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

Pull networking updates from David Miller:
 "Highlights (1721 non-merge commits, this has to be a record of some
  sort):

   1) Add 'random' mode to team driver, from Jiri Pirko and Eric
      Dumazet.

   2) Make it so that any driver that supports configuration of multiple
      MAC addresses can provide the forwarding database add and del
      calls by providing a default implementation and hooking that up if
      the driver doesn't have an explicit set of handlers.  From Vlad
      Yasevich.

   3) Support GSO segmentation over tunnels and other encapsulating
      devices such as VXLAN, from Pravin B Shelar.

   4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.

   5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita
      Dukkipati.

   6) In the PHY layer, allow supporting wake-on-lan in situations where
      the PHY registers have to be written for it to be configured.

      Use it to support wake-on-lan in mv643xx_eth.

      From Michael Stapelberg.

   7) Significantly improve firewire IPV6 support, from YOSHIFUJI
      Hideaki.

   8) Allow multiple packets to be sent in a single transmission using
      network coding in batman-adv, from Martin Hundebøll.

   9) Add support for T5 cxgb4 chips, from Santosh Rastapur.

  10) Generalize the VXLAN forwarding tables so that there is more
      flexibility in configurating various aspects of the endpoints.
      From David Stevens.

  11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,
      from Dmitry Kravkov.

  12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo
      Neira Ayuso.

  13) Start adding networking selftests.

  14) In situations of overload on the same AF_PACKET fanout socket, or
      per-cpu packet receive queue, minimize drop by distributing the
      load to other cpus/fanouts.  From Willem de Bruijn and Eric
      Dumazet.

  15) Add support for new payload offset BPF instruction, from Daniel
      Borkmann.

  16) Convert several drivers over to mdoule_platform_driver(), from
      Sachin Kamat.

  17) Provide a minimal BPF JIT image disassembler userspace tool, from
      Daniel Borkmann.

  18) Rewrite F-RTO implementation in TCP to match the final
      specification of it in RFC4138 and RFC5682.  From Yuchung Cheng.

  19) Provide netlink socket diag of netlink sockets ("Yo dawg, I hear
      you like netlink, so I implemented netlink dumping of netlink
      sockets.") From Andrey Vagin.

  20) Remove ugly passing of rtnetlink attributes into rtnl_doit
      functions, from Thomas Graf.

  21) Allow userspace to be able to see if a configuration change occurs
      in the middle of an address or device list dump, from Nicolas
      Dichtel.

  22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes
      Frederic Sowa.

  23) Increase accuracy of packet length used by packet scheduler, from
      Jason Wang.

  24) Beginning set of changes to make ipv4/ipv6 fragment handling more
      scalable and less susceptible to overload and locking contention,
      from Jesper Dangaard Brouer.

  25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()
      instead.  From Hong Zhiguo.

  26) Optimize route usage in IPVS by avoiding reference counting where
      possible, from Julian Anastasov.

  27) Convert IPVS schedulers to RCU, also from Julian Anastasov.

  28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger
      Eitzenberger.

  29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,
      nfnetlink_log, and nfnetlink_queue.  From Gao feng.

  30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.

  31) Support several new r8169 chips, from Hayes Wang.

  32) Support tokenized interface identifiers in ipv6, from Daniel
      Borkmann.

  33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.

  34) Add 802.1ad vlan offload support, from Patrick McHardy.

  35) Support mmap() based netlink communication, also from Patrick
      McHardy.

  36) Support HW timestamping in mlx4 driver, from Amir Vadai.

  37) Rationalize AF_PACKET packet timestamping when transmitting, from
      Willem de Bruijn and Daniel Borkmann.

  38) Bring parity to what's provided by /proc/net/packet socket dumping
      and the info provided by netlink socket dumping of AF_PACKET
      sockets.  From Nicolas Dichtel.

  39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin
      Poirier"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
  filter: fix va_list build error
  af_unix: fix a fatal race with bit fields
  bnx2x: Prevent memory leak when cnic is absent
  bnx2x: correct reading of speed capabilities
  net: sctp: attribute printl with __printf for gcc fmt checks
  netlink: kconfig: move mmap i/o into netlink kconfig
  netpoll: convert mutex into a semaphore
  netlink: Fix skb ref counting.
  net_sched: act_ipt forward compat with xtables
  mlx4_en: fix a build error on 32bit arches
  Revert "bnx2x: allow nvram test to run when device is down"
  bridge: avoid OOPS if root port not found
  drivers: net: cpsw: fix kernel warn on cpsw irq enable
  sh_eth: use random MAC address if no valid one supplied
  3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
  tg3: fix to append hardware time stamping flags
  unix/stream: fix peeking with an offset larger than data in queue
  unix/dgram: fix peeking with an offset larger than data in queue
  unix/dgram: peek beyond 0-sized skbs
  openvswitch: Remove unneeded ovs_netdev_get_ifindex()
  ...

899 files changed, 58235 insertions, 19130 deletions

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index d6891267f5bb..507362a76a73 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -1055,7 +1055,7 @@ static int he_start(struct atm_dev *dev)
         he_writel(he_dev, 0x0, RESET_CNTL);
         he_writel(he_dev, 0xff, RESET_CNTL);
 
-        udelay(16*1000);        /* 16 ms */
+        msleep(16);     /* 16 ms */
         status = he_readl(he_dev, RESET_CNTL);
         if ((status & BOARD_RST_STATUS) == 0) {
                 hprintk("reset failed\n");
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 03bbe104338f..17b26ce7e051 100644
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -104,7 +104,13 @@ void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on)
                 if (i)
                         bcma_err(core->bus, "PLL enable timeout\n");
         } else {
-                bcma_warn(core->bus, "Disabling PLL not supported yet!\n");
+                /*
+                 * Mask the PLL but don't wait for it to be disabled. PLL may be
+                 * shared between cores and will be still up if there is another
+                 * core using it.
+                 */
+                bcma_mask32(core, BCMA_CLKCTLST, ~req);
+                bcma_read32(core, BCMA_CLKCTLST);
         }
 }
 EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index 28fa50ad87be..036c6744b39b 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -25,13 +25,14 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
         return value;
 }
 
-static u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)
+u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)
 {
         if (cc->capabilities & BCMA_CC_CAP_PMU)
                 return bcma_pmu_get_alp_clock(cc);
 
         return 20000000;
 }
+EXPORT_SYMBOL_GPL(bcma_chipco_get_alp_clock);
 
 static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)
 {
@@ -213,6 +214,7 @@ u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value)
 
         return res;
 }
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_out);
 
 u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)
 {
@@ -225,6 +227,7 @@ u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)
 
         return res;
 }
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_outen);
 
 /*
  * If the bit is set to 0, chipcommon controlls this GPIO,
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index 932b101dee36..edca73af3cc0 100644
--- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -174,19 +174,35 @@ u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc)
         struct bcma_bus *bus = cc->core->bus;
 
         switch (bus->chipinfo.id) {
+        case BCMA_CHIP_ID_BCM4313:
+        case BCMA_CHIP_ID_BCM43224:
+        case BCMA_CHIP_ID_BCM43225:
+        case BCMA_CHIP_ID_BCM43227:
+        case BCMA_CHIP_ID_BCM43228:
+        case BCMA_CHIP_ID_BCM4331:
+        case BCMA_CHIP_ID_BCM43421:
+        case BCMA_CHIP_ID_BCM43428:
+        case BCMA_CHIP_ID_BCM43431:
         case BCMA_CHIP_ID_BCM4716:
-        case BCMA_CHIP_ID_BCM4748:
         case BCMA_CHIP_ID_BCM47162:
-        case BCMA_CHIP_ID_BCM4313:
-        case BCMA_CHIP_ID_BCM5357:
+        case BCMA_CHIP_ID_BCM4748:
         case BCMA_CHIP_ID_BCM4749:
+        case BCMA_CHIP_ID_BCM5357:
         case BCMA_CHIP_ID_BCM53572:
+        case BCMA_CHIP_ID_BCM6362:
                 /* always 20Mhz */
                 return 20000 * 1000;
-        case BCMA_CHIP_ID_BCM5356:
         case BCMA_CHIP_ID_BCM4706:
+        case BCMA_CHIP_ID_BCM5356:
                 /* always 25Mhz */
                 return 25000 * 1000;
+        case BCMA_CHIP_ID_BCM43460:
+        case BCMA_CHIP_ID_BCM4352:
+        case BCMA_CHIP_ID_BCM4360:
+                if (cc->status & BCMA_CC_CHIPST_4360_XTAL_40MZ)
+                        return 40000 * 1000;
+                else
+                        return 20000 * 1000;
         default:
                 bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
                           bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
@@ -373,7 +389,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
                 tmp |= (bcm5357_bcm43236_ndiv[spuravoid]) << BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT;
                 bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, tmp);
 
-                tmp = 1 << 10;
+                tmp = BCMA_CC_PMU_CTL_PLL_UPD;
                 break;
 
         case BCMA_CHIP_ID_BCM4331:
@@ -394,7 +410,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
                         bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
                                                      0x03000a08);
                 }
-                tmp = 1 << 10;
+                tmp = BCMA_CC_PMU_CTL_PLL_UPD;
                 break;
 
         case BCMA_CHIP_ID_BCM43224:
@@ -427,7 +443,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
                         bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
                                                      0x88888815);
                 }
-                tmp = 1 << 10;
+                tmp = BCMA_CC_PMU_CTL_PLL_UPD;
                 break;
 
         case BCMA_CHIP_ID_BCM4716:
@@ -461,7 +477,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
                                                      0x88888815);
                 }
 
-                tmp = 3 << 9;
+                tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;
                 break;
 
         case BCMA_CHIP_ID_BCM43227:
@@ -497,7 +513,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
                         bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
                                                      0x88888815);
                 }
-                tmp = 1 << 10;
+                tmp = BCMA_CC_PMU_CTL_PLL_UPD;
                 break;
         default:
                 bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 9a6188add590..f72f52b4b1dd 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -120,6 +120,11 @@ static int bcma_register_cores(struct bcma_bus *bus)
                         continue;
                 }
 
+                /* Only first GMAC core on BCM4706 is connected and working */
+                if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
+                    core->core_unit > 0)
+                        continue;
+
                 core->dev.release = bcma_release_core_dev;
                 core->dev.bus = &bcma_bus_type;
                 dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 8d0b57164018..bca9c80056fe 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -137,19 +137,19 @@ static void bcma_scan_switch_core(struct bcma_bus *bus, u32 addr)
                                        addr);
 }
 
-static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 **eromptr)
+static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 __iomem **eromptr)
 {
         u32 ent = readl(*eromptr);
         (*eromptr)++;
         return ent;
 }
 
-static void bcma_erom_push_ent(u32 **eromptr)
+static void bcma_erom_push_ent(u32 __iomem **eromptr)
 {
         (*eromptr)--;
 }
 
-static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr)
+static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 __iomem **eromptr)
 {
         u32 ent = bcma_erom_get_ent(bus, eromptr);
         if (!(ent & SCAN_ER_VALID))
@@ -159,14 +159,14 @@ static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr)
         return ent;
 }
 
-static bool bcma_erom_is_end(struct bcma_bus *bus, u32 **eromptr)
+static bool bcma_erom_is_end(struct bcma_bus *bus, u32 __iomem **eromptr)
 {
         u32 ent = bcma_erom_get_ent(bus, eromptr);
         bcma_erom_push_ent(eromptr);
         return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID));
 }
 
-static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr)
+static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 __iomem **eromptr)
 {
         u32 ent = bcma_erom_get_ent(bus, eromptr);
         bcma_erom_push_ent(eromptr);
@@ -175,7 +175,7 @@ static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr)
                 ((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE));
 }
 
-static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr)
+static void bcma_erom_skip_component(struct bcma_bus *bus, u32 __iomem **eromptr)
 {
         u32 ent;
         while (1) {
@@ -189,7 +189,7 @@ static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr)
         bcma_erom_push_ent(eromptr);
 }
 
-static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr)
+static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
 {
         u32 ent = bcma_erom_get_ent(bus, eromptr);
         if (!(ent & SCAN_ER_VALID))
@@ -199,7 +199,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr)
         return ent;
 }
 
-static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 **eromptr,
+static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
                                   u32 type, u8 port)
 {
         u32 addrl, addrh, sizel, sizeh = 0;
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index 4adf9ef9a113..8934298a638d 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -217,6 +217,7 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
         }
 
         SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);
+        SPEX(board_type, SSB_SPROM1_SPID, ~0, 0);
 
         SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,
              SSB_SPROM4_TXPID2G0_SHIFT);
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 6aab00ef4379..11f467c00d0a 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -90,6 +90,7 @@ static struct usb_device_id ath3k_table[] = {
         { USB_DEVICE(0x13d3, 0x3393) },
         { USB_DEVICE(0x0489, 0xe04e) },
         { USB_DEVICE(0x0489, 0xe056) },
+        { USB_DEVICE(0x0489, 0xe04d) },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE02C) },
@@ -126,6 +127,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
         { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU22 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index 428dbb7574bd..db2c3c305df8 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -29,20 +29,6 @@
 struct btmrvl_debugfs_data {
         struct dentry *config_dir;
         struct dentry *status_dir;
-
-        /* config */
-        struct dentry *psmode;
-        struct dentry *pscmd;
-        struct dentry *hsmode;
-        struct dentry *hscmd;
-        struct dentry *gpiogap;
-        struct dentry *hscfgcmd;
-
-        /* status */
-        struct dentry *curpsmode;
-        struct dentry *hsstate;
-        struct dentry *psstate;
-        struct dentry *txdnldready;
 };
 
 static ssize_t btmrvl_hscfgcmd_write(struct file *file,
@@ -91,47 +77,6 @@ static const struct file_operations btmrvl_hscfgcmd_fops = {
         .llseek = default_llseek,
 };
 
-static ssize_t btmrvl_psmode_write(struct file *file, const char __user *ubuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        long result, ret;
-
-        memset(buf, 0, sizeof(buf));
-
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
-                return -EFAULT;
-
-        ret = strict_strtol(buf, 10, &result);
-        if (ret)
-                return ret;
-
-        priv->btmrvl_dev.psmode = result;
-
-        return count;
-}
-
-static ssize_t btmrvl_psmode_read(struct file *file, char __user *userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "%d\n",
-                                                priv->btmrvl_dev.psmode);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_psmode_fops = {
-        .read   = btmrvl_psmode_read,
-        .write  = btmrvl_psmode_write,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
 static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf,
                                                 size_t count, loff_t *ppos)
 {
@@ -178,47 +123,6 @@ static const struct file_operations btmrvl_pscmd_fops = {
         .llseek = default_llseek,
 };
 
-static ssize_t btmrvl_gpiogap_write(struct file *file, const char __user *ubuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        long result, ret;
-
-        memset(buf, 0, sizeof(buf));
-
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
-                return -EFAULT;
-
-        ret = strict_strtol(buf, 16, &result);
-        if (ret)
-                return ret;
-
-        priv->btmrvl_dev.gpio_gap = result;
-
-        return count;
-}
-
-static ssize_t btmrvl_gpiogap_read(struct file *file, char __user *userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "0x%x\n",
-                                                priv->btmrvl_dev.gpio_gap);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_gpiogap_fops = {
-        .read   = btmrvl_gpiogap_read,
-        .write  = btmrvl_gpiogap_write,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
 static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf,
                                                 size_t count, loff_t *ppos)
 {
@@ -263,119 +167,6 @@ static const struct file_operations btmrvl_hscmd_fops = {
         .llseek = default_llseek,
 };
 
-static ssize_t btmrvl_hsmode_write(struct file *file, const char __user *ubuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        long result, ret;
-
-        memset(buf, 0, sizeof(buf));
-
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
-                return -EFAULT;
-
-        ret = strict_strtol(buf, 10, &result);
-        if (ret)
-                return ret;
-
-        priv->btmrvl_dev.hsmode = result;
-
-        return count;
-}
-
-static ssize_t btmrvl_hsmode_read(struct file *file, char __user * userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->btmrvl_dev.hsmode);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_hsmode_fops = {
-        .read   = btmrvl_hsmode_read,
-        .write  = btmrvl_hsmode_write,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
-static ssize_t btmrvl_curpsmode_read(struct file *file, char __user *userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->adapter->psmode);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_curpsmode_fops = {
-        .read   = btmrvl_curpsmode_read,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
-static ssize_t btmrvl_psstate_read(struct file *file, char __user * userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->adapter->ps_state);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_psstate_fops = {
-        .read   = btmrvl_psstate_read,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
-static ssize_t btmrvl_hsstate_read(struct file *file, char __user *userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->adapter->hs_state);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_hsstate_fops = {
-        .read   = btmrvl_hsstate_read,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
-static ssize_t btmrvl_txdnldready_read(struct file *file, char __user *userbuf,
-                                                size_t count, loff_t *ppos)
-{
-        struct btmrvl_private *priv = file->private_data;
-        char buf[16];
-        int ret;
-
-        ret = snprintf(buf, sizeof(buf) - 1, "%d\n",
-                                        priv->btmrvl_dev.tx_dnld_rdy);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
-}
-
-static const struct file_operations btmrvl_txdnldready_fops = {
-        .read   = btmrvl_txdnldready_read,
-        .open   = simple_open,
-        .llseek = default_llseek,
-};
-
 void btmrvl_debugfs_init(struct hci_dev *hdev)
 {
         struct btmrvl_private *priv = hci_get_drvdata(hdev);
@@ -394,30 +185,28 @@ void btmrvl_debugfs_init(struct hci_dev *hdev)
 
         dbg->config_dir = debugfs_create_dir("config", hdev->debugfs);
 
-        dbg->psmode = debugfs_create_file("psmode", 0644, dbg->config_dir,
-                                          priv, &btmrvl_psmode_fops);
-        dbg->pscmd = debugfs_create_file("pscmd", 0644, dbg->config_dir,
-                                         priv, &btmrvl_pscmd_fops);
-        dbg->gpiogap = debugfs_create_file("gpiogap", 0644, dbg->config_dir,
-                                           priv, &btmrvl_gpiogap_fops);
-        dbg->hsmode =  debugfs_create_file("hsmode", 0644, dbg->config_dir,
-                                           priv, &btmrvl_hsmode_fops);
-        dbg->hscmd = debugfs_create_file("hscmd", 0644, dbg->config_dir,
-                                         priv, &btmrvl_hscmd_fops);
-        dbg->hscfgcmd = debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,
-                                            priv, &btmrvl_hscfgcmd_fops);
+        debugfs_create_u8("psmode", 0644, dbg->config_dir,
+                          &priv->btmrvl_dev.psmode);
+        debugfs_create_file("pscmd", 0644, dbg->config_dir,
+                            priv, &btmrvl_pscmd_fops);
+        debugfs_create_x16("gpiogap", 0644, dbg->config_dir,
+                           &priv->btmrvl_dev.gpio_gap);
+        debugfs_create_u8("hsmode", 0644, dbg->config_dir,
+                          &priv->btmrvl_dev.hsmode);
+        debugfs_create_file("hscmd", 0644, dbg->config_dir,
+                            priv, &btmrvl_hscmd_fops);
+        debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,
+                            priv, &btmrvl_hscfgcmd_fops);
 
         dbg->status_dir = debugfs_create_dir("status", hdev->debugfs);
-        dbg->curpsmode = debugfs_create_file("curpsmode", 0444,
-                                             dbg->status_dir, priv,
-                                             &btmrvl_curpsmode_fops);
-        dbg->psstate = debugfs_create_file("psstate", 0444, dbg->status_dir,
-                                           priv, &btmrvl_psstate_fops);
-        dbg->hsstate = debugfs_create_file("hsstate", 0444, dbg->status_dir,
-                                           priv, &btmrvl_hsstate_fops);
-        dbg->txdnldready = debugfs_create_file("txdnldready", 0444,
-                                               dbg->status_dir, priv,
-                                               &btmrvl_txdnldready_fops);
+        debugfs_create_u8("curpsmode", 0444, dbg->status_dir,
+                          &priv->adapter->psmode);
+        debugfs_create_u8("psstate", 0444, dbg->status_dir,
+                          &priv->adapter->ps_state);
+        debugfs_create_u8("hsstate", 0444, dbg->status_dir,
+                          &priv->adapter->hs_state);
+        debugfs_create_u8("txdnldready", 0444, dbg->status_dir,
+                          &priv->btmrvl_dev.tx_dnld_rdy);
 }
 
 void btmrvl_debugfs_remove(struct hci_dev *hdev)
@@ -428,19 +217,8 @@ void btmrvl_debugfs_remove(struct hci_dev *hdev)
         if (!dbg)
                 return;
 
-        debugfs_remove(dbg->psmode);
-        debugfs_remove(dbg->pscmd);
-        debugfs_remove(dbg->gpiogap);
-        debugfs_remove(dbg->hsmode);
-        debugfs_remove(dbg->hscmd);
-        debugfs_remove(dbg->hscfgcmd);
-        debugfs_remove(dbg->config_dir);
-
-        debugfs_remove(dbg->curpsmode);
-        debugfs_remove(dbg->psstate);
-        debugfs_remove(dbg->hsstate);
-        debugfs_remove(dbg->txdnldready);
-        debugfs_remove(dbg->status_dir);
+        debugfs_remove_recursive(dbg->config_dir);
+        debugfs_remove_recursive(dbg->status_dir);
 
         kfree(dbg);
 }
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 9959d4cb23dc..c63488c54f4a 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
 };
 
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
-        .helper         = "sd8688_helper.bin",
-        .firmware       = "sd8688.bin",
+        .helper         = "mrvl/sd8688_helper.bin",
+        .firmware       = "mrvl/sd8688.bin",
         .reg            = &btmrvl_reg_8688,
         .sd_blksz_fw_dl = 64,
 };
@@ -228,24 +228,24 @@ failed:
 static int btmrvl_sdio_verify_fw_download(struct btmrvl_sdio_card *card,
                                                                 int pollnum)
 {
-        int ret = -ETIMEDOUT;
         u16 firmwarestat;
-        unsigned int tries;
+        int tries, ret;
 
          /* Wait for firmware to become ready */
         for (tries = 0; tries < pollnum; tries++) {
-                if (btmrvl_sdio_read_fw_status(card, &firmwarestat) < 0)
+                sdio_claim_host(card->func);
+                ret = btmrvl_sdio_read_fw_status(card, &firmwarestat);
+                sdio_release_host(card->func);
+                if (ret < 0)
                         continue;
 
-                if (firmwarestat == FIRMWARE_READY) {
-                        ret = 0;
-                        break;
-                } else {
-                        msleep(10);
-                }
+                if (firmwarestat == FIRMWARE_READY)
+                        return 0;
+
+                msleep(10);
         }
 
-        return ret;
+        return -ETIMEDOUT;
 }
 
 static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
@@ -874,7 +874,7 @@ exit:
 
 static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
 {
-        int ret = 0;
+        int ret;
         u8 fws0;
         int pollnum = MAX_POLL_TRIES;
 
@@ -882,13 +882,14 @@ static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
                 BT_ERR("card or function is NULL!");
                 return -EINVAL;
         }
-        sdio_claim_host(card->func);
 
         if (!btmrvl_sdio_verify_fw_download(card, 1)) {
                 BT_DBG("Firmware already downloaded!");
-                goto done;
+                return 0;
         }
 
+        sdio_claim_host(card->func);
+
         /* Check if other function driver is downloading the firmware */
         fws0 = sdio_readb(card->func, card->reg->card_fw_status0, &ret);
         if (ret) {
@@ -918,15 +919,21 @@ static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
                 }
         }
 
+        sdio_release_host(card->func);
+
+        /*
+         * winner or not, with this test the FW synchronizes when the
+         * module can continue its initialization
+         */
         if (btmrvl_sdio_verify_fw_download(card, pollnum)) {
                 BT_ERR("FW failed to be active in time!");
-                ret = -ETIMEDOUT;
-                goto done;
+                return -ETIMEDOUT;
         }
 
+        return 0;
+
 done:
         sdio_release_host(card->func);
-
         return ret;
 }
 
@@ -989,8 +996,6 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
                 goto unreg_dev;
         }
 
-        msleep(100);
-
         btmrvl_sdio_enable_host_int(card);
 
         priv = btmrvl_add_card(card);
@@ -1185,7 +1190,7 @@ MODULE_AUTHOR("Marvell International Ltd.");
 MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE("sd8688_helper.bin");
-MODULE_FIRMWARE("sd8688.bin");
+MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
+MODULE_FIRMWARE("mrvl/sd8688.bin");
 MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
 MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 2cc5f774a29c..7a7e5f8ecadc 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -23,6 +23,7 @@
 
 #include <linux/module.h>
 #include <linux/usb.h>
+#include <linux/firmware.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -47,6 +48,7 @@ static struct usb_driver btusb_driver;
 #define BTUSB_BROKEN_ISOC       0x20
 #define BTUSB_WRONG_SCO_MTU     0x40
 #define BTUSB_ATH3012           0x80
+#define BTUSB_INTEL             0x100
 
 static struct usb_device_id btusb_table[] = {
         /* Generic Bluetooth USB device */
@@ -148,6 +150,7 @@ static struct usb_device_id blacklist_table[] = {
         { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -206,6 +209,9 @@ static struct usb_device_id blacklist_table[] = {
         /* Frontline ComProbe Bluetooth Sniffer */
         { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
 
+        /* Intel Bluetooth device */
+        { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },
+
         { }     /* Terminating entry */
 };
 
@@ -926,6 +932,391 @@ static void btusb_waker(struct work_struct *work)
         usb_autopm_put_interface(data->intf);
 }
 
+static int btusb_setup_bcm92035(struct hci_dev *hdev)
+{
+        struct sk_buff *skb;
+        u8 val = 0x00;
+
+        BT_DBG("%s", hdev->name);
+
+        skb = __hci_cmd_sync(hdev, 0xfc3b, 1, &val, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb))
+                BT_ERR("BCM92035 command failed (%ld)", -PTR_ERR(skb));
+        else
+                kfree_skb(skb);
+
+        return 0;
+}
+
+struct intel_version {
+        u8 status;
+        u8 hw_platform;
+        u8 hw_variant;
+        u8 hw_revision;
+        u8 fw_variant;
+        u8 fw_revision;
+        u8 fw_build_num;
+        u8 fw_build_ww;
+        u8 fw_build_yy;
+        u8 fw_patch_num;
+} __packed;
+
+static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev,
+                                                struct intel_version *ver)
+{
+        const struct firmware *fw;
+        char fwname[64];
+        int ret;
+
+        snprintf(fwname, sizeof(fwname),
+                 "intel/ibt-hw-%x.%x.%x-fw-%x.%x.%x.%x.%x.bseq",
+                 ver->hw_platform, ver->hw_variant, ver->hw_revision,
+                 ver->fw_variant,  ver->fw_revision, ver->fw_build_num,
+                 ver->fw_build_ww, ver->fw_build_yy);
+
+        ret = request_firmware(&fw, fwname, &hdev->dev);
+        if (ret < 0) {
+                if (ret == -EINVAL) {
+                        BT_ERR("%s Intel firmware file request failed (%d)",
+                               hdev->name, ret);
+                        return NULL;
+                }
+
+                BT_ERR("%s failed to open Intel firmware file: %s(%d)",
+                       hdev->name, fwname, ret);
+
+                /* If the correct firmware patch file is not found, use the
+                 * default firmware patch file instead
+                 */
+                snprintf(fwname, sizeof(fwname), "intel/ibt-hw-%x.%x.bseq",
+                         ver->hw_platform, ver->hw_variant);
+                if (request_firmware(&fw, fwname, &hdev->dev) < 0) {
+                        BT_ERR("%s failed to open default Intel fw file: %s",
+                               hdev->name, fwname);
+                        return NULL;
+                }
+        }
+
+        BT_INFO("%s: Intel Bluetooth firmware file: %s", hdev->name, fwname);
+
+        return fw;
+}
+
+static int btusb_setup_intel_patching(struct hci_dev *hdev,
+                                      const struct firmware *fw,
+                                      const u8 **fw_ptr, int *disable_patch)
+{
+        struct sk_buff *skb;
+        struct hci_command_hdr *cmd;
+        const u8 *cmd_param;
+        struct hci_event_hdr *evt = NULL;
+        const u8 *evt_param = NULL;
+        int remain = fw->size - (*fw_ptr - fw->data);
+
+        /* The first byte indicates the types of the patch command or event.
+         * 0x01 means HCI command and 0x02 is HCI event. If the first bytes
+         * in the current firmware buffer doesn't start with 0x01 or
+         * the size of remain buffer is smaller than HCI command header,
+         * the firmware file is corrupted and it should stop the patching
+         * process.
+         */
+        if (remain > HCI_COMMAND_HDR_SIZE && *fw_ptr[0] != 0x01) {
+                BT_ERR("%s Intel fw corrupted: invalid cmd read", hdev->name);
+                return -EINVAL;
+        }
+        (*fw_ptr)++;
+        remain--;
+
+        cmd = (struct hci_command_hdr *)(*fw_ptr);
+        *fw_ptr += sizeof(*cmd);
+        remain -= sizeof(*cmd);
+
+        /* Ensure that the remain firmware data is long enough than the length
+         * of command parameter. If not, the firmware file is corrupted.
+         */
+        if (remain < cmd->plen) {
+                BT_ERR("%s Intel fw corrupted: invalid cmd len", hdev->name);
+                return -EFAULT;
+        }
+
+        /* If there is a command that loads a patch in the firmware
+         * file, then enable the patch upon success, otherwise just
+         * disable the manufacturer mode, for example patch activation
+         * is not required when the default firmware patch file is used
+         * because there are no patch data to load.
+         */
+        if (*disable_patch && le16_to_cpu(cmd->opcode) == 0xfc8e)
+                *disable_patch = 0;
+
+        cmd_param = *fw_ptr;
+        *fw_ptr += cmd->plen;
+        remain -= cmd->plen;
+
+        /* This reads the expected events when the above command is sent to the
+         * device. Some vendor commands expects more than one events, for
+         * example command status event followed by vendor specific event.
+         * For this case, it only keeps the last expected event. so the command
+         * can be sent with __hci_cmd_sync_ev() which returns the sk_buff of
+         * last expected event.
+         */
+        while (remain > HCI_EVENT_HDR_SIZE && *fw_ptr[0] == 0x02) {
+                (*fw_ptr)++;
+                remain--;
+
+                evt = (struct hci_event_hdr *)(*fw_ptr);
+                *fw_ptr += sizeof(*evt);
+                remain -= sizeof(*evt);
+
+                if (remain < evt->plen) {
+                        BT_ERR("%s Intel fw corrupted: invalid evt len",
+                               hdev->name);
+                        return -EFAULT;
+                }
+
+                evt_param = *fw_ptr;
+                *fw_ptr += evt->plen;
+                remain -= evt->plen;
+        }
+
+        /* Every HCI commands in the firmware file has its correspond event.
+         * If event is not found or remain is smaller than zero, the firmware
+         * file is corrupted.
+         */
+        if (!evt || !evt_param || remain < 0) {
+                BT_ERR("%s Intel fw corrupted: invalid evt read", hdev->name);
+                return -EFAULT;
+        }
+
+        skb = __hci_cmd_sync_ev(hdev, le16_to_cpu(cmd->opcode), cmd->plen,
+                                cmd_param, evt->evt, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s sending Intel patch command (0x%4.4x) failed (%ld)",
+                       hdev->name, cmd->opcode, PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+
+        /* It ensures that the returned event matches the event data read from
+         * the firmware file. At fist, it checks the length and then
+         * the contents of the event.
+         */
+        if (skb->len != evt->plen) {
+                BT_ERR("%s mismatch event length (opcode 0x%4.4x)", hdev->name,
+                       le16_to_cpu(cmd->opcode));
+                kfree_skb(skb);
+                return -EFAULT;
+        }
+
+        if (memcmp(skb->data, evt_param, evt->plen)) {
+                BT_ERR("%s mismatch event parameter (opcode 0x%4.4x)",
+                       hdev->name, le16_to_cpu(cmd->opcode));
+                kfree_skb(skb);
+                return -EFAULT;
+        }
+        kfree_skb(skb);
+
+        return 0;
+}
+
+static int btusb_setup_intel(struct hci_dev *hdev)
+{
+        struct sk_buff *skb;
+        const struct firmware *fw;
+        const u8 *fw_ptr;
+        int disable_patch;
+        struct intel_version *ver;
+
+        const u8 mfg_enable[] = { 0x01, 0x00 };
+        const u8 mfg_disable[] = { 0x00, 0x00 };
+        const u8 mfg_reset_deactivate[] = { 0x00, 0x01 };
+        const u8 mfg_reset_activate[] = { 0x00, 0x02 };
+
+        BT_DBG("%s", hdev->name);
+
+        /* The controller has a bug with the first HCI command sent to it
+         * returning number of completed commands as zero. This would stall the
+         * command processing in the Bluetooth core.
+         *
+         * As a workaround, send HCI Reset command first which will reset the
+         * number of completed commands and allow normal command processing
+         * from now on.
+         */
+        skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s sending initial HCI reset command failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+        kfree_skb(skb);
+
+        /* Read Intel specific controller version first to allow selection of
+         * which firmware file to load.
+         *
+         * The returned information are hardware variant and revision plus
+         * firmware variant, revision and build number.
+         */
+        skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s reading Intel fw version command failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+
+        if (skb->len != sizeof(*ver)) {
+                BT_ERR("%s Intel version event length mismatch", hdev->name);
+                kfree_skb(skb);
+                return -EIO;
+        }
+
+        ver = (struct intel_version *)skb->data;
+        if (ver->status) {
+                BT_ERR("%s Intel fw version event failed (%02x)", hdev->name,
+                       ver->status);
+                kfree_skb(skb);
+                return -bt_to_errno(ver->status);
+        }
+
+        BT_INFO("%s: read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                hdev->name, ver->hw_platform, ver->hw_variant,
+                ver->hw_revision, ver->fw_variant,  ver->fw_revision,
+                ver->fw_build_num, ver->fw_build_ww, ver->fw_build_yy,
+                ver->fw_patch_num);
+
+        /* fw_patch_num indicates the version of patch the device currently
+         * have. If there is no patch data in the device, it is always 0x00.
+         * So, if it is other than 0x00, no need to patch the deivce again.
+         */
+        if (ver->fw_patch_num) {
+                BT_INFO("%s: Intel device is already patched. patch num: %02x",
+                        hdev->name, ver->fw_patch_num);
+                kfree_skb(skb);
+                return 0;
+        }
+
+        /* Opens the firmware patch file based on the firmware version read
+         * from the controller. If it fails to open the matching firmware
+         * patch file, it tries to open the default firmware patch file.
+         * If no patch file is found, allow the device to operate without
+         * a patch.
+         */
+        fw = btusb_setup_intel_get_fw(hdev, ver);
+        if (!fw) {
+                kfree_skb(skb);
+                return 0;
+        }
+        fw_ptr = fw->data;
+
+        /* This Intel specific command enables the manufacturer mode of the
+         * controller.
+         *
+         * Only while this mode is enabled, the driver can download the
+         * firmware patch data and configuration parameters.
+         */
+        skb = __hci_cmd_sync(hdev, 0xfc11, 2, mfg_enable, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s entering Intel manufacturer mode failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                release_firmware(fw);
+                return -PTR_ERR(skb);
+        }
+
+        if (skb->data[0]) {
+                u8 evt_status = skb->data[0];
+                BT_ERR("%s enable Intel manufacturer mode event failed (%02x)",
+                       hdev->name, evt_status);
+                kfree_skb(skb);
+                release_firmware(fw);
+                return -bt_to_errno(evt_status);
+        }
+        kfree_skb(skb);
+
+        disable_patch = 1;
+
+        /* The firmware data file consists of list of Intel specific HCI
+         * commands and its expected events. The first byte indicates the
+         * type of the message, either HCI command or HCI event.
+         *
+         * It reads the command and its expected event from the firmware file,
+         * and send to the controller. Once __hci_cmd_sync_ev() returns,
+         * the returned event is compared with the event read from the firmware
+         * file and it will continue until all the messages are downloaded to
+         * the controller.
+         *
+         * Once the firmware patching is completed successfully,
+         * the manufacturer mode is disabled with reset and activating the
+         * downloaded patch.
+         *
+         * If the firmware patching fails, the manufacturer mode is
+         * disabled with reset and deactivating the patch.
+         *
+         * If the default patch file is used, no reset is done when disabling
+         * the manufacturer.
+         */
+        while (fw->size > fw_ptr - fw->data) {
+                int ret;
+
+                ret = btusb_setup_intel_patching(hdev, fw, &fw_ptr,
+                                                 &disable_patch);
+                if (ret < 0)
+                        goto exit_mfg_deactivate;
+        }
+
+        release_firmware(fw);
+
+        if (disable_patch)
+                goto exit_mfg_disable;
+
+        /* Patching completed successfully and disable the manufacturer mode
+         * with reset and activate the downloaded firmware patches.
+         */
+        skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_reset_activate),
+                             mfg_reset_activate, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s exiting Intel manufacturer mode failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+        kfree_skb(skb);
+
+        BT_INFO("%s: Intel Bluetooth firmware patch completed and activated",
+                hdev->name);
+
+        return 0;
+
+exit_mfg_disable:
+        /* Disable the manufacturer mode without reset */
+        skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_disable), mfg_disable,
+                             HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s exiting Intel manufacturer mode failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+        kfree_skb(skb);
+
+        BT_INFO("%s: Intel Bluetooth firmware patch completed", hdev->name);
+        return 0;
+
+exit_mfg_deactivate:
+        release_firmware(fw);
+
+        /* Patching failed. Disable the manufacturer mode with reset and
+         * deactivate the downloaded firmware patches.
+         */
+        skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_reset_deactivate),
+                             mfg_reset_deactivate, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s exiting Intel manufacturer mode failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+        kfree_skb(skb);
+
+        BT_INFO("%s: Intel Bluetooth firmware patch completed and deactivated",
+                hdev->name);
+
+        return 0;
+}
+
 static int btusb_probe(struct usb_interface *intf,
                                 const struct usb_device_id *id)
 {
@@ -1022,11 +1413,17 @@ static int btusb_probe(struct usb_interface *intf,
 
         SET_HCIDEV_DEV(hdev, &intf->dev);
 
-        hdev->open     = btusb_open;
-        hdev->close    = btusb_close;
-        hdev->flush    = btusb_flush;
-        hdev->send     = btusb_send_frame;
-        hdev->notify   = btusb_notify;
+        hdev->open   = btusb_open;
+        hdev->close  = btusb_close;
+        hdev->flush  = btusb_flush;
+        hdev->send   = btusb_send_frame;
+        hdev->notify = btusb_notify;
+
+        if (id->driver_info & BTUSB_BCM92035)
+                hdev->setup = btusb_setup_bcm92035;
+
+        if (id->driver_info & BTUSB_INTEL)
+                hdev->setup = btusb_setup_intel;
 
         /* Interface numbers are hardcoded in the specification */
         data->isoc = usb_ifnum_to_if(data->udev, 1);
@@ -1065,17 +1462,6 @@ static int btusb_probe(struct usb_interface *intf,
                 data->isoc = NULL;
         }
 
-        if (id->driver_info & BTUSB_BCM92035) {
-                unsigned char cmd[] = { 0x3b, 0xfc, 0x01, 0x00 };
-                struct sk_buff *skb;
-
-                skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);
-                if (skb) {
-                        memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));
-                        skb_queue_tail(&hdev->driver_init, skb);
-                }
-        }
-
         if (data->isoc) {
                 err = usb_driver_claim_interface(&btusb_driver,
                                                         data->isoc, data);
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index c60623f206d4..8ae9f1ea2bb5 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -153,6 +153,9 @@ static int h4_recv(struct hci_uart *hu, void *data, int count)
 {
         int ret;
 
+        if (!test_bit(HCI_UART_REGISTERED, &hu->flags))
+                return -EUNATCH;
+
         ret = hci_recv_stream_fragment(hu->hdev, data, count);
         if (ret < 0) {
                 BT_ERR("Frame Reassembly Failed");
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index ed0fade46aed..bc68a440d432 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -260,12 +260,12 @@ static int hci_uart_send_frame(struct sk_buff *skb)
 
 /* ------ LDISC part ------ */
 /* hci_uart_tty_open
- * 
+ *
  *     Called when line discipline changed to HCI_UART.
  *
  * Arguments:
  *     tty    pointer to tty info structure
- * Return Value:    
+ * Return Value:
  *     0 if success, otherwise error code
  */
 static int hci_uart_tty_open(struct tty_struct *tty)
@@ -365,15 +365,15 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
 }
 
 /* hci_uart_tty_receive()
- * 
+ *
  *     Called by tty low level driver when receive data is
  *     available.
- *     
+ *
  * Arguments:  tty          pointer to tty isntance data
  *             data         pointer to received data
  *             flags        pointer to flags for data
  *             count        count of received data in bytes
- *     
+ *
  * Return Value:    None
  */
 static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
@@ -388,7 +388,10 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *f
 
         spin_lock(&hu->rx_lock);
         hu->proto->recv(hu, (void *) data, count);
-        hu->hdev->stat.byte_rx += count;
+
+        if (hu->hdev)
+                hu->hdev->stat.byte_rx += count;
+
         spin_unlock(&hu->rx_lock);
 
         tty_unthrottle(tty);
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 1110478dd0fd..08ae128cce9b 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -232,6 +232,31 @@ void proc_comm_connector(struct task_struct *task)
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
+void proc_coredump_connector(struct task_struct *task)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+        struct timespec ts;
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg *)buffer;
+        ev = (struct proc_event *)msg->data;
+        get_seq(&msg->seq, &ev->cpu);
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+        ev->what = PROC_EVENT_COREDUMP;
+        ev->event_data.coredump.process_pid = task->pid;
+        ev->event_data.coredump.process_tgid = task->tgid;
+
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = 0; /* not used */
+        msg->len = sizeof(*ev);
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
 void proc_exit_connector(struct task_struct *task)
 {
         struct cn_msg *msg;
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index f1b7e244bfc1..6ecfa758942c 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/list.h>
 #include <linux/skbuff.h>
-#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <linux/moduleparam.h>
 #include <linux/connector.h>
 #include <linux/slab.h>
@@ -95,13 +95,13 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
         if (!netlink_has_listeners(dev->nls, group))
                 return -ESRCH;
 
-        size = NLMSG_SPACE(sizeof(*msg) + msg->len);
+        size = sizeof(*msg) + msg->len;
 
-        skb = alloc_skb(size, gfp_mask);
+        skb = nlmsg_new(size, gfp_mask);
         if (!skb)
                 return -ENOMEM;
 
-        nlh = nlmsg_put(skb, 0, msg->seq, NLMSG_DONE, size - sizeof(*nlh), 0);
+        nlh = nlmsg_put(skb, 0, msg->seq, NLMSG_DONE, size, 0);
         if (!nlh) {
                 kfree_skb(skb);
                 return -EMSGSIZE;
@@ -124,7 +124,7 @@ static int cn_call_callback(struct sk_buff *skb)
 {
         struct cn_callback_entry *i, *cbq = NULL;
         struct cn_dev *dev = &cdev;
-        struct cn_msg *msg = NLMSG_DATA(nlmsg_hdr(skb));
+        struct cn_msg *msg = nlmsg_data(nlmsg_hdr(skb));
         struct netlink_skb_parms *nsp = &NETLINK_CB(skb);
         int err = -ENODEV;
 
@@ -162,7 +162,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
 
         skb = skb_get(__skb);
 
-        if (skb->len >= NLMSG_SPACE(0)) {
+        if (skb->len >= NLMSG_HDRLEN) {
                 nlh = nlmsg_hdr(skb);
 
                 if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
diff --git a/drivers/dma/ioat/dca.c b/drivers/dma/ioat/dca.c
index 9b041858d10d..9e84d5bc9307 100644
--- a/drivers/dma/ioat/dca.c
+++ b/drivers/dma/ioat/dca.c
@@ -470,8 +470,10 @@ struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)
         }
 
         if (!dca2_tag_map_valid(ioatdca->tag_map)) {
-                dev_err(&pdev->dev, "APICID_TAG_MAP set incorrectly by BIOS, "
-                        "disabling DCA\n");
+                WARN_TAINT_ONCE(1, TAINT_FIRMWARE_WORKAROUND,
+                                "%s %s: APICID_TAG_MAP set incorrectly by BIOS, disabling DCA\n",
+                                dev_driver_string(&pdev->dev),
+                                dev_name(&pdev->dev));
                 free_dca_provider(dca);
                 return NULL;
         }
@@ -689,7 +691,10 @@ struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)
         }
 
         if (dca3_tag_map_invalid(ioatdca->tag_map)) {
-                dev_err(&pdev->dev, "APICID_TAG_MAP set incorrectly by BIOS, disabling DCA\n");
+                WARN_TAINT_ONCE(1, TAINT_FIRMWARE_WORKAROUND,
+                                "%s %s: APICID_TAG_MAP set incorrectly by BIOS, disabling DCA\n",
+                                dev_driver_string(&pdev->dev),
+                                dev_name(&pdev->dev));
                 free_dca_provider(dca);
                 return NULL;
         }
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 7224533e8ca6..7a701a58bbf0 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -47,9 +47,9 @@ config FIREWIRE_NET
         tristate "IP networking over 1394"
         depends on FIREWIRE && INET
         help
-          This enables IPv4 over IEEE 1394, providing IP connectivity with
-          other implementations of RFC 2734 as found on several operating
-          systems.  Multicast support is currently limited.
+          This enables IPv4/IPv6 over IEEE 1394, providing IP connectivity
+          with other implementations of RFC 2734/3146 as found on several
+          operating systems.  Multicast support is currently limited.
 
           To compile this driver as a module, say M here:  The module will be
           called firewire-net.
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 2b27bff2591a..4d565365e476 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1,5 +1,6 @@
 /*
  * IPv4 over IEEE 1394, per RFC 2734
+ * IPv6 over IEEE 1394, per RFC 3146
  *
  * Copyright (C) 2009 Jay Fenlason <fenlason@redhat.com>
  *
@@ -28,6 +29,7 @@
 
 #include <asm/unaligned.h>
 #include <net/arp.h>
+#include <net/firewire.h>
 
 /* rx limits */
 #define FWNET_MAX_FRAGMENTS             30 /* arbitrary, > TX queue depth */
@@ -45,6 +47,7 @@
 
 #define IANA_SPECIFIER_ID               0x00005eU
 #define RFC2734_SW_VERSION              0x000001U
+#define RFC3146_SW_VERSION              0x000002U
 
 #define IEEE1394_GASP_HDR_SIZE  8
 
@@ -57,32 +60,10 @@
 #define RFC2374_HDR_LASTFRAG    2       /* last fragment        */
 #define RFC2374_HDR_INTFRAG     3       /* interior fragment    */
 
-#define RFC2734_HW_ADDR_LEN     16
-
-struct rfc2734_arp {
-        __be16 hw_type;         /* 0x0018       */
-        __be16 proto_type;      /* 0x0806       */
-        u8 hw_addr_len;         /* 16           */
-        u8 ip_addr_len;         /* 4            */
-        __be16 opcode;          /* ARP Opcode   */
-        /* Above is exactly the same format as struct arphdr */
-
-        __be64 s_uniq_id;       /* Sender's 64bit EUI                   */
-        u8 max_rec;             /* Sender's max packet size             */
-        u8 sspd;                /* Sender's max speed                   */
-        __be16 fifo_hi;         /* hi 16bits of sender's FIFO addr      */
-        __be32 fifo_lo;         /* lo 32bits of sender's FIFO addr      */
-        __be32 sip;             /* Sender's IP Address                  */
-        __be32 tip;             /* IP Address of requested hw addr      */
-} __packed;
-
-/* This header format is specific to this driver implementation. */
-#define FWNET_ALEN      8
-#define FWNET_HLEN      10
-struct fwnet_header {
-        u8 h_dest[FWNET_ALEN];  /* destination address */
-        __be16 h_proto;         /* packet type ID field */
-} __packed;
+static bool fwnet_hwaddr_is_multicast(u8 *ha)
+{
+        return !!(*ha & 1);
+}
 
 /* IPv4 and IPv6 encapsulation header */
 struct rfc2734_header {
@@ -191,8 +172,6 @@ struct fwnet_peer {
         struct list_head peer_link;
         struct fwnet_device *dev;
         u64 guid;
-        u64 fifo;
-        __be32 ip;
 
         /* guarded by dev->lock */
         struct list_head pd_list; /* received partial datagrams */
@@ -222,6 +201,15 @@ struct fwnet_packet_task {
 };
 
 /*
+ * Get fifo address embedded in hwaddr
+ */
+static __u64 fwnet_hwaddr_fifo(union fwnet_hwaddr *ha)
+{
+        return (u64)get_unaligned_be16(&ha->uc.fifo_hi) << 32
+               | get_unaligned_be32(&ha->uc.fifo_lo);
+}
+
+/*
  * saddr == NULL means use device source address.
  * daddr == NULL means leave destination address (eg unresolved arp).
  */
@@ -513,10 +501,20 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                                         bool is_broadcast, u16 ether_type)
 {
         struct fwnet_device *dev;
-        static const __be64 broadcast_hw = cpu_to_be64(~0ULL);
         int status;
         __be64 guid;
 
+        switch (ether_type) {
+        case ETH_P_ARP:
+        case ETH_P_IP:
+#if IS_ENABLED(CONFIG_IPV6)
+        case ETH_P_IPV6:
+#endif
+                break;
+        default:
+                goto err;
+        }
+
         dev = netdev_priv(net);
         /* Write metadata, and then pass to the receive level */
         skb->dev = net;
@@ -524,92 +522,11 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
 
         /*
          * Parse the encapsulation header. This actually does the job of
-         * converting to an ethernet frame header, as well as arp
-         * conversion if needed. ARP conversion is easier in this
-         * direction, since we are using ethernet as our backend.
+         * converting to an ethernet-like pseudo frame header.
          */
-        /*
-         * If this is an ARP packet, convert it. First, we want to make
-         * use of some of the fields, since they tell us a little bit
-         * about the sending machine.
-         */
-        if (ether_type == ETH_P_ARP) {
-                struct rfc2734_arp *arp1394;
-                struct arphdr *arp;
-                unsigned char *arp_ptr;
-                u64 fifo_addr;
-                u64 peer_guid;
-                unsigned sspd;
-                u16 max_payload;
-                struct fwnet_peer *peer;
-                unsigned long flags;
-
-                arp1394   = (struct rfc2734_arp *)skb->data;
-                arp       = (struct arphdr *)skb->data;
-                arp_ptr   = (unsigned char *)(arp + 1);
-                peer_guid = get_unaligned_be64(&arp1394->s_uniq_id);
-                fifo_addr = (u64)get_unaligned_be16(&arp1394->fifo_hi) << 32
-                                | get_unaligned_be32(&arp1394->fifo_lo);
-
-                sspd = arp1394->sspd;
-                /* Sanity check.  OS X 10.3 PPC reportedly sends 131. */
-                if (sspd > SCODE_3200) {
-                        dev_notice(&net->dev, "sspd %x out of range\n", sspd);
-                        sspd = SCODE_3200;
-                }
-                max_payload = fwnet_max_payload(arp1394->max_rec, sspd);
-
-                spin_lock_irqsave(&dev->lock, flags);
-                peer = fwnet_peer_find_by_guid(dev, peer_guid);
-                if (peer) {
-                        peer->fifo = fifo_addr;
-
-                        if (peer->speed > sspd)
-                                peer->speed = sspd;
-                        if (peer->max_payload > max_payload)
-                                peer->max_payload = max_payload;
-
-                        peer->ip = arp1394->sip;
-                }
-                spin_unlock_irqrestore(&dev->lock, flags);
-
-                if (!peer) {
-                        dev_notice(&net->dev,
-                                   "no peer for ARP packet from %016llx\n",
-                                   (unsigned long long)peer_guid);
-                        goto no_peer;
-                }
-
-                /*
-                 * Now that we're done with the 1394 specific stuff, we'll
-                 * need to alter some of the data.  Believe it or not, all
-                 * that needs to be done is sender_IP_address needs to be
-                 * moved, the destination hardware address get stuffed
-                 * in and the hardware address length set to 8.
-                 *
-                 * IMPORTANT: The code below overwrites 1394 specific data
-                 * needed above so keep the munging of the data for the
-                 * higher level IP stack last.
-                 */
-
-                arp->ar_hln = 8;
-                /* skip over sender unique id */
-                arp_ptr += arp->ar_hln;
-                /* move sender IP addr */
-                put_unaligned(arp1394->sip, (u32 *)arp_ptr);
-                /* skip over sender IP addr */
-                arp_ptr += arp->ar_pln;
-
-                if (arp->ar_op == htons(ARPOP_REQUEST))
-                        memset(arp_ptr, 0, sizeof(u64));
-                else
-                        memcpy(arp_ptr, net->dev_addr, sizeof(u64));
-        }
-
-        /* Now add the ethernet header. */
         guid = cpu_to_be64(dev->card->guid);
         if (dev_hard_header(skb, net, ether_type,
-                           is_broadcast ? &broadcast_hw : &guid,
+                           is_broadcast ? net->broadcast : net->dev_addr,
                            NULL, skb->len) >= 0) {
                 struct fwnet_header *eth;
                 u16 *rawp;
@@ -618,7 +535,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                 skb_reset_mac_header(skb);
                 skb_pull(skb, sizeof(*eth));
                 eth = (struct fwnet_header *)skb_mac_header(skb);
-                if (*eth->h_dest & 1) {
+                if (fwnet_hwaddr_is_multicast(eth->h_dest)) {
                         if (memcmp(eth->h_dest, net->broadcast,
                                    net->addr_len) == 0)
                                 skb->pkt_type = PACKET_BROADCAST;
@@ -630,7 +547,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                         if (memcmp(eth->h_dest, net->dev_addr, net->addr_len))
                                 skb->pkt_type = PACKET_OTHERHOST;
                 }
-                if (ntohs(eth->h_proto) >= 1536) {
+                if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN) {
                         protocol = eth->h_proto;
                 } else {
                         rawp = (u16 *)skb->data;
@@ -652,7 +569,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
 
         return 0;
 
- no_peer:
+ err:
         net->stats.rx_errors++;
         net->stats.rx_dropped++;
 
@@ -856,7 +773,12 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
         ver = be32_to_cpu(buf_ptr[1]) & 0xffffff;
         source_node_id = be32_to_cpu(buf_ptr[0]) >> 16;
 
-        if (specifier_id == IANA_SPECIFIER_ID && ver == RFC2734_SW_VERSION) {
+        if (specifier_id == IANA_SPECIFIER_ID &&
+            (ver == RFC2734_SW_VERSION
+#if IS_ENABLED(CONFIG_IPV6)
+             || ver == RFC3146_SW_VERSION
+#endif
+            )) {
                 buf_ptr += 2;
                 length -= IEEE1394_GASP_HDR_SIZE;
                 fwnet_incoming_packet(dev, buf_ptr, length, source_node_id,
@@ -1059,16 +981,27 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
                 u8 *p;
                 int generation;
                 int node_id;
+                unsigned int sw_version;
 
                 /* ptask->generation may not have been set yet */
                 generation = dev->card->generation;
                 smp_rmb();
                 node_id = dev->card->node_id;
 
+                switch (ptask->skb->protocol) {
+                default:
+                        sw_version = RFC2734_SW_VERSION;
+                        break;
+#if IS_ENABLED(CONFIG_IPV6)
+                case htons(ETH_P_IPV6):
+                        sw_version = RFC3146_SW_VERSION;
+#endif
+                }
+
                 p = skb_push(ptask->skb, IEEE1394_GASP_HDR_SIZE);
                 put_unaligned_be32(node_id << 16 | IANA_SPECIFIER_ID >> 8, p);
                 put_unaligned_be32((IANA_SPECIFIER_ID & 0xff) << 24
-                                                | RFC2734_SW_VERSION, &p[4]);
+                                                | sw_version, &p[4]);
 
                 /* We should not transmit if broadcast_channel.valid == 0. */
                 fw_send_request(dev->card, &ptask->transaction,
@@ -1116,6 +1049,62 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
         return 0;
 }
 
+static void fwnet_fifo_stop(struct fwnet_device *dev)
+{
+        if (dev->local_fifo == FWNET_NO_FIFO_ADDR)
+                return;
+
+        fw_core_remove_address_handler(&dev->handler);
+        dev->local_fifo = FWNET_NO_FIFO_ADDR;
+}
+
+static int fwnet_fifo_start(struct fwnet_device *dev)
+{
+        int retval;
+
+        if (dev->local_fifo != FWNET_NO_FIFO_ADDR)
+                return 0;
+
+        dev->handler.length = 4096;
+        dev->handler.address_callback = fwnet_receive_packet;
+        dev->handler.callback_data = dev;
+
+        retval = fw_core_add_address_handler(&dev->handler,
+                                             &fw_high_memory_region);
+        if (retval < 0)
+                return retval;
+
+        dev->local_fifo = dev->handler.offset;
+
+        return 0;
+}
+
+static void __fwnet_broadcast_stop(struct fwnet_device *dev)
+{
+        unsigned u;
+
+        if (dev->broadcast_state != FWNET_BROADCAST_ERROR) {
+                for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++)
+                        kunmap(dev->broadcast_rcv_buffer.pages[u]);
+                fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, dev->card);
+        }
+        if (dev->broadcast_rcv_context) {
+                fw_iso_context_destroy(dev->broadcast_rcv_context);
+                dev->broadcast_rcv_context = NULL;
+        }
+        kfree(dev->broadcast_rcv_buffer_ptrs);
+        dev->broadcast_rcv_buffer_ptrs = NULL;
+        dev->broadcast_state = FWNET_BROADCAST_ERROR;
+}
+
+static void fwnet_broadcast_stop(struct fwnet_device *dev)
+{
+        if (dev->broadcast_state == FWNET_BROADCAST_ERROR)
+                return;
+        fw_iso_context_stop(dev->broadcast_rcv_context);
+        __fwnet_broadcast_stop(dev);
+}
+
 static int fwnet_broadcast_start(struct fwnet_device *dev)
 {
         struct fw_iso_context *context;
@@ -1124,60 +1113,47 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
         unsigned max_receive;
         struct fw_iso_packet packet;
         unsigned long offset;
+        void **ptrptr;
         unsigned u;
 
-        if (dev->local_fifo == FWNET_NO_FIFO_ADDR) {
-                dev->handler.length = 4096;
-                dev->handler.address_callback = fwnet_receive_packet;
-                dev->handler.callback_data = dev;
-
-                retval = fw_core_add_address_handler(&dev->handler,
-                                        &fw_high_memory_region);
-                if (retval < 0)
-                        goto failed_initial;
-
-                dev->local_fifo = dev->handler.offset;
-        }
+        if (dev->broadcast_state != FWNET_BROADCAST_ERROR)
+                return 0;
 
         max_receive = 1U << (dev->card->max_receive + 1);
         num_packets = (FWNET_ISO_PAGE_COUNT * PAGE_SIZE) / max_receive;
 
-        if (!dev->broadcast_rcv_context) {
-                void **ptrptr;
-
-                context = fw_iso_context_create(dev->card,
-                    FW_ISO_CONTEXT_RECEIVE, IEEE1394_BROADCAST_CHANNEL,
-                    dev->card->link_speed, 8, fwnet_receive_broadcast, dev);
-                if (IS_ERR(context)) {
-                        retval = PTR_ERR(context);
-                        goto failed_context_create;
-                }
+        ptrptr = kmalloc(sizeof(void *) * num_packets, GFP_KERNEL);
+        if (!ptrptr) {
+                retval = -ENOMEM;
+                goto failed;
+        }
+        dev->broadcast_rcv_buffer_ptrs = ptrptr;
+
+        context = fw_iso_context_create(dev->card, FW_ISO_CONTEXT_RECEIVE,
+                                        IEEE1394_BROADCAST_CHANNEL,
+                                        dev->card->link_speed, 8,
+                                        fwnet_receive_broadcast, dev);
+        if (IS_ERR(context)) {
+                retval = PTR_ERR(context);
+                goto failed;
+        }
 
-                retval = fw_iso_buffer_init(&dev->broadcast_rcv_buffer,
-                    dev->card, FWNET_ISO_PAGE_COUNT, DMA_FROM_DEVICE);
-                if (retval < 0)
-                        goto failed_buffer_init;
+        retval = fw_iso_buffer_init(&dev->broadcast_rcv_buffer, dev->card,
+                                    FWNET_ISO_PAGE_COUNT, DMA_FROM_DEVICE);
+        if (retval < 0)
+                goto failed;
 
-                ptrptr = kmalloc(sizeof(void *) * num_packets, GFP_KERNEL);
-                if (!ptrptr) {
-                        retval = -ENOMEM;
-                        goto failed_ptrs_alloc;
-                }
+        dev->broadcast_state = FWNET_BROADCAST_STOPPED;
 
-                dev->broadcast_rcv_buffer_ptrs = ptrptr;
-                for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++) {
-                        void *ptr;
-                        unsigned v;
+        for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++) {
+                void *ptr;
+                unsigned v;
 
-                        ptr = kmap(dev->broadcast_rcv_buffer.pages[u]);
-                        for (v = 0; v < num_packets / FWNET_ISO_PAGE_COUNT; v++)
-                                *ptrptr++ = (void *)
-                                                ((char *)ptr + v * max_receive);
-                }
-                dev->broadcast_rcv_context = context;
-        } else {
-                context = dev->broadcast_rcv_context;
+                ptr = kmap(dev->broadcast_rcv_buffer.pages[u]);
+                for (v = 0; v < num_packets / FWNET_ISO_PAGE_COUNT; v++)
+                        *ptrptr++ = (void *) ((char *)ptr + v * max_receive);
         }
+        dev->broadcast_rcv_context = context;
 
         packet.payload_length = max_receive;
         packet.interrupt = 1;
@@ -1191,7 +1167,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
                 retval = fw_iso_context_queue(context, &packet,
                                 &dev->broadcast_rcv_buffer, offset);
                 if (retval < 0)
-                        goto failed_rcv_queue;
+                        goto failed;
 
                 offset += max_receive;
         }
@@ -1201,7 +1177,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
         retval = fw_iso_context_start(context, -1, 0,
                         FW_ISO_CONTEXT_MATCH_ALL_TAGS); /* ??? sync */
         if (retval < 0)
-                goto failed_rcv_queue;
+                goto failed;
 
         /* FIXME: adjust it according to the min. speed of all known peers? */
         dev->broadcast_xmt_max_payload = IEEE1394_MAX_PAYLOAD_S100
@@ -1210,19 +1186,8 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 
         return 0;
 
- failed_rcv_queue:
-        kfree(dev->broadcast_rcv_buffer_ptrs);
-        dev->broadcast_rcv_buffer_ptrs = NULL;
- failed_ptrs_alloc:
-        fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, dev->card);
- failed_buffer_init:
-        fw_iso_context_destroy(context);
-        dev->broadcast_rcv_context = NULL;
- failed_context_create:
-        fw_core_remove_address_handler(&dev->handler);
- failed_initial:
-        dev->local_fifo = FWNET_NO_FIFO_ADDR;
-
+ failed:
+        __fwnet_broadcast_stop(dev);
         return retval;
 }
 
@@ -1240,11 +1205,10 @@ static int fwnet_open(struct net_device *net)
         struct fwnet_device *dev = netdev_priv(net);
         int ret;
 
-        if (dev->broadcast_state == FWNET_BROADCAST_ERROR) {
-                ret = fwnet_broadcast_start(dev);
-                if (ret)
-                        return ret;
-        }
+        ret = fwnet_broadcast_start(dev);
+        if (ret)
+                return ret;
+
         netif_start_queue(net);
 
         spin_lock_irq(&dev->lock);
@@ -1257,9 +1221,10 @@ static int fwnet_open(struct net_device *net)
 /* ifdown */
 static int fwnet_stop(struct net_device *net)
 {
-        netif_stop_queue(net);
+        struct fwnet_device *dev = netdev_priv(net);
 
-        /* Deallocate iso context for use by other applications? */
+        netif_stop_queue(net);
+        fwnet_broadcast_stop(dev);
 
         return 0;
 }
@@ -1299,19 +1264,27 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
          * We might need to rebuild the header on tx failure.
          */
         memcpy(&hdr_buf, skb->data, sizeof(hdr_buf));
-        skb_pull(skb, sizeof(hdr_buf));
-
         proto = hdr_buf.h_proto;
+
+        switch (proto) {
+        case htons(ETH_P_ARP):
+        case htons(ETH_P_IP):
+#if IS_ENABLED(CONFIG_IPV6)
+        case htons(ETH_P_IPV6):
+#endif
+                break;
+        default:
+                goto fail;
+        }
+
+        skb_pull(skb, sizeof(hdr_buf));
         dg_size = skb->len;
 
         /*
          * Set the transmission type for the packet.  ARP packets and IP
          * broadcast packets are sent via GASP.
          */
-        if (memcmp(hdr_buf.h_dest, net->broadcast, FWNET_ALEN) == 0
-            || proto == htons(ETH_P_ARP)
-            || (proto == htons(ETH_P_IP)
-                && IN_MULTICAST(ntohl(ip_hdr(skb)->daddr)))) {
+        if (fwnet_hwaddr_is_multicast(hdr_buf.h_dest)) {
                 max_payload        = dev->broadcast_xmt_max_payload;
                 datagram_label_ptr = &dev->broadcast_xmt_datagramlabel;
 
@@ -1320,11 +1293,12 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
                 ptask->dest_node   = IEEE1394_ALL_NODES;
                 ptask->speed       = SCODE_100;
         } else {
-                __be64 guid = get_unaligned((__be64 *)hdr_buf.h_dest);
+                union fwnet_hwaddr *ha = (union fwnet_hwaddr *)hdr_buf.h_dest;
+                __be64 guid = get_unaligned(&ha->uc.uniq_id);
                 u8 generation;
 
                 peer = fwnet_peer_find_by_guid(dev, be64_to_cpu(guid));
-                if (!peer || peer->fifo == FWNET_NO_FIFO_ADDR)
+                if (!peer)
                         goto fail;
 
                 generation         = peer->generation;
@@ -1332,32 +1306,12 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
                 max_payload        = peer->max_payload;
                 datagram_label_ptr = &peer->datagram_label;
 
-                ptask->fifo_addr   = peer->fifo;
+                ptask->fifo_addr   = fwnet_hwaddr_fifo(ha);
                 ptask->generation  = generation;
                 ptask->dest_node   = dest_node;
                 ptask->speed       = peer->speed;
         }
 
-        /* If this is an ARP packet, convert it */
-        if (proto == htons(ETH_P_ARP)) {
-                struct arphdr *arp = (struct arphdr *)skb->data;
-                unsigned char *arp_ptr = (unsigned char *)(arp + 1);
-                struct rfc2734_arp *arp1394 = (struct rfc2734_arp *)skb->data;
-                __be32 ipaddr;
-
-                ipaddr = get_unaligned((__be32 *)(arp_ptr + FWNET_ALEN));
-
-                arp1394->hw_addr_len    = RFC2734_HW_ADDR_LEN;
-                arp1394->max_rec        = dev->card->max_receive;
-                arp1394->sspd           = dev->card->link_speed;
-
-                put_unaligned_be16(dev->local_fifo >> 32,
-                                   &arp1394->fifo_hi);
-                put_unaligned_be32(dev->local_fifo & 0xffffffff,
-                                   &arp1394->fifo_lo);
-                put_unaligned(ipaddr, &arp1394->sip);
-        }
-
         ptask->hdr.w0 = 0;
         ptask->hdr.w1 = 0;
         ptask->skb = skb;
@@ -1472,8 +1426,6 @@ static int fwnet_add_peer(struct fwnet_device *dev,
 
         peer->dev = dev;
         peer->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
-        peer->fifo = FWNET_NO_FIFO_ADDR;
-        peer->ip = 0;
         INIT_LIST_HEAD(&peer->pd_list);
         peer->pdg_size = 0;
         peer->datagram_label = 0;
@@ -1503,6 +1455,7 @@ static int fwnet_probe(struct device *_dev)
         struct fwnet_device *dev;
         unsigned max_mtu;
         int ret;
+        union fwnet_hwaddr *ha;
 
         mutex_lock(&fwnet_device_mutex);
 
@@ -1533,6 +1486,11 @@ static int fwnet_probe(struct device *_dev)
         dev->card = card;
         dev->netdev = net;
 
+        ret = fwnet_fifo_start(dev);
+        if (ret < 0)
+                goto out;
+        dev->local_fifo = dev->handler.offset;
+
         /*
          * Use the RFC 2734 default 1500 octets or the maximum payload
          * as initial MTU
@@ -1542,24 +1500,31 @@ static int fwnet_probe(struct device *_dev)
         net->mtu = min(1500U, max_mtu);
 
         /* Set our hardware address while we're at it */
-        put_unaligned_be64(card->guid, net->dev_addr);
-        put_unaligned_be64(~0ULL, net->broadcast);
+        ha = (union fwnet_hwaddr *)net->dev_addr;
+        put_unaligned_be64(card->guid, &ha->uc.uniq_id);
+        ha->uc.max_rec = dev->card->max_receive;
+        ha->uc.sspd = dev->card->link_speed;
+        put_unaligned_be16(dev->local_fifo >> 32, &ha->uc.fifo_hi);
+        put_unaligned_be32(dev->local_fifo & 0xffffffff, &ha->uc.fifo_lo);
+
+        memset(net->broadcast, -1, net->addr_len);
+
         ret = register_netdev(net);
         if (ret)
                 goto out;
 
         list_add_tail(&dev->dev_link, &fwnet_device_list);
-        dev_notice(&net->dev, "IPv4 over IEEE 1394 on card %s\n",
+        dev_notice(&net->dev, "IP over IEEE 1394 on card %s\n",
                    dev_name(card->device));
  have_dev:
         ret = fwnet_add_peer(dev, unit, device);
         if (ret && allocated_netdev) {
                 unregister_netdev(net);
                 list_del(&dev->dev_link);
-        }
  out:
-        if (ret && allocated_netdev)
+                fwnet_fifo_stop(dev);
                 free_netdev(net);
+        }
 
         mutex_unlock(&fwnet_device_mutex);
 
@@ -1592,22 +1557,14 @@ static int fwnet_remove(struct device *_dev)
         mutex_lock(&fwnet_device_mutex);
 
         net = dev->netdev;
-        if (net && peer->ip)
-                arp_invalidate(net, peer->ip);
 
         fwnet_remove_peer(peer, dev);
 
         if (list_empty(&dev->peer_list)) {
                 unregister_netdev(net);
 
-                if (dev->local_fifo != FWNET_NO_FIFO_ADDR)
-                        fw_core_remove_address_handler(&dev->handler);
-                if (dev->broadcast_rcv_context) {
-                        fw_iso_context_stop(dev->broadcast_rcv_context);
-                        fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer,
-                                              dev->card);
-                        fw_iso_context_destroy(dev->broadcast_rcv_context);
-                }
+                fwnet_fifo_stop(dev);
+
                 for (i = 0; dev->queued_datagrams && i < 5; i++)
                         ssleep(1);
                 WARN_ON(dev->queued_datagrams);
@@ -1646,6 +1603,14 @@ static const struct ieee1394_device_id fwnet_id_table[] = {
                 .specifier_id = IANA_SPECIFIER_ID,
                 .version      = RFC2734_SW_VERSION,
         },
+#if IS_ENABLED(CONFIG_IPV6)
+        {
+                .match_flags  = IEEE1394_MATCH_SPECIFIER_ID |
+                                IEEE1394_MATCH_VERSION,
+                .specifier_id = IANA_SPECIFIER_ID,
+                .version      = RFC3146_SW_VERSION,
+        },
+#endif
         { }
 };
 
@@ -1683,6 +1648,30 @@ static struct fw_descriptor rfc2374_unit_directory = {
         .data   = rfc2374_unit_directory_data
 };
 
+#if IS_ENABLED(CONFIG_IPV6)
+static const u32 rfc3146_unit_directory_data[] = {
+        0x00040000,     /* directory_length             */
+        0x1200005e,     /* unit_specifier_id: IANA      */
+        0x81000003,     /* textual descriptor offset    */
+        0x13000002,     /* unit_sw_version: RFC 3146    */
+        0x81000005,     /* textual descriptor offset    */
+        0x00030000,     /* descriptor_length            */
+        0x00000000,     /* text                         */
+        0x00000000,     /* minimal ASCII, en            */
+        0x49414e41,     /* I A N A                      */
+        0x00030000,     /* descriptor_length            */
+        0x00000000,     /* text                         */
+        0x00000000,     /* minimal ASCII, en            */
+        0x49507636,     /* I P v 6                      */
+};
+
+static struct fw_descriptor rfc3146_unit_directory = {
+        .length = ARRAY_SIZE(rfc3146_unit_directory_data),
+        .key    = (CSR_DIRECTORY | CSR_UNIT) << 24,
+        .data   = rfc3146_unit_directory_data
+};
+#endif
+
 static int __init fwnet_init(void)
 {
         int err;
@@ -1691,11 +1680,17 @@ static int __init fwnet_init(void)
         if (err)
                 return err;
 
+#if IS_ENABLED(CONFIG_IPV6)
+        err = fw_core_add_descriptor(&rfc3146_unit_directory);
+        if (err)
+                goto out;
+#endif
+
         fwnet_packet_task_cache = kmem_cache_create("packet_task",
                         sizeof(struct fwnet_packet_task), 0, 0, NULL);
         if (!fwnet_packet_task_cache) {
                 err = -ENOMEM;
-                goto out;
+                goto out2;
         }
 
         err = driver_register(&fwnet_driver.driver);
@@ -1703,7 +1698,11 @@ static int __init fwnet_init(void)
                 return 0;
 
         kmem_cache_destroy(fwnet_packet_task_cache);
+out2:
+#if IS_ENABLED(CONFIG_IPV6)
+        fw_core_remove_descriptor(&rfc3146_unit_directory);
 out:
+#endif
         fw_core_remove_descriptor(&rfc2374_unit_directory);
 
         return err;
@@ -1714,11 +1713,14 @@ static void __exit fwnet_cleanup(void)
 {
         driver_unregister(&fwnet_driver.driver);
         kmem_cache_destroy(fwnet_packet_task_cache);
+#if IS_ENABLED(CONFIG_IPV6)
+        fw_core_remove_descriptor(&rfc3146_unit_directory);
+#endif
         fw_core_remove_descriptor(&rfc2374_unit_directory);
 }
 module_exit(fwnet_cleanup);
 
 MODULE_AUTHOR("Jay Fenlason <fenlason@redhat.com>");
-MODULE_DESCRIPTION("IPv4 over IEEE1394 as per RFC 2734");
+MODULE_DESCRIPTION("IP over IEEE1394 as per RFC 2734/3146");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(ieee1394, fwnet_id_table);
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index a3fde52840ca..65c30ea8c1a1 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -511,12 +511,16 @@ static unsigned int select_ntuple(struct c4iw_dev *dev, struct dst_entry *dst,
 static int send_connect(struct c4iw_ep *ep)
 {
         struct cpl_act_open_req *req;
+        struct cpl_t5_act_open_req *t5_req;
         struct sk_buff *skb;
         u64 opt0;
         u32 opt2;
         unsigned int mtu_idx;
         int wscale;
-        int wrlen = roundup(sizeof *req, 16);
+        int size = is_t4(ep->com.dev->rdev.lldi.adapter_type) ?
+                sizeof(struct cpl_act_open_req) :
+                sizeof(struct cpl_t5_act_open_req);
+        int wrlen = roundup(size, 16);
 
         PDBG("%s ep %p atid %u\n", __func__, ep, ep->atid);
 
@@ -552,17 +556,36 @@ static int send_connect(struct c4iw_ep *ep)
                 opt2 |= WND_SCALE_EN(1);
         t4_set_arp_err_handler(skb, NULL, act_open_req_arp_failure);
 
-        req = (struct cpl_act_open_req *) skb_put(skb, wrlen);
-        INIT_TP_WR(req, 0);
-        OPCODE_TID(req) = cpu_to_be32(
-                MK_OPCODE_TID(CPL_ACT_OPEN_REQ, ((ep->rss_qid<<14)|ep->atid)));
-        req->local_port = ep->com.local_addr.sin_port;
-        req->peer_port = ep->com.remote_addr.sin_port;
-        req->local_ip = ep->com.local_addr.sin_addr.s_addr;
-        req->peer_ip = ep->com.remote_addr.sin_addr.s_addr;
-        req->opt0 = cpu_to_be64(opt0);
-        req->params = cpu_to_be32(select_ntuple(ep->com.dev, ep->dst, ep->l2t));
-        req->opt2 = cpu_to_be32(opt2);
+        if (is_t4(ep->com.dev->rdev.lldi.adapter_type)) {
+                req = (struct cpl_act_open_req *) skb_put(skb, wrlen);
+                INIT_TP_WR(req, 0);
+                OPCODE_TID(req) = cpu_to_be32(
+                                MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
+                                ((ep->rss_qid << 14) | ep->atid)));
+                req->local_port = ep->com.local_addr.sin_port;
+                req->peer_port = ep->com.remote_addr.sin_port;
+                req->local_ip = ep->com.local_addr.sin_addr.s_addr;
+                req->peer_ip = ep->com.remote_addr.sin_addr.s_addr;
+                req->opt0 = cpu_to_be64(opt0);
+                req->params = cpu_to_be32(select_ntuple(ep->com.dev,
+                                        ep->dst, ep->l2t));
+                req->opt2 = cpu_to_be32(opt2);
+        } else {
+                t5_req = (struct cpl_t5_act_open_req *) skb_put(skb, wrlen);
+                INIT_TP_WR(t5_req, 0);
+                OPCODE_TID(t5_req) = cpu_to_be32(
+                                        MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
+                                        ((ep->rss_qid << 14) | ep->atid)));
+                t5_req->local_port = ep->com.local_addr.sin_port;
+                t5_req->peer_port = ep->com.remote_addr.sin_port;
+                t5_req->local_ip = ep->com.local_addr.sin_addr.s_addr;
+                t5_req->peer_ip = ep->com.remote_addr.sin_addr.s_addr;
+                t5_req->opt0 = cpu_to_be64(opt0);
+                t5_req->params = cpu_to_be64(V_FILTER_TUPLE(
+                                select_ntuple(ep->com.dev, ep->dst, ep->l2t)));
+                t5_req->opt2 = cpu_to_be32(opt2);
+        }
+
         set_bit(ACT_OPEN_REQ, &ep->com.history);
         return c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);
 }
@@ -1676,9 +1699,9 @@ static int act_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb)
         case CPL_ERR_CONN_TIMEDOUT:
                 break;
         case CPL_ERR_TCAM_FULL:
+                dev->rdev.stats.tcam_full++;
                 if (dev->rdev.lldi.enable_fw_ofld_conn) {
                         mutex_lock(&dev->rdev.stats.lock);
-                        dev->rdev.stats.tcam_full++;
                         mutex_unlock(&dev->rdev.stats.lock);
                         send_fw_act_open_req(ep,
                                              GET_TID_TID(GET_AOPEN_ATID(
@@ -2875,12 +2898,14 @@ static int deferred_fw6_msg(struct c4iw_dev *dev, struct sk_buff *skb)
 static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
 {
         u32 l2info;
-        u16 vlantag, len, hdr_len;
+        u16 vlantag, len, hdr_len, eth_hdr_len;
         u8 intf;
         struct cpl_rx_pkt *cpl = cplhdr(skb);
         struct cpl_pass_accept_req *req;
         struct tcp_options_received tmp_opt;
+        struct c4iw_dev *dev;
 
+        dev = *((struct c4iw_dev **) (skb->cb + sizeof(void *)));
         /* Store values from cpl_rx_pkt in temporary location. */
         vlantag = (__force u16) cpl->vlan;
         len = (__force u16) cpl->len;
@@ -2896,7 +2921,7 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
          */
         memset(&tmp_opt, 0, sizeof(tmp_opt));
         tcp_clear_options(&tmp_opt);
-        tcp_parse_options(skb, &tmp_opt, NULL, 0, NULL);
+        tcp_parse_options(skb, &tmp_opt, 0, NULL);
 
         req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req));
         memset(req, 0, sizeof(*req));
@@ -2904,14 +2929,16 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
                          V_SYN_MAC_IDX(G_RX_MACIDX(
                          (__force int) htonl(l2info))) |
                          F_SYN_XACT_MATCH);
+        eth_hdr_len = is_t4(dev->rdev.lldi.adapter_type) ?
+                            G_RX_ETHHDR_LEN((__force int) htonl(l2info)) :
+                            G_RX_T5_ETHHDR_LEN((__force int) htonl(l2info));
         req->hdr_len = cpu_to_be32(V_SYN_RX_CHAN(G_RX_CHAN(
                                         (__force int) htonl(l2info))) |
                                    V_TCP_HDR_LEN(G_RX_TCPHDR_LEN(
                                         (__force int) htons(hdr_len))) |
                                    V_IP_HDR_LEN(G_RX_IPHDR_LEN(
                                         (__force int) htons(hdr_len))) |
-                                   V_ETH_HDR_LEN(G_RX_ETHHDR_LEN(
-                                        (__force int) htonl(l2info))));
+                                   V_ETH_HDR_LEN(G_RX_ETHHDR_LEN(eth_hdr_len)));
         req->vlan = (__force __be16) vlantag;
         req->len = (__force __be16) len;
         req->tos_stid = cpu_to_be32(PASS_OPEN_TID(stid) |
@@ -2999,7 +3026,7 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
         u16 window;
         struct port_info *pi;
         struct net_device *pdev;
-        u16 rss_qid;
+        u16 rss_qid, eth_hdr_len;
         int step;
         u32 tx_chan;
         struct neighbour *neigh;
@@ -3028,7 +3055,10 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
                 goto reject;
         }
 
-        if (G_RX_ETHHDR_LEN(ntohl(cpl->l2info)) == ETH_HLEN) {
+        eth_hdr_len = is_t4(dev->rdev.lldi.adapter_type) ?
+                            G_RX_ETHHDR_LEN(htonl(cpl->l2info)) :
+                            G_RX_T5_ETHHDR_LEN(htonl(cpl->l2info));
+        if (eth_hdr_len == ETH_HLEN) {
                 eh = (struct ethhdr *)(req + 1);
                 iph = (struct iphdr *)(eh + 1);
         } else {
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 80069ad595c1..ae656016e1ae 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -41,10 +41,20 @@
 #define DRV_VERSION "0.1"
 
 MODULE_AUTHOR("Steve Wise");
-MODULE_DESCRIPTION("Chelsio T4 RDMA Driver");
+MODULE_DESCRIPTION("Chelsio T4/T5 RDMA Driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static int allow_db_fc_on_t5;
+module_param(allow_db_fc_on_t5, int, 0644);
+MODULE_PARM_DESC(allow_db_fc_on_t5,
+                 "Allow DB Flow Control on T5 (default = 0)");
+
+static int allow_db_coalescing_on_t5;
+module_param(allow_db_coalescing_on_t5, int, 0644);
+MODULE_PARM_DESC(allow_db_coalescing_on_t5,
+                 "Allow DB Coalescing on T5 (default = 0)");
+
 struct uld_ctx {
         struct list_head entry;
         struct cxgb4_lld_info lldi;
@@ -614,7 +624,7 @@ static int rdma_supported(const struct cxgb4_lld_info *infop)
 {
         return infop->vr->stag.size > 0 && infop->vr->pbl.size > 0 &&
                infop->vr->rq.size > 0 && infop->vr->qp.size > 0 &&
-               infop->vr->cq.size > 0 && infop->vr->ocq.size > 0;
+               infop->vr->cq.size > 0;
 }
 
 static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
@@ -627,6 +637,22 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
                        pci_name(infop->pdev));
                 return ERR_PTR(-ENOSYS);
         }
+        if (!ocqp_supported(infop))
+                pr_info("%s: On-Chip Queues not supported on this device.\n",
+                        pci_name(infop->pdev));
+
+        if (!is_t4(infop->adapter_type)) {
+                if (!allow_db_fc_on_t5) {
+                        db_fc_threshold = 100000;
+                        pr_info("DB Flow Control Disabled.\n");
+                }
+
+                if (!allow_db_coalescing_on_t5) {
+                        db_coalescing_threshold = -1;
+                        pr_info("DB Coalescing Disabled.\n");
+                }
+        }
+
         devp = (struct c4iw_dev *)ib_alloc_device(sizeof(*devp));
         if (!devp) {
                 printk(KERN_ERR MOD "Cannot allocate ib device\n");
@@ -678,8 +704,8 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop)
         int i;
 
         if (!vers_printed++)
-                printk(KERN_INFO MOD "Chelsio T4 RDMA Driver - version %s\n",
-                       DRV_VERSION);
+                pr_info("Chelsio T4/T5 RDMA Driver - version %s\n",
+                        DRV_VERSION);
 
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx) {
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 7eec5e13fa8c..485183ad34cd 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -162,7 +162,7 @@ static inline int c4iw_num_stags(struct c4iw_rdev *rdev)
         return min((int)T4_MAX_NUM_STAG, (int)(rdev->lldi.vr->stag.size >> 5));
 }
 
-#define C4IW_WR_TO (10*HZ)
+#define C4IW_WR_TO (30*HZ)
 
 struct c4iw_wr_wait {
         struct completion completion;
@@ -369,7 +369,6 @@ struct c4iw_fr_page_list {
         DEFINE_DMA_UNMAP_ADDR(mapping);
         dma_addr_t dma_addr;
         struct c4iw_dev *dev;
-        int size;
 };
 
 static inline struct c4iw_fr_page_list *to_c4iw_fr_page_list(
@@ -817,6 +816,15 @@ static inline int compute_wscale(int win)
         return wscale;
 }
 
+static inline int ocqp_supported(const struct cxgb4_lld_info *infop)
+{
+#if defined(__i386__) || defined(__x86_64__) || defined(CONFIG_PPC64)
+        return infop->vr->ocq.size > 0;
+#else
+        return 0;
+#endif
+}
+
 u32 c4iw_id_alloc(struct c4iw_id_table *alloc);
 void c4iw_id_free(struct c4iw_id_table *alloc, u32 obj);
 int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
@@ -930,6 +938,8 @@ extern struct cxgb4_client t4c_client;
 extern c4iw_handler_func c4iw_handlers[NUM_CPL_CMDS];
 extern int c4iw_max_read_depth;
 extern int db_fc_threshold;
+extern int db_coalescing_threshold;
+extern int use_dsgl;
 
 
 #endif
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 903a92d6f91d..4cb8eb24497c 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -30,16 +30,76 @@
  * SOFTWARE.
  */
 
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <rdma/ib_umem.h>
 #include <linux/atomic.h>
 
 #include "iw_cxgb4.h"
 
+int use_dsgl = 1;
+module_param(use_dsgl, int, 0644);
+MODULE_PARM_DESC(use_dsgl, "Use DSGL for PBL/FastReg (default=1)");
+
 #define T4_ULPTX_MIN_IO 32
 #define C4IW_MAX_INLINE_SIZE 96
+#define T4_ULPTX_MAX_DMA 1024
+#define C4IW_INLINE_THRESHOLD 128
 
-static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
-                             void *data)
+static int inline_threshold = C4IW_INLINE_THRESHOLD;
+module_param(inline_threshold, int, 0644);
+MODULE_PARM_DESC(inline_threshold, "inline vs dsgl threshold (default=128)");
+
+static int _c4iw_write_mem_dma_aligned(struct c4iw_rdev *rdev, u32 addr,
+                                       u32 len, dma_addr_t data, int wait)
+{
+        struct sk_buff *skb;
+        struct ulp_mem_io *req;
+        struct ulptx_sgl *sgl;
+        u8 wr_len;
+        int ret = 0;
+        struct c4iw_wr_wait wr_wait;
+
+        addr &= 0x7FFFFFF;
+
+        if (wait)
+                c4iw_init_wr_wait(&wr_wait);
+        wr_len = roundup(sizeof(*req) + sizeof(*sgl), 16);
+
+        skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
+        if (!skb)
+                return -ENOMEM;
+        set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
+
+        req = (struct ulp_mem_io *)__skb_put(skb, wr_len);
+        memset(req, 0, wr_len);
+        INIT_ULPTX_WR(req, wr_len, 0, 0);
+        req->wr.wr_hi = cpu_to_be32(FW_WR_OP(FW_ULPTX_WR) |
+                        (wait ? FW_WR_COMPL(1) : 0));
+        req->wr.wr_lo = wait ? (__force __be64)&wr_wait : 0;
+        req->wr.wr_mid = cpu_to_be32(FW_WR_LEN16(DIV_ROUND_UP(wr_len, 16)));
+        req->cmd = cpu_to_be32(ULPTX_CMD(ULP_TX_MEM_WRITE));
+        req->cmd |= cpu_to_be32(V_T5_ULP_MEMIO_ORDER(1));
+        req->dlen = cpu_to_be32(ULP_MEMIO_DATA_LEN(len>>5));
+        req->len16 = cpu_to_be32(DIV_ROUND_UP(wr_len-sizeof(req->wr), 16));
+        req->lock_addr = cpu_to_be32(ULP_MEMIO_ADDR(addr));
+
+        sgl = (struct ulptx_sgl *)(req + 1);
+        sgl->cmd_nsge = cpu_to_be32(ULPTX_CMD(ULP_TX_SC_DSGL) |
+                                    ULPTX_NSGE(1));
+        sgl->len0 = cpu_to_be32(len);
+        sgl->addr0 = cpu_to_be64(data);
+
+        ret = c4iw_ofld_send(rdev, skb);
+        if (ret)
+                return ret;
+        if (wait)
+                ret = c4iw_wait_for_reply(rdev, &wr_wait, 0, 0, __func__);
+        return ret;
+}
+
+static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len,
+                                  void *data)
 {
         struct sk_buff *skb;
         struct ulp_mem_io *req;
@@ -47,6 +107,12 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
         u8 wr_len, *to_dp, *from_dp;
         int copy_len, num_wqe, i, ret = 0;
         struct c4iw_wr_wait wr_wait;
+        __be32 cmd = cpu_to_be32(ULPTX_CMD(ULP_TX_MEM_WRITE));
+
+        if (is_t4(rdev->lldi.adapter_type))
+                cmd |= cpu_to_be32(ULP_MEMIO_ORDER(1));
+        else
+                cmd |= cpu_to_be32(V_T5_ULP_MEMIO_IMM(1));
 
         addr &= 0x7FFFFFF;
         PDBG("%s addr 0x%x len %u\n", __func__, addr, len);
@@ -77,7 +143,7 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
                 req->wr.wr_mid = cpu_to_be32(
                                        FW_WR_LEN16(DIV_ROUND_UP(wr_len, 16)));
 
-                req->cmd = cpu_to_be32(ULPTX_CMD(ULP_TX_MEM_WRITE) | (1<<23));
+                req->cmd = cmd;
                 req->dlen = cpu_to_be32(ULP_MEMIO_DATA_LEN(
                                 DIV_ROUND_UP(copy_len, T4_ULPTX_MIN_IO)));
                 req->len16 = cpu_to_be32(DIV_ROUND_UP(wr_len-sizeof(req->wr),
@@ -107,6 +173,67 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
         return ret;
 }
 
+int _c4iw_write_mem_dma(struct c4iw_rdev *rdev, u32 addr, u32 len, void *data)
+{
+        u32 remain = len;
+        u32 dmalen;
+        int ret = 0;
+        dma_addr_t daddr;
+        dma_addr_t save;
+
+        daddr = dma_map_single(&rdev->lldi.pdev->dev, data, len, DMA_TO_DEVICE);
+        if (dma_mapping_error(&rdev->lldi.pdev->dev, daddr))
+                return -1;
+        save = daddr;
+
+        while (remain > inline_threshold) {
+                if (remain < T4_ULPTX_MAX_DMA) {
+                        if (remain & ~T4_ULPTX_MIN_IO)
+                                dmalen = remain & ~(T4_ULPTX_MIN_IO-1);
+                        else
+                                dmalen = remain;
+                } else
+                        dmalen = T4_ULPTX_MAX_DMA;
+                remain -= dmalen;
+                ret = _c4iw_write_mem_dma_aligned(rdev, addr, dmalen, daddr,
+                                                 !remain);
+                if (ret)
+                        goto out;
+                addr += dmalen >> 5;
+                data += dmalen;
+                daddr += dmalen;
+        }
+        if (remain)
+                ret = _c4iw_write_mem_inline(rdev, addr, remain, data);
+out:
+        dma_unmap_single(&rdev->lldi.pdev->dev, save, len, DMA_TO_DEVICE);
+        return ret;
+}
+
+/*
+ * write len bytes of data into addr (32B aligned address)
+ * If data is NULL, clear len byte of memory to zero.
+ */
+static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
+                             void *data)
+{
+        if (is_t5(rdev->lldi.adapter_type) && use_dsgl) {
+                if (len > inline_threshold) {
+                        if (_c4iw_write_mem_dma(rdev, addr, len, data)) {
+                                printk_ratelimited(KERN_WARNING
+                                                   "%s: dma map"
+                                                   " failure (non fatal)\n",
+                                                   pci_name(rdev->lldi.pdev));
+                                return _c4iw_write_mem_inline(rdev, addr, len,
+                                                              data);
+                        } else
+                                return 0;
+                } else
+                        return _c4iw_write_mem_inline(rdev, addr, len, data);
+        } else
+                return _c4iw_write_mem_inline(rdev, addr, len, data);
+}
+
 /*
  * Build and write a TPT entry.
  * IN: stag key, pdid, perm, bind_enabled, zbva, to, len, page_size,
@@ -760,19 +887,23 @@ struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device,
         struct c4iw_fr_page_list *c4pl;
         struct c4iw_dev *dev = to_c4iw_dev(device);
         dma_addr_t dma_addr;
-        int size = sizeof *c4pl + page_list_len * sizeof(u64);
+        int pll_len = roundup(page_list_len * sizeof(u64), 32);
 
-        c4pl = dma_alloc_coherent(&dev->rdev.lldi.pdev->dev, size,
-                                  &dma_addr, GFP_KERNEL);
+        c4pl = kmalloc(sizeof(*c4pl), GFP_KERNEL);
         if (!c4pl)
                 return ERR_PTR(-ENOMEM);
 
+        c4pl->ibpl.page_list = dma_alloc_coherent(&dev->rdev.lldi.pdev->dev,
+                                                  pll_len, &dma_addr,
+                                                  GFP_KERNEL);
+        if (!c4pl->ibpl.page_list) {
+                kfree(c4pl);
+                return ERR_PTR(-ENOMEM);
+        }
         dma_unmap_addr_set(c4pl, mapping, dma_addr);
         c4pl->dma_addr = dma_addr;
         c4pl->dev = dev;
-        c4pl->size = size;
-        c4pl->ibpl.page_list = (u64 *)(c4pl + 1);
-        c4pl->ibpl.max_page_list_len = page_list_len;
+        c4pl->ibpl.max_page_list_len = pll_len;
 
         return &c4pl->ibpl;
 }
@@ -781,8 +912,10 @@ void c4iw_free_fastreg_pbl(struct ib_fast_reg_page_list *ibpl)
 {
         struct c4iw_fr_page_list *c4pl = to_c4iw_fr_page_list(ibpl);
 
-        dma_free_coherent(&c4pl->dev->rdev.lldi.pdev->dev, c4pl->size,
-                          c4pl, dma_unmap_addr(c4pl, mapping));
+        dma_free_coherent(&c4pl->dev->rdev.lldi.pdev->dev,
+                          c4pl->ibpl.max_page_list_len,
+                          c4pl->ibpl.page_list, dma_unmap_addr(c4pl, mapping));
+        kfree(c4pl);
 }
 
 int c4iw_dereg_mr(struct ib_mr *ib_mr)
diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index e084fdc6da7f..7e94c9a656a1 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -162,8 +162,14 @@ static int c4iw_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
                  */
                 if (addr >= rdev->oc_mw_pa)
                         vma->vm_page_prot = t4_pgprot_wc(vma->vm_page_prot);
-                else
-                        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+                else {
+                        if (is_t5(rdev->lldi.adapter_type))
+                                vma->vm_page_prot =
+                                        t4_pgprot_wc(vma->vm_page_prot);
+                        else
+                                vma->vm_page_prot =
+                                        pgprot_noncached(vma->vm_page_prot);
+                }
                 ret = io_remap_pfn_range(vma, vma->vm_start,
                                          addr >> PAGE_SHIFT,
                                          len, vma->vm_page_prot);
@@ -263,7 +269,7 @@ static int c4iw_query_device(struct ib_device *ibdev,
         dev = to_c4iw_dev(ibdev);
         memset(props, 0, sizeof *props);
         memcpy(&props->sys_image_guid, dev->rdev.lldi.ports[0]->dev_addr, 6);
-        props->hw_ver = dev->rdev.lldi.adapter_type;
+        props->hw_ver = CHELSIO_CHIP_RELEASE(dev->rdev.lldi.adapter_type);
         props->fw_ver = dev->rdev.lldi.fw_vers;
         props->device_cap_flags = dev->device_cap_flags;
         props->page_size_cap = T4_PAGESIZE_MASK;
@@ -346,7 +352,8 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
         struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,
                                                  ibdev.dev);
         PDBG("%s dev 0x%p\n", __func__, dev);
-        return sprintf(buf, "%d\n", c4iw_dev->rdev.lldi.adapter_type);
+        return sprintf(buf, "%d\n",
+                       CHELSIO_CHIP_RELEASE(c4iw_dev->rdev.lldi.adapter_type));
 }
 
 static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 70b1808a08f4..5b059e2d80cc 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -42,10 +42,21 @@ static int ocqp_support = 1;
 module_param(ocqp_support, int, 0644);
 MODULE_PARM_DESC(ocqp_support, "Support on-chip SQs (default=1)");
 
-int db_fc_threshold = 2000;
+int db_fc_threshold = 1000;
 module_param(db_fc_threshold, int, 0644);
-MODULE_PARM_DESC(db_fc_threshold, "QP count/threshold that triggers automatic "
-                 "db flow control mode (default = 2000)");
+MODULE_PARM_DESC(db_fc_threshold,
+                 "QP count/threshold that triggers"
+                 " automatic db flow control mode (default = 1000)");
+
+int db_coalescing_threshold;
+module_param(db_coalescing_threshold, int, 0644);
+MODULE_PARM_DESC(db_coalescing_threshold,
+                 "QP count/threshold that triggers"
+                 " disabling db coalescing (default = 0)");
+
+static int max_fr_immd = T4_MAX_FR_IMMD;
+module_param(max_fr_immd, int, 0644);
+MODULE_PARM_DESC(max_fr_immd, "fastreg threshold for using DSGL instead of immedate");
 
 static void set_state(struct c4iw_qp *qhp, enum c4iw_qp_state state)
 {
@@ -76,7 +87,7 @@ static void dealloc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
 
 static int alloc_oc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
 {
-        if (!ocqp_support || !t4_ocqp_supported())
+        if (!ocqp_support || !ocqp_supported(&rdev->lldi))
                 return -ENOSYS;
         sq->dma_addr = c4iw_ocqp_pool_alloc(rdev, sq->memsize);
         if (!sq->dma_addr)
@@ -129,7 +140,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         int wr_len;
         struct c4iw_wr_wait wr_wait;
         struct sk_buff *skb;
-        int ret;
+        int ret = 0;
         int eqsize;
 
         wq->sq.qid = c4iw_get_qpid(rdev, uctx);
@@ -169,17 +180,14 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         }
 
         if (user) {
-                ret = alloc_oc_sq(rdev, &wq->sq);
-                if (ret)
+                if (alloc_oc_sq(rdev, &wq->sq) && alloc_host_sq(rdev, &wq->sq))
                         goto free_hwaddr;
-
-                ret = alloc_host_sq(rdev, &wq->sq);
-                if (ret)
-                        goto free_sq;
-        } else
+        } else {
                 ret = alloc_host_sq(rdev, &wq->sq);
                 if (ret)
                         goto free_hwaddr;
+        }
+
         memset(wq->sq.queue, 0, wq->sq.memsize);
         dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
 
@@ -534,7 +542,7 @@ static int build_rdma_recv(struct c4iw_qp *qhp, union t4_recv_wr *wqe,
 }
 
 static int build_fastreg(struct t4_sq *sq, union t4_wr *wqe,
-                         struct ib_send_wr *wr, u8 *len16)
+                         struct ib_send_wr *wr, u8 *len16, u8 t5dev)
 {
 
         struct fw_ri_immd *imdp;
@@ -556,28 +564,51 @@ static int build_fastreg(struct t4_sq *sq, union t4_wr *wqe,
         wqe->fr.va_hi = cpu_to_be32(wr->wr.fast_reg.iova_start >> 32);
         wqe->fr.va_lo_fbo = cpu_to_be32(wr->wr.fast_reg.iova_start &
                                         0xffffffff);
-        WARN_ON(pbllen > T4_MAX_FR_IMMD);
-        imdp = (struct fw_ri_immd *)(&wqe->fr + 1);
-        imdp->op = FW_RI_DATA_IMMD;
-        imdp->r1 = 0;
-        imdp->r2 = 0;
-        imdp->immdlen = cpu_to_be32(pbllen);
-        p = (__be64 *)(imdp + 1);
-        rem = pbllen;
-        for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
-                *p = cpu_to_be64((u64)wr->wr.fast_reg.page_list->page_list[i]);
-                rem -= sizeof *p;
-                if (++p == (__be64 *)&sq->queue[sq->size])
-                        p = (__be64 *)sq->queue;
-        }
-        BUG_ON(rem < 0);
-        while (rem) {
-                *p = 0;
-                rem -= sizeof *p;
-                if (++p == (__be64 *)&sq->queue[sq->size])
-                        p = (__be64 *)sq->queue;
+
+        if (t5dev && use_dsgl && (pbllen > max_fr_immd)) {
+                struct c4iw_fr_page_list *c4pl =
+                        to_c4iw_fr_page_list(wr->wr.fast_reg.page_list);
+                struct fw_ri_dsgl *sglp;
+
+                for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
+                        wr->wr.fast_reg.page_list->page_list[i] = (__force u64)
+                                cpu_to_be64((u64)
+                                wr->wr.fast_reg.page_list->page_list[i]);
+                }
+
+                sglp = (struct fw_ri_dsgl *)(&wqe->fr + 1);
+                sglp->op = FW_RI_DATA_DSGL;
+                sglp->r1 = 0;
+                sglp->nsge = cpu_to_be16(1);
+                sglp->addr0 = cpu_to_be64(c4pl->dma_addr);
+                sglp->len0 = cpu_to_be32(pbllen);
+
+                *len16 = DIV_ROUND_UP(sizeof(wqe->fr) + sizeof(*sglp), 16);
+        } else {
+                imdp = (struct fw_ri_immd *)(&wqe->fr + 1);
+                imdp->op = FW_RI_DATA_IMMD;
+                imdp->r1 = 0;
+                imdp->r2 = 0;
+                imdp->immdlen = cpu_to_be32(pbllen);
+                p = (__be64 *)(imdp + 1);
+                rem = pbllen;
+                for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
+                        *p = cpu_to_be64(
+                                (u64)wr->wr.fast_reg.page_list->page_list[i]);
+                        rem -= sizeof(*p);
+                        if (++p == (__be64 *)&sq->queue[sq->size])
+                                p = (__be64 *)sq->queue;
+                }
+                BUG_ON(rem < 0);
+                while (rem) {
+                        *p = 0;
+                        rem -= sizeof(*p);
+                        if (++p == (__be64 *)&sq->queue[sq->size])
+                                p = (__be64 *)sq->queue;
+                }
+                *len16 = DIV_ROUND_UP(sizeof(wqe->fr) + sizeof(*imdp)
+                                      + pbllen, 16);
         }
-        *len16 = DIV_ROUND_UP(sizeof wqe->fr + sizeof *imdp + pbllen, 16);
         return 0;
 }
 
@@ -678,7 +709,10 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                 case IB_WR_FAST_REG_MR:
                         fw_opcode = FW_RI_FR_NSMR_WR;
                         swsqe->opcode = FW_RI_FAST_REGISTER;
-                        err = build_fastreg(&qhp->wq.sq, wqe, wr, &len16);
+                        err = build_fastreg(&qhp->wq.sq, wqe, wr, &len16,
+                                            is_t5(
+                                            qhp->rhp->rdev.lldi.adapter_type) ?
+                                            1 : 0);
                         break;
                 case IB_WR_LOCAL_INV:
                         if (wr->send_flags & IB_SEND_FENCE)
@@ -1450,6 +1484,9 @@ int c4iw_destroy_qp(struct ib_qp *ib_qp)
                 rhp->db_state = NORMAL;
                 idr_for_each(&rhp->qpidr, enable_qp_db, NULL);
         }
+        if (db_coalescing_threshold >= 0)
+                if (rhp->qpcnt <= db_coalescing_threshold)
+                        cxgb4_enable_db_coalescing(rhp->rdev.lldi.ports[0]);
         spin_unlock_irq(&rhp->lock);
         atomic_dec(&qhp->refcnt);
         wait_event(qhp->wait, !atomic_read(&qhp->refcnt));
@@ -1561,11 +1598,15 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
         spin_lock_irq(&rhp->lock);
         if (rhp->db_state != NORMAL)
                 t4_disable_wq_db(&qhp->wq);
-        if (++rhp->qpcnt > db_fc_threshold && rhp->db_state == NORMAL) {
+        rhp->qpcnt++;
+        if (rhp->qpcnt > db_fc_threshold && rhp->db_state == NORMAL) {
                 rhp->rdev.stats.db_state_transitions++;
                 rhp->db_state = FLOW_CONTROL;
                 idr_for_each(&rhp->qpidr, disable_qp_db, NULL);
         }
+        if (db_coalescing_threshold >= 0)
+                if (rhp->qpcnt > db_coalescing_threshold)
+                        cxgb4_disable_db_coalescing(rhp->rdev.lldi.ports[0]);
         ret = insert_handle_nolock(rhp, &rhp->qpidr, qhp, qhp->wq.sq.qid);
         spin_unlock_irq(&rhp->lock);
         if (ret)
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index 16f26ab29302..ebcb03bd1b72 100644
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -84,7 +84,7 @@ struct t4_status_page {
                         sizeof(struct fw_ri_isgl)) / sizeof(struct fw_ri_sge))
 #define T4_MAX_FR_IMMD ((T4_SQ_NUM_BYTES - sizeof(struct fw_ri_fr_nsmr_wr) - \
                         sizeof(struct fw_ri_immd)) & ~31UL)
-#define T4_MAX_FR_DEPTH (T4_MAX_FR_IMMD / sizeof(u64))
+#define T4_MAX_FR_DEPTH (1024 / sizeof(u64))
 
 #define T4_RQ_NUM_SLOTS 2
 #define T4_RQ_NUM_BYTES (T4_EQ_ENTRY_SIZE * T4_RQ_NUM_SLOTS)
@@ -280,15 +280,6 @@ static inline pgprot_t t4_pgprot_wc(pgprot_t prot)
 #endif
 }
 
-static inline int t4_ocqp_supported(void)
-{
-#if defined(__i386__) || defined(__x86_64__) || defined(CONFIG_PPC64)
-        return 1;
-#else
-        return 0;
-#endif
-}
-
 enum {
         T4_SQ_ONCHIP = (1<<0),
 };
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index ae67df35dd4d..73b3a7132587 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -228,7 +228,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector
                 vector = dev->eq_table[vector % ibdev->num_comp_vectors];
 
         err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar,
-                            cq->db.dma, &cq->mcq, vector, 0);
+                            cq->db.dma, &cq->mcq, vector, 0, 0);
         if (err)
                 goto err_dbmap;
 
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 67647e264611..418004c93feb 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2948,7 +2948,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
                                         nes_debug(NES_DBG_CQ, "%s: Reporting stripped VLAN packet. Tag = 0x%04X\n",
                                                         nesvnic->netdev->name, vlan_tag);
 
-                                        __vlan_hwaccel_put_tag(rx_skb, vlan_tag);
+                                        __vlan_hwaccel_put_tag(rx_skb, htons(ETH_P_8021Q), vlan_tag);
                                 }
                                 if (nes_use_lro)
                                         lro_receive_skb(&nesvnic->lro_mgr, rx_skb, NULL);
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 85cf4d1ac442..49eb5111d2cd 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1599,7 +1599,7 @@ static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev,
 
         /* Enable/Disable VLAN Stripping */
         u32temp = nes_read_indexed(nesdev, NES_IDX_PCIX_DIAG);
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 u32temp &= 0xfdffffff;
         else
                 u32temp |= 0x02000000;
@@ -1614,10 +1614,10 @@ static netdev_features_t nes_fix_features(struct net_device *netdev, netdev_feat
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -1628,7 +1628,7 @@ static int nes_set_features(struct net_device *netdev, netdev_features_t feature
         struct nes_device *nesdev = nesvnic->nesdev;
         u32 changed = netdev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 nes_vlan_mode(netdev, nesdev, features);
 
         return 0;
@@ -1706,11 +1706,11 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
         netdev->dev_addr[4] = (u8)(u64temp>>8);
         netdev->dev_addr[5] = (u8)u64temp;
 
-        netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX;
+        netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX;
         if ((nesvnic->logical_port < 2) || (nesdev->nesadapter->hw_rev != NE020_REV))
                 netdev->hw_features |= NETIF_F_TSO;
 
-        netdev->features = netdev->hw_features | NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX;
+        netdev->features = netdev->hw_features | NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX;
         netdev->hw_features |= NETIF_F_LRO;
 
         nes_debug(NES_DBG_INIT, "nesvnic = %p, reported features = 0x%lX, QPid = %d,"
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 8534afd04e7c..554b9063da54 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -730,7 +730,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if ((header->proto != htons(ETH_P_IP)) &&
                     (header->proto != htons(ETH_P_IPV6)) &&
                     (header->proto != htons(ETH_P_ARP)) &&
-                    (header->proto != htons(ETH_P_RARP))) {
+                    (header->proto != htons(ETH_P_RARP)) &&
+                    (header->proto != htons(ETH_P_TIPC))) {
                         /* ethertype not supported by IPoIB */
                         ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
@@ -751,6 +752,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
         switch (header->proto) {
         case htons(ETH_P_IP):
         case htons(ETH_P_IPV6):
+        case htons(ETH_P_TIPC):
                 neigh = ipoib_neigh_get(dev, cb->hwaddr);
                 if (unlikely(!neigh)) {
                         neigh_add_path(skb, cb->hwaddr, dev);
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 832bc807ed20..cc9f1927a322 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -469,8 +469,7 @@ static int capidrv_add_ack(struct capidrv_ncci *nccip,
 {
         struct ncci_datahandle_queue *n, **pp;
 
-        n = (struct ncci_datahandle_queue *)
-                kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC);
+        n = kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC);
         if (!n) {
                 printk(KERN_ERR "capidrv: kmalloc ncci_datahandle failed\n");
                 return -1;
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index db432e635496..50749a70c5ca 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -441,8 +441,7 @@ static int isdn_divert_icall(isdn_ctrl *ic)
 
                 switch (dv->rule.action) {
                 case DEFLECT_IGNORE:
-                        return (0);
-                        break;
+                        return 0;
 
                 case DEFLECT_ALERT:
                 case DEFLECT_PROCEED:
@@ -510,10 +509,9 @@ static int isdn_divert_icall(isdn_ctrl *ic)
                         break;
 
                 default:
-                        return (0); /* ignore call */
-                        break;
+                        return 0; /* ignore call */
                 } /* switch action */
-                break;
+                break; /* will break the 'for' looping */
         } /* scan_table */
 
         if (cs) {
diff --git a/drivers/isdn/hisax/fsm.c b/drivers/isdn/hisax/fsm.c
index 1bb291021fdb..c7a94713e9ec 100644
--- a/drivers/isdn/hisax/fsm.c
+++ b/drivers/isdn/hisax/fsm.c
@@ -26,7 +26,7 @@ FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount)
 {
         int i;
 
-        fsm->jumpmatrix = (FSMFNPTR *)
+        fsm->jumpmatrix =
                 kzalloc(sizeof(FSMFNPTR) * fsm->state_count * fsm->event_count, GFP_KERNEL);
         if (!fsm->jumpmatrix)
                 return -ENOMEM;
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index 90f34ae2b80f..dc4574f735ef 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1479,7 +1479,7 @@ int setup_hfcsx(struct IsdnCard *card)
                         release_region(cs->hw.hfcsx.base, 2);
                         return (0);
                 }
-                if (!(cs->hw.hfcsx.extra = (void *)
+                if (!(cs->hw.hfcsx.extra =
                       kmalloc(sizeof(struct hfcsx_extra), GFP_ATOMIC))) {
                         release_region(cs->hw.hfcsx.base, 2);
                         printk(KERN_WARNING "HFC-SX: unable to allocate memory\n");
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index babc621a07fb..88d657dff474 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1385,7 +1385,7 @@ isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev)
                 if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN))
                         skb->pkt_type = PACKET_OTHERHOST;
         }
-        if (ntohs(eth->h_proto) >= 1536)
+        if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
                 return eth->h_proto;
 
         rawp = skb->data;
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 8b07f83d48ad..e47dcb9d1e91 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
         lock_sock(sk);
 
         *addr_len = sizeof(*maddr);
+        maddr->family = AF_ISDN;
         maddr->dev = _pms(sk)->dev->id;
         maddr->channel = _pms(sk)->ch.nr;
         maddr->sapi = _pms(sk)->ch.addr & 0xff;
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index 6b580b2c717f..ca997bd4e818 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -33,8 +33,8 @@ static unsigned long ram[] = {0, 0, 0, 0};
 static bool do_reset = 0;
 
 module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(ram, int, NULL, 0);
+module_param_array(irq, byte, NULL, 0);
+module_param_array(ram, long, NULL, 0);
 module_param(do_reset, bool, 0);
 
 static int identify_board(unsigned long, unsigned int);
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index e17cb85d3ecf..c3cc3b52662b 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -185,7 +185,7 @@ static __be16 dvb_net_eth_type_trans(struct sk_buff *skb,
                         skb->pkt_type=PACKET_MULTICAST;
         }
 
-        if (ntohs(eth->h_proto) >= 1536)
+        if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
                 return eth->h_proto;
 
         rawp = skb->data;
@@ -228,9 +228,9 @@ static int ule_test_sndu( struct dvb_net_priv *p )
 static int ule_bridged_sndu( struct dvb_net_priv *p )
 {
         struct ethhdr *hdr = (struct ethhdr*) p->ule_next_hdr;
-        if(ntohs(hdr->h_proto) < 1536) {
+        if(ntohs(hdr->h_proto) < ETH_P_802_3_MIN) {
                 int framelen = p->ule_sndu_len - ((p->ule_next_hdr+sizeof(struct ethhdr)) - p->ule_skb->data);
-                /* A frame Type < 1536 for a bridged frame, introduces a LLC Length field. */
+                /* A frame Type < ETH_P_802_3_MIN for a bridged frame, introduces a LLC Length field. */
                 if(framelen != ntohs(hdr->h_proto)) {
                         return -1;
                 }
@@ -320,7 +320,7 @@ static int handle_ule_extensions( struct dvb_net_priv *p )
                         (int) p->ule_sndu_type, l, total_ext_len);
 #endif
 
-        } while (p->ule_sndu_type < 1536);
+        } while (p->ule_sndu_type < ETH_P_802_3_MIN);
 
         return total_ext_len;
 }
@@ -712,7 +712,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                                 }
 
                                 /* Handle ULE Extension Headers. */
-                                if (priv->ule_sndu_type < 1536) {
+                                if (priv->ule_sndu_type < ETH_P_802_3_MIN) {
                                         /* There is an extension header.  Handle it accordingly. */
                                         int l = handle_ule_extensions(priv);
                                         if (l < 0) {
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 87f1d39ca551..3835321b8cf3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -151,6 +151,7 @@ config MACVTAP
 config VXLAN
        tristate "Virtual eXtensible Local Area Network (VXLAN)"
        depends on INET
+       select NET_IP_TUNNEL
        ---help---
           This allows one to create vxlan virtual interfaces that provide
           Layer 2 Networks over Layer 3 Networks. VXLAN is often used
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index f5a89164e779..4ce6ca5f3d36 100644
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -106,20 +106,4 @@ config IPDDP_ENCAP
           IP packets inside AppleTalk frames; this is useful if your Linux box
           is stuck on an AppleTalk network (which hopefully contains a
           decapsulator somewhere). Please see
-          <file:Documentation/networking/ipddp.txt> for more information. If
-          you said Y to "AppleTalk-IP driver support" above and you say Y
-          here, then you cannot say Y to "AppleTalk-IP to IP Decapsulation
-          support", below.
-
-config IPDDP_DECAP
-        bool "Appletalk-IP to IP Decapsulation support"
-        depends on IPDDP
-        help
-          If you say Y here, the AppleTalk-IP code will be able to decapsulate
-          AppleTalk-IP frames to IP packets; this is useful if you want your
-          Linux box to act as an Internet gateway for an AppleTalk network.
-          Please see <file:Documentation/networking/ipddp.txt> for more
-          information.  If you said Y to "AppleTalk-IP driver support" above
-          and you say Y here, then you cannot say Y to "IP to AppleTalk-IP
-          Encapsulation support", above.
-
+          <file:Documentation/networking/ipddp.txt> for more information.
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f5e052723029..e02cc265723a 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -514,7 +514,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                 skb->dev = client_info->slave->dev;
 
                 if (client_info->tag) {
-                        skb = vlan_put_tag(skb, client_info->vlan_id);
+                        skb = vlan_put_tag(skb, htons(ETH_P_8021Q), client_info->vlan_id);
                         if (!skb) {
                                 pr_err("%s: Error: failed to insert VLAN tag\n",
                                        client_info->slave->bond->dev->name);
@@ -1014,7 +1014,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
                                 continue;
                         }
 
-                        skb = vlan_put_tag(skb, vlan->vlan_id);
+                        skb = vlan_put_tag(skb, htons(ETH_P_8021Q), vlan->vlan_id);
                         if (!skb) {
                                 pr_err("%s: Error: failed to insert VLAN tag\n",
                                        bond->dev->name);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index dbbea0eec134..d0aade04e49a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -428,14 +428,15 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
  * @bond_dev: bonding net device that got called
  * @vid: vlan id being added
  */
-static int bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
+static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
+                                __be16 proto, u16 vid)
 {
         struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *stop_at;
         int i, res;
 
         bond_for_each_slave(bond, slave, i) {
-                res = vlan_vid_add(slave->dev, vid);
+                res = vlan_vid_add(slave->dev, proto, vid);
                 if (res)
                         goto unwind;
         }
@@ -453,7 +454,7 @@ unwind:
         /* unwind from head to the slave that failed */
         stop_at = slave;
         bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at)
-                vlan_vid_del(slave->dev, vid);
+                vlan_vid_del(slave->dev, proto, vid);
 
         return res;
 }
@@ -463,14 +464,15 @@ unwind:
  * @bond_dev: bonding net device that got called
  * @vid: vlan id being removed
  */
-static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
+static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
+                                 __be16 proto, u16 vid)
 {
         struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         int i, res;
 
         bond_for_each_slave(bond, slave, i)
-                vlan_vid_del(slave->dev, vid);
+                vlan_vid_del(slave->dev, proto, vid);
 
         res = bond_del_vlan(bond, vid);
         if (res) {
@@ -488,7 +490,8 @@ static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *sla
         int res;
 
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
-                res = vlan_vid_add(slave_dev, vlan->vlan_id);
+                res = vlan_vid_add(slave_dev, htons(ETH_P_8021Q),
+                                   vlan->vlan_id);
                 if (res)
                         pr_warning("%s: Failed to add vlan id %d to device %s\n",
                                    bond->dev->name, vlan->vlan_id,
@@ -504,7 +507,7 @@ static void bond_del_vlans_from_slave(struct bonding *bond,
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                 if (!vlan->vlan_id)
                         continue;
-                vlan_vid_del(slave_dev, vlan->vlan_id);
+                vlan_vid_del(slave_dev, htons(ETH_P_8021Q), vlan->vlan_id);
         }
 }
 
@@ -779,7 +782,7 @@ static void bond_resend_igmp_join_requests(struct bonding *bond)
 
         /* rejoin all groups on vlan devices */
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
-                vlan_dev = __vlan_find_dev_deep(bond_dev,
+                vlan_dev = __vlan_find_dev_deep(bond_dev, htons(ETH_P_8021Q),
                                                 vlan->vlan_id);
                 if (vlan_dev)
                         __bond_resend_igmp_join_requests(vlan_dev);
@@ -796,9 +799,8 @@ static void bond_resend_igmp_join_requests_delayed(struct work_struct *work)
 {
         struct bonding *bond = container_of(work, struct bonding,
                                             mcast_work.work);
-        rcu_read_lock();
+
         bond_resend_igmp_join_requests(bond);
-        rcu_read_unlock();
 }
 
 /*
@@ -1915,14 +1917,16 @@ err_detach:
         bond_detach_slave(bond, new_slave);
         if (bond->primary_slave == new_slave)
                 bond->primary_slave = NULL;
-        write_unlock_bh(&bond->lock);
         if (bond->curr_active_slave == new_slave) {
+                bond_change_active_slave(bond, NULL);
+                write_unlock_bh(&bond->lock);
                 read_lock(&bond->lock);
                 write_lock_bh(&bond->curr_slave_lock);
-                bond_change_active_slave(bond, NULL);
                 bond_select_active_slave(bond);
                 write_unlock_bh(&bond->curr_slave_lock);
                 read_unlock(&bond->lock);
+        } else {
+                write_unlock_bh(&bond->lock);
         }
         slave_disable_netpoll(new_slave);
 
@@ -2532,7 +2536,8 @@ static int bond_has_this_ip(struct bonding *bond, __be32 ip)
 
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                 rcu_read_lock();
-                vlan_dev = __vlan_find_dev_deep(bond->dev, vlan->vlan_id);
+                vlan_dev = __vlan_find_dev_deep(bond->dev, htons(ETH_P_8021Q),
+                                                vlan->vlan_id);
                 rcu_read_unlock();
                 if (vlan_dev && ip == bond_confirm_addr(vlan_dev, 0, ip))
                         return 1;
@@ -2561,7 +2566,7 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
                 return;
         }
         if (vlan_id) {
-                skb = vlan_put_tag(skb, vlan_id);
+                skb = vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_id);
                 if (!skb) {
                         pr_err("failed to insert VLAN tag\n");
                         return;
@@ -2623,6 +2628,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                         rcu_read_lock();
                         vlan_dev = __vlan_find_dev_deep(bond->dev,
+                                                        htons(ETH_P_8021Q),
                                                         vlan->vlan_id);
                         rcu_read_unlock();
                         if (vlan_dev == rt->dst.dev) {
@@ -4258,6 +4264,37 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
         }
 }
 
+static int bond_ethtool_get_settings(struct net_device *bond_dev,
+                                     struct ethtool_cmd *ecmd)
+{
+        struct bonding *bond = netdev_priv(bond_dev);
+        struct slave *slave;
+        int i;
+        unsigned long speed = 0;
+
+        ecmd->duplex = DUPLEX_UNKNOWN;
+        ecmd->port = PORT_OTHER;
+
+        /* Since SLAVE_IS_OK returns false for all inactive or down slaves, we
+         * do not need to check mode.  Though link speed might not represent
+         * the true receive or transmit bandwidth (not all modes are symmetric)
+         * this is an accurate maximum.
+         */
+        read_lock(&bond->lock);
+        bond_for_each_slave(bond, slave, i) {
+                if (SLAVE_IS_OK(slave)) {
+                        if (slave->speed != SPEED_UNKNOWN)
+                                speed += slave->speed;
+                        if (ecmd->duplex == DUPLEX_UNKNOWN &&
+                            slave->duplex != DUPLEX_UNKNOWN)
+                                ecmd->duplex = slave->duplex;
+                }
+        }
+        ethtool_cmd_speed_set(ecmd, speed ? : SPEED_UNKNOWN);
+        read_unlock(&bond->lock);
+        return 0;
+}
+
 static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
                                      struct ethtool_drvinfo *drvinfo)
 {
@@ -4269,6 +4306,7 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
 
 static const struct ethtool_ops bond_ethtool_ops = {
         .get_drvinfo            = bond_ethtool_get_drvinfo,
+        .get_settings           = bond_ethtool_get_settings,
         .get_link               = ethtool_op_get_link,
 };
 
@@ -4359,9 +4397,9 @@ static void bond_setup(struct net_device *bond_dev)
          */
 
         bond_dev->hw_features = BOND_VLAN_FEATURES |
-                                NETIF_F_HW_VLAN_TX |
-                                NETIF_F_HW_VLAN_RX |
-                                NETIF_F_HW_VLAN_FILTER;
+                                NETIF_F_HW_VLAN_CTAG_TX |
+                                NETIF_F_HW_VLAN_CTAG_RX |
+                                NETIF_F_HW_VLAN_CTAG_FILTER;
 
         bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM);
         bond_dev->features |= bond_dev->hw_features;
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 60c2142373c9..a966128c2a7a 100644
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -32,13 +32,6 @@ config CAIF_SPI_SYNC
         help to synchronize to the next transfer in case of over or under-runs.
         This option also needs to be enabled on the modem.
 
-config CAIF_SHM
-        tristate "CAIF shared memory protocol driver"
-        depends on CAIF && U5500_MBOX
-        default n
-        ---help---
-        The CAIF shared memory protocol driver for the STE UX5500 platform.
-
 config CAIF_HSI
        tristate "CAIF HSI transport driver"
        depends on CAIF
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile
index 91dff861560f..15a9d2fc753d 100644
--- a/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@ -7,9 +7,5 @@ obj-$(CONFIG_CAIF_TTY) += caif_serial.o
 cfspi_slave-objs := caif_spi.o caif_spi_slave.o
 obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o
 
-# Shared memory
-caif_shm-objs := caif_shmcore.o caif_shm_u5500.o
-obj-$(CONFIG_CAIF_SHM) += caif_shm.o
-
 # HSI interface
 obj-$(CONFIG_CAIF_HSI) += caif_hsi.o
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 0def8b3106f4..5e40a8b68cbe 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -1,8 +1,7 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
- * Author:  Daniel Martensson / daniel.martensson@stericsson.com
- *          Dmitry.Tarnyagin  / dmitry.tarnyagin@stericsson.com
+ * Author:  Daniel Martensson
+ *          Dmitry.Tarnyagin  / dmitry.tarnyagin@lockless.no
  * License terms: GNU General Public License (GPL) version 2.
  */
 
@@ -25,7 +24,7 @@
 #include <net/caif/caif_hsi.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Daniel Martensson<daniel.martensson@stericsson.com>");
+MODULE_AUTHOR("Daniel Martensson");
 MODULE_DESCRIPTION("CAIF HSI driver");
 
 /* Returns the number of padding bytes for alignment. */
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index be90debc7cd1..77be3cb0b5fe 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Author:      Sjur Brendeland / sjur.brandeland@stericsson.com
+ * Author:      Sjur Brendeland
  * License terms: GNU General Public License (GPL) version 2
  */
 
@@ -21,7 +21,7 @@
 #include <linux/debugfs.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Sjur Brendeland<sjur.brandeland@stericsson.com>");
+MODULE_AUTHOR("Sjur Brendeland");
 MODULE_DESCRIPTION("CAIF serial device TTY line discipline");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_LDISC(N_CAIF);
diff --git a/drivers/net/caif/caif_shm_u5500.c b/drivers/net/caif/caif_shm_u5500.c
deleted file mode 100644
index 89d76b7b325a..000000000000
--- a/drivers/net/caif/caif_shm_u5500.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
- * Author:  Amarnath Revanna / amarnath.bangalore.revanna@stericsson.com
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <mach/mbox-db5500.h>
-#include <net/caif/caif_shm.h>
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("CAIF Shared Memory protocol driver");
-
-#define MAX_SHM_INSTANCES       1
-
-enum {
-        MBX_ACC0,
-        MBX_ACC1,
-        MBX_DSP
-};
-
-static struct shmdev_layer shmdev_lyr[MAX_SHM_INSTANCES];
-
-static unsigned int shm_start;
-static unsigned int shm_size;
-
-module_param(shm_size, uint  , 0440);
-MODULE_PARM_DESC(shm_total_size, "Start of SHM shared memory");
-
-module_param(shm_start, uint  , 0440);
-MODULE_PARM_DESC(shm_total_start, "Total Size of SHM shared memory");
-
-static int shmdev_send_msg(u32 dev_id, u32 mbx_msg)
-{
-        /* Always block until msg is written successfully */
-        mbox_send(shmdev_lyr[dev_id].hmbx, mbx_msg, true);
-        return 0;
-}
-
-static int shmdev_mbx_setup(void *pshmdrv_cb, struct shmdev_layer *pshm_dev,
-                                                         void *pshm_drv)
-{
-        /*
-         * For UX5500, we have only 1 SHM instance which uses MBX0
-         * for communication with the peer modem
-         */
-        pshm_dev->hmbx = mbox_setup(MBX_ACC0, pshmdrv_cb, pshm_drv);
-
-        if (!pshm_dev->hmbx)
-                return -ENODEV;
-        else
-                return 0;
-}
-
-static int __init caif_shmdev_init(void)
-{
-        int i, result;
-
-        /* Loop is currently overkill, there is only one instance */
-        for (i = 0; i < MAX_SHM_INSTANCES; i++) {
-
-                shmdev_lyr[i].shm_base_addr = shm_start;
-                shmdev_lyr[i].shm_total_sz = shm_size;
-
-                if (((char *)shmdev_lyr[i].shm_base_addr == NULL)
-                               || (shmdev_lyr[i].shm_total_sz <= 0))    {
-                        pr_warn("ERROR,"
-                                "Shared memory Address and/or Size incorrect"
-                                ", Bailing out ...\n");
-                        result = -EINVAL;
-                        goto clean;
-                }
-
-                pr_info("SHM AREA (instance %d) STARTS"
-                        " AT %p\n", i, (char *)shmdev_lyr[i].shm_base_addr);
-
-                shmdev_lyr[i].shm_id = i;
-                shmdev_lyr[i].pshmdev_mbxsend = shmdev_send_msg;
-                shmdev_lyr[i].pshmdev_mbxsetup = shmdev_mbx_setup;
-
-                /*
-                 * Finally, CAIF core module is called with details in place:
-                 * 1. SHM base address
-                 * 2. SHM size
-                 * 3. MBX handle
-                 */
-                result = caif_shmcore_probe(&shmdev_lyr[i]);
-                if (result) {
-                        pr_warn("ERROR[%d],"
-                                "Could not probe SHM core (instance %d)"
-                                " Bailing out ...\n", result, i);
-                        goto clean;
-                }
-        }
-
-        return 0;
-
-clean:
-        /*
-         * For now, we assume that even if one instance of SHM fails, we bail
-         * out of the driver support completely. For this, we need to release
-         * any memory allocated and unregister any instance of SHM net device.
-         */
-        for (i = 0; i < MAX_SHM_INSTANCES; i++) {
-                if (shmdev_lyr[i].pshm_netdev)
-                        unregister_netdev(shmdev_lyr[i].pshm_netdev);
-        }
-        return result;
-}
-
-static void __exit caif_shmdev_exit(void)
-{
-        int i;
-
-        for (i = 0; i < MAX_SHM_INSTANCES; i++) {
-                caif_shmcore_remove(shmdev_lyr[i].pshm_netdev);
-                kfree((void *)shmdev_lyr[i].shm_base_addr);
-        }
-
-}
-
-module_init(caif_shmdev_init);
-module_exit(caif_shmdev_exit);
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c
deleted file mode 100644
index bce8bac311c9..000000000000
--- a/drivers/net/caif/caif_shmcore.c
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
- * Authors:  Amarnath Revanna / amarnath.bangalore.revanna@stericsson.com,
- *           Daniel Martensson / daniel.martensson@stericsson.com
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
-
-#include <linux/spinlock.h>
-#include <linux/sched.h>
-#include <linux/list.h>
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/io.h>
-
-#include <net/caif/caif_device.h>
-#include <net/caif/caif_shm.h>
-
-#define NR_TX_BUF               6
-#define NR_RX_BUF               6
-#define TX_BUF_SZ               0x2000
-#define RX_BUF_SZ               0x2000
-
-#define CAIF_NEEDED_HEADROOM    32
-
-#define CAIF_FLOW_ON            1
-#define CAIF_FLOW_OFF           0
-
-#define LOW_WATERMARK           3
-#define HIGH_WATERMARK          4
-
-/* Maximum number of CAIF buffers per shared memory buffer. */
-#define SHM_MAX_FRMS_PER_BUF    10
-
-/*
- * Size in bytes of the descriptor area
- * (With end of descriptor signalling)
- */
-#define SHM_CAIF_DESC_SIZE      ((SHM_MAX_FRMS_PER_BUF + 1) * \
-                                        sizeof(struct shm_pck_desc))
-
-/*
- * Offset to the first CAIF frame within a shared memory buffer.
- * Aligned on 32 bytes.
- */
-#define SHM_CAIF_FRM_OFS        (SHM_CAIF_DESC_SIZE + (SHM_CAIF_DESC_SIZE % 32))
-
-/* Number of bytes for CAIF shared memory header. */
-#define SHM_HDR_LEN             1
-
-/* Number of padding bytes for the complete CAIF frame. */
-#define SHM_FRM_PAD_LEN         4
-
-#define CAIF_MAX_MTU            4096
-
-#define SHM_SET_FULL(x) (((x+1) & 0x0F) << 0)
-#define SHM_GET_FULL(x) (((x >> 0) & 0x0F) - 1)
-
-#define SHM_SET_EMPTY(x)        (((x+1) & 0x0F) << 4)
-#define SHM_GET_EMPTY(x)        (((x >> 4) & 0x0F) - 1)
-
-#define SHM_FULL_MASK           (0x0F << 0)
-#define SHM_EMPTY_MASK          (0x0F << 4)
-
-struct shm_pck_desc {
-        /*
-         * Offset from start of shared memory area to start of
-         * shared memory CAIF frame.
-         */
-        u32 frm_ofs;
-        u32 frm_len;
-};
-
-struct buf_list {
-        unsigned char *desc_vptr;
-        u32 phy_addr;
-        u32 index;
-        u32 len;
-        u32 frames;
-        u32 frm_ofs;
-        struct list_head list;
-};
-
-struct shm_caif_frm {
-        /* Number of bytes of padding before the CAIF frame. */
-        u8 hdr_ofs;
-};
-
-struct shmdrv_layer {
-        /* caif_dev_common must always be first in the structure*/
-        struct caif_dev_common cfdev;
-
-        u32 shm_tx_addr;
-        u32 shm_rx_addr;
-        u32 shm_base_addr;
-        u32 tx_empty_available;
-        spinlock_t lock;
-
-        struct list_head tx_empty_list;
-        struct list_head tx_pend_list;
-        struct list_head tx_full_list;
-        struct list_head rx_empty_list;
-        struct list_head rx_pend_list;
-        struct list_head rx_full_list;
-
-        struct workqueue_struct *pshm_tx_workqueue;
-        struct workqueue_struct *pshm_rx_workqueue;
-
-        struct work_struct shm_tx_work;
-        struct work_struct shm_rx_work;
-
-        struct sk_buff_head sk_qhead;
-        struct shmdev_layer *pshm_dev;
-};
-
-static int shm_netdev_open(struct net_device *shm_netdev)
-{
-        netif_wake_queue(shm_netdev);
-        return 0;
-}
-
-static int shm_netdev_close(struct net_device *shm_netdev)
-{
-        netif_stop_queue(shm_netdev);
-        return 0;
-}
-
-int caif_shmdrv_rx_cb(u32 mbx_msg, void *priv)
-{
-        struct buf_list *pbuf;
-        struct shmdrv_layer *pshm_drv;
-        struct list_head *pos;
-        u32 avail_emptybuff = 0;
-        unsigned long flags = 0;
-
-        pshm_drv = priv;
-
-        /* Check for received buffers. */
-        if (mbx_msg & SHM_FULL_MASK) {
-                int idx;
-
-                spin_lock_irqsave(&pshm_drv->lock, flags);
-
-                /* Check whether we have any outstanding buffers. */
-                if (list_empty(&pshm_drv->rx_empty_list)) {
-
-                        /* Release spin lock. */
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                        /* We print even in IRQ context... */
-                        pr_warn("No empty Rx buffers to fill: "
-                                        "mbx_msg:%x\n", mbx_msg);
-
-                        /* Bail out. */
-                        goto err_sync;
-                }
-
-                pbuf =
-                        list_entry(pshm_drv->rx_empty_list.next,
-                                        struct buf_list, list);
-                idx = pbuf->index;
-
-                /* Check buffer synchronization. */
-                if (idx != SHM_GET_FULL(mbx_msg)) {
-
-                        /* We print even in IRQ context... */
-                        pr_warn(
-                        "phyif_shm_mbx_msg_cb: RX full out of sync:"
-                        " idx:%d, msg:%x SHM_GET_FULL(mbx_msg):%x\n",
-                                idx, mbx_msg, SHM_GET_FULL(mbx_msg));
-
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                        /* Bail out. */
-                        goto err_sync;
-                }
-
-                list_del_init(&pbuf->list);
-                list_add_tail(&pbuf->list, &pshm_drv->rx_full_list);
-
-                spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                /* Schedule RX work queue. */
-                if (!work_pending(&pshm_drv->shm_rx_work))
-                        queue_work(pshm_drv->pshm_rx_workqueue,
-                                                &pshm_drv->shm_rx_work);
-        }
-
-        /* Check for emptied buffers. */
-        if (mbx_msg & SHM_EMPTY_MASK) {
-                int idx;
-
-                spin_lock_irqsave(&pshm_drv->lock, flags);
-
-                /* Check whether we have any outstanding buffers. */
-                if (list_empty(&pshm_drv->tx_full_list)) {
-
-                        /* We print even in IRQ context... */
-                        pr_warn("No TX to empty: msg:%x\n", mbx_msg);
-
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                        /* Bail out. */
-                        goto err_sync;
-                }
-
-                pbuf =
-                        list_entry(pshm_drv->tx_full_list.next,
-                                        struct buf_list, list);
-                idx = pbuf->index;
-
-                /* Check buffer synchronization. */
-                if (idx != SHM_GET_EMPTY(mbx_msg)) {
-
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                        /* We print even in IRQ context... */
-                        pr_warn("TX empty "
-                                "out of sync:idx:%d, msg:%x\n", idx, mbx_msg);
-
-                        /* Bail out. */
-                        goto err_sync;
-                }
-                list_del_init(&pbuf->list);
-
-                /* Reset buffer parameters. */
-                pbuf->frames = 0;
-                pbuf->frm_ofs = SHM_CAIF_FRM_OFS;
-
-                list_add_tail(&pbuf->list, &pshm_drv->tx_empty_list);
-
-                /* Check the available no. of buffers in the empty list */
-                list_for_each(pos, &pshm_drv->tx_empty_list)
-                        avail_emptybuff++;
-
-                /* Check whether we have to wake up the transmitter. */
-                if ((avail_emptybuff > HIGH_WATERMARK) &&
-                                        (!pshm_drv->tx_empty_available)) {
-                        pshm_drv->tx_empty_available = 1;
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-                        pshm_drv->cfdev.flowctrl
-                                        (pshm_drv->pshm_dev->pshm_netdev,
-                                                                CAIF_FLOW_ON);
-
-
-                        /* Schedule the work queue. if required */
-                        if (!work_pending(&pshm_drv->shm_tx_work))
-                                queue_work(pshm_drv->pshm_tx_workqueue,
-                                                        &pshm_drv->shm_tx_work);
-                } else
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-        }
-
-        return 0;
-
-err_sync:
-        return -EIO;
-}
-
-static void shm_rx_work_func(struct work_struct *rx_work)
-{
-        struct shmdrv_layer *pshm_drv;
-        struct buf_list *pbuf;
-        unsigned long flags = 0;
-        struct sk_buff *skb;
-        char *p;
-        int ret;
-
-        pshm_drv = container_of(rx_work, struct shmdrv_layer, shm_rx_work);
-
-        while (1) {
-
-                struct shm_pck_desc *pck_desc;
-
-                spin_lock_irqsave(&pshm_drv->lock, flags);
-
-                /* Check for received buffers. */
-                if (list_empty(&pshm_drv->rx_full_list)) {
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-                        break;
-                }
-
-                pbuf =
-                        list_entry(pshm_drv->rx_full_list.next, struct buf_list,
-                                        list);
-                list_del_init(&pbuf->list);
-                spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                /* Retrieve pointer to start of the packet descriptor area. */
-                pck_desc = (struct shm_pck_desc *) pbuf->desc_vptr;
-
-                /*
-                 * Check whether descriptor contains a CAIF shared memory
-                 * frame.
-                 */
-                while (pck_desc->frm_ofs) {
-                        unsigned int frm_buf_ofs;
-                        unsigned int frm_pck_ofs;
-                        unsigned int frm_pck_len;
-                        /*
-                         * Check whether offset is within buffer limits
-                         * (lower).
-                         */
-                        if (pck_desc->frm_ofs <
-                                (pbuf->phy_addr - pshm_drv->shm_base_addr))
-                                break;
-                        /*
-                         * Check whether offset is within buffer limits
-                         * (higher).
-                         */
-                        if (pck_desc->frm_ofs >
-                                ((pbuf->phy_addr - pshm_drv->shm_base_addr) +
-                                        pbuf->len))
-                                break;
-
-                        /* Calculate offset from start of buffer. */
-                        frm_buf_ofs =
-                                pck_desc->frm_ofs - (pbuf->phy_addr -
-                                                pshm_drv->shm_base_addr);
-
-                        /*
-                         * Calculate offset and length of CAIF packet while
-                         * taking care of the shared memory header.
-                         */
-                        frm_pck_ofs =
-                                frm_buf_ofs + SHM_HDR_LEN +
-                                (*(pbuf->desc_vptr + frm_buf_ofs));
-                        frm_pck_len =
-                                (pck_desc->frm_len - SHM_HDR_LEN -
-                                (*(pbuf->desc_vptr + frm_buf_ofs)));
-
-                        /* Check whether CAIF packet is within buffer limits */
-                        if ((frm_pck_ofs + pck_desc->frm_len) > pbuf->len)
-                                break;
-
-                        /* Get a suitable CAIF packet and copy in data. */
-                        skb = netdev_alloc_skb(pshm_drv->pshm_dev->pshm_netdev,
-                                                        frm_pck_len + 1);
-
-                        if (skb == NULL) {
-                                pr_info("OOM: Try next frame in descriptor\n");
-                                break;
-                        }
-
-                        p = skb_put(skb, frm_pck_len);
-                        memcpy(p, pbuf->desc_vptr + frm_pck_ofs, frm_pck_len);
-
-                        skb->protocol = htons(ETH_P_CAIF);
-                        skb_reset_mac_header(skb);
-                        skb->dev = pshm_drv->pshm_dev->pshm_netdev;
-
-                        /* Push received packet up the stack. */
-                        ret = netif_rx_ni(skb);
-
-                        if (!ret) {
-                                pshm_drv->pshm_dev->pshm_netdev->stats.
-                                                                rx_packets++;
-                                pshm_drv->pshm_dev->pshm_netdev->stats.
-                                                rx_bytes += pck_desc->frm_len;
-                        } else
-                                ++pshm_drv->pshm_dev->pshm_netdev->stats.
-                                                                rx_dropped;
-                        /* Move to next packet descriptor. */
-                        pck_desc++;
-                }
-
-                spin_lock_irqsave(&pshm_drv->lock, flags);
-                list_add_tail(&pbuf->list, &pshm_drv->rx_pend_list);
-
-                spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-        }
-
-        /* Schedule the work queue. if required */
-        if (!work_pending(&pshm_drv->shm_tx_work))
-                queue_work(pshm_drv->pshm_tx_workqueue, &pshm_drv->shm_tx_work);
-
-}
-
-static void shm_tx_work_func(struct work_struct *tx_work)
-{
-        u32 mbox_msg;
-        unsigned int frmlen, avail_emptybuff, append = 0;
-        unsigned long flags = 0;
-        struct buf_list *pbuf = NULL;
-        struct shmdrv_layer *pshm_drv;
-        struct shm_caif_frm *frm;
-        struct sk_buff *skb;
-        struct shm_pck_desc *pck_desc;
-        struct list_head *pos;
-
-        pshm_drv = container_of(tx_work, struct shmdrv_layer, shm_tx_work);
-
-        do {
-                /* Initialize mailbox message. */
-                mbox_msg = 0x00;
-                avail_emptybuff = 0;
-
-                spin_lock_irqsave(&pshm_drv->lock, flags);
-
-                /* Check for pending receive buffers. */
-                if (!list_empty(&pshm_drv->rx_pend_list)) {
-
-                        pbuf = list_entry(pshm_drv->rx_pend_list.next,
-                                                struct buf_list, list);
-
-                        list_del_init(&pbuf->list);
-                        list_add_tail(&pbuf->list, &pshm_drv->rx_empty_list);
-                        /*
-                         * Value index is never changed,
-                         * so read access should be safe.
-                         */
-                        mbox_msg |= SHM_SET_EMPTY(pbuf->index);
-                }
-
-                skb = skb_peek(&pshm_drv->sk_qhead);
-
-                if (skb == NULL)
-                        goto send_msg;
-                /* Check the available no. of buffers in the empty list */
-                list_for_each(pos, &pshm_drv->tx_empty_list)
-                        avail_emptybuff++;
-
-                if ((avail_emptybuff < LOW_WATERMARK) &&
-                                        pshm_drv->tx_empty_available) {
-                        /* Update blocking condition. */
-                        pshm_drv->tx_empty_available = 0;
-                        spin_unlock_irqrestore(&pshm_drv->lock, flags);
-                        pshm_drv->cfdev.flowctrl
-                                        (pshm_drv->pshm_dev->pshm_netdev,
-                                        CAIF_FLOW_OFF);
-                        spin_lock_irqsave(&pshm_drv->lock, flags);
-                }
-                /*
-                 * We simply return back to the caller if we do not have space
-                 * either in Tx pending list or Tx empty list. In this case,
-                 * we hold the received skb in the skb list, waiting to
-                 * be transmitted once Tx buffers become available
-                 */
-                if (list_empty(&pshm_drv->tx_empty_list))
-                        goto send_msg;
-
-                /* Get the first free Tx buffer. */
-                pbuf = list_entry(pshm_drv->tx_empty_list.next,
-                                                struct buf_list, list);
-                do {
-                        if (append) {
-                                skb = skb_peek(&pshm_drv->sk_qhead);
-                                if (skb == NULL)
-                                        break;
-                        }
-
-                        frm = (struct shm_caif_frm *)
-                                        (pbuf->desc_vptr + pbuf->frm_ofs);
-
-                        frm->hdr_ofs = 0;
-                        frmlen = 0;
-                        frmlen += SHM_HDR_LEN + frm->hdr_ofs + skb->len;
-
-                        /* Add tail padding if needed. */
-                        if (frmlen % SHM_FRM_PAD_LEN)
-                                frmlen += SHM_FRM_PAD_LEN -
-                                                (frmlen % SHM_FRM_PAD_LEN);
-
-                        /*
-                         * Verify that packet, header and additional padding
-                         * can fit within the buffer frame area.
-                         */
-                        if (frmlen >= (pbuf->len - pbuf->frm_ofs))
-                                break;
-
-                        if (!append) {
-                                list_del_init(&pbuf->list);
-                                append = 1;
-                        }
-
-                        skb = skb_dequeue(&pshm_drv->sk_qhead);
-                        if (skb == NULL)
-                                break;
-                        /* Copy in CAIF frame. */
-                        skb_copy_bits(skb, 0, pbuf->desc_vptr +
-                                        pbuf->frm_ofs + SHM_HDR_LEN +
-                                                frm->hdr_ofs, skb->len);
-
-                        pshm_drv->pshm_dev->pshm_netdev->stats.tx_packets++;
-                        pshm_drv->pshm_dev->pshm_netdev->stats.tx_bytes +=
-                                                                        frmlen;
-                        dev_kfree_skb_irq(skb);
-
-                        /* Fill in the shared memory packet descriptor area. */
-                        pck_desc = (struct shm_pck_desc *) (pbuf->desc_vptr);
-                        /* Forward to current frame. */
-                        pck_desc += pbuf->frames;
-                        pck_desc->frm_ofs = (pbuf->phy_addr -
-                                                pshm_drv->shm_base_addr) +
-                                                                pbuf->frm_ofs;
-                        pck_desc->frm_len = frmlen;
-                        /* Terminate packet descriptor area. */
-                        pck_desc++;
-                        pck_desc->frm_ofs = 0;
-                        /* Update buffer parameters. */
-                        pbuf->frames++;
-                        pbuf->frm_ofs += frmlen + (frmlen % 32);
-
-                } while (pbuf->frames < SHM_MAX_FRMS_PER_BUF);
-
-                /* Assign buffer as full. */
-                list_add_tail(&pbuf->list, &pshm_drv->tx_full_list);
-                append = 0;
-                mbox_msg |= SHM_SET_FULL(pbuf->index);
-send_msg:
-                spin_unlock_irqrestore(&pshm_drv->lock, flags);
-
-                if (mbox_msg)
-                        pshm_drv->pshm_dev->pshmdev_mbxsend
-                                        (pshm_drv->pshm_dev->shm_id, mbox_msg);
-        } while (mbox_msg);
-}
-
-static int shm_netdev_tx(struct sk_buff *skb, struct net_device *shm_netdev)
-{
-        struct shmdrv_layer *pshm_drv;
-
-        pshm_drv = netdev_priv(shm_netdev);
-
-        skb_queue_tail(&pshm_drv->sk_qhead, skb);
-
-        /* Schedule Tx work queue. for deferred processing of skbs*/
-        if (!work_pending(&pshm_drv->shm_tx_work))
-                queue_work(pshm_drv->pshm_tx_workqueue, &pshm_drv->shm_tx_work);
-
-        return 0;
-}
-
-static const struct net_device_ops netdev_ops = {
-        .ndo_open = shm_netdev_open,
-        .ndo_stop = shm_netdev_close,
-        .ndo_start_xmit = shm_netdev_tx,
-};
-
-static void shm_netdev_setup(struct net_device *pshm_netdev)
-{
-        struct shmdrv_layer *pshm_drv;
-        pshm_netdev->netdev_ops = &netdev_ops;
-
-        pshm_netdev->mtu = CAIF_MAX_MTU;
-        pshm_netdev->type = ARPHRD_CAIF;
-        pshm_netdev->hard_header_len = CAIF_NEEDED_HEADROOM;
-        pshm_netdev->tx_queue_len = 0;
-        pshm_netdev->destructor = free_netdev;
-
-        pshm_drv = netdev_priv(pshm_netdev);
-
-        /* Initialize structures in a clean state. */
-        memset(pshm_drv, 0, sizeof(struct shmdrv_layer));
-
-        pshm_drv->cfdev.link_select = CAIF_LINK_LOW_LATENCY;
-}
-
-int caif_shmcore_probe(struct shmdev_layer *pshm_dev)
-{
-        int result, j;
-        struct shmdrv_layer *pshm_drv = NULL;
-
-        pshm_dev->pshm_netdev = alloc_netdev(sizeof(struct shmdrv_layer),
-                                                "cfshm%d", shm_netdev_setup);
-        if (!pshm_dev->pshm_netdev)
-                return -ENOMEM;
-
-        pshm_drv = netdev_priv(pshm_dev->pshm_netdev);
-        pshm_drv->pshm_dev = pshm_dev;
-
-        /*
-         * Initialization starts with the verification of the
-         * availability of MBX driver by calling its setup function.
-         * MBX driver must be available by this time for proper
-         * functioning of SHM driver.
-         */
-        if ((pshm_dev->pshmdev_mbxsetup
-                                (caif_shmdrv_rx_cb, pshm_dev, pshm_drv)) != 0) {
-                pr_warn("Could not config. SHM Mailbox,"
-                                " Bailing out.....\n");
-                free_netdev(pshm_dev->pshm_netdev);
-                return -ENODEV;
-        }
-
-        skb_queue_head_init(&pshm_drv->sk_qhead);
-
-        pr_info("SHM DEVICE[%d] PROBED BY DRIVER, NEW SHM DRIVER"
-                        " INSTANCE AT pshm_drv =0x%p\n",
-                        pshm_drv->pshm_dev->shm_id, pshm_drv);
-
-        if (pshm_dev->shm_total_sz <
-                        (NR_TX_BUF * TX_BUF_SZ + NR_RX_BUF * RX_BUF_SZ)) {
-
-                pr_warn("ERROR, Amount of available"
-                                " Phys. SHM cannot accommodate current SHM "
-                                "driver configuration, Bailing out ...\n");
-                free_netdev(pshm_dev->pshm_netdev);
-                return -ENOMEM;
-        }
-
-        pshm_drv->shm_base_addr = pshm_dev->shm_base_addr;
-        pshm_drv->shm_tx_addr = pshm_drv->shm_base_addr;
-
-        if (pshm_dev->shm_loopback)
-                pshm_drv->shm_rx_addr = pshm_drv->shm_tx_addr;
-        else
-                pshm_drv->shm_rx_addr = pshm_dev->shm_base_addr +
-                                                (NR_TX_BUF * TX_BUF_SZ);
-
-        spin_lock_init(&pshm_drv->lock);
-        INIT_LIST_HEAD(&pshm_drv->tx_empty_list);
-        INIT_LIST_HEAD(&pshm_drv->tx_pend_list);
-        INIT_LIST_HEAD(&pshm_drv->tx_full_list);
-
-        INIT_LIST_HEAD(&pshm_drv->rx_empty_list);
-        INIT_LIST_HEAD(&pshm_drv->rx_pend_list);
-        INIT_LIST_HEAD(&pshm_drv->rx_full_list);
-
-        INIT_WORK(&pshm_drv->shm_tx_work, shm_tx_work_func);
-        INIT_WORK(&pshm_drv->shm_rx_work, shm_rx_work_func);
-
-        pshm_drv->pshm_tx_workqueue =
-                                create_singlethread_workqueue("shm_tx_work");
-        pshm_drv->pshm_rx_workqueue =
-                                create_singlethread_workqueue("shm_rx_work");
-
-        for (j = 0; j < NR_TX_BUF; j++) {
-                struct buf_list *tx_buf =
-                                kmalloc(sizeof(struct buf_list), GFP_KERNEL);
-
-                if (tx_buf == NULL) {
-                        free_netdev(pshm_dev->pshm_netdev);
-                        return -ENOMEM;
-                }
-                tx_buf->index = j;
-                tx_buf->phy_addr = pshm_drv->shm_tx_addr + (TX_BUF_SZ * j);
-                tx_buf->len = TX_BUF_SZ;
-                tx_buf->frames = 0;
-                tx_buf->frm_ofs = SHM_CAIF_FRM_OFS;
-
-                if (pshm_dev->shm_loopback)
-                        tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr;
-                else
-                        /*
-                         * FIXME: the result of ioremap is not a pointer - arnd
-                         */
-                        tx_buf->desc_vptr =
-                                        ioremap(tx_buf->phy_addr, TX_BUF_SZ);
-
-                list_add_tail(&tx_buf->list, &pshm_drv->tx_empty_list);
-        }
-
-        for (j = 0; j < NR_RX_BUF; j++) {
-                struct buf_list *rx_buf =
-                                kmalloc(sizeof(struct buf_list), GFP_KERNEL);
-
-                if (rx_buf == NULL) {
-                        free_netdev(pshm_dev->pshm_netdev);
-                        return -ENOMEM;
-                }
-                rx_buf->index = j;
-                rx_buf->phy_addr = pshm_drv->shm_rx_addr + (RX_BUF_SZ * j);
-                rx_buf->len = RX_BUF_SZ;
-
-                if (pshm_dev->shm_loopback)
-                        rx_buf->desc_vptr = (unsigned char *)rx_buf->phy_addr;
-                else
-                        rx_buf->desc_vptr =
-                                        ioremap(rx_buf->phy_addr, RX_BUF_SZ);
-                list_add_tail(&rx_buf->list, &pshm_drv->rx_empty_list);
-        }
-
-        pshm_drv->tx_empty_available = 1;
-        result = register_netdev(pshm_dev->pshm_netdev);
-        if (result)
-                pr_warn("ERROR[%d], SHM could not, "
-                        "register with NW FRMWK Bailing out ...\n", result);
-
-        return result;
-}
-
-void caif_shmcore_remove(struct net_device *pshm_netdev)
-{
-        struct buf_list *pbuf;
-        struct shmdrv_layer *pshm_drv = NULL;
-
-        pshm_drv = netdev_priv(pshm_netdev);
-
-        while (!(list_empty(&pshm_drv->tx_pend_list))) {
-                pbuf =
-                        list_entry(pshm_drv->tx_pend_list.next,
-                                        struct buf_list, list);
-
-                list_del(&pbuf->list);
-                kfree(pbuf);
-        }
-
-        while (!(list_empty(&pshm_drv->tx_full_list))) {
-                pbuf =
-                        list_entry(pshm_drv->tx_full_list.next,
-                                        struct buf_list, list);
-                list_del(&pbuf->list);
-                kfree(pbuf);
-        }
-
-        while (!(list_empty(&pshm_drv->tx_empty_list))) {
-                pbuf =
-                        list_entry(pshm_drv->tx_empty_list.next,
-                                        struct buf_list, list);
-                list_del(&pbuf->list);
-                kfree(pbuf);
-        }
-
-        while (!(list_empty(&pshm_drv->rx_full_list))) {
-                pbuf =
-                        list_entry(pshm_drv->tx_full_list.next,
-                                struct buf_list, list);
-                list_del(&pbuf->list);
-                kfree(pbuf);
-        }
-
-        while (!(list_empty(&pshm_drv->rx_pend_list))) {
-                pbuf =
-                        list_entry(pshm_drv->tx_pend_list.next,
-                                struct buf_list, list);
-                list_del(&pbuf->list);
-                kfree(pbuf);
-        }
-
-        while (!(list_empty(&pshm_drv->rx_empty_list))) {
-                pbuf =
-                        list_entry(pshm_drv->rx_empty_list.next,
-                                struct buf_list, list);
-                list_del(&pbuf->list);
-                kfree(pbuf);
-        }
-
-        /* Destroy work queues. */
-        destroy_workqueue(pshm_drv->pshm_tx_workqueue);
-        destroy_workqueue(pshm_drv->pshm_rx_workqueue);
-
-        unregister_netdev(pshm_netdev);
-}
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index b71ce9bf0afb..155db68e13ba 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -1,7 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
- * Author:  Daniel Martensson / Daniel.Martensson@stericsson.com
+ * Author:  Daniel Martensson
  * License terms: GNU General Public License (GPL) version 2.
  */
 
@@ -29,7 +28,7 @@
 #endif /* CONFIG_CAIF_SPI_SYNC */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Daniel Martensson<daniel.martensson@stericsson.com>");
+MODULE_AUTHOR("Daniel Martensson");
 MODULE_DESCRIPTION("CAIF SPI driver");
 
 /* Returns the number of padding bytes for alignment. */
@@ -864,6 +863,7 @@ static int __init cfspi_init_module(void)
         driver_remove_file(&cfspi_spi_driver.driver,
                            &driver_attr_up_head_align);
  err_create_up_head_align:
+        platform_driver_unregister(&cfspi_spi_driver);
  err_dev_register:
         return result;
 }
diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c
index e139e133fc79..ee92ad5a6cf8 100644
--- a/drivers/net/caif/caif_spi_slave.c
+++ b/drivers/net/caif/caif_spi_slave.c
@@ -1,7 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
- * Author:  Daniel Martensson / Daniel.Martensson@stericsson.com
+ * Author:  Daniel Martensson
  * License terms: GNU General Public License (GPL) version 2.
  */
 #include <linux/init.h>
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 9862b2e07644..e456b70933c2 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -65,7 +65,7 @@ config CAN_LEDS
 
 config CAN_AT91
         tristate "Atmel AT91 onchip CAN controller"
-        depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9X5
+        depends on ARM
         ---help---
           This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
           and AT91SAM9X5 processors.
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 44f363792b59..db52f4414def 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
@@ -155,19 +156,20 @@ struct at91_priv {
         canid_t mb0_id;
 };
 
-static const struct at91_devtype_data at91_devtype_data[] = {
-        [AT91_DEVTYPE_SAM9263] = {
-                .rx_first = 1,
-                .rx_split = 8,
-                .rx_last = 11,
-                .tx_shift = 2,
-        },
-        [AT91_DEVTYPE_SAM9X5] = {
-                .rx_first = 0,
-                .rx_split = 4,
-                .rx_last = 5,
-                .tx_shift = 1,
-        },
+static const struct at91_devtype_data at91_at91sam9263_data = {
+        .rx_first = 1,
+        .rx_split = 8,
+        .rx_last = 11,
+        .tx_shift = 2,
+        .type = AT91_DEVTYPE_SAM9263,
+};
+
+static const struct at91_devtype_data at91_at91sam9x5_data = {
+        .rx_first = 0,
+        .rx_split = 4,
+        .rx_last = 5,
+        .tx_shift = 1,
+        .type = AT91_DEVTYPE_SAM9X5,
 };
 
 static const struct can_bittiming_const at91_bittiming_const = {
@@ -1249,10 +1251,42 @@ static struct attribute_group at91_sysfs_attr_group = {
         .attrs = at91_sysfs_attrs,
 };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id at91_can_dt_ids[] = {
+        {
+                .compatible = "atmel,at91sam9x5-can",
+                .data = &at91_at91sam9x5_data,
+        }, {
+                .compatible = "atmel,at91sam9263-can",
+                .data = &at91_at91sam9263_data,
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(of, at91_can_dt_ids);
+#else
+#define at91_can_dt_ids NULL
+#endif
+
+static const struct at91_devtype_data *at91_can_get_driver_data(struct platform_device *pdev)
+{
+        if (pdev->dev.of_node) {
+                const struct of_device_id *match;
+
+                match = of_match_node(at91_can_dt_ids, pdev->dev.of_node);
+                if (!match) {
+                        dev_err(&pdev->dev, "no matching node found in dtb\n");
+                        return NULL;
+                }
+                return (const struct at91_devtype_data *)match->data;
+        }
+        return (const struct at91_devtype_data *)
+                platform_get_device_id(pdev)->driver_data;
+}
+
 static int at91_can_probe(struct platform_device *pdev)
 {
         const struct at91_devtype_data *devtype_data;
-        enum at91_devtype devtype;
         struct net_device *dev;
         struct at91_priv *priv;
         struct resource *res;
@@ -1260,8 +1294,12 @@ static int at91_can_probe(struct platform_device *pdev)
         void __iomem *addr;
         int err, irq;
 
-        devtype = pdev->id_entry->driver_data;
-        devtype_data = &at91_devtype_data[devtype];
+        devtype_data = at91_can_get_driver_data(pdev);
+        if (!devtype_data) {
+                dev_err(&pdev->dev, "no driver data\n");
+                err = -ENODEV;
+                goto exit;
+        }
 
         clk = clk_get(&pdev->dev, "can_clk");
         if (IS_ERR(clk)) {
@@ -1310,7 +1348,6 @@ static int at91_can_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->reg_base = addr;
         priv->devtype_data = *devtype_data;
-        priv->devtype_data.type = devtype;
         priv->clk = clk;
         priv->pdata = pdev->dev.platform_data;
         priv->mb0_id = 0x7ff;
@@ -1373,10 +1410,10 @@ static int at91_can_remove(struct platform_device *pdev)
 static const struct platform_device_id at91_can_id_table[] = {
         {
                 .name = "at91_can",
-                .driver_data = AT91_DEVTYPE_SAM9263,
+                .driver_data = (kernel_ulong_t)&at91_at91sam9x5_data,
         }, {
                 .name = "at91sam9x5_can",
-                .driver_data = AT91_DEVTYPE_SAM9X5,
+                .driver_data = (kernel_ulong_t)&at91_at91sam9263_data,
         }, {
                 /* sentinel */
         }
@@ -1389,6 +1426,7 @@ static struct platform_driver at91_can_driver = {
         .driver = {
                 .name = KBUILD_MODNAME,
                 .owner = THIS_MODULE,
+                .of_match_table = at91_can_dt_ids,
         },
         .id_table = at91_can_id_table,
 };
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 6a0532176b69..d4a15e82bfc0 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -412,7 +412,7 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
         return 0;
 }
 
-irqreturn_t bfin_can_interrupt(int irq, void *dev_id)
+static irqreturn_t bfin_can_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct bfin_can_priv *priv = netdev_priv(dev);
@@ -504,7 +504,7 @@ static int bfin_can_close(struct net_device *dev)
         return 0;
 }
 
-struct net_device *alloc_bfin_candev(void)
+static struct net_device *alloc_bfin_candev(void)
 {
         struct net_device *dev;
         struct bfin_can_priv *priv;
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 9aa0c64c33c8..8cda23bf0614 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -269,7 +269,7 @@ struct mcp251x_priv {
 #define MCP251X_IS(_model) \
 static inline int mcp251x_is_##_model(struct spi_device *spi) \
 { \
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); \
+        struct mcp251x_priv *priv = spi_get_drvdata(spi); \
         return priv->model == CAN_MCP251X_MCP##_model; \
 }
 
@@ -305,7 +305,7 @@ static void mcp251x_clean(struct net_device *net)
  */
 static int mcp251x_spi_trans(struct spi_device *spi, int len)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         struct spi_transfer t = {
                 .tx_buf = priv->spi_tx_buf,
                 .rx_buf = priv->spi_rx_buf,
@@ -333,7 +333,7 @@ static int mcp251x_spi_trans(struct spi_device *spi, int len)
 
 static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         u8 val = 0;
 
         priv->spi_tx_buf[0] = INSTRUCTION_READ;
@@ -348,7 +348,7 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)
 static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg,
                 uint8_t *v1, uint8_t *v2)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
 
         priv->spi_tx_buf[0] = INSTRUCTION_READ;
         priv->spi_tx_buf[1] = reg;
@@ -361,7 +361,7 @@ static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg,
 
 static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
 
         priv->spi_tx_buf[0] = INSTRUCTION_WRITE;
         priv->spi_tx_buf[1] = reg;
@@ -373,7 +373,7 @@ static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val)
 static void mcp251x_write_bits(struct spi_device *spi, u8 reg,
                                u8 mask, uint8_t val)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
 
         priv->spi_tx_buf[0] = INSTRUCTION_BIT_MODIFY;
         priv->spi_tx_buf[1] = reg;
@@ -386,7 +386,7 @@ static void mcp251x_write_bits(struct spi_device *spi, u8 reg,
 static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,
                                 int len, int tx_buf_idx)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
 
         if (mcp251x_is_2510(spi)) {
                 int i;
@@ -403,7 +403,7 @@ static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,
 static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame,
                           int tx_buf_idx)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         u32 sid, eid, exide, rtr;
         u8 buf[SPI_TRANSFER_BUF_LEN];
 
@@ -434,7 +434,7 @@ static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame,
 static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
                                 int buf_idx)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
 
         if (mcp251x_is_2510(spi)) {
                 int i, len;
@@ -454,7 +454,7 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
 
 static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         struct sk_buff *skb;
         struct can_frame *frame;
         u8 buf[SPI_TRANSFER_BUF_LEN];
@@ -550,7 +550,7 @@ static int mcp251x_do_set_mode(struct net_device *net, enum can_mode mode)
 
 static int mcp251x_set_normal_mode(struct spi_device *spi)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         unsigned long timeout;
 
         /* Enable interrupts */
@@ -620,7 +620,7 @@ static int mcp251x_setup(struct net_device *net, struct mcp251x_priv *priv,
 
 static int mcp251x_hw_reset(struct spi_device *spi)
 {
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         int ret;
         unsigned long timeout;
 
@@ -1026,7 +1026,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
                 CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY;
         priv->model = spi_get_device_id(spi)->driver_data;
         priv->net = net;
-        dev_set_drvdata(&spi->dev, priv);
+        spi_set_drvdata(spi, priv);
 
         priv->spi = spi;
         mutex_init(&priv->mcp_lock);
@@ -1124,7 +1124,7 @@ error_out:
 static int mcp251x_can_remove(struct spi_device *spi)
 {
         struct mcp251x_platform_data *pdata = spi->dev.platform_data;
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         struct net_device *net = priv->net;
 
         unregister_candev(net);
@@ -1144,11 +1144,13 @@ static int mcp251x_can_remove(struct spi_device *spi)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int mcp251x_can_suspend(struct spi_device *spi, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+
+static int mcp251x_can_suspend(struct device *dev)
 {
+        struct spi_device *spi = to_spi_device(dev);
         struct mcp251x_platform_data *pdata = spi->dev.platform_data;
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
         struct net_device *net = priv->net;
 
         priv->force_quit = 1;
@@ -1176,10 +1178,11 @@ static int mcp251x_can_suspend(struct spi_device *spi, pm_message_t state)
         return 0;
 }
 
-static int mcp251x_can_resume(struct spi_device *spi)
+static int mcp251x_can_resume(struct device *dev)
 {
+        struct spi_device *spi = to_spi_device(dev);
         struct mcp251x_platform_data *pdata = spi->dev.platform_data;
-        struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
+        struct mcp251x_priv *priv = spi_get_drvdata(spi);
 
         if (priv->after_suspend & AFTER_SUSPEND_POWER) {
                 pdata->power_enable(1);
@@ -1197,11 +1200,11 @@ static int mcp251x_can_resume(struct spi_device *spi)
         enable_irq(spi->irq);
         return 0;
 }
-#else
-#define mcp251x_can_suspend NULL
-#define mcp251x_can_resume NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend,
+        mcp251x_can_resume);
+
 static const struct spi_device_id mcp251x_id_table[] = {
         { "mcp2510",    CAN_MCP251X_MCP2510 },
         { "mcp2515",    CAN_MCP251X_MCP2515 },
@@ -1213,29 +1216,15 @@ MODULE_DEVICE_TABLE(spi, mcp251x_id_table);
 static struct spi_driver mcp251x_can_driver = {
         .driver = {
                 .name = DEVICE_NAME,
-                .bus = &spi_bus_type,
                 .owner = THIS_MODULE,
+                .pm = &mcp251x_can_pm_ops,
         },
 
         .id_table = mcp251x_id_table,
         .probe = mcp251x_can_probe,
         .remove = mcp251x_can_remove,
-        .suspend = mcp251x_can_suspend,
-        .resume = mcp251x_can_resume,
 };
-
-static int __init mcp251x_can_init(void)
-{
-        return spi_register_driver(&mcp251x_can_driver);
-}
-
-static void __exit mcp251x_can_exit(void)
-{
-        spi_unregister_driver(&mcp251x_can_driver);
-}
-
-module_init(mcp251x_can_init);
-module_exit(mcp251x_can_exit);
+module_spi_driver(mcp251x_can_driver);
 
 MODULE_AUTHOR("Chris Elston <celston@katalix.com>, "
               "Christian Pellegrin <chripell@evolware.org>");
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 36d298da2af6..3752342a678a 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -168,12 +168,12 @@ static inline int ems_pci_check_chan(const struct sja1000_priv *priv)
         unsigned char res;
 
         /* Make sure SJA1000 is in reset mode */
-        priv->write_reg(priv, REG_MOD, 1);
+        priv->write_reg(priv, SJA1000_MOD, 1);
 
-        priv->write_reg(priv, REG_CDR, CDR_PELICAN);
+        priv->write_reg(priv, SJA1000_CDR, CDR_PELICAN);
 
         /* read reset-values */
-        res = priv->read_reg(priv, REG_CDR);
+        res = priv->read_reg(priv, SJA1000_CDR);
 
         if (res == CDR_PELICAN)
                 return 1;
diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c
index 321c27e1c7fc..9e535f2ef52b 100644
--- a/drivers/net/can/sja1000/ems_pcmcia.c
+++ b/drivers/net/can/sja1000/ems_pcmcia.c
@@ -126,11 +126,11 @@ static irqreturn_t ems_pcmcia_interrupt(int irq, void *dev_id)
 static inline int ems_pcmcia_check_chan(struct sja1000_priv *priv)
 {
         /* Make sure SJA1000 is in reset mode */
-        ems_pcmcia_write_reg(priv, REG_MOD, 1);
-        ems_pcmcia_write_reg(priv, REG_CDR, CDR_PELICAN);
+        ems_pcmcia_write_reg(priv, SJA1000_MOD, 1);
+        ems_pcmcia_write_reg(priv, SJA1000_CDR, CDR_PELICAN);
 
         /* read reset-values */
-        if (ems_pcmcia_read_reg(priv, REG_CDR) == CDR_PELICAN)
+        if (ems_pcmcia_read_reg(priv, SJA1000_CDR) == CDR_PELICAN)
                 return 1;
 
         return 0;
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
index 37b0381f532e..217585b97cd3 100644
--- a/drivers/net/can/sja1000/kvaser_pci.c
+++ b/drivers/net/can/sja1000/kvaser_pci.c
@@ -159,9 +159,9 @@ static int number_of_sja1000_chip(void __iomem *base_addr)
         for (i = 0; i < MAX_NO_OF_CHANNELS; i++) {
                 /* reset chip */
                 iowrite8(MOD_RM, base_addr +
-                         (i * KVASER_PCI_PORT_BYTES) + REG_MOD);
+                         (i * KVASER_PCI_PORT_BYTES) + SJA1000_MOD);
                 status = ioread8(base_addr +
-                                 (i * KVASER_PCI_PORT_BYTES) + REG_MOD);
+                                 (i * KVASER_PCI_PORT_BYTES) + SJA1000_MOD);
                 /* check reset bit */
                 if (!(status & MOD_RM))
                         break;
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index d1e7f1006ddd..6b6f0ad75090 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -402,7 +402,7 @@ static void peak_pciec_write_reg(const struct sja1000_priv *priv,
         int c = (priv->reg_base - card->reg_base) / PEAK_PCI_CHAN_SIZE;
 
         /* sja1000 register changes control the leds state */
-        if (port == REG_MOD)
+        if (port == SJA1000_MOD)
                 switch (val) {
                 case MOD_RM:
                         /* Reset Mode: set led on */
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index 0a707f70661c..f7ad754dd2aa 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -196,7 +196,7 @@ static void pcan_write_canreg(const struct sja1000_priv *priv, int port, u8 v)
         int c = (priv->reg_base - card->ioport_addr) / PCC_CHAN_SIZE;
 
         /* sja1000 register changes control the leds state */
-        if (port == REG_MOD)
+        if (port == SJA1000_MOD)
                 switch (v) {
                 case MOD_RM:
                         /* Reset Mode: set led on */
@@ -509,11 +509,11 @@ static void pcan_free_channels(struct pcan_pccard *card)
 static inline int pcan_channel_present(struct sja1000_priv *priv)
 {
         /* make sure SJA1000 is in reset mode */
-        pcan_write_canreg(priv, REG_MOD, 1);
-        pcan_write_canreg(priv, REG_CDR, CDR_PELICAN);
+        pcan_write_canreg(priv, SJA1000_MOD, 1);
+        pcan_write_canreg(priv, SJA1000_CDR, CDR_PELICAN);
 
         /* read reset-values */
-        if (pcan_read_canreg(priv, REG_CDR) == CDR_PELICAN)
+        if (pcan_read_canreg(priv, SJA1000_CDR) == CDR_PELICAN)
                 return 1;
 
         return 0;
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 3c18d7d000ed..c52c1e96bf90 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -348,20 +348,20 @@ static inline int plx_pci_check_sja1000(const struct sja1000_priv *priv)
          */
         if ((priv->read_reg(priv, REG_CR) & REG_CR_BASICCAN_INITIAL_MASK) ==
             REG_CR_BASICCAN_INITIAL &&
-            (priv->read_reg(priv, SJA1000_REG_SR) == REG_SR_BASICCAN_INITIAL) &&
-            (priv->read_reg(priv, REG_IR) == REG_IR_BASICCAN_INITIAL))
+            (priv->read_reg(priv, SJA1000_SR) == REG_SR_BASICCAN_INITIAL) &&
+            (priv->read_reg(priv, SJA1000_IR) == REG_IR_BASICCAN_INITIAL))
                 flag = 1;
 
         /* Bring the SJA1000 into the PeliCAN mode*/
-        priv->write_reg(priv, REG_CDR, CDR_PELICAN);
+        priv->write_reg(priv, SJA1000_CDR, CDR_PELICAN);
 
         /*
          * Check registers after reset in the PeliCAN mode.
          * See states on p. 23 of the Datasheet.
          */
-        if (priv->read_reg(priv, REG_MOD) == REG_MOD_PELICAN_INITIAL &&
-            priv->read_reg(priv, SJA1000_REG_SR) == REG_SR_PELICAN_INITIAL &&
-            priv->read_reg(priv, REG_IR) == REG_IR_PELICAN_INITIAL)
+        if (priv->read_reg(priv, SJA1000_MOD) == REG_MOD_PELICAN_INITIAL &&
+            priv->read_reg(priv, SJA1000_SR) == REG_SR_PELICAN_INITIAL &&
+            priv->read_reg(priv, SJA1000_IR) == REG_IR_PELICAN_INITIAL)
                 return flag;
 
         return 0;
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index e4df307eaa90..7164a999f50f 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -91,14 +91,14 @@ static void sja1000_write_cmdreg(struct sja1000_priv *priv, u8 val)
          * the write_reg() operation - especially on SMP systems.
          */
         spin_lock_irqsave(&priv->cmdreg_lock, flags);
-        priv->write_reg(priv, REG_CMR, val);
-        priv->read_reg(priv, SJA1000_REG_SR);
+        priv->write_reg(priv, SJA1000_CMR, val);
+        priv->read_reg(priv, SJA1000_SR);
         spin_unlock_irqrestore(&priv->cmdreg_lock, flags);
 }
 
 static int sja1000_is_absent(struct sja1000_priv *priv)
 {
-        return (priv->read_reg(priv, REG_MOD) == 0xFF);
+        return (priv->read_reg(priv, SJA1000_MOD) == 0xFF);
 }
 
 static int sja1000_probe_chip(struct net_device *dev)
@@ -116,11 +116,11 @@ static int sja1000_probe_chip(struct net_device *dev)
 static void set_reset_mode(struct net_device *dev)
 {
         struct sja1000_priv *priv = netdev_priv(dev);
-        unsigned char status = priv->read_reg(priv, REG_MOD);
+        unsigned char status = priv->read_reg(priv, SJA1000_MOD);
         int i;
 
         /* disable interrupts */
-        priv->write_reg(priv, REG_IER, IRQ_OFF);
+        priv->write_reg(priv, SJA1000_IER, IRQ_OFF);
 
         for (i = 0; i < 100; i++) {
                 /* check reset bit */
@@ -129,9 +129,10 @@ static void set_reset_mode(struct net_device *dev)
                         return;
                 }
 
-                priv->write_reg(priv, REG_MOD, MOD_RM); /* reset chip */
+                /* reset chip */
+                priv->write_reg(priv, SJA1000_MOD, MOD_RM);
                 udelay(10);
-                status = priv->read_reg(priv, REG_MOD);
+                status = priv->read_reg(priv, SJA1000_MOD);
         }
 
         netdev_err(dev, "setting SJA1000 into reset mode failed!\n");
@@ -140,7 +141,7 @@ static void set_reset_mode(struct net_device *dev)
 static void set_normal_mode(struct net_device *dev)
 {
         struct sja1000_priv *priv = netdev_priv(dev);
-        unsigned char status = priv->read_reg(priv, REG_MOD);
+        unsigned char status = priv->read_reg(priv, SJA1000_MOD);
         int i;
 
         for (i = 0; i < 100; i++) {
@@ -149,22 +150,22 @@ static void set_normal_mode(struct net_device *dev)
                         priv->can.state = CAN_STATE_ERROR_ACTIVE;
                         /* enable interrupts */
                         if (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
-                                priv->write_reg(priv, REG_IER, IRQ_ALL);
+                                priv->write_reg(priv, SJA1000_IER, IRQ_ALL);
                         else
-                                priv->write_reg(priv, REG_IER,
+                                priv->write_reg(priv, SJA1000_IER,
                                                 IRQ_ALL & ~IRQ_BEI);
                         return;
                 }
 
                 /* set chip to normal mode */
                 if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
-                        priv->write_reg(priv, REG_MOD, MOD_LOM);
+                        priv->write_reg(priv, SJA1000_MOD, MOD_LOM);
                 else
-                        priv->write_reg(priv, REG_MOD, 0x00);
+                        priv->write_reg(priv, SJA1000_MOD, 0x00);
 
                 udelay(10);
 
-                status = priv->read_reg(priv, REG_MOD);
+                status = priv->read_reg(priv, SJA1000_MOD);
         }
 
         netdev_err(dev, "setting SJA1000 into normal mode failed!\n");
@@ -179,9 +180,9 @@ static void sja1000_start(struct net_device *dev)
                 set_reset_mode(dev);
 
         /* Clear error counters and error code capture */
-        priv->write_reg(priv, REG_TXERR, 0x0);
-        priv->write_reg(priv, REG_RXERR, 0x0);
-        priv->read_reg(priv, REG_ECC);
+        priv->write_reg(priv, SJA1000_TXERR, 0x0);
+        priv->write_reg(priv, SJA1000_RXERR, 0x0);
+        priv->read_reg(priv, SJA1000_ECC);
 
         /* leave reset mode */
         set_normal_mode(dev);
@@ -217,8 +218,8 @@ static int sja1000_set_bittiming(struct net_device *dev)
 
         netdev_info(dev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
-        priv->write_reg(priv, REG_BTR0, btr0);
-        priv->write_reg(priv, REG_BTR1, btr1);
+        priv->write_reg(priv, SJA1000_BTR0, btr0);
+        priv->write_reg(priv, SJA1000_BTR1, btr1);
 
         return 0;
 }
@@ -228,8 +229,8 @@ static int sja1000_get_berr_counter(const struct net_device *dev,
 {
         struct sja1000_priv *priv = netdev_priv(dev);
 
-        bec->txerr = priv->read_reg(priv, REG_TXERR);
-        bec->rxerr = priv->read_reg(priv, REG_RXERR);
+        bec->txerr = priv->read_reg(priv, SJA1000_TXERR);
+        bec->rxerr = priv->read_reg(priv, SJA1000_RXERR);
 
         return 0;
 }
@@ -247,20 +248,20 @@ static void chipset_init(struct net_device *dev)
         struct sja1000_priv *priv = netdev_priv(dev);
 
         /* set clock divider and output control register */
-        priv->write_reg(priv, REG_CDR, priv->cdr | CDR_PELICAN);
+        priv->write_reg(priv, SJA1000_CDR, priv->cdr | CDR_PELICAN);
 
         /* set acceptance filter (accept all) */
-        priv->write_reg(priv, REG_ACCC0, 0x00);
-        priv->write_reg(priv, REG_ACCC1, 0x00);
-        priv->write_reg(priv, REG_ACCC2, 0x00);
-        priv->write_reg(priv, REG_ACCC3, 0x00);
+        priv->write_reg(priv, SJA1000_ACCC0, 0x00);
+        priv->write_reg(priv, SJA1000_ACCC1, 0x00);
+        priv->write_reg(priv, SJA1000_ACCC2, 0x00);
+        priv->write_reg(priv, SJA1000_ACCC3, 0x00);
 
-        priv->write_reg(priv, REG_ACCM0, 0xFF);
-        priv->write_reg(priv, REG_ACCM1, 0xFF);
-        priv->write_reg(priv, REG_ACCM2, 0xFF);
-        priv->write_reg(priv, REG_ACCM3, 0xFF);
+        priv->write_reg(priv, SJA1000_ACCM0, 0xFF);
+        priv->write_reg(priv, SJA1000_ACCM1, 0xFF);
+        priv->write_reg(priv, SJA1000_ACCM2, 0xFF);
+        priv->write_reg(priv, SJA1000_ACCM3, 0xFF);
 
-        priv->write_reg(priv, REG_OCR, priv->ocr | OCR_MODE_NORMAL);
+        priv->write_reg(priv, SJA1000_OCR, priv->ocr | OCR_MODE_NORMAL);
 }
 
 /*
@@ -289,21 +290,21 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,
         id = cf->can_id;
 
         if (id & CAN_RTR_FLAG)
-                fi |= FI_RTR;
+                fi |= SJA1000_FI_RTR;
 
         if (id & CAN_EFF_FLAG) {
-                fi |= FI_FF;
-                dreg = EFF_BUF;
-                priv->write_reg(priv, REG_FI, fi);
-                priv->write_reg(priv, REG_ID1, (id & 0x1fe00000) >> (5 + 16));
-                priv->write_reg(priv, REG_ID2, (id & 0x001fe000) >> (5 + 8));
-                priv->write_reg(priv, REG_ID3, (id & 0x00001fe0) >> 5);
-                priv->write_reg(priv, REG_ID4, (id & 0x0000001f) << 3);
+                fi |= SJA1000_FI_FF;
+                dreg = SJA1000_EFF_BUF;
+                priv->write_reg(priv, SJA1000_FI, fi);
+                priv->write_reg(priv, SJA1000_ID1, (id & 0x1fe00000) >> 21);
+                priv->write_reg(priv, SJA1000_ID2, (id & 0x001fe000) >> 13);
+                priv->write_reg(priv, SJA1000_ID3, (id & 0x00001fe0) >> 5);
+                priv->write_reg(priv, SJA1000_ID4, (id & 0x0000001f) << 3);
         } else {
-                dreg = SFF_BUF;
-                priv->write_reg(priv, REG_FI, fi);
-                priv->write_reg(priv, REG_ID1, (id & 0x000007f8) >> 3);
-                priv->write_reg(priv, REG_ID2, (id & 0x00000007) << 5);
+                dreg = SJA1000_SFF_BUF;
+                priv->write_reg(priv, SJA1000_FI, fi);
+                priv->write_reg(priv, SJA1000_ID1, (id & 0x000007f8) >> 3);
+                priv->write_reg(priv, SJA1000_ID2, (id & 0x00000007) << 5);
         }
 
         for (i = 0; i < dlc; i++)
@@ -335,25 +336,25 @@ static void sja1000_rx(struct net_device *dev)
         if (skb == NULL)
                 return;
 
-        fi = priv->read_reg(priv, REG_FI);
+        fi = priv->read_reg(priv, SJA1000_FI);
 
-        if (fi & FI_FF) {
+        if (fi & SJA1000_FI_FF) {
                 /* extended frame format (EFF) */
-                dreg = EFF_BUF;
-                id = (priv->read_reg(priv, REG_ID1) << (5 + 16))
-                    | (priv->read_reg(priv, REG_ID2) << (5 + 8))
-                    | (priv->read_reg(priv, REG_ID3) << 5)
-                    | (priv->read_reg(priv, REG_ID4) >> 3);
+                dreg = SJA1000_EFF_BUF;
+                id = (priv->read_reg(priv, SJA1000_ID1) << 21)
+                    | (priv->read_reg(priv, SJA1000_ID2) << 13)
+                    | (priv->read_reg(priv, SJA1000_ID3) << 5)
+                    | (priv->read_reg(priv, SJA1000_ID4) >> 3);
                 id |= CAN_EFF_FLAG;
         } else {
                 /* standard frame format (SFF) */
-                dreg = SFF_BUF;
-                id = (priv->read_reg(priv, REG_ID1) << 3)
-                    | (priv->read_reg(priv, REG_ID2) >> 5);
+                dreg = SJA1000_SFF_BUF;
+                id = (priv->read_reg(priv, SJA1000_ID1) << 3)
+                    | (priv->read_reg(priv, SJA1000_ID2) >> 5);
         }
 
         cf->can_dlc = get_can_dlc(fi & 0x0F);
-        if (fi & FI_RTR) {
+        if (fi & SJA1000_FI_RTR) {
                 id |= CAN_RTR_FLAG;
         } else {
                 for (i = 0; i < cf->can_dlc; i++)
@@ -414,7 +415,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
                 priv->can.can_stats.bus_error++;
                 stats->rx_errors++;
 
-                ecc = priv->read_reg(priv, REG_ECC);
+                ecc = priv->read_reg(priv, SJA1000_ECC);
 
                 cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
 
@@ -448,7 +449,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
         if (isrc & IRQ_ALI) {
                 /* arbitration lost interrupt */
                 netdev_dbg(dev, "arbitration lost interrupt\n");
-                alc = priv->read_reg(priv, REG_ALC);
+                alc = priv->read_reg(priv, SJA1000_ALC);
                 priv->can.can_stats.arbitration_lost++;
                 stats->tx_errors++;
                 cf->can_id |= CAN_ERR_LOSTARB;
@@ -457,8 +458,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
         if (state != priv->can.state && (state == CAN_STATE_ERROR_WARNING ||
                                          state == CAN_STATE_ERROR_PASSIVE)) {
-                uint8_t rxerr = priv->read_reg(priv, REG_RXERR);
-                uint8_t txerr = priv->read_reg(priv, REG_TXERR);
+                uint8_t rxerr = priv->read_reg(priv, SJA1000_RXERR);
+                uint8_t txerr = priv->read_reg(priv, SJA1000_TXERR);
                 cf->can_id |= CAN_ERR_CRTL;
                 if (state == CAN_STATE_ERROR_WARNING) {
                         priv->can.can_stats.error_warning++;
@@ -494,15 +495,16 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
         int n = 0;
 
         /* Shared interrupts and IRQ off? */
-        if (priv->read_reg(priv, REG_IER) == IRQ_OFF)
+        if (priv->read_reg(priv, SJA1000_IER) == IRQ_OFF)
                 return IRQ_NONE;
 
         if (priv->pre_irq)
                 priv->pre_irq(priv);
 
-        while ((isrc = priv->read_reg(priv, REG_IR)) && (n < SJA1000_MAX_IRQ)) {
+        while ((isrc = priv->read_reg(priv, SJA1000_IR)) &&
+               (n < SJA1000_MAX_IRQ)) {
                 n++;
-                status = priv->read_reg(priv, SJA1000_REG_SR);
+                status = priv->read_reg(priv, SJA1000_SR);
                 /* check for absent controller due to hw unplug */
                 if (status == 0xFF && sja1000_is_absent(priv))
                         return IRQ_NONE;
@@ -519,7 +521,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                         } else {
                                 /* transmission complete */
                                 stats->tx_bytes +=
-                                        priv->read_reg(priv, REG_FI) & 0xf;
+                                        priv->read_reg(priv, SJA1000_FI) & 0xf;
                                 stats->tx_packets++;
                                 can_get_echo_skb(dev, 0);
                         }
@@ -530,7 +532,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                         /* receive interrupt */
                         while (status & SR_RBS) {
                                 sja1000_rx(dev);
-                                status = priv->read_reg(priv, SJA1000_REG_SR);
+                                status = priv->read_reg(priv, SJA1000_SR);
                                 /* check for absent controller */
                                 if (status == 0xFF && sja1000_is_absent(priv))
                                         return IRQ_NONE;
diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h
index aa48e053da27..9d46398f8154 100644
--- a/drivers/net/can/sja1000/sja1000.h
+++ b/drivers/net/can/sja1000/sja1000.h
@@ -54,46 +54,46 @@
 #define SJA1000_MAX_IRQ 20      /* max. number of interrupts handled in ISR */
 
 /* SJA1000 registers - manual section 6.4 (Pelican Mode) */
-#define REG_MOD         0x00
-#define REG_CMR         0x01
-#define SJA1000_REG_SR          0x02
-#define REG_IR          0x03
-#define REG_IER         0x04
-#define REG_ALC         0x0B
-#define REG_ECC         0x0C
-#define REG_EWL         0x0D
-#define REG_RXERR       0x0E
-#define REG_TXERR       0x0F
-#define REG_ACCC0       0x10
-#define REG_ACCC1       0x11
-#define REG_ACCC2       0x12
-#define REG_ACCC3       0x13
-#define REG_ACCM0       0x14
-#define REG_ACCM1       0x15
-#define REG_ACCM2       0x16
-#define REG_ACCM3       0x17
-#define REG_RMC         0x1D
-#define REG_RBSA        0x1E
+#define SJA1000_MOD             0x00
+#define SJA1000_CMR             0x01
+#define SJA1000_SR              0x02
+#define SJA1000_IR              0x03
+#define SJA1000_IER             0x04
+#define SJA1000_ALC             0x0B
+#define SJA1000_ECC             0x0C
+#define SJA1000_EWL             0x0D
+#define SJA1000_RXERR           0x0E
+#define SJA1000_TXERR           0x0F
+#define SJA1000_ACCC0           0x10
+#define SJA1000_ACCC1           0x11
+#define SJA1000_ACCC2           0x12
+#define SJA1000_ACCC3           0x13
+#define SJA1000_ACCM0           0x14
+#define SJA1000_ACCM1           0x15
+#define SJA1000_ACCM2           0x16
+#define SJA1000_ACCM3           0x17
+#define SJA1000_RMC             0x1D
+#define SJA1000_RBSA            0x1E
 
 /* Common registers - manual section 6.5 */
-#define REG_BTR0        0x06
-#define REG_BTR1        0x07
-#define REG_OCR         0x08
-#define REG_CDR         0x1F
+#define SJA1000_BTR0            0x06
+#define SJA1000_BTR1            0x07
+#define SJA1000_OCR             0x08
+#define SJA1000_CDR             0x1F
 
-#define REG_FI          0x10
-#define SFF_BUF         0x13
-#define EFF_BUF         0x15
+#define SJA1000_FI              0x10
+#define SJA1000_SFF_BUF         0x13
+#define SJA1000_EFF_BUF         0x15
 
-#define FI_FF           0x80
-#define FI_RTR          0x40
+#define SJA1000_FI_FF           0x80
+#define SJA1000_FI_RTR          0x40
 
-#define REG_ID1         0x11
-#define REG_ID2         0x12
-#define REG_ID3         0x13
-#define REG_ID4         0x14
+#define SJA1000_ID1             0x11
+#define SJA1000_ID2             0x12
+#define SJA1000_ID3             0x13
+#define SJA1000_ID4             0x14
 
-#define CAN_RAM         0x20
+#define SJA1000_CAN_RAM         0x20
 
 /* mode register */
 #define MOD_RM          0x01
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index f36ff99fd394..adb4bf5eb4b4 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -306,6 +306,7 @@ static int el3_isa_match(struct device *pdev, unsigned int ndev)
         if (!dev)
                 return -ENOMEM;
 
+        SET_NETDEV_DEV(dev, pdev);
         netdev_boot_setup_check(dev);
 
         if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) {
@@ -595,6 +596,7 @@ static int __init el3_eisa_probe (struct device *device)
                 return -ENOMEM;
         }
 
+        SET_NETDEV_DEV(dev, device);
         netdev_boot_setup_check(dev);
 
         el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA);
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 27aaaf99e73e..144942f6372b 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -1690,7 +1690,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read
                         skb_checksum_none_assert(new_skb);
 
                 if (rx->rxStatus & TYPHOON_RX_VLAN)
-                        __vlan_hwaccel_put_tag(new_skb,
+                        __vlan_hwaccel_put_tag(new_skb, htons(ETH_P_8021Q),
                                                ntohl(rx->vlanTag) & 0xffff);
                 netif_receive_skb(new_skb);
 
@@ -2445,9 +2445,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
          * settings -- so we only allow the user to toggle the TX processing.
          */
         dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-                NETIF_F_HW_VLAN_TX;
+                NETIF_F_HW_VLAN_CTAG_TX;
         dev->features = dev->hw_features |
-                NETIF_F_HW_VLAN_RX | NETIF_F_RXCSUM;
+                NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_RXCSUM;
 
         if(register_netdev(dev) < 0) {
                 err_msg = "unable to register netdev";
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index 549b77500579..8b04bfc20cfb 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -594,7 +594,8 @@ static const struct ethtool_ops ethtool_ops;
 
 
 #ifdef VLAN_SUPPORT
-static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int netdev_vlan_rx_add_vid(struct net_device *dev,
+                                  __be16 proto, u16 vid)
 {
         struct netdev_private *np = netdev_priv(dev);
 
@@ -608,7 +609,8 @@ static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
         return 0;
 }
 
-static int netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int netdev_vlan_rx_kill_vid(struct net_device *dev,
+                                   __be16 proto, u16 vid)
 {
         struct netdev_private *np = netdev_priv(dev);
 
@@ -702,7 +704,7 @@ static int starfire_init_one(struct pci_dev *pdev,
 #endif /* ZEROCOPY */
 
 #ifdef VLAN_SUPPORT
-        dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+        dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER;
 #endif /* VLAN_RX_KILL_VID */
 #ifdef ADDR_64BITS
         dev->features |= NETIF_F_HIGHDMA;
@@ -1496,7 +1498,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                                 printk(KERN_DEBUG "  netdev_rx() vlanid = %d\n",
                                        vlid);
                         }
-                        __vlan_hwaccel_put_tag(skb, vlid);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlid);
                 }
 #endif /* VLAN_SUPPORT */
                 netif_receive_skb(skb);
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index a175d0be1ae1..ee705771bd2c 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -188,10 +188,9 @@ static int desc_list_init(struct net_device *dev)
 
                 /* allocate a new skb for next time receive */
                 new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN);
-                if (!new_skb) {
-                        pr_notice("init: low on mem - packet dropped\n");
+                if (!new_skb)
                         goto init_error;
-                }
+
                 skb_reserve(new_skb, NET_IP_ALIGN);
                 /* Invidate the data cache of skb->data range when it is write back
                  * cache. It will prevent overwritting the new data from DMA
@@ -1236,7 +1235,6 @@ static void bfin_mac_rx(struct net_device *dev)
 
         new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN);
         if (!new_skb) {
-                netdev_notice(dev, "rx: low on mem - packet dropped\n");
                 dev->stats.rx_dropped++;
                 goto out;
         }
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 0be2195e5034..269295403fc4 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1464,35 +1464,23 @@ static int greth_of_probe(struct platform_device *ofdev)
         }
 
         /* Allocate TX descriptor ring in coherent memory */
-        greth->tx_bd_base = (struct greth_bd *) dma_alloc_coherent(greth->dev,
-                                                                   1024,
-                                                                   &greth->tx_bd_base_phys,
-                                                                   GFP_KERNEL);
-
+        greth->tx_bd_base = dma_alloc_coherent(greth->dev, 1024,
+                                               &greth->tx_bd_base_phys,
+                                               GFP_KERNEL | __GFP_ZERO);
         if (!greth->tx_bd_base) {
-                if (netif_msg_probe(greth))
-                        dev_err(&dev->dev, "could not allocate descriptor memory.\n");
                 err = -ENOMEM;
                 goto error3;
         }
 
-        memset(greth->tx_bd_base, 0, 1024);
-
         /* Allocate RX descriptor ring in coherent memory */
-        greth->rx_bd_base = (struct greth_bd *) dma_alloc_coherent(greth->dev,
-                                                                   1024,
-                                                                   &greth->rx_bd_base_phys,
-                                                                   GFP_KERNEL);
-
+        greth->rx_bd_base = dma_alloc_coherent(greth->dev, 1024,
+                                               &greth->rx_bd_base_phys,
+                                               GFP_KERNEL | __GFP_ZERO);
         if (!greth->rx_bd_base) {
-                if (netif_msg_probe(greth))
-                        dev_err(greth->dev, "could not allocate descriptor memory.\n");
                 err = -ENOMEM;
                 goto error4;
         }
 
-        memset(greth->rx_bd_base, 0, 1024);
-
         /* Get MAC address from: module param, OF property or ID prom */
         for (i = 0; i < 6; i++) {
                 if (macaddr[i] != 0)
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index c0bc41a784ca..b7894f8af9d1 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -472,7 +472,7 @@ static int acenic_probe_one(struct pci_dev *pdev,
         ap->name = pci_name(pdev);
 
         dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
 
         dev->watchdog_timeo = 5*HZ;
 
@@ -2019,7 +2019,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
 
                 /* send it up */
                 if ((bd_flags & BD_FLG_VLAN_TAG))
-                        __vlan_hwaccel_put_tag(skb, retdesc->vlan);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), retdesc->vlan);
                 netif_rx(skb);
 
                 dev->stats.rx_packets++;
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index 6e722dc37db7..65926a956575 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -318,8 +318,6 @@ static int lance_rx (struct net_device *dev)
                         struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 
                         if (!skb) {
-                                printk ("%s: Memory squeeze, deferring packet.\n",
-                                        dev->name);
                                 dev->stats.rx_dropped++;
                                 rd->mblength = 0;
                                 rd->rmd1_bits = LE_R1_OWN;
diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index 3789affbc0e5..0866e7627433 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -293,7 +293,6 @@ static int lance_rx(struct net_device *dev)
                         struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 
                         if (!skb) {
-                                netdev_warn(dev, "Memory squeeze, deferring packet\n");
                                 dev->stats.rx_dropped++;
                                 rd->mblength = 0;
                                 rd->rmd1_bits = LE_R1_OWN;
diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index 60e2b701afe7..9793767996a2 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -528,7 +528,6 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
                         dev->stats.rx_packets++;
                 } else {
                         am_writeword (dev, hdraddr + 2, RMD_OWN);
-                        printk (KERN_WARNING "%s: memory squeeze, dropping packet.\n", dev->name);
                         dev->stats.rx_dropped++;
                         break;
                 }
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 42d4e6ad58a5..8e6b665a6726 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -793,7 +793,7 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
 #if AMD8111E_VLAN_TAG_USED
                         if (vtag == TT_VLAN_TAGGED){
                                 u16 vlan_tag = le16_to_cpu(lp->rx_ring[rx_index].tag_ctrl_info);
-                                __vlan_hwaccel_put_tag(skb, vlan_tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                         }
 #endif
                         netif_receive_skb(skb);
@@ -1869,7 +1869,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
         SET_NETDEV_DEV(dev, &pdev->dev);
 
 #if AMD8111E_VLAN_TAG_USED
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX ;
+        dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX ;
 #endif
 
         lp = netdev_priv(dev);
@@ -1907,7 +1907,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
         netif_napi_add(dev, &lp->napi, amd8111e_rx_poll, 32);
 
 #if AMD8111E_VLAN_TAG_USED
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
 #endif
         /* Probe the external PHY */
         amd8111e_probe_ext_phy(dev);
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index 98f4522fd17b..c178eb4c8166 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -193,7 +193,6 @@ static int ariadne_rx(struct net_device *dev)
 
                         skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) {
-                                netdev_warn(dev, "Memory squeeze, deferring packet\n");
                                 for (i = 0; i < RX_RING_SIZE; i++)
                                         if (lowb(priv->rx_ring[(entry + i) % RX_RING_SIZE]->RMD1) & RF_OWN)
                                                 break;
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 84219df72f51..e8d0ef508f48 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -996,8 +996,6 @@ static int lance_rx( struct net_device *dev )
                         else {
                                 skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL) {
-                                        DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
-                                                                  dev->name ));
                                         for( i = 0; i < RX_RING_SIZE; i++ )
                                                 if (MEM->rx_head[(entry+i) & RX_RING_MOD_MASK].flag &
                                                         RMD1_OWN_CHIP)
@@ -1149,9 +1147,7 @@ static struct net_device *atarilance_dev;
 static int __init atarilance_module_init(void)
 {
         atarilance_dev = atarilance_probe(-1);
-        if (IS_ERR(atarilance_dev))
-                return PTR_ERR(atarilance_dev);
-        return 0;
+        return PTR_RET(atarilance_dev);
 }
 
 static void __exit atarilance_module_exit(void)
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index de774d419144..688aede742c7 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -727,7 +727,6 @@ static int au1000_rx(struct net_device *dev)
                         frmlen -= 4; /* Remove FCS */
                         skb = netdev_alloc_skb(dev, frmlen + 2);
                         if (skb == NULL) {
-                                netdev_err(dev, "Memory squeeze, dropping packet.\n");
                                 dev->stats.rx_dropped++;
                                 continue;
                         }
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index baca0bd1b393..3d86ffeb4e15 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -607,8 +607,6 @@ static int lance_rx(struct net_device *dev)
                         skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == 0) {
-                                printk("%s: Memory squeeze, deferring packet.\n",
-                                       dev->name);
                                 dev->stats.rx_dropped++;
                                 *rds_ptr(rd, mblength, lp->type) = 0;
                                 *rds_ptr(rd, rmd1, lp->type) =
diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
index 9af3c307862c..a51497c9d2af 100644
--- a/drivers/net/ethernet/amd/mvme147.c
+++ b/drivers/net/ethernet/amd/mvme147.c
@@ -188,9 +188,7 @@ static struct net_device *dev_mvme147_lance;
 int __init init_module(void)
 {
         dev_mvme147_lance = mvme147lance_probe(-1);
-        if (IS_ERR(dev_mvme147_lance))
-                return PTR_ERR(dev_mvme147_lance);
-        return 0;
+        return PTR_RET(dev_mvme147_lance);
 }
 
 void __exit cleanup_module(void)
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 013b65108536..26fc0ce0faa3 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -1238,7 +1238,7 @@ MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");
 int __init init_module(void)
 {
         dev_ni65 = ni65_probe(-1);
-        return IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0;
+        return PTR_RET(dev_ni65);
 }
 
 void __exit cleanup_module(void)
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 797f847edf13..ed2130727643 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1166,7 +1166,6 @@ static void pcnet32_rx_entry(struct net_device *dev,
                 skb = netdev_alloc_skb(dev, pkt_len + NET_IP_ALIGN);
 
         if (skb == NULL) {
-                netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
                 dev->stats.rx_dropped++;
                 return;
         }
diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index 74b3891b6483..4375abe61da1 100644
--- a/drivers/net/ethernet/amd/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c
@@ -812,9 +812,6 @@ static int lance_rx( struct net_device *dev )
                         else {
                                 skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL) {
-                                        DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
-                                                      dev->name ));
-
                                         dev->stats.rx_dropped++;
                                         head->msg_length = 0;
                                         head->flag |= RMD1_OWN_CHIP;
@@ -943,9 +940,7 @@ static struct net_device *sun3lance_dev;
 int __init init_module(void)
 {
         sun3lance_dev = sun3lance_probe(-1);
-        if (IS_ERR(sun3lance_dev))
-                return PTR_ERR(sun3lance_dev);
-        return 0;
+        return PTR_RET(sun3lance_dev);
 }
 
 void __exit cleanup_module(void)
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 6a40290d3727..f47b780892e9 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -536,8 +536,6 @@ static void lance_rx_dvma(struct net_device *dev)
                         skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == NULL) {
-                                printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
-                                       dev->name);
                                 dev->stats.rx_dropped++;
                                 rd->mblength = 0;
                                 rd->rmd1_bits = LE_R1_OWN;
@@ -708,8 +706,6 @@ static void lance_rx_pio(struct net_device *dev)
                         skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == NULL) {
-                                printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
-                                       dev->name);
                                 dev->stats.rx_dropped++;
                                 sbus_writew(0, &rd->mblength);
                                 sbus_writeb(LE_R1_OWN, &rd->rmd1_bits);
@@ -1377,10 +1373,9 @@ static int sparc_lance_probe_one(struct platform_device *op,
                         dma_alloc_coherent(&op->dev,
                                            sizeof(struct lance_init_block),
                                            &lp->init_block_dvma, GFP_ATOMIC);
-                if (!lp->init_block_mem) {
-                        printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");
+                if (!lp->init_block_mem)
                         goto fail;
-                }
+
                 lp->pio_buffer = 0;
                 lp->init_ring = lance_init_ring_dvma;
                 lp->rx = lance_rx_dvma;
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index a206779c68cf..4ce8ceb62205 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -386,20 +386,16 @@ static int mace_open(struct net_device *dev)
         /* Allocate the DMA ring buffers */
 
         mp->tx_ring = dma_alloc_coherent(mp->device,
-                        N_TX_RING * MACE_BUFF_SIZE,
-                        &mp->tx_ring_phys, GFP_KERNEL);
-        if (mp->tx_ring == NULL) {
-                printk(KERN_ERR "%s: unable to allocate DMA tx buffers\n", dev->name);
+                                         N_TX_RING * MACE_BUFF_SIZE,
+                                         &mp->tx_ring_phys, GFP_KERNEL);
+        if (mp->tx_ring == NULL)
                 goto out1;
-        }
 
         mp->rx_ring = dma_alloc_coherent(mp->device,
-                        N_RX_RING * MACE_BUFF_SIZE,
-                        &mp->rx_ring_phys, GFP_KERNEL);
-        if (mp->rx_ring == NULL) {
-                printk(KERN_ERR "%s: unable to allocate DMA rx buffers\n", dev->name);
+                                         N_RX_RING * MACE_BUFF_SIZE,
+                                         &mp->rx_ring_phys, GFP_KERNEL);
+        if (mp->rx_ring == NULL)
                 goto out2;
-        }
 
         mace_dma_off(dev);
 
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 1f07fc633ab9..0ba900762b13 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -417,7 +417,7 @@ static void atl1c_set_multi(struct net_device *netdev)
 
 static void __atl1c_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data)
 {
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* enable VLAN tag insert/strip */
                 *mac_ctrl_data |= MAC_CTRL_RMV_VLAN;
         } else {
@@ -494,10 +494,10 @@ static netdev_features_t atl1c_fix_features(struct net_device *netdev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         if (netdev->mtu > MAX_TSO_FRAME_SIZE)
                 features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
@@ -510,7 +510,7 @@ static int atl1c_set_features(struct net_device *netdev,
 {
         netdev_features_t changed = netdev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 atl1c_vlan_mode(netdev, features);
 
         return 0;
@@ -1809,7 +1809,7 @@ rrs_checked:
 
                         AT_TAG_TO_VLAN(rrs->vlan_tag, vlan);
                         vlan = le16_to_cpu(vlan);
-                        __vlan_hwaccel_put_tag(skb, vlan);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
                 }
                 netif_receive_skb(skb);
 
@@ -2475,13 +2475,13 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         atl1c_set_ethtool_ops(netdev);
 
         /* TODO: add when ready */
-        netdev->hw_features =   NETIF_F_SG         |
-                                NETIF_F_HW_CSUM    |
-                                NETIF_F_HW_VLAN_RX |
-                                NETIF_F_TSO        |
+        netdev->hw_features =   NETIF_F_SG              |
+                                NETIF_F_HW_CSUM         |
+                                NETIF_F_HW_VLAN_CTAG_RX |
+                                NETIF_F_TSO             |
                                 NETIF_F_TSO6;
-        netdev->features =      netdev->hw_features |
-                                NETIF_F_HW_VLAN_TX;
+        netdev->features =      netdev->hw_features     |
+                                NETIF_F_HW_VLAN_CTAG_TX;
         return 0;
 }
 
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index ac25f05ff68f..0688bb82b442 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -315,7 +315,7 @@ static void atl1e_set_multi(struct net_device *netdev)
 
 static void __atl1e_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data)
 {
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* enable VLAN tag insert/strip */
                 *mac_ctrl_data |= MAC_CTRL_RMV_VLAN;
         } else {
@@ -378,10 +378,10 @@ static netdev_features_t atl1e_fix_features(struct net_device *netdev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -391,7 +391,7 @@ static int atl1e_set_features(struct net_device *netdev,
 {
         netdev_features_t changed = netdev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 atl1e_vlan_mode(netdev, features);
 
         return 0;
@@ -1420,11 +1420,9 @@ static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que,
                         packet_size = ((prrs->word1 >> RRS_PKT_SIZE_SHIFT) &
                                         RRS_PKT_SIZE_MASK) - 4; /* CRC */
                         skb = netdev_alloc_skb_ip_align(netdev, packet_size);
-                        if (skb == NULL) {
-                                netdev_warn(netdev,
-                                            "Memory squeeze, deferring packet\n");
+                        if (skb == NULL)
                                 goto skip_pkt;
-                        }
+
                         memcpy(skb->data, (u8 *)(prrs + 1), packet_size);
                         skb_put(skb, packet_size);
                         skb->protocol = eth_type_trans(skb, netdev);
@@ -1437,7 +1435,7 @@ static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que,
                                 netdev_dbg(netdev,
                                            "RXD VLAN TAG<RRD>=0x%04x\n",
                                            prrs->vtag);
-                                __vlan_hwaccel_put_tag(skb, vlan_tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                         }
                         netif_receive_skb(skb);
 
@@ -2200,9 +2198,9 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         atl1e_set_ethtool_ops(netdev);
 
         netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |
-                              NETIF_F_HW_VLAN_RX;
+                              NETIF_F_HW_VLAN_CTAG_RX;
         netdev->features = netdev->hw_features | NETIF_F_LLTX |
-                           NETIF_F_HW_VLAN_TX;
+                           NETIF_F_HW_VLAN_CTAG_TX;
 
         return 0;
 }
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 5b0d9931c720..fa0915f3999b 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -2024,7 +2024,7 @@ rrd_ok:
                                         ((rrd->vlan_tag & 7) << 13) |
                                         ((rrd->vlan_tag & 8) << 9);
 
-                        __vlan_hwaccel_put_tag(skb, vlan_tag);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                 }
                 netif_receive_skb(skb);
 
@@ -2774,7 +2774,7 @@ static int atl1_close(struct net_device *netdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atl1_suspend(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
@@ -2876,23 +2876,18 @@ static int atl1_resume(struct device *dev)
 
         return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
-#define ATL1_PM_OPS     (&atl1_pm_ops)
-
-#else
-
-static int atl1_suspend(struct device *dev) { return 0; }
-
-#define ATL1_PM_OPS     NULL
-#endif
 
 static void atl1_shutdown(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1_adapter *adapter = netdev_priv(netdev);
 
+#ifdef CONFIG_PM_SLEEP
         atl1_suspend(&pdev->dev);
+#endif
         pci_wake_from_d3(pdev, adapter->wol);
         pci_set_power_state(pdev, PCI_D3hot);
 }
@@ -3023,10 +3018,10 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netdev->features = NETIF_F_HW_CSUM;
         netdev->features |= NETIF_F_SG;
-        netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
+        netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
 
         netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO |
-                              NETIF_F_HW_VLAN_RX;
+                              NETIF_F_HW_VLAN_CTAG_RX;
 
         /* is this valid? see atl1_setup_mac_ctrl() */
         netdev->features |= NETIF_F_RXCSUM;
@@ -3147,7 +3142,7 @@ static struct pci_driver atl1_driver = {
         .probe = atl1_probe,
         .remove = atl1_remove,
         .shutdown = atl1_shutdown,
-        .driver.pm = ATL1_PM_OPS,
+        .driver.pm = &atl1_pm_ops,
 };
 
 /**
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 1278b47022e0..265ce1b752ed 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -363,7 +363,7 @@ static inline void atl2_irq_disable(struct atl2_adapter *adapter)
 
 static void __atl2_vlan_mode(netdev_features_t features, u32 *ctrl)
 {
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* enable VLAN tag insert/strip */
                 *ctrl |= MAC_CTRL_RMV_VLAN;
         } else {
@@ -399,10 +399,10 @@ static netdev_features_t atl2_fix_features(struct net_device *netdev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -412,7 +412,7 @@ static int atl2_set_features(struct net_device *netdev,
 {
         netdev_features_t changed = netdev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 atl2_vlan_mode(netdev, features);
 
         return 0;
@@ -437,9 +437,6 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                         /* alloc new buffer */
                         skb = netdev_alloc_skb_ip_align(netdev, rx_size);
                         if (NULL == skb) {
-                                printk(KERN_WARNING
-                                        "%s: Mem squeeze, deferring packet.\n",
-                                        netdev->name);
                                 /*
                                  * Check that some rx space is free. If not,
                                  * free one and mark stats->rx_dropped++.
@@ -455,7 +452,7 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                                         ((rxd->status.vtag&7) << 13) |
                                         ((rxd->status.vtag&8) << 9);
 
-                                __vlan_hwaccel_put_tag(skb, vlan_tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                         }
                         netif_rx(skb);
                         netdev->stats.rx_bytes += rx_size;
@@ -890,7 +887,7 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
                         skb->len-copy_len);
                 offset = ((u32)(skb->len-copy_len + 3) & ~3);
         }
-#ifdef NETIF_F_HW_VLAN_TX
+#ifdef NETIF_F_HW_VLAN_CTAG_TX
         if (vlan_tx_tag_present(skb)) {
                 u16 vlan_tag = vlan_tx_tag_get(skb);
                 vlan_tag = (vlan_tag << 4) |
@@ -1416,8 +1413,8 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         err = -EIO;
 
-        netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_RX;
-        netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
+        netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX;
+        netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
 
         /* Init PHY as early as possible due to power saving issue  */
         atl2_phy_init(&adapter->hw);
diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
index f82eb1699464..46a622cceee4 100644
--- a/drivers/net/ethernet/atheros/atlx/atlx.c
+++ b/drivers/net/ethernet/atheros/atlx/atlx.c
@@ -220,7 +220,7 @@ static void atlx_link_chg_task(struct work_struct *work)
 
 static void __atlx_vlan_mode(netdev_features_t features, u32 *ctrl)
 {
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* enable VLAN tag insert/strip */
                 *ctrl |= MAC_CTRL_RMV_VLAN;
         } else {
@@ -257,10 +257,10 @@ static netdev_features_t atlx_fix_features(struct net_device *netdev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -270,7 +270,7 @@ static int atlx_set_features(struct net_device *netdev,
 {
         netdev_features_t changed = netdev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 atlx_vlan_mode(netdev, features);
 
         return 0;
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 7d81e059e811..0b3e23ec37f7 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -862,27 +862,25 @@ static int bcm_enet_open(struct net_device *dev)
 
         /* allocate rx dma ring */
         size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
-        p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma,
+                               GFP_KERNEL | __GFP_ZERO);
         if (!p) {
-                dev_err(kdev, "cannot allocate rx ring %u\n", size);
                 ret = -ENOMEM;
                 goto out_freeirq_tx;
         }
 
-        memset(p, 0, size);
         priv->rx_desc_alloc_size = size;
         priv->rx_desc_cpu = p;
 
         /* allocate tx dma ring */
         size = priv->tx_ring_size * sizeof(struct bcm_enet_desc);
-        p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma,
+                               GFP_KERNEL | __GFP_ZERO);
         if (!p) {
-                dev_err(kdev, "cannot allocate tx ring\n");
                 ret = -ENOMEM;
                 goto out_free_rx_ring;
         }
 
-        memset(p, 0, size);
         priv->tx_desc_alloc_size = size;
         priv->tx_desc_cpu = p;
 
@@ -1619,7 +1617,6 @@ static int bcm_enet_probe(struct platform_device *pdev)
         struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
         struct mii_bus *bus;
         const char *clk_name;
-        unsigned int iomem_size;
         int i, ret;
 
         /* stop if shared driver failed, assume driver->probe will be
@@ -1644,17 +1641,12 @@ static int bcm_enet_probe(struct platform_device *pdev)
         if (ret)
                 goto out;
 
-        iomem_size = resource_size(res_mem);
-        if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
-                ret = -EBUSY;
-                goto out;
-        }
-
-        priv->base = ioremap(res_mem->start, iomem_size);
+        priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
         if (priv->base == NULL) {
                 ret = -ENOMEM;
-                goto out_release_mem;
+                goto out;
         }
+
         dev->irq = priv->irq = res_irq->start;
         priv->irq_rx = res_irq_rx->start;
         priv->irq_tx = res_irq_tx->start;
@@ -1674,9 +1666,9 @@ static int bcm_enet_probe(struct platform_device *pdev)
         priv->mac_clk = clk_get(&pdev->dev, clk_name);
         if (IS_ERR(priv->mac_clk)) {
                 ret = PTR_ERR(priv->mac_clk);
-                goto out_unmap;
+                goto out;
         }
-        clk_enable(priv->mac_clk);
+        clk_prepare_enable(priv->mac_clk);
 
         /* initialize default and fetch platform data */
         priv->rx_ring_size = BCMENET_DEF_RX_DESC;
@@ -1705,7 +1697,7 @@ static int bcm_enet_probe(struct platform_device *pdev)
                         priv->phy_clk = NULL;
                         goto out_put_clk_mac;
                 }
-                clk_enable(priv->phy_clk);
+                clk_prepare_enable(priv->phy_clk);
         }
 
         /* do minimal hardware init to be able to probe mii bus */
@@ -1733,7 +1725,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
                  * if a slave is not present on hw */
                 bus->phy_mask = ~(1 << priv->phy_id);
 
-                bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+                bus->irq = devm_kzalloc(&pdev->dev, sizeof(int) * PHY_MAX_ADDR,
+                                        GFP_KERNEL);
                 if (!bus->irq) {
                         ret = -ENOMEM;
                         goto out_free_mdio;
@@ -1794,10 +1787,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
         return 0;
 
 out_unregister_mdio:
-        if (priv->mii_bus) {
+        if (priv->mii_bus)
                 mdiobus_unregister(priv->mii_bus);
-                kfree(priv->mii_bus->irq);
-        }
 
 out_free_mdio:
         if (priv->mii_bus)
@@ -1807,19 +1798,13 @@ out_uninit_hw:
         /* turn off mdc clock */
         enet_writel(priv, 0, ENET_MIISC_REG);
         if (priv->phy_clk) {
-                clk_disable(priv->phy_clk);
+                clk_disable_unprepare(priv->phy_clk);
                 clk_put(priv->phy_clk);
         }
 
 out_put_clk_mac:
-        clk_disable(priv->mac_clk);
+        clk_disable_unprepare(priv->mac_clk);
         clk_put(priv->mac_clk);
-
-out_unmap:
-        iounmap(priv->base);
-
-out_release_mem:
-        release_mem_region(res_mem->start, iomem_size);
 out:
         free_netdev(dev);
         return ret;
@@ -1833,7 +1818,6 @@ static int bcm_enet_remove(struct platform_device *pdev)
 {
         struct bcm_enet_priv *priv;
         struct net_device *dev;
-        struct resource *res;
 
         /* stop netdevice */
         dev = platform_get_drvdata(pdev);
@@ -1845,7 +1829,6 @@ static int bcm_enet_remove(struct platform_device *pdev)
 
         if (priv->has_phy) {
                 mdiobus_unregister(priv->mii_bus);
-                kfree(priv->mii_bus->irq);
                 mdiobus_free(priv->mii_bus);
         } else {
                 struct bcm63xx_enet_platform_data *pd;
@@ -1856,17 +1839,12 @@ static int bcm_enet_remove(struct platform_device *pdev)
                                        bcm_enet_mdio_write_mii);
         }
 
-        /* release device resources */
-        iounmap(priv->base);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
-
         /* disable hw block clocks */
         if (priv->phy_clk) {
-                clk_disable(priv->phy_clk);
+                clk_disable_unprepare(priv->phy_clk);
                 clk_put(priv->phy_clk);
         }
-        clk_disable(priv->mac_clk);
+        clk_disable_unprepare(priv->mac_clk);
         clk_put(priv->mac_clk);
 
         platform_set_drvdata(pdev, NULL);
@@ -1889,31 +1867,20 @@ struct platform_driver bcm63xx_enet_driver = {
 static int bcm_enet_shared_probe(struct platform_device *pdev)
 {
         struct resource *res;
-        unsigned int iomem_size;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
                 return -ENODEV;
 
-        iomem_size = resource_size(res);
-        if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma"))
-                return -EBUSY;
-
-        bcm_enet_shared_base = ioremap(res->start, iomem_size);
-        if (!bcm_enet_shared_base) {
-                release_mem_region(res->start, iomem_size);
+        bcm_enet_shared_base = devm_request_and_ioremap(&pdev->dev, res);
+        if (!bcm_enet_shared_base)
                 return -ENOMEM;
-        }
+
         return 0;
 }
 
 static int bcm_enet_shared_remove(struct platform_device *pdev)
 {
-        struct resource *res;
-
-        iounmap(bcm_enet_shared_base);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
         return 0;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index da5f4397f87c..eec0af45b859 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
+#include <linux/phy.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <bcm47xx_nvram.h>
@@ -244,10 +245,8 @@ static int bgmac_dma_rx_skb_for_slot(struct bgmac *bgmac,
 
         /* Alloc skb */
         slot->skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
-        if (!slot->skb) {
-                bgmac_err(bgmac, "Allocation of skb failed!\n");
+        if (!slot->skb)
                 return -ENOMEM;
-        }
 
         /* Poison - if everything goes fine, hardware will overwrite it */
         rx = (struct bgmac_rx_header *)slot->skb->data;
@@ -1313,6 +1312,73 @@ static const struct ethtool_ops bgmac_ethtool_ops = {
 };
 
 /**************************************************
+ * MII
+ **************************************************/
+
+static int bgmac_mii_read(struct mii_bus *bus, int mii_id, int regnum)
+{
+        return bgmac_phy_read(bus->priv, mii_id, regnum);
+}
+
+static int bgmac_mii_write(struct mii_bus *bus, int mii_id, int regnum,
+                           u16 value)
+{
+        return bgmac_phy_write(bus->priv, mii_id, regnum, value);
+}
+
+static int bgmac_mii_register(struct bgmac *bgmac)
+{
+        struct mii_bus *mii_bus;
+        int i, err = 0;
+
+        mii_bus = mdiobus_alloc();
+        if (!mii_bus)
+                return -ENOMEM;
+
+        mii_bus->name = "bgmac mii bus";
+        sprintf(mii_bus->id, "%s-%d-%d", "bgmac", bgmac->core->bus->num,
+                bgmac->core->core_unit);
+        mii_bus->priv = bgmac;
+        mii_bus->read = bgmac_mii_read;
+        mii_bus->write = bgmac_mii_write;
+        mii_bus->parent = &bgmac->core->dev;
+        mii_bus->phy_mask = ~(1 << bgmac->phyaddr);
+
+        mii_bus->irq = kmalloc_array(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
+        if (!mii_bus->irq) {
+                err = -ENOMEM;
+                goto err_free_bus;
+        }
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                mii_bus->irq[i] = PHY_POLL;
+
+        err = mdiobus_register(mii_bus);
+        if (err) {
+                bgmac_err(bgmac, "Registration of mii bus failed\n");
+                goto err_free_irq;
+        }
+
+        bgmac->mii_bus = mii_bus;
+
+        return err;
+
+err_free_irq:
+        kfree(mii_bus->irq);
+err_free_bus:
+        mdiobus_free(mii_bus);
+        return err;
+}
+
+static void bgmac_mii_unregister(struct bgmac *bgmac)
+{
+        struct mii_bus *mii_bus = bgmac->mii_bus;
+
+        mdiobus_unregister(mii_bus);
+        kfree(mii_bus->irq);
+        mdiobus_free(mii_bus);
+}
+
+/**************************************************
  * BCMA bus ops
  **************************************************/
 
@@ -1404,11 +1470,18 @@ static int bgmac_probe(struct bcma_device *core)
         if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
                 bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
 
+        err = bgmac_mii_register(bgmac);
+        if (err) {
+                bgmac_err(bgmac, "Cannot register MDIO\n");
+                err = -ENOTSUPP;
+                goto err_dma_free;
+        }
+
         err = register_netdev(bgmac->net_dev);
         if (err) {
                 bgmac_err(bgmac, "Cannot register net device\n");
                 err = -ENOTSUPP;
-                goto err_dma_free;
+                goto err_mii_unregister;
         }
 
         netif_carrier_off(net_dev);
@@ -1417,6 +1490,8 @@ static int bgmac_probe(struct bcma_device *core)
 
         return 0;
 
+err_mii_unregister:
+        bgmac_mii_unregister(bgmac);
 err_dma_free:
         bgmac_dma_free(bgmac);
 
@@ -1433,6 +1508,7 @@ static void bgmac_remove(struct bcma_device *core)
 
         netif_napi_del(&bgmac->napi);
         unregister_netdev(bgmac->net_dev);
+        bgmac_mii_unregister(bgmac);
         bgmac_dma_free(bgmac);
         bcma_set_drvdata(core, NULL);
         free_netdev(bgmac->net_dev);
diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h
index 4ede614c81f8..98d4b5fcc070 100644
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
@@ -399,6 +399,7 @@ struct bgmac {
         struct bcma_device *cmn; /* Reference to CMN core for BCM4706 */
         struct net_device *net_dev;
         struct napi_struct napi;
+        struct mii_bus *mii_bus;
 
         /* DMA */
         struct bgmac_dma_ring tx_ring[BGMAC_MAX_TX_RINGS];
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 2f0ba8f2fd6c..5d204492c603 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -416,7 +416,7 @@ static int bnx2_unregister_cnic(struct net_device *dev)
         return 0;
 }
 
-struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev)
+static struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev)
 {
         struct bnx2 *bp = netdev_priv(dev);
         struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
@@ -854,12 +854,11 @@ bnx2_alloc_mem(struct bnx2 *bp)
                                 sizeof(struct statistics_block);
 
         status_blk = dma_alloc_coherent(&bp->pdev->dev, bp->status_stats_size,
-                                        &bp->status_blk_mapping, GFP_KERNEL);
+                                        &bp->status_blk_mapping,
+                                        GFP_KERNEL | __GFP_ZERO);
         if (status_blk == NULL)
                 goto alloc_mem_err;
 
-        memset(status_blk, 0, bp->status_stats_size);
-
         bnapi = &bp->bnx2_napi[0];
         bnapi->status_blk.msi = status_blk;
         bnapi->hw_tx_cons_ptr =
@@ -3212,7 +3211,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                 }
                 if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) &&
                     !(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG))
-                        __vlan_hwaccel_put_tag(skb, rx_hdr->l2_fhdr_vlan_tag);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), rx_hdr->l2_fhdr_vlan_tag);
 
                 skb->protocol = eth_type_trans(skb, bp->dev);
 
@@ -3554,7 +3553,7 @@ bnx2_set_rx_mode(struct net_device *dev)
         rx_mode = bp->rx_mode & ~(BNX2_EMAC_RX_MODE_PROMISCUOUS |
                                   BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);
         sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;
-        if (!(dev->features & NETIF_F_HW_VLAN_RX) &&
+        if (!(dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
              (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN))
                 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
         if (dev->flags & IFF_PROMISC) {
@@ -7696,7 +7695,7 @@ bnx2_fix_features(struct net_device *dev, netdev_features_t features)
         struct bnx2 *bp = netdev_priv(dev);
 
         if (!(bp->flags & BNX2_FLAG_CAN_KEEP_VLAN))
-                features |= NETIF_F_HW_VLAN_RX;
+                features |= NETIF_F_HW_VLAN_CTAG_RX;
 
         return features;
 }
@@ -7707,12 +7706,12 @@ bnx2_set_features(struct net_device *dev, netdev_features_t features)
         struct bnx2 *bp = netdev_priv(dev);
 
         /* TSO with VLAN tag won't work with current firmware */
-        if (features & NETIF_F_HW_VLAN_TX)
+        if (features & NETIF_F_HW_VLAN_CTAG_TX)
                 dev->vlan_features |= (dev->hw_features & NETIF_F_ALL_TSO);
         else
                 dev->vlan_features &= ~NETIF_F_ALL_TSO;
 
-        if ((!!(features & NETIF_F_HW_VLAN_RX) !=
+        if ((!!(features & NETIF_F_HW_VLAN_CTAG_RX) !=
             !!(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG)) &&
             netif_running(dev)) {
                 bnx2_netif_stop(bp, false);
@@ -8552,7 +8551,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
 
         dev->vlan_features = dev->hw_features;
-        dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
         dev->features |= dev->hw_features;
         dev->priv_flags |= IFF_UNICAST_FLT;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index e4605a965084..3dba2a70a00e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -26,8 +26,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.78.02-0"
-#define DRV_MODULE_RELDATE      "2013/01/14"
+#define DRV_MODULE_VERSION      "1.78.17-0"
+#define DRV_MODULE_RELDATE      "2013/04/11"
 #define BNX2X_BC_VER            0x040200
 
 #if defined(CONFIG_DCB)
@@ -492,7 +492,6 @@ enum bnx2x_tpa_mode_t {
 struct bnx2x_fastpath {
         struct bnx2x            *bp; /* parent */
 
-#define BNX2X_NAPI_WEIGHT       128
         struct napi_struct      napi;
         union host_hc_status_block      status_blk;
         /* chip independed shortcuts into sb structure */
@@ -613,9 +612,10 @@ struct bnx2x_fastpath {
  * START_BD             - describes packed
  * START_BD(splitted)   - includes unpaged data segment for GSO
  * PARSING_BD           - for TSO and CSUM data
+ * PARSING_BD2          - for encapsulation data
  * Frag BDs             - decribes pages for frags
  */
-#define BDS_PER_TX_PKT          3
+#define BDS_PER_TX_PKT          4
 #define MAX_BDS_PER_TX_PKT      (MAX_SKB_FRAGS + BDS_PER_TX_PKT)
 /* max BDs per tx packet including next pages */
 #define MAX_DESC_PER_TX_PKT     (MAX_BDS_PER_TX_PKT + \
@@ -730,18 +730,24 @@ struct bnx2x_fastpath {
 #define SKB_CS(skb)             (*(u16 *)(skb_transport_header(skb) + \
                                           skb->csum_offset))
 
-#define pbd_tcp_flags(skb)      (ntohl(tcp_flag_word(tcp_hdr(skb)))>>16 & 0xff)
+#define pbd_tcp_flags(tcp_hdr)  (ntohl(tcp_flag_word(tcp_hdr))>>16 & 0xff)
 
-#define XMIT_PLAIN                      0
-#define XMIT_CSUM_V4                    0x1
-#define XMIT_CSUM_V6                    0x2
-#define XMIT_CSUM_TCP                   0x4
-#define XMIT_GSO_V4                     0x8
-#define XMIT_GSO_V6                     0x10
+#define XMIT_PLAIN              0
+#define XMIT_CSUM_V4            (1 << 0)
+#define XMIT_CSUM_V6            (1 << 1)
+#define XMIT_CSUM_TCP           (1 << 2)
+#define XMIT_GSO_V4             (1 << 3)
+#define XMIT_GSO_V6             (1 << 4)
+#define XMIT_CSUM_ENC_V4        (1 << 5)
+#define XMIT_CSUM_ENC_V6        (1 << 6)
+#define XMIT_GSO_ENC_V4         (1 << 7)
+#define XMIT_GSO_ENC_V6         (1 << 8)
 
-#define XMIT_CSUM                       (XMIT_CSUM_V4 | XMIT_CSUM_V6)
-#define XMIT_GSO                        (XMIT_GSO_V4 | XMIT_GSO_V6)
+#define XMIT_CSUM_ENC           (XMIT_CSUM_ENC_V4 | XMIT_CSUM_ENC_V6)
+#define XMIT_GSO_ENC            (XMIT_GSO_ENC_V4 | XMIT_GSO_ENC_V6)
 
+#define XMIT_CSUM               (XMIT_CSUM_V4 | XMIT_CSUM_V6 | XMIT_CSUM_ENC)
+#define XMIT_GSO                (XMIT_GSO_V4 | XMIT_GSO_V6 | XMIT_GSO_ENC)
 
 /* stuff added to make the code fit 80Col */
 #define CQE_TYPE(cqe_fp_flags)   ((cqe_fp_flags) & ETH_FAST_PATH_RX_CQE_TYPE)
@@ -844,6 +850,9 @@ struct bnx2x_common {
 #define CHIP_IS_57840_VF(bp)            (CHIP_NUM(bp) == CHIP_NUM_57840_VF)
 #define CHIP_IS_E1H(bp)                 (CHIP_IS_57711(bp) || \
                                          CHIP_IS_57711E(bp))
+#define CHIP_IS_57811xx(bp)             (CHIP_IS_57811(bp) || \
+                                         CHIP_IS_57811_MF(bp) || \
+                                         CHIP_IS_57811_VF(bp))
 #define CHIP_IS_E2(bp)                  (CHIP_IS_57712(bp) || \
                                          CHIP_IS_57712_MF(bp) || \
                                          CHIP_IS_57712_VF(bp))
@@ -853,9 +862,7 @@ struct bnx2x_common {
                                          CHIP_IS_57810(bp) || \
                                          CHIP_IS_57810_MF(bp) || \
                                          CHIP_IS_57810_VF(bp) || \
-                                         CHIP_IS_57811(bp) || \
-                                         CHIP_IS_57811_MF(bp) || \
-                                         CHIP_IS_57811_VF(bp) || \
+                                         CHIP_IS_57811xx(bp) || \
                                          CHIP_IS_57840(bp) || \
                                          CHIP_IS_57840_MF(bp) || \
                                          CHIP_IS_57840_VF(bp))
@@ -1215,14 +1222,16 @@ enum {
         BNX2X_SP_RTNL_ENABLE_SRIOV,
         BNX2X_SP_RTNL_VFPF_MCAST,
         BNX2X_SP_RTNL_VFPF_STORM_RX_MODE,
+        BNX2X_SP_RTNL_HYPERVISOR_VLAN,
 };
 
 
 struct bnx2x_prev_path_list {
+        struct list_head list;
         u8 bus;
         u8 slot;
         u8 path;
-        struct list_head list;
+        u8 aer;
         u8 undi;
 };
 
@@ -1269,6 +1278,8 @@ struct bnx2x {
 #define BP_FW_MB_IDX(bp)                BP_FW_MB_IDX_VN(bp, BP_VN(bp))
 
 #ifdef CONFIG_BNX2X_SRIOV
+        /* protects vf2pf mailbox from simultaneous access */
+        struct mutex            vf2pf_mutex;
         /* vf pf channel mailbox contains request and response buffers */
         struct bnx2x_vf_mbx_msg *vf2pf_mbox;
         dma_addr_t              vf2pf_mbox_mapping;
@@ -1281,6 +1292,8 @@ struct bnx2x {
         dma_addr_t              pf2vf_bulletin_mapping;
 
         struct pf_vf_bulletin_content   old_bulletin;
+
+        u16 requested_nr_virtfn;
 #endif /* CONFIG_BNX2X_SRIOV */
 
         struct net_device       *dev;
@@ -1944,12 +1957,9 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
                             bool is_pf);
 
-#define BNX2X_ILT_ZALLOC(x, y, size) \
-        do { \
-                x = dma_alloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL); \
-                if (x) \
-                        memset(x, 0, size); \
-        } while (0)
+#define BNX2X_ILT_ZALLOC(x, y, size)                            \
+        x = dma_alloc_coherent(&bp->pdev->dev, size, y,         \
+                               GFP_KERNEL | __GFP_ZERO)
 
 #define BNX2X_ILT_FREE(x, y, size) \
         do { \
@@ -2286,7 +2296,7 @@ static const u32 dmae_reg_go_c[] = {
         DMAE_REG_GO_C12, DMAE_REG_GO_C13, DMAE_REG_GO_C14, DMAE_REG_GO_C15
 };
 
-void bnx2x_set_ethtool_ops(struct net_device *netdev);
+void bnx2x_set_ethtool_ops(struct bnx2x *bp, struct net_device *netdev);
 void bnx2x_notify_link_changed(struct bnx2x *bp);
 
 #define BNX2X_MF_SD_PROTOCOL(bp) \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 57619dd4a92b..b8fbe266ab68 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -451,7 +451,8 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
  * Compute number of aggregated segments, and gso_type.
  */
 static void bnx2x_set_gro_params(struct sk_buff *skb, u16 parsing_flags,
-                                 u16 len_on_bd, unsigned int pkt_len)
+                                 u16 len_on_bd, unsigned int pkt_len,
+                                 u16 num_of_coalesced_segs)
 {
         /* TPA aggregation won't have either IP options or TCP options
          * other than timestamp or IPv6 extension headers.
@@ -480,8 +481,7 @@ static void bnx2x_set_gro_params(struct sk_buff *skb, u16 parsing_flags,
         /* tcp_gro_complete() will copy NAPI_GRO_CB(skb)->count
          * to skb_shinfo(skb)->gso_segs
          */
-        NAPI_GRO_CB(skb)->count = DIV_ROUND_UP(pkt_len - hdrs_len,
-                                               skb_shinfo(skb)->gso_size);
+        NAPI_GRO_CB(skb)->count = num_of_coalesced_segs;
 }
 
 static int bnx2x_alloc_rx_sge(struct bnx2x *bp,
@@ -537,7 +537,8 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
         /* This is needed in order to enable forwarding support */
         if (frag_size)
                 bnx2x_set_gro_params(skb, tpa_info->parsing_flags, len_on_bd,
-                                     le16_to_cpu(cqe->pkt_len));
+                                     le16_to_cpu(cqe->pkt_len),
+                                     le16_to_cpu(cqe->num_of_coalesced_segs));
 
 #ifdef BNX2X_STOP_ON_ERROR
         if (pages > min_t(u32, 8, MAX_SKB_FRAGS) * SGE_PAGES) {
@@ -641,6 +642,14 @@ static void bnx2x_gro_ipv6_csum(struct bnx2x *bp, struct sk_buff *skb)
         th->check = ~tcp_v6_check(skb->len - skb_transport_offset(skb),
                                   &iph->saddr, &iph->daddr, 0);
 }
+
+static void bnx2x_gro_csum(struct bnx2x *bp, struct sk_buff *skb,
+                            void (*gro_func)(struct bnx2x*, struct sk_buff*))
+{
+        skb_set_network_header(skb, 0);
+        gro_func(bp, skb);
+        tcp_gro_complete(skb);
+}
 #endif
 
 static void bnx2x_gro_receive(struct bnx2x *bp, struct bnx2x_fastpath *fp,
@@ -648,19 +657,17 @@ static void bnx2x_gro_receive(struct bnx2x *bp, struct bnx2x_fastpath *fp,
 {
 #ifdef CONFIG_INET
         if (skb_shinfo(skb)->gso_size) {
-                skb_set_network_header(skb, 0);
                 switch (be16_to_cpu(skb->protocol)) {
                 case ETH_P_IP:
-                        bnx2x_gro_ip_csum(bp, skb);
+                        bnx2x_gro_csum(bp, skb, bnx2x_gro_ip_csum);
                         break;
                 case ETH_P_IPV6:
-                        bnx2x_gro_ipv6_csum(bp, skb);
+                        bnx2x_gro_csum(bp, skb, bnx2x_gro_ipv6_csum);
                         break;
                 default:
-                        BNX2X_ERR("FW GRO supports only IPv4/IPv6, not 0x%04x\n",
+                        BNX2X_ERR("Error: FW GRO supports only IPv4/IPv6, not 0x%04x\n",
                                   be16_to_cpu(skb->protocol));
                 }
-                tcp_gro_complete(skb);
         }
 #endif
         napi_gro_receive(&fp->napi, skb);
@@ -718,7 +725,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                 if (!bnx2x_fill_frag_skb(bp, fp, tpa_info, pages,
                                          skb, cqe, cqe_idx)) {
                         if (tpa_info->parsing_flags & PARSING_FLAGS_VLAN)
-                                __vlan_hwaccel_put_tag(skb, tpa_info->vlan_tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), tpa_info->vlan_tag);
                         bnx2x_gro_receive(bp, fp, skb);
                 } else {
                         DP(NETIF_MSG_RX_STATUS,
@@ -993,7 +1000,7 @@ reuse_rx:
 
                 if (le16_to_cpu(cqe_fp->pars_flags.flags) &
                     PARSING_FLAGS_VLAN)
-                        __vlan_hwaccel_put_tag(skb,
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
                                                le16_to_cpu(cqe_fp->vlan_tag));
                 napi_gro_receive(&fp->napi, skb);
 
@@ -1037,6 +1044,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
         DP(NETIF_MSG_INTR,
            "got an MSI-X interrupt on IDX:SB [fp %d fw_sd %d igusb %d]\n",
            fp->index, fp->fw_sb_id, fp->igu_sb_id);
+
         bnx2x_ack_sb(bp, fp->igu_sb_id, USTORM_ID, 0, IGU_INT_DISABLE, 0);
 
 #ifdef BNX2X_STOP_ON_ERROR
@@ -1718,7 +1726,7 @@ static int bnx2x_req_irq(struct bnx2x *bp)
         return request_irq(irq, bnx2x_interrupt, flags, bp->dev->name, bp->dev);
 }
 
-static int bnx2x_setup_irqs(struct bnx2x *bp)
+int bnx2x_setup_irqs(struct bnx2x *bp)
 {
         int rc = 0;
         if (bp->flags & USING_MSIX_FLAG &&
@@ -2009,7 +2017,7 @@ static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
  * Cleans the object that have internal lists without sending
  * ramrods. Should be run when interrutps are disabled.
  */
-static void bnx2x_squeeze_objects(struct bnx2x *bp)
+void bnx2x_squeeze_objects(struct bnx2x *bp)
 {
         int rc;
         unsigned long ramrod_flags = 0, vlan_mac_flags = 0;
@@ -2574,6 +2582,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 }
         }
 
+        bnx2x_pre_irq_nic_init(bp);
+
         /* Connect to IRQs */
         rc = bnx2x_setup_irqs(bp);
         if (rc) {
@@ -2583,11 +2593,11 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 LOAD_ERROR_EXIT(bp, load_error2);
         }
 
-        /* Setup NIC internals and enable interrupts */
-        bnx2x_nic_init(bp, load_code);
-
         /* Init per-function objects */
         if (IS_PF(bp)) {
+                /* Setup NIC internals and enable interrupts */
+                bnx2x_post_irq_nic_init(bp, load_code);
+
                 bnx2x_init_bp_objs(bp);
                 bnx2x_iov_nic_init(bp);
 
@@ -2657,7 +2667,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         if (IS_PF(bp))
                 rc = bnx2x_set_eth_mac(bp, true);
         else /* vf */
-                rc = bnx2x_vfpf_set_mac(bp);
+                rc = bnx2x_vfpf_config_mac(bp, bp->dev->dev_addr, bp->fp->index,
+                                           true);
         if (rc) {
                 BNX2X_ERR("Setting Ethernet MAC failed\n");
                 LOAD_ERROR_EXIT(bp, load_error3);
@@ -2777,7 +2788,7 @@ load_error0:
 #endif /* ! BNX2X_STOP_ON_ERROR */
 }
 
-static int bnx2x_drain_tx_queues(struct bnx2x *bp)
+int bnx2x_drain_tx_queues(struct bnx2x *bp)
 {
         u8 rc = 0, cos, i;
 
@@ -2926,9 +2937,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
                 bnx2x_free_fp_mem_cnic(bp);
 
         if (IS_PF(bp)) {
-                bnx2x_free_mem(bp);
                 if (CNIC_LOADED(bp))
                         bnx2x_free_mem_cnic(bp);
+                bnx2x_free_mem(bp);
         }
         bp->state = BNX2X_STATE_CLOSED;
         bp->cnic_loaded = false;
@@ -3089,11 +3100,11 @@ int bnx2x_poll(struct napi_struct *napi, int budget)
  * to ease the pain of our fellow microcode engineers
  * we use one mapping for both BDs
  */
-static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
-                                   struct bnx2x_fp_txdata *txdata,
-                                   struct sw_tx_bd *tx_buf,
-                                   struct eth_tx_start_bd **tx_bd, u16 hlen,
-                                   u16 bd_prod, int nbd)
+static u16 bnx2x_tx_split(struct bnx2x *bp,
+                          struct bnx2x_fp_txdata *txdata,
+                          struct sw_tx_bd *tx_buf,
+                          struct eth_tx_start_bd **tx_bd, u16 hlen,
+                          u16 bd_prod)
 {
         struct eth_tx_start_bd *h_tx_bd = *tx_bd;
         struct eth_tx_bd *d_tx_bd;
@@ -3101,11 +3112,10 @@ static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
         int old_len = le16_to_cpu(h_tx_bd->nbytes);
 
         /* first fix first BD */
-        h_tx_bd->nbd = cpu_to_le16(nbd);
         h_tx_bd->nbytes = cpu_to_le16(hlen);
 
-        DP(NETIF_MSG_TX_QUEUED, "TSO split header size is %d (%x:%x) nbd %d\n",
-           h_tx_bd->nbytes, h_tx_bd->addr_hi, h_tx_bd->addr_lo, h_tx_bd->nbd);
+        DP(NETIF_MSG_TX_QUEUED, "TSO split header size is %d (%x:%x)\n",
+           h_tx_bd->nbytes, h_tx_bd->addr_hi, h_tx_bd->addr_lo);
 
         /* now get a new data BD
          * (after the pbd) and fill it */
@@ -3134,7 +3144,7 @@ static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
 
 #define bswab32(b32) ((__force __le32) swab32((__force __u32) (b32)))
 #define bswab16(b16) ((__force __le16) swab16((__force __u16) (b16)))
-static inline __le16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
+static __le16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
 {
         __sum16 tsum = (__force __sum16) csum;
 
@@ -3149,30 +3159,47 @@ static inline __le16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
         return bswab16(tsum);
 }
 
-static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
+static u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
 {
         u32 rc;
+        __u8 prot = 0;
+        __be16 protocol;
 
         if (skb->ip_summed != CHECKSUM_PARTIAL)
-                rc = XMIT_PLAIN;
+                return XMIT_PLAIN;
 
-        else {
-                if (vlan_get_protocol(skb) == htons(ETH_P_IPV6)) {
-                        rc = XMIT_CSUM_V6;
-                        if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                                rc |= XMIT_CSUM_TCP;
+        protocol = vlan_get_protocol(skb);
+        if (protocol == htons(ETH_P_IPV6)) {
+                rc = XMIT_CSUM_V6;
+                prot = ipv6_hdr(skb)->nexthdr;
+        } else {
+                rc = XMIT_CSUM_V4;
+                prot = ip_hdr(skb)->protocol;
+        }
 
+        if (!CHIP_IS_E1x(bp) && skb->encapsulation) {
+                if (inner_ip_hdr(skb)->version == 6) {
+                        rc |= XMIT_CSUM_ENC_V6;
+                        if (inner_ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                                rc |= XMIT_CSUM_TCP;
                 } else {
-                        rc = XMIT_CSUM_V4;
-                        if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                        rc |= XMIT_CSUM_ENC_V4;
+                        if (inner_ip_hdr(skb)->protocol == IPPROTO_TCP)
                                 rc |= XMIT_CSUM_TCP;
                 }
         }
+        if (prot == IPPROTO_TCP)
+                rc |= XMIT_CSUM_TCP;
 
-        if (skb_is_gso_v6(skb))
-                rc |= XMIT_GSO_V6 | XMIT_CSUM_TCP | XMIT_CSUM_V6;
-        else if (skb_is_gso(skb))
-                rc |= XMIT_GSO_V4 | XMIT_CSUM_V4 | XMIT_CSUM_TCP;
+        if (skb_is_gso_v6(skb)) {
+                rc |= (XMIT_GSO_V6 | XMIT_CSUM_TCP | XMIT_CSUM_V6);
+                if (rc & XMIT_CSUM_ENC)
+                        rc |= XMIT_GSO_ENC_V6;
+        } else if (skb_is_gso(skb)) {
+                rc |= (XMIT_GSO_V4 | XMIT_CSUM_V4 | XMIT_CSUM_TCP);
+                if (rc & XMIT_CSUM_ENC)
+                        rc |= XMIT_GSO_ENC_V4;
+        }
 
         return rc;
 }
@@ -3257,14 +3284,23 @@ exit_lbl:
 }
 #endif
 
-static inline void bnx2x_set_pbd_gso_e2(struct sk_buff *skb, u32 *parsing_data,
-                                        u32 xmit_type)
+static void bnx2x_set_pbd_gso_e2(struct sk_buff *skb, u32 *parsing_data,
+                                 u32 xmit_type)
 {
+        struct ipv6hdr *ipv6;
+
         *parsing_data |= (skb_shinfo(skb)->gso_size <<
                               ETH_TX_PARSE_BD_E2_LSO_MSS_SHIFT) &
                               ETH_TX_PARSE_BD_E2_LSO_MSS;
-        if ((xmit_type & XMIT_GSO_V6) &&
-            (ipv6_hdr(skb)->nexthdr == NEXTHDR_IPV6))
+
+        if (xmit_type & XMIT_GSO_ENC_V6)
+                ipv6 = inner_ipv6_hdr(skb);
+        else if (xmit_type & XMIT_GSO_V6)
+                ipv6 = ipv6_hdr(skb);
+        else
+                ipv6 = NULL;
+
+        if (ipv6 && ipv6->nexthdr == NEXTHDR_IPV6)
                 *parsing_data |= ETH_TX_PARSE_BD_E2_IPV6_WITH_EXT_HDR;
 }
 
@@ -3275,13 +3311,13 @@ static inline void bnx2x_set_pbd_gso_e2(struct sk_buff *skb, u32 *parsing_data,
  * @pbd:        parse BD
  * @xmit_type:  xmit flags
  */
-static inline void bnx2x_set_pbd_gso(struct sk_buff *skb,
-                                     struct eth_tx_parse_bd_e1x *pbd,
-                                     u32 xmit_type)
+static void bnx2x_set_pbd_gso(struct sk_buff *skb,
+                              struct eth_tx_parse_bd_e1x *pbd,
+                              u32 xmit_type)
 {
         pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
         pbd->tcp_send_seq = bswab32(tcp_hdr(skb)->seq);
-        pbd->tcp_flags = pbd_tcp_flags(skb);
+        pbd->tcp_flags = pbd_tcp_flags(tcp_hdr(skb));
 
         if (xmit_type & XMIT_GSO_V4) {
                 pbd->ip_id = bswab16(ip_hdr(skb)->id);
@@ -3301,6 +3337,40 @@ static inline void bnx2x_set_pbd_gso(struct sk_buff *skb,
 }
 
 /**
+ * bnx2x_set_pbd_csum_enc - update PBD with checksum and return header length
+ *
+ * @bp:                 driver handle
+ * @skb:                packet skb
+ * @parsing_data:       data to be updated
+ * @xmit_type:          xmit flags
+ *
+ * 57712/578xx related, when skb has encapsulation
+ */
+static u8 bnx2x_set_pbd_csum_enc(struct bnx2x *bp, struct sk_buff *skb,
+                                 u32 *parsing_data, u32 xmit_type)
+{
+        *parsing_data |=
+                ((((u8 *)skb_inner_transport_header(skb) - skb->data) >> 1) <<
+                ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W_SHIFT) &
+                ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W;
+
+        if (xmit_type & XMIT_CSUM_TCP) {
+                *parsing_data |= ((inner_tcp_hdrlen(skb) / 4) <<
+                        ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT) &
+                        ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW;
+
+                return skb_inner_transport_header(skb) +
+                        inner_tcp_hdrlen(skb) - skb->data;
+        }
+
+        /* We support checksum offload for TCP and UDP only.
+         * No need to pass the UDP header length - it's a constant.
+         */
+        return skb_inner_transport_header(skb) +
+                sizeof(struct udphdr) - skb->data;
+}
+
+/**
  * bnx2x_set_pbd_csum_e2 - update PBD with checksum and return header length
  *
  * @bp:                 driver handle
@@ -3308,15 +3378,15 @@ static inline void bnx2x_set_pbd_gso(struct sk_buff *skb,
  * @parsing_data:       data to be updated
  * @xmit_type:          xmit flags
  *
- * 57712 related
+ * 57712/578xx related
  */
-static inline  u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
-                                        u32 *parsing_data, u32 xmit_type)
+static u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
+                                u32 *parsing_data, u32 xmit_type)
 {
         *parsing_data |=
                 ((((u8 *)skb_transport_header(skb) - skb->data) >> 1) <<
-                ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W_SHIFT) &
-                ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W;
+                ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W_SHIFT) &
+                ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W;
 
         if (xmit_type & XMIT_CSUM_TCP) {
                 *parsing_data |= ((tcp_hdrlen(skb) / 4) <<
@@ -3331,17 +3401,15 @@ static inline  u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
         return skb_transport_header(skb) + sizeof(struct udphdr) - skb->data;
 }
 
-static inline void bnx2x_set_sbd_csum(struct bnx2x *bp, struct sk_buff *skb,
-        struct eth_tx_start_bd *tx_start_bd, u32 xmit_type)
+/* set FW indication according to inner or outer protocols if tunneled */
+static void bnx2x_set_sbd_csum(struct bnx2x *bp, struct sk_buff *skb,
+                               struct eth_tx_start_bd *tx_start_bd,
+                               u32 xmit_type)
 {
         tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_L4_CSUM;
 
-        if (xmit_type & XMIT_CSUM_V4)
-                tx_start_bd->bd_flags.as_bitfield |=
-                                        ETH_TX_BD_FLAGS_IP_CSUM;
-        else
-                tx_start_bd->bd_flags.as_bitfield |=
-                                        ETH_TX_BD_FLAGS_IPV6;
+        if (xmit_type & (XMIT_CSUM_ENC_V6 | XMIT_CSUM_V6))
+                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_IPV6;
 
         if (!(xmit_type & XMIT_CSUM_TCP))
                 tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_IS_UDP;
@@ -3355,9 +3423,9 @@ static inline void bnx2x_set_sbd_csum(struct bnx2x *bp, struct sk_buff *skb,
  * @pbd:        parse BD to be updated
  * @xmit_type:  xmit flags
  */
-static inline u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,
-        struct eth_tx_parse_bd_e1x *pbd,
-        u32 xmit_type)
+static u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,
+                             struct eth_tx_parse_bd_e1x *pbd,
+                             u32 xmit_type)
 {
         u8 hlen = (skb_network_header(skb) - skb->data) >> 1;
 
@@ -3403,6 +3471,75 @@ static inline u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,
         return hlen;
 }
 
+static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,
+                                      struct eth_tx_parse_bd_e2 *pbd_e2,
+                                      struct eth_tx_parse_2nd_bd *pbd2,
+                                      u16 *global_data,
+                                      u32 xmit_type)
+{
+        u16 hlen_w = 0;
+        u8 outerip_off, outerip_len = 0;
+        /* from outer IP to transport */
+        hlen_w = (skb_inner_transport_header(skb) -
+                  skb_network_header(skb)) >> 1;
+
+        /* transport len */
+        if (xmit_type & XMIT_CSUM_TCP)
+                hlen_w += inner_tcp_hdrlen(skb) >> 1;
+        else
+                hlen_w += sizeof(struct udphdr) >> 1;
+
+        pbd2->fw_ip_hdr_to_payload_w = hlen_w;
+
+        if (xmit_type & XMIT_CSUM_ENC_V4) {
+                struct iphdr *iph = ip_hdr(skb);
+                pbd2->fw_ip_csum_wo_len_flags_frag =
+                        bswab16(csum_fold((~iph->check) -
+                                          iph->tot_len - iph->frag_off));
+        } else {
+                pbd2->fw_ip_hdr_to_payload_w =
+                        hlen_w - ((sizeof(struct ipv6hdr)) >> 1);
+        }
+
+        pbd2->tcp_send_seq = bswab32(inner_tcp_hdr(skb)->seq);
+
+        pbd2->tcp_flags = pbd_tcp_flags(inner_tcp_hdr(skb));
+
+        if (xmit_type & XMIT_GSO_V4) {
+                pbd2->hw_ip_id = bswab16(inner_ip_hdr(skb)->id);
+
+                pbd_e2->data.tunnel_data.pseudo_csum =
+                        bswab16(~csum_tcpudp_magic(
+                                        inner_ip_hdr(skb)->saddr,
+                                        inner_ip_hdr(skb)->daddr,
+                                        0, IPPROTO_TCP, 0));
+
+                outerip_len = ip_hdr(skb)->ihl << 1;
+        } else {
+                pbd_e2->data.tunnel_data.pseudo_csum =
+                        bswab16(~csum_ipv6_magic(
+                                        &inner_ipv6_hdr(skb)->saddr,
+                                        &inner_ipv6_hdr(skb)->daddr,
+                                        0, IPPROTO_TCP, 0));
+        }
+
+        outerip_off = (skb_network_header(skb) - skb->data) >> 1;
+
+        *global_data |=
+                outerip_off |
+                (!!(xmit_type & XMIT_CSUM_V6) <<
+                        ETH_TX_PARSE_2ND_BD_IP_HDR_TYPE_OUTER_SHIFT) |
+                (outerip_len <<
+                        ETH_TX_PARSE_2ND_BD_IP_HDR_LEN_OUTER_W_SHIFT) |
+                ((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<
+                        ETH_TX_PARSE_2ND_BD_LLC_SNAP_EN_SHIFT);
+
+        if (ip_hdr(skb)->protocol == IPPROTO_UDP) {
+                SET_FLAG(*global_data, ETH_TX_PARSE_2ND_BD_TUNNEL_UDP_EXIST, 1);
+                pbd2->tunnel_udp_hdr_start_w = skb_transport_offset(skb) >> 1;
+        }
+}
+
 /* called with netif_tx_lock
  * bnx2x_tx_int() runs without netif_tx_lock unless it needs to call
  * netif_wake_queue()
@@ -3418,6 +3555,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct eth_tx_bd *tx_data_bd, *total_pkt_bd = NULL;
         struct eth_tx_parse_bd_e1x *pbd_e1x = NULL;
         struct eth_tx_parse_bd_e2 *pbd_e2 = NULL;
+        struct eth_tx_parse_2nd_bd *pbd2 = NULL;
         u32 pbd_e2_parsing_data = 0;
         u16 pkt_prod, bd_prod;
         int nbd, txq_index;
@@ -3485,7 +3623,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         mac_type = MULTICAST_ADDRESS;
         }
 
-#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - 3)
+#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - BDS_PER_TX_PKT)
         /* First, check if we need to linearize the skb (due to FW
            restrictions). No need to check fragmentation if page size > 8K
            (there will be no violation to FW restrictions) */
@@ -3533,12 +3671,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         first_bd = tx_start_bd;
 
         tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
-        SET_FLAG(tx_start_bd->general_data,
-                 ETH_TX_START_BD_PARSE_NBDS,
-                 0);
 
-        /* header nbd */
-        SET_FLAG(tx_start_bd->general_data, ETH_TX_START_BD_HDR_NBDS, 1);
+        /* header nbd: indirectly zero other flags! */
+        tx_start_bd->general_data = 1 << ETH_TX_START_BD_HDR_NBDS_SHIFT;
 
         /* remember the first BD of the packet */
         tx_buf->first_bd = txdata->tx_bd_prod;
@@ -3558,19 +3693,16 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 /* when transmitting in a vf, start bd must hold the ethertype
                  * for fw to enforce it
                  */
-#ifndef BNX2X_STOP_ON_ERROR
-                if (IS_VF(bp)) {
-#endif
+                if (IS_VF(bp))
                         tx_start_bd->vlan_or_ethertype =
                                 cpu_to_le16(ntohs(eth->h_proto));
-#ifndef BNX2X_STOP_ON_ERROR
-                } else {
+                else
                         /* used by FW for packet accounting */
                         tx_start_bd->vlan_or_ethertype = cpu_to_le16(pkt_prod);
-                }
-#endif
         }
 
+        nbd = 2; /* start_bd + pbd + frags (updated when pages are mapped) */
+
         /* turn on parsing and get a BD */
         bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
 
@@ -3580,23 +3712,58 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!CHIP_IS_E1x(bp)) {
                 pbd_e2 = &txdata->tx_desc_ring[bd_prod].parse_bd_e2;
                 memset(pbd_e2, 0, sizeof(struct eth_tx_parse_bd_e2));
-                /* Set PBD in checksum offload case */
-                if (xmit_type & XMIT_CSUM)
+
+                if (xmit_type & XMIT_CSUM_ENC) {
+                        u16 global_data = 0;
+
+                        /* Set PBD in enc checksum offload case */
+                        hlen = bnx2x_set_pbd_csum_enc(bp, skb,
+                                                      &pbd_e2_parsing_data,
+                                                      xmit_type);
+
+                        /* turn on 2nd parsing and get a BD */
+                        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+
+                        pbd2 = &txdata->tx_desc_ring[bd_prod].parse_2nd_bd;
+
+                        memset(pbd2, 0, sizeof(*pbd2));
+
+                        pbd_e2->data.tunnel_data.ip_hdr_start_inner_w =
+                                (skb_inner_network_header(skb) -
+                                 skb->data) >> 1;
+
+                        if (xmit_type & XMIT_GSO_ENC)
+                                bnx2x_update_pbds_gso_enc(skb, pbd_e2, pbd2,
+                                                          &global_data,
+                                                          xmit_type);
+
+                        pbd2->global_data = cpu_to_le16(global_data);
+
+                        /* add addition parse BD indication to start BD */
+                        SET_FLAG(tx_start_bd->general_data,
+                                 ETH_TX_START_BD_PARSE_NBDS, 1);
+                        /* set encapsulation flag in start BD */
+                        SET_FLAG(tx_start_bd->general_data,
+                                 ETH_TX_START_BD_TUNNEL_EXIST, 1);
+                        nbd++;
+                } else if (xmit_type & XMIT_CSUM) {
+                        /* Set PBD in checksum offload case w/o encapsulation */
                         hlen = bnx2x_set_pbd_csum_e2(bp, skb,
                                                      &pbd_e2_parsing_data,
                                                      xmit_type);
+                }
 
-                if (IS_MF_SI(bp) || IS_VF(bp)) {
-                        /* fill in the MAC addresses in the PBD - for local
-                         * switching
-                         */
-                        bnx2x_set_fw_mac_addr(&pbd_e2->src_mac_addr_hi,
-                                              &pbd_e2->src_mac_addr_mid,
-                                              &pbd_e2->src_mac_addr_lo,
+                /* Add the macs to the parsing BD this is a vf */
+                if (IS_VF(bp)) {
+                        /* override GRE parameters in BD */
+                        bnx2x_set_fw_mac_addr(&pbd_e2->data.mac_addr.src_hi,
+                                              &pbd_e2->data.mac_addr.src_mid,
+                                              &pbd_e2->data.mac_addr.src_lo,
                                               eth->h_source);
-                        bnx2x_set_fw_mac_addr(&pbd_e2->dst_mac_addr_hi,
-                                              &pbd_e2->dst_mac_addr_mid,
-                                              &pbd_e2->dst_mac_addr_lo,
+
+                        bnx2x_set_fw_mac_addr(&pbd_e2->data.mac_addr.dst_hi,
+                                              &pbd_e2->data.mac_addr.dst_mid,
+                                              &pbd_e2->data.mac_addr.dst_lo,
                                               eth->h_dest);
                 }
 
@@ -3618,14 +3785,13 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Setup the data pointer of the first BD of the packet */
         tx_start_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
         tx_start_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-        nbd = 2; /* start_bd + pbd + frags (updated when pages are mapped) */
         tx_start_bd->nbytes = cpu_to_le16(skb_headlen(skb));
         pkt_size = tx_start_bd->nbytes;
 
         DP(NETIF_MSG_TX_QUEUED,
-           "first bd @%p  addr (%x:%x)  nbd %d  nbytes %d  flags %x  vlan %x\n",
+           "first bd @%p  addr (%x:%x)  nbytes %d  flags %x  vlan %x\n",
            tx_start_bd, tx_start_bd->addr_hi, tx_start_bd->addr_lo,
-           le16_to_cpu(tx_start_bd->nbd), le16_to_cpu(tx_start_bd->nbytes),
+           le16_to_cpu(tx_start_bd->nbytes),
            tx_start_bd->bd_flags.as_bitfield,
            le16_to_cpu(tx_start_bd->vlan_or_ethertype));
 
@@ -3638,10 +3804,12 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_SW_LSO;
 
-                if (unlikely(skb_headlen(skb) > hlen))
+                if (unlikely(skb_headlen(skb) > hlen)) {
+                        nbd++;
                         bd_prod = bnx2x_tx_split(bp, txdata, tx_buf,
                                                  &tx_start_bd, hlen,
-                                                 bd_prod, ++nbd);
+                                                 bd_prod);
+                }
                 if (!CHIP_IS_E1x(bp))
                         bnx2x_set_pbd_gso_e2(skb, &pbd_e2_parsing_data,
                                              xmit_type);
@@ -3731,9 +3899,13 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (pbd_e2)
                 DP(NETIF_MSG_TX_QUEUED,
                    "PBD (E2) @%p  dst %x %x %x src %x %x %x parsing_data %x\n",
-                   pbd_e2, pbd_e2->dst_mac_addr_hi, pbd_e2->dst_mac_addr_mid,
-                   pbd_e2->dst_mac_addr_lo, pbd_e2->src_mac_addr_hi,
-                   pbd_e2->src_mac_addr_mid, pbd_e2->src_mac_addr_lo,
+                   pbd_e2,
+                   pbd_e2->data.mac_addr.dst_hi,
+                   pbd_e2->data.mac_addr.dst_mid,
+                   pbd_e2->data.mac_addr.dst_lo,
+                   pbd_e2->data.mac_addr.src_hi,
+                   pbd_e2->data.mac_addr.src_mid,
+                   pbd_e2->data.mac_addr.src_lo,
                    pbd_e2->parsing_data);
         DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %d  bd %u\n", nbd, bd_prod);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index aee7671ff4c1..151675d66b0d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -50,13 +50,13 @@ extern int int_mode;
                 } \
         } while (0)
 
-#define BNX2X_PCI_ALLOC(x, y, size) \
-        do { \
-                x = dma_alloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL); \
-                if (x == NULL) \
-                        goto alloc_mem_err; \
-                memset((void *)x, 0, size); \
-        } while (0)
+#define BNX2X_PCI_ALLOC(x, y, size)                             \
+do {                                                            \
+        x = dma_alloc_coherent(&bp->pdev->dev, size, y,         \
+                               GFP_KERNEL | __GFP_ZERO);        \
+        if (x == NULL)                                          \
+                goto alloc_mem_err;                             \
+} while (0)
 
 #define BNX2X_ALLOC(x, size) \
         do { \
@@ -295,16 +295,29 @@ void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw);
 void bnx2x_nic_init_cnic(struct bnx2x *bp);
 
 /**
- * bnx2x_nic_init - init driver internals.
+ * bnx2x_preirq_nic_init - init driver internals.
  *
  * @bp:         driver handle
  *
  * Initializes:
- *  - rings
+ *  - fastpath object
+ *  - fastpath rings
+ *  etc.
+ */
+void bnx2x_pre_irq_nic_init(struct bnx2x *bp);
+
+/**
+ * bnx2x_postirq_nic_init - init driver internals.
+ *
+ * @bp:         driver handle
+ * @load_code:  COMMON, PORT or FUNCTION
+ *
+ * Initializes:
  *  - status blocks
+ *  - slowpath rings
  *  - etc.
  */
-void bnx2x_nic_init(struct bnx2x *bp, u32 load_code);
+void bnx2x_post_irq_nic_init(struct bnx2x *bp, u32 load_code);
 /**
  * bnx2x_alloc_mem_cnic - allocate driver's memory for cnic.
  *
@@ -496,7 +509,10 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev);
 /* setup_tc callback */
 int bnx2x_setup_tc(struct net_device *dev, u8 num_tc);
 
+int bnx2x_get_vf_config(struct net_device *dev, int vf,
+                        struct ifla_vf_info *ivi);
 int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac);
+int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos);
 
 /* select_queue callback */
 u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb);
@@ -834,7 +850,7 @@ static inline void bnx2x_add_all_napi_cnic(struct bnx2x *bp)
         /* Add NAPI objects */
         for_each_rx_queue_cnic(bp, i)
                 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
-                               bnx2x_poll, BNX2X_NAPI_WEIGHT);
+                               bnx2x_poll, NAPI_POLL_WEIGHT);
 }
 
 static inline void bnx2x_add_all_napi(struct bnx2x *bp)
@@ -844,7 +860,7 @@ static inline void bnx2x_add_all_napi(struct bnx2x *bp)
         /* Add NAPI objects */
         for_each_eth_queue(bp, i)
                 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
-                               bnx2x_poll, BNX2X_NAPI_WEIGHT);
+                               bnx2x_poll, NAPI_POLL_WEIGHT);
 }
 
 static inline void bnx2x_del_all_napi_cnic(struct bnx2x *bp)
@@ -970,6 +986,9 @@ static inline int bnx2x_func_start(struct bnx2x *bp)
         else /* CHIP_IS_E1X */
                 start_params->network_cos_mode = FW_WRR;
 
+        start_params->gre_tunnel_mode = IPGRE_TUNNEL;
+        start_params->gre_tunnel_rss = GRE_INNER_HEADERS_RSS;
+
         return bnx2x_func_state_change(bp, &func_params);
 }
 
@@ -1396,4 +1415,8 @@ static inline bool bnx2x_is_valid_ether_addr(struct bnx2x *bp, u8 *addr)
  *
  */
 void bnx2x_fill_fw_str(struct bnx2x *bp, char *buf, size_t buf_len);
+
+int bnx2x_drain_tx_queues(struct bnx2x *bp);
+void bnx2x_squeeze_objects(struct bnx2x *bp);
+
 #endif /* BNX2X_CMN_H */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index edfa67adf2f9..ce1a91618677 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1364,11 +1364,27 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
         return rc;
 }
 
+static int bnx2x_nvram_read32(struct bnx2x *bp, u32 offset, u32 *buf,
+                              int buf_size)
+{
+        int rc;
+
+        rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
+
+        if (!rc) {
+                __be32 *be = (__be32 *)buf;
+
+                while ((buf_size -= 4) >= 0)
+                        *buf++ = be32_to_cpu(*be++);
+        }
+
+        return rc;
+}
+
 static int bnx2x_get_eeprom(struct net_device *dev,
                             struct ethtool_eeprom *eeprom, u8 *eebuf)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        int rc;
 
         if (!netif_running(dev)) {
                 DP(BNX2X_MSG_ETHTOOL  | BNX2X_MSG_NVM,
@@ -1383,9 +1399,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
 
         /* parameters already validated in ethtool_get_eeprom */
 
-        rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
-
-        return rc;
+        return bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
 }
 
 static int bnx2x_get_module_eeprom(struct net_device *dev,
@@ -1393,10 +1407,9 @@ static int bnx2x_get_module_eeprom(struct net_device *dev,
                                    u8 *data)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        int rc = 0, phy_idx;
+        int rc = -EINVAL, phy_idx;
         u8 *user_data = data;
-        int remaining_len = ee->len, xfer_size;
-        unsigned int page_off = ee->offset;
+        unsigned int start_addr = ee->offset, xfer_size = 0;
 
         if (!netif_running(dev)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
@@ -1405,21 +1418,52 @@ static int bnx2x_get_module_eeprom(struct net_device *dev,
         }
 
         phy_idx = bnx2x_get_cur_phy_idx(bp);
-        bnx2x_acquire_phy_lock(bp);
-        while (!rc && remaining_len > 0) {
-                xfer_size = (remaining_len > SFP_EEPROM_PAGE_SIZE) ?
-                        SFP_EEPROM_PAGE_SIZE : remaining_len;
+
+        /* Read A0 section */
+        if (start_addr < ETH_MODULE_SFF_8079_LEN) {
+                /* Limit transfer size to the A0 section boundary */
+                if (start_addr + ee->len > ETH_MODULE_SFF_8079_LEN)
+                        xfer_size = ETH_MODULE_SFF_8079_LEN - start_addr;
+                else
+                        xfer_size = ee->len;
+                bnx2x_acquire_phy_lock(bp);
                 rc = bnx2x_read_sfp_module_eeprom(&bp->link_params.phy[phy_idx],
                                                   &bp->link_params,
-                                                  page_off,
+                                                  I2C_DEV_ADDR_A0,
+                                                  start_addr,
                                                   xfer_size,
                                                   user_data);
-                remaining_len -= xfer_size;
+                bnx2x_release_phy_lock(bp);
+                if (rc) {
+                        DP(BNX2X_MSG_ETHTOOL, "Failed reading A0 section\n");
+
+                        return -EINVAL;
+                }
                 user_data += xfer_size;
-                page_off += xfer_size;
+                start_addr += xfer_size;
         }
 
-        bnx2x_release_phy_lock(bp);
+        /* Read A2 section */
+        if ((start_addr >= ETH_MODULE_SFF_8079_LEN) &&
+            (start_addr < ETH_MODULE_SFF_8472_LEN)) {
+                xfer_size = ee->len - xfer_size;
+                /* Limit transfer size to the A2 section boundary */
+                if (start_addr + xfer_size > ETH_MODULE_SFF_8472_LEN)
+                        xfer_size = ETH_MODULE_SFF_8472_LEN - start_addr;
+                start_addr -= ETH_MODULE_SFF_8079_LEN;
+                bnx2x_acquire_phy_lock(bp);
+                rc = bnx2x_read_sfp_module_eeprom(&bp->link_params.phy[phy_idx],
+                                                  &bp->link_params,
+                                                  I2C_DEV_ADDR_A2,
+                                                  start_addr,
+                                                  xfer_size,
+                                                  user_data);
+                bnx2x_release_phy_lock(bp);
+                if (rc) {
+                        DP(BNX2X_MSG_ETHTOOL, "Failed reading A2 section\n");
+                        return -EINVAL;
+                }
+        }
         return rc;
 }
 
@@ -1427,24 +1471,50 @@ static int bnx2x_get_module_info(struct net_device *dev,
                                  struct ethtool_modinfo *modinfo)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        int phy_idx;
+        int phy_idx, rc;
+        u8 sff8472_comp, diag_type;
+
         if (!netif_running(dev)) {
-                DP(BNX2X_MSG_ETHTOOL  | BNX2X_MSG_NVM,
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
         }
-
         phy_idx = bnx2x_get_cur_phy_idx(bp);
-        switch (bp->link_params.phy[phy_idx].media_type) {
-        case ETH_PHY_SFPP_10G_FIBER:
-        case ETH_PHY_SFP_1G_FIBER:
-        case ETH_PHY_DA_TWINAX:
+        bnx2x_acquire_phy_lock(bp);
+        rc = bnx2x_read_sfp_module_eeprom(&bp->link_params.phy[phy_idx],
+                                          &bp->link_params,
+                                          I2C_DEV_ADDR_A0,
+                                          SFP_EEPROM_SFF_8472_COMP_ADDR,
+                                          SFP_EEPROM_SFF_8472_COMP_SIZE,
+                                          &sff8472_comp);
+        bnx2x_release_phy_lock(bp);
+        if (rc) {
+                DP(BNX2X_MSG_ETHTOOL, "Failed reading SFF-8472 comp field\n");
+                return -EINVAL;
+        }
+
+        bnx2x_acquire_phy_lock(bp);
+        rc = bnx2x_read_sfp_module_eeprom(&bp->link_params.phy[phy_idx],
+                                          &bp->link_params,
+                                          I2C_DEV_ADDR_A0,
+                                          SFP_EEPROM_DIAG_TYPE_ADDR,
+                                          SFP_EEPROM_DIAG_TYPE_SIZE,
+                                          &diag_type);
+        bnx2x_release_phy_lock(bp);
+        if (rc) {
+                DP(BNX2X_MSG_ETHTOOL, "Failed reading Diag Type field\n");
+                return -EINVAL;
+        }
+
+        if (!sff8472_comp ||
+            (diag_type & SFP_EEPROM_DIAG_ADDR_CHANGE_REQ)) {
                 modinfo->type = ETH_MODULE_SFF_8079;
                 modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;
-                return 0;
-        default:
-                return -EOPNOTSUPP;
+        } else {
+                modinfo->type = ETH_MODULE_SFF_8472;
+                modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
         }
+        return 0;
 }
 
 static int bnx2x_nvram_write_dword(struct bnx2x *bp, u32 offset, u32 val,
@@ -1496,9 +1566,8 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
                               int buf_size)
 {
         int rc;
-        u32 cmd_flags;
-        u32 align_offset;
-        __be32 val;
+        u32 cmd_flags, align_offset, val;
+        __be32 val_be;
 
         if (offset + buf_size > bp->common.flash_size) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
@@ -1517,16 +1586,16 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
 
         cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
         align_offset = (offset & ~0x03);
-        rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
+        rc = bnx2x_nvram_read_dword(bp, align_offset, &val_be, cmd_flags);
 
         if (rc == 0) {
-                val &= ~(0xff << BYTE_OFFSET(offset));
-                val |= (*data_buf << BYTE_OFFSET(offset));
-
                 /* nvram data is returned as an array of bytes
                  * convert it back to cpu order
                  */
-                val = be32_to_cpu(val);
+                val = be32_to_cpu(val_be);
+
+                val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset));
+                val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset));
 
                 rc = bnx2x_nvram_write_dword(bp, align_offset, val,
                                              cmd_flags);
@@ -1820,12 +1889,15 @@ static int bnx2x_set_pauseparam(struct net_device *dev,
                         bp->link_params.req_flow_ctrl[cfg_idx] =
                                 BNX2X_FLOW_CTRL_AUTO;
                 }
-                bp->link_params.req_fc_auto_adv = BNX2X_FLOW_CTRL_NONE;
+                bp->link_params.req_fc_auto_adv = 0;
                 if (epause->rx_pause)
                         bp->link_params.req_fc_auto_adv |= BNX2X_FLOW_CTRL_RX;
 
                 if (epause->tx_pause)
                         bp->link_params.req_fc_auto_adv |= BNX2X_FLOW_CTRL_TX;
+
+                if (!bp->link_params.req_fc_auto_adv)
+                        bp->link_params.req_fc_auto_adv |= BNX2X_FLOW_CTRL_NONE;
         }
 
         DP(BNX2X_MSG_ETHTOOL,
@@ -2526,14 +2598,168 @@ static int bnx2x_test_ext_loopback(struct bnx2x *bp)
         return rc;
 }
 
+struct code_entry {
+        u32 sram_start_addr;
+        u32 code_attribute;
+#define CODE_IMAGE_TYPE_MASK                    0xf0800003
+#define CODE_IMAGE_VNTAG_PROFILES_DATA          0xd0000003
+#define CODE_IMAGE_LENGTH_MASK                  0x007ffffc
+#define CODE_IMAGE_TYPE_EXTENDED_DIR            0xe0000000
+        u32 nvm_start_addr;
+};
+
+#define CODE_ENTRY_MAX                  16
+#define CODE_ENTRY_EXTENDED_DIR_IDX     15
+#define MAX_IMAGES_IN_EXTENDED_DIR      64
+#define NVRAM_DIR_OFFSET                0x14
+
+#define EXTENDED_DIR_EXISTS(code)                                         \
+        ((code & CODE_IMAGE_TYPE_MASK) == CODE_IMAGE_TYPE_EXTENDED_DIR && \
+         (code & CODE_IMAGE_LENGTH_MASK) != 0)
+
 #define CRC32_RESIDUAL                  0xdebb20e3
+#define CRC_BUFF_SIZE                   256
+
+static int bnx2x_nvram_crc(struct bnx2x *bp,
+                           int offset,
+                           int size,
+                           u8 *buff)
+{
+        u32 crc = ~0;
+        int rc = 0, done = 0;
+
+        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+           "NVRAM CRC from 0x%08x to 0x%08x\n", offset, offset + size);
+
+        while (done < size) {
+                int count = min_t(int, size - done, CRC_BUFF_SIZE);
+
+                rc = bnx2x_nvram_read(bp, offset + done, buff, count);
+
+                if (rc)
+                        return rc;
+
+                crc = crc32_le(crc, buff, count);
+                done += count;
+        }
+
+        if (crc != CRC32_RESIDUAL)
+                rc = -EINVAL;
+
+        return rc;
+}
+
+static int bnx2x_test_nvram_dir(struct bnx2x *bp,
+                                struct code_entry *entry,
+                                u8 *buff)
+{
+        size_t size = entry->code_attribute & CODE_IMAGE_LENGTH_MASK;
+        u32 type = entry->code_attribute & CODE_IMAGE_TYPE_MASK;
+        int rc;
+
+        /* Zero-length images and AFEX profiles do not have CRC */
+        if (size == 0 || type == CODE_IMAGE_VNTAG_PROFILES_DATA)
+                return 0;
+
+        rc = bnx2x_nvram_crc(bp, entry->nvm_start_addr, size, buff);
+        if (rc)
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "image %x has failed crc test (rc %d)\n", type, rc);
+
+        return rc;
+}
+
+static int bnx2x_test_dir_entry(struct bnx2x *bp, u32 addr, u8 *buff)
+{
+        int rc;
+        struct code_entry entry;
+
+        rc = bnx2x_nvram_read32(bp, addr, (u32 *)&entry, sizeof(entry));
+        if (rc)
+                return rc;
+
+        return bnx2x_test_nvram_dir(bp, &entry, buff);
+}
+
+static int bnx2x_test_nvram_ext_dirs(struct bnx2x *bp, u8 *buff)
+{
+        u32 rc, cnt, dir_offset = NVRAM_DIR_OFFSET;
+        struct code_entry entry;
+        int i;
+
+        rc = bnx2x_nvram_read32(bp,
+                                dir_offset +
+                                sizeof(entry) * CODE_ENTRY_EXTENDED_DIR_IDX,
+                                (u32 *)&entry, sizeof(entry));
+        if (rc)
+                return rc;
+
+        if (!EXTENDED_DIR_EXISTS(entry.code_attribute))
+                return 0;
+
+        rc = bnx2x_nvram_read32(bp, entry.nvm_start_addr,
+                                &cnt, sizeof(u32));
+        if (rc)
+                return rc;
+
+        dir_offset = entry.nvm_start_addr + 8;
+
+        for (i = 0; i < cnt && i < MAX_IMAGES_IN_EXTENDED_DIR; i++) {
+                rc = bnx2x_test_dir_entry(bp, dir_offset +
+                                              sizeof(struct code_entry) * i,
+                                          buff);
+                if (rc)
+                        return rc;
+        }
+
+        return 0;
+}
+
+static int bnx2x_test_nvram_dirs(struct bnx2x *bp, u8 *buff)
+{
+        u32 rc, dir_offset = NVRAM_DIR_OFFSET;
+        int i;
+
+        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "NVRAM DIRS CRC test-set\n");
+
+        for (i = 0; i < CODE_ENTRY_EXTENDED_DIR_IDX; i++) {
+                rc = bnx2x_test_dir_entry(bp, dir_offset +
+                                              sizeof(struct code_entry) * i,
+                                          buff);
+                if (rc)
+                        return rc;
+        }
+
+        return bnx2x_test_nvram_ext_dirs(bp, buff);
+}
+
+struct crc_pair {
+        int offset;
+        int size;
+};
+
+static int bnx2x_test_nvram_tbl(struct bnx2x *bp,
+                                const struct crc_pair *nvram_tbl, u8 *buf)
+{
+        int i;
+
+        for (i = 0; nvram_tbl[i].size; i++) {
+                int rc = bnx2x_nvram_crc(bp, nvram_tbl[i].offset,
+                                         nvram_tbl[i].size, buf);
+                if (rc) {
+                        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                           "nvram_tbl[%d] has failed crc test (rc %d)\n",
+                           i, rc);
+                        return rc;
+                }
+        }
+
+        return 0;
+}
 
 static int bnx2x_test_nvram(struct bnx2x *bp)
 {
-        static const struct {
-                int offset;
-                int size;
-        } nvram_tbl[] = {
+        const struct crc_pair nvram_tbl[] = {
                 {     0,  0x14 }, /* bootstrap */
                 {  0x14,  0xec }, /* dir */
                 { 0x100, 0x350 }, /* manuf_info */
@@ -2542,30 +2768,33 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
                 { 0x708,  0x70 }, /* manuf_key_info */
                 {     0,     0 }
         };
-        __be32 *buf;
-        u8 *data;
-        int i, rc;
-        u32 magic, crc;
+        const struct crc_pair nvram_tbl2[] = {
+                { 0x7e8, 0x350 }, /* manuf_info2 */
+                { 0xb38,  0xf0 }, /* feature_info */
+                {     0,     0 }
+        };
+
+        u8 *buf;
+        int rc;
+        u32 magic;
 
         if (BP_NOMCP(bp))
                 return 0;
 
-        buf = kmalloc(0x350, GFP_KERNEL);
+        buf = kmalloc(CRC_BUFF_SIZE, GFP_KERNEL);
         if (!buf) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "kmalloc failed\n");
                 rc = -ENOMEM;
                 goto test_nvram_exit;
         }
-        data = (u8 *)buf;
 
-        rc = bnx2x_nvram_read(bp, 0, data, 4);
+        rc = bnx2x_nvram_read32(bp, 0, &magic, sizeof(magic));
         if (rc) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "magic value read (rc %d)\n", rc);
                 goto test_nvram_exit;
         }
 
-        magic = be32_to_cpu(buf[0]);
         if (magic != 0x669955aa) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "wrong magic value (0x%08x)\n", magic);
@@ -2573,25 +2802,26 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
                 goto test_nvram_exit;
         }
 
-        for (i = 0; nvram_tbl[i].size; i++) {
+        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "Port 0 CRC test-set\n");
+        rc = bnx2x_test_nvram_tbl(bp, nvram_tbl, buf);
+        if (rc)
+                goto test_nvram_exit;
 
-                rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, data,
-                                      nvram_tbl[i].size);
-                if (rc) {
-                        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
-                           "nvram_tbl[%d] read data (rc %d)\n", i, rc);
-                        goto test_nvram_exit;
-                }
+        if (!CHIP_IS_E1x(bp) && !CHIP_IS_57811xx(bp)) {
+                u32 hide = SHMEM_RD(bp, dev_info.shared_hw_config.config2) &
+                           SHARED_HW_CFG_HIDE_PORT1;
 
-                crc = ether_crc_le(nvram_tbl[i].size, data);
-                if (crc != CRC32_RESIDUAL) {
+                if (!hide) {
                         DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
-                           "nvram_tbl[%d] wrong crc value (0x%08x)\n", i, crc);
-                        rc = -ENODEV;
-                        goto test_nvram_exit;
+                           "Port 1 CRC test-set\n");
+                        rc = bnx2x_test_nvram_tbl(bp, nvram_tbl2, buf);
+                        if (rc)
+                                goto test_nvram_exit;
                 }
         }
 
+        rc = bnx2x_test_nvram_dirs(bp, buf);
+
 test_nvram_exit:
         kfree(buf);
         return rc;
@@ -3232,7 +3462,32 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
         .get_ts_info            = ethtool_op_get_ts_info,
 };
 
-void bnx2x_set_ethtool_ops(struct net_device *netdev)
+static const struct ethtool_ops bnx2x_vf_ethtool_ops = {
+        .get_settings           = bnx2x_get_settings,
+        .set_settings           = bnx2x_set_settings,
+        .get_drvinfo            = bnx2x_get_drvinfo,
+        .get_msglevel           = bnx2x_get_msglevel,
+        .set_msglevel           = bnx2x_set_msglevel,
+        .get_link               = bnx2x_get_link,
+        .get_coalesce           = bnx2x_get_coalesce,
+        .get_ringparam          = bnx2x_get_ringparam,
+        .set_ringparam          = bnx2x_set_ringparam,
+        .get_sset_count         = bnx2x_get_sset_count,
+        .get_strings            = bnx2x_get_strings,
+        .get_ethtool_stats      = bnx2x_get_ethtool_stats,
+        .get_rxnfc              = bnx2x_get_rxnfc,
+        .set_rxnfc              = bnx2x_set_rxnfc,
+        .get_rxfh_indir_size    = bnx2x_get_rxfh_indir_size,
+        .get_rxfh_indir         = bnx2x_get_rxfh_indir,
+        .set_rxfh_indir         = bnx2x_set_rxfh_indir,
+        .get_channels           = bnx2x_get_channels,
+        .set_channels           = bnx2x_set_channels,
+};
+
+void bnx2x_set_ethtool_ops(struct bnx2x *bp, struct net_device *netdev)
 {
-        SET_ETHTOOL_OPS(netdev, &bnx2x_ethtool_ops);
+        if (IS_PF(bp))
+                SET_ETHTOOL_OPS(netdev, &bnx2x_ethtool_ops);
+        else /* vf */
+                SET_ETHTOOL_OPS(netdev, &bnx2x_vf_ethtool_ops);
 }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index e5f808377c91..84aecdf06f7a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -30,31 +30,31 @@
         * IRO[138].m2) + ((sbId) * IRO[138].m3))
 #define CSTORM_IGU_MODE_OFFSET (IRO[157].base)
 #define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
-        (IRO[316].base + ((pfId) * IRO[316].m1))
-#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
         (IRO[317].base + ((pfId) * IRO[317].m1))
+#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
+        (IRO[318].base + ((pfId) * IRO[318].m1))
 #define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \
-        (IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
+        (IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))
 #define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \
-        (IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))
+        (IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))
 #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \
-        (IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))
+        (IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))
 #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \
-        (IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))
+        (IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))
 #define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \
-        (IRO[308].base + ((pfId) * IRO[308].m1) + ((iscsiEqId) * IRO[308].m2))
+        (IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
 #define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \
-        (IRO[314].base + ((pfId) * IRO[314].m1) + ((iscsiEqId) * IRO[314].m2))
+        (IRO[315].base + ((pfId) * IRO[315].m1) + ((iscsiEqId) * IRO[315].m2))
 #define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \
-        (IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))
+        (IRO[314].base + ((pfId) * IRO[314].m1) + ((iscsiEqId) * IRO[314].m2))
 #define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
-        (IRO[315].base + ((pfId) * IRO[315].m1))
+        (IRO[316].base + ((pfId) * IRO[316].m1))
 #define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[307].base + ((pfId) * IRO[307].m1))
+        (IRO[308].base + ((pfId) * IRO[308].m1))
 #define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[306].base + ((pfId) * IRO[306].m1))
+        (IRO[307].base + ((pfId) * IRO[307].m1))
 #define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[305].base + ((pfId) * IRO[305].m1))
+        (IRO[306].base + ((pfId) * IRO[306].m1))
 #define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
         (IRO[151].base + ((funcId) * IRO[151].m1))
 #define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \
@@ -114,7 +114,7 @@
 #define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
         (IRO[268].base + ((pfId) * IRO[268].m1))
 #define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \
-        (IRO[277].base + ((pfId) * IRO[277].m1))
+        (IRO[278].base + ((pfId) * IRO[278].m1))
 #define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
         (IRO[264].base + ((pfId) * IRO[264].m1))
 #define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
@@ -136,35 +136,32 @@
 #define USTORM_ASSERT_LIST_INDEX_OFFSET (IRO[177].base)
 #define USTORM_ASSERT_LIST_OFFSET(assertListEntry) \
         (IRO[176].base + ((assertListEntry) * IRO[176].m1))
-#define USTORM_CQE_PAGE_NEXT_OFFSET(portId, clientId) \
-        (IRO[205].base + ((portId) * IRO[205].m1) + ((clientId) * \
-        IRO[205].m2))
 #define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \
         (IRO[183].base + ((portId) * IRO[183].m1))
 #define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \
-        (IRO[318].base + ((pfId) * IRO[318].m1))
+        (IRO[319].base + ((pfId) * IRO[319].m1))
 #define USTORM_FUNC_EN_OFFSET(funcId) \
         (IRO[178].base + ((funcId) * IRO[178].m1))
 #define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
-        (IRO[282].base + ((pfId) * IRO[282].m1))
-#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
         (IRO[283].base + ((pfId) * IRO[283].m1))
+#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
+        (IRO[284].base + ((pfId) * IRO[284].m1))
 #define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
-        (IRO[287].base + ((pfId) * IRO[287].m1))
+        (IRO[288].base + ((pfId) * IRO[288].m1))
 #define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \
-        (IRO[284].base + ((pfId) * IRO[284].m1))
+        (IRO[285].base + ((pfId) * IRO[285].m1))
 #define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[280].base + ((pfId) * IRO[280].m1))
+        (IRO[281].base + ((pfId) * IRO[281].m1))
 #define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[279].base + ((pfId) * IRO[279].m1))
+        (IRO[280].base + ((pfId) * IRO[280].m1))
 #define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[278].base + ((pfId) * IRO[278].m1))
+        (IRO[279].base + ((pfId) * IRO[279].m1))
 #define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
-        (IRO[281].base + ((pfId) * IRO[281].m1))
+        (IRO[282].base + ((pfId) * IRO[282].m1))
 #define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \
-        (IRO[285].base + ((pfId) * IRO[285].m1))
-#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
         (IRO[286].base + ((pfId) * IRO[286].m1))
+#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
+        (IRO[287].base + ((pfId) * IRO[287].m1))
 #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \
         (IRO[182].base + ((pfId) * IRO[182].m1))
 #define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
@@ -190,39 +187,39 @@
 #define XSTORM_FUNC_EN_OFFSET(funcId) \
         (IRO[47].base + ((funcId) * IRO[47].m1))
 #define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
-        (IRO[295].base + ((pfId) * IRO[295].m1))
+        (IRO[296].base + ((pfId) * IRO[296].m1))
 #define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \
-        (IRO[298].base + ((pfId) * IRO[298].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
         (IRO[299].base + ((pfId) * IRO[299].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
         (IRO[300].base + ((pfId) * IRO[300].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
         (IRO[301].base + ((pfId) * IRO[301].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
         (IRO[302].base + ((pfId) * IRO[302].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
         (IRO[303].base + ((pfId) * IRO[303].m1))
-#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
         (IRO[304].base + ((pfId) * IRO[304].m1))
+#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
+        (IRO[305].base + ((pfId) * IRO[305].m1))
 #define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[294].base + ((pfId) * IRO[294].m1))
+        (IRO[295].base + ((pfId) * IRO[295].m1))
 #define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[293].base + ((pfId) * IRO[293].m1))
+        (IRO[294].base + ((pfId) * IRO[294].m1))
 #define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[292].base + ((pfId) * IRO[292].m1))
+        (IRO[293].base + ((pfId) * IRO[293].m1))
 #define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
-        (IRO[297].base + ((pfId) * IRO[297].m1))
+        (IRO[298].base + ((pfId) * IRO[298].m1))
 #define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \
-        (IRO[296].base + ((pfId) * IRO[296].m1))
+        (IRO[297].base + ((pfId) * IRO[297].m1))
 #define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \
-        (IRO[291].base + ((pfId) * IRO[291].m1))
+        (IRO[292].base + ((pfId) * IRO[292].m1))
 #define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
-        (IRO[290].base + ((pfId) * IRO[290].m1))
+        (IRO[291].base + ((pfId) * IRO[291].m1))
 #define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \
-        (IRO[289].base + ((pfId) * IRO[289].m1))
+        (IRO[290].base + ((pfId) * IRO[290].m1))
 #define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \
-        (IRO[288].base + ((pfId) * IRO[288].m1))
+        (IRO[289].base + ((pfId) * IRO[289].m1))
 #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \
         (IRO[44].base + ((pfId) * IRO[44].m1))
 #define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
@@ -389,4 +386,8 @@
 
 #define UNDEF_IRO 0x80000000
 
+/* used for defining the amount of FCoE tasks supported for PF */
+#define MAX_FCOE_FUNCS_PER_ENGINE 2
+#define MAX_NUM_FCOE_TASKS_PER_ENGINE 4096
+
 #endif /* BNX2X_FW_DEFS_H */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index 037860ecc343..12f00a40cdf0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -114,6 +114,10 @@ struct license_key {
 #define EPIO_CFG_EPIO30                     0x0000001f
 #define EPIO_CFG_EPIO31                     0x00000020
 
+struct mac_addr {
+        u32 upper;
+        u32 lower;
+};
 
 struct shared_hw_cfg {                   /* NVRAM Offset */
         /* Up to 16 bytes of NULL-terminated string */
@@ -508,7 +512,22 @@ struct port_hw_cfg {		    /* port 0: 0x12c  port 1: 0x2bc */
         #define PORT_HW_CFG_PAUSE_ON_HOST_RING_DISABLED               0x00000000
         #define PORT_HW_CFG_PAUSE_ON_HOST_RING_ENABLED                0x00000001
 
-        u32 reserved0[6];                                   /* 0x178 */
+        /* SFP+ Tx Equalization: NIC recommended and tested value is 0xBEB2
+         * LOM recommended and tested value is 0xBEB2. Using a different
+         * value means using a value not tested by BRCM
+         */
+        u32 sfi_tap_values;                                 /* 0x178 */
+        #define PORT_HW_CFG_TX_EQUALIZATION_MASK                      0x0000FFFF
+        #define PORT_HW_CFG_TX_EQUALIZATION_SHIFT                     0
+
+        /* SFP+ Tx driver broadcast IDRIVER: NIC recommended and tested
+         * value is 0x2. LOM recommended and tested value is 0x2. Using a
+         * different value means using a value not tested by BRCM
+         */
+        #define PORT_HW_CFG_TX_DRV_BROADCAST_MASK                     0x000F0000
+        #define PORT_HW_CFG_TX_DRV_BROADCAST_SHIFT                    16
+
+        u32 reserved0[5];                                   /* 0x17c */
 
         u32 aeu_int_mask;                                   /* 0x190 */
 
@@ -2821,8 +2840,8 @@ struct afex_stats {
 
 #define BCM_5710_FW_MAJOR_VERSION                       7
 #define BCM_5710_FW_MINOR_VERSION                       8
-#define BCM_5710_FW_REVISION_VERSION            2
-#define BCM_5710_FW_ENGINEERING_VERSION                 0
+#define BCM_5710_FW_REVISION_VERSION            17
+#define BCM_5710_FW_ENGINEERING_VERSION         0
 #define BCM_5710_FW_COMPILE_FLAGS                       1
 
 
@@ -3513,11 +3532,14 @@ struct client_init_tx_data {
 #define CLIENT_INIT_TX_DATA_BCAST_ACCEPT_ALL_SHIFT 2
 #define CLIENT_INIT_TX_DATA_ACCEPT_ANY_VLAN (0x1<<3)
 #define CLIENT_INIT_TX_DATA_ACCEPT_ANY_VLAN_SHIFT 3
-#define CLIENT_INIT_TX_DATA_RESERVED1 (0xFFF<<4)
-#define CLIENT_INIT_TX_DATA_RESERVED1_SHIFT 4
+#define CLIENT_INIT_TX_DATA_RESERVED0 (0xFFF<<4)
+#define CLIENT_INIT_TX_DATA_RESERVED0_SHIFT 4
         u8 default_vlan_flg;
         u8 force_default_pri_flg;
-        __le32 reserved3;
+        u8 tunnel_lso_inc_ip_id;
+        u8 refuse_outband_vlan_flg;
+        u8 tunnel_non_lso_pcsum_location;
+        u8 reserved1;
 };
 
 /*
@@ -3551,6 +3573,11 @@ struct client_update_ramrod_data {
         __le16 silent_vlan_mask;
         u8 silent_vlan_removal_flg;
         u8 silent_vlan_change_flg;
+        u8 refuse_outband_vlan_flg;
+        u8 refuse_outband_vlan_change_flg;
+        u8 tx_switching_flg;
+        u8 tx_switching_change_flg;
+        __le32 reserved1;
         __le32 echo;
 };
 
@@ -3620,7 +3647,8 @@ struct eth_classify_header {
  */
 struct eth_classify_mac_cmd {
         struct eth_classify_cmd_header header;
-        __le32 reserved0;
+        __le16 reserved0;
+        __le16 inner_mac;
         __le16 mac_lsb;
         __le16 mac_mid;
         __le16 mac_msb;
@@ -3633,7 +3661,8 @@ struct eth_classify_mac_cmd {
  */
 struct eth_classify_pair_cmd {
         struct eth_classify_cmd_header header;
-        __le32 reserved0;
+        __le16 reserved0;
+        __le16 inner_mac;
         __le16 mac_lsb;
         __le16 mac_mid;
         __le16 mac_msb;
@@ -3855,8 +3884,68 @@ struct eth_halt_ramrod_data {
 
 
 /*
- * Command for setting multicast classification for a client
+ * destination and source mac address.
+ */
+struct eth_mac_addresses {
+#if defined(__BIG_ENDIAN)
+        __le16 dst_mid;
+        __le16 dst_lo;
+#elif defined(__LITTLE_ENDIAN)
+        __le16 dst_lo;
+        __le16 dst_mid;
+#endif
+#if defined(__BIG_ENDIAN)
+        __le16 src_lo;
+        __le16 dst_hi;
+#elif defined(__LITTLE_ENDIAN)
+        __le16 dst_hi;
+        __le16 src_lo;
+#endif
+#if defined(__BIG_ENDIAN)
+        __le16 src_hi;
+        __le16 src_mid;
+#elif defined(__LITTLE_ENDIAN)
+        __le16 src_mid;
+        __le16 src_hi;
+#endif
+};
+
+/* tunneling related data */
+struct eth_tunnel_data {
+#if defined(__BIG_ENDIAN)
+        __le16 dst_mid;
+        __le16 dst_lo;
+#elif defined(__LITTLE_ENDIAN)
+        __le16 dst_lo;
+        __le16 dst_mid;
+#endif
+#if defined(__BIG_ENDIAN)
+        __le16 reserved0;
+        __le16 dst_hi;
+#elif defined(__LITTLE_ENDIAN)
+        __le16 dst_hi;
+        __le16 reserved0;
+#endif
+#if defined(__BIG_ENDIAN)
+        u8 reserved1;
+        u8 ip_hdr_start_inner_w;
+        __le16 pseudo_csum;
+#elif defined(__LITTLE_ENDIAN)
+        __le16 pseudo_csum;
+        u8 ip_hdr_start_inner_w;
+        u8 reserved1;
+#endif
+};
+
+/* union for mac addresses and for tunneling data.
+ * considered as tunneling data only if (tunnel_exist == 1).
  */
+union eth_mac_addr_or_tunnel_data {
+        struct eth_mac_addresses mac_addr;
+        struct eth_tunnel_data tunnel_data;
+};
+
+/*Command for setting multicast classification for a client */
 struct eth_multicast_rules_cmd {
         u8 cmd_general_data;
 #define ETH_MULTICAST_RULES_CMD_RX_CMD (0x1<<0)
@@ -3874,7 +3963,6 @@ struct eth_multicast_rules_cmd {
         struct regpair reserved3;
 };
 
-
 /*
  * parameters for multicast classification ramrod
  */
@@ -3883,7 +3971,6 @@ struct eth_multicast_rules_ramrod_data {
         struct eth_multicast_rules_cmd rules[MULTICAST_RULES_COUNT];
 };
 
-
 /*
  * Place holder for ramrods protocol specific data
  */
@@ -3947,11 +4034,14 @@ struct eth_rss_update_ramrod_data {
 #define ETH_RSS_UPDATE_RAMROD_DATA_IPV6_TCP_CAPABILITY_SHIFT 4
 #define ETH_RSS_UPDATE_RAMROD_DATA_IPV6_UDP_CAPABILITY (0x1<<5)
 #define ETH_RSS_UPDATE_RAMROD_DATA_IPV6_UDP_CAPABILITY_SHIFT 5
+#define ETH_RSS_UPDATE_RAMROD_DATA_EN_5_TUPLE_CAPABILITY (0x1<<6)
+#define ETH_RSS_UPDATE_RAMROD_DATA_EN_5_TUPLE_CAPABILITY_SHIFT 6
 #define ETH_RSS_UPDATE_RAMROD_DATA_UPDATE_RSS_KEY (0x1<<7)
 #define ETH_RSS_UPDATE_RAMROD_DATA_UPDATE_RSS_KEY_SHIFT 7
         u8 rss_result_mask;
         u8 rss_mode;
-        __le32 __reserved2;
+        __le16 udp_4tuple_dst_port_mask;
+        __le16 udp_4tuple_dst_port_value;
         u8 indirection_table[T_ETH_INDIRECTION_TABLE_SIZE];
         __le32 rss_key[T_ETH_RSS_KEY];
         __le32 echo;
@@ -4115,6 +4205,23 @@ enum eth_tpa_update_command {
         MAX_ETH_TPA_UPDATE_COMMAND
 };
 
+/* In case of LSO over IPv4 tunnel, whether to increment
+ * IP ID on external IP header or internal IP header
+ */
+enum eth_tunnel_lso_inc_ip_id {
+        EXT_HEADER,
+        INT_HEADER,
+        MAX_ETH_TUNNEL_LSO_INC_IP_ID
+};
+
+/* In case tunnel exist and L4 checksum offload,
+ * the pseudo checksum location, on packet or on BD.
+ */
+enum eth_tunnel_non_lso_pcsum_location {
+        PCSUM_ON_PKT,
+        PCSUM_ON_BD,
+        MAX_ETH_TUNNEL_NON_LSO_PCSUM_LOCATION
+};
 
 /*
  * Tx regular BD structure
@@ -4166,8 +4273,8 @@ struct eth_tx_start_bd {
 #define ETH_TX_START_BD_FORCE_VLAN_MODE_SHIFT 4
 #define ETH_TX_START_BD_PARSE_NBDS (0x3<<5)
 #define ETH_TX_START_BD_PARSE_NBDS_SHIFT 5
-#define ETH_TX_START_BD_RESREVED (0x1<<7)
-#define ETH_TX_START_BD_RESREVED_SHIFT 7
+#define ETH_TX_START_BD_TUNNEL_EXIST (0x1<<7)
+#define ETH_TX_START_BD_TUNNEL_EXIST_SHIFT 7
 };
 
 /*
@@ -4216,15 +4323,10 @@ struct eth_tx_parse_bd_e1x {
  * Tx parsing BD structure for ETH E2
  */
 struct eth_tx_parse_bd_e2 {
-        __le16 dst_mac_addr_lo;
-        __le16 dst_mac_addr_mid;
-        __le16 dst_mac_addr_hi;
-        __le16 src_mac_addr_lo;
-        __le16 src_mac_addr_mid;
-        __le16 src_mac_addr_hi;
+        union eth_mac_addr_or_tunnel_data data;
         __le32 parsing_data;
-#define ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W (0x7FF<<0)
-#define ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W_SHIFT 0
+#define ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W (0x7FF<<0)
+#define ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W_SHIFT 0
 #define ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW (0xF<<11)
 #define ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT 11
 #define ETH_TX_PARSE_BD_E2_IPV6_WITH_EXT_HDR (0x1<<15)
@@ -4236,8 +4338,51 @@ struct eth_tx_parse_bd_e2 {
 };
 
 /*
- * The last BD in the BD memory will hold a pointer to the next BD memory
+ * Tx 2nd parsing BD structure for ETH packet
  */
+struct eth_tx_parse_2nd_bd {
+        __le16 global_data;
+#define ETH_TX_PARSE_2ND_BD_IP_HDR_START_OUTER_W (0xF<<0)
+#define ETH_TX_PARSE_2ND_BD_IP_HDR_START_OUTER_W_SHIFT 0
+#define ETH_TX_PARSE_2ND_BD_IP_HDR_TYPE_OUTER (0x1<<4)
+#define ETH_TX_PARSE_2ND_BD_IP_HDR_TYPE_OUTER_SHIFT 4
+#define ETH_TX_PARSE_2ND_BD_LLC_SNAP_EN (0x1<<5)
+#define ETH_TX_PARSE_2ND_BD_LLC_SNAP_EN_SHIFT 5
+#define ETH_TX_PARSE_2ND_BD_NS_FLG (0x1<<6)
+#define ETH_TX_PARSE_2ND_BD_NS_FLG_SHIFT 6
+#define ETH_TX_PARSE_2ND_BD_TUNNEL_UDP_EXIST (0x1<<7)
+#define ETH_TX_PARSE_2ND_BD_TUNNEL_UDP_EXIST_SHIFT 7
+#define ETH_TX_PARSE_2ND_BD_IP_HDR_LEN_OUTER_W (0x1F<<8)
+#define ETH_TX_PARSE_2ND_BD_IP_HDR_LEN_OUTER_W_SHIFT 8
+#define ETH_TX_PARSE_2ND_BD_RESERVED0 (0x7<<13)
+#define ETH_TX_PARSE_2ND_BD_RESERVED0_SHIFT 13
+        __le16 reserved1;
+        u8 tcp_flags;
+#define ETH_TX_PARSE_2ND_BD_FIN_FLG (0x1<<0)
+#define ETH_TX_PARSE_2ND_BD_FIN_FLG_SHIFT 0
+#define ETH_TX_PARSE_2ND_BD_SYN_FLG (0x1<<1)
+#define ETH_TX_PARSE_2ND_BD_SYN_FLG_SHIFT 1
+#define ETH_TX_PARSE_2ND_BD_RST_FLG (0x1<<2)
+#define ETH_TX_PARSE_2ND_BD_RST_FLG_SHIFT 2
+#define ETH_TX_PARSE_2ND_BD_PSH_FLG (0x1<<3)
+#define ETH_TX_PARSE_2ND_BD_PSH_FLG_SHIFT 3
+#define ETH_TX_PARSE_2ND_BD_ACK_FLG (0x1<<4)
+#define ETH_TX_PARSE_2ND_BD_ACK_FLG_SHIFT 4
+#define ETH_TX_PARSE_2ND_BD_URG_FLG (0x1<<5)
+#define ETH_TX_PARSE_2ND_BD_URG_FLG_SHIFT 5
+#define ETH_TX_PARSE_2ND_BD_ECE_FLG (0x1<<6)
+#define ETH_TX_PARSE_2ND_BD_ECE_FLG_SHIFT 6
+#define ETH_TX_PARSE_2ND_BD_CWR_FLG (0x1<<7)
+#define ETH_TX_PARSE_2ND_BD_CWR_FLG_SHIFT 7
+        u8 reserved2;
+        u8 tunnel_udp_hdr_start_w;
+        u8 fw_ip_hdr_to_payload_w;
+        __le16 fw_ip_csum_wo_len_flags_frag;
+        __le16 hw_ip_id;
+        __le32 tcp_send_seq;
+};
+
+/* The last BD in the BD memory will hold a pointer to the next BD memory */
 struct eth_tx_next_bd {
         __le32 addr_lo;
         __le32 addr_hi;
@@ -4252,6 +4397,7 @@ union eth_tx_bd_types {
         struct eth_tx_bd reg_bd;
         struct eth_tx_parse_bd_e1x parse_bd_e1x;
         struct eth_tx_parse_bd_e2 parse_bd_e2;
+        struct eth_tx_parse_2nd_bd parse_2nd_bd;
         struct eth_tx_next_bd next_bd;
 };
 
@@ -4663,10 +4809,10 @@ enum common_spqe_cmd_id {
         RAMROD_CMD_ID_COMMON_STOP_TRAFFIC,
         RAMROD_CMD_ID_COMMON_START_TRAFFIC,
         RAMROD_CMD_ID_COMMON_AFEX_VIF_LISTS,
+        RAMROD_CMD_ID_COMMON_SET_TIMESYNC,
         MAX_COMMON_SPQE_CMD_ID
 };
 
-
 /*
  * Per-protocol connection types
  */
@@ -4863,7 +5009,7 @@ struct vf_flr_event_data {
  */
 struct malicious_vf_event_data {
         u8 vf_id;
-        u8 reserved0;
+        u8 err_id;
         u16 reserved1;
         u32 reserved2;
         u32 reserved3;
@@ -4969,10 +5115,10 @@ enum event_ring_opcode {
         EVENT_RING_OPCODE_CLASSIFICATION_RULES,
         EVENT_RING_OPCODE_FILTERS_RULES,
         EVENT_RING_OPCODE_MULTICAST_RULES,
+        EVENT_RING_OPCODE_SET_TIMESYNC,
         MAX_EVENT_RING_OPCODE
 };
 
-
 /*
  * Modes for fairness algorithm
  */
@@ -5010,14 +5156,18 @@ struct flow_control_configuration {
  */
 struct function_start_data {
         u8 function_mode;
-        u8 reserved;
+        u8 allow_npar_tx_switching;
         __le16 sd_vlan_tag;
         __le16 vif_id;
         u8 path_id;
         u8 network_cos_mode;
+        u8 dmae_cmd_id;
+        u8 gre_tunnel_mode;
+        u8 gre_tunnel_rss;
+        u8 nvgre_clss_en;
+        __le16 reserved1[2];
 };
 
-
 struct function_update_data {
         u8 vif_id_change_flg;
         u8 afex_default_vlan_change_flg;
@@ -5027,14 +5177,19 @@ struct function_update_data {
         __le16 afex_default_vlan;
         u8 allowed_priorities;
         u8 network_cos_mode;
+        u8 lb_mode_en_change_flg;
         u8 lb_mode_en;
         u8 tx_switch_suspend_change_flg;
         u8 tx_switch_suspend;
         u8 echo;
-        __le16 reserved1;
+        u8 reserved1;
+        u8 update_gre_cfg_flg;
+        u8 gre_tunnel_mode;
+        u8 gre_tunnel_rss;
+        u8 nvgre_clss_en;
+        u32 reserved3;
 };
 
-
 /*
  * FW version stored in the Xstorm RAM
  */
@@ -5061,6 +5216,22 @@ struct fw_version {
 #define __FW_VERSION_RESERVED_SHIFT 4
 };
 
+/* GRE RSS Mode */
+enum gre_rss_mode {
+        GRE_OUTER_HEADERS_RSS,
+        GRE_INNER_HEADERS_RSS,
+        NVGRE_KEY_ENTROPY_RSS,
+        MAX_GRE_RSS_MODE
+};
+
+/* GRE Tunnel Mode */
+enum gre_tunnel_type {
+        NO_GRE_TUNNEL,
+        NVGRE_TUNNEL,
+        L2GRE_TUNNEL,
+        IPGRE_TUNNEL,
+        MAX_GRE_TUNNEL_TYPE
+};
 
 /*
  * Dynamic Host-Coalescing - Driver(host) counters
@@ -5224,6 +5395,26 @@ enum ip_ver {
         MAX_IP_VER
 };
 
+/*
+ * Malicious VF error ID
+ */
+enum malicious_vf_error_id {
+        VF_PF_CHANNEL_NOT_READY,
+        ETH_ILLEGAL_BD_LENGTHS,
+        ETH_PACKET_TOO_SHORT,
+        ETH_PAYLOAD_TOO_BIG,
+        ETH_ILLEGAL_ETH_TYPE,
+        ETH_ILLEGAL_LSO_HDR_LEN,
+        ETH_TOO_MANY_BDS,
+        ETH_ZERO_HDR_NBDS,
+        ETH_START_BD_NOT_SET,
+        ETH_ILLEGAL_PARSE_NBDS,
+        ETH_IPV6_AND_CHECKSUM,
+        ETH_VLAN_FLG_INCORRECT,
+        ETH_ILLEGAL_LSO_MSS,
+        ETH_TUNNEL_NOT_SUPPORTED,
+        MAX_MALICIOUS_VF_ERROR_ID
+};
 
 /*
  * Multi-function modes
@@ -5368,7 +5559,6 @@ struct protocol_common_spe {
         union protocol_common_specific_data data;
 };
 
-
 /*
  * The send queue element
  */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 0283f343b0d1..9d64b988ab34 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -27,6 +27,10 @@
 #include "bnx2x.h"
 #include "bnx2x_cmn.h"
 
+typedef int (*read_sfp_module_eeprom_func_p)(struct bnx2x_phy *phy,
+                                             struct link_params *params,
+                                             u8 dev_addr, u16 addr, u8 byte_cnt,
+                                             u8 *o_buf, u8);
 /********************************************************/
 #define ETH_HLEN                        14
 /* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */
@@ -152,6 +156,7 @@
 #define SFP_EEPROM_CON_TYPE_ADDR                0x2
         #define SFP_EEPROM_CON_TYPE_VAL_LC      0x7
         #define SFP_EEPROM_CON_TYPE_VAL_COPPER  0x21
+        #define SFP_EEPROM_CON_TYPE_VAL_RJ45    0x22
 
 
 #define SFP_EEPROM_COMP_CODE_ADDR               0x3
@@ -3127,11 +3132,6 @@ static int bnx2x_bsc_read(struct link_params *params,
         int rc = 0;
         struct bnx2x *bp = params->bp;
 
-        if ((sl_devid != 0xa0) && (sl_devid != 0xa2)) {
-                DP(NETIF_MSG_LINK, "invalid sl_devid 0x%x\n", sl_devid);
-                return -EINVAL;
-        }
-
         if (xfer_cnt > 16) {
                 DP(NETIF_MSG_LINK, "invalid xfer_cnt %d. Max is 16 bytes\n",
                                         xfer_cnt);
@@ -3426,13 +3426,19 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
 
         switch (phy->req_flow_ctrl) {
         case BNX2X_FLOW_CTRL_AUTO:
-                if (params->req_fc_auto_adv == BNX2X_FLOW_CTRL_BOTH)
+                switch (params->req_fc_auto_adv) {
+                case BNX2X_FLOW_CTRL_BOTH:
                         *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                else
+                        break;
+                case BNX2X_FLOW_CTRL_RX:
+                case BNX2X_FLOW_CTRL_TX:
                         *ieee_fc |=
-                        MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
+                                MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
+                        break;
+                default:
+                        break;
+                }
                 break;
-
         case BNX2X_FLOW_CTRL_TX:
                 *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
                 break;
@@ -3629,6 +3635,16 @@ static u8 bnx2x_ext_phy_resolve_fc(struct bnx2x_phy *phy,
  * init configuration, and set/clear SGMII flag. Internal
  * phy init is done purely in phy_init stage.
  */
+#define WC_TX_DRIVER(post2, idriver, ipre) \
+        ((post2 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) | \
+         (idriver << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) | \
+         (ipre << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET))
+
+#define WC_TX_FIR(post, main, pre) \
+        ((post << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) | \
+         (main << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) | \
+         (pre << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET))
+
 static void bnx2x_warpcore_enable_AN_KR2(struct bnx2x_phy *phy,
                                          struct link_params *params,
                                          struct link_vars *vars)
@@ -3728,7 +3744,7 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         if (((vars->line_speed == SPEED_AUTO_NEG) &&
              (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)) ||
             (vars->line_speed == SPEED_1000)) {
-                u32 addr = MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2;
+                u16 addr = MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2;
                 an_adv |= (1<<5);
 
                 /* Enable CL37 1G Parallel Detect */
@@ -3753,20 +3769,13 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         /* Set Transmit PMD settings */
         lane = bnx2x_get_warpcore_lane(phy, params);
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                      MDIO_WC_REG_TX0_TX_DRIVER + 0x10*lane,
-                     ((0x02 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
-                      (0x06 << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                      (0x09 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET)));
+                         MDIO_WC_REG_TX0_TX_DRIVER + 0x10*lane,
+                         WC_TX_DRIVER(0x02, 0x06, 0x09));
         /* Configure the next lane if dual mode */
         if (phy->flags & FLAGS_WC_DUAL_MODE)
                 bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                                  MDIO_WC_REG_TX0_TX_DRIVER + 0x10*(lane+1),
-                                 ((0x02 <<
-                                 MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
-                                  (0x06 <<
-                                   MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                                  (0x09 <<
-                                MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET)));
+                                 WC_TX_DRIVER(0x02, 0x06, 0x09));
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_CL72_USERB0_CL72_OS_DEF_CTRL,
                          0x03f0);
@@ -3909,6 +3918,8 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u16 misc1_val, tap_val, tx_driver_val, lane, val;
+        u32 cfg_tap_val, tx_drv_brdct, tx_equal;
+
         /* Hold rxSeqStart */
         bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
                                  MDIO_WC_REG_DSC2B0_DSC_MISC_CTRL0, 0x8000);
@@ -3952,23 +3963,33 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
 
         if (is_xfi) {
                 misc1_val |= 0x5;
-                tap_val = ((0x08 << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
-                           (0x37 << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
-                           (0x00 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET));
-                tx_driver_val =
-                      ((0x00 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
-                       (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                       (0x03 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET));
-
+                tap_val = WC_TX_FIR(0x08, 0x37, 0x00);
+                tx_driver_val = WC_TX_DRIVER(0x00, 0x02, 0x03);
         } else {
+                cfg_tap_val = REG_RD(bp, params->shmem_base +
+                                     offsetof(struct shmem_region, dev_info.
+                                              port_hw_config[params->port].
+                                              sfi_tap_values));
+
+                tx_equal = cfg_tap_val & PORT_HW_CFG_TX_EQUALIZATION_MASK;
+
+                tx_drv_brdct = (cfg_tap_val &
+                                PORT_HW_CFG_TX_DRV_BROADCAST_MASK) >>
+                               PORT_HW_CFG_TX_DRV_BROADCAST_SHIFT;
+
                 misc1_val |= 0x9;
-                tap_val = ((0x0f << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
-                           (0x2b << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
-                           (0x02 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET));
-                tx_driver_val =
-                      ((0x03 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
-                       (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                       (0x06 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET));
+
+                /* TAP values are controlled by nvram, if value there isn't 0 */
+                if (tx_equal)
+                        tap_val = (u16)tx_equal;
+                else
+                        tap_val = WC_TX_FIR(0x0f, 0x2b, 0x02);
+
+                if (tx_drv_brdct)
+                        tx_driver_val = WC_TX_DRIVER(0x03, (u16)tx_drv_brdct,
+                                                     0x06);
+                else
+                        tx_driver_val = WC_TX_DRIVER(0x03, 0x02, 0x06);
         }
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_SERDESDIGITAL_MISC1, misc1_val);
@@ -4105,15 +4126,11 @@ static void bnx2x_warpcore_set_20G_DXGXS(struct bnx2x *bp,
         /* Set Transmit PMD settings */
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_TX_FIR_TAP,
-                        ((0x12 << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
-                         (0x2d << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
-                         (0x00 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET) |
-                         MDIO_WC_REG_TX_FIR_TAP_ENABLE));
+                         (WC_TX_FIR(0x12, 0x2d, 0x00) |
+                          MDIO_WC_REG_TX_FIR_TAP_ENABLE));
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                      MDIO_WC_REG_TX0_TX_DRIVER + 0x10*lane,
-                     ((0x02 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
-                      (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                      (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET)));
+                         MDIO_WC_REG_TX0_TX_DRIVER + 0x10*lane,
+                         WC_TX_DRIVER(0x02, 0x02, 0x02));
 }
 
 static void bnx2x_warpcore_set_sgmii_speed(struct bnx2x_phy *phy,
@@ -4750,8 +4767,8 @@ void bnx2x_link_status_update(struct link_params *params,
                                             port_mb[port].link_status));
 
         /* Force link UP in non LOOPBACK_EXT loopback mode(s) */
-        if (bp->link_params.loopback_mode != LOOPBACK_NONE &&
-            bp->link_params.loopback_mode != LOOPBACK_EXT)
+        if (params->loopback_mode != LOOPBACK_NONE &&
+            params->loopback_mode != LOOPBACK_EXT)
                 vars->link_status |= LINK_STATUS_LINK_UP;
 
         if (bnx2x_eee_has_cap(params))
@@ -7758,7 +7775,8 @@ static void bnx2x_sfp_set_transmitter(struct link_params *params,
 
 static int bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                              struct link_params *params,
-                                             u16 addr, u8 byte_cnt, u8 *o_buf)
+                                             u8 dev_addr, u16 addr, u8 byte_cnt,
+                                             u8 *o_buf, u8 is_init)
 {
         struct bnx2x *bp = params->bp;
         u16 val = 0;
@@ -7771,7 +7789,7 @@ static int bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         /* Set the read command byte count */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
-                         (byte_cnt | 0xa000));
+                         (byte_cnt | (dev_addr << 8)));
 
         /* Set the read command address */
         bnx2x_cl45_write(bp, phy,
@@ -7845,6 +7863,7 @@ static void bnx2x_warpcore_power_module(struct link_params *params,
 }
 static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                                  struct link_params *params,
+                                                 u8 dev_addr,
                                                  u16 addr, u8 byte_cnt,
                                                  u8 *o_buf, u8 is_init)
 {
@@ -7869,7 +7888,7 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                         usleep_range(1000, 2000);
                         bnx2x_warpcore_power_module(params, 1);
                 }
-                rc = bnx2x_bsc_read(params, phy, 0xa0, addr32, 0, byte_cnt,
+                rc = bnx2x_bsc_read(params, phy, dev_addr, addr32, 0, byte_cnt,
                                     data_array);
         } while ((rc != 0) && (++cnt < I2C_WA_RETRY_CNT));
 
@@ -7885,7 +7904,8 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
 
 static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                              struct link_params *params,
-                                             u16 addr, u8 byte_cnt, u8 *o_buf)
+                                             u8 dev_addr, u16 addr, u8 byte_cnt,
+                                             u8 *o_buf, u8 is_init)
 {
         struct bnx2x *bp = params->bp;
         u16 val, i;
@@ -7896,6 +7916,15 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                 return -EINVAL;
         }
 
+        /* Set 2-wire transfer rate of SFP+ module EEPROM
+         * to 100Khz since some DACs(direct attached cables) do
+         * not work at 400Khz.
+         */
+        bnx2x_cl45_write(bp, phy,
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_8727_TWO_WIRE_SLAVE_ADDR,
+                         ((dev_addr << 8) | 1));
+
         /* Need to read from 1.8000 to clear it */
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD,
@@ -7968,26 +7997,44 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
 
         return -EINVAL;
 }
-
 int bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
-                                 struct link_params *params, u16 addr,
-                                 u8 byte_cnt, u8 *o_buf)
+                                 struct link_params *params, u8 dev_addr,
+                                 u16 addr, u16 byte_cnt, u8 *o_buf)
 {
-        int rc = -EOPNOTSUPP;
+        int rc = 0;
+        struct bnx2x *bp = params->bp;
+        u8 xfer_size;
+        u8 *user_data = o_buf;
+        read_sfp_module_eeprom_func_p read_func;
+
+        if ((dev_addr != 0xa0) && (dev_addr != 0xa2)) {
+                DP(NETIF_MSG_LINK, "invalid dev_addr 0x%x\n", dev_addr);
+                return -EINVAL;
+        }
+
         switch (phy->type) {
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
-                rc = bnx2x_8726_read_sfp_module_eeprom(phy, params, addr,
-                                                       byte_cnt, o_buf);
-        break;
+                read_func = bnx2x_8726_read_sfp_module_eeprom;
+                break;
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727:
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8722:
-                rc = bnx2x_8727_read_sfp_module_eeprom(phy, params, addr,
-                                                       byte_cnt, o_buf);
-        break;
+                read_func = bnx2x_8727_read_sfp_module_eeprom;
+                break;
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
-                rc = bnx2x_warpcore_read_sfp_module_eeprom(phy, params, addr,
-                                                           byte_cnt, o_buf, 0);
-        break;
+                read_func = bnx2x_warpcore_read_sfp_module_eeprom;
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        while (!rc && (byte_cnt > 0)) {
+                xfer_size = (byte_cnt > SFP_EEPROM_PAGE_SIZE) ?
+                        SFP_EEPROM_PAGE_SIZE : byte_cnt;
+                rc = read_func(phy, params, dev_addr, addr, xfer_size,
+                               user_data, 0);
+                byte_cnt -= xfer_size;
+                user_data += xfer_size;
+                addr += xfer_size;
         }
         return rc;
 }
@@ -8004,6 +8051,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
         /* First check for copper cable */
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
+                                         I2C_DEV_ADDR_A0,
                                          SFP_EEPROM_CON_TYPE_ADDR,
                                          2,
                                          (u8 *)val) != 0) {
@@ -8021,6 +8069,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                  */
                 if (bnx2x_read_sfp_module_eeprom(phy,
                                                params,
+                                               I2C_DEV_ADDR_A0,
                                                SFP_EEPROM_FC_TX_TECH_ADDR,
                                                1,
                                                &copper_module_type) != 0) {
@@ -8049,20 +8098,24 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                 break;
         }
         case SFP_EEPROM_CON_TYPE_VAL_LC:
+        case SFP_EEPROM_CON_TYPE_VAL_RJ45:
                 check_limiting_mode = 1;
                 if ((val[1] & (SFP_EEPROM_COMP_CODE_SR_MASK |
                                SFP_EEPROM_COMP_CODE_LR_MASK |
                                SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) {
-                        DP(NETIF_MSG_LINK, "1G Optic module detected\n");
+                        DP(NETIF_MSG_LINK, "1G SFP module detected\n");
                         gport = params->port;
                         phy->media_type = ETH_PHY_SFP_1G_FIBER;
-                        phy->req_line_speed = SPEED_1000;
-                        if (!CHIP_IS_E1x(bp))
-                                gport = BP_PATH(bp) + (params->port << 1);
-                        netdev_err(bp->dev, "Warning: Link speed was forced to 1000Mbps."
-                              " Current SFP module in port %d is not"
-                              " compliant with 10G Ethernet\n",
-                         gport);
+                        if (phy->req_line_speed != SPEED_1000) {
+                                phy->req_line_speed = SPEED_1000;
+                                if (!CHIP_IS_E1x(bp)) {
+                                        gport = BP_PATH(bp) +
+                                        (params->port << 1);
+                                }
+                                netdev_err(bp->dev,
+                                           "Warning: Link speed was forced to 1000Mbps. Current SFP module in port %d is not compliant with 10G Ethernet\n",
+                                           gport);
+                        }
                 } else {
                         int idx, cfg_idx = 0;
                         DP(NETIF_MSG_LINK, "10G Optic module detected\n");
@@ -8101,6 +8154,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                 u8 options[SFP_EEPROM_OPTIONS_SIZE];
                 if (bnx2x_read_sfp_module_eeprom(phy,
                                                  params,
+                                                 I2C_DEV_ADDR_A0,
                                                  SFP_EEPROM_OPTIONS_ADDR,
                                                  SFP_EEPROM_OPTIONS_SIZE,
                                                  options) != 0) {
@@ -8167,6 +8221,7 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
         /* Format the warning message */
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
+                                         I2C_DEV_ADDR_A0,
                                          SFP_EEPROM_VENDOR_NAME_ADDR,
                                          SFP_EEPROM_VENDOR_NAME_SIZE,
                                          (u8 *)vendor_name))
@@ -8175,6 +8230,7 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
                 vendor_name[SFP_EEPROM_VENDOR_NAME_SIZE] = '\0';
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
+                                         I2C_DEV_ADDR_A0,
                                          SFP_EEPROM_PART_NO_ADDR,
                                          SFP_EEPROM_PART_NO_SIZE,
                                          (u8 *)vendor_pn))
@@ -8205,12 +8261,13 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
 
         for (timeout = 0; timeout < 60; timeout++) {
                 if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT)
-                        rc = bnx2x_warpcore_read_sfp_module_eeprom(phy,
-                                                                   params, 1,
-                                                                   1, &val, 1);
+                        rc = bnx2x_warpcore_read_sfp_module_eeprom(
+                                phy, params, I2C_DEV_ADDR_A0, 1, 1, &val,
+                                1);
                 else
-                        rc = bnx2x_read_sfp_module_eeprom(phy, params, 1, 1,
-                                                          &val);
+                        rc = bnx2x_read_sfp_module_eeprom(phy, params,
+                                                          I2C_DEV_ADDR_A0,
+                                                          1, 1, &val);
                 if (rc == 0) {
                         DP(NETIF_MSG_LINK,
                            "SFP+ module initialization took %d ms\n",
@@ -8219,7 +8276,8 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
                 }
                 usleep_range(5000, 10000);
         }
-        rc = bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val);
+        rc = bnx2x_read_sfp_module_eeprom(phy, params, I2C_DEV_ADDR_A0,
+                                          1, 1, &val);
         return rc;
 }
 
@@ -8376,15 +8434,6 @@ static void bnx2x_8727_specific_func(struct bnx2x_phy *phy,
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_PCS_OPT_CTRL,
                                  val);
-
-                /* Set 2-wire transfer rate of SFP+ module EEPROM
-                 * to 100Khz since some DACs(direct attached cables) do
-                 * not work at 400Khz.
-                 */
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_PMA_DEVAD,
-                                 MDIO_PMA_REG_8727_TWO_WIRE_SLAVE_ADDR,
-                                 0xa001);
                 break;
         default:
                 DP(NETIF_MSG_LINK, "Function 0x%x not supported by 8727\n",
@@ -9528,8 +9577,7 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
         } else {
                 /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */
                 /* (1) set reg 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */
-                for (i = 0; i < ARRAY_SIZE(reg_set);
-                      i++)
+                for (i = 0; i < ARRAY_SIZE(reg_set); i++)
                         bnx2x_cl45_write(bp, phy, reg_set[i].devad,
                                          reg_set[i].reg, reg_set[i].val);
 
@@ -10281,7 +10329,8 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
                                 LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE;
 
                 /* Determine if EEE was negotiated */
-                if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) ||
+                    (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834))
                         bnx2x_eee_an_resolve(phy, params, vars);
         }
 
@@ -12242,7 +12291,7 @@ static void bnx2x_init_bmac_loopback(struct link_params *params,
 
                 bnx2x_xgxs_deassert(params);
 
-                /* set bmac loopback */
+                /* Set bmac loopback */
                 bnx2x_bmac_enable(params, vars, 1, 1);
 
                 REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
@@ -12261,7 +12310,7 @@ static void bnx2x_init_emac_loopback(struct link_params *params,
                 vars->phy_flags = PHY_XGXS_FLAG;
 
                 bnx2x_xgxs_deassert(params);
-                /* set bmac loopback */
+                /* Set bmac loopback */
                 bnx2x_emac_enable(params, vars, 1);
                 bnx2x_emac_program(params, vars);
                 REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
@@ -12521,6 +12570,7 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                    params->req_line_speed[0], params->req_flow_ctrl[0]);
         DP(NETIF_MSG_LINK, "(2) req_speed %d, req_flowctrl %d\n",
                    params->req_line_speed[1], params->req_flow_ctrl[1]);
+        DP(NETIF_MSG_LINK, "req_adv_flow_ctrl 0x%x\n", params->req_fc_auto_adv);
         vars->link_status = 0;
         vars->phy_link_up = 0;
         vars->link_up = 0;
@@ -13440,8 +13490,8 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
         int sigdet;
 
         /* Once KR2 was disabled, wait 5 seconds before checking KR2 recovery
-         * since some switches tend to reinit the AN process and clear the
-         * advertised BP/NP after ~2 seconds causing the KR2 to be disabled
+         * Since some switches tend to reinit the AN process and clear the
+         * the advertised BP/NP after ~2 seconds causing the KR2 to be disabled
          * and recovered many times
          */
         if (vars->check_kr2_recovery_cnt > 0) {
@@ -13469,8 +13519,10 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
 
         /* CL73 has not begun yet */
         if (base_page == 0) {
-                if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE))
+                if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
                         bnx2x_kr2_recovery(params, vars, phy);
+                        DP(NETIF_MSG_LINK, "No BP\n");
+                }
                 return;
         }
 
@@ -13486,7 +13538,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
         if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
                 if (!not_kr2_device) {
                         DP(NETIF_MSG_LINK, "BP=0x%x, NP=0x%x\n", base_page,
-                                       next_page);
+                           next_page);
                         bnx2x_kr2_recovery(params, vars, phy);
                 }
                 return;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index 56c2aae4e2c8..4df45234fdc0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -41,6 +41,9 @@
 #define SPEED_AUTO_NEG          0
 #define SPEED_20000             20000
 
+#define I2C_DEV_ADDR_A0                 0xa0
+#define I2C_DEV_ADDR_A2                 0xa2
+
 #define SFP_EEPROM_PAGE_SIZE                    16
 #define SFP_EEPROM_VENDOR_NAME_ADDR             0x14
 #define SFP_EEPROM_VENDOR_NAME_SIZE             16
@@ -54,6 +57,15 @@
 #define SFP_EEPROM_SERIAL_SIZE                  16
 #define SFP_EEPROM_DATE_ADDR                    0x54 /* ASCII YYMMDD */
 #define SFP_EEPROM_DATE_SIZE                    6
+#define SFP_EEPROM_DIAG_TYPE_ADDR               0x5c
+#define SFP_EEPROM_DIAG_TYPE_SIZE               1
+#define SFP_EEPROM_DIAG_ADDR_CHANGE_REQ         (1<<2)
+#define SFP_EEPROM_SFF_8472_COMP_ADDR           0x5e
+#define SFP_EEPROM_SFF_8472_COMP_SIZE           1
+
+#define SFP_EEPROM_A2_CHECKSUM_RANGE            0x5e
+#define SFP_EEPROM_A2_CC_DMI_ADDR               0x5f
+
 #define PWR_FLT_ERR_MSG_LEN                     250
 
 #define XGXS_EXT_PHY_TYPE(ext_phy_config) \
@@ -420,8 +432,8 @@ void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy);
 
 /* Read "byte_cnt" bytes from address "addr" from the SFP+ EEPROM */
 int bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
-                                 struct link_params *params, u16 addr,
-                                 u8 byte_cnt, u8 *o_buf);
+                                 struct link_params *params, u8 dev_addr,
+                                 u16 addr, u16 byte_cnt, u8 *o_buf);
 
 void bnx2x_hw_reset_phy(struct link_params *params);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c50696b396f1..b4c9dea93a53 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -75,8 +75,6 @@
 #define FW_FILE_NAME_E1H        "bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw"
 #define FW_FILE_NAME_E2         "bnx2x/bnx2x-e2-" FW_FILE_VERSION ".fw"
 
-#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)
-
 /* Time in jiffies before concluding the transmitter is hung */
 #define TX_TIMEOUT              (5*HZ)
 
@@ -2955,14 +2953,16 @@ static unsigned long bnx2x_get_common_flags(struct bnx2x *bp,
         __set_bit(BNX2X_Q_FLG_ACTIVE, &flags);
 
         /* tx only connections collect statistics (on the same index as the
-         *  parent connection). The statistics are zeroed when the parent
-         *  connection is initialized.
+         * parent connection). The statistics are zeroed when the parent
+         * connection is initialized.
          */
 
         __set_bit(BNX2X_Q_FLG_STATS, &flags);
         if (zero_stats)
                 __set_bit(BNX2X_Q_FLG_ZERO_STATS, &flags);
 
+        __set_bit(BNX2X_Q_FLG_PCSUM_ON_PKT, &flags);
+        __set_bit(BNX2X_Q_FLG_TUN_INC_INNER_IP_ID, &flags);
 
 #ifdef BNX2X_STOP_ON_ERROR
         __set_bit(BNX2X_Q_FLG_TX_SEC, &flags);
@@ -3227,16 +3227,29 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)
 {
         struct eth_stats_info *ether_stat =
                 &bp->slowpath->drv_info_to_mcp.ether_stat;
+        struct bnx2x_vlan_mac_obj *mac_obj =
+                &bp->sp_objs->mac_obj;
+        int i;
 
         strlcpy(ether_stat->version, DRV_MODULE_VERSION,
                 ETH_STAT_INFO_VERSION_LEN);
 
-        bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj,
-                                        DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,
-                                        ether_stat->mac_local);
-
+        /* get DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED macs, placing them in the
+         * mac_local field in ether_stat struct. The base address is offset by 2
+         * bytes to account for the field being 8 bytes but a mac address is
+         * only 6 bytes. Likewise, the stride for the get_n_elements function is
+         * 2 bytes to compensate from the 6 bytes of a mac to the 8 bytes
+         * allocated by the ether_stat struct, so the macs will land in their
+         * proper positions.
+         */
+        for (i = 0; i < DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED; i++)
+                memset(ether_stat->mac_local + i, 0,
+                       sizeof(ether_stat->mac_local[0]));
+        mac_obj->get_n_elements(bp, &bp->sp_objs[0].mac_obj,
+                                DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,
+                                ether_stat->mac_local + MAC_PAD, MAC_PAD,
+                                ETH_ALEN);
         ether_stat->mtu_size = bp->dev->mtu;
-
         if (bp->dev->features & NETIF_F_RXCSUM)
                 ether_stat->feature_flags |= FEATURE_ETH_CHKSUM_OFFLOAD_MASK;
         if (bp->dev->features & NETIF_F_TSO)
@@ -3258,8 +3271,7 @@ static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp)
         if (!CNIC_LOADED(bp))
                 return;
 
-        memcpy(fcoe_stat->mac_local + MAC_LEADING_ZERO_CNT,
-               bp->fip_mac, ETH_ALEN);
+        memcpy(fcoe_stat->mac_local + MAC_PAD, bp->fip_mac, ETH_ALEN);
 
         fcoe_stat->qos_priority =
                 app->traffic_type_priority[LLFC_TRAFFIC_TYPE_FCOE];
@@ -3361,8 +3373,8 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp)
         if (!CNIC_LOADED(bp))
                 return;
 
-        memcpy(iscsi_stat->mac_local + MAC_LEADING_ZERO_CNT,
-               bp->cnic_eth_dev.iscsi_mac, ETH_ALEN);
+        memcpy(iscsi_stat->mac_local + MAC_PAD, bp->cnic_eth_dev.iscsi_mac,
+               ETH_ALEN);
 
         iscsi_stat->qos_priority =
                 app->traffic_type_priority[LLFC_TRAFFIC_TYPE_ISCSI];
@@ -6018,10 +6030,11 @@ void bnx2x_nic_init_cnic(struct bnx2x *bp)
         mmiowb();
 }
 
-void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
+void bnx2x_pre_irq_nic_init(struct bnx2x *bp)
 {
         int i;
 
+        /* Setup NIC internals and enable interrupts */
         for_each_eth_queue(bp, i)
                 bnx2x_init_eth_fp(bp, i);
 
@@ -6030,17 +6043,26 @@ void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
         bnx2x_init_rx_rings(bp);
         bnx2x_init_tx_rings(bp);
 
-        if (IS_VF(bp))
+        if (IS_VF(bp)) {
+                bnx2x_memset_stats(bp);
                 return;
+        }
 
-        /* Initialize MOD_ABS interrupts */
-        bnx2x_init_mod_abs_int(bp, &bp->link_vars, bp->common.chip_id,
-                               bp->common.shmem_base, bp->common.shmem2_base,
-                               BP_PORT(bp));
+        if (IS_PF(bp)) {
+                /* Initialize MOD_ABS interrupts */
+                bnx2x_init_mod_abs_int(bp, &bp->link_vars, bp->common.chip_id,
+                                       bp->common.shmem_base,
+                                       bp->common.shmem2_base, BP_PORT(bp));
 
-        bnx2x_init_def_sb(bp);
-        bnx2x_update_dsb_idx(bp);
-        bnx2x_init_sp_ring(bp);
+                /* initialize the default status block and sp ring */
+                bnx2x_init_def_sb(bp);
+                bnx2x_update_dsb_idx(bp);
+                bnx2x_init_sp_ring(bp);
+        }
+}
+
+void bnx2x_post_irq_nic_init(struct bnx2x *bp, u32 load_code)
+{
         bnx2x_init_eq_ring(bp);
         bnx2x_init_internal(bp, load_code);
         bnx2x_pf_init(bp);
@@ -6058,12 +6080,7 @@ void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
                                    AEU_INPUTS_ATTN_BITS_SPIO5);
 }
 
-/* end of nic init */
-
-/*
- * gzip service functions
- */
-
+/* gzip service functions */
 static int bnx2x_gunzip_init(struct bnx2x *bp)
 {
         bp->gunzip_buf = dma_alloc_coherent(&bp->pdev->dev, FW_BUF_SIZE,
@@ -7757,6 +7774,8 @@ void bnx2x_free_mem(struct bnx2x *bp)
         BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping,
                        BCM_PAGE_SIZE * NUM_EQ_PAGES);
 
+        BNX2X_PCI_FREE(bp->t2, bp->t2_mapping, SRC_T2_SZ);
+
         bnx2x_iov_free_mem(bp);
 }
 
@@ -7773,7 +7792,7 @@ int bnx2x_alloc_mem_cnic(struct bnx2x *bp)
                                 sizeof(struct
                                        host_hc_status_block_e1x));
 
-        if (CONFIGURE_NIC_MODE(bp))
+        if (CONFIGURE_NIC_MODE(bp) && !bp->t2)
                 /* allocate searcher T2 table, as it wan't allocated before */
                 BNX2X_PCI_ALLOC(bp->t2, &bp->t2_mapping, SRC_T2_SZ);
 
@@ -7796,7 +7815,7 @@ int bnx2x_alloc_mem(struct bnx2x *bp)
 {
         int i, allocated, context_size;
 
-        if (!CONFIGURE_NIC_MODE(bp))
+        if (!CONFIGURE_NIC_MODE(bp) && !bp->t2)
                 /* allocate searcher T2 table */
                 BNX2X_PCI_ALLOC(bp->t2, &bp->t2_mapping, SRC_T2_SZ);
 
@@ -7917,8 +7936,6 @@ int bnx2x_del_all_macs(struct bnx2x *bp,
 
 int bnx2x_set_eth_mac(struct bnx2x *bp, bool set)
 {
-        unsigned long ramrod_flags = 0;
-
         if (is_zero_ether_addr(bp->dev->dev_addr) &&
             (IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp))) {
                 DP(NETIF_MSG_IFUP | NETIF_MSG_IFDOWN,
@@ -7926,12 +7943,18 @@ int bnx2x_set_eth_mac(struct bnx2x *bp, bool set)
                 return 0;
         }
 
-        DP(NETIF_MSG_IFUP, "Adding Eth MAC\n");
+        if (IS_PF(bp)) {
+                unsigned long ramrod_flags = 0;
 
-        __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
-        /* Eth MAC is set on RSS leading client (fp[0]) */
-        return bnx2x_set_mac_one(bp, bp->dev->dev_addr, &bp->sp_objs->mac_obj,
-                                 set, BNX2X_ETH_MAC, &ramrod_flags);
+                DP(NETIF_MSG_IFUP, "Adding Eth MAC\n");
+                __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
+                return bnx2x_set_mac_one(bp, bp->dev->dev_addr,
+                                         &bp->sp_objs->mac_obj, set,
+                                         BNX2X_ETH_MAC, &ramrod_flags);
+        } else { /* vf */
+                return bnx2x_vfpf_config_mac(bp, bp->dev->dev_addr,
+                                             bp->fp->index, true);
+        }
 }
 
 int bnx2x_setup_leading(struct bnx2x *bp)
@@ -9525,6 +9548,10 @@ sp_rtnl_not_reset:
                 bnx2x_vfpf_storm_rx_mode(bp);
         }
 
+        if (test_and_clear_bit(BNX2X_SP_RTNL_HYPERVISOR_VLAN,
+                               &bp->sp_rtnl_state))
+                bnx2x_pf_set_vfs_vlan(bp);
+
         /* work which needs rtnl lock not-taken (as it takes the lock itself and
          * can be called from other contexts as well)
          */
@@ -9532,8 +9559,10 @@ sp_rtnl_not_reset:
 
         /* enable SR-IOV if applicable */
         if (IS_SRIOV(bp) && test_and_clear_bit(BNX2X_SP_RTNL_ENABLE_SRIOV,
-                                               &bp->sp_rtnl_state))
+                                               &bp->sp_rtnl_state)) {
+                bnx2x_disable_sriov(bp);
                 bnx2x_enable_sriov(bp);
+        }
 }
 
 static void bnx2x_period_task(struct work_struct *work)
@@ -9701,6 +9730,31 @@ static struct bnx2x_prev_path_list *
         return NULL;
 }
 
+static int bnx2x_prev_path_mark_eeh(struct bnx2x *bp)
+{
+        struct bnx2x_prev_path_list *tmp_list;
+        int rc;
+
+        rc = down_interruptible(&bnx2x_prev_sem);
+        if (rc) {
+                BNX2X_ERR("Received %d when tried to take lock\n", rc);
+                return rc;
+        }
+
+        tmp_list = bnx2x_prev_path_get_entry(bp);
+        if (tmp_list) {
+                tmp_list->aer = 1;
+                rc = 0;
+        } else {
+                BNX2X_ERR("path %d: Entry does not exist for eeh; Flow occurs before initial insmod is over ?\n",
+                          BP_PATH(bp));
+        }
+
+        up(&bnx2x_prev_sem);
+
+        return rc;
+}
+
 static bool bnx2x_prev_is_path_marked(struct bnx2x *bp)
 {
         struct bnx2x_prev_path_list *tmp_list;
@@ -9709,14 +9763,15 @@ static bool bnx2x_prev_is_path_marked(struct bnx2x *bp)
         if (down_trylock(&bnx2x_prev_sem))
                 return false;
 
-        list_for_each_entry(tmp_list, &bnx2x_prev_list, list) {
-                if (PCI_SLOT(bp->pdev->devfn) == tmp_list->slot &&
-                    bp->pdev->bus->number == tmp_list->bus &&
-                    BP_PATH(bp) == tmp_list->path) {
+        tmp_list = bnx2x_prev_path_get_entry(bp);
+        if (tmp_list) {
+                if (tmp_list->aer) {
+                        DP(NETIF_MSG_HW, "Path %d was marked by AER\n",
+                           BP_PATH(bp));
+                } else {
                         rc = true;
                         BNX2X_DEV_INFO("Path %d was already cleaned from previous drivers\n",
                                        BP_PATH(bp));
-                        break;
                 }
         }
 
@@ -9730,6 +9785,28 @@ static int bnx2x_prev_mark_path(struct bnx2x *bp, bool after_undi)
         struct bnx2x_prev_path_list *tmp_list;
         int rc;
 
+        rc = down_interruptible(&bnx2x_prev_sem);
+        if (rc) {
+                BNX2X_ERR("Received %d when tried to take lock\n", rc);
+                return rc;
+        }
+
+        /* Check whether the entry for this path already exists */
+        tmp_list = bnx2x_prev_path_get_entry(bp);
+        if (tmp_list) {
+                if (!tmp_list->aer) {
+                        BNX2X_ERR("Re-Marking the path.\n");
+                } else {
+                        DP(NETIF_MSG_HW, "Removing AER indication from path %d\n",
+                           BP_PATH(bp));
+                        tmp_list->aer = 0;
+                }
+                up(&bnx2x_prev_sem);
+                return 0;
+        }
+        up(&bnx2x_prev_sem);
+
+        /* Create an entry for this path and add it */
         tmp_list = kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
         if (!tmp_list) {
                 BNX2X_ERR("Failed to allocate 'bnx2x_prev_path_list'\n");
@@ -9739,6 +9816,7 @@ static int bnx2x_prev_mark_path(struct bnx2x *bp, bool after_undi)
         tmp_list->bus = bp->pdev->bus->number;
         tmp_list->slot = PCI_SLOT(bp->pdev->devfn);
         tmp_list->path = BP_PATH(bp);
+        tmp_list->aer = 0;
         tmp_list->undi = after_undi ? (1 << BP_PORT(bp)) : 0;
 
         rc = down_interruptible(&bnx2x_prev_sem);
@@ -9746,8 +9824,8 @@ static int bnx2x_prev_mark_path(struct bnx2x *bp, bool after_undi)
                 BNX2X_ERR("Received %d when tried to take lock\n", rc);
                 kfree(tmp_list);
         } else {
-                BNX2X_DEV_INFO("Marked path [%d] - finished previous unload\n",
-                                BP_PATH(bp));
+                DP(NETIF_MSG_HW, "Marked path [%d] - finished previous unload\n",
+                   BP_PATH(bp));
                 list_add(&tmp_list->list, &bnx2x_prev_list);
                 up(&bnx2x_prev_sem);
         }
@@ -9990,6 +10068,7 @@ static int bnx2x_prev_unload(struct bnx2x *bp)
         }
 
         do {
+                int aer = 0;
                 /* Lock MCP using an unload request */
                 fw = bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS, 0);
                 if (!fw) {
@@ -9998,7 +10077,18 @@ static int bnx2x_prev_unload(struct bnx2x *bp)
                         break;
                 }
 
-                if (fw == FW_MSG_CODE_DRV_UNLOAD_COMMON) {
+                rc = down_interruptible(&bnx2x_prev_sem);
+                if (rc) {
+                        BNX2X_ERR("Cannot check for AER; Received %d when tried to take lock\n",
+                                  rc);
+                } else {
+                        /* If Path is marked by EEH, ignore unload status */
+                        aer = !!(bnx2x_prev_path_get_entry(bp) &&
+                                 bnx2x_prev_path_get_entry(bp)->aer);
+                        up(&bnx2x_prev_sem);
+                }
+
+                if (fw == FW_MSG_CODE_DRV_UNLOAD_COMMON || aer) {
                         rc = bnx2x_prev_unload_common(bp);
                         break;
                 }
@@ -10038,8 +10128,12 @@ static void bnx2x_get_common_hwinfo(struct bnx2x *bp)
         id = ((val & 0xffff) << 16);
         val = REG_RD(bp, MISC_REG_CHIP_REV);
         id |= ((val & 0xf) << 12);
-        val = REG_RD(bp, MISC_REG_CHIP_METAL);
-        id |= ((val & 0xff) << 4);
+
+        /* Metal is read from PCI regs, but we can't access >=0x400 from
+         * the configuration space (so we need to reg_rd)
+         */
+        val = REG_RD(bp, PCICFG_OFFSET + PCI_ID_VAL3);
+        id |= (((val >> 24) & 0xf) << 4);
         val = REG_RD(bp, MISC_REG_BOND_ID);
         id |= (val & 0xf);
         bp->common.chip_id = id;
@@ -10575,10 +10669,12 @@ static void bnx2x_get_port_hwinfo(struct bnx2x *bp)
 
         bp->link_params.speed_cap_mask[0] =
                 SHMEM_RD(bp,
-                         dev_info.port_hw_config[port].speed_capability_mask);
+                         dev_info.port_hw_config[port].speed_capability_mask) &
+                PORT_HW_CFG_SPEED_CAPABILITY_D0_MASK;
         bp->link_params.speed_cap_mask[1] =
                 SHMEM_RD(bp,
-                         dev_info.port_hw_config[port].speed_capability_mask2);
+                         dev_info.port_hw_config[port].speed_capability_mask2) &
+                PORT_HW_CFG_SPEED_CAPABILITY_D0_MASK;
         bp->port.link_config[0] =
                 SHMEM_RD(bp, dev_info.port_feature_config[port].link_config);
 
@@ -10703,6 +10799,12 @@ static void bnx2x_get_fcoe_info(struct bnx2x *bp)
                 (max_fcoe_conn & BNX2X_MAX_FCOE_INIT_CONN_MASK) >>
                 BNX2X_MAX_FCOE_INIT_CONN_SHIFT;
 
+        /* Calculate the number of maximum allowed FCoE tasks */
+        bp->cnic_eth_dev.max_fcoe_exchanges = MAX_NUM_FCOE_TASKS_PER_ENGINE;
+        if (IS_MF(bp) || CHIP_MODE_IS_4_PORT(bp))
+                bp->cnic_eth_dev.max_fcoe_exchanges /=
+                                                MAX_FCOE_FUNCS_PER_ENGINE;
+
         /* Read the WWN: */
         if (!IS_MF(bp)) {
                 /* Port info */
@@ -10816,14 +10918,12 @@ static void bnx2x_get_cnic_mac_hwinfo(struct bnx2x *bp)
                         }
                 }
 
-                if (IS_MF_STORAGE_SD(bp))
-                        /* Zero primary MAC configuration */
-                        memset(bp->dev->dev_addr, 0, ETH_ALEN);
-
-                if (IS_MF_FCOE_AFEX(bp) || IS_MF_FCOE_SD(bp))
-                        /* use FIP MAC as primary MAC */
+                /* If this is a storage-only interface, use SAN mac as
+                 * primary MAC. Notice that for SD this is already the case,
+                 * as the SAN mac was copied from the primary MAC.
+                 */
+                if (IS_MF_FCOE_AFEX(bp))
                         memcpy(bp->dev->dev_addr, fip_mac, ETH_ALEN);
-
         } else {
                 val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].
                                 iscsi_mac_upper);
@@ -11060,6 +11160,9 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp)
                                 } else
                                         BNX2X_DEV_INFO("illegal OV for SD\n");
                                 break;
+                        case SHARED_FEAT_CFG_FORCE_SF_MODE_FORCED_SF:
+                                bp->mf_config[vn] = 0;
+                                break;
                         default:
                                 /* Unknown configuration: reset mf_config */
                                 bp->mf_config[vn] = 0;
@@ -11406,26 +11509,6 @@ static int bnx2x_init_bp(struct bnx2x *bp)
  * net_device service functions
  */
 
-static int bnx2x_open_epilog(struct bnx2x *bp)
-{
-        /* Enable sriov via delayed work. This must be done via delayed work
-         * because it causes the probe of the vf devices to be run, which invoke
-         * register_netdevice which must have rtnl lock taken. As we are holding
-         * the lock right now, that could only work if the probe would not take
-         * the lock. However, as the probe of the vf may be called from other
-         * contexts as well (such as passthrough to vm failes) it can't assume
-         * the lock is being held for it. Using delayed work here allows the
-         * probe code to simply take the lock (i.e. wait for it to be released
-         * if it is being held).
-         */
-        smp_mb__before_clear_bit();
-        set_bit(BNX2X_SP_RTNL_ENABLE_SRIOV, &bp->sp_rtnl_state);
-        smp_mb__after_clear_bit();
-        schedule_delayed_work(&bp->sp_rtnl_task, 0);
-
-        return 0;
-}
-
 /* called with rtnl_lock */
 static int bnx2x_open(struct net_device *dev)
 {
@@ -11795,6 +11878,8 @@ static const struct net_device_ops bnx2x_netdev_ops = {
         .ndo_setup_tc           = bnx2x_setup_tc,
 #ifdef CONFIG_BNX2X_SRIOV
         .ndo_set_vf_mac         = bnx2x_set_vf_mac,
+        .ndo_set_vf_vlan        = bnx2x_set_vf_vlan,
+        .ndo_get_vf_config      = bnx2x_get_vf_config,
 #endif
 #ifdef NETDEV_FCOE_WWNN
         .ndo_fcoe_get_wwn       = bnx2x_fcoe_get_wwn,
@@ -11957,19 +12042,26 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,
         dev->watchdog_timeo = TX_TIMEOUT;
 
         dev->netdev_ops = &bnx2x_netdev_ops;
-        bnx2x_set_ethtool_ops(dev);
+        bnx2x_set_ethtool_ops(bp, dev);
 
         dev->priv_flags |= IFF_UNICAST_FLT;
 
         dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                 NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 |
                 NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_GRO |
-                NETIF_F_RXHASH | NETIF_F_HW_VLAN_TX;
+                NETIF_F_RXHASH | NETIF_F_HW_VLAN_CTAG_TX;
+        if (!CHIP_IS_E1x(bp)) {
+                dev->hw_features |= NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL;
+                dev->hw_enc_features =
+                        NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |
+                        NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 |
+                        NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL;
+        }
 
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                 NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA;
 
-        dev->features |= dev->hw_features | NETIF_F_HW_VLAN_RX;
+        dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX;
         if (bp->flags & USING_DAC_FLAG)
                 dev->features |= NETIF_F_HIGHDMA;
 
@@ -12451,7 +12543,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
          * l2 connections.
          */
         if (IS_VF(bp)) {
-                bnx2x_vf_map_doorbells(bp);
+                bp->doorbells = bnx2x_vf_doorbells(bp);
                 rc = bnx2x_vf_pci_alloc(bp);
                 if (rc)
                         goto init_one_exit;
@@ -12479,13 +12571,8 @@ static int bnx2x_init_one(struct pci_dev *pdev,
                         goto init_one_exit;
         }
 
-        /* Enable SRIOV if capability found in configuration space.
-         * Once the generic SR-IOV framework makes it in from the
-         * pci tree this will be revised, to allow dynamic control
-         * over the number of VFs. Right now, change the num of vfs
-         * param below to enable SR-IOV.
-         */
-        rc = bnx2x_iov_init_one(bp, int_mode, 0/*num vfs*/);
+        /* Enable SRIOV if capability found in configuration space */
+        rc = bnx2x_iov_init_one(bp, int_mode, BNX2X_MAX_NUM_OF_VFS);
         if (rc)
                 goto init_one_exit;
 
@@ -12497,16 +12584,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
         if (CHIP_IS_E1x(bp))
                 bp->flags |= NO_FCOE_FLAG;
 
-        /* disable FCOE for 57840 device, until FW supports it */
-        switch (ent->driver_data) {
-        case BCM57840_O:
-        case BCM57840_4_10:
-        case BCM57840_2_20:
-        case BCM57840_MFO:
-        case BCM57840_MF:
-                bp->flags |= NO_FCOE_FLAG;
-        }
-
         /* Set bp->num_queues for MSI-X mode*/
         bnx2x_set_num_queues(bp);
 
@@ -12640,9 +12717,7 @@ static void bnx2x_remove_one(struct pci_dev *pdev)
 
 static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
 {
-        int i;
-
-        bp->state = BNX2X_STATE_ERROR;
+        bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT;
 
         bp->rx_mode = BNX2X_RX_MODE_NONE;
 
@@ -12651,29 +12726,21 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
 
         /* Stop Tx */
         bnx2x_tx_disable(bp);
-
-        bnx2x_netif_stop(bp, 0);
         /* Delete all NAPI objects */
         bnx2x_del_all_napi(bp);
         if (CNIC_LOADED(bp))
                 bnx2x_del_all_napi_cnic(bp);
+        netdev_reset_tc(bp->dev);
 
         del_timer_sync(&bp->timer);
+        cancel_delayed_work(&bp->sp_task);
+        cancel_delayed_work(&bp->period_task);
 
-        bnx2x_stats_handle(bp, STATS_EVENT_STOP);
-
-        /* Release IRQs */
-        bnx2x_free_irq(bp);
-
-        /* Free SKBs, SGEs, TPA pool and driver internals */
-        bnx2x_free_skbs(bp);
-
-        for_each_rx_queue(bp, i)
-                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
-
-        bnx2x_free_mem(bp);
+        spin_lock_bh(&bp->stats_lock);
+        bp->stats_state = STATS_STATE_DISABLED;
+        spin_unlock_bh(&bp->stats_lock);
 
-        bp->state = BNX2X_STATE_CLOSED;
+        bnx2x_save_statistics(bp);
 
         netif_carrier_off(bp->dev);
 
@@ -12709,6 +12776,8 @@ static pci_ers_result_t bnx2x_io_error_detected(struct pci_dev *pdev,
 
         rtnl_lock();
 
+        BNX2X_ERR("IO error detected\n");
+
         netif_device_detach(dev);
 
         if (state == pci_channel_io_perm_failure) {
@@ -12719,6 +12788,8 @@ static pci_ers_result_t bnx2x_io_error_detected(struct pci_dev *pdev,
         if (netif_running(dev))
                 bnx2x_eeh_nic_unload(bp);
 
+        bnx2x_prev_path_mark_eeh(bp);
+
         pci_disable_device(pdev);
 
         rtnl_unlock();
@@ -12737,9 +12808,10 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct bnx2x *bp = netdev_priv(dev);
+        int i;
 
         rtnl_lock();
-
+        BNX2X_ERR("IO slot reset initializing...\n");
         if (pci_enable_device(pdev)) {
                 dev_err(&pdev->dev,
                         "Cannot re-enable PCI device after reset\n");
@@ -12749,10 +12821,47 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)
 
         pci_set_master(pdev);
         pci_restore_state(pdev);
+        pci_save_state(pdev);
 
         if (netif_running(dev))
                 bnx2x_set_power_state(bp, PCI_D0);
 
+        if (netif_running(dev)) {
+                BNX2X_ERR("IO slot reset --> driver unload\n");
+                if (IS_PF(bp) && SHMEM2_HAS(bp, drv_capabilities_flag)) {
+                        u32 v;
+
+                        v = SHMEM2_RD(bp,
+                                      drv_capabilities_flag[BP_FW_MB_IDX(bp)]);
+                        SHMEM2_WR(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)],
+                                  v & ~DRV_FLAGS_CAPABILITIES_LOADED_L2);
+                }
+                bnx2x_drain_tx_queues(bp);
+                bnx2x_send_unload_req(bp, UNLOAD_RECOVERY);
+                bnx2x_netif_stop(bp, 1);
+                bnx2x_free_irq(bp);
+
+                /* Report UNLOAD_DONE to MCP */
+                bnx2x_send_unload_done(bp, true);
+
+                bp->sp_state = 0;
+                bp->port.pmf = 0;
+
+                bnx2x_prev_unload(bp);
+
+                /* We should have resetted the engine, so It's fair to
+                 * assume the FW will no longer write to the bnx2x driver.
+                 */
+                bnx2x_squeeze_objects(bp);
+                bnx2x_free_skbs(bp);
+                for_each_rx_queue(bp, i)
+                        bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
+                bnx2x_free_fp_mem(bp);
+                bnx2x_free_mem(bp);
+
+                bp->state = BNX2X_STATE_CLOSED;
+        }
+
         rtnl_unlock();
 
         return PCI_ERS_RESULT_RECOVERED;
@@ -12779,6 +12888,9 @@ static void bnx2x_io_resume(struct pci_dev *pdev)
 
         bnx2x_eeh_recover(bp);
 
+        bp->fw_seq = SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) &
+                                                        DRV_MSG_SEQ_NUMBER_MASK;
+
         if (netif_running(dev))
                 bnx2x_nic_load(bp, LOAD_NORMAL);
 
@@ -12801,6 +12913,9 @@ static struct pci_driver bnx2x_pci_driver = {
         .suspend     = bnx2x_suspend,
         .resume      = bnx2x_resume,
         .err_handler = &bnx2x_err_handler,
+#ifdef CONFIG_BNX2X_SRIOV
+        .sriov_configure = bnx2x_sriov_configure,
+#endif
 };
 
 static int __init bnx2x_init(void)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index 791eb2d53011..d22bc40091ec 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -1491,10 +1491,6 @@
 /* [R 4] This field indicates the type of the device. '0' - 2 Ports; '1' - 1
    Port. */
 #define MISC_REG_BOND_ID                                         0xa400
-/* [R 8] These bits indicate the metal revision of the chip. This value
-   starts at 0x00 for each all-layer tape-out and increments by one for each
-   tape-out. */
-#define MISC_REG_CHIP_METAL                                      0xa404
 /* [R 16] These bits indicate the part number for the chip. */
 #define MISC_REG_CHIP_NUM                                        0xa408
 /* [R 4] These bits indicate the base revision of the chip. This value
@@ -6331,6 +6327,8 @@
 #define PCI_PM_DATA_B                                   0x414
 #define PCI_ID_VAL1                                     0x434
 #define PCI_ID_VAL2                                     0x438
+#define PCI_ID_VAL3                                     0x43c
+
 #define GRC_CONFIG_REG_PF_INIT_VF               0x624
 #define GRC_CR_PF_INIT_VF_PF_FIRST_VF_NUM_MASK  0xf
 /* First VF_NUM for PF is encoded in this register.
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 7306416bc90d..32a9609cc98b 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -30,8 +30,6 @@
 
 #define BNX2X_MAX_EMUL_MULTI            16
 
-#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)
-
 /**** Exe Queue interfaces ****/
 
 /**
@@ -444,30 +442,21 @@ static bool bnx2x_put_credit_vlan_mac(struct bnx2x_vlan_mac_obj *o)
 }
 
 static int bnx2x_get_n_elements(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,
-                                int n, u8 *buf)
+                                int n, u8 *base, u8 stride, u8 size)
 {
         struct bnx2x_vlan_mac_registry_elem *pos;
-        u8 *next = buf;
+        u8 *next = base;
         int counter = 0;
 
         /* traverse list */
         list_for_each_entry(pos, &o->head, link) {
                 if (counter < n) {
-                        /* place leading zeroes in buffer */
-                        memset(next, 0, MAC_LEADING_ZERO_CNT);
-
-                        /* place mac after leading zeroes*/
-                        memcpy(next + MAC_LEADING_ZERO_CNT, pos->u.mac.mac,
-                               ETH_ALEN);
-
-                        /* calculate address of next element and
-                         * advance counter
-                         */
+                        memcpy(next, &pos->u, size);
                         counter++;
-                        next = buf + counter * ALIGN(ETH_ALEN, sizeof(u32));
+                        DP(BNX2X_MSG_SP, "copied element number %d to address %p element was:\n",
+                           counter, next);
+                        next += stride + size;
 
-                        DP(BNX2X_MSG_SP, "copied element number %d to address %p element was %pM\n",
-                           counter, next, pos->u.mac.mac);
                 }
         }
         return counter * ETH_ALEN;
@@ -487,7 +476,8 @@ static int bnx2x_check_mac_add(struct bnx2x *bp,
 
         /* Check if a requested MAC already exists */
         list_for_each_entry(pos, &o->head, link)
-                if (!memcmp(data->mac.mac, pos->u.mac.mac, ETH_ALEN))
+                if (!memcmp(data->mac.mac, pos->u.mac.mac, ETH_ALEN) &&
+                    (data->mac.is_inner_mac == pos->u.mac.is_inner_mac))
                         return -EEXIST;
 
         return 0;
@@ -520,7 +510,9 @@ static int bnx2x_check_vlan_mac_add(struct bnx2x *bp,
         list_for_each_entry(pos, &o->head, link)
                 if ((data->vlan_mac.vlan == pos->u.vlan_mac.vlan) &&
                     (!memcmp(data->vlan_mac.mac, pos->u.vlan_mac.mac,
-                             ETH_ALEN)))
+                                  ETH_ALEN)) &&
+                    (data->vlan_mac.is_inner_mac ==
+                     pos->u.vlan_mac.is_inner_mac))
                         return -EEXIST;
 
         return 0;
@@ -538,7 +530,8 @@ static struct bnx2x_vlan_mac_registry_elem *
         DP(BNX2X_MSG_SP, "Checking MAC %pM for DEL command\n", data->mac.mac);
 
         list_for_each_entry(pos, &o->head, link)
-                if (!memcmp(data->mac.mac, pos->u.mac.mac, ETH_ALEN))
+                if ((!memcmp(data->mac.mac, pos->u.mac.mac, ETH_ALEN)) &&
+                    (data->mac.is_inner_mac == pos->u.mac.is_inner_mac))
                         return pos;
 
         return NULL;
@@ -573,7 +566,9 @@ static struct bnx2x_vlan_mac_registry_elem *
         list_for_each_entry(pos, &o->head, link)
                 if ((data->vlan_mac.vlan == pos->u.vlan_mac.vlan) &&
                     (!memcmp(data->vlan_mac.mac, pos->u.vlan_mac.mac,
-                             ETH_ALEN)))
+                             ETH_ALEN)) &&
+                    (data->vlan_mac.is_inner_mac ==
+                     pos->u.vlan_mac.is_inner_mac))
                         return pos;
 
         return NULL;
@@ -770,6 +765,8 @@ static void bnx2x_set_one_mac_e2(struct bnx2x *bp,
         bnx2x_set_fw_mac_addr(&rule_entry->mac.mac_msb,
                               &rule_entry->mac.mac_mid,
                               &rule_entry->mac.mac_lsb, mac);
+        rule_entry->mac.inner_mac =
+                cpu_to_le16(elem->cmd_data.vlan_mac.u.mac.is_inner_mac);
 
         /* MOVE: Add a rule that will add this MAC to the target Queue */
         if (cmd == BNX2X_VLAN_MAC_MOVE) {
@@ -786,6 +783,9 @@ static void bnx2x_set_one_mac_e2(struct bnx2x *bp,
                 bnx2x_set_fw_mac_addr(&rule_entry->mac.mac_msb,
                                       &rule_entry->mac.mac_mid,
                                       &rule_entry->mac.mac_lsb, mac);
+                rule_entry->mac.inner_mac =
+                        cpu_to_le16(elem->cmd_data.vlan_mac.
+                                                u.mac.is_inner_mac);
         }
 
         /* Set the ramrod data header */
@@ -974,7 +974,8 @@ static void bnx2x_set_one_vlan_mac_e2(struct bnx2x *bp,
         bnx2x_set_fw_mac_addr(&rule_entry->pair.mac_msb,
                               &rule_entry->pair.mac_mid,
                               &rule_entry->pair.mac_lsb, mac);
-
+        rule_entry->pair.inner_mac =
+                cpu_to_le16(elem->cmd_data.vlan_mac.u.vlan_mac.is_inner_mac);
         /* MOVE: Add a rule that will add this MAC to the target Queue */
         if (cmd == BNX2X_VLAN_MAC_MOVE) {
                 rule_entry++;
@@ -991,6 +992,9 @@ static void bnx2x_set_one_vlan_mac_e2(struct bnx2x *bp,
                 bnx2x_set_fw_mac_addr(&rule_entry->pair.mac_msb,
                                       &rule_entry->pair.mac_mid,
                                       &rule_entry->pair.mac_lsb, mac);
+                rule_entry->pair.inner_mac =
+                        cpu_to_le16(elem->cmd_data.vlan_mac.u.
+                                                vlan_mac.is_inner_mac);
         }
 
         /* Set the ramrod data header */
@@ -1854,6 +1858,7 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,
                                 return rc;
                         }
                         list_del(&exeq_pos->link);
+                        bnx2x_exe_queue_free_elem(bp, exeq_pos);
                 }
         }
 
@@ -2012,6 +2017,7 @@ void bnx2x_init_vlan_obj(struct bnx2x *bp,
                 vlan_obj->check_move        = bnx2x_check_move;
                 vlan_obj->ramrod_cmd        =
                         RAMROD_CMD_ID_ETH_CLASSIFICATION_RULES;
+                vlan_obj->get_n_elements    = bnx2x_get_n_elements;
 
                 /* Exe Queue */
                 bnx2x_exe_queue_init(bp,
@@ -4426,6 +4432,12 @@ static void bnx2x_q_fill_init_tx_data(struct bnx2x_queue_sp_obj *o,
         tx_data->force_default_pri_flg =
                 test_bit(BNX2X_Q_FLG_FORCE_DEFAULT_PRI, flags);
 
+        tx_data->tunnel_lso_inc_ip_id =
+                test_bit(BNX2X_Q_FLG_TUN_INC_INNER_IP_ID, flags);
+        tx_data->tunnel_non_lso_pcsum_location =
+                test_bit(BNX2X_Q_FLG_PCSUM_ON_PKT, flags) ? PCSUM_ON_PKT :
+                                                                  PCSUM_ON_BD;
+
         tx_data->tx_status_block_id = params->fw_sb_id;
         tx_data->tx_sb_index_number = params->sb_cq_index;
         tx_data->tss_leading_client_id = params->tss_leading_cl_id;
@@ -5669,17 +5681,18 @@ static inline int bnx2x_func_send_start(struct bnx2x *bp,
         memset(rdata, 0, sizeof(*rdata));
 
         /* Fill the ramrod data with provided parameters */
-        rdata->function_mode    = (u8)start_params->mf_mode;
-        rdata->sd_vlan_tag      = cpu_to_le16(start_params->sd_vlan_tag);
-        rdata->path_id          = BP_PATH(bp);
-        rdata->network_cos_mode = start_params->network_cos_mode;
-
-        /*
-         *  No need for an explicit memory barrier here as long we would
-         *  need to ensure the ordering of writing to the SPQ element
-         *  and updating of the SPQ producer which involves a memory
-         *  read and we will have to put a full memory barrier there
-         *  (inside bnx2x_sp_post()).
+        rdata->function_mode    = (u8)start_params->mf_mode;
+        rdata->sd_vlan_tag      = cpu_to_le16(start_params->sd_vlan_tag);
+        rdata->path_id          = BP_PATH(bp);
+        rdata->network_cos_mode = start_params->network_cos_mode;
+        rdata->gre_tunnel_mode  = start_params->gre_tunnel_mode;
+        rdata->gre_tunnel_rss   = start_params->gre_tunnel_rss;
+
+        /* No need for an explicit memory barrier here as long we would
+         * need to ensure the ordering of writing to the SPQ element
+         * and updating of the SPQ producer which involves a memory
+         * read and we will have to put a full memory barrier there
+         * (inside bnx2x_sp_post()).
          */
 
         return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_FUNCTION_START, 0,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index ff907609b9fc..43c00bc84a08 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -100,6 +100,7 @@ struct bnx2x_raw_obj {
 /************************* VLAN-MAC commands related parameters ***************/
 struct bnx2x_mac_ramrod_data {
         u8 mac[ETH_ALEN];
+        u8 is_inner_mac;
 };
 
 struct bnx2x_vlan_ramrod_data {
@@ -108,6 +109,7 @@ struct bnx2x_vlan_ramrod_data {
 
 struct bnx2x_vlan_mac_ramrod_data {
         u8 mac[ETH_ALEN];
+        u8 is_inner_mac;
         u16 vlan;
 };
 
@@ -313,8 +315,9 @@ struct bnx2x_vlan_mac_obj {
          *
          * @return number of copied bytes
          */
-        int (*get_n_elements)(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,
-                              int n, u8 *buf);
+        int (*get_n_elements)(struct bnx2x *bp,
+                              struct bnx2x_vlan_mac_obj *o, int n, u8 *base,
+                              u8 stride, u8 size);
 
         /**
          * Checks if ADD-ramrod with the given params may be performed.
@@ -824,7 +827,9 @@ enum {
         BNX2X_Q_FLG_TX_SEC,
         BNX2X_Q_FLG_ANTI_SPOOF,
         BNX2X_Q_FLG_SILENT_VLAN_REM,
-        BNX2X_Q_FLG_FORCE_DEFAULT_PRI
+        BNX2X_Q_FLG_FORCE_DEFAULT_PRI,
+        BNX2X_Q_FLG_PCSUM_ON_PKT,
+        BNX2X_Q_FLG_TUN_INC_INNER_IP_ID
 };
 
 /* Queue type options: queue type may be a compination of below. */
@@ -842,6 +847,7 @@ enum bnx2x_q_type {
 #define BNX2X_MULTI_TX_COS_E3B0                 3
 #define BNX2X_MULTI_TX_COS                      3 /* Maximum possible */
 
+#define MAC_PAD (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)
 
 struct bnx2x_queue_init_params {
         struct {
@@ -1118,6 +1124,15 @@ struct bnx2x_func_start_params {
 
         /* Function cos mode */
         u8 network_cos_mode;
+
+        /* NVGRE classification enablement */
+        u8 nvgre_clss_en;
+
+        /* NO_GRE_TUNNEL/NVGRE_TUNNEL/L2GRE_TUNNEL/IPGRE_TUNNEL */
+        u8 gre_tunnel_mode;
+
+        /* GRE_OUTER_HEADERS_RSS/GRE_INNER_HEADERS_RSS/NVGRE_KEY_ENTROPY_RSS */
+        u8 gre_tunnel_rss;
 };
 
 struct bnx2x_func_switch_update_params {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 6adfa2093581..2ce7c7471367 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -20,7 +20,9 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 #include "bnx2x_cmn.h"
+#include "bnx2x_sp.h"
 #include <linux/crc32.h>
+#include <linux/if_vlan.h>
 
 /* General service functions */
 static void storm_memset_vf_to_pf(struct bnx2x *bp, u16 abs_fid,
@@ -555,8 +557,7 @@ static int bnx2x_vfop_config_list(struct bnx2x *bp,
                 rc = bnx2x_config_vlan_mac(bp, vlan_mac);
                 if (rc >= 0) {
                         cnt += pos->add ? 1 : -1;
-                        list_del(&pos->link);
-                        list_add(&pos->link, &rollback_list);
+                        list_move(&pos->link, &rollback_list);
                         rc = 0;
                 } else if (rc == -EEXIST) {
                         rc = 0;
@@ -958,6 +959,12 @@ op_err:
         BNX2X_ERR("QSETUP[%d:%d] error: rc %d\n", vf->abs_vfid, qid, vfop->rc);
 op_done:
         case BNX2X_VFOP_QSETUP_DONE:
+                vf->cfg_flags |= VF_CFG_VLAN;
+                smp_mb__before_clear_bit();
+                set_bit(BNX2X_SP_RTNL_HYPERVISOR_VLAN,
+                        &bp->sp_rtnl_state);
+                smp_mb__after_clear_bit();
+                schedule_delayed_work(&bp->sp_rtnl_task, 0);
                 bnx2x_vfop_end(bp, vf, vfop);
                 return;
         default:
@@ -1459,7 +1466,6 @@ static u8 bnx2x_vf_is_pcie_pending(struct bnx2x *bp, u8 abs_vfid)
                 return bnx2x_is_pcie_pending(dev);
 
 unknown_dev:
-        BNX2X_ERR("Unknown device\n");
         return false;
 }
 
@@ -1926,20 +1932,22 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
 
         /* SRIOV can be enabled only with MSIX */
         if (int_mode_param == BNX2X_INT_MODE_MSI ||
-            int_mode_param == BNX2X_INT_MODE_INTX)
+            int_mode_param == BNX2X_INT_MODE_INTX) {
                 BNX2X_ERR("Forced MSI/INTx mode is incompatible with SRIOV\n");
+                return 0;
+        }
 
         err = -EIO;
         /* verify ari is enabled */
         if (!bnx2x_ari_enabled(bp->pdev)) {
-                BNX2X_ERR("ARI not supported, SRIOV can not be enabled\n");
-                return err;
+                BNX2X_ERR("ARI not supported (check pci bridge ARI forwarding), SRIOV can not be enabled\n");
+                return 0;
         }
 
         /* verify igu is in normal mode */
         if (CHIP_INT_MODE_IS_BC(bp)) {
                 BNX2X_ERR("IGU not normal mode,  SRIOV can not be enabled\n");
-                return err;
+                return 0;
         }
 
         /* allocate the vfs database */
@@ -1964,8 +1972,10 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
         if (iov->total == 0)
                 goto failed;
 
-        /* calculate the actual number of VFs */
-        iov->nr_virtfn = min_t(u16, iov->total, (u16)num_vfs_param);
+        iov->nr_virtfn = min_t(u16, iov->total, num_vfs_param);
+
+        DP(BNX2X_MSG_IOV, "num_vfs_param was %d, nr_virtfn was %d\n",
+           num_vfs_param, iov->nr_virtfn);
 
         /* allocate the vf array */
         bp->vfdb->vfs = kzalloc(sizeof(struct bnx2x_virtf) *
@@ -2378,8 +2388,8 @@ int bnx2x_iov_eq_sp_event(struct bnx2x *bp, union event_ring_elem *elem)
                 goto get_vf;
         case EVENT_RING_OPCODE_MALICIOUS_VF:
                 abs_vfid = elem->message.data.malicious_vf_event.vf_id;
-                DP(BNX2X_MSG_IOV, "Got VF MALICIOUS notification abs_vfid=%d\n",
-                   abs_vfid);
+                DP(BNX2X_MSG_IOV, "Got VF MALICIOUS notification abs_vfid=%d err_id=0x%x\n",
+                   abs_vfid, elem->message.data.malicious_vf_event.err_id);
                 goto get_vf;
         default:
                 return 1;
@@ -2436,8 +2446,8 @@ get_vf:
                 /* Do nothing for now */
                 break;
         case EVENT_RING_OPCODE_MALICIOUS_VF:
-                DP(BNX2X_MSG_IOV, "got VF [%d] MALICIOUS notification\n",
-                   vf->abs_vfid);
+                DP(BNX2X_MSG_IOV, "Got VF MALICIOUS notification abs_vfid=%d error id %x\n",
+                   abs_vfid, elem->message.data.malicious_vf_event.err_id);
                 /* Do nothing for now */
                 break;
         }
@@ -3012,21 +3022,138 @@ void bnx2x_unlock_vf_pf_channel(struct bnx2x *bp, struct bnx2x_virtf *vf,
         vf->op_current = CHANNEL_TLV_NONE;
 }
 
-void bnx2x_enable_sriov(struct bnx2x *bp)
+int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs_param)
 {
-        int rc = 0;
 
-        /* disbale sriov in case it is still enabled */
+        struct bnx2x *bp = netdev_priv(pci_get_drvdata(dev));
+
+        DP(BNX2X_MSG_IOV, "bnx2x_sriov_configure called with %d, BNX2X_NR_VIRTFN(bp) was %d\n",
+           num_vfs_param, BNX2X_NR_VIRTFN(bp));
+
+        /* HW channel is only operational when PF is up */
+        if (bp->state != BNX2X_STATE_OPEN) {
+                BNX2X_ERR("VF num configurtion via sysfs not supported while PF is down");
+                return -EINVAL;
+        }
+
+        /* we are always bound by the total_vfs in the configuration space */
+        if (num_vfs_param > BNX2X_NR_VIRTFN(bp)) {
+                BNX2X_ERR("truncating requested number of VFs (%d) down to maximum allowed (%d)\n",
+                          num_vfs_param, BNX2X_NR_VIRTFN(bp));
+                num_vfs_param = BNX2X_NR_VIRTFN(bp);
+        }
+
+        bp->requested_nr_virtfn = num_vfs_param;
+        if (num_vfs_param == 0) {
+                pci_disable_sriov(dev);
+                return 0;
+        } else {
+                return bnx2x_enable_sriov(bp);
+        }
+}
+
+int bnx2x_enable_sriov(struct bnx2x *bp)
+{
+        int rc = 0, req_vfs = bp->requested_nr_virtfn;
+
+        rc = pci_enable_sriov(bp->pdev, req_vfs);
+        if (rc) {
+                BNX2X_ERR("pci_enable_sriov failed with %d\n", rc);
+                return rc;
+        }
+        DP(BNX2X_MSG_IOV, "sriov enabled (%d vfs)\n", req_vfs);
+        return req_vfs;
+}
+
+void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp)
+{
+        int vfidx;
+        struct pf_vf_bulletin_content *bulletin;
+
+        DP(BNX2X_MSG_IOV, "configuring vlan for VFs from sp-task\n");
+        for_each_vf(bp, vfidx) {
+        bulletin = BP_VF_BULLETIN(bp, vfidx);
+                if (BP_VF(bp, vfidx)->cfg_flags & VF_CFG_VLAN)
+                        bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0);
+        }
+}
+
+void bnx2x_disable_sriov(struct bnx2x *bp)
+{
         pci_disable_sriov(bp->pdev);
-        DP(BNX2X_MSG_IOV, "sriov disabled\n");
+}
+
+static int bnx2x_vf_ndo_sanity(struct bnx2x *bp, int vfidx,
+                               struct bnx2x_virtf *vf)
+{
+        if (!IS_SRIOV(bp)) {
+                BNX2X_ERR("vf ndo called though sriov is disabled\n");
+                return -EINVAL;
+        }
+
+        if (vfidx >= BNX2X_NR_VIRTFN(bp)) {
+                BNX2X_ERR("vf ndo called for uninitialized VF. vfidx was %d BNX2X_NR_VIRTFN was %d\n",
+                          vfidx, BNX2X_NR_VIRTFN(bp));
+                return -EINVAL;
+        }
+
+        if (!vf) {
+                BNX2X_ERR("vf ndo called but vf was null. vfidx was %d\n",
+                          vfidx);
+                return -EINVAL;
+        }
 
-        /* enable sriov */
-        DP(BNX2X_MSG_IOV, "vf num (%d)\n", (bp->vfdb->sriov.nr_virtfn));
-        rc = pci_enable_sriov(bp->pdev, (bp->vfdb->sriov.nr_virtfn));
+        return 0;
+}
+
+int bnx2x_get_vf_config(struct net_device *dev, int vfidx,
+                        struct ifla_vf_info *ivi)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        struct bnx2x_virtf *vf = BP_VF(bp, vfidx);
+        struct bnx2x_vlan_mac_obj *mac_obj = &bnx2x_vfq(vf, 0, mac_obj);
+        struct bnx2x_vlan_mac_obj *vlan_obj = &bnx2x_vfq(vf, 0, vlan_obj);
+        struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vfidx);
+        int rc;
+
+        /* sanity */
+        rc = bnx2x_vf_ndo_sanity(bp, vfidx, vf);
         if (rc)
-                BNX2X_ERR("pci_enable_sriov failed with %d\n", rc);
-        else
-                DP(BNX2X_MSG_IOV, "sriov enabled\n");
+                return rc;
+        if (!mac_obj || !vlan_obj || !bulletin) {
+                BNX2X_ERR("VF partially initialized\n");
+                return -EINVAL;
+        }
+
+        ivi->vf = vfidx;
+        ivi->qos = 0;
+        ivi->tx_rate = 10000; /* always 10G. TBA take from link struct */
+        ivi->spoofchk = 1; /*always enabled */
+        if (vf->state == VF_ENABLED) {
+                /* mac and vlan are in vlan_mac objects */
+                mac_obj->get_n_elements(bp, mac_obj, 1, (u8 *)&ivi->mac,
+                                        0, ETH_ALEN);
+                vlan_obj->get_n_elements(bp, vlan_obj, 1, (u8 *)&ivi->vlan,
+                                         0, VLAN_HLEN);
+        } else {
+                /* mac */
+                if (bulletin->valid_bitmap & (1 << MAC_ADDR_VALID))
+                        /* mac configured by ndo so its in bulletin board */
+                        memcpy(&ivi->mac, bulletin->mac, ETH_ALEN);
+                else
+                        /* funtion has not been loaded yet. Show mac as 0s */
+                        memset(&ivi->mac, 0, ETH_ALEN);
+
+                /* vlan */
+                if (bulletin->valid_bitmap & (1 << VLAN_VALID))
+                        /* vlan configured by ndo so its in bulletin board */
+                        memcpy(&ivi->vlan, &bulletin->vlan, VLAN_HLEN);
+                else
+                        /* funtion has not been loaded yet. Show vlans as 0s */
+                        memset(&ivi->vlan, 0, VLAN_HLEN);
+        }
+
+        return 0;
 }
 
 /* New mac for VF. Consider these cases:
@@ -3044,23 +3171,19 @@ void bnx2x_enable_sriov(struct bnx2x *bp)
  * VF to configure any mac for itself except for this mac. In case of a race
  * where the VF fails to see the new post on its bulletin board before sending a
  * mac configuration request, the PF will simply fail the request and VF can try
- * again after consulting its bulletin board
+ * again after consulting its bulletin board.
  */
-int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac)
+int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        int rc, q_logical_state, vfidx = queue;
+        int rc, q_logical_state;
         struct bnx2x_virtf *vf = BP_VF(bp, vfidx);
         struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vfidx);
 
-        /* if SRIOV is disabled there is nothing to do (and somewhere, someone
-         * has erred).
-         */
-        if (!IS_SRIOV(bp)) {
-                BNX2X_ERR("bnx2x_set_vf_mac called though sriov is disabled\n");
-                return -EINVAL;
-        }
-
+        /* sanity */
+        rc = bnx2x_vf_ndo_sanity(bp, vfidx, vf);
+        if (rc)
+                return rc;
         if (!is_valid_ether_addr(mac)) {
                 BNX2X_ERR("mac address invalid\n");
                 return -EINVAL;
@@ -3085,7 +3208,7 @@ int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac)
         if (vf->state == VF_ENABLED &&
             q_logical_state == BNX2X_Q_LOGICAL_STATE_ACTIVE) {
                 /* configure the mac in device on this vf's queue */
-                unsigned long flags = 0;
+                unsigned long ramrod_flags = 0;
                 struct bnx2x_vlan_mac_obj *mac_obj = &bnx2x_vfq(vf, 0, mac_obj);
 
                 /* must lock vfpf channel to protect against vf flows */
@@ -3106,14 +3229,133 @@ int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac)
                 }
 
                 /* configure the new mac to device */
-                __set_bit(RAMROD_COMP_WAIT, &flags);
+                __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
                 bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true,
-                                  BNX2X_ETH_MAC, &flags);
+                                  BNX2X_ETH_MAC, &ramrod_flags);
 
                 bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC);
         }
 
-        return rc;
+        return 0;
+}
+
+int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int rc, q_logical_state;
+        struct bnx2x_virtf *vf = BP_VF(bp, vfidx);
+        struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vfidx);
+
+        /* sanity */
+        rc = bnx2x_vf_ndo_sanity(bp, vfidx, vf);
+        if (rc)
+                return rc;
+
+        if (vlan > 4095) {
+                BNX2X_ERR("illegal vlan value %d\n", vlan);
+                return -EINVAL;
+        }
+
+        DP(BNX2X_MSG_IOV, "configuring VF %d with VLAN %d qos %d\n",
+           vfidx, vlan, 0);
+
+        /* update PF's copy of the VF's bulletin. No point in posting the vlan
+         * to the VF since it doesn't have anything to do with it. But it useful
+         * to store it here in case the VF is not up yet and we can only
+         * configure the vlan later when it does.
+         */
+        bulletin->valid_bitmap |= 1 << VLAN_VALID;
+        bulletin->vlan = vlan;
+
+        /* is vf initialized and queue set up? */
+        q_logical_state =
+                bnx2x_get_q_logical_state(bp, &bnx2x_vfq(vf, 0, sp_obj));
+        if (vf->state == VF_ENABLED &&
+            q_logical_state == BNX2X_Q_LOGICAL_STATE_ACTIVE) {
+                /* configure the vlan in device on this vf's queue */
+                unsigned long ramrod_flags = 0;
+                unsigned long vlan_mac_flags = 0;
+                struct bnx2x_vlan_mac_obj *vlan_obj =
+                        &bnx2x_vfq(vf, 0, vlan_obj);
+                struct bnx2x_vlan_mac_ramrod_params ramrod_param;
+                struct bnx2x_queue_state_params q_params = {NULL};
+                struct bnx2x_queue_update_params *update_params;
+
+                memset(&ramrod_param, 0, sizeof(ramrod_param));
+
+                /* must lock vfpf channel to protect against vf flows */
+                bnx2x_lock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);
+
+                /* remove existing vlans */
+                __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
+                rc = vlan_obj->delete_all(bp, vlan_obj, &vlan_mac_flags,
+                                          &ramrod_flags);
+                if (rc) {
+                        BNX2X_ERR("failed to delete vlans\n");
+                        return -EINVAL;
+                }
+
+                /* send queue update ramrod to configure default vlan and silent
+                 * vlan removal
+                 */
+                __set_bit(RAMROD_COMP_WAIT, &q_params.ramrod_flags);
+                q_params.cmd = BNX2X_Q_CMD_UPDATE;
+                q_params.q_obj = &bnx2x_vfq(vf, 0, sp_obj);
+                update_params = &q_params.params.update;
+                __set_bit(BNX2X_Q_UPDATE_DEF_VLAN_EN_CHNG,
+                          &update_params->update_flags);
+                __set_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM_CHNG,
+                          &update_params->update_flags);
+
+                if (vlan == 0) {
+                        /* if vlan is 0 then we want to leave the VF traffic
+                         * untagged, and leave the incoming traffic untouched
+                         * (i.e. do not remove any vlan tags).
+                         */
+                        __clear_bit(BNX2X_Q_UPDATE_DEF_VLAN_EN,
+                                    &update_params->update_flags);
+                        __clear_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM,
+                                    &update_params->update_flags);
+                } else {
+                        /* configure the new vlan to device */
+                        __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
+                        ramrod_param.vlan_mac_obj = vlan_obj;
+                        ramrod_param.ramrod_flags = ramrod_flags;
+                        ramrod_param.user_req.u.vlan.vlan = vlan;
+                        ramrod_param.user_req.cmd = BNX2X_VLAN_MAC_ADD;
+                        rc = bnx2x_config_vlan_mac(bp, &ramrod_param);
+                        if (rc) {
+                                BNX2X_ERR("failed to configure vlan\n");
+                                return -EINVAL;
+                        }
+
+                        /* configure default vlan to vf queue and set silent
+                         * vlan removal (the vf remains unaware of this vlan).
+                         */
+                        update_params = &q_params.params.update;
+                        __set_bit(BNX2X_Q_UPDATE_DEF_VLAN_EN,
+                                  &update_params->update_flags);
+                        __set_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM,
+                                  &update_params->update_flags);
+                        update_params->def_vlan = vlan;
+                }
+
+                /* Update the Queue state */
+                rc = bnx2x_queue_state_change(bp, &q_params);
+                if (rc) {
+                        BNX2X_ERR("Failed to configure default VLAN\n");
+                        return rc;
+                }
+
+                /* clear the flag indicating that this VF needs its vlan
+                 * (will only be set if the HV configured th Vlan before vf was
+                 * and we were called because the VF came up later
+                 */
+                vf->cfg_flags &= ~VF_CFG_VLAN;
+
+                bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);
+        }
+        return 0;
 }
 
 /* crc is the first field in the bulletin board. compute the crc over the
@@ -3165,20 +3407,26 @@ enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp)
                 memcpy(bp->dev->dev_addr, bulletin.mac, ETH_ALEN);
         }
 
+        /* the vlan in bulletin board is valid and is new */
+        if (bulletin.valid_bitmap & 1 << VLAN_VALID)
+                memcpy(&bulletin.vlan, &bp->old_bulletin.vlan, VLAN_HLEN);
+
         /* copy new bulletin board to bp */
         bp->old_bulletin = bulletin;
 
         return PFVF_BULLETIN_UPDATED;
 }
 
-void bnx2x_vf_map_doorbells(struct bnx2x *bp)
+void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
 {
         /* vf doorbells are embedded within the regview */
-        bp->doorbells = bp->regview + PXP_VF_ADDR_DB_START;
+        return bp->regview + PXP_VF_ADDR_DB_START;
 }
 
 int bnx2x_vf_pci_alloc(struct bnx2x *bp)
 {
+        mutex_init(&bp->vf2pf_mutex);
+
         /* allocate vf2pf mailbox for vf to pf channel */
         BNX2X_PCI_ALLOC(bp->vf2pf_mbox, &bp->vf2pf_mbox_mapping,
                         sizeof(struct bnx2x_vf_mbx_msg));
@@ -3196,3 +3444,26 @@ alloc_mem_err:
                        sizeof(union pf_vf_bulletin));
         return -ENOMEM;
 }
+
+int bnx2x_open_epilog(struct bnx2x *bp)
+{
+        /* Enable sriov via delayed work. This must be done via delayed work
+         * because it causes the probe of the vf devices to be run, which invoke
+         * register_netdevice which must have rtnl lock taken. As we are holding
+         * the lock right now, that could only work if the probe would not take
+         * the lock. However, as the probe of the vf may be called from other
+         * contexts as well (such as passthrough to vm failes) it can't assume
+         * the lock is being held for it. Using delayed work here allows the
+         * probe code to simply take the lock (i.e. wait for it to be released
+         * if it is being held). We only want to do this if the number of VFs
+         * was set before PF driver was loaded.
+         */
+        if (IS_SRIOV(bp) && BNX2X_NR_VIRTFN(bp)) {
+                smp_mb__before_clear_bit();
+                set_bit(BNX2X_SP_RTNL_ENABLE_SRIOV, &bp->sp_rtnl_state);
+                smp_mb__after_clear_bit();
+                schedule_delayed_work(&bp->sp_rtnl_task, 0);
+        }
+
+        return 0;
+}
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
index b4050173add9..d67ddc554c0f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
@@ -193,6 +193,7 @@ struct bnx2x_virtf {
 #define VF_CFG_TPA              0x0004
 #define VF_CFG_INT_SIMD         0x0008
 #define VF_CACHE_LINE           0x0010
+#define VF_CFG_VLAN             0x0020
 
         u8 state;
 #define VF_FREE         0       /* VF ready to be acquired holds no resc */
@@ -712,6 +713,7 @@ void bnx2x_add_tlv(struct bnx2x *bp, void *tlvs_list, u16 offset, u16 type,
                    u16 length);
 void bnx2x_vfpf_prep(struct bnx2x *bp, struct vfpf_first_tlv *first_tlv,
                      u16 type, u16 length);
+void bnx2x_vfpf_finalize(struct bnx2x *bp, struct vfpf_first_tlv *first_tlv);
 void bnx2x_dp_tlv_list(struct bnx2x *bp, void *tlvs_list);
 
 bool bnx2x_tlv_supported(u16 tlvtype);
@@ -731,7 +733,7 @@ int bnx2x_vfpf_init(struct bnx2x *bp);
 void bnx2x_vfpf_close_vf(struct bnx2x *bp);
 int bnx2x_vfpf_setup_q(struct bnx2x *bp, int fp_idx);
 int bnx2x_vfpf_teardown_queue(struct bnx2x *bp, int qidx);
-int bnx2x_vfpf_set_mac(struct bnx2x *bp);
+int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr, u8 vf_qid, bool set);
 int bnx2x_vfpf_set_mcast(struct net_device *dev);
 int bnx2x_vfpf_storm_rx_mode(struct bnx2x *bp);
 
@@ -750,13 +752,17 @@ static inline int bnx2x_vf_ustorm_prods_offset(struct bnx2x *bp,
 }
 
 enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp);
-void bnx2x_vf_map_doorbells(struct bnx2x *bp);
+void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp);
 int bnx2x_vf_pci_alloc(struct bnx2x *bp);
-void bnx2x_enable_sriov(struct bnx2x *bp);
+int bnx2x_enable_sriov(struct bnx2x *bp);
+void bnx2x_disable_sriov(struct bnx2x *bp);
 static inline int bnx2x_vf_headroom(struct bnx2x *bp)
 {
         return bp->vfdb->sriov.nr_virtfn * BNX2X_CLIENTS_PER_VF;
 }
+void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp);
+int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs);
+int bnx2x_open_epilog(struct bnx2x *bp);
 
 #else /* CONFIG_BNX2X_SRIOV */
 
@@ -779,7 +785,8 @@ static inline void bnx2x_iov_init_dmae(struct bnx2x *bp) {}
 static inline int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
                                      int num_vfs_param) {return 0; }
 static inline void bnx2x_iov_remove_one(struct bnx2x *bp) {}
-static inline void bnx2x_enable_sriov(struct bnx2x *bp) {}
+static inline int bnx2x_enable_sriov(struct bnx2x *bp) {return 0; }
+static inline void bnx2x_disable_sriov(struct bnx2x *bp) {}
 static inline int bnx2x_vfpf_acquire(struct bnx2x *bp,
                                      u8 tx_count, u8 rx_count) {return 0; }
 static inline int bnx2x_vfpf_release(struct bnx2x *bp) {return 0; }
@@ -787,7 +794,8 @@ static inline int bnx2x_vfpf_init(struct bnx2x *bp) {return 0; }
 static inline void bnx2x_vfpf_close_vf(struct bnx2x *bp) {}
 static inline int bnx2x_vfpf_setup_q(struct bnx2x *bp, int fp_idx) {return 0; }
 static inline int bnx2x_vfpf_teardown_queue(struct bnx2x *bp, int qidx) {return 0; }
-static inline int bnx2x_vfpf_set_mac(struct bnx2x *bp) {return 0; }
+static inline int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr,
+                                        u8 vf_qid, bool set) {return 0; }
 static inline int bnx2x_vfpf_set_mcast(struct net_device *dev) {return 0; }
 static inline int bnx2x_vfpf_storm_rx_mode(struct bnx2x *bp) {return 0; }
 static inline int bnx2x_iov_nic_init(struct bnx2x *bp) {return 0; }
@@ -802,8 +810,15 @@ static inline enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp
         return PFVF_BULLETIN_UNCHANGED;
 }
 
-static inline int bnx2x_vf_map_doorbells(struct bnx2x *bp) {return 0; }
+static inline void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
+{
+        return NULL;
+}
+
 static inline int bnx2x_vf_pci_alloc(struct bnx2x *bp) {return 0; }
+static inline void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp) {}
+static inline int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs) {return 0; }
+static inline int bnx2x_open_epilog(struct bnx2x *bp) {return 0; }
 
 #endif /* CONFIG_BNX2X_SRIOV */
 #endif /* bnx2x_sriov.h */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 4397f8b76f2e..2ca3d94fcec2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -1547,11 +1547,51 @@ static void bnx2x_prep_fw_stats_req(struct bnx2x *bp)
         }
 }
 
+void bnx2x_memset_stats(struct bnx2x *bp)
+{
+        int i;
+
+        /* function stats */
+        for_each_queue(bp, i) {
+                struct bnx2x_fp_stats *fp_stats = &bp->fp_stats[i];
+
+                memset(&fp_stats->old_tclient, 0,
+                       sizeof(fp_stats->old_tclient));
+                memset(&fp_stats->old_uclient, 0,
+                       sizeof(fp_stats->old_uclient));
+                memset(&fp_stats->old_xclient, 0,
+                       sizeof(fp_stats->old_xclient));
+                if (bp->stats_init) {
+                        memset(&fp_stats->eth_q_stats, 0,
+                               sizeof(fp_stats->eth_q_stats));
+                        memset(&fp_stats->eth_q_stats_old, 0,
+                               sizeof(fp_stats->eth_q_stats_old));
+                }
+        }
+
+        memset(&bp->dev->stats, 0, sizeof(bp->dev->stats));
+
+        if (bp->stats_init) {
+                memset(&bp->net_stats_old, 0, sizeof(bp->net_stats_old));
+                memset(&bp->fw_stats_old, 0, sizeof(bp->fw_stats_old));
+                memset(&bp->eth_stats_old, 0, sizeof(bp->eth_stats_old));
+                memset(&bp->eth_stats, 0, sizeof(bp->eth_stats));
+                memset(&bp->func_stats, 0, sizeof(bp->func_stats));
+        }
+
+        bp->stats_state = STATS_STATE_DISABLED;
+
+        if (bp->port.pmf && bp->port.port_stx)
+                bnx2x_port_stats_base_init(bp);
+
+        /* mark the end of statistics initializiation */
+        bp->stats_init = false;
+}
+
 void bnx2x_stats_init(struct bnx2x *bp)
 {
         int /*abs*/port = BP_PORT(bp);
         int mb_idx = BP_FW_MB_IDX(bp);
-        int i;
 
         bp->stats_pending = 0;
         bp->executer_idx = 0;
@@ -1587,36 +1627,11 @@ void bnx2x_stats_init(struct bnx2x *bp)
                             &(bp->port.old_nig_stats.egress_mac_pkt1_lo), 2);
         }
 
-        /* function stats */
-        for_each_queue(bp, i) {
-                struct bnx2x_fp_stats *fp_stats = &bp->fp_stats[i];
-
-                memset(&fp_stats->old_tclient, 0,
-                       sizeof(fp_stats->old_tclient));
-                memset(&fp_stats->old_uclient, 0,
-                       sizeof(fp_stats->old_uclient));
-                memset(&fp_stats->old_xclient, 0,
-                       sizeof(fp_stats->old_xclient));
-                if (bp->stats_init) {
-                        memset(&fp_stats->eth_q_stats, 0,
-                               sizeof(fp_stats->eth_q_stats));
-                        memset(&fp_stats->eth_q_stats_old, 0,
-                               sizeof(fp_stats->eth_q_stats_old));
-                }
-        }
-
         /* Prepare statistics ramrod data */
         bnx2x_prep_fw_stats_req(bp);
 
-        memset(&bp->dev->stats, 0, sizeof(bp->dev->stats));
+        /* Clean SP from previous statistics */
         if (bp->stats_init) {
-                memset(&bp->net_stats_old, 0, sizeof(bp->net_stats_old));
-                memset(&bp->fw_stats_old, 0, sizeof(bp->fw_stats_old));
-                memset(&bp->eth_stats_old, 0, sizeof(bp->eth_stats_old));
-                memset(&bp->eth_stats, 0, sizeof(bp->eth_stats));
-                memset(&bp->func_stats, 0, sizeof(bp->func_stats));
-
-                /* Clean SP from previous statistics */
                 if (bp->func_stx) {
                         memset(bnx2x_sp(bp, func_stats), 0,
                                sizeof(struct host_func_stats));
@@ -1626,13 +1641,7 @@ void bnx2x_stats_init(struct bnx2x *bp)
                 }
         }
 
-        bp->stats_state = STATS_STATE_DISABLED;
-
-        if (bp->port.pmf && bp->port.port_stx)
-                bnx2x_port_stats_base_init(bp);
-
-        /* mark the end of statistics initializiation */
-        bp->stats_init = false;
+        bnx2x_memset_stats(bp);
 }
 
 void bnx2x_save_statistics(struct bnx2x *bp)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 198f6f1c9ad5..d117f472816c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -540,8 +540,8 @@ struct bnx2x_fw_port_stats_old {
 /* forward */
 struct bnx2x;
 
+void bnx2x_memset_stats(struct bnx2x *bp);
 void bnx2x_stats_init(struct bnx2x *bp);
-
 void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
 
 /**
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index 531eebf40d60..928b074d7d80 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -36,6 +36,8 @@ void bnx2x_add_tlv(struct bnx2x *bp, void *tlvs_list, u16 offset, u16 type,
 void bnx2x_vfpf_prep(struct bnx2x *bp, struct vfpf_first_tlv *first_tlv,
                      u16 type, u16 length)
 {
+        mutex_lock(&bp->vf2pf_mutex);
+
         DP(BNX2X_MSG_IOV, "preparing to send %d tlv over vf pf channel\n",
            type);
 
@@ -49,6 +51,15 @@ void bnx2x_vfpf_prep(struct bnx2x *bp, struct vfpf_first_tlv *first_tlv,
         first_tlv->resp_msg_offset = sizeof(bp->vf2pf_mbox->req);
 }
 
+/* releases the mailbox */
+void bnx2x_vfpf_finalize(struct bnx2x *bp, struct vfpf_first_tlv *first_tlv)
+{
+        DP(BNX2X_MSG_IOV, "done sending [%d] tlv over vf pf channel\n",
+           first_tlv->tl.type);
+
+        mutex_unlock(&bp->vf2pf_mutex);
+}
+
 /* list the types and lengths of the tlvs on the buffer */
 void bnx2x_dp_tlv_list(struct bnx2x *bp, void *tlvs_list)
 {
@@ -181,8 +192,10 @@ int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count)
         /* clear mailbox and prep first tlv */
         bnx2x_vfpf_prep(bp, &req->first_tlv, CHANNEL_TLV_ACQUIRE, sizeof(*req));
 
-        if (bnx2x_get_vf_id(bp, &vf_id))
-                return -EAGAIN;
+        if (bnx2x_get_vf_id(bp, &vf_id)) {
+                rc = -EAGAIN;
+                goto out;
+        }
 
         req->vfdev_info.vf_id = vf_id;
         req->vfdev_info.vf_os = 0;
@@ -213,7 +226,7 @@ int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count)
 
                 /* PF timeout */
                 if (rc)
-                        return rc;
+                        goto out;
 
                 /* copy acquire response from buffer to bp */
                 memcpy(&bp->acquire_resp, resp, sizeof(bp->acquire_resp));
@@ -253,7 +266,8 @@ int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count)
                         /* PF reports error */
                         BNX2X_ERR("Failed to get the requested amount of resources: %d. Breaking...\n",
                                   bp->acquire_resp.hdr.status);
-                        return -EAGAIN;
+                        rc = -EAGAIN;
+                        goto out;
                 }
         }
 
@@ -279,20 +293,24 @@ int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count)
                        bp->acquire_resp.resc.current_mac_addr,
                        ETH_ALEN);
 
-        return 0;
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
+        return rc;
 }
 
 int bnx2x_vfpf_release(struct bnx2x *bp)
 {
         struct vfpf_release_tlv *req = &bp->vf2pf_mbox->req.release;
         struct pfvf_general_resp_tlv *resp = &bp->vf2pf_mbox->resp.general_resp;
-        u32 rc = 0, vf_id;
+        u32 rc, vf_id;
 
         /* clear mailbox and prep first tlv */
         bnx2x_vfpf_prep(bp, &req->first_tlv, CHANNEL_TLV_RELEASE, sizeof(*req));
 
-        if (bnx2x_get_vf_id(bp, &vf_id))
-                return -EAGAIN;
+        if (bnx2x_get_vf_id(bp, &vf_id)) {
+                rc = -EAGAIN;
+                goto out;
+        }
 
         req->vf_id = vf_id;
 
@@ -308,7 +326,8 @@ int bnx2x_vfpf_release(struct bnx2x *bp)
 
         if (rc)
                 /* PF timeout */
-                return rc;
+                goto out;
+
         if (resp->hdr.status == PFVF_STATUS_SUCCESS) {
                 /* PF released us */
                 DP(BNX2X_MSG_SP, "vf released\n");
@@ -316,10 +335,13 @@ int bnx2x_vfpf_release(struct bnx2x *bp)
                 /* PF reports error */
                 BNX2X_ERR("PF failed our release request - are we out of sync? response status: %d\n",
                           resp->hdr.status);
-                return -EAGAIN;
+                rc = -EAGAIN;
+                goto out;
         }
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
 
-        return 0;
+        return rc;
 }
 
 /* Tell PF about SB addresses */
@@ -350,16 +372,20 @@ int bnx2x_vfpf_init(struct bnx2x *bp)
 
         rc = bnx2x_send_msg2pf(bp, &resp->hdr.status, bp->vf2pf_mbox_mapping);
         if (rc)
-                return rc;
+                goto out;
 
         if (resp->hdr.status != PFVF_STATUS_SUCCESS) {
                 BNX2X_ERR("INIT VF failed: %d. Breaking...\n",
                           resp->hdr.status);
-                return -EAGAIN;
+                rc = -EAGAIN;
+                goto out;
         }
 
         DP(BNX2X_MSG_SP, "INIT VF Succeeded\n");
-        return 0;
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
+
+        return rc;
 }
 
 /* CLOSE VF - opposite to INIT_VF */
@@ -380,6 +406,9 @@ void bnx2x_vfpf_close_vf(struct bnx2x *bp)
         for_each_queue(bp, i)
                 bnx2x_vfpf_teardown_queue(bp, i);
 
+        /* remove mac */
+        bnx2x_vfpf_config_mac(bp, bp->dev->dev_addr, bp->fp->index, false);
+
         /* clear mailbox and prep first tlv */
         bnx2x_vfpf_prep(bp, &req->first_tlv, CHANNEL_TLV_CLOSE, sizeof(*req));
 
@@ -401,6 +430,8 @@ void bnx2x_vfpf_close_vf(struct bnx2x *bp)
                 BNX2X_ERR("Sending CLOSE failed: pf response was %d\n",
                           resp->hdr.status);
 
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
+
 free_irq:
         /* Disable HW interrupts, NAPI */
         bnx2x_netif_stop(bp, 0);
@@ -435,7 +466,6 @@ int bnx2x_vfpf_setup_q(struct bnx2x *bp, int fp_idx)
         /* calculate queue flags */
         flags |= VFPF_QUEUE_FLG_STATS;
         flags |= VFPF_QUEUE_FLG_CACHE_ALIGN;
-        flags |= IS_MF_SD(bp) ? VFPF_QUEUE_FLG_OV : 0;
         flags |= VFPF_QUEUE_FLG_VLAN;
         DP(NETIF_MSG_IFUP, "vlan removal enabled\n");
 
@@ -486,8 +516,11 @@ int bnx2x_vfpf_setup_q(struct bnx2x *bp, int fp_idx)
         if (resp->hdr.status != PFVF_STATUS_SUCCESS) {
                 BNX2X_ERR("Status of SETUP_Q for queue[%d] is %d\n",
                           fp_idx, resp->hdr.status);
-                return -EINVAL;
+                rc = -EINVAL;
         }
+
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
+
         return rc;
 }
 
@@ -515,41 +548,46 @@ int bnx2x_vfpf_teardown_queue(struct bnx2x *bp, int qidx)
         if (rc) {
                 BNX2X_ERR("Sending TEARDOWN for queue %d failed: %d\n", qidx,
                           rc);
-                return rc;
+                goto out;
         }
 
         /* PF failed the transaction */
         if (resp->hdr.status != PFVF_STATUS_SUCCESS) {
                 BNX2X_ERR("TEARDOWN for queue %d failed: %d\n", qidx,
                           resp->hdr.status);
-                return -EINVAL;
+                rc = -EINVAL;
         }
 
-        return 0;
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
+        return rc;
 }
 
 /* request pf to add a mac for the vf */
-int bnx2x_vfpf_set_mac(struct bnx2x *bp)
+int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr, u8 vf_qid, bool set)
 {
         struct vfpf_set_q_filters_tlv *req = &bp->vf2pf_mbox->req.set_q_filters;
         struct pfvf_general_resp_tlv *resp = &bp->vf2pf_mbox->resp.general_resp;
-        int rc;
+        struct pf_vf_bulletin_content bulletin = bp->pf2vf_bulletin->content;
+        int rc = 0;
 
         /* clear mailbox and prep first tlv */
         bnx2x_vfpf_prep(bp, &req->first_tlv, CHANNEL_TLV_SET_Q_FILTERS,
                         sizeof(*req));
 
         req->flags = VFPF_SET_Q_FILTERS_MAC_VLAN_CHANGED;
-        req->vf_qid = 0;
+        req->vf_qid = vf_qid;
         req->n_mac_vlan_filters = 1;
-        req->filters[0].flags =
-                VFPF_Q_FILTER_DEST_MAC_VALID | VFPF_Q_FILTER_SET_MAC;
+
+        req->filters[0].flags = VFPF_Q_FILTER_DEST_MAC_VALID;
+        if (set)
+                req->filters[0].flags |= VFPF_Q_FILTER_SET_MAC;
 
         /* sample bulletin board for new mac */
         bnx2x_sample_bulletin(bp);
 
         /* copy mac from device to request */
-        memcpy(req->filters[0].mac, bp->dev->dev_addr, ETH_ALEN);
+        memcpy(req->filters[0].mac, addr, ETH_ALEN);
 
         /* add list termination tlv */
         bnx2x_add_tlv(bp, req, req->first_tlv.tl.length, CHANNEL_TLV_LIST_END,
@@ -562,7 +600,7 @@ int bnx2x_vfpf_set_mac(struct bnx2x *bp)
         rc = bnx2x_send_msg2pf(bp, &resp->hdr.status, bp->vf2pf_mbox_mapping);
         if (rc) {
                 BNX2X_ERR("failed to send message to pf. rc was %d\n", rc);
-                return rc;
+                goto out;
         }
 
         /* failure may mean PF was configured with a new mac for us */
@@ -570,6 +608,9 @@ int bnx2x_vfpf_set_mac(struct bnx2x *bp)
                 DP(BNX2X_MSG_IOV,
                    "vfpf SET MAC failed. Check bulletin board for new posts\n");
 
+                /* copy mac from bulletin to device */
+                memcpy(bp->dev->dev_addr, bulletin.mac, ETH_ALEN);
+
                 /* check if bulletin board was updated */
                 if (bnx2x_sample_bulletin(bp) == PFVF_BULLETIN_UPDATED) {
                         /* copy mac from device to request */
@@ -587,8 +628,10 @@ int bnx2x_vfpf_set_mac(struct bnx2x *bp)
 
         if (resp->hdr.status != PFVF_STATUS_SUCCESS) {
                 BNX2X_ERR("vfpf SET MAC failed: %d\n", resp->hdr.status);
-                return -EINVAL;
+                rc = -EINVAL;
         }
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
 
         return 0;
 }
@@ -643,14 +686,16 @@ int bnx2x_vfpf_set_mcast(struct net_device *dev)
         rc = bnx2x_send_msg2pf(bp, &resp->hdr.status, bp->vf2pf_mbox_mapping);
         if (rc) {
                 BNX2X_ERR("Sending a message failed: %d\n", rc);
-                return rc;
+                goto out;
         }
 
         if (resp->hdr.status != PFVF_STATUS_SUCCESS) {
                 BNX2X_ERR("Set Rx mode/multicast failed: %d\n",
                           resp->hdr.status);
-                return -EINVAL;
+                rc = -EINVAL;
         }
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
 
         return 0;
 }
@@ -689,7 +734,8 @@ int bnx2x_vfpf_storm_rx_mode(struct bnx2x *bp)
                 break;
         default:
                 BNX2X_ERR("BAD rx mode (%d)\n", mode);
-                return -EINVAL;
+                rc = -EINVAL;
+                goto out;
         }
 
         req->flags |= VFPF_SET_Q_FILTERS_RX_MASK_CHANGED;
@@ -708,8 +754,10 @@ int bnx2x_vfpf_storm_rx_mode(struct bnx2x *bp)
 
         if (resp->hdr.status != PFVF_STATUS_SUCCESS) {
                 BNX2X_ERR("Set Rx mode failed: %d\n", resp->hdr.status);
-                return -EINVAL;
+                rc = -EINVAL;
         }
+out:
+        bnx2x_vfpf_finalize(bp, &req->first_tlv);
 
         return rc;
 }
@@ -1004,7 +1052,7 @@ static void bnx2x_vf_mbx_init_vf(struct bnx2x *bp, struct bnx2x_virtf *vf,
 }
 
 /* convert MBX queue-flags to standard SP queue-flags */
-static void bnx2x_vf_mbx_set_q_flags(u32 mbx_q_flags,
+static void bnx2x_vf_mbx_set_q_flags(struct bnx2x *bp, u32 mbx_q_flags,
                                      unsigned long *sp_q_flags)
 {
         if (mbx_q_flags & VFPF_QUEUE_FLG_TPA)
@@ -1015,8 +1063,6 @@ static void bnx2x_vf_mbx_set_q_flags(u32 mbx_q_flags,
                 __set_bit(BNX2X_Q_FLG_TPA_GRO, sp_q_flags);
         if (mbx_q_flags & VFPF_QUEUE_FLG_STATS)
                 __set_bit(BNX2X_Q_FLG_STATS, sp_q_flags);
-        if (mbx_q_flags & VFPF_QUEUE_FLG_OV)
-                __set_bit(BNX2X_Q_FLG_OV, sp_q_flags);
         if (mbx_q_flags & VFPF_QUEUE_FLG_VLAN)
                 __set_bit(BNX2X_Q_FLG_VLAN, sp_q_flags);
         if (mbx_q_flags & VFPF_QUEUE_FLG_COS)
@@ -1025,6 +1071,10 @@ static void bnx2x_vf_mbx_set_q_flags(u32 mbx_q_flags,
                 __set_bit(BNX2X_Q_FLG_HC, sp_q_flags);
         if (mbx_q_flags & VFPF_QUEUE_FLG_DHC)
                 __set_bit(BNX2X_Q_FLG_DHC, sp_q_flags);
+
+        /* outer vlan removal is set according to the PF's multi fuction mode */
+        if (IS_MF_SD(bp))
+                __set_bit(BNX2X_Q_FLG_OV, sp_q_flags);
 }
 
 static void bnx2x_vf_mbx_setup_q(struct bnx2x *bp, struct bnx2x_virtf *vf,
@@ -1075,11 +1125,11 @@ static void bnx2x_vf_mbx_setup_q(struct bnx2x *bp, struct bnx2x_virtf *vf,
                         init_p->tx.hc_rate = setup_q->txq.hc_rate;
                         init_p->tx.sb_cq_index = setup_q->txq.sb_index;
 
-                        bnx2x_vf_mbx_set_q_flags(setup_q->txq.flags,
+                        bnx2x_vf_mbx_set_q_flags(bp, setup_q->txq.flags,
                                                  &init_p->tx.flags);
 
                         /* tx setup - flags */
-                        bnx2x_vf_mbx_set_q_flags(setup_q->txq.flags,
+                        bnx2x_vf_mbx_set_q_flags(bp, setup_q->txq.flags,
                                                  &setup_p->flags);
 
                         /* tx setup - general, nothing */
@@ -1107,11 +1157,11 @@ static void bnx2x_vf_mbx_setup_q(struct bnx2x *bp, struct bnx2x_virtf *vf,
                         /* rx init */
                         init_p->rx.hc_rate = setup_q->rxq.hc_rate;
                         init_p->rx.sb_cq_index = setup_q->rxq.sb_index;
-                        bnx2x_vf_mbx_set_q_flags(setup_q->rxq.flags,
+                        bnx2x_vf_mbx_set_q_flags(bp, setup_q->rxq.flags,
                                                  &init_p->rx.flags);
 
                         /* rx setup - flags */
-                        bnx2x_vf_mbx_set_q_flags(setup_q->rxq.flags,
+                        bnx2x_vf_mbx_set_q_flags(bp, setup_q->rxq.flags,
                                                  &setup_p->flags);
 
                         /* rx setup - general */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
index bfc80baec00d..41708faab575 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
@@ -328,9 +328,15 @@ struct pf_vf_bulletin_content {
 #define MAC_ADDR_VALID          0       /* alert the vf that a new mac address
                                          * is available for it
                                          */
+#define VLAN_VALID              1       /* when set, the vf should not access
+                                         * the vfpf channel
+                                         */
 
         u8 mac[ETH_ALEN];
-        u8 padding[2];
+        u8 mac_padding[2];
+
+        u16 vlan;
+        u8 vlan_padding[6];
 };
 
 union pf_vf_bulletin {
@@ -353,6 +359,7 @@ enum channel_tlvs {
         CHANNEL_TLV_LIST_END,
         CHANNEL_TLV_FLR,
         CHANNEL_TLV_PF_SET_MAC,
+        CHANNEL_TLV_PF_SET_VLAN,
         CHANNEL_TLV_MAX
 };
 
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 149a3a038491..40649a8bf390 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -5544,8 +5544,10 @@ static struct cnic_dev *init_bnx2x_cnic(struct net_device *dev)
 
         if (!(ethdev->drv_state & CNIC_DRV_STATE_NO_ISCSI))
                 cdev->max_iscsi_conn = ethdev->max_iscsi_conn;
-        if (CNIC_SUPPORTS_FCOE(cp))
+        if (CNIC_SUPPORTS_FCOE(cp)) {
                 cdev->max_fcoe_conn = ethdev->max_fcoe_conn;
+                cdev->max_fcoe_exchanges = ethdev->max_fcoe_exchanges;
+        }
 
         if (cdev->max_fcoe_conn > BNX2X_FCOE_NUM_CONNECTIONS)
                 cdev->max_fcoe_conn = BNX2X_FCOE_NUM_CONNECTIONS;
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 0c9367a0f57d..ec9bb9ad4bb3 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -195,6 +195,7 @@ struct cnic_eth_dev {
         u32             max_fcoe_conn;
         u32             max_rdma_conn;
         u32             fcoe_init_cid;
+        u32             max_fcoe_exchanges;
         u32             fcoe_wwn_port_name_hi;
         u32             fcoe_wwn_port_name_lo;
         u32             fcoe_wwn_node_name_hi;
@@ -313,6 +314,8 @@ struct cnic_dev {
         int             max_fcoe_conn;
         int             max_rdma_conn;
 
+        int             max_fcoe_exchanges;
+
         union drv_info_to_mcp   *stats_addr;
         struct fcoe_capabilities        *fcoe_cap;
 
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index e9b35da375cb..e80bfb60c3ef 100644
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -831,11 +831,8 @@ static int sbdma_add_rcvbuffer(struct sbmac_softc *sc, struct sbmacdma *d,
                 sb_new = netdev_alloc_skb(dev, ENET_PACKET_SIZE +
                                                SMP_CACHE_BYTES * 2 +
                                                NET_IP_ALIGN);
-                if (sb_new == NULL) {
-                        pr_info("%s: sk_buff allocation failed\n",
-                               d->sbdma_eth->sbm_dev->name);
+                if (sb_new == NULL)
                         return -ENOBUFS;
-                }
 
                 sbdma_align_skb(sb_new, SMP_CACHE_BYTES, NET_IP_ALIGN);
         }
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 17a972734ba7..728d42ab2a76 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -94,10 +94,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 
 #define DRV_MODULE_NAME         "tg3"
 #define TG3_MAJ_NUM                     3
-#define TG3_MIN_NUM                     130
+#define TG3_MIN_NUM                     131
 #define DRV_MODULE_VERSION      \
         __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
-#define DRV_MODULE_RELDATE      "February 14, 2013"
+#define DRV_MODULE_RELDATE      "April 09, 2013"
 
 #define RESET_KIND_SHUTDOWN     0
 #define RESET_KIND_INIT         1
@@ -212,6 +212,7 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 #define TG3_FW_UPDATE_FREQ_SEC          (TG3_FW_UPDATE_TIMEOUT_SEC / 2)
 
 #define FIRMWARE_TG3            "tigon/tg3.bin"
+#define FIRMWARE_TG357766       "tigon/tg357766.bin"
 #define FIRMWARE_TG3TSO         "tigon/tg3_tso.bin"
 #define FIRMWARE_TG3TSO5        "tigon/tg3_tso5.bin"
 
@@ -1873,6 +1874,20 @@ static void tg3_link_report(struct tg3 *tp)
         tp->link_up = netif_carrier_ok(tp->dev);
 }
 
+static u32 tg3_decode_flowctrl_1000T(u32 adv)
+{
+        u32 flowctrl = 0;
+
+        if (adv & ADVERTISE_PAUSE_CAP) {
+                flowctrl |= FLOW_CTRL_RX;
+                if (!(adv & ADVERTISE_PAUSE_ASYM))
+                        flowctrl |= FLOW_CTRL_TX;
+        } else if (adv & ADVERTISE_PAUSE_ASYM)
+                flowctrl |= FLOW_CTRL_TX;
+
+        return flowctrl;
+}
+
 static u16 tg3_advert_flowctrl_1000X(u8 flow_ctrl)
 {
         u16 miireg;
@@ -1889,6 +1904,20 @@ static u16 tg3_advert_flowctrl_1000X(u8 flow_ctrl)
         return miireg;
 }
 
+static u32 tg3_decode_flowctrl_1000X(u32 adv)
+{
+        u32 flowctrl = 0;
+
+        if (adv & ADVERTISE_1000XPAUSE) {
+                flowctrl |= FLOW_CTRL_RX;
+                if (!(adv & ADVERTISE_1000XPSE_ASYM))
+                        flowctrl |= FLOW_CTRL_TX;
+        } else if (adv & ADVERTISE_1000XPSE_ASYM)
+                flowctrl |= FLOW_CTRL_TX;
+
+        return flowctrl;
+}
+
 static u8 tg3_resolve_flowctrl_1000X(u16 lcladv, u16 rmtadv)
 {
         u8 cap = 0;
@@ -2199,7 +2228,7 @@ static void tg3_phy_toggle_apd(struct tg3 *tp, bool enable)
         tg3_writephy(tp, MII_TG3_MISC_SHDW, reg);
 }
 
-static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable)
+static void tg3_phy_toggle_automdix(struct tg3 *tp, bool enable)
 {
         u32 phy;
 
@@ -2291,7 +2320,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp)
         tg3_phy_toggle_auxctl_smdsp(tp, false);
 }
 
-static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
+static void tg3_phy_eee_adjust(struct tg3 *tp, bool current_link_up)
 {
         u32 val;
 
@@ -2301,7 +2330,7 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
         tp->setlpicnt = 0;
 
         if (tp->link_config.autoneg == AUTONEG_ENABLE &&
-            current_link_up == 1 &&
+            current_link_up &&
             tp->link_config.active_duplex == DUPLEX_FULL &&
             (tp->link_config.active_speed == SPEED_100 ||
              tp->link_config.active_speed == SPEED_1000)) {
@@ -2323,7 +2352,7 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
         }
 
         if (!tp->setlpicnt) {
-                if (current_link_up == 1 &&
+                if (current_link_up &&
                    !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
                         tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000);
                         tg3_phy_toggle_auxctl_smdsp(tp, false);
@@ -2530,6 +2559,13 @@ static void tg3_carrier_off(struct tg3 *tp)
         tp->link_up = false;
 }
 
+static void tg3_warn_mgmt_link_flap(struct tg3 *tp)
+{
+        if (tg3_flag(tp, ENABLE_ASF))
+                netdev_warn(tp->dev,
+                            "Management side-band traffic will be interrupted during phy settings change\n");
+}
+
 /* This will reset the tigon3 PHY if there is no valid
  * link unless the FORCE argument is non-zero.
  */
@@ -2669,7 +2705,7 @@ out:
         if (tg3_chip_rev_id(tp) == CHIPREV_ID_5762_A0)
                 tg3_phydsp_write(tp, 0xffb, 0x4000);
 
-        tg3_phy_toggle_automdix(tp, 1);
+        tg3_phy_toggle_automdix(tp, true);
         tg3_phy_set_wirespeed(tp);
         return 0;
 }
@@ -2925,6 +2961,9 @@ static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
 {
         u32 val;
 
+        if (tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN)
+                return;
+
         if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
                 if (tg3_asic_rev(tp) == ASIC_REV_5704) {
                         u32 sg_dig_ctrl = tr32(SG_DIG_CTRL);
@@ -3448,11 +3487,58 @@ static int tg3_nvram_write_block(struct tg3 *tp, u32 offset, u32 len, u8 *buf)
 #define TX_CPU_SCRATCH_SIZE     0x04000
 
 /* tp->lock is held. */
-static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
+static int tg3_pause_cpu(struct tg3 *tp, u32 cpu_base)
 {
         int i;
+        const int iters = 10000;
+
+        for (i = 0; i < iters; i++) {
+                tw32(cpu_base + CPU_STATE, 0xffffffff);
+                tw32(cpu_base + CPU_MODE,  CPU_MODE_HALT);
+                if (tr32(cpu_base + CPU_MODE) & CPU_MODE_HALT)
+                        break;
+        }
+
+        return (i == iters) ? -EBUSY : 0;
+}
+
+/* tp->lock is held. */
+static int tg3_rxcpu_pause(struct tg3 *tp)
+{
+        int rc = tg3_pause_cpu(tp, RX_CPU_BASE);
+
+        tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
+        tw32_f(RX_CPU_BASE + CPU_MODE,  CPU_MODE_HALT);
+        udelay(10);
+
+        return rc;
+}
+
+/* tp->lock is held. */
+static int tg3_txcpu_pause(struct tg3 *tp)
+{
+        return tg3_pause_cpu(tp, TX_CPU_BASE);
+}
+
+/* tp->lock is held. */
+static void tg3_resume_cpu(struct tg3 *tp, u32 cpu_base)
+{
+        tw32(cpu_base + CPU_STATE, 0xffffffff);
+        tw32_f(cpu_base + CPU_MODE,  0x00000000);
+}
 
-        BUG_ON(offset == TX_CPU_BASE && tg3_flag(tp, 5705_PLUS));
+/* tp->lock is held. */
+static void tg3_rxcpu_resume(struct tg3 *tp)
+{
+        tg3_resume_cpu(tp, RX_CPU_BASE);
+}
+
+/* tp->lock is held. */
+static int tg3_halt_cpu(struct tg3 *tp, u32 cpu_base)
+{
+        int rc;
+
+        BUG_ON(cpu_base == TX_CPU_BASE && tg3_flag(tp, 5705_PLUS));
 
         if (tg3_asic_rev(tp) == ASIC_REV_5906) {
                 u32 val = tr32(GRC_VCPU_EXT_CTRL);
@@ -3460,17 +3546,8 @@ static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
                 tw32(GRC_VCPU_EXT_CTRL, val | GRC_VCPU_EXT_CTRL_HALT_CPU);
                 return 0;
         }
-        if (offset == RX_CPU_BASE) {
-                for (i = 0; i < 10000; i++) {
-                        tw32(offset + CPU_STATE, 0xffffffff);
-                        tw32(offset + CPU_MODE,  CPU_MODE_HALT);
-                        if (tr32(offset + CPU_MODE) & CPU_MODE_HALT)
-                                break;
-                }
-
-                tw32(offset + CPU_STATE, 0xffffffff);
-                tw32_f(offset + CPU_MODE,  CPU_MODE_HALT);
-                udelay(10);
+        if (cpu_base == RX_CPU_BASE) {
+                rc = tg3_rxcpu_pause(tp);
         } else {
                 /*
                  * There is only an Rx CPU for the 5750 derivative in the
@@ -3479,17 +3556,12 @@ static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
                 if (tg3_flag(tp, IS_SSB_CORE))
                         return 0;
 
-                for (i = 0; i < 10000; i++) {
-                        tw32(offset + CPU_STATE, 0xffffffff);
-                        tw32(offset + CPU_MODE,  CPU_MODE_HALT);
-                        if (tr32(offset + CPU_MODE) & CPU_MODE_HALT)
-                                break;
-                }
+                rc = tg3_txcpu_pause(tp);
         }
 
-        if (i >= 10000) {
+        if (rc) {
                 netdev_err(tp->dev, "%s timed out, %s CPU\n",
-                           __func__, offset == RX_CPU_BASE ? "RX" : "TX");
+                           __func__, cpu_base == RX_CPU_BASE ? "RX" : "TX");
                 return -ENODEV;
         }
 
@@ -3499,19 +3571,41 @@ static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
         return 0;
 }
 
-struct fw_info {
-        unsigned int fw_base;
-        unsigned int fw_len;
-        const __be32 *fw_data;
-};
+static int tg3_fw_data_len(struct tg3 *tp,
+                           const struct tg3_firmware_hdr *fw_hdr)
+{
+        int fw_len;
+
+        /* Non fragmented firmware have one firmware header followed by a
+         * contiguous chunk of data to be written. The length field in that
+         * header is not the length of data to be written but the complete
+         * length of the bss. The data length is determined based on
+         * tp->fw->size minus headers.
+         *
+         * Fragmented firmware have a main header followed by multiple
+         * fragments. Each fragment is identical to non fragmented firmware
+         * with a firmware header followed by a contiguous chunk of data. In
+         * the main header, the length field is unused and set to 0xffffffff.
+         * In each fragment header the length is the entire size of that
+         * fragment i.e. fragment data + header length. Data length is
+         * therefore length field in the header minus TG3_FW_HDR_LEN.
+         */
+        if (tp->fw_len == 0xffffffff)
+                fw_len = be32_to_cpu(fw_hdr->len);
+        else
+                fw_len = tp->fw->size;
+
+        return (fw_len - TG3_FW_HDR_LEN) / sizeof(u32);
+}
 
 /* tp->lock is held. */
 static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base,
                                  u32 cpu_scratch_base, int cpu_scratch_size,
-                                 struct fw_info *info)
+                                 const struct tg3_firmware_hdr *fw_hdr)
 {
-        int err, lock_err, i;
+        int err, i;
         void (*write_op)(struct tg3 *, u32, u32);
+        int total_len = tp->fw->size;
 
         if (cpu_base == TX_CPU_BASE && tg3_flag(tp, 5705_PLUS)) {
                 netdev_err(tp->dev,
@@ -3520,30 +3614,49 @@ static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base,
                 return -EINVAL;
         }
 
-        if (tg3_flag(tp, 5705_PLUS))
+        if (tg3_flag(tp, 5705_PLUS) && tg3_asic_rev(tp) != ASIC_REV_57766)
                 write_op = tg3_write_mem;
         else
                 write_op = tg3_write_indirect_reg32;
 
-        /* It is possible that bootcode is still loading at this point.
-         * Get the nvram lock first before halting the cpu.
-         */
-        lock_err = tg3_nvram_lock(tp);
-        err = tg3_halt_cpu(tp, cpu_base);
-        if (!lock_err)
-                tg3_nvram_unlock(tp);
-        if (err)
-                goto out;
+        if (tg3_asic_rev(tp) != ASIC_REV_57766) {
+                /* It is possible that bootcode is still loading at this point.
+                 * Get the nvram lock first before halting the cpu.
+                 */
+                int lock_err = tg3_nvram_lock(tp);
+                err = tg3_halt_cpu(tp, cpu_base);
+                if (!lock_err)
+                        tg3_nvram_unlock(tp);
+                if (err)
+                        goto out;
 
-        for (i = 0; i < cpu_scratch_size; i += sizeof(u32))
-                write_op(tp, cpu_scratch_base + i, 0);
-        tw32(cpu_base + CPU_STATE, 0xffffffff);
-        tw32(cpu_base + CPU_MODE, tr32(cpu_base+CPU_MODE)|CPU_MODE_HALT);
-        for (i = 0; i < (info->fw_len / sizeof(u32)); i++)
-                write_op(tp, (cpu_scratch_base +
-                              (info->fw_base & 0xffff) +
-                              (i * sizeof(u32))),
-                              be32_to_cpu(info->fw_data[i]));
+                for (i = 0; i < cpu_scratch_size; i += sizeof(u32))
+                        write_op(tp, cpu_scratch_base + i, 0);
+                tw32(cpu_base + CPU_STATE, 0xffffffff);
+                tw32(cpu_base + CPU_MODE,
+                     tr32(cpu_base + CPU_MODE) | CPU_MODE_HALT);
+        } else {
+                /* Subtract additional main header for fragmented firmware and
+                 * advance to the first fragment
+                 */
+                total_len -= TG3_FW_HDR_LEN;
+                fw_hdr++;
+        }
+
+        do {
+                u32 *fw_data = (u32 *)(fw_hdr + 1);
+                for (i = 0; i < tg3_fw_data_len(tp, fw_hdr); i++)
+                        write_op(tp, cpu_scratch_base +
+                                     (be32_to_cpu(fw_hdr->base_addr) & 0xffff) +
+                                     (i * sizeof(u32)),
+                                 be32_to_cpu(fw_data[i]));
+
+                total_len -= be32_to_cpu(fw_hdr->len);
+
+                /* Advance to next fragment */
+                fw_hdr = (struct tg3_firmware_hdr *)
+                         ((void *)fw_hdr + be32_to_cpu(fw_hdr->len));
+        } while (total_len > 0);
 
         err = 0;
 
@@ -3552,13 +3665,33 @@ out:
 }
 
 /* tp->lock is held. */
+static int tg3_pause_cpu_and_set_pc(struct tg3 *tp, u32 cpu_base, u32 pc)
+{
+        int i;
+        const int iters = 5;
+
+        tw32(cpu_base + CPU_STATE, 0xffffffff);
+        tw32_f(cpu_base + CPU_PC, pc);
+
+        for (i = 0; i < iters; i++) {
+                if (tr32(cpu_base + CPU_PC) == pc)
+                        break;
+                tw32(cpu_base + CPU_STATE, 0xffffffff);
+                tw32(cpu_base + CPU_MODE,  CPU_MODE_HALT);
+                tw32_f(cpu_base + CPU_PC, pc);
+                udelay(1000);
+        }
+
+        return (i == iters) ? -EBUSY : 0;
+}
+
+/* tp->lock is held. */
 static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
 {
-        struct fw_info info;
-        const __be32 *fw_data;
-        int err, i;
+        const struct tg3_firmware_hdr *fw_hdr;
+        int err;
 
-        fw_data = (void *)tp->fw->data;
+        fw_hdr = (struct tg3_firmware_hdr *)tp->fw->data;
 
         /* Firmware blob starts with version numbers, followed by
            start address and length. We are setting complete length.
@@ -3566,60 +3699,117 @@ static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
            Remainder is the blob to be loaded contiguously
            from start address. */
 
-        info.fw_base = be32_to_cpu(fw_data[1]);
-        info.fw_len = tp->fw->size - 12;
-        info.fw_data = &fw_data[3];
-
         err = tg3_load_firmware_cpu(tp, RX_CPU_BASE,
                                     RX_CPU_SCRATCH_BASE, RX_CPU_SCRATCH_SIZE,
-                                    &info);
+                                    fw_hdr);
         if (err)
                 return err;
 
         err = tg3_load_firmware_cpu(tp, TX_CPU_BASE,
                                     TX_CPU_SCRATCH_BASE, TX_CPU_SCRATCH_SIZE,
-                                    &info);
+                                    fw_hdr);
         if (err)
                 return err;
 
         /* Now startup only the RX cpu. */
-        tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
-        tw32_f(RX_CPU_BASE + CPU_PC, info.fw_base);
-
-        for (i = 0; i < 5; i++) {
-                if (tr32(RX_CPU_BASE + CPU_PC) == info.fw_base)
-                        break;
-                tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
-                tw32(RX_CPU_BASE + CPU_MODE,  CPU_MODE_HALT);
-                tw32_f(RX_CPU_BASE + CPU_PC, info.fw_base);
-                udelay(1000);
-        }
-        if (i >= 5) {
+        err = tg3_pause_cpu_and_set_pc(tp, RX_CPU_BASE,
+                                       be32_to_cpu(fw_hdr->base_addr));
+        if (err) {
                 netdev_err(tp->dev, "%s fails to set RX CPU PC, is %08x "
                            "should be %08x\n", __func__,
-                           tr32(RX_CPU_BASE + CPU_PC), info.fw_base);
+                           tr32(RX_CPU_BASE + CPU_PC),
+                                be32_to_cpu(fw_hdr->base_addr));
                 return -ENODEV;
         }
-        tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
-        tw32_f(RX_CPU_BASE + CPU_MODE,  0x00000000);
+
+        tg3_rxcpu_resume(tp);
 
         return 0;
 }
 
+static int tg3_validate_rxcpu_state(struct tg3 *tp)
+{
+        const int iters = 1000;
+        int i;
+        u32 val;
+
+        /* Wait for boot code to complete initialization and enter service
+         * loop. It is then safe to download service patches
+         */
+        for (i = 0; i < iters; i++) {
+                if (tr32(RX_CPU_HWBKPT) == TG3_SBROM_IN_SERVICE_LOOP)
+                        break;
+
+                udelay(10);
+        }
+
+        if (i == iters) {
+                netdev_err(tp->dev, "Boot code not ready for service patches\n");
+                return -EBUSY;
+        }
+
+        val = tg3_read_indirect_reg32(tp, TG3_57766_FW_HANDSHAKE);
+        if (val & 0xff) {
+                netdev_warn(tp->dev,
+                            "Other patches exist. Not downloading EEE patch\n");
+                return -EEXIST;
+        }
+
+        return 0;
+}
+
+/* tp->lock is held. */
+static void tg3_load_57766_firmware(struct tg3 *tp)
+{
+        struct tg3_firmware_hdr *fw_hdr;
+
+        if (!tg3_flag(tp, NO_NVRAM))
+                return;
+
+        if (tg3_validate_rxcpu_state(tp))
+                return;
+
+        if (!tp->fw)
+                return;
+
+        /* This firmware blob has a different format than older firmware
+         * releases as given below. The main difference is we have fragmented
+         * data to be written to non-contiguous locations.
+         *
+         * In the beginning we have a firmware header identical to other
+         * firmware which consists of version, base addr and length. The length
+         * here is unused and set to 0xffffffff.
+         *
+         * This is followed by a series of firmware fragments which are
+         * individually identical to previous firmware. i.e. they have the
+         * firmware header and followed by data for that fragment. The version
+         * field of the individual fragment header is unused.
+         */
+
+        fw_hdr = (struct tg3_firmware_hdr *)tp->fw->data;
+        if (be32_to_cpu(fw_hdr->base_addr) != TG3_57766_FW_BASE_ADDR)
+                return;
+
+        if (tg3_rxcpu_pause(tp))
+                return;
+
+        /* tg3_load_firmware_cpu() will always succeed for the 57766 */
+        tg3_load_firmware_cpu(tp, 0, TG3_57766_FW_BASE_ADDR, 0, fw_hdr);
+
+        tg3_rxcpu_resume(tp);
+}
+
 /* tp->lock is held. */
 static int tg3_load_tso_firmware(struct tg3 *tp)
 {
-        struct fw_info info;
-        const __be32 *fw_data;
+        const struct tg3_firmware_hdr *fw_hdr;
         unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
-        int err, i;
+        int err;
 
-        if (tg3_flag(tp, HW_TSO_1) ||
-            tg3_flag(tp, HW_TSO_2) ||
-            tg3_flag(tp, HW_TSO_3))
+        if (!tg3_flag(tp, FW_TSO))
                 return 0;
 
-        fw_data = (void *)tp->fw->data;
+        fw_hdr = (struct tg3_firmware_hdr *)tp->fw->data;
 
         /* Firmware blob starts with version numbers, followed by
            start address and length. We are setting complete length.
@@ -3627,10 +3817,7 @@ static int tg3_load_tso_firmware(struct tg3 *tp)
            Remainder is the blob to be loaded contiguously
            from start address. */
 
-        info.fw_base = be32_to_cpu(fw_data[1]);
         cpu_scratch_size = tp->fw_len;
-        info.fw_len = tp->fw->size - 12;
-        info.fw_data = &fw_data[3];
 
         if (tg3_asic_rev(tp) == ASIC_REV_5705) {
                 cpu_base = RX_CPU_BASE;
@@ -3643,36 +3830,28 @@ static int tg3_load_tso_firmware(struct tg3 *tp)
 
         err = tg3_load_firmware_cpu(tp, cpu_base,
                                     cpu_scratch_base, cpu_scratch_size,
-                                    &info);
+                                    fw_hdr);
         if (err)
                 return err;
 
         /* Now startup the cpu. */
-        tw32(cpu_base + CPU_STATE, 0xffffffff);
-        tw32_f(cpu_base + CPU_PC, info.fw_base);
-
-        for (i = 0; i < 5; i++) {
-                if (tr32(cpu_base + CPU_PC) == info.fw_base)
-                        break;
-                tw32(cpu_base + CPU_STATE, 0xffffffff);
-                tw32(cpu_base + CPU_MODE,  CPU_MODE_HALT);
-                tw32_f(cpu_base + CPU_PC, info.fw_base);
-                udelay(1000);
-        }
-        if (i >= 5) {
+        err = tg3_pause_cpu_and_set_pc(tp, cpu_base,
+                                       be32_to_cpu(fw_hdr->base_addr));
+        if (err) {
                 netdev_err(tp->dev,
                            "%s fails to set CPU PC, is %08x should be %08x\n",
-                           __func__, tr32(cpu_base + CPU_PC), info.fw_base);
+                           __func__, tr32(cpu_base + CPU_PC),
+                           be32_to_cpu(fw_hdr->base_addr));
                 return -ENODEV;
         }
-        tw32(cpu_base + CPU_STATE, 0xffffffff);
-        tw32_f(cpu_base + CPU_MODE,  0x00000000);
+
+        tg3_resume_cpu(tp, cpu_base);
         return 0;
 }
 
 
 /* tp->lock is held. */
-static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)
+static void __tg3_set_mac_addr(struct tg3 *tp, bool skip_mac_1)
 {
         u32 addr_high, addr_low;
         int i;
@@ -3735,7 +3914,7 @@ static int tg3_power_up(struct tg3 *tp)
         return err;
 }
 
-static int tg3_setup_phy(struct tg3 *, int);
+static int tg3_setup_phy(struct tg3 *, bool);
 
 static int tg3_power_down_prepare(struct tg3 *tp)
 {
@@ -3807,7 +3986,7 @@ static int tg3_power_down_prepare(struct tg3 *tp)
                         tp->phy_flags |= TG3_PHYFLG_IS_LOW_POWER;
 
                 if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES))
-                        tg3_setup_phy(tp, 0);
+                        tg3_setup_phy(tp, false);
         }
 
         if (tg3_asic_rev(tp) == ASIC_REV_5906) {
@@ -3848,7 +4027,13 @@ static int tg3_power_down_prepare(struct tg3 *tp)
 
                         if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
                                 mac_mode = MAC_MODE_PORT_MODE_GMII;
-                        else
+                        else if (tp->phy_flags &
+                                 TG3_PHYFLG_KEEP_LINK_ON_PWRDN) {
+                                if (tp->link_config.active_speed == SPEED_1000)
+                                        mac_mode = MAC_MODE_PORT_MODE_GMII;
+                                else
+                                        mac_mode = MAC_MODE_PORT_MODE_MII;
+                        } else
                                 mac_mode = MAC_MODE_PORT_MODE_MII;
 
                         mac_mode |= tp->mac_mode & MAC_MODE_LINK_POLARITY;
@@ -4102,12 +4287,16 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
             (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
                 u32 adv, fc;
 
-                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) {
+                if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) &&
+                    !(tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN)) {
                         adv = ADVERTISED_10baseT_Half |
                               ADVERTISED_10baseT_Full;
                         if (tg3_flag(tp, WOL_SPEED_100MB))
                                 adv |= ADVERTISED_100baseT_Half |
                                        ADVERTISED_100baseT_Full;
+                        if (tp->phy_flags & TG3_PHYFLG_1G_ON_VAUX_OK)
+                                adv |= ADVERTISED_1000baseT_Half |
+                                       ADVERTISED_1000baseT_Full;
 
                         fc = FLOW_CTRL_TX | FLOW_CTRL_RX;
                 } else {
@@ -4121,6 +4310,15 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
 
                 tg3_phy_autoneg_cfg(tp, adv, fc);
 
+                if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) &&
+                    (tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN)) {
+                        /* Normally during power down we want to autonegotiate
+                         * the lowest possible speed for WOL. However, to avoid
+                         * link flap, we leave it untouched.
+                         */
+                        return;
+                }
+
                 tg3_writephy(tp, MII_BMCR,
                              BMCR_ANENABLE | BMCR_ANRESTART);
         } else {
@@ -4177,6 +4375,103 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
         }
 }
 
+static int tg3_phy_pull_config(struct tg3 *tp)
+{
+        int err;
+        u32 val;
+
+        err = tg3_readphy(tp, MII_BMCR, &val);
+        if (err)
+                goto done;
+
+        if (!(val & BMCR_ANENABLE)) {
+                tp->link_config.autoneg = AUTONEG_DISABLE;
+                tp->link_config.advertising = 0;
+                tg3_flag_clear(tp, PAUSE_AUTONEG);
+
+                err = -EIO;
+
+                switch (val & (BMCR_SPEED1000 | BMCR_SPEED100)) {
+                case 0:
+                        if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
+                                goto done;
+
+                        tp->link_config.speed = SPEED_10;
+                        break;
+                case BMCR_SPEED100:
+                        if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
+                                goto done;
+
+                        tp->link_config.speed = SPEED_100;
+                        break;
+                case BMCR_SPEED1000:
+                        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) {
+                                tp->link_config.speed = SPEED_1000;
+                                break;
+                        }
+                        /* Fall through */
+                default:
+                        goto done;
+                }
+
+                if (val & BMCR_FULLDPLX)
+                        tp->link_config.duplex = DUPLEX_FULL;
+                else
+                        tp->link_config.duplex = DUPLEX_HALF;
+
+                tp->link_config.flowctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;
+
+                err = 0;
+                goto done;
+        }
+
+        tp->link_config.autoneg = AUTONEG_ENABLE;
+        tp->link_config.advertising = ADVERTISED_Autoneg;
+        tg3_flag_set(tp, PAUSE_AUTONEG);
+
+        if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES)) {
+                u32 adv;
+
+                err = tg3_readphy(tp, MII_ADVERTISE, &val);
+                if (err)
+                        goto done;
+
+                adv = mii_adv_to_ethtool_adv_t(val & ADVERTISE_ALL);
+                tp->link_config.advertising |= adv | ADVERTISED_TP;
+
+                tp->link_config.flowctrl = tg3_decode_flowctrl_1000T(val);
+        } else {
+                tp->link_config.advertising |= ADVERTISED_FIBRE;
+        }
+
+        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) {
+                u32 adv;
+
+                if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES)) {
+                        err = tg3_readphy(tp, MII_CTRL1000, &val);
+                        if (err)
+                                goto done;
+
+                        adv = mii_ctrl1000_to_ethtool_adv_t(val);
+                } else {
+                        err = tg3_readphy(tp, MII_ADVERTISE, &val);
+                        if (err)
+                                goto done;
+
+                        adv = tg3_decode_flowctrl_1000X(val);
+                        tp->link_config.flowctrl = adv;
+
+                        val &= (ADVERTISE_1000XHALF | ADVERTISE_1000XFULL);
+                        adv = mii_adv_to_ethtool_adv_x(val);
+                }
+
+                tp->link_config.advertising |= adv;
+        }
+
+done:
+        return err;
+}
+
 static int tg3_init_5401phy_dsp(struct tg3 *tp)
 {
         int err;
@@ -4196,6 +4491,32 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)
         return err;
 }
 
+static bool tg3_phy_eee_config_ok(struct tg3 *tp)
+{
+        u32 val;
+        u32 tgtadv = 0;
+        u32 advertising = tp->link_config.advertising;
+
+        if (!(tp->phy_flags & TG3_PHYFLG_EEE_CAP))
+                return true;
+
+        if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, &val))
+                return false;
+
+        val &= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
+
+
+        if (advertising & ADVERTISED_100baseT_Full)
+                tgtadv |= MDIO_AN_EEE_ADV_100TX;
+        if (advertising & ADVERTISED_1000baseT_Full)
+                tgtadv |= MDIO_AN_EEE_ADV_1000T;
+
+        if (val != tgtadv)
+                return false;
+
+        return true;
+}
+
 static bool tg3_phy_copper_an_config_ok(struct tg3 *tp, u32 *lcladv)
 {
         u32 advmsk, tgtadv, advertising;
@@ -4262,7 +4583,7 @@ static bool tg3_phy_copper_fetch_rmtadv(struct tg3 *tp, u32 *rmtadv)
         return true;
 }
 
-static bool tg3_test_and_report_link_chg(struct tg3 *tp, int curr_link_up)
+static bool tg3_test_and_report_link_chg(struct tg3 *tp, bool curr_link_up)
 {
         if (curr_link_up != tp->link_up) {
                 if (curr_link_up) {
@@ -4280,23 +4601,28 @@ static bool tg3_test_and_report_link_chg(struct tg3 *tp, int curr_link_up)
         return false;
 }
 
-static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
+static void tg3_clear_mac_status(struct tg3 *tp)
 {
-        int current_link_up;
+        tw32(MAC_EVENT, 0);
+
+        tw32_f(MAC_STATUS,
+               MAC_STATUS_SYNC_CHANGED |
+               MAC_STATUS_CFG_CHANGED |
+               MAC_STATUS_MI_COMPLETION |
+               MAC_STATUS_LNKSTATE_CHANGED);
+        udelay(40);
+}
+
+static int tg3_setup_copper_phy(struct tg3 *tp, bool force_reset)
+{
+        bool current_link_up;
         u32 bmsr, val;
         u32 lcl_adv, rmt_adv;
         u16 current_speed;
         u8 current_duplex;
         int i, err;
 
-        tw32(MAC_EVENT, 0);
-
-        tw32_f(MAC_STATUS,
-             (MAC_STATUS_SYNC_CHANGED |
-              MAC_STATUS_CFG_CHANGED |
-              MAC_STATUS_MI_COMPLETION |
-              MAC_STATUS_LNKSTATE_CHANGED));
-        udelay(40);
+        tg3_clear_mac_status(tp);
 
         if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
                 tw32_f(MAC_MI_MODE,
@@ -4316,7 +4642,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
                 tg3_readphy(tp, MII_BMSR, &bmsr);
                 if (!tg3_readphy(tp, MII_BMSR, &bmsr) &&
                     !(bmsr & BMSR_LSTATUS))
-                        force_reset = 1;
+                        force_reset = true;
         }
         if (force_reset)
                 tg3_phy_reset(tp);
@@ -4380,7 +4706,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
                         tg3_writephy(tp, MII_TG3_EXT_CTRL, 0);
         }
 
-        current_link_up = 0;
+        current_link_up = false;
         current_speed = SPEED_UNKNOWN;
         current_duplex = DUPLEX_UNKNOWN;
         tp->phy_flags &= ~TG3_PHYFLG_MDIX_STATE;
@@ -4439,21 +4765,31 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
                 tp->link_config.active_duplex = current_duplex;
 
                 if (tp->link_config.autoneg == AUTONEG_ENABLE) {
+                        bool eee_config_ok = tg3_phy_eee_config_ok(tp);
+
                         if ((bmcr & BMCR_ANENABLE) &&
+                            eee_config_ok &&
                             tg3_phy_copper_an_config_ok(tp, &lcl_adv) &&
                             tg3_phy_copper_fetch_rmtadv(tp, &rmt_adv))
-                                current_link_up = 1;
+                                current_link_up = true;
+
+                        /* EEE settings changes take effect only after a phy
+                         * reset.  If we have skipped a reset due to Link Flap
+                         * Avoidance being enabled, do it now.
+                         */
+                        if (!eee_config_ok &&
+                            (tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN) &&
+                            !force_reset)
+                                tg3_phy_reset(tp);
                 } else {
                         if (!(bmcr & BMCR_ANENABLE) &&
                             tp->link_config.speed == current_speed &&
-                            tp->link_config.duplex == current_duplex &&
-                            tp->link_config.flowctrl ==
-                            tp->link_config.active_flowctrl) {
-                                current_link_up = 1;
+                            tp->link_config.duplex == current_duplex) {
+                                current_link_up = true;
                         }
                 }
 
-                if (current_link_up == 1 &&
+                if (current_link_up &&
                     tp->link_config.active_duplex == DUPLEX_FULL) {
                         u32 reg, bit;
 
@@ -4473,11 +4809,11 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
         }
 
 relink:
-        if (current_link_up == 0 || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
+        if (!current_link_up || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
                 tg3_phy_copper_begin(tp);
 
                 if (tg3_flag(tp, ROBOSWITCH)) {
-                        current_link_up = 1;
+                        current_link_up = true;
                         /* FIXME: when BCM5325 switch is used use 100 MBit/s */
                         current_speed = SPEED_1000;
                         current_duplex = DUPLEX_FULL;
@@ -4488,11 +4824,11 @@ relink:
                 tg3_readphy(tp, MII_BMSR, &bmsr);
                 if ((!tg3_readphy(tp, MII_BMSR, &bmsr) && (bmsr & BMSR_LSTATUS)) ||
                     (tp->mac_mode & MAC_MODE_PORT_INT_LPBACK))
-                        current_link_up = 1;
+                        current_link_up = true;
         }
 
         tp->mac_mode &= ~MAC_MODE_PORT_MODE_MASK;
-        if (current_link_up == 1) {
+        if (current_link_up) {
                 if (tp->link_config.active_speed == SPEED_100 ||
                     tp->link_config.active_speed == SPEED_10)
                         tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
@@ -4528,7 +4864,7 @@ relink:
                 tp->mac_mode |= MAC_MODE_HALF_DUPLEX;
 
         if (tg3_asic_rev(tp) == ASIC_REV_5700) {
-                if (current_link_up == 1 &&
+                if (current_link_up &&
                     tg3_5700_link_polarity(tp, tp->link_config.active_speed))
                         tp->mac_mode |= MAC_MODE_LINK_POLARITY;
                 else
@@ -4559,7 +4895,7 @@ relink:
         udelay(40);
 
         if (tg3_asic_rev(tp) == ASIC_REV_5700 &&
-            current_link_up == 1 &&
+            current_link_up &&
             tp->link_config.active_speed == SPEED_1000 &&
             (tg3_flag(tp, PCIX_MODE) || tg3_flag(tp, PCI_HIGH_SPEED))) {
                 udelay(120);
@@ -4999,19 +5335,19 @@ static void tg3_init_bcm8002(struct tg3 *tp)
         tg3_writephy(tp, 0x10, 0x8011);
 }
 
-static int tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
+static bool tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
 {
         u16 flowctrl;
+        bool current_link_up;
         u32 sg_dig_ctrl, sg_dig_status;
         u32 serdes_cfg, expected_sg_dig_ctrl;
         int workaround, port_a;
-        int current_link_up;
 
         serdes_cfg = 0;
         expected_sg_dig_ctrl = 0;
         workaround = 0;
         port_a = 1;
-        current_link_up = 0;
+        current_link_up = false;
 
         if (tg3_chip_rev_id(tp) != CHIPREV_ID_5704_A0 &&
             tg3_chip_rev_id(tp) != CHIPREV_ID_5704_A1) {
@@ -5042,7 +5378,7 @@ static int tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
                 }
                 if (mac_status & MAC_STATUS_PCS_SYNCED) {
                         tg3_setup_flow_control(tp, 0, 0);
-                        current_link_up = 1;
+                        current_link_up = true;
                 }
                 goto out;
         }
@@ -5063,7 +5399,7 @@ static int tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
                                     MAC_STATUS_RCVD_CFG)) ==
                      MAC_STATUS_PCS_SYNCED)) {
                         tp->serdes_counter--;
-                        current_link_up = 1;
+                        current_link_up = true;
                         goto out;
                 }
 restart_autoneg:
@@ -5098,7 +5434,7 @@ restart_autoneg:
                                            mii_adv_to_ethtool_adv_x(remote_adv);
 
                         tg3_setup_flow_control(tp, local_adv, remote_adv);
-                        current_link_up = 1;
+                        current_link_up = true;
                         tp->serdes_counter = 0;
                         tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
                 } else if (!(sg_dig_status & SG_DIG_AUTONEG_COMPLETE)) {
@@ -5126,7 +5462,7 @@ restart_autoneg:
                                 if ((mac_status & MAC_STATUS_PCS_SYNCED) &&
                                     !(mac_status & MAC_STATUS_RCVD_CFG)) {
                                         tg3_setup_flow_control(tp, 0, 0);
-                                        current_link_up = 1;
+                                        current_link_up = true;
                                         tp->phy_flags |=
                                                 TG3_PHYFLG_PARALLEL_DETECT;
                                         tp->serdes_counter =
@@ -5144,9 +5480,9 @@ out:
         return current_link_up;
 }
 
-static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
+static bool tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
 {
-        int current_link_up = 0;
+        bool current_link_up = false;
 
         if (!(mac_status & MAC_STATUS_PCS_SYNCED))
                 goto out;
@@ -5173,7 +5509,7 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
 
                         tg3_setup_flow_control(tp, local_adv, remote_adv);
 
-                        current_link_up = 1;
+                        current_link_up = true;
                 }
                 for (i = 0; i < 30; i++) {
                         udelay(20);
@@ -5188,15 +5524,15 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
                 }
 
                 mac_status = tr32(MAC_STATUS);
-                if (current_link_up == 0 &&
+                if (!current_link_up &&
                     (mac_status & MAC_STATUS_PCS_SYNCED) &&
                     !(mac_status & MAC_STATUS_RCVD_CFG))
-                        current_link_up = 1;
+                        current_link_up = true;
         } else {
                 tg3_setup_flow_control(tp, 0, 0);
 
                 /* Forcing 1000FD link up. */
-                current_link_up = 1;
+                current_link_up = true;
 
                 tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS));
                 udelay(40);
@@ -5209,13 +5545,13 @@ out:
         return current_link_up;
 }
 
-static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
+static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset)
 {
         u32 orig_pause_cfg;
         u16 orig_active_speed;
         u8 orig_active_duplex;
         u32 mac_status;
-        int current_link_up;
+        bool current_link_up;
         int i;
 
         orig_pause_cfg = tp->link_config.active_flowctrl;
@@ -5252,7 +5588,7 @@ static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
         tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);
         udelay(40);
 
-        current_link_up = 0;
+        current_link_up = false;
         tp->link_config.rmt_adv = 0;
         mac_status = tr32(MAC_STATUS);
 
@@ -5277,7 +5613,7 @@ static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
 
         mac_status = tr32(MAC_STATUS);
         if ((mac_status & MAC_STATUS_PCS_SYNCED) == 0) {
-                current_link_up = 0;
+                current_link_up = false;
                 if (tp->link_config.autoneg == AUTONEG_ENABLE &&
                     tp->serdes_counter == 0) {
                         tw32_f(MAC_MODE, (tp->mac_mode |
@@ -5287,7 +5623,7 @@ static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
                 }
         }
 
-        if (current_link_up == 1) {
+        if (current_link_up) {
                 tp->link_config.active_speed = SPEED_1000;
                 tp->link_config.active_duplex = DUPLEX_FULL;
                 tw32(MAC_LED_CTRL, (tp->led_ctrl |
@@ -5312,33 +5648,63 @@ static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
         return 0;
 }
 
-static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
+static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset)
 {
-        int current_link_up, err = 0;
+        int err = 0;
         u32 bmsr, bmcr;
-        u16 current_speed;
-        u8 current_duplex;
-        u32 local_adv, remote_adv;
+        u16 current_speed = SPEED_UNKNOWN;
+        u8 current_duplex = DUPLEX_UNKNOWN;
+        bool current_link_up = false;
+        u32 local_adv, remote_adv, sgsr;
+
+        if ((tg3_asic_rev(tp) == ASIC_REV_5719 ||
+             tg3_asic_rev(tp) == ASIC_REV_5720) &&
+             !tg3_readphy(tp, SERDES_TG3_1000X_STATUS, &sgsr) &&
+             (sgsr & SERDES_TG3_SGMII_MODE)) {
+
+                if (force_reset)
+                        tg3_phy_reset(tp);
+
+                tp->mac_mode &= ~MAC_MODE_PORT_MODE_MASK;
+
+                if (!(sgsr & SERDES_TG3_LINK_UP)) {
+                        tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
+                } else {
+                        current_link_up = true;
+                        if (sgsr & SERDES_TG3_SPEED_1000) {
+                                current_speed = SPEED_1000;
+                                tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
+                        } else if (sgsr & SERDES_TG3_SPEED_100) {
+                                current_speed = SPEED_100;
+                                tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
+                        } else {
+                                current_speed = SPEED_10;
+                                tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
+                        }
+
+                        if (sgsr & SERDES_TG3_FULL_DUPLEX)
+                                current_duplex = DUPLEX_FULL;
+                        else
+                                current_duplex = DUPLEX_HALF;
+                }
+
+                tw32_f(MAC_MODE, tp->mac_mode);
+                udelay(40);
+
+                tg3_clear_mac_status(tp);
+
+                goto fiber_setup_done;
+        }
 
         tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
         tw32_f(MAC_MODE, tp->mac_mode);
         udelay(40);
 
-        tw32(MAC_EVENT, 0);
-
-        tw32_f(MAC_STATUS,
-             (MAC_STATUS_SYNC_CHANGED |
-              MAC_STATUS_CFG_CHANGED |
-              MAC_STATUS_MI_COMPLETION |
-              MAC_STATUS_LNKSTATE_CHANGED));
-        udelay(40);
+        tg3_clear_mac_status(tp);
 
         if (force_reset)
                 tg3_phy_reset(tp);
 
-        current_link_up = 0;
-        current_speed = SPEED_UNKNOWN;
-        current_duplex = DUPLEX_UNKNOWN;
         tp->link_config.rmt_adv = 0;
 
         err |= tg3_readphy(tp, MII_BMSR, &bmsr);
@@ -5424,7 +5790,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
 
         if (bmsr & BMSR_LSTATUS) {
                 current_speed = SPEED_1000;
-                current_link_up = 1;
+                current_link_up = true;
                 if (bmcr & BMCR_FULLDPLX)
                         current_duplex = DUPLEX_FULL;
                 else
@@ -5451,12 +5817,13 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
                         } else if (!tg3_flag(tp, 5780_CLASS)) {
                                 /* Link is up via parallel detect */
                         } else {
-                                current_link_up = 0;
+                                current_link_up = false;
                         }
                 }
         }
 
-        if (current_link_up == 1 && current_duplex == DUPLEX_FULL)
+fiber_setup_done:
+        if (current_link_up && current_duplex == DUPLEX_FULL)
                 tg3_setup_flow_control(tp, local_adv, remote_adv);
 
         tp->mac_mode &= ~MAC_MODE_HALF_DUPLEX;
@@ -5535,7 +5902,7 @@ static void tg3_serdes_parallel_detect(struct tg3 *tp)
         }
 }
 
-static int tg3_setup_phy(struct tg3 *tp, int force_reset)
+static int tg3_setup_phy(struct tg3 *tp, bool force_reset)
 {
         u32 val;
         int err;
@@ -5625,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)
 
         info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
                                 SOF_TIMESTAMPING_RX_SOFTWARE |
-                                SOF_TIMESTAMPING_SOFTWARE    |
-                                SOF_TIMESTAMPING_TX_HARDWARE |
-                                SOF_TIMESTAMPING_RX_HARDWARE |
-                                SOF_TIMESTAMPING_RAW_HARDWARE;
+                                SOF_TIMESTAMPING_SOFTWARE;
+
+        if (tg3_flag(tp, PTP_CAPABLE)) {
+                info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE |
+                                        SOF_TIMESTAMPING_RX_HARDWARE |
+                                        SOF_TIMESTAMPING_RAW_HARDWARE;
+        }
 
         if (tp->ptp_clock)
                 info->phc_index = ptp_clock_index(tp->ptp_clock);
@@ -6348,7 +6718,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
 
                 if (desc->type_flags & RXD_FLAG_VLAN &&
                     !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG))
-                        __vlan_hwaccel_put_tag(skb,
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
                                                desc->err_vlan & RXD_VLAN_MASK);
 
                 napi_gro_receive(&tnapi->napi, skb);
@@ -6436,7 +6806,7 @@ static void tg3_poll_link(struct tg3 *tp)
                                       MAC_STATUS_LNKSTATE_CHANGED));
                                 udelay(40);
                         } else
-                                tg3_setup_phy(tp, 0);
+                                tg3_setup_phy(tp, false);
                         spin_unlock(&tp->lock);
                 }
         }
@@ -7533,7 +7903,7 @@ static int tg3_phy_lpbk_set(struct tg3 *tp, u32 speed, bool extlpbk)
         u32 val, bmcr, mac_mode, ptest = 0;
 
         tg3_phy_toggle_apd(tp, false);
-        tg3_phy_toggle_automdix(tp, 0);
+        tg3_phy_toggle_automdix(tp, false);
 
         if (extlpbk && tg3_phy_set_extloopbk(tp))
                 return -EIO;
@@ -7641,7 +8011,7 @@ static void tg3_set_loopback(struct net_device *dev, netdev_features_t features)
                 spin_lock_bh(&tp->lock);
                 tg3_mac_loopback(tp, false);
                 /* Force link status check */
-                tg3_setup_phy(tp, 1);
+                tg3_setup_phy(tp, true);
                 spin_unlock_bh(&tp->lock);
                 netdev_info(dev, "Internal MAC loopback mode disabled.\n");
         }
@@ -8039,11 +8409,9 @@ static int tg3_mem_rx_acquire(struct tg3 *tp)
                 tnapi->rx_rcb = dma_alloc_coherent(&tp->pdev->dev,
                                                    TG3_RX_RCB_RING_BYTES(tp),
                                                    &tnapi->rx_rcb_mapping,
-                                                   GFP_KERNEL);
+                                                   GFP_KERNEL | __GFP_ZERO);
                 if (!tnapi->rx_rcb)
                         goto err_out;
-
-                memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
         }
 
         return 0;
@@ -8093,12 +8461,10 @@ static int tg3_alloc_consistent(struct tg3 *tp)
         tp->hw_stats = dma_alloc_coherent(&tp->pdev->dev,
                                           sizeof(struct tg3_hw_stats),
                                           &tp->stats_mapping,
-                                          GFP_KERNEL);
+                                          GFP_KERNEL | __GFP_ZERO);
         if (!tp->hw_stats)
                 goto err_out;
 
-        memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
-
         for (i = 0; i < tp->irq_cnt; i++) {
                 struct tg3_napi *tnapi = &tp->napi[i];
                 struct tg3_hw_status *sblk;
@@ -8106,11 +8472,10 @@ static int tg3_alloc_consistent(struct tg3 *tp)
                 tnapi->hw_status = dma_alloc_coherent(&tp->pdev->dev,
                                                       TG3_HW_STATUS_SIZE,
                                                       &tnapi->status_mapping,
-                                                      GFP_KERNEL);
+                                                      GFP_KERNEL | __GFP_ZERO);
                 if (!tnapi->hw_status)
                         goto err_out;
 
-                memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE);
                 sblk = tnapi->hw_status;
 
                 if (tg3_flag(tp, ENABLE_RSS)) {
@@ -8157,7 +8522,7 @@ err_out:
 /* To stop a block, clear the enable bit and poll till it
  * clears.  tp->lock is held.
  */
-static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int silent)
+static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, bool silent)
 {
         unsigned int i;
         u32 val;
@@ -8201,7 +8566,7 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int
 }
 
 /* tp->lock is held. */
-static int tg3_abort_hw(struct tg3 *tp, int silent)
+static int tg3_abort_hw(struct tg3 *tp, bool silent)
 {
         int i, err;
 
@@ -8561,6 +8926,9 @@ static int tg3_chip_reset(struct tg3 *tp)
 
         /* Reprobe ASF enable state.  */
         tg3_flag_clear(tp, ENABLE_ASF);
+        tp->phy_flags &= ~(TG3_PHYFLG_1G_ON_VAUX_OK |
+                           TG3_PHYFLG_KEEP_LINK_ON_PWRDN);
+
         tg3_flag_clear(tp, ASF_NEW_HANDSHAKE);
         tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
         if (val == NIC_SRAM_DATA_SIG_MAGIC) {
@@ -8572,6 +8940,12 @@ static int tg3_chip_reset(struct tg3 *tp)
                         tp->last_event_jiffies = jiffies;
                         if (tg3_flag(tp, 5750_PLUS))
                                 tg3_flag_set(tp, ASF_NEW_HANDSHAKE);
+
+                        tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &nic_cfg);
+                        if (nic_cfg & NIC_SRAM_1G_ON_VAUX_OK)
+                                tp->phy_flags |= TG3_PHYFLG_1G_ON_VAUX_OK;
+                        if (nic_cfg & NIC_SRAM_LNK_FLAP_AVOID)
+                                tp->phy_flags |= TG3_PHYFLG_KEEP_LINK_ON_PWRDN;
                 }
         }
 
@@ -8582,7 +8956,7 @@ static void tg3_get_nstats(struct tg3 *, struct rtnl_link_stats64 *);
 static void tg3_get_estats(struct tg3 *, struct tg3_ethtool_stats *);
 
 /* tp->lock is held. */
-static int tg3_halt(struct tg3 *tp, int kind, int silent)
+static int tg3_halt(struct tg3 *tp, int kind, bool silent)
 {
         int err;
 
@@ -8593,7 +8967,7 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
         tg3_abort_hw(tp, silent);
         err = tg3_chip_reset(tp);
 
-        __tg3_set_mac_addr(tp, 0);
+        __tg3_set_mac_addr(tp, false);
 
         tg3_write_sig_legacy(tp, kind);
         tg3_write_sig_post_reset(tp, kind);
@@ -8617,7 +8991,8 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
 {
         struct tg3 *tp = netdev_priv(dev);
         struct sockaddr *addr = p;
-        int err = 0, skip_mac_1 = 0;
+        int err = 0;
+        bool skip_mac_1 = false;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
@@ -8638,7 +9013,7 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
                 /* Skip MAC addr 1 if ASF is using it. */
                 if ((addr0_high != addr1_high || addr0_low != addr1_low) &&
                     !(addr1_high == 0 && addr1_low == 0))
-                        skip_mac_1 = 1;
+                        skip_mac_1 = true;
         }
         spin_lock_bh(&tp->lock);
         __tg3_set_mac_addr(tp, skip_mac_1);
@@ -9057,7 +9432,7 @@ static void tg3_rss_write_indir_tbl(struct tg3 *tp)
 }
 
 /* tp->lock is held. */
-static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
+static int tg3_reset_hw(struct tg3 *tp, bool reset_phy)
 {
         u32 val, rdmac_mode;
         int i, err, limit;
@@ -9106,6 +9481,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                        TG3_CPMU_DBTMR2_TXIDXEQ_2047US);
         }
 
+        if ((tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN) &&
+            !(tp->phy_flags & TG3_PHYFLG_USER_CONFIGURED)) {
+                tg3_phy_pull_config(tp);
+                tp->phy_flags |= TG3_PHYFLG_USER_CONFIGURED;
+        }
+
         if (reset_phy)
                 tg3_phy_reset(tp);
 
@@ -9444,7 +9825,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tg3_rings_reset(tp);
 
         /* Initialize MAC address and backoff seed. */
-        __tg3_set_mac_addr(tp, 0);
+        __tg3_set_mac_addr(tp, false);
 
         /* MTU + ethernet header + FCS + optional VLAN tag */
         tw32(MAC_RX_MTU_SIZE,
@@ -9781,6 +10162,13 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                         return err;
         }
 
+        if (tg3_asic_rev(tp) == ASIC_REV_57766) {
+                /* Ignore any errors for the firmware download. If download
+                 * fails, the device will operate with EEE disabled
+                 */
+                tg3_load_57766_firmware(tp);
+        }
+
         if (tg3_flag(tp, TSO_CAPABLE)) {
                 err = tg3_load_tso_firmware(tp);
                 if (err)
@@ -9888,7 +10276,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                         tp->phy_flags &= ~TG3_PHYFLG_IS_LOW_POWER;
 
-                err = tg3_setup_phy(tp, 0);
+                err = tg3_setup_phy(tp, false);
                 if (err)
                         return err;
 
@@ -9968,7 +10356,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 /* Called at device open time to get the chip ready for
  * packet processing.  Invoked with tp->lock held.
  */
-static int tg3_init_hw(struct tg3 *tp, int reset_phy)
+static int tg3_init_hw(struct tg3 *tp, bool reset_phy)
 {
         tg3_switch_clocks(tp);
 
@@ -10229,7 +10617,7 @@ static void tg3_timer(unsigned long __opaque)
                                 phy_event = 1;
 
                         if (phy_event)
-                                tg3_setup_phy(tp, 0);
+                                tg3_setup_phy(tp, false);
                 } else if (tg3_flag(tp, POLL_SERDES)) {
                         u32 mac_stat = tr32(MAC_STATUS);
                         int need_setup = 0;
@@ -10252,7 +10640,7 @@ static void tg3_timer(unsigned long __opaque)
                                         tw32_f(MAC_MODE, tp->mac_mode);
                                         udelay(40);
                                 }
-                                tg3_setup_phy(tp, 0);
+                                tg3_setup_phy(tp, false);
                         }
                 } else if ((tp->phy_flags & TG3_PHYFLG_MII_SERDES) &&
                            tg3_flag(tp, 5780_CLASS)) {
@@ -10338,7 +10726,7 @@ static void tg3_timer_stop(struct tg3 *tp)
 /* Restart hardware after configuration changes, self-test, etc.
  * Invoked with tp->lock held.
  */
-static int tg3_restart_hw(struct tg3 *tp, int reset_phy)
+static int tg3_restart_hw(struct tg3 *tp, bool reset_phy)
         __releases(tp->lock)
         __acquires(tp->lock)
 {
@@ -10388,7 +10776,7 @@ static void tg3_reset_task(struct work_struct *work)
         }
 
         tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);
-        err = tg3_init_hw(tp, 1);
+        err = tg3_init_hw(tp, true);
         if (err)
                 goto out;
 
@@ -10558,7 +10946,7 @@ static int tg3_test_msi(struct tg3 *tp)
         tg3_full_lock(tp, 1);
 
         tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-        err = tg3_init_hw(tp, 1);
+        err = tg3_init_hw(tp, true);
 
         tg3_full_unlock(tp);
 
@@ -10570,7 +10958,7 @@ static int tg3_test_msi(struct tg3 *tp)
 
 static int tg3_request_firmware(struct tg3 *tp)
 {
-        const __be32 *fw_data;
+        const struct tg3_firmware_hdr *fw_hdr;
 
         if (request_firmware(&tp->fw, tp->fw_needed, &tp->pdev->dev)) {
                 netdev_err(tp->dev, "Failed to load firmware \"%s\"\n",
@@ -10578,15 +10966,15 @@ static int tg3_request_firmware(struct tg3 *tp)
                 return -ENOENT;
         }
 
-        fw_data = (void *)tp->fw->data;
+        fw_hdr = (struct tg3_firmware_hdr *)tp->fw->data;
 
         /* Firmware blob starts with version numbers, followed by
          * start address and _full_ length including BSS sections
          * (which must be longer than the actual data, of course
          */
 
-        tp->fw_len = be32_to_cpu(fw_data[2]);   /* includes bss */
-        if (tp->fw_len < (tp->fw->size - 12)) {
+        tp->fw_len = be32_to_cpu(fw_hdr->len);  /* includes bss */
+        if (tp->fw_len < (tp->fw->size - TG3_FW_HDR_LEN)) {
                 netdev_err(tp->dev, "bogus length %d in \"%s\"\n",
                            tp->fw_len, tp->fw_needed);
                 release_firmware(tp->fw);
@@ -10885,7 +11273,15 @@ static int tg3_open(struct net_device *dev)
 
         if (tp->fw_needed) {
                 err = tg3_request_firmware(tp);
-                if (tg3_chip_rev_id(tp) == CHIPREV_ID_5701_A0) {
+                if (tg3_asic_rev(tp) == ASIC_REV_57766) {
+                        if (err) {
+                                netdev_warn(tp->dev, "EEE capability disabled\n");
+                                tp->phy_flags &= ~TG3_PHYFLG_EEE_CAP;
+                        } else if (!(tp->phy_flags & TG3_PHYFLG_EEE_CAP)) {
+                                netdev_warn(tp->dev, "EEE capability restored\n");
+                                tp->phy_flags |= TG3_PHYFLG_EEE_CAP;
+                        }
+                } else if (tg3_chip_rev_id(tp) == CHIPREV_ID_5701_A0) {
                         if (err)
                                 return err;
                 } else if (err) {
@@ -10910,7 +11306,9 @@ static int tg3_open(struct net_device *dev)
 
         tg3_full_unlock(tp);
 
-        err = tg3_start(tp, true, true, true);
+        err = tg3_start(tp,
+                        !(tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN),
+                        true, true);
         if (err) {
                 tg3_frob_aux_power(tp, false);
                 pci_set_power_state(tp->pdev, PCI_D3hot);
@@ -11416,8 +11814,12 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 tp->link_config.duplex = cmd->duplex;
         }
 
+        tp->phy_flags |= TG3_PHYFLG_USER_CONFIGURED;
+
+        tg3_warn_mgmt_link_flap(tp);
+
         if (netif_running(dev))
-                tg3_setup_phy(tp, 1);
+                tg3_setup_phy(tp, true);
 
         tg3_full_unlock(tp);
 
@@ -11494,6 +11896,8 @@ static int tg3_nway_reset(struct net_device *dev)
         if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                 return -EINVAL;
 
+        tg3_warn_mgmt_link_flap(tp);
+
         if (tg3_flag(tp, USE_PHYLIB)) {
                 if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
@@ -11571,7 +11975,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
 
         if (netif_running(dev)) {
                 tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-                err = tg3_restart_hw(tp, 1);
+                err = tg3_restart_hw(tp, false);
                 if (!err)
                         tg3_netif_start(tp);
         }
@@ -11606,6 +12010,9 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
         struct tg3 *tp = netdev_priv(dev);
         int err = 0;
 
+        if (tp->link_config.autoneg == AUTONEG_ENABLE)
+                tg3_warn_mgmt_link_flap(tp);
+
         if (tg3_flag(tp, USE_PHYLIB)) {
                 u32 newadv;
                 struct phy_device *phydev;
@@ -11692,7 +12099,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
 
                 if (netif_running(dev)) {
                         tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-                        err = tg3_restart_hw(tp, 1);
+                        err = tg3_restart_hw(tp, false);
                         if (!err)
                                 tg3_netif_start(tp);
                 }
@@ -11700,6 +12107,8 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
                 tg3_full_unlock(tp);
         }
 
+        tp->phy_flags |= TG3_PHYFLG_USER_CONFIGURED;
+
         return err;
 }
 
@@ -12760,7 +13169,7 @@ static int tg3_test_loopback(struct tg3 *tp, u64 *data, bool do_extlpbk)
                 goto done;
         }
 
-        err = tg3_reset_hw(tp, 1);
+        err = tg3_reset_hw(tp, true);
         if (err) {
                 data[TG3_MAC_LOOPB_TEST] = TG3_LOOPBACK_FAILED;
                 data[TG3_PHY_LOOPB_TEST] = TG3_LOOPBACK_FAILED;
@@ -12927,7 +13336,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                 tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
                 if (netif_running(dev)) {
                         tg3_flag_set(tp, INIT_COMPLETE);
-                        err2 = tg3_restart_hw(tp, 1);
+                        err2 = tg3_restart_hw(tp, true);
                         if (!err2)
                                 tg3_netif_start(tp);
                 }
@@ -13244,7 +13653,8 @@ static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,
 static int tg3_change_mtu(struct net_device *dev, int new_mtu)
 {
         struct tg3 *tp = netdev_priv(dev);
-        int err, reset_phy = 0;
+        int err;
+        bool reset_phy = false;
 
         if (new_mtu < TG3_MIN_MTU || new_mtu > TG3_MAX_MTU(tp))
                 return -EINVAL;
@@ -13271,7 +13681,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
          * breaks all requests to 256 bytes.
          */
         if (tg3_asic_rev(tp) == ASIC_REV_57766)
-                reset_phy = 1;
+                reset_phy = true;
 
         err = tg3_restart_hw(tp, reset_phy);
 
@@ -13837,6 +14247,12 @@ static void tg3_get_5720_nvram_info(struct tg3 *tp)
                 case FLASH_5762_EEPROM_LD:
                         nvmpinstrp = FLASH_5720_EEPROM_LD;
                         break;
+                case FLASH_5720VENDOR_M_ST_M45PE20:
+                        /* This pinstrap supports multiple sizes, so force it
+                         * to read the actual size from location 0xf0.
+                         */
+                        nvmpinstrp = FLASH_5720VENDOR_ST_45USPT;
+                        break;
                 }
         }
 
@@ -14289,14 +14705,18 @@ static void tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                     (cfg2 & NIC_SRAM_DATA_CFG_2_APD_EN))
                         tp->phy_flags |= TG3_PHYFLG_ENABLE_APD;
 
-                if (tg3_flag(tp, PCI_EXPRESS) &&
-                    tg3_asic_rev(tp) != ASIC_REV_5785 &&
-                    !tg3_flag(tp, 57765_PLUS)) {
+                if (tg3_flag(tp, PCI_EXPRESS)) {
                         u32 cfg3;
 
                         tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &cfg3);
-                        if (cfg3 & NIC_SRAM_ASPM_DEBOUNCE)
+                        if (tg3_asic_rev(tp) != ASIC_REV_5785 &&
+                            !tg3_flag(tp, 57765_PLUS) &&
+                            (cfg3 & NIC_SRAM_ASPM_DEBOUNCE))
                                 tg3_flag_set(tp, ASPM_WORKAROUND);
+                        if (cfg3 & NIC_SRAM_LNK_FLAP_AVOID)
+                                tp->phy_flags |= TG3_PHYFLG_KEEP_LINK_ON_PWRDN;
+                        if (cfg3 & NIC_SRAM_1G_ON_VAUX_OK)
+                                tp->phy_flags |= TG3_PHYFLG_1G_ON_VAUX_OK;
                 }
 
                 if (cfg4 & NIC_SRAM_RGMII_INBAND_DISABLE)
@@ -14450,6 +14870,12 @@ static int tg3_phy_probe(struct tg3 *tp)
                 }
         }
 
+        if (!tg3_flag(tp, ENABLE_ASF) &&
+            !(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) &&
+            !(tp->phy_flags & TG3_PHYFLG_10_100_ONLY))
+                tp->phy_flags &= ~(TG3_PHYFLG_1G_ON_VAUX_OK |
+                                   TG3_PHYFLG_KEEP_LINK_ON_PWRDN);
+
         if (tg3_flag(tp, USE_PHYLIB))
                 return tg3_phy_init(tp);
 
@@ -14515,6 +14941,7 @@ static int tg3_phy_probe(struct tg3 *tp)
         if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) &&
             (tg3_asic_rev(tp) == ASIC_REV_5719 ||
              tg3_asic_rev(tp) == ASIC_REV_5720 ||
+             tg3_asic_rev(tp) == ASIC_REV_57766 ||
              tg3_asic_rev(tp) == ASIC_REV_5762 ||
              (tg3_asic_rev(tp) == ASIC_REV_5717 &&
               tg3_chip_rev_id(tp) != CHIPREV_ID_5717_A0) ||
@@ -14524,7 +14951,8 @@ static int tg3_phy_probe(struct tg3 *tp)
 
         tg3_phy_init_link_config(tp);
 
-        if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) &&
+        if (!(tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN) &&
+            !(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) &&
             !tg3_flag(tp, ENABLE_APE) &&
             !tg3_flag(tp, ENABLE_ASF)) {
                 u32 bmsr, dummy;
@@ -15300,7 +15728,8 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
         } else if (tg3_asic_rev(tp) != ASIC_REV_5700 &&
                    tg3_asic_rev(tp) != ASIC_REV_5701 &&
                    tg3_chip_rev_id(tp) != CHIPREV_ID_5705_A0) {
-                        tg3_flag_set(tp, TSO_BUG);
+                tg3_flag_set(tp, FW_TSO);
+                tg3_flag_set(tp, TSO_BUG);
                 if (tg3_asic_rev(tp) == ASIC_REV_5705)
                         tp->fw_needed = FIRMWARE_TG3TSO5;
                 else
@@ -15311,7 +15740,7 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
         if (tg3_flag(tp, HW_TSO_1) ||
             tg3_flag(tp, HW_TSO_2) ||
             tg3_flag(tp, HW_TSO_3) ||
-            tp->fw_needed) {
+            tg3_flag(tp, FW_TSO)) {
                 /* For firmware TSO, assume ASF is disabled.
                  * We'll disable TSO later if we discover ASF
                  * is enabled in tg3_get_eeprom_hw_cfg().
@@ -15326,6 +15755,9 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
         if (tg3_chip_rev_id(tp) == CHIPREV_ID_5701_A0)
                 tp->fw_needed = FIRMWARE_TG3;
 
+        if (tg3_asic_rev(tp) == ASIC_REV_57766)
+                tp->fw_needed = FIRMWARE_TG357766;
+
         tp->irq_max = 1;
 
         if (tg3_flag(tp, 5750_PLUS)) {
@@ -15598,7 +16030,7 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
          */
         tg3_get_eeprom_hw_cfg(tp);
 
-        if (tp->fw_needed && tg3_flag(tp, ENABLE_ASF)) {
+        if (tg3_flag(tp, FW_TSO) && tg3_flag(tp, ENABLE_ASF)) {
                 tg3_flag_clear(tp, TSO_CAPABLE);
                 tg3_flag_clear(tp, TSO_BUG);
                 tp->fw_needed = NULL;
@@ -15786,6 +16218,11 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
         udelay(50);
         tg3_nvram_init(tp);
 
+        /* If the device has an NVRAM, no need to load patch firmware */
+        if (tg3_asic_rev(tp) == ASIC_REV_57766 &&
+            !tg3_flag(tp, NO_NVRAM))
+                tp->fw_needed = NULL;
+
         grc_misc_cfg = tr32(GRC_MISC_CFG);
         grc_misc_cfg &= GRC_MISC_CFG_BOARD_ID_MASK;
 
@@ -16144,7 +16581,7 @@ out:
 }
 
 static int tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dma,
-                           int size, int to_device)
+                           int size, bool to_device)
 {
         struct tg3_internal_buffer_desc test_desc;
         u32 sram_dma_descs;
@@ -16344,7 +16781,7 @@ static int tg3_test_dma(struct tg3 *tp)
                         p[i] = i;
 
                 /* Send the buffer to the chip. */
-                ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, 1);
+                ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, true);
                 if (ret) {
                         dev_err(&tp->pdev->dev,
                                 "%s: Buffer write failed. err = %d\n",
@@ -16367,7 +16804,7 @@ static int tg3_test_dma(struct tg3 *tp)
                 }
 #endif
                 /* Now read it back. */
-                ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, 0);
+                ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, false);
                 if (ret) {
                         dev_err(&tp->pdev->dev, "%s: Buffer read failed. "
                                 "err = %d\n", __func__, ret);
@@ -16763,7 +17200,7 @@ static int tg3_init_one(struct pci_dev *pdev,
 
         tg3_init_bufmgr_config(tp);
 
-        features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
 
         /* 5700 B0 chips do not support checksumming correctly due
          * to hardware bugs.
@@ -17048,7 +17485,7 @@ static int tg3_suspend(struct device *device)
                 tg3_full_lock(tp, 0);
 
                 tg3_flag_set(tp, INIT_COMPLETE);
-                err2 = tg3_restart_hw(tp, 1);
+                err2 = tg3_restart_hw(tp, true);
                 if (err2)
                         goto out;
 
@@ -17082,7 +17519,8 @@ static int tg3_resume(struct device *device)
         tg3_full_lock(tp, 0);
 
         tg3_flag_set(tp, INIT_COMPLETE);
-        err = tg3_restart_hw(tp, 1);
+        err = tg3_restart_hw(tp,
+                             !(tp->phy_flags & TG3_PHYFLG_KEEP_LINK_ON_PWRDN));
         if (err)
                 goto out;
 
@@ -17098,15 +17536,9 @@ out:
 
         return err;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume);
-#define TG3_PM_OPS (&tg3_pm_ops)
-
-#else
-
-#define TG3_PM_OPS NULL
-
-#endif /* CONFIG_PM_SLEEP */
 
 /**
  * tg3_io_error_detected - called when PCI error is detected
@@ -17221,7 +17653,7 @@ static void tg3_io_resume(struct pci_dev *pdev)
 
         tg3_full_lock(tp, 0);
         tg3_flag_set(tp, INIT_COMPLETE);
-        err = tg3_restart_hw(tp, 1);
+        err = tg3_restart_hw(tp, true);
         if (err) {
                 tg3_full_unlock(tp);
                 netdev_err(netdev, "Cannot restart hardware after reset.\n");
@@ -17254,7 +17686,7 @@ static struct pci_driver tg3_driver = {
         .probe          = tg3_init_one,
         .remove         = tg3_remove_one,
         .err_handler    = &tg3_err_handler,
-        .driver.pm      = TG3_PM_OPS,
+        .driver.pm      = &tg3_pm_ops,
 };
 
 static int __init tg3_init(void)
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 8d7d4c2ab5d6..9b2d3ac2474a 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -2198,6 +2198,8 @@
 
 #define NIC_SRAM_DATA_CFG_3             0x00000d3c
 #define  NIC_SRAM_ASPM_DEBOUNCE          0x00000002
+#define  NIC_SRAM_LNK_FLAP_AVOID         0x00400000
+#define  NIC_SRAM_1G_ON_VAUX_OK          0x00800000
 
 #define NIC_SRAM_DATA_CFG_4             0x00000d60
 #define  NIC_SRAM_GMII_MODE              0x00000002
@@ -2222,6 +2224,12 @@
 #define  NIC_SRAM_MBUF_POOL_BASE5705    0x00010000
 #define  NIC_SRAM_MBUF_POOL_SIZE5705    0x0000e000
 
+#define TG3_SRAM_RXCPU_SCRATCH_BASE_57766       0x00030000
+#define  TG3_SRAM_RXCPU_SCRATCH_SIZE_57766       0x00010000
+#define TG3_57766_FW_BASE_ADDR                  0x00030000
+#define TG3_57766_FW_HANDSHAKE                  0x0003fccc
+#define TG3_SBROM_IN_SERVICE_LOOP               0x51
+
 #define TG3_SRAM_RX_STD_BDCACHE_SIZE_5700       128
 #define TG3_SRAM_RX_STD_BDCACHE_SIZE_5755       64
 #define TG3_SRAM_RX_STD_BDCACHE_SIZE_5906       32
@@ -2365,6 +2373,13 @@
 #define MII_TG3_FET_SHDW_AUXSTAT2       0x1b
 #define  MII_TG3_FET_SHDW_AUXSTAT2_APD  0x0020
 
+/* Serdes PHY Register Definitions */
+#define SERDES_TG3_1000X_STATUS         0x14
+#define  SERDES_TG3_SGMII_MODE           0x0001
+#define  SERDES_TG3_LINK_UP              0x0002
+#define  SERDES_TG3_FULL_DUPLEX          0x0004
+#define  SERDES_TG3_SPEED_100            0x0008
+#define  SERDES_TG3_SPEED_1000           0x0010
 
 /* APE registers.  Accessible through BAR1 */
 #define TG3_APE_GPIO_MSG                0x0008
@@ -3009,17 +3024,18 @@ enum TG3_FLAGS {
         TG3_FLAG_JUMBO_CAPABLE,
         TG3_FLAG_CHIP_RESETTING,
         TG3_FLAG_INIT_COMPLETE,
-        TG3_FLAG_TSO_BUG,
         TG3_FLAG_MAX_RXPEND_64,
-        TG3_FLAG_TSO_CAPABLE,
         TG3_FLAG_PCI_EXPRESS, /* BCM5785 + pci_is_pcie() */
         TG3_FLAG_ASF_NEW_HANDSHAKE,
         TG3_FLAG_HW_AUTONEG,
         TG3_FLAG_IS_NIC,
         TG3_FLAG_FLASH,
+        TG3_FLAG_FW_TSO,
         TG3_FLAG_HW_TSO_1,
         TG3_FLAG_HW_TSO_2,
         TG3_FLAG_HW_TSO_3,
+        TG3_FLAG_TSO_CAPABLE,
+        TG3_FLAG_TSO_BUG,
         TG3_FLAG_ICH_WORKAROUND,
         TG3_FLAG_1SHOT_MSI,
         TG3_FLAG_NO_FWARE_REPORTED,
@@ -3064,6 +3080,13 @@ enum TG3_FLAGS {
         TG3_FLAG_NUMBER_OF_FLAGS,       /* Last entry in enum TG3_FLAGS */
 };
 
+struct tg3_firmware_hdr {
+        __be32 version; /* unused for fragments */
+        __be32 base_addr;
+        __be32 len;
+};
+#define TG3_FW_HDR_LEN         (sizeof(struct tg3_firmware_hdr))
+
 struct tg3 {
         /* begin "general, frequently-used members" cacheline section */
 
@@ -3267,6 +3290,7 @@ struct tg3 {
 #define TG3_PHYFLG_IS_LOW_POWER         0x00000001
 #define TG3_PHYFLG_IS_CONNECTED         0x00000002
 #define TG3_PHYFLG_USE_MI_INTERRUPT     0x00000004
+#define TG3_PHYFLG_USER_CONFIGURED      0x00000008
 #define TG3_PHYFLG_PHY_SERDES           0x00000010
 #define TG3_PHYFLG_MII_SERDES           0x00000020
 #define TG3_PHYFLG_ANY_SERDES           (TG3_PHYFLG_PHY_SERDES |        \
@@ -3284,6 +3308,8 @@ struct tg3 {
 #define TG3_PHYFLG_SERDES_PREEMPHASIS   0x00010000
 #define TG3_PHYFLG_PARALLEL_DETECT      0x00020000
 #define TG3_PHYFLG_EEE_CAP              0x00040000
+#define TG3_PHYFLG_1G_ON_VAUX_OK        0x00080000
+#define TG3_PHYFLG_KEEP_LINK_ON_PWRDN   0x00100000
 #define TG3_PHYFLG_MDIX_STATE           0x00200000
 
         u32                             led_ctrl;
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
index 3227fdde521b..f2b73ffa9122 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
@@ -76,7 +76,7 @@ static void bfa_ioc_pf_disabled(struct bfa_ioc *ioc);
 static void bfa_ioc_pf_failed(struct bfa_ioc *ioc);
 static void bfa_ioc_pf_hwfailed(struct bfa_ioc *ioc);
 static void bfa_ioc_pf_fwmismatch(struct bfa_ioc *ioc);
-static void bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type,
+static void bfa_ioc_boot(struct bfa_ioc *ioc, enum bfi_fwboot_type boot_type,
                          u32 boot_param);
 static u32 bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr);
 static void bfa_ioc_get_adapter_serial_num(struct bfa_ioc *ioc,
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 7cce42dc2f20..ce4a030d3d0c 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -610,7 +610,7 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget)
                 rcb->rxq->rx_bytes += length;
 
                 if (flags & BNA_CQ_EF_VLAN)
-                        __vlan_hwaccel_put_tag(skb, ntohs(cmpl->vlan_tag));
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(cmpl->vlan_tag));
 
                 if (BNAD_RXBUF_IS_PAGE(unmap_q->type))
                         napi_gro_frags(&rx_ctrl->napi);
@@ -1264,9 +1264,8 @@ bnad_mem_alloc(struct bnad *bnad,
                         mem_info->mdl[i].len = mem_info->len;
                         mem_info->mdl[i].kva =
                                 dma_alloc_coherent(&bnad->pcidev->dev,
-                                                mem_info->len, &dma_pa,
-                                                GFP_KERNEL);
-
+                                                   mem_info->len, &dma_pa,
+                                                   GFP_KERNEL);
                         if (mem_info->mdl[i].kva == NULL)
                                 goto err_return;
 
@@ -3069,8 +3068,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)
 }
 
 static int
-bnad_vlan_rx_add_vid(struct net_device *netdev,
-                                 unsigned short vid)
+bnad_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct bnad *bnad = netdev_priv(netdev);
         unsigned long flags;
@@ -3091,8 +3089,7 @@ bnad_vlan_rx_add_vid(struct net_device *netdev,
 }
 
 static int
-bnad_vlan_rx_kill_vid(struct net_device *netdev,
-                                  unsigned short vid)
+bnad_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct bnad *bnad = netdev_priv(netdev);
         unsigned long flags;
@@ -3171,14 +3168,14 @@ bnad_netdev_init(struct bnad *bnad, bool using_dac)
 
         netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-                NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_HW_VLAN_TX;
+                NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_HW_VLAN_CTAG_TX;
 
         netdev->vlan_features = NETIF_F_SG | NETIF_F_HIGHDMA |
                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                 NETIF_F_TSO | NETIF_F_TSO6;
 
         netdev->features |= netdev->hw_features |
-                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+                NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER;
 
         if (using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 3becdb2deb46..cc9a185f0abb 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -47,22 +47,19 @@ static int at91ether_start(struct net_device *dev)
         int i;
 
         lp->rx_ring = dma_alloc_coherent(&lp->pdev->dev,
-                                        MAX_RX_DESCR * sizeof(struct macb_dma_desc),
-                                        &lp->rx_ring_dma, GFP_KERNEL);
-        if (!lp->rx_ring) {
-                netdev_err(dev, "unable to alloc rx ring DMA buffer\n");
+                                         (MAX_RX_DESCR *
+                                          sizeof(struct macb_dma_desc)),
+                                         &lp->rx_ring_dma, GFP_KERNEL);
+        if (!lp->rx_ring)
                 return -ENOMEM;
-        }
 
         lp->rx_buffers = dma_alloc_coherent(&lp->pdev->dev,
-                                        MAX_RX_DESCR * MAX_RBUFF_SZ,
-                                        &lp->rx_buffers_dma, GFP_KERNEL);
+                                            MAX_RX_DESCR * MAX_RBUFF_SZ,
+                                            &lp->rx_buffers_dma, GFP_KERNEL);
         if (!lp->rx_buffers) {
-                netdev_err(dev, "unable to alloc rx data DMA buffer\n");
-
                 dma_free_coherent(&lp->pdev->dev,
-                                        MAX_RX_DESCR * sizeof(struct macb_dma_desc),
-                                        lp->rx_ring, lp->rx_ring_dma);
+                                  MAX_RX_DESCR * sizeof(struct macb_dma_desc),
+                                  lp->rx_ring, lp->rx_ring_dma);
                 lp->rx_ring = NULL;
                 return -ENOMEM;
         }
@@ -209,7 +206,6 @@ static void at91ether_rx(struct net_device *dev)
                         netif_rx(skb);
                 } else {
                         lp->stats.rx_dropped++;
-                        netdev_notice(dev, "Memory squeeze, dropping packet.\n");
                 }
 
                 if (lp->rx_ring[lp->rx_tail].ctrl & MACB_BIT(RX_MHASH_MATCH))
@@ -303,42 +299,7 @@ static const struct of_device_id at91ether_dt_ids[] = {
         { .compatible = "cdns,emac" },
         { /* sentinel */ }
 };
-
 MODULE_DEVICE_TABLE(of, at91ether_dt_ids);
-
-static int at91ether_get_phy_mode_dt(struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-
-        if (np)
-                return of_get_phy_mode(np);
-
-        return -ENODEV;
-}
-
-static int at91ether_get_hwaddr_dt(struct macb *bp)
-{
-        struct device_node *np = bp->pdev->dev.of_node;
-
-        if (np) {
-                const char *mac = of_get_mac_address(np);
-                if (mac) {
-                        memcpy(bp->dev->dev_addr, mac, ETH_ALEN);
-                        return 0;
-                }
-        }
-
-        return -ENODEV;
-}
-#else
-static int at91ether_get_phy_mode_dt(struct platform_device *pdev)
-{
-        return -ENODEV;
-}
-static int at91ether_get_hwaddr_dt(struct macb *bp)
-{
-        return -ENODEV;
-}
 #endif
 
 /* Detect MAC & PHY and perform ethernet interface initialization */
@@ -352,6 +313,7 @@ static int __init at91ether_probe(struct platform_device *pdev)
         struct macb *lp;
         int res;
         u32 reg;
+        const char *mac;
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!regs)
@@ -403,11 +365,13 @@ static int __init at91ether_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-        res = at91ether_get_hwaddr_dt(lp);
-        if (res < 0)
+        mac = of_get_mac_address(pdev->dev.of_node);
+        if (mac)
+                memcpy(lp->dev->dev_addr, mac, ETH_ALEN);
+        else
                 macb_get_hwaddr(lp);
 
-        res = at91ether_get_phy_mode_dt(pdev);
+        res = of_get_phy_mode(pdev->dev.of_node);
         if (res < 0) {
                 if (board_data && board_data->is_rmii)
                         lp->phy_interface = PHY_INTERFACE_MODE_RMII;
@@ -430,7 +394,8 @@ static int __init at91ether_probe(struct platform_device *pdev)
         if (res)
                 goto err_disable_clock;
 
-        if (macb_mii_init(lp) != 0)
+        res = macb_mii_init(lp);
+        if (res)
                 goto err_out_unregister_netdev;
 
         /* will be enabled in open() */
@@ -519,18 +484,7 @@ static struct platform_driver at91ether_driver = {
         },
 };
 
-static int __init at91ether_init(void)
-{
-        return platform_driver_probe(&at91ether_driver, at91ether_probe);
-}
-
-static void __exit at91ether_exit(void)
-{
-        platform_driver_unregister(&at91ether_driver);
-}
-
-module_init(at91ether_init)
-module_exit(at91ether_exit)
+module_platform_driver_probe(at91ether_driver, at91ether_probe);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("AT91RM9200 EMAC Ethernet driver");
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 79039439bfdc..6be513deb17f 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -485,6 +485,8 @@ static void macb_tx_interrupt(struct macb *bp)
         status = macb_readl(bp, TSR);
         macb_writel(bp, TSR, status);
 
+        macb_writel(bp, ISR, MACB_BIT(TCOMP));
+
         netdev_vdbg(bp->dev, "macb_tx_interrupt status = 0x%03lx\n",
                 (unsigned long)status);
 
@@ -736,6 +738,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
                          * now.
                          */
                         macb_writel(bp, IDR, MACB_RX_INT_FLAGS);
+                        macb_writel(bp, ISR, MACB_BIT(RCOMP));
 
                         if (napi_schedule_prep(&bp->napi)) {
                                 netdev_vdbg(bp->dev, "scheduling RX softirq\n");
@@ -1054,6 +1057,7 @@ static void macb_configure_dma(struct macb *bp)
                 dmacfg |= GEM_BF(RXBS, RX_BUFFER_SIZE / 64);
                 dmacfg |= GEM_BF(FBLDO, 16);
                 dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L);
+                dmacfg &= ~GEM_BIT(ENDIA);
                 gem_writel(bp, DMACFG, dmacfg);
         }
 }
@@ -1472,41 +1476,7 @@ static const struct of_device_id macb_dt_ids[] = {
         { .compatible = "cdns,gem" },
         { /* sentinel */ }
 };
-
 MODULE_DEVICE_TABLE(of, macb_dt_ids);
-
-static int macb_get_phy_mode_dt(struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-
-        if (np)
-                return of_get_phy_mode(np);
-
-        return -ENODEV;
-}
-
-static int macb_get_hwaddr_dt(struct macb *bp)
-{
-        struct device_node *np = bp->pdev->dev.of_node;
-        if (np) {
-                const char *mac = of_get_mac_address(np);
-                if (mac) {
-                        memcpy(bp->dev->dev_addr, mac, ETH_ALEN);
-                        return 0;
-                }
-        }
-
-        return -ENODEV;
-}
-#else
-static int macb_get_phy_mode_dt(struct platform_device *pdev)
-{
-        return -ENODEV;
-}
-static int macb_get_hwaddr_dt(struct macb *bp)
-{
-        return -ENODEV;
-}
 #endif
 
 static int __init macb_probe(struct platform_device *pdev)
@@ -1519,6 +1489,7 @@ static int __init macb_probe(struct platform_device *pdev)
         u32 config;
         int err = -ENXIO;
         struct pinctrl *pinctrl;
+        const char *mac;
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!regs) {
@@ -1557,14 +1528,14 @@ static int __init macb_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "failed to get macb_clk\n");
                 goto err_out_free_dev;
         }
-        clk_enable(bp->pclk);
+        clk_prepare_enable(bp->pclk);
 
         bp->hclk = clk_get(&pdev->dev, "hclk");
         if (IS_ERR(bp->hclk)) {
                 dev_err(&pdev->dev, "failed to get hclk\n");
                 goto err_out_put_pclk;
         }
-        clk_enable(bp->hclk);
+        clk_prepare_enable(bp->hclk);
 
         bp->regs = ioremap(regs->start, resource_size(regs));
         if (!bp->regs) {
@@ -1592,11 +1563,13 @@ static int __init macb_probe(struct platform_device *pdev)
         config |= macb_dbw(bp);
         macb_writel(bp, NCFGR, config);
 
-        err = macb_get_hwaddr_dt(bp);
-        if (err < 0)
+        mac = of_get_mac_address(pdev->dev.of_node);
+        if (mac)
+                memcpy(bp->dev->dev_addr, mac, ETH_ALEN);
+        else
                 macb_get_hwaddr(bp);
 
-        err = macb_get_phy_mode_dt(pdev);
+        err = of_get_phy_mode(pdev->dev.of_node);
         if (err < 0) {
                 pdata = pdev->dev.platform_data;
                 if (pdata && pdata->is_rmii)
@@ -1629,9 +1602,9 @@ static int __init macb_probe(struct platform_device *pdev)
                 goto err_out_free_irq;
         }
 
-        if (macb_mii_init(bp) != 0) {
+        err = macb_mii_init(bp);
+        if (err)
                 goto err_out_unregister_netdev;
-        }
 
         platform_set_drvdata(pdev, dev);
 
@@ -1654,9 +1627,9 @@ err_out_free_irq:
 err_out_iounmap:
         iounmap(bp->regs);
 err_out_disable_clocks:
-        clk_disable(bp->hclk);
+        clk_disable_unprepare(bp->hclk);
         clk_put(bp->hclk);
-        clk_disable(bp->pclk);
+        clk_disable_unprepare(bp->pclk);
 err_out_put_pclk:
         clk_put(bp->pclk);
 err_out_free_dev:
@@ -1683,9 +1656,9 @@ static int __exit macb_remove(struct platform_device *pdev)
                 unregister_netdev(dev);
                 free_irq(dev->irq, dev);
                 iounmap(bp->regs);
-                clk_disable(bp->hclk);
+                clk_disable_unprepare(bp->hclk);
                 clk_put(bp->hclk);
-                clk_disable(bp->pclk);
+                clk_disable_unprepare(bp->pclk);
                 clk_put(bp->pclk);
                 free_netdev(dev);
                 platform_set_drvdata(pdev, NULL);
@@ -1703,8 +1676,8 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state)
         netif_carrier_off(netdev);
         netif_device_detach(netdev);
 
-        clk_disable(bp->hclk);
-        clk_disable(bp->pclk);
+        clk_disable_unprepare(bp->hclk);
+        clk_disable_unprepare(bp->pclk);
 
         return 0;
 }
@@ -1714,8 +1687,8 @@ static int macb_resume(struct platform_device *pdev)
         struct net_device *netdev = platform_get_drvdata(pdev);
         struct macb *bp = netdev_priv(netdev);
 
-        clk_enable(bp->pclk);
-        clk_enable(bp->hclk);
+        clk_prepare_enable(bp->pclk);
+        clk_prepare_enable(bp->hclk);
 
         netif_device_attach(netdev);
 
@@ -1737,18 +1710,7 @@ static struct platform_driver macb_driver = {
         },
 };
 
-static int __init macb_init(void)
-{
-        return platform_driver_probe(&macb_driver, macb_probe);
-}
-
-static void __exit macb_exit(void)
-{
-        platform_driver_unregister(&macb_driver);
-}
-
-module_init(macb_init);
-module_exit(macb_exit);
+module_platform_driver_probe(macb_driver, macb_probe);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver");
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 570908b93578..993d70380688 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -173,6 +173,8 @@
 /* Bitfields in DMACFG. */
 #define GEM_FBLDO_OFFSET                        0
 #define GEM_FBLDO_SIZE                          5
+#define GEM_ENDIA_OFFSET                        7
+#define GEM_ENDIA_SIZE                          1
 #define GEM_RXBMS_OFFSET                        8
 #define GEM_RXBMS_SIZE                          2
 #define GEM_TXPBMS_OFFSET                       10
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index b0ebc9f6d55e..4a1f2fa812ab 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -1482,7 +1482,7 @@ static int xgmac_set_features(struct net_device *dev, netdev_features_t features
         u32 ctrl;
         struct xgmac_priv *priv = netdev_priv(dev);
         void __iomem *ioaddr = priv->base;
-        u32 changed = dev->features ^ features;
+        netdev_features_t changed = dev->features ^ features;
 
         if (!(changed & NETIF_F_RXCSUM))
                 return 0;
@@ -1886,12 +1886,9 @@ static int xgmac_resume(struct device *dev)
 
         return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(xgmac_pm_ops, xgmac_suspend, xgmac_resume);
-#define XGMAC_PM_OPS (&xgmac_pm_ops)
-#else
-#define XGMAC_PM_OPS NULL
-#endif /* CONFIG_PM_SLEEP */
 
 static const struct of_device_id xgmac_of_match[] = {
         { .compatible = "calxeda,hb-xgmac", },
@@ -1906,7 +1903,7 @@ static struct platform_driver xgmac_driver = {
         },
         .probe = xgmac_probe,
         .remove = xgmac_remove,
-        .driver.pm = XGMAC_PM_OPS,
+        .driver.pm = &xgmac_pm_ops,
 };
 
 module_platform_driver(xgmac_driver);
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index 20d2085f61c5..9624cfe7df57 100644
--- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
@@ -856,10 +856,10 @@ static netdev_features_t t1_fix_features(struct net_device *dev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -869,7 +869,7 @@ static int t1_set_features(struct net_device *dev, netdev_features_t features)
         netdev_features_t changed = dev->features ^ features;
         struct adapter *adapter = dev->ml_priv;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 t1_vlan_mode(adapter, features);
 
         return 0;
@@ -1085,8 +1085,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                         netdev->features |= NETIF_F_HIGHDMA;
                 if (vlan_tso_capable(adapter)) {
                         netdev->features |=
-                                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-                        netdev->hw_features |= NETIF_F_HW_VLAN_RX;
+                                NETIF_F_HW_VLAN_CTAG_TX |
+                                NETIF_F_HW_VLAN_CTAG_RX;
+                        netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
 
                         /* T204: disable TSO */
                         if (!(is_T2(adapter)) || bi->port_number != 4) {
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
index 482976925154..8061fb0ef7ed 100644
--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -734,7 +734,7 @@ void t1_vlan_mode(struct adapter *adapter, netdev_features_t features)
 {
         struct sge *sge = adapter->sge;
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 sge->sge_control |= F_VLAN_XTRACT;
         else
                 sge->sge_control &= ~F_VLAN_XTRACT;
@@ -835,7 +835,7 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)
                 struct sk_buff *skb;
                 dma_addr_t mapping;
 
-                skb = alloc_skb(q->rx_buffer_size, GFP_ATOMIC);
+                skb = dev_alloc_skb(q->rx_buffer_size);
                 if (!skb)
                         break;
 
@@ -1046,11 +1046,10 @@ static inline struct sk_buff *get_packet(struct pci_dev *pdev,
         const struct freelQ_ce *ce = &fl->centries[fl->cidx];
 
         if (len < copybreak) {
-                skb = alloc_skb(len + 2, GFP_ATOMIC);
+                skb = netdev_alloc_skb_ip_align(NULL, len);
                 if (!skb)
                         goto use_orig_buf;
 
-                skb_reserve(skb, 2);    /* align IP header */
                 skb_put(skb, len);
                 pci_dma_sync_single_for_cpu(pdev,
                                             dma_unmap_addr(ce, dma_addr),
@@ -1387,7 +1386,7 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
 
         if (p->vlan_valid) {
                 st->vlan_xtract++;
-                __vlan_hwaccel_put_tag(skb, ntohs(p->vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(p->vlan));
         }
         netif_receive_skb(skb);
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 2b5e62193cea..71497e835f42 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -1181,14 +1181,15 @@ static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features)
 
         if (adapter->params.rev > 0) {
                 t3_set_vlan_accel(adapter, 1 << pi->port_id,
-                                  features & NETIF_F_HW_VLAN_RX);
+                                  features & NETIF_F_HW_VLAN_CTAG_RX);
         } else {
                 /* single control for all ports */
-                unsigned int i, have_vlans = features & NETIF_F_HW_VLAN_RX;
+                unsigned int i, have_vlans = features & NETIF_F_HW_VLAN_CTAG_RX;
 
                 for_each_port(adapter, i)
                         have_vlans |=
-                                adapter->port[i]->features & NETIF_F_HW_VLAN_RX;
+                                adapter->port[i]->features &
+                                NETIF_F_HW_VLAN_CTAG_RX;
 
                 t3_set_vlan_accel(adapter, 1, have_vlans);
         }
@@ -2563,10 +2564,10 @@ static netdev_features_t cxgb_fix_features(struct net_device *dev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -2575,7 +2576,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features)
 {
         netdev_features_t changed = dev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 cxgb_vlan_mode(dev, features);
 
         return 0;
@@ -3288,8 +3289,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 netdev->mem_start = mmio_start;
                 netdev->mem_end = mmio_start + mmio_len - 1;
                 netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
-                        NETIF_F_TSO | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX;
-                netdev->features |= netdev->hw_features | NETIF_F_HW_VLAN_TX;
+                        NETIF_F_TSO | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX;
+                netdev->features |= netdev->hw_features |
+                                    NETIF_F_HW_VLAN_CTAG_TX;
                 netdev->vlan_features |= netdev->features & VLAN_FEAT;
                 if (pci_using_dac)
                         netdev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 4232767862b5..0c96e5fe99cc 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -185,7 +185,7 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
                 if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) {
                         rcu_read_lock();
                         if (vlan && vlan != VLAN_VID_MASK) {
-                                dev = __vlan_find_dev_deep(dev, vlan);
+                                dev = __vlan_find_dev_deep(dev, htons(ETH_P_8021Q), vlan);
                         } else if (netif_is_bond_slave(dev)) {
                                 struct net_device *upper_dev;
 
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
index 9d67eb794c4b..f12e6b85a653 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
@@ -2030,7 +2030,7 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
 
         if (p->vlan_valid) {
                 qs->port_stats[SGE_PSTAT_VLANEX]++;
-                __vlan_hwaccel_put_tag(skb, ntohs(p->vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(p->vlan));
         }
         if (rq->polling) {
                 if (lro)
@@ -2132,7 +2132,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs,
 
         if (cpl->vlan_valid) {
                 qs->port_stats[SGE_PSTAT_VLANEX]++;
-                __vlan_hwaccel_put_tag(skb, ntohs(cpl->vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(cpl->vlan));
         }
         napi_gro_frags(&qs->napi);
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 6db997c78a5f..681804b30a3f 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -54,6 +54,10 @@
 #define FW_VERSION_MINOR 1
 #define FW_VERSION_MICRO 0
 
+#define FW_VERSION_MAJOR_T5 0
+#define FW_VERSION_MINOR_T5 0
+#define FW_VERSION_MICRO_T5 0
+
 #define CH_WARN(adap, fmt, ...) dev_warn(adap->pdev_dev, fmt, ## __VA_ARGS__)
 
 enum {
@@ -66,7 +70,9 @@ enum {
 enum {
         MEM_EDC0,
         MEM_EDC1,
-        MEM_MC
+        MEM_MC,
+        MEM_MC0 = MEM_MC,
+        MEM_MC1
 };
 
 enum {
@@ -74,8 +80,10 @@ enum {
         MEMWIN0_BASE     = 0x1b800,
         MEMWIN1_APERTURE = 32768,
         MEMWIN1_BASE     = 0x28000,
+        MEMWIN1_BASE_T5  = 0x52000,
         MEMWIN2_APERTURE = 65536,
         MEMWIN2_BASE     = 0x30000,
+        MEMWIN2_BASE_T5  = 0x54000,
 };
 
 enum dev_master {
@@ -431,6 +439,7 @@ struct sge_txq {
         spinlock_t db_lock;
         int db_disabled;
         unsigned short db_pidx;
+        u64 udb;
 };
 
 struct sge_eth_txq {                /* state for an SGE Ethernet Tx queue */
@@ -504,13 +513,44 @@ struct sge {
 
 struct l2t_data;
 
+#define CHELSIO_CHIP_CODE(version, revision) (((version) << 4) | (revision))
+#define CHELSIO_CHIP_VERSION(code) ((code) >> 4)
+#define CHELSIO_CHIP_RELEASE(code) ((code) & 0xf)
+
+#define CHELSIO_T4              0x4
+#define CHELSIO_T5              0x5
+
+enum chip_type {
+        T4_A1 = CHELSIO_CHIP_CODE(CHELSIO_T4, 0),
+        T4_A2 = CHELSIO_CHIP_CODE(CHELSIO_T4, 1),
+        T4_A3 = CHELSIO_CHIP_CODE(CHELSIO_T4, 2),
+        T4_FIRST_REV    = T4_A1,
+        T4_LAST_REV     = T4_A3,
+
+        T5_A1 = CHELSIO_CHIP_CODE(CHELSIO_T5, 0),
+        T5_FIRST_REV    = T5_A1,
+        T5_LAST_REV     = T5_A1,
+};
+
+#ifdef CONFIG_PCI_IOV
+
+/* T4 supports SRIOV on PF0-3 and T5 on PF0-7.  However, the Serial
+ * Configuration initialization for T5 only has SR-IOV functionality enabled
+ * on PF0-3 in order to simplify everything.
+ */
+#define NUM_OF_PF_WITH_SRIOV 4
+
+#endif
+
 struct adapter {
         void __iomem *regs;
+        void __iomem *bar2;
         struct pci_dev *pdev;
         struct device *pdev_dev;
         unsigned int mbox;
         unsigned int fn;
         unsigned int flags;
+        enum chip_type chip;
 
         int msg_enable;
 
@@ -673,6 +713,16 @@ enum {
         VLAN_REWRITE
 };
 
+static inline int is_t5(enum chip_type chip)
+{
+        return (chip >= T5_FIRST_REV && chip <= T5_LAST_REV);
+}
+
+static inline int is_t4(enum chip_type chip)
+{
+        return (chip >= T4_FIRST_REV && chip <= T4_LAST_REV);
+}
+
 static inline u32 t4_read_reg(struct adapter *adap, u32 reg_addr)
 {
         return readl(adap->regs + reg_addr);
@@ -858,7 +908,8 @@ int t4_config_rss_range(struct adapter *adapter, int mbox, unsigned int viid,
                         int start, int n, const u16 *rspq, unsigned int nrspq);
 int t4_config_glbl_rss(struct adapter *adapter, int mbox, unsigned int mode,
                        unsigned int flags);
-int t4_mc_read(struct adapter *adap, u32 addr, __be32 *data, u64 *parity);
+int t4_mc_read(struct adapter *adap, int idx, u32 addr, __be32 *data,
+               u64 *parity);
 int t4_edc_read(struct adapter *adap, int idx, u32 addr, __be32 *data,
                 u64 *parity);
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index e707e31abd81..c59ec3ddaa66 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -68,8 +68,8 @@
 #include "t4fw_api.h"
 #include "l2t.h"
 
-#define DRV_VERSION "1.3.0-ko"
-#define DRV_DESC "Chelsio T4 Network Driver"
+#define DRV_VERSION "2.0.0-ko"
+#define DRV_DESC "Chelsio T4/T5 Network Driver"
 
 /*
  * Max interrupt hold-off timer value in us.  Queues fall back to this value
@@ -229,11 +229,51 @@ static DEFINE_PCI_DEVICE_TABLE(cxgb4_pci_tbl) = {
         CH_DEVICE(0x440a, 4),
         CH_DEVICE(0x440d, 4),
         CH_DEVICE(0x440e, 4),
+        CH_DEVICE(0x5001, 4),
+        CH_DEVICE(0x5002, 4),
+        CH_DEVICE(0x5003, 4),
+        CH_DEVICE(0x5004, 4),
+        CH_DEVICE(0x5005, 4),
+        CH_DEVICE(0x5006, 4),
+        CH_DEVICE(0x5007, 4),
+        CH_DEVICE(0x5008, 4),
+        CH_DEVICE(0x5009, 4),
+        CH_DEVICE(0x500A, 4),
+        CH_DEVICE(0x500B, 4),
+        CH_DEVICE(0x500C, 4),
+        CH_DEVICE(0x500D, 4),
+        CH_DEVICE(0x500E, 4),
+        CH_DEVICE(0x500F, 4),
+        CH_DEVICE(0x5010, 4),
+        CH_DEVICE(0x5011, 4),
+        CH_DEVICE(0x5012, 4),
+        CH_DEVICE(0x5013, 4),
+        CH_DEVICE(0x5401, 4),
+        CH_DEVICE(0x5402, 4),
+        CH_DEVICE(0x5403, 4),
+        CH_DEVICE(0x5404, 4),
+        CH_DEVICE(0x5405, 4),
+        CH_DEVICE(0x5406, 4),
+        CH_DEVICE(0x5407, 4),
+        CH_DEVICE(0x5408, 4),
+        CH_DEVICE(0x5409, 4),
+        CH_DEVICE(0x540A, 4),
+        CH_DEVICE(0x540B, 4),
+        CH_DEVICE(0x540C, 4),
+        CH_DEVICE(0x540D, 4),
+        CH_DEVICE(0x540E, 4),
+        CH_DEVICE(0x540F, 4),
+        CH_DEVICE(0x5410, 4),
+        CH_DEVICE(0x5411, 4),
+        CH_DEVICE(0x5412, 4),
+        CH_DEVICE(0x5413, 4),
         { 0, }
 };
 
 #define FW_FNAME "cxgb4/t4fw.bin"
+#define FW5_FNAME "cxgb4/t5fw.bin"
 #define FW_CFNAME "cxgb4/t4-config.txt"
+#define FW5_CFNAME "cxgb4/t5-config.txt"
 
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_AUTHOR("Chelsio Communications");
@@ -241,6 +281,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRV_VERSION);
 MODULE_DEVICE_TABLE(pci, cxgb4_pci_tbl);
 MODULE_FIRMWARE(FW_FNAME);
+MODULE_FIRMWARE(FW5_FNAME);
 
 /*
  * Normally we're willing to become the firmware's Master PF but will be happy
@@ -319,7 +360,10 @@ static bool vf_acls;
 module_param(vf_acls, bool, 0644);
 MODULE_PARM_DESC(vf_acls, "if set enable virtualization L2 ACL enforcement");
 
-static unsigned int num_vf[4];
+/* Configure the number of PCI-E Virtual Function which are to be instantiated
+ * on SR-IOV Capable Physical Functions.
+ */
+static unsigned int num_vf[NUM_OF_PF_WITH_SRIOV];
 
 module_param_array(num_vf, uint, NULL, 0644);
 MODULE_PARM_DESC(num_vf, "number of VFs for each of PFs 0-3");
@@ -515,7 +559,7 @@ static int link_start(struct net_device *dev)
          * that step explicitly.
          */
         ret = t4_set_rxmode(pi->adapter, mb, pi->viid, dev->mtu, -1, -1, -1,
-                            !!(dev->features & NETIF_F_HW_VLAN_RX), true);
+                            !!(dev->features & NETIF_F_HW_VLAN_CTAG_RX), true);
         if (ret == 0) {
                 ret = t4_change_mac(pi->adapter, mb, pi->viid,
                                     pi->xact_addr_filt, dev->dev_addr, true,
@@ -601,6 +645,21 @@ static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp,
         u8 opcode = ((const struct rss_header *)rsp)->opcode;
 
         rsp++;                                          /* skip RSS header */
+
+        /* FW can send EGR_UPDATEs encapsulated in a CPL_FW4_MSG.
+         */
+        if (unlikely(opcode == CPL_FW4_MSG &&
+           ((const struct cpl_fw4_msg *)rsp)->type == FW_TYPE_RSSCPL)) {
+                rsp++;
+                opcode = ((const struct rss_header *)rsp)->opcode;
+                rsp++;
+                if (opcode != CPL_SGE_EGR_UPDATE) {
+                        dev_err(q->adap->pdev_dev, "unexpected FW4/CPL %#x on FW event queue\n"
+                                , opcode);
+                        goto out;
+                }
+        }
+
         if (likely(opcode == CPL_SGE_EGR_UPDATE)) {
                 const struct cpl_sge_egr_update *p = (void *)rsp;
                 unsigned int qid = EGR_QID(ntohl(p->opcode_qid));
@@ -635,6 +694,7 @@ static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp,
         } else
                 dev_err(q->adap->pdev_dev,
                         "unexpected CPL %#x on FW event queue\n", opcode);
+out:
         return 0;
 }
 
@@ -652,6 +712,12 @@ static int uldrx_handler(struct sge_rspq *q, const __be64 *rsp,
 {
         struct sge_ofld_rxq *rxq = container_of(q, struct sge_ofld_rxq, rspq);
 
+        /* FW can send CPLs encapsulated in a CPL_FW4_MSG.
+         */
+        if (((const struct rss_header *)rsp)->opcode == CPL_FW4_MSG &&
+            ((const struct cpl_fw4_msg *)(rsp + 1))->type == FW_TYPE_RSSCPL)
+                rsp += 2;
+
         if (ulds[q->uld].rx_handler(q->adap->uld_handle[q->uld], rsp, gl)) {
                 rxq->stats.nomem++;
                 return -1;
@@ -1002,21 +1068,36 @@ freeout:	t4_free_sge_resources(adap);
 static int upgrade_fw(struct adapter *adap)
 {
         int ret;
-        u32 vers;
+        u32 vers, exp_major;
         const struct fw_hdr *hdr;
         const struct firmware *fw;
         struct device *dev = adap->pdev_dev;
+        char *fw_file_name;
 
-        ret = request_firmware(&fw, FW_FNAME, dev);
+        switch (CHELSIO_CHIP_VERSION(adap->chip)) {
+        case CHELSIO_T4:
+                fw_file_name = FW_FNAME;
+                exp_major = FW_VERSION_MAJOR;
+                break;
+        case CHELSIO_T5:
+                fw_file_name = FW5_FNAME;
+                exp_major = FW_VERSION_MAJOR_T5;
+                break;
+        default:
+                dev_err(dev, "Unsupported chip type, %x\n", adap->chip);
+                return -EINVAL;
+        }
+
+        ret = request_firmware(&fw, fw_file_name, dev);
         if (ret < 0) {
-                dev_err(dev, "unable to load firmware image " FW_FNAME
-                        ", error %d\n", ret);
+                dev_err(dev, "unable to load firmware image %s, error %d\n",
+                        fw_file_name, ret);
                 return ret;
         }
 
         hdr = (const struct fw_hdr *)fw->data;
         vers = ntohl(hdr->fw_ver);
-        if (FW_HDR_FW_VER_MAJOR_GET(vers) != FW_VERSION_MAJOR) {
+        if (FW_HDR_FW_VER_MAJOR_GET(vers) != exp_major) {
                 ret = -EINVAL;              /* wrong major version, won't do */
                 goto out;
         }
@@ -1024,18 +1105,15 @@ static int upgrade_fw(struct adapter *adap)
         /*
          * If the flash FW is unusable or we found something newer, load it.
          */
-        if (FW_HDR_FW_VER_MAJOR_GET(adap->params.fw_vers) != FW_VERSION_MAJOR ||
+        if (FW_HDR_FW_VER_MAJOR_GET(adap->params.fw_vers) != exp_major ||
             vers > adap->params.fw_vers) {
                 dev_info(dev, "upgrading firmware ...\n");
                 ret = t4_fw_upgrade(adap, adap->mbox, fw->data, fw->size,
                                     /*force=*/false);
                 if (!ret)
-                        dev_info(dev, "firmware successfully upgraded to "
-                                 FW_FNAME " (%d.%d.%d.%d)\n",
-                                 FW_HDR_FW_VER_MAJOR_GET(vers),
-                                 FW_HDR_FW_VER_MINOR_GET(vers),
-                                 FW_HDR_FW_VER_MICRO_GET(vers),
-                                 FW_HDR_FW_VER_BUILD_GET(vers));
+                        dev_info(dev,
+                                 "firmware upgraded to version %pI4 from %s\n",
+                                 &hdr->fw_ver, fw_file_name);
                 else
                         dev_err(dev, "firmware upgrade failed! err=%d\n", -ret);
         } else {
@@ -1308,6 +1386,8 @@ static char stats_strings[][ETH_GSTRING_LEN] = {
         "VLANinsertions     ",
         "GROpackets         ",
         "GROmerged          ",
+        "WriteCoalSuccess   ",
+        "WriteCoalFail      ",
 };
 
 static int get_sset_count(struct net_device *dev, int sset)
@@ -1321,10 +1401,15 @@ static int get_sset_count(struct net_device *dev, int sset)
 }
 
 #define T4_REGMAP_SIZE (160 * 1024)
+#define T5_REGMAP_SIZE (332 * 1024)
 
 static int get_regs_len(struct net_device *dev)
 {
-        return T4_REGMAP_SIZE;
+        struct adapter *adap = netdev2adap(dev);
+        if (is_t4(adap->chip))
+                return T4_REGMAP_SIZE;
+        else
+                return T5_REGMAP_SIZE;
 }
 
 static int get_eeprom_len(struct net_device *dev)
@@ -1398,11 +1483,25 @@ static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
 {
         struct port_info *pi = netdev_priv(dev);
         struct adapter *adapter = pi->adapter;
+        u32 val1, val2;
 
         t4_get_port_stats(adapter, pi->tx_chan, (struct port_stats *)data);
 
         data += sizeof(struct port_stats) / sizeof(u64);
         collect_sge_port_stats(adapter, pi, (struct queue_port_stats *)data);
+        data += sizeof(struct queue_port_stats) / sizeof(u64);
+        if (!is_t4(adapter->chip)) {
+                t4_write_reg(adapter, SGE_STAT_CFG, STATSOURCE_T5(7));
+                val1 = t4_read_reg(adapter, SGE_STAT_TOTAL);
+                val2 = t4_read_reg(adapter, SGE_STAT_MATCH);
+                *data = val1 - val2;
+                data++;
+                *data = val2;
+                data++;
+        } else {
+                memset(data, 0, 2 * sizeof(u64));
+                *data += 2;
+        }
 }
 
 /*
@@ -1413,7 +1512,8 @@ static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
  */
 static inline unsigned int mk_adap_vers(const struct adapter *ap)
 {
-        return 4 | (ap->params.rev << 10) | (1 << 16);
+        return CHELSIO_CHIP_VERSION(ap->chip) |
+                (CHELSIO_CHIP_RELEASE(ap->chip) << 10) | (1 << 16);
 }
 
 static void reg_block_dump(struct adapter *ap, void *buf, unsigned int start,
@@ -1428,7 +1528,7 @@ static void reg_block_dump(struct adapter *ap, void *buf, unsigned int start,
 static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                      void *buf)
 {
-        static const unsigned int reg_ranges[] = {
+        static const unsigned int t4_reg_ranges[] = {
                 0x1008, 0x1108,
                 0x1180, 0x11b4,
                 0x11fc, 0x123c,
@@ -1648,13 +1748,452 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                 0x27e00, 0x27e04
         };
 
+        static const unsigned int t5_reg_ranges[] = {
+                0x1008, 0x1148,
+                0x1180, 0x11b4,
+                0x11fc, 0x123c,
+                0x1280, 0x173c,
+                0x1800, 0x18fc,
+                0x3000, 0x3028,
+                0x3060, 0x30d8,
+                0x30e0, 0x30fc,
+                0x3140, 0x357c,
+                0x35a8, 0x35cc,
+                0x35ec, 0x35ec,
+                0x3600, 0x5624,
+                0x56cc, 0x575c,
+                0x580c, 0x5814,
+                0x5890, 0x58bc,
+                0x5940, 0x59dc,
+                0x59fc, 0x5a18,
+                0x5a60, 0x5a9c,
+                0x5b9c, 0x5bfc,
+                0x6000, 0x6040,
+                0x6058, 0x614c,
+                0x7700, 0x7798,
+                0x77c0, 0x78fc,
+                0x7b00, 0x7c54,
+                0x7d00, 0x7efc,
+                0x8dc0, 0x8de0,
+                0x8df8, 0x8e84,
+                0x8ea0, 0x8f84,
+                0x8fc0, 0x90f8,
+                0x9400, 0x9470,
+                0x9600, 0x96f4,
+                0x9800, 0x9808,
+                0x9820, 0x983c,
+                0x9850, 0x9864,
+                0x9c00, 0x9c6c,
+                0x9c80, 0x9cec,
+                0x9d00, 0x9d6c,
+                0x9d80, 0x9dec,
+                0x9e00, 0x9e6c,
+                0x9e80, 0x9eec,
+                0x9f00, 0x9f6c,
+                0x9f80, 0xa020,
+                0xd004, 0xd03c,
+                0xdfc0, 0xdfe0,
+                0xe000, 0x11088,
+                0x1109c, 0x1117c,
+                0x11190, 0x11204,
+                0x19040, 0x1906c,
+                0x19078, 0x19080,
+                0x1908c, 0x19124,
+                0x19150, 0x191b0,
+                0x191d0, 0x191e8,
+                0x19238, 0x19290,
+                0x193f8, 0x19474,
+                0x19490, 0x194cc,
+                0x194f0, 0x194f8,
+                0x19c00, 0x19c60,
+                0x19c94, 0x19e10,
+                0x19e50, 0x19f34,
+                0x19f40, 0x19f50,
+                0x19f90, 0x19fe4,
+                0x1a000, 0x1a06c,
+                0x1a0b0, 0x1a120,
+                0x1a128, 0x1a138,
+                0x1a190, 0x1a1c4,
+                0x1a1fc, 0x1a1fc,
+                0x1e008, 0x1e00c,
+                0x1e040, 0x1e04c,
+                0x1e284, 0x1e290,
+                0x1e2c0, 0x1e2c0,
+                0x1e2e0, 0x1e2e0,
+                0x1e300, 0x1e384,
+                0x1e3c0, 0x1e3c8,
+                0x1e408, 0x1e40c,
+                0x1e440, 0x1e44c,
+                0x1e684, 0x1e690,
+                0x1e6c0, 0x1e6c0,
+                0x1e6e0, 0x1e6e0,
+                0x1e700, 0x1e784,
+                0x1e7c0, 0x1e7c8,
+                0x1e808, 0x1e80c,
+                0x1e840, 0x1e84c,
+                0x1ea84, 0x1ea90,
+                0x1eac0, 0x1eac0,
+                0x1eae0, 0x1eae0,
+                0x1eb00, 0x1eb84,
+                0x1ebc0, 0x1ebc8,
+                0x1ec08, 0x1ec0c,
+                0x1ec40, 0x1ec4c,
+                0x1ee84, 0x1ee90,
+                0x1eec0, 0x1eec0,
+                0x1eee0, 0x1eee0,
+                0x1ef00, 0x1ef84,
+                0x1efc0, 0x1efc8,
+                0x1f008, 0x1f00c,
+                0x1f040, 0x1f04c,
+                0x1f284, 0x1f290,
+                0x1f2c0, 0x1f2c0,
+                0x1f2e0, 0x1f2e0,
+                0x1f300, 0x1f384,
+                0x1f3c0, 0x1f3c8,
+                0x1f408, 0x1f40c,
+                0x1f440, 0x1f44c,
+                0x1f684, 0x1f690,
+                0x1f6c0, 0x1f6c0,
+                0x1f6e0, 0x1f6e0,
+                0x1f700, 0x1f784,
+                0x1f7c0, 0x1f7c8,
+                0x1f808, 0x1f80c,
+                0x1f840, 0x1f84c,
+                0x1fa84, 0x1fa90,
+                0x1fac0, 0x1fac0,
+                0x1fae0, 0x1fae0,
+                0x1fb00, 0x1fb84,
+                0x1fbc0, 0x1fbc8,
+                0x1fc08, 0x1fc0c,
+                0x1fc40, 0x1fc4c,
+                0x1fe84, 0x1fe90,
+                0x1fec0, 0x1fec0,
+                0x1fee0, 0x1fee0,
+                0x1ff00, 0x1ff84,
+                0x1ffc0, 0x1ffc8,
+                0x30000, 0x30030,
+                0x30100, 0x30144,
+                0x30190, 0x301d0,
+                0x30200, 0x30318,
+                0x30400, 0x3052c,
+                0x30540, 0x3061c,
+                0x30800, 0x30834,
+                0x308c0, 0x30908,
+                0x30910, 0x309ac,
+                0x30a00, 0x30a04,
+                0x30a0c, 0x30a2c,
+                0x30a44, 0x30a50,
+                0x30a74, 0x30c24,
+                0x30d08, 0x30d14,
+                0x30d1c, 0x30d20,
+                0x30d3c, 0x30d50,
+                0x31200, 0x3120c,
+                0x31220, 0x31220,
+                0x31240, 0x31240,
+                0x31600, 0x31600,
+                0x31608, 0x3160c,
+                0x31a00, 0x31a1c,
+                0x31e04, 0x31e20,
+                0x31e38, 0x31e3c,
+                0x31e80, 0x31e80,
+                0x31e88, 0x31ea8,
+                0x31eb0, 0x31eb4,
+                0x31ec8, 0x31ed4,
+                0x31fb8, 0x32004,
+                0x32208, 0x3223c,
+                0x32600, 0x32630,
+                0x32a00, 0x32abc,
+                0x32b00, 0x32b70,
+                0x33000, 0x33048,
+                0x33060, 0x3309c,
+                0x330f0, 0x33148,
+                0x33160, 0x3319c,
+                0x331f0, 0x332e4,
+                0x332f8, 0x333e4,
+                0x333f8, 0x33448,
+                0x33460, 0x3349c,
+                0x334f0, 0x33548,
+                0x33560, 0x3359c,
+                0x335f0, 0x336e4,
+                0x336f8, 0x337e4,
+                0x337f8, 0x337fc,
+                0x33814, 0x33814,
+                0x3382c, 0x3382c,
+                0x33880, 0x3388c,
+                0x338e8, 0x338ec,
+                0x33900, 0x33948,
+                0x33960, 0x3399c,
+                0x339f0, 0x33ae4,
+                0x33af8, 0x33b10,
+                0x33b28, 0x33b28,
+                0x33b3c, 0x33b50,
+                0x33bf0, 0x33c10,
+                0x33c28, 0x33c28,
+                0x33c3c, 0x33c50,
+                0x33cf0, 0x33cfc,
+                0x34000, 0x34030,
+                0x34100, 0x34144,
+                0x34190, 0x341d0,
+                0x34200, 0x34318,
+                0x34400, 0x3452c,
+                0x34540, 0x3461c,
+                0x34800, 0x34834,
+                0x348c0, 0x34908,
+                0x34910, 0x349ac,
+                0x34a00, 0x34a04,
+                0x34a0c, 0x34a2c,
+                0x34a44, 0x34a50,
+                0x34a74, 0x34c24,
+                0x34d08, 0x34d14,
+                0x34d1c, 0x34d20,
+                0x34d3c, 0x34d50,
+                0x35200, 0x3520c,
+                0x35220, 0x35220,
+                0x35240, 0x35240,
+                0x35600, 0x35600,
+                0x35608, 0x3560c,
+                0x35a00, 0x35a1c,
+                0x35e04, 0x35e20,
+                0x35e38, 0x35e3c,
+                0x35e80, 0x35e80,
+                0x35e88, 0x35ea8,
+                0x35eb0, 0x35eb4,
+                0x35ec8, 0x35ed4,
+                0x35fb8, 0x36004,
+                0x36208, 0x3623c,
+                0x36600, 0x36630,
+                0x36a00, 0x36abc,
+                0x36b00, 0x36b70,
+                0x37000, 0x37048,
+                0x37060, 0x3709c,
+                0x370f0, 0x37148,
+                0x37160, 0x3719c,
+                0x371f0, 0x372e4,
+                0x372f8, 0x373e4,
+                0x373f8, 0x37448,
+                0x37460, 0x3749c,
+                0x374f0, 0x37548,
+                0x37560, 0x3759c,
+                0x375f0, 0x376e4,
+                0x376f8, 0x377e4,
+                0x377f8, 0x377fc,
+                0x37814, 0x37814,
+                0x3782c, 0x3782c,
+                0x37880, 0x3788c,
+                0x378e8, 0x378ec,
+                0x37900, 0x37948,
+                0x37960, 0x3799c,
+                0x379f0, 0x37ae4,
+                0x37af8, 0x37b10,
+                0x37b28, 0x37b28,
+                0x37b3c, 0x37b50,
+                0x37bf0, 0x37c10,
+                0x37c28, 0x37c28,
+                0x37c3c, 0x37c50,
+                0x37cf0, 0x37cfc,
+                0x38000, 0x38030,
+                0x38100, 0x38144,
+                0x38190, 0x381d0,
+                0x38200, 0x38318,
+                0x38400, 0x3852c,
+                0x38540, 0x3861c,
+                0x38800, 0x38834,
+                0x388c0, 0x38908,
+                0x38910, 0x389ac,
+                0x38a00, 0x38a04,
+                0x38a0c, 0x38a2c,
+                0x38a44, 0x38a50,
+                0x38a74, 0x38c24,
+                0x38d08, 0x38d14,
+                0x38d1c, 0x38d20,
+                0x38d3c, 0x38d50,
+                0x39200, 0x3920c,
+                0x39220, 0x39220,
+                0x39240, 0x39240,
+                0x39600, 0x39600,
+                0x39608, 0x3960c,
+                0x39a00, 0x39a1c,
+                0x39e04, 0x39e20,
+                0x39e38, 0x39e3c,
+                0x39e80, 0x39e80,
+                0x39e88, 0x39ea8,
+                0x39eb0, 0x39eb4,
+                0x39ec8, 0x39ed4,
+                0x39fb8, 0x3a004,
+                0x3a208, 0x3a23c,
+                0x3a600, 0x3a630,
+                0x3aa00, 0x3aabc,
+                0x3ab00, 0x3ab70,
+                0x3b000, 0x3b048,
+                0x3b060, 0x3b09c,
+                0x3b0f0, 0x3b148,
+                0x3b160, 0x3b19c,
+                0x3b1f0, 0x3b2e4,
+                0x3b2f8, 0x3b3e4,
+                0x3b3f8, 0x3b448,
+                0x3b460, 0x3b49c,
+                0x3b4f0, 0x3b548,
+                0x3b560, 0x3b59c,
+                0x3b5f0, 0x3b6e4,
+                0x3b6f8, 0x3b7e4,
+                0x3b7f8, 0x3b7fc,
+                0x3b814, 0x3b814,
+                0x3b82c, 0x3b82c,
+                0x3b880, 0x3b88c,
+                0x3b8e8, 0x3b8ec,
+                0x3b900, 0x3b948,
+                0x3b960, 0x3b99c,
+                0x3b9f0, 0x3bae4,
+                0x3baf8, 0x3bb10,
+                0x3bb28, 0x3bb28,
+                0x3bb3c, 0x3bb50,
+                0x3bbf0, 0x3bc10,
+                0x3bc28, 0x3bc28,
+                0x3bc3c, 0x3bc50,
+                0x3bcf0, 0x3bcfc,
+                0x3c000, 0x3c030,
+                0x3c100, 0x3c144,
+                0x3c190, 0x3c1d0,
+                0x3c200, 0x3c318,
+                0x3c400, 0x3c52c,
+                0x3c540, 0x3c61c,
+                0x3c800, 0x3c834,
+                0x3c8c0, 0x3c908,
+                0x3c910, 0x3c9ac,
+                0x3ca00, 0x3ca04,
+                0x3ca0c, 0x3ca2c,
+                0x3ca44, 0x3ca50,
+                0x3ca74, 0x3cc24,
+                0x3cd08, 0x3cd14,
+                0x3cd1c, 0x3cd20,
+                0x3cd3c, 0x3cd50,
+                0x3d200, 0x3d20c,
+                0x3d220, 0x3d220,
+                0x3d240, 0x3d240,
+                0x3d600, 0x3d600,
+                0x3d608, 0x3d60c,
+                0x3da00, 0x3da1c,
+                0x3de04, 0x3de20,
+                0x3de38, 0x3de3c,
+                0x3de80, 0x3de80,
+                0x3de88, 0x3dea8,
+                0x3deb0, 0x3deb4,
+                0x3dec8, 0x3ded4,
+                0x3dfb8, 0x3e004,
+                0x3e208, 0x3e23c,
+                0x3e600, 0x3e630,
+                0x3ea00, 0x3eabc,
+                0x3eb00, 0x3eb70,
+                0x3f000, 0x3f048,
+                0x3f060, 0x3f09c,
+                0x3f0f0, 0x3f148,
+                0x3f160, 0x3f19c,
+                0x3f1f0, 0x3f2e4,
+                0x3f2f8, 0x3f3e4,
+                0x3f3f8, 0x3f448,
+                0x3f460, 0x3f49c,
+                0x3f4f0, 0x3f548,
+                0x3f560, 0x3f59c,
+                0x3f5f0, 0x3f6e4,
+                0x3f6f8, 0x3f7e4,
+                0x3f7f8, 0x3f7fc,
+                0x3f814, 0x3f814,
+                0x3f82c, 0x3f82c,
+                0x3f880, 0x3f88c,
+                0x3f8e8, 0x3f8ec,
+                0x3f900, 0x3f948,
+                0x3f960, 0x3f99c,
+                0x3f9f0, 0x3fae4,
+                0x3faf8, 0x3fb10,
+                0x3fb28, 0x3fb28,
+                0x3fb3c, 0x3fb50,
+                0x3fbf0, 0x3fc10,
+                0x3fc28, 0x3fc28,
+                0x3fc3c, 0x3fc50,
+                0x3fcf0, 0x3fcfc,
+                0x40000, 0x4000c,
+                0x40040, 0x40068,
+                0x40080, 0x40144,
+                0x40180, 0x4018c,
+                0x40200, 0x40298,
+                0x402ac, 0x4033c,
+                0x403f8, 0x403fc,
+                0x41300, 0x413c4,
+                0x41400, 0x4141c,
+                0x41480, 0x414d0,
+                0x44000, 0x44078,
+                0x440c0, 0x44278,
+                0x442c0, 0x44478,
+                0x444c0, 0x44678,
+                0x446c0, 0x44878,
+                0x448c0, 0x449fc,
+                0x45000, 0x45068,
+                0x45080, 0x45084,
+                0x450a0, 0x450b0,
+                0x45200, 0x45268,
+                0x45280, 0x45284,
+                0x452a0, 0x452b0,
+                0x460c0, 0x460e4,
+                0x47000, 0x4708c,
+                0x47200, 0x47250,
+                0x47400, 0x47420,
+                0x47600, 0x47618,
+                0x47800, 0x47814,
+                0x48000, 0x4800c,
+                0x48040, 0x48068,
+                0x48080, 0x48144,
+                0x48180, 0x4818c,
+                0x48200, 0x48298,
+                0x482ac, 0x4833c,
+                0x483f8, 0x483fc,
+                0x49300, 0x493c4,
+                0x49400, 0x4941c,
+                0x49480, 0x494d0,
+                0x4c000, 0x4c078,
+                0x4c0c0, 0x4c278,
+                0x4c2c0, 0x4c478,
+                0x4c4c0, 0x4c678,
+                0x4c6c0, 0x4c878,
+                0x4c8c0, 0x4c9fc,
+                0x4d000, 0x4d068,
+                0x4d080, 0x4d084,
+                0x4d0a0, 0x4d0b0,
+                0x4d200, 0x4d268,
+                0x4d280, 0x4d284,
+                0x4d2a0, 0x4d2b0,
+                0x4e0c0, 0x4e0e4,
+                0x4f000, 0x4f08c,
+                0x4f200, 0x4f250,
+                0x4f400, 0x4f420,
+                0x4f600, 0x4f618,
+                0x4f800, 0x4f814,
+                0x50000, 0x500cc,
+                0x50400, 0x50400,
+                0x50800, 0x508cc,
+                0x50c00, 0x50c00,
+                0x51000, 0x5101c,
+                0x51300, 0x51308,
+        };
+
         int i;
         struct adapter *ap = netdev2adap(dev);
+        static const unsigned int *reg_ranges;
+        int arr_size = 0, buf_size = 0;
+
+        if (is_t4(ap->chip)) {
+                reg_ranges = &t4_reg_ranges[0];
+                arr_size = ARRAY_SIZE(t4_reg_ranges);
+                buf_size = T4_REGMAP_SIZE;
+        } else {
+                reg_ranges = &t5_reg_ranges[0];
+                arr_size = ARRAY_SIZE(t5_reg_ranges);
+                buf_size = T5_REGMAP_SIZE;
+        }
 
         regs->version = mk_adap_vers(ap);
 
-        memset(buf, 0, T4_REGMAP_SIZE);
-        for (i = 0; i < ARRAY_SIZE(reg_ranges); i += 2)
+        memset(buf, 0, buf_size);
+        for (i = 0; i < arr_size; i += 2)
                 reg_block_dump(ap, buf, reg_ranges[i], reg_ranges[i + 1]);
 }
 
@@ -2205,14 +2744,14 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features)
         netdev_features_t changed = dev->features ^ features;
         int err;
 
-        if (!(changed & NETIF_F_HW_VLAN_RX))
+        if (!(changed & NETIF_F_HW_VLAN_CTAG_RX))
                 return 0;
 
         err = t4_set_rxmode(pi->adapter, pi->adapter->fn, pi->viid, -1,
                             -1, -1, -1,
-                            !!(features & NETIF_F_HW_VLAN_RX), true);
+                            !!(features & NETIF_F_HW_VLAN_CTAG_RX), true);
         if (unlikely(err))
-                dev->features = features ^ NETIF_F_HW_VLAN_RX;
+                dev->features = features ^ NETIF_F_HW_VLAN_CTAG_RX;
         return err;
 }
 
@@ -2363,8 +2902,8 @@ static ssize_t mem_read(struct file *file, char __user *buf, size_t count,
                 int ret, ofst;
                 __be32 data[16];
 
-                if (mem == MEM_MC)
-                        ret = t4_mc_read(adap, pos, data, NULL);
+                if ((mem == MEM_MC) || (mem == MEM_MC1))
+                        ret = t4_mc_read(adap, mem % MEM_MC, pos, data, NULL);
                 else
                         ret = t4_edc_read(adap, mem, pos, data, NULL);
                 if (ret)
@@ -2405,18 +2944,37 @@ static void add_debugfs_mem(struct adapter *adap, const char *name,
 static int setup_debugfs(struct adapter *adap)
 {
         int i;
+        u32 size;
 
         if (IS_ERR_OR_NULL(adap->debugfs_root))
                 return -1;
 
         i = t4_read_reg(adap, MA_TARGET_MEM_ENABLE);
-        if (i & EDRAM0_ENABLE)
-                add_debugfs_mem(adap, "edc0", MEM_EDC0, 5);
-        if (i & EDRAM1_ENABLE)
-                add_debugfs_mem(adap, "edc1", MEM_EDC1, 5);
-        if (i & EXT_MEM_ENABLE)
-                add_debugfs_mem(adap, "mc", MEM_MC,
-                        EXT_MEM_SIZE_GET(t4_read_reg(adap, MA_EXT_MEMORY_BAR)));
+        if (i & EDRAM0_ENABLE) {
+                size = t4_read_reg(adap, MA_EDRAM0_BAR);
+                add_debugfs_mem(adap, "edc0", MEM_EDC0, EDRAM_SIZE_GET(size));
+        }
+        if (i & EDRAM1_ENABLE) {
+                size = t4_read_reg(adap, MA_EDRAM1_BAR);
+                add_debugfs_mem(adap, "edc1", MEM_EDC1, EDRAM_SIZE_GET(size));
+        }
+        if (is_t4(adap->chip)) {
+                size = t4_read_reg(adap, MA_EXT_MEMORY_BAR);
+                if (i & EXT_MEM_ENABLE)
+                        add_debugfs_mem(adap, "mc", MEM_MC,
+                                        EXT_MEM_SIZE_GET(size));
+        } else {
+                if (i & EXT_MEM_ENABLE) {
+                        size = t4_read_reg(adap, MA_EXT_MEMORY_BAR);
+                        add_debugfs_mem(adap, "mc0", MEM_MC0,
+                                        EXT_MEM_SIZE_GET(size));
+                }
+                if (i & EXT_MEM1_ENABLE) {
+                        size = t4_read_reg(adap, MA_EXT_MEMORY1_BAR);
+                        add_debugfs_mem(adap, "mc1", MEM_MC1,
+                                        EXT_MEM_SIZE_GET(size));
+                }
+        }
         if (adap->l2t)
                 debugfs_create_file("l2t", S_IRUSR, adap->debugfs_root, adap,
                                     &t4_l2t_fops);
@@ -2747,10 +3305,18 @@ EXPORT_SYMBOL(cxgb4_port_chan);
 unsigned int cxgb4_dbfifo_count(const struct net_device *dev, int lpfifo)
 {
         struct adapter *adap = netdev2adap(dev);
-        u32 v;
+        u32 v1, v2, lp_count, hp_count;
 
-        v = t4_read_reg(adap, A_SGE_DBFIFO_STATUS);
-        return lpfifo ? G_LP_COUNT(v) : G_HP_COUNT(v);
+        v1 = t4_read_reg(adap, A_SGE_DBFIFO_STATUS);
+        v2 = t4_read_reg(adap, SGE_DBFIFO_STATUS2);
+        if (is_t4(adap->chip)) {
+                lp_count = G_LP_COUNT(v1);
+                hp_count = G_HP_COUNT(v1);
+        } else {
+                lp_count = G_LP_COUNT_T5(v1);
+                hp_count = G_HP_COUNT_T5(v2);
+        }
+        return lpfifo ? lp_count : hp_count;
 }
 EXPORT_SYMBOL(cxgb4_dbfifo_count);
 
@@ -2853,6 +3419,25 @@ out:
 }
 EXPORT_SYMBOL(cxgb4_sync_txq_pidx);
 
+void cxgb4_disable_db_coalescing(struct net_device *dev)
+{
+        struct adapter *adap;
+
+        adap = netdev2adap(dev);
+        t4_set_reg_field(adap, A_SGE_DOORBELL_CONTROL, F_NOCOALESCE,
+                         F_NOCOALESCE);
+}
+EXPORT_SYMBOL(cxgb4_disable_db_coalescing);
+
+void cxgb4_enable_db_coalescing(struct net_device *dev)
+{
+        struct adapter *adap;
+
+        adap = netdev2adap(dev);
+        t4_set_reg_field(adap, A_SGE_DOORBELL_CONTROL, F_NOCOALESCE, 0);
+}
+EXPORT_SYMBOL(cxgb4_enable_db_coalescing);
+
 static struct pci_driver cxgb4_driver;
 
 static void check_neigh_update(struct neighbour *neigh)
@@ -2888,14 +3473,23 @@ static struct notifier_block cxgb4_netevent_nb = {
 
 static void drain_db_fifo(struct adapter *adap, int usecs)
 {
-        u32 v;
+        u32 v1, v2, lp_count, hp_count;
 
         do {
+                v1 = t4_read_reg(adap, A_SGE_DBFIFO_STATUS);
+                v2 = t4_read_reg(adap, SGE_DBFIFO_STATUS2);
+                if (is_t4(adap->chip)) {
+                        lp_count = G_LP_COUNT(v1);
+                        hp_count = G_HP_COUNT(v1);
+                } else {
+                        lp_count = G_LP_COUNT_T5(v1);
+                        hp_count = G_HP_COUNT_T5(v2);
+                }
+
+                if (lp_count == 0 && hp_count == 0)
+                        break;
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(usecs_to_jiffies(usecs));
-                v = t4_read_reg(adap, A_SGE_DBFIFO_STATUS);
-                if (G_LP_COUNT(v) == 0 && G_HP_COUNT(v) == 0)
-                        break;
         } while (1);
 }
 
@@ -3004,24 +3598,62 @@ static void process_db_drop(struct work_struct *work)
 
         adap = container_of(work, struct adapter, db_drop_task);
 
+        if (is_t4(adap->chip)) {
+                disable_dbs(adap);
+                notify_rdma_uld(adap, CXGB4_CONTROL_DB_DROP);
+                drain_db_fifo(adap, 1);
+                recover_all_queues(adap);
+                enable_dbs(adap);
+        } else {
+                u32 dropped_db = t4_read_reg(adap, 0x010ac);
+                u16 qid = (dropped_db >> 15) & 0x1ffff;
+                u16 pidx_inc = dropped_db & 0x1fff;
+                unsigned int s_qpp;
+                unsigned short udb_density;
+                unsigned long qpshift;
+                int page;
+                u32 udb;
+
+                dev_warn(adap->pdev_dev,
+                         "Dropped DB 0x%x qid %d bar2 %d coalesce %d pidx %d\n",
+                         dropped_db, qid,
+                         (dropped_db >> 14) & 1,
+                         (dropped_db >> 13) & 1,
+                         pidx_inc);
+
+                drain_db_fifo(adap, 1);
+
+                s_qpp = QUEUESPERPAGEPF1 * adap->fn;
+                udb_density = 1 << QUEUESPERPAGEPF0_GET(t4_read_reg(adap,
+                                SGE_EGRESS_QUEUES_PER_PAGE_PF) >> s_qpp);
+                qpshift = PAGE_SHIFT - ilog2(udb_density);
+                udb = qid << qpshift;
+                udb &= PAGE_MASK;
+                page = udb / PAGE_SIZE;
+                udb += (qid - (page * udb_density)) * 128;
+
+                writel(PIDX(pidx_inc),  adap->bar2 + udb + 8);
+
+                /* Re-enable BAR2 WC */
+                t4_set_reg_field(adap, 0x10b0, 1<<15, 1<<15);
+        }
+
         t4_set_reg_field(adap, A_SGE_DOORBELL_CONTROL, F_DROPPED_DB, 0);
-        disable_dbs(adap);
-        notify_rdma_uld(adap, CXGB4_CONTROL_DB_DROP);
-        drain_db_fifo(adap, 1);
-        recover_all_queues(adap);
-        enable_dbs(adap);
 }
 
 void t4_db_full(struct adapter *adap)
 {
-        t4_set_reg_field(adap, SGE_INT_ENABLE3,
-                         DBFIFO_HP_INT | DBFIFO_LP_INT, 0);
-        queue_work(workq, &adap->db_full_task);
+        if (is_t4(adap->chip)) {
+                t4_set_reg_field(adap, SGE_INT_ENABLE3,
+                                 DBFIFO_HP_INT | DBFIFO_LP_INT, 0);
+                queue_work(workq, &adap->db_full_task);
+        }
 }
 
 void t4_db_dropped(struct adapter *adap)
 {
-        queue_work(workq, &adap->db_drop_task);
+        if (is_t4(adap->chip))
+                queue_work(workq, &adap->db_drop_task);
 }
 
 static void uld_attach(struct adapter *adap, unsigned int uld)
@@ -3566,17 +4198,27 @@ void t4_fatal_err(struct adapter *adap)
 
 static void setup_memwin(struct adapter *adap)
 {
-        u32 bar0;
+        u32 bar0, mem_win0_base, mem_win1_base, mem_win2_base;
 
         bar0 = pci_resource_start(adap->pdev, 0);  /* truncation intentional */
+        if (is_t4(adap->chip)) {
+                mem_win0_base = bar0 + MEMWIN0_BASE;
+                mem_win1_base = bar0 + MEMWIN1_BASE;
+                mem_win2_base = bar0 + MEMWIN2_BASE;
+        } else {
+                /* For T5, only relative offset inside the PCIe BAR is passed */
+                mem_win0_base = MEMWIN0_BASE;
+                mem_win1_base = MEMWIN1_BASE_T5;
+                mem_win2_base = MEMWIN2_BASE_T5;
+        }
         t4_write_reg(adap, PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 0),
-                     (bar0 + MEMWIN0_BASE) | BIR(0) |
+                     mem_win0_base | BIR(0) |
                      WINDOW(ilog2(MEMWIN0_APERTURE) - 10));
         t4_write_reg(adap, PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 1),
-                     (bar0 + MEMWIN1_BASE) | BIR(0) |
+                     mem_win1_base | BIR(0) |
                      WINDOW(ilog2(MEMWIN1_APERTURE) - 10));
         t4_write_reg(adap, PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 2),
-                     (bar0 + MEMWIN2_BASE) | BIR(0) |
+                     mem_win2_base | BIR(0) |
                      WINDOW(ilog2(MEMWIN2_APERTURE) - 10));
 }
 
@@ -3745,6 +4387,7 @@ static int adap_init0_config(struct adapter *adapter, int reset)
         unsigned long mtype = 0, maddr = 0;
         u32 finiver, finicsum, cfcsum;
         int ret, using_flash;
+        char *fw_config_file, fw_config_file_path[256];
 
         /*
          * Reset device if necessary.
@@ -3761,7 +4404,21 @@ static int adap_init0_config(struct adapter *adapter, int reset)
          * then use that.  Otherwise, use the configuration file stored
          * in the adapter flash ...
          */
-        ret = request_firmware(&cf, FW_CFNAME, adapter->pdev_dev);
+        switch (CHELSIO_CHIP_VERSION(adapter->chip)) {
+        case CHELSIO_T4:
+                fw_config_file = FW_CFNAME;
+                break;
+        case CHELSIO_T5:
+                fw_config_file = FW5_CFNAME;
+                break;
+        default:
+                dev_err(adapter->pdev_dev, "Device %d is not supported\n",
+                       adapter->pdev->device);
+                ret = -EINVAL;
+                goto bye;
+        }
+
+        ret = request_firmware(&cf, fw_config_file, adapter->pdev_dev);
         if (ret < 0) {
                 using_flash = 1;
                 mtype = FW_MEMTYPE_CF_FLASH;
@@ -3877,6 +4534,7 @@ static int adap_init0_config(struct adapter *adapter, int reset)
         if (ret < 0)
                 goto bye;
 
+        sprintf(fw_config_file_path, "/lib/firmware/%s", fw_config_file);
         /*
          * Return successfully and note that we're operating with parameters
          * not supplied by the driver, rather than from hard-wired
@@ -3887,7 +4545,7 @@ static int adap_init0_config(struct adapter *adapter, int reset)
                  "Configuration File %s, version %#x, computed checksum %#x\n",
                  (using_flash
                   ? "in device FLASH"
-                  : "/lib/firmware/" FW_CFNAME),
+                  : fw_config_file_path),
                  finiver, cfcsum);
         return 0;
 
@@ -4354,6 +5012,15 @@ static int adap_init0(struct adapter *adap)
                 adap->tids.aftid_end = val[1];
         }
 
+        /* If we're running on newer firmware, let it know that we're
+         * prepared to deal with encapsulated CPL messages.  Older
+         * firmware won't understand this and we'll just get
+         * unencapsulated messages ...
+         */
+        params[0] = FW_PARAM_PFVF(CPLFW4MSG_ENCAP);
+        val[0] = 1;
+        (void) t4_set_params(adap, adap->mbox, adap->fn, 0, 1, params, val);
+
         /*
          * Get device capabilities so we can determine what resources we need
          * to manage.
@@ -4814,7 +5481,8 @@ static void print_port_info(const struct net_device *dev)
         sprintf(bufp, "BASE-%s", base[pi->port_type]);
 
         netdev_info(dev, "Chelsio %s rev %d %s %sNIC PCIe x%d%s%s\n",
-                    adap->params.vpd.id, adap->params.rev, buf,
+                    adap->params.vpd.id,
+                    CHELSIO_CHIP_RELEASE(adap->params.rev), buf,
                     is_offload(adap) ? "R" : "", adap->params.pci.width, spd,
                     (adap->flags & USING_MSIX) ? " MSI-X" :
                     (adap->flags & USING_MSI) ? " MSI" : "");
@@ -4854,10 +5522,11 @@ static void free_some_resources(struct adapter *adapter)
 #define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
 #define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
                    NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
+#define SEGMENT_SIZE 128
 
 static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        int func, i, err;
+        int func, i, err, s_qpp, qpp, num_seg;
         struct port_info *pi;
         bool highdma = false;
         struct adapter *adapter = NULL;
@@ -4934,7 +5603,34 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         err = t4_prep_adapter(adapter);
         if (err)
-                goto out_unmap_bar;
+                goto out_unmap_bar0;
+
+        if (!is_t4(adapter->chip)) {
+                s_qpp = QUEUESPERPAGEPF1 * adapter->fn;
+                qpp = 1 << QUEUESPERPAGEPF0_GET(t4_read_reg(adapter,
+                      SGE_EGRESS_QUEUES_PER_PAGE_PF) >> s_qpp);
+                num_seg = PAGE_SIZE / SEGMENT_SIZE;
+
+                /* Each segment size is 128B. Write coalescing is enabled only
+                 * when SGE_EGRESS_QUEUES_PER_PAGE_PF reg value for the
+                 * queue is less no of segments that can be accommodated in
+                 * a page size.
+                 */
+                if (qpp > num_seg) {
+                        dev_err(&pdev->dev,
+                                "Incorrect number of egress queues per page\n");
+                        err = -EINVAL;
+                        goto out_unmap_bar0;
+                }
+                adapter->bar2 = ioremap_wc(pci_resource_start(pdev, 2),
+                pci_resource_len(pdev, 2));
+                if (!adapter->bar2) {
+                        dev_err(&pdev->dev, "cannot map device bar2 region\n");
+                        err = -ENOMEM;
+                        goto out_unmap_bar0;
+                }
+        }
+
         setup_memwin(adapter);
         err = adap_init0(adapter);
         setup_memwin_rdma(adapter);
@@ -4963,7 +5659,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 netdev->hw_features = NETIF_F_SG | TSO_FLAGS |
                         NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                         NETIF_F_RXCSUM | NETIF_F_RXHASH |
-                        NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                        NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
                 if (highdma)
                         netdev->hw_features |= NETIF_F_HIGHDMA;
                 netdev->features |= netdev->hw_features;
@@ -5063,6 +5759,9 @@ sriov:
  out_free_dev:
         free_some_resources(adapter);
  out_unmap_bar:
+        if (!is_t4(adapter->chip))
+                iounmap(adapter->bar2);
+ out_unmap_bar0:
         iounmap(adapter->regs);
  out_free_adapter:
         kfree(adapter);
@@ -5113,6 +5812,8 @@ static void remove_one(struct pci_dev *pdev)
 
                 free_some_resources(adapter);
                 iounmap(adapter->regs);
+                if (!is_t4(adapter->chip))
+                        iounmap(adapter->bar2);
                 kfree(adapter);
                 pci_disable_pcie_error_reporting(pdev);
                 pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
index e2bbc7f3e2de..4faf4d067ee7 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
@@ -269,4 +269,7 @@ struct sk_buff *cxgb4_pktgl_to_skb(const struct pkt_gl *gl,
                                    unsigned int skb_len, unsigned int pull_len);
 int cxgb4_sync_txq_pidx(struct net_device *dev, u16 qid, u16 pidx, u16 size);
 int cxgb4_flush_eq_cache(struct net_device *dev);
+void cxgb4_disable_db_coalescing(struct net_device *dev);
+void cxgb4_enable_db_coalescing(struct net_device *dev);
+
 #endif  /* !__CXGB4_OFLD_H */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index fe9a2ea3588b..2bfbb206b35a 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -506,10 +506,14 @@ static void unmap_rx_buf(struct adapter *adap, struct sge_fl *q)
 
 static inline void ring_fl_db(struct adapter *adap, struct sge_fl *q)
 {
+        u32 val;
         if (q->pend_cred >= 8) {
+                val = PIDX(q->pend_cred / 8);
+                if (!is_t4(adap->chip))
+                        val |= DBTYPE(1);
                 wmb();
                 t4_write_reg(adap, MYPF_REG(SGE_PF_KDOORBELL), DBPRIO(1) |
-                             QID(q->cntxt_id) | PIDX(q->pend_cred / 8));
+                             QID(q->cntxt_id) | val);
                 q->pend_cred &= 7;
         }
 }
@@ -812,6 +816,22 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q,
                 *end = 0;
 }
 
+/* This function copies 64 byte coalesced work request to
+ * memory mapped BAR2 space(user space writes).
+ * For coalesced WR SGE, fetches data from the FIFO instead of from Host.
+ */
+static void cxgb_pio_copy(u64 __iomem *dst, u64 *src)
+{
+        int count = 8;
+
+        while (count) {
+                writeq(*src, dst);
+                src++;
+                dst++;
+                count--;
+        }
+}
+
 /**
  *      ring_tx_db - check and potentially ring a Tx queue's doorbell
  *      @adap: the adapter
@@ -822,11 +842,25 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q,
  */
 static inline void ring_tx_db(struct adapter *adap, struct sge_txq *q, int n)
 {
+        unsigned int *wr, index;
+
         wmb();            /* write descriptors before telling HW */
         spin_lock(&q->db_lock);
         if (!q->db_disabled) {
-                t4_write_reg(adap, MYPF_REG(SGE_PF_KDOORBELL),
-                             QID(q->cntxt_id) | PIDX(n));
+                if (is_t4(adap->chip)) {
+                        t4_write_reg(adap, MYPF_REG(SGE_PF_KDOORBELL),
+                                     QID(q->cntxt_id) | PIDX(n));
+                } else {
+                        if (n == 1) {
+                                index = q->pidx ? (q->pidx - 1) : (q->size - 1);
+                                wr = (unsigned int *)&q->desc[index];
+                                cxgb_pio_copy((u64 __iomem *)
+                                              (adap->bar2 + q->udb + 64),
+                                              (u64 *)wr);
+                        } else
+                                writel(n,  adap->bar2 + q->udb + 8);
+                        wmb();
+                }
         }
         q->db_pidx = q->pidx;
         spin_unlock(&q->db_lock);
@@ -1555,7 +1589,6 @@ static noinline int handle_trace_pkt(struct adapter *adap,
                                      const struct pkt_gl *gl)
 {
         struct sk_buff *skb;
-        struct cpl_trace_pkt *p;
 
         skb = cxgb4_pktgl_to_skb(gl, RX_PULL_LEN, RX_PULL_LEN);
         if (unlikely(!skb)) {
@@ -1563,8 +1596,11 @@ static noinline int handle_trace_pkt(struct adapter *adap,
                 return 0;
         }
 
-        p = (struct cpl_trace_pkt *)skb->data;
-        __skb_pull(skb, sizeof(*p));
+        if (is_t4(adap->chip))
+                __skb_pull(skb, sizeof(struct cpl_trace_pkt));
+        else
+                __skb_pull(skb, sizeof(struct cpl_t5_trace_pkt));
+
         skb_reset_mac_header(skb);
         skb->protocol = htons(0xffff);
         skb->dev = adap->port[0];
@@ -1597,7 +1633,7 @@ static void do_gro(struct sge_eth_rxq *rxq, const struct pkt_gl *gl,
                 skb->rxhash = (__force u32)pkt->rsshdr.hash_val;
 
         if (unlikely(pkt->vlan_ex)) {
-                __vlan_hwaccel_put_tag(skb, ntohs(pkt->vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(pkt->vlan));
                 rxq->stats.vlan_ex++;
         }
         ret = napi_gro_frags(&rxq->rspq.napi);
@@ -1625,8 +1661,10 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
         const struct cpl_rx_pkt *pkt;
         struct sge_eth_rxq *rxq = container_of(q, struct sge_eth_rxq, rspq);
         struct sge *s = &q->adap->sge;
+        int cpl_trace_pkt = is_t4(q->adap->chip) ?
+                            CPL_TRACE_PKT : CPL_TRACE_PKT_T5;
 
-        if (unlikely(*(u8 *)rsp == CPL_TRACE_PKT))
+        if (unlikely(*(u8 *)rsp == cpl_trace_pkt))
                 return handle_trace_pkt(q->adap, si);
 
         pkt = (const struct cpl_rx_pkt *)rsp;
@@ -1667,7 +1705,7 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
                 skb_checksum_none_assert(skb);
 
         if (unlikely(pkt->vlan_ex)) {
-                __vlan_hwaccel_put_tag(skb, ntohs(pkt->vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(pkt->vlan));
                 rxq->stats.vlan_ex++;
         }
         netif_receive_skb(skb);
@@ -2143,11 +2181,27 @@ err:
 
 static void init_txq(struct adapter *adap, struct sge_txq *q, unsigned int id)
 {
+        q->cntxt_id = id;
+        if (!is_t4(adap->chip)) {
+                unsigned int s_qpp;
+                unsigned short udb_density;
+                unsigned long qpshift;
+                int page;
+
+                s_qpp = QUEUESPERPAGEPF1 * adap->fn;
+                udb_density = 1 << QUEUESPERPAGEPF0_GET((t4_read_reg(adap,
+                                SGE_EGRESS_QUEUES_PER_PAGE_PF) >> s_qpp));
+                qpshift = PAGE_SHIFT - ilog2(udb_density);
+                q->udb = q->cntxt_id << qpshift;
+                q->udb &= PAGE_MASK;
+                page = q->udb / PAGE_SIZE;
+                q->udb += (q->cntxt_id - (page * udb_density)) * 128;
+        }
+
         q->in_use = 0;
         q->cidx = q->pidx = 0;
         q->stops = q->restarts = 0;
         q->stat = (void *)&q->desc[q->size];
-        q->cntxt_id = id;
         spin_lock_init(&q->db_lock);
         adap->sge.egr_map[id - adap->sge.egr_start] = q;
 }
@@ -2587,11 +2641,20 @@ static int t4_sge_init_hard(struct adapter *adap)
          * Set up to drop DOORBELL writes when the DOORBELL FIFO overflows
          * and generate an interrupt when this occurs so we can recover.
          */
-        t4_set_reg_field(adap, A_SGE_DBFIFO_STATUS,
-                        V_HP_INT_THRESH(M_HP_INT_THRESH) |
-                        V_LP_INT_THRESH(M_LP_INT_THRESH),
-                        V_HP_INT_THRESH(dbfifo_int_thresh) |
-                        V_LP_INT_THRESH(dbfifo_int_thresh));
+        if (is_t4(adap->chip)) {
+                t4_set_reg_field(adap, A_SGE_DBFIFO_STATUS,
+                                 V_HP_INT_THRESH(M_HP_INT_THRESH) |
+                                 V_LP_INT_THRESH(M_LP_INT_THRESH),
+                                 V_HP_INT_THRESH(dbfifo_int_thresh) |
+                                 V_LP_INT_THRESH(dbfifo_int_thresh));
+        } else {
+                t4_set_reg_field(adap, A_SGE_DBFIFO_STATUS,
+                                 V_LP_INT_THRESH_T5(M_LP_INT_THRESH_T5),
+                                 V_LP_INT_THRESH_T5(dbfifo_int_thresh));
+                t4_set_reg_field(adap, SGE_DBFIFO_STATUS2,
+                                 V_HP_INT_THRESH_T5(M_HP_INT_THRESH_T5),
+                                 V_HP_INT_THRESH_T5(dbfifo_int_thresh));
+        }
         t4_set_reg_field(adap, A_SGE_DOORBELL_CONTROL, F_ENABLE_DROP,
                         F_ENABLE_DROP);
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 8049268ce0f2..d02d4e8c4417 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -282,6 +282,7 @@ int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size,
  *      t4_mc_read - read from MC through backdoor accesses
  *      @adap: the adapter
  *      @addr: address of first byte requested
+ *      @idx: which MC to access
  *      @data: 64 bytes of data containing the requested address
  *      @ecc: where to store the corresponding 64-bit ECC word
  *
@@ -289,22 +290,38 @@ int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size,
  *      that covers the requested address @addr.  If @parity is not %NULL it
  *      is assigned the 64-bit ECC word for the read data.
  */
-int t4_mc_read(struct adapter *adap, u32 addr, __be32 *data, u64 *ecc)
+int t4_mc_read(struct adapter *adap, int idx, u32 addr, __be32 *data, u64 *ecc)
 {
         int i;
+        u32 mc_bist_cmd, mc_bist_cmd_addr, mc_bist_cmd_len;
+        u32 mc_bist_status_rdata, mc_bist_data_pattern;
+
+        if (is_t4(adap->chip)) {
+                mc_bist_cmd = MC_BIST_CMD;
+                mc_bist_cmd_addr = MC_BIST_CMD_ADDR;
+                mc_bist_cmd_len = MC_BIST_CMD_LEN;
+                mc_bist_status_rdata = MC_BIST_STATUS_RDATA;
+                mc_bist_data_pattern = MC_BIST_DATA_PATTERN;
+        } else {
+                mc_bist_cmd = MC_REG(MC_P_BIST_CMD, idx);
+                mc_bist_cmd_addr = MC_REG(MC_P_BIST_CMD_ADDR, idx);
+                mc_bist_cmd_len = MC_REG(MC_P_BIST_CMD_LEN, idx);
+                mc_bist_status_rdata = MC_REG(MC_P_BIST_STATUS_RDATA, idx);
+                mc_bist_data_pattern = MC_REG(MC_P_BIST_DATA_PATTERN, idx);
+        }
 
-        if (t4_read_reg(adap, MC_BIST_CMD) & START_BIST)
+        if (t4_read_reg(adap, mc_bist_cmd) & START_BIST)
                 return -EBUSY;
-        t4_write_reg(adap, MC_BIST_CMD_ADDR, addr & ~0x3fU);
-        t4_write_reg(adap, MC_BIST_CMD_LEN, 64);
-        t4_write_reg(adap, MC_BIST_DATA_PATTERN, 0xc);
-        t4_write_reg(adap, MC_BIST_CMD, BIST_OPCODE(1) | START_BIST |
+        t4_write_reg(adap, mc_bist_cmd_addr, addr & ~0x3fU);
+        t4_write_reg(adap, mc_bist_cmd_len, 64);
+        t4_write_reg(adap, mc_bist_data_pattern, 0xc);
+        t4_write_reg(adap, mc_bist_cmd, BIST_OPCODE(1) | START_BIST |
                      BIST_CMD_GAP(1));
-        i = t4_wait_op_done(adap, MC_BIST_CMD, START_BIST, 0, 10, 1);
+        i = t4_wait_op_done(adap, mc_bist_cmd, START_BIST, 0, 10, 1);
         if (i)
                 return i;
 
-#define MC_DATA(i) MC_BIST_STATUS_REG(MC_BIST_STATUS_RDATA, i)
+#define MC_DATA(i) MC_BIST_STATUS_REG(mc_bist_status_rdata, i)
 
         for (i = 15; i >= 0; i--)
                 *data++ = htonl(t4_read_reg(adap, MC_DATA(i)));
@@ -329,20 +346,39 @@ int t4_mc_read(struct adapter *adap, u32 addr, __be32 *data, u64 *ecc)
 int t4_edc_read(struct adapter *adap, int idx, u32 addr, __be32 *data, u64 *ecc)
 {
         int i;
+        u32 edc_bist_cmd, edc_bist_cmd_addr, edc_bist_cmd_len;
+        u32 edc_bist_cmd_data_pattern, edc_bist_status_rdata;
+
+        if (is_t4(adap->chip)) {
+                edc_bist_cmd = EDC_REG(EDC_BIST_CMD, idx);
+                edc_bist_cmd_addr = EDC_REG(EDC_BIST_CMD_ADDR, idx);
+                edc_bist_cmd_len = EDC_REG(EDC_BIST_CMD_LEN, idx);
+                edc_bist_cmd_data_pattern = EDC_REG(EDC_BIST_DATA_PATTERN,
+                                                    idx);
+                edc_bist_status_rdata = EDC_REG(EDC_BIST_STATUS_RDATA,
+                                                    idx);
+        } else {
+                edc_bist_cmd = EDC_REG_T5(EDC_H_BIST_CMD, idx);
+                edc_bist_cmd_addr = EDC_REG_T5(EDC_H_BIST_CMD_ADDR, idx);
+                edc_bist_cmd_len = EDC_REG_T5(EDC_H_BIST_CMD_LEN, idx);
+                edc_bist_cmd_data_pattern =
+                        EDC_REG_T5(EDC_H_BIST_DATA_PATTERN, idx);
+                edc_bist_status_rdata =
+                         EDC_REG_T5(EDC_H_BIST_STATUS_RDATA, idx);
+        }
 
-        idx *= EDC_STRIDE;
-        if (t4_read_reg(adap, EDC_BIST_CMD + idx) & START_BIST)
+        if (t4_read_reg(adap, edc_bist_cmd) & START_BIST)
                 return -EBUSY;
-        t4_write_reg(adap, EDC_BIST_CMD_ADDR + idx, addr & ~0x3fU);
-        t4_write_reg(adap, EDC_BIST_CMD_LEN + idx, 64);
-        t4_write_reg(adap, EDC_BIST_DATA_PATTERN + idx, 0xc);
-        t4_write_reg(adap, EDC_BIST_CMD + idx,
+        t4_write_reg(adap, edc_bist_cmd_addr, addr & ~0x3fU);
+        t4_write_reg(adap, edc_bist_cmd_len, 64);
+        t4_write_reg(adap, edc_bist_cmd_data_pattern, 0xc);
+        t4_write_reg(adap, edc_bist_cmd,
                      BIST_OPCODE(1) | BIST_CMD_GAP(1) | START_BIST);
-        i = t4_wait_op_done(adap, EDC_BIST_CMD + idx, START_BIST, 0, 10, 1);
+        i = t4_wait_op_done(adap, edc_bist_cmd, START_BIST, 0, 10, 1);
         if (i)
                 return i;
 
-#define EDC_DATA(i) (EDC_BIST_STATUS_REG(EDC_BIST_STATUS_RDATA, i) + idx)
+#define EDC_DATA(i) (EDC_BIST_STATUS_REG(edc_bist_status_rdata, i))
 
         for (i = 15; i >= 0; i--)
                 *data++ = htonl(t4_read_reg(adap, EDC_DATA(i)));
@@ -366,6 +402,7 @@ int t4_edc_read(struct adapter *adap, int idx, u32 addr, __be32 *data, u64 *ecc)
 static int t4_mem_win_rw(struct adapter *adap, u32 addr, __be32 *data, int dir)
 {
         int i;
+        u32 win_pf = is_t4(adap->chip) ? 0 : V_PFNUM(adap->fn);
 
         /*
          * Setup offset into PCIE memory window.  Address must be a
@@ -374,7 +411,7 @@ static int t4_mem_win_rw(struct adapter *adap, u32 addr, __be32 *data, int dir)
          * values.)
          */
         t4_write_reg(adap, PCIE_MEM_ACCESS_OFFSET,
-                     addr & ~(MEMWIN0_APERTURE - 1));
+                     (addr & ~(MEMWIN0_APERTURE - 1)) | win_pf);
         t4_read_reg(adap, PCIE_MEM_ACCESS_OFFSET);
 
         /* Collecting data 4 bytes at a time upto MEMWIN0_APERTURE */
@@ -410,6 +447,7 @@ static int t4_memory_rw(struct adapter *adap, int mtype, u32 addr, u32 len,
                         __be32 *buf, int dir)
 {
         u32 pos, start, end, offset, memoffset;
+        u32 edc_size, mc_size;
         int ret = 0;
         __be32 *data;
 
@@ -423,13 +461,21 @@ static int t4_memory_rw(struct adapter *adap, int mtype, u32 addr, u32 len,
         if (!data)
                 return -ENOMEM;
 
-        /*
-         * Offset into the region of memory which is being accessed
+        /* Offset into the region of memory which is being accessed
          * MEM_EDC0 = 0
          * MEM_EDC1 = 1
-         * MEM_MC   = 2
+         * MEM_MC   = 2 -- T4
+         * MEM_MC0  = 2 -- For T5
+         * MEM_MC1  = 3 -- For T5
          */
-        memoffset = (mtype * (5 * 1024 * 1024));
+        edc_size  = EDRAM_SIZE_GET(t4_read_reg(adap, MA_EDRAM0_BAR));
+        if (mtype != MEM_MC1)
+                memoffset = (mtype * (edc_size * 1024 * 1024));
+        else {
+                mc_size = EXT_MEM_SIZE_GET(t4_read_reg(adap,
+                                                       MA_EXT_MEMORY_BAR));
+                memoffset = (MEM_MC0 * edc_size + mc_size) * 1024 * 1024;
+        }
 
         /* Determine the PCIE_MEM_ACCESS_OFFSET */
         addr = addr + memoffset;
@@ -497,9 +543,9 @@ int t4_memory_write(struct adapter *adap, int mtype, u32 addr, u32 len,
 }
 
 #define EEPROM_STAT_ADDR   0x7bfc
-#define VPD_LEN            512
 #define VPD_BASE           0x400
 #define VPD_BASE_OLD       0
+#define VPD_LEN            1024
 
 /**
  *      t4_seeprom_wp - enable/disable EEPROM write protection
@@ -856,6 +902,7 @@ int t4_check_fw_version(struct adapter *adapter)
 {
         u32 api_vers[2];
         int ret, major, minor, micro;
+        int exp_major, exp_minor, exp_micro;
 
         ret = get_fw_version(adapter, &adapter->params.fw_vers);
         if (!ret)
@@ -870,17 +917,35 @@ int t4_check_fw_version(struct adapter *adapter)
         major = FW_HDR_FW_VER_MAJOR_GET(adapter->params.fw_vers);
         minor = FW_HDR_FW_VER_MINOR_GET(adapter->params.fw_vers);
         micro = FW_HDR_FW_VER_MICRO_GET(adapter->params.fw_vers);
+
+        switch (CHELSIO_CHIP_VERSION(adapter->chip)) {
+        case CHELSIO_T4:
+                exp_major = FW_VERSION_MAJOR;
+                exp_minor = FW_VERSION_MINOR;
+                exp_micro = FW_VERSION_MICRO;
+                break;
+        case CHELSIO_T5:
+                exp_major = FW_VERSION_MAJOR_T5;
+                exp_minor = FW_VERSION_MINOR_T5;
+                exp_micro = FW_VERSION_MICRO_T5;
+                break;
+        default:
+                dev_err(adapter->pdev_dev, "Unsupported chip type, %x\n",
+                        adapter->chip);
+                return -EINVAL;
+        }
+
         memcpy(adapter->params.api_vers, api_vers,
                sizeof(adapter->params.api_vers));
 
-        if (major != FW_VERSION_MAJOR) {            /* major mismatch - fail */
+        if (major != exp_major) {            /* major mismatch - fail */
                 dev_err(adapter->pdev_dev,
                         "card FW has major version %u, driver wants %u\n",
-                        major, FW_VERSION_MAJOR);
+                        major, exp_major);
                 return -EINVAL;
         }
 
-        if (minor == FW_VERSION_MINOR && micro == FW_VERSION_MICRO)
+        if (minor == exp_minor && micro == exp_micro)
                 return 0;                                   /* perfect match */
 
         /* Minor/micro version mismatch.  Report it but often it's OK. */
@@ -1246,6 +1311,45 @@ static void pcie_intr_handler(struct adapter *adapter)
                 { 0 }
         };
 
+        static struct intr_info t5_pcie_intr_info[] = {
+                { MSTGRPPERR, "Master Response Read Queue parity error",
+                  -1, 1 },
+                { MSTTIMEOUTPERR, "Master Timeout FIFO parity error", -1, 1 },
+                { MSIXSTIPERR, "MSI-X STI SRAM parity error", -1, 1 },
+                { MSIXADDRLPERR, "MSI-X AddrL parity error", -1, 1 },
+                { MSIXADDRHPERR, "MSI-X AddrH parity error", -1, 1 },
+                { MSIXDATAPERR, "MSI-X data parity error", -1, 1 },
+                { MSIXDIPERR, "MSI-X DI parity error", -1, 1 },
+                { PIOCPLGRPPERR, "PCI PIO completion Group FIFO parity error",
+                  -1, 1 },
+                { PIOREQGRPPERR, "PCI PIO request Group FIFO parity error",
+                  -1, 1 },
+                { TARTAGPERR, "PCI PCI target tag FIFO parity error", -1, 1 },
+                { MSTTAGQPERR, "PCI master tag queue parity error", -1, 1 },
+                { CREQPERR, "PCI CMD channel request parity error", -1, 1 },
+                { CRSPPERR, "PCI CMD channel response parity error", -1, 1 },
+                { DREQWRPERR, "PCI DMA channel write request parity error",
+                  -1, 1 },
+                { DREQPERR, "PCI DMA channel request parity error", -1, 1 },
+                { DRSPPERR, "PCI DMA channel response parity error", -1, 1 },
+                { HREQWRPERR, "PCI HMA channel count parity error", -1, 1 },
+                { HREQPERR, "PCI HMA channel request parity error", -1, 1 },
+                { HRSPPERR, "PCI HMA channel response parity error", -1, 1 },
+                { CFGSNPPERR, "PCI config snoop FIFO parity error", -1, 1 },
+                { FIDPERR, "PCI FID parity error", -1, 1 },
+                { VFIDPERR, "PCI INTx clear parity error", -1, 1 },
+                { MAGRPPERR, "PCI MA group FIFO parity error", -1, 1 },
+                { PIOTAGPERR, "PCI PIO tag parity error", -1, 1 },
+                { IPRXHDRGRPPERR, "PCI IP Rx header group parity error",
+                  -1, 1 },
+                { IPRXDATAGRPPERR, "PCI IP Rx data group parity error", -1, 1 },
+                { RPLPERR, "PCI IP replay buffer parity error", -1, 1 },
+                { IPSOTPERR, "PCI IP SOT buffer parity error", -1, 1 },
+                { TRGT1GRPPERR, "PCI TRGT1 group FIFOs parity error", -1, 1 },
+                { READRSPERR, "Outbound read error", -1, 0 },
+                { 0 }
+        };
+
         int fat;
 
         fat = t4_handle_intr_status(adapter,
@@ -1254,7 +1358,10 @@ static void pcie_intr_handler(struct adapter *adapter)
               t4_handle_intr_status(adapter,
                                     PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
                                     pcie_port_intr_info) +
-              t4_handle_intr_status(adapter, PCIE_INT_CAUSE, pcie_intr_info);
+              t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
+                                    is_t4(adapter->chip) ?
+                                    pcie_intr_info : t5_pcie_intr_info);
+
         if (fat)
                 t4_fatal_err(adapter);
 }
@@ -1664,7 +1771,14 @@ static void ncsi_intr_handler(struct adapter *adap)
  */
 static void xgmac_intr_handler(struct adapter *adap, int port)
 {
-        u32 v = t4_read_reg(adap, PORT_REG(port, XGMAC_PORT_INT_CAUSE));
+        u32 v, int_cause_reg;
+
+        if (is_t4(adap->chip))
+                int_cause_reg = PORT_REG(port, XGMAC_PORT_INT_CAUSE);
+        else
+                int_cause_reg = T5_PORT_REG(port, MAC_PORT_INT_CAUSE);
+
+        v = t4_read_reg(adap, int_cause_reg);
 
         v &= TXFIFO_PRTY_ERR | RXFIFO_PRTY_ERR;
         if (!v)
@@ -2126,7 +2240,9 @@ void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p)
         u32 bgmap = get_mps_bg_map(adap, idx);
 
 #define GET_STAT(name) \
-        t4_read_reg64(adap, PORT_REG(idx, MPS_PORT_STAT_##name##_L))
+        t4_read_reg64(adap, \
+        (is_t4(adap->chip) ? PORT_REG(idx, MPS_PORT_STAT_##name##_L) : \
+        T5_PORT_REG(idx, MPS_PORT_STAT_##name##_L)))
 #define GET_STAT_COM(name) t4_read_reg64(adap, MPS_STAT_##name##_L)
 
         p->tx_octets           = GET_STAT(TX_PORT_BYTES);
@@ -2205,14 +2321,26 @@ void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p)
 void t4_wol_magic_enable(struct adapter *adap, unsigned int port,
                          const u8 *addr)
 {
+        u32 mag_id_reg_l, mag_id_reg_h, port_cfg_reg;
+
+        if (is_t4(adap->chip)) {
+                mag_id_reg_l = PORT_REG(port, XGMAC_PORT_MAGIC_MACID_LO);
+                mag_id_reg_h = PORT_REG(port, XGMAC_PORT_MAGIC_MACID_HI);
+                port_cfg_reg = PORT_REG(port, XGMAC_PORT_CFG2);
+        } else {
+                mag_id_reg_l = T5_PORT_REG(port, MAC_PORT_MAGIC_MACID_LO);
+                mag_id_reg_h = T5_PORT_REG(port, MAC_PORT_MAGIC_MACID_HI);
+                port_cfg_reg = T5_PORT_REG(port, MAC_PORT_CFG2);
+        }
+
         if (addr) {
-                t4_write_reg(adap, PORT_REG(port, XGMAC_PORT_MAGIC_MACID_LO),
+                t4_write_reg(adap, mag_id_reg_l,
                              (addr[2] << 24) | (addr[3] << 16) |
                              (addr[4] << 8) | addr[5]);
-                t4_write_reg(adap, PORT_REG(port, XGMAC_PORT_MAGIC_MACID_HI),
+                t4_write_reg(adap, mag_id_reg_h,
                              (addr[0] << 8) | addr[1]);
         }
-        t4_set_reg_field(adap, PORT_REG(port, XGMAC_PORT_CFG2), MAGICEN,
+        t4_set_reg_field(adap, port_cfg_reg, MAGICEN,
                          addr ? MAGICEN : 0);
 }
 
@@ -2235,16 +2363,23 @@ int t4_wol_pat_enable(struct adapter *adap, unsigned int port, unsigned int map,
                       u64 mask0, u64 mask1, unsigned int crc, bool enable)
 {
         int i;
+        u32 port_cfg_reg;
+
+        if (is_t4(adap->chip))
+                port_cfg_reg = PORT_REG(port, XGMAC_PORT_CFG2);
+        else
+                port_cfg_reg = T5_PORT_REG(port, MAC_PORT_CFG2);
 
         if (!enable) {
-                t4_set_reg_field(adap, PORT_REG(port, XGMAC_PORT_CFG2),
-                                 PATEN, 0);
+                t4_set_reg_field(adap, port_cfg_reg, PATEN, 0);
                 return 0;
         }
         if (map > 0xff)
                 return -EINVAL;
 
-#define EPIO_REG(name) PORT_REG(port, XGMAC_PORT_EPIO_##name)
+#define EPIO_REG(name) \
+        (is_t4(adap->chip) ? PORT_REG(port, XGMAC_PORT_EPIO_##name) : \
+        T5_PORT_REG(port, MAC_PORT_EPIO_##name))
 
         t4_write_reg(adap, EPIO_REG(DATA1), mask0 >> 32);
         t4_write_reg(adap, EPIO_REG(DATA2), mask1);
@@ -2322,24 +2457,24 @@ int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox,
  *     @addr: address of first byte requested aligned on 32b.
  *     @data: len bytes to hold the data read
  *     @len: amount of data to read from window.  Must be <=
- *            MEMWIN0_APERATURE after adjusting for 16B alignment
- *            requirements of the the memory window.
+ *            MEMWIN0_APERATURE after adjusting for 16B for T4 and
+ *            128B for T5 alignment requirements of the the memory window.
  *
  *     Read len bytes of data from MC starting at @addr.
  */
 int t4_mem_win_read_len(struct adapter *adap, u32 addr, __be32 *data, int len)
 {
-        int i;
-        int off;
+        int i, off;
+        u32 win_pf = is_t4(adap->chip) ? 0 : V_PFNUM(adap->fn);
 
-        /*
-         * Align on a 16B boundary.
+        /* Align on a 2KB boundary.
          */
-        off = addr & 15;
+        off = addr & MEMWIN0_APERTURE;
         if ((addr & 3) || (len + off) > MEMWIN0_APERTURE)
                 return -EINVAL;
 
-        t4_write_reg(adap, PCIE_MEM_ACCESS_OFFSET, addr & ~15);
+        t4_write_reg(adap, PCIE_MEM_ACCESS_OFFSET,
+                     (addr & ~MEMWIN0_APERTURE) | win_pf);
         t4_read_reg(adap, PCIE_MEM_ACCESS_OFFSET);
 
         for (i = 0; i < len; i += 4)
@@ -3162,6 +3297,9 @@ int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox,
         int i, ret;
         struct fw_vi_mac_cmd c;
         struct fw_vi_mac_exact *p;
+        unsigned int max_naddr = is_t4(adap->chip) ?
+                                       NUM_MPS_CLS_SRAM_L_INSTANCES :
+                                       NUM_MPS_T5_CLS_SRAM_L_INSTANCES;
 
         if (naddr > 7)
                 return -EINVAL;
@@ -3187,8 +3325,8 @@ int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox,
                 u16 index = FW_VI_MAC_CMD_IDX_GET(ntohs(p->valid_to_idx));
 
                 if (idx)
-                        idx[i] = index >= NEXACT_MAC ? 0xffff : index;
-                if (index < NEXACT_MAC)
+                        idx[i] = index >= max_naddr ? 0xffff : index;
+                if (index < max_naddr)
                         ret++;
                 else if (hash)
                         *hash |= (1ULL << hash_mac_addr(addr[i]));
@@ -3221,6 +3359,9 @@ int t4_change_mac(struct adapter *adap, unsigned int mbox, unsigned int viid,
         int ret, mode;
         struct fw_vi_mac_cmd c;
         struct fw_vi_mac_exact *p = c.u.exact;
+        unsigned int max_mac_addr = is_t4(adap->chip) ?
+                                    NUM_MPS_CLS_SRAM_L_INSTANCES :
+                                    NUM_MPS_T5_CLS_SRAM_L_INSTANCES;
 
         if (idx < 0)                             /* new allocation */
                 idx = persist ? FW_VI_MAC_ADD_PERSIST_MAC : FW_VI_MAC_ADD_MAC;
@@ -3238,7 +3379,7 @@ int t4_change_mac(struct adapter *adap, unsigned int mbox, unsigned int viid,
         ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
         if (ret == 0) {
                 ret = FW_VI_MAC_CMD_IDX_GET(ntohs(p->valid_to_idx));
-                if (ret >= NEXACT_MAC)
+                if (ret >= max_mac_addr)
                         ret = -ENOMEM;
         }
         return ret;
@@ -3547,7 +3688,8 @@ static int get_flash_params(struct adapter *adap)
  */
 int t4_prep_adapter(struct adapter *adapter)
 {
-        int ret;
+        int ret, ver;
+        uint16_t device_id;
 
         ret = t4_wait_dev_ready(adapter);
         if (ret < 0)
@@ -3562,6 +3704,28 @@ int t4_prep_adapter(struct adapter *adapter)
                 return ret;
         }
 
+        /* Retrieve adapter's device ID
+         */
+        pci_read_config_word(adapter->pdev, PCI_DEVICE_ID, &device_id);
+        ver = device_id >> 12;
+        switch (ver) {
+        case CHELSIO_T4:
+                adapter->chip = CHELSIO_CHIP_CODE(CHELSIO_T4,
+                                                  adapter->params.rev);
+                break;
+        case CHELSIO_T5:
+                adapter->chip = CHELSIO_CHIP_CODE(CHELSIO_T5,
+                                                  adapter->params.rev);
+                break;
+        default:
+                dev_err(adapter->pdev_dev, "Device %d is not supported\n",
+                        device_id);
+                return -EINVAL;
+        }
+
+        /* Reassign the updated revision field */
+        adapter->params.rev = adapter->chip;
+
         init_cong_ctrl(adapter->params.a_wnd, adapter->params.b_wnd);
 
         /*
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
index f534ed7e10e9..1d1623be9f1e 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
@@ -47,7 +47,6 @@ enum {
         TCB_SIZE       = 128,   /* TCB size */
         NMTUS          = 16,    /* size of MTU table */
         NCCTRL_WIN     = 32,    /* # of congestion control windows */
-        NEXACT_MAC     = 336,   /* # of exact MAC address filters */
         L2T_SIZE       = 4096,  /* # of L2T entries */
         MBOX_LEN       = 64,    /* mailbox size in bytes */
         TRACE_LEN      = 112,   /* length of trace data and mask */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index 261d17703adc..01d484441200 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
@@ -74,6 +74,7 @@ enum {
         CPL_PASS_ESTABLISH    = 0x41,
         CPL_RX_DATA_DDP       = 0x42,
         CPL_PASS_ACCEPT_REQ   = 0x44,
+        CPL_TRACE_PKT_T5      = 0x48,
 
         CPL_RDMA_READ_REQ     = 0x60,
 
@@ -157,6 +158,7 @@ union opcode_tid {
 };
 
 #define CPL_OPCODE(x) ((x) << 24)
+#define G_CPL_OPCODE(x) (((x) >> 24) & 0xFF)
 #define MK_OPCODE_TID(opcode, tid) (CPL_OPCODE(opcode) | (tid))
 #define OPCODE_TID(cmd) ((cmd)->ot.opcode_tid)
 #define GET_TID(cmd) (ntohl(OPCODE_TID(cmd)) & 0xFFFFFF)
@@ -287,6 +289,23 @@ struct cpl_act_open_req {
         __be32 opt2;
 };
 
+#define S_FILTER_TUPLE  24
+#define M_FILTER_TUPLE  0xFFFFFFFFFF
+#define V_FILTER_TUPLE(x) ((x) << S_FILTER_TUPLE)
+#define G_FILTER_TUPLE(x) (((x) >> S_FILTER_TUPLE) & M_FILTER_TUPLE)
+struct cpl_t5_act_open_req {
+        WR_HDR;
+        union opcode_tid ot;
+        __be16 local_port;
+        __be16 peer_port;
+        __be32 local_ip;
+        __be32 peer_ip;
+        __be64 opt0;
+        __be32 rsvd;
+        __be32 opt2;
+        __be64 params;
+};
+
 struct cpl_act_open_req6 {
         WR_HDR;
         union opcode_tid ot;
@@ -566,6 +585,11 @@ struct cpl_rx_pkt {
 #define V_RX_ETHHDR_LEN(x) ((x) << S_RX_ETHHDR_LEN)
 #define G_RX_ETHHDR_LEN(x) (((x) >> S_RX_ETHHDR_LEN) & M_RX_ETHHDR_LEN)
 
+#define S_RX_T5_ETHHDR_LEN    0
+#define M_RX_T5_ETHHDR_LEN    0x3F
+#define V_RX_T5_ETHHDR_LEN(x) ((x) << S_RX_T5_ETHHDR_LEN)
+#define G_RX_T5_ETHHDR_LEN(x) (((x) >> S_RX_T5_ETHHDR_LEN) & M_RX_T5_ETHHDR_LEN)
+
 #define S_RX_MACIDX    8
 #define M_RX_MACIDX    0x1FF
 #define V_RX_MACIDX(x) ((x) << S_RX_MACIDX)
@@ -612,6 +636,28 @@ struct cpl_trace_pkt {
         __be64 tstamp;
 };
 
+struct cpl_t5_trace_pkt {
+        __u8 opcode;
+        __u8 intf;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 runt:4;
+        __u8 filter_hit:4;
+        __u8:6;
+        __u8 err:1;
+        __u8 trunc:1;
+#else
+        __u8 filter_hit:4;
+        __u8 runt:4;
+        __u8 trunc:1;
+        __u8 err:1;
+        __u8:6;
+#endif
+        __be16 rsvd;
+        __be16 len;
+        __be64 tstamp;
+        __be64 rsvd1;
+};
+
 struct cpl_l2t_write_req {
         WR_HDR;
         union opcode_tid ot;
@@ -643,6 +689,15 @@ struct cpl_sge_egr_update {
         __be16 pidx;
 };
 
+/* cpl_fw*.type values */
+enum {
+        FW_TYPE_CMD_RPL = 0,
+        FW_TYPE_WR_RPL = 1,
+        FW_TYPE_CQE = 2,
+        FW_TYPE_OFLD_CONNECTION_WR_RPL = 3,
+        FW_TYPE_RSSCPL = 4,
+};
+
 struct cpl_fw4_pld {
         u8 opcode;
         u8 rsvd0[3];
@@ -692,6 +747,7 @@ enum {
         FW6_TYPE_WR_RPL = 1,
         FW6_TYPE_CQE = 2,
         FW6_TYPE_OFLD_CONNECTION_WR_RPL = 3,
+        FW6_TYPE_RSSCPL = FW_TYPE_RSSCPL,
 };
 
 struct cpl_fw6_msg_ofld_connection_wr_rpl {
@@ -742,4 +798,12 @@ struct ulp_mem_io {
 #define ULP_MEMIO_LOCK(x) ((x) << 31)
 };
 
+#define S_T5_ULP_MEMIO_IMM    23
+#define V_T5_ULP_MEMIO_IMM(x) ((x) << S_T5_ULP_MEMIO_IMM)
+#define F_T5_ULP_MEMIO_IMM    V_T5_ULP_MEMIO_IMM(1U)
+
+#define S_T5_ULP_MEMIO_ORDER    22
+#define V_T5_ULP_MEMIO_ORDER(x) ((x) << S_T5_ULP_MEMIO_ORDER)
+#define F_T5_ULP_MEMIO_ORDER    V_T5_ULP_MEMIO_ORDER(1U)
+
 #endif  /* __T4_MSG_H */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
index 83ec5f7844ac..ef146c0ba481 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
@@ -68,9 +68,14 @@
 #define  QID_SHIFT   15
 #define  QID(x)      ((x) << QID_SHIFT)
 #define  DBPRIO(x)   ((x) << 14)
+#define  DBTYPE(x)   ((x) << 13)
 #define  PIDX_MASK   0x00003fffU
 #define  PIDX_SHIFT  0
 #define  PIDX(x)     ((x) << PIDX_SHIFT)
+#define  S_PIDX_T5   0
+#define  M_PIDX_T5   0x1fffU
+#define  PIDX_T5(x)  (((x) >> S_PIDX_T5) & M_PIDX_T5)
+
 
 #define SGE_PF_GTS 0x4
 #define  INGRESSQID_MASK   0xffff0000U
@@ -152,6 +157,8 @@
 #define  QUEUESPERPAGEPF0_MASK   0x0000000fU
 #define  QUEUESPERPAGEPF0_GET(x) ((x) & QUEUESPERPAGEPF0_MASK)
 
+#define QUEUESPERPAGEPF1    4
+
 #define SGE_INT_CAUSE1 0x1024
 #define SGE_INT_CAUSE2 0x1030
 #define SGE_INT_CAUSE3 0x103c
@@ -234,6 +241,10 @@
 #define SGE_DOORBELL_CONTROL 0x10a8
 #define  ENABLE_DROP        (1 << 13)
 
+#define S_NOCOALESCE    26
+#define V_NOCOALESCE(x) ((x) << S_NOCOALESCE)
+#define F_NOCOALESCE    V_NOCOALESCE(1U)
+
 #define SGE_TIMER_VALUE_0_AND_1 0x10b8
 #define  TIMERVALUE0_MASK   0xffff0000U
 #define  TIMERVALUE0_SHIFT  16
@@ -272,17 +283,36 @@
 #define S_HP_INT_THRESH    28
 #define M_HP_INT_THRESH 0xfU
 #define V_HP_INT_THRESH(x) ((x) << S_HP_INT_THRESH)
+#define S_LP_INT_THRESH_T5    18
+#define V_LP_INT_THRESH_T5(x) ((x) << S_LP_INT_THRESH_T5)
+#define M_LP_COUNT_T5    0x3ffffU
+#define G_LP_COUNT_T5(x) (((x) >> S_LP_COUNT) & M_LP_COUNT_T5)
 #define M_HP_COUNT 0x7ffU
 #define S_HP_COUNT 16
 #define G_HP_COUNT(x) (((x) >> S_HP_COUNT) & M_HP_COUNT)
 #define S_LP_INT_THRESH    12
 #define M_LP_INT_THRESH 0xfU
+#define M_LP_INT_THRESH_T5    0xfffU
 #define V_LP_INT_THRESH(x) ((x) << S_LP_INT_THRESH)
 #define M_LP_COUNT 0x7ffU
 #define S_LP_COUNT 0
 #define G_LP_COUNT(x) (((x) >> S_LP_COUNT) & M_LP_COUNT)
 #define A_SGE_DBFIFO_STATUS 0x10a4
 
+#define SGE_STAT_TOTAL 0x10e4
+#define SGE_STAT_MATCH 0x10e8
+
+#define SGE_STAT_CFG   0x10ec
+#define S_STATSOURCE_T5    9
+#define STATSOURCE_T5(x) ((x) << S_STATSOURCE_T5)
+
+#define SGE_DBFIFO_STATUS2 0x1118
+#define M_HP_COUNT_T5    0x3ffU
+#define G_HP_COUNT_T5(x) ((x)  & M_HP_COUNT_T5)
+#define S_HP_INT_THRESH_T5    10
+#define M_HP_INT_THRESH_T5    0xfU
+#define V_HP_INT_THRESH_T5(x) ((x) << S_HP_INT_THRESH_T5)
+
 #define S_ENABLE_DROP    13
 #define V_ENABLE_DROP(x) ((x) << S_ENABLE_DROP)
 #define F_ENABLE_DROP    V_ENABLE_DROP(1U)
@@ -331,8 +361,27 @@
 #define  MSIADDRHPERR  0x00000002U
 #define  MSIADDRLPERR  0x00000001U
 
+#define  READRSPERR      0x20000000U
+#define  TRGT1GRPPERR    0x10000000U
+#define  IPSOTPERR       0x08000000U
+#define  IPRXDATAGRPPERR 0x02000000U
+#define  IPRXHDRGRPPERR  0x01000000U
+#define  MAGRPPERR       0x00400000U
+#define  VFIDPERR        0x00200000U
+#define  HREQWRPERR      0x00010000U
+#define  DREQWRPERR      0x00002000U
+#define  MSTTAGQPERR     0x00000400U
+#define  PIOREQGRPPERR   0x00000100U
+#define  PIOCPLGRPPERR   0x00000080U
+#define  MSIXSTIPERR     0x00000004U
+#define  MSTTIMEOUTPERR  0x00000002U
+#define  MSTGRPPERR      0x00000001U
+
 #define PCIE_NONFAT_ERR 0x3010
 #define PCIE_MEM_ACCESS_BASE_WIN 0x3068
+#define S_PCIEOFST       10
+#define M_PCIEOFST       0x3fffffU
+#define GET_PCIEOFST(x)  (((x) >> S_PCIEOFST) & M_PCIEOFST)
 #define  PCIEOFST_MASK   0xfffffc00U
 #define  BIR_MASK        0x00000300U
 #define  BIR_SHIFT       8
@@ -342,6 +391,9 @@
 #define  WINDOW(x)       ((x) << WINDOW_SHIFT)
 #define PCIE_MEM_ACCESS_OFFSET 0x306c
 
+#define S_PFNUM    0
+#define V_PFNUM(x) ((x) << S_PFNUM)
+
 #define PCIE_FW 0x30b8
 #define  PCIE_FW_ERR            0x80000000U
 #define  PCIE_FW_INIT           0x40000000U
@@ -407,12 +459,18 @@
 
 #define MC_BIST_STATUS_RDATA 0x7688
 
+#define MA_EDRAM0_BAR 0x77c0
+#define MA_EDRAM1_BAR 0x77c4
+#define EDRAM_SIZE_MASK   0xfffU
+#define EDRAM_SIZE_GET(x) ((x) & EDRAM_SIZE_MASK)
+
 #define MA_EXT_MEMORY_BAR 0x77c8
 #define  EXT_MEM_SIZE_MASK   0x00000fffU
 #define  EXT_MEM_SIZE_SHIFT  0
 #define  EXT_MEM_SIZE_GET(x) (((x) & EXT_MEM_SIZE_MASK) >> EXT_MEM_SIZE_SHIFT)
 
 #define MA_TARGET_MEM_ENABLE 0x77d8
+#define  EXT_MEM1_ENABLE 0x00000010U
 #define  EXT_MEM_ENABLE 0x00000004U
 #define  EDRAM1_ENABLE  0x00000002U
 #define  EDRAM0_ENABLE  0x00000001U
@@ -431,6 +489,7 @@
 #define MA_PCIE_FW 0x30b8
 #define MA_PARITY_ERROR_STATUS 0x77f4
 
+#define MA_EXT_MEMORY1_BAR 0x7808
 #define EDC_0_BASE_ADDR 0x7900
 
 #define EDC_BIST_CMD 0x7904
@@ -801,6 +860,15 @@
 #define MPS_PORT_STAT_RX_PORT_PPP7_H 0x60c
 #define MPS_PORT_STAT_RX_PORT_LESS_64B_L 0x610
 #define MPS_PORT_STAT_RX_PORT_LESS_64B_H 0x614
+#define MAC_PORT_CFG2 0x818
+#define MAC_PORT_MAGIC_MACID_LO 0x824
+#define MAC_PORT_MAGIC_MACID_HI 0x828
+#define MAC_PORT_EPIO_DATA0 0x8c0
+#define MAC_PORT_EPIO_DATA1 0x8c4
+#define MAC_PORT_EPIO_DATA2 0x8c8
+#define MAC_PORT_EPIO_DATA3 0x8cc
+#define MAC_PORT_EPIO_OP 0x8d0
+
 #define MPS_CMN_CTL 0x9000
 #define  NUMPORTS_MASK   0x00000003U
 #define  NUMPORTS_SHIFT  0
@@ -1063,6 +1131,7 @@
 #define  ADDRESS_SHIFT  0
 #define  ADDRESS(x)     ((x) << ADDRESS_SHIFT)
 
+#define MAC_PORT_INT_CAUSE 0x8dc
 #define XGMAC_PORT_INT_CAUSE 0x10dc
 
 #define A_TP_TX_MOD_QUEUE_REQ_MAP 0x7e28
@@ -1101,4 +1170,33 @@
 #define V_PORT(x) ((x) << S_PORT)
 #define F_PORT    V_PORT(1U)
 
+#define NUM_MPS_CLS_SRAM_L_INSTANCES 336
+#define NUM_MPS_T5_CLS_SRAM_L_INSTANCES 512
+
+#define T5_PORT0_BASE 0x30000
+#define T5_PORT_STRIDE 0x4000
+#define T5_PORT_BASE(idx) (T5_PORT0_BASE + (idx) * T5_PORT_STRIDE)
+#define T5_PORT_REG(idx, reg) (T5_PORT_BASE(idx) + (reg))
+
+#define MC_0_BASE_ADDR 0x40000
+#define MC_1_BASE_ADDR 0x48000
+#define MC_STRIDE (MC_1_BASE_ADDR - MC_0_BASE_ADDR)
+#define MC_REG(reg, idx) (reg + MC_STRIDE * idx)
+
+#define MC_P_BIST_CMD 0x41400
+#define MC_P_BIST_CMD_ADDR 0x41404
+#define MC_P_BIST_CMD_LEN 0x41408
+#define MC_P_BIST_DATA_PATTERN 0x4140c
+#define MC_P_BIST_STATUS_RDATA 0x41488
+#define EDC_T50_BASE_ADDR 0x50000
+#define EDC_H_BIST_CMD 0x50004
+#define EDC_H_BIST_CMD_ADDR 0x50008
+#define EDC_H_BIST_CMD_LEN 0x5000c
+#define EDC_H_BIST_DATA_PATTERN 0x50010
+#define EDC_H_BIST_STATUS_RDATA 0x50028
+
+#define EDC_T51_BASE_ADDR 0x50800
+#define EDC_STRIDE_T5 (EDC_T51_BASE_ADDR - EDC_T50_BASE_ADDR)
+#define EDC_REG_T5(reg, idx) (reg + EDC_STRIDE_T5 * idx)
+
 #endif /* __T4_REGS_H */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
index a0dcccd846c9..d1c755f78aaf 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
@@ -574,7 +574,7 @@ struct fw_eth_tx_pkt_vm_wr {
         __be16 vlantci;
 };
 
-#define FW_CMD_MAX_TIMEOUT 3000
+#define FW_CMD_MAX_TIMEOUT 10000
 
 /*
  * If a host driver does a HELLO and discovers that there's already a MASTER
@@ -973,7 +973,9 @@ enum fw_params_param_pfvf {
         FW_PARAMS_PARAM_PFVF_EQ_START   = 0x2B,
         FW_PARAMS_PARAM_PFVF_EQ_END     = 0x2C,
         FW_PARAMS_PARAM_PFVF_ACTIVE_FILTER_START = 0x2D,
-        FW_PARAMS_PARAM_PFVF_ACTIVE_FILTER_END = 0x2E
+        FW_PARAMS_PARAM_PFVF_ACTIVE_FILTER_END = 0x2E,
+        FW_PARAMS_PARAM_PFVF_ETHOFLD_END = 0x30,
+        FW_PARAMS_PARAM_PFVF_CPLFW4MSG_ENCAP = 0x31
 };
 
 /*
@@ -1758,6 +1760,25 @@ enum fw_port_module_type {
         FW_PORT_MOD_TYPE_NONE = FW_PORT_CMD_MODTYPE_MASK
 };
 
+enum fw_port_mod_sub_type {
+        FW_PORT_MOD_SUB_TYPE_NA,
+        FW_PORT_MOD_SUB_TYPE_MV88E114X = 0x1,
+        FW_PORT_MOD_SUB_TYPE_TN8022 = 0x2,
+        FW_PORT_MOD_SUB_TYPE_AQ1202 = 0x3,
+        FW_PORT_MOD_SUB_TYPE_88x3120 = 0x4,
+        FW_PORT_MOD_SUB_TYPE_BCM84834 = 0x5,
+        FW_PORT_MOD_SUB_TYPE_BT_VSC8634 = 0x8,
+
+        /* The following will never been in the VPD.  They are TWINAX cable
+         * lengths decoded from SFP+ module i2c PROMs.  These should
+         * almost certainly go somewhere else ...
+         */
+        FW_PORT_MOD_SUB_TYPE_TWINAX_1 = 0x9,
+        FW_PORT_MOD_SUB_TYPE_TWINAX_3 = 0xA,
+        FW_PORT_MOD_SUB_TYPE_TWINAX_5 = 0xB,
+        FW_PORT_MOD_SUB_TYPE_TWINAX_7 = 0xC,
+};
+
 /* port stats */
 #define FW_NUM_PORT_STATS 50
 #define FW_NUM_PORT_TX_STATS 23
@@ -2123,11 +2144,11 @@ struct fw_hdr {
         u8 intfver_ri;
         u8 intfver_iscsipdu;
         u8 intfver_iscsi;
+        u8 intfver_fcoepdu;
         u8 intfver_fcoe;
-        u8 reserved2;
+        __u32   reserved2;
         __u32   reserved3;
         __u32   reserved4;
-        __u32   reserved5;
         __be32  flags;
         __be32  reserved6[23];
 };
@@ -2137,6 +2158,17 @@ struct fw_hdr {
 #define FW_HDR_FW_VER_MICRO_GET(x) (((x) >> 8) & 0xff)
 #define FW_HDR_FW_VER_BUILD_GET(x) (((x) >> 0) & 0xff)
 
+enum fw_hdr_intfver {
+        FW_HDR_INTFVER_NIC      = 0x00,
+        FW_HDR_INTFVER_VNIC     = 0x00,
+        FW_HDR_INTFVER_OFLD     = 0x00,
+        FW_HDR_INTFVER_RI       = 0x00,
+        FW_HDR_INTFVER_ISCSIPDU = 0x00,
+        FW_HDR_INTFVER_ISCSI    = 0x00,
+        FW_HDR_INTFVER_FCOEPDU  = 0x00,
+        FW_HDR_INTFVER_FCOE     = 0x00,
+};
+
 enum fw_hdr_flags {
         FW_HDR_FLAGS_RESET_HALT = 0x00000001,
 };
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
index 68eaa9c88c7d..be5c7ef6ca93 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
@@ -344,6 +344,7 @@ struct adapter {
         unsigned long registered_device_map;
         unsigned long open_device_map;
         unsigned long flags;
+        enum chip_type chip;
         struct adapter_params params;
 
         /* queue and interrupt resources */
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 56b46ab2d4c5..40c22e7de15c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -54,8 +54,8 @@
 /*
  * Generic information about the driver.
  */
-#define DRV_VERSION "1.0.0"
-#define DRV_DESC "Chelsio T4 Virtual Function (VF) Network Driver"
+#define DRV_VERSION "2.0.0-ko"
+#define DRV_DESC "Chelsio T4/T5 Virtual Function (VF) Network Driver"
 
 /*
  * Module Parameters.
@@ -409,6 +409,20 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,
                 break;
         }
 
+        case CPL_FW4_MSG: {
+                /* FW can send EGR_UPDATEs encapsulated in a CPL_FW4_MSG.
+                 */
+                const struct cpl_sge_egr_update *p = (void *)(rsp + 3);
+                opcode = G_CPL_OPCODE(ntohl(p->opcode_qid));
+                if (opcode != CPL_SGE_EGR_UPDATE) {
+                        dev_err(adapter->pdev_dev, "unexpected FW4/CPL %#x on FW event queue\n"
+                                , opcode);
+                        break;
+                }
+                cpl = (void *)p;
+                /*FALLTHROUGH*/
+        }
+
         case CPL_SGE_EGR_UPDATE: {
                 /*
                  * We've received an Egress Queue Status Update message.  We
@@ -1050,7 +1064,7 @@ static inline unsigned int mk_adap_vers(const struct adapter *adapter)
         /*
          * Chip version 4, revision 0x3f (cxgb4vf).
          */
-        return 4 | (0x3f << 10);
+        return CHELSIO_CHIP_VERSION(adapter->chip) | (0x3f << 10);
 }
 
 /*
@@ -1100,10 +1114,10 @@ static netdev_features_t cxgb4vf_fix_features(struct net_device *dev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -1114,9 +1128,9 @@ static int cxgb4vf_set_features(struct net_device *dev,
         struct port_info *pi = netdev_priv(dev);
         netdev_features_t changed = dev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 t4vf_set_rxmode(pi->adapter, pi->viid, -1, -1, -1, -1,
-                                features & NETIF_F_HW_VLAN_TX, 0);
+                                features & NETIF_F_HW_VLAN_CTAG_TX, 0);
 
         return 0;
 }
@@ -2072,6 +2086,7 @@ static int adap_init0(struct adapter *adapter)
         struct sge *s = &adapter->sge;
         unsigned int ethqsets;
         int err;
+        u32 param, val = 0;
 
         /*
          * Wait for the device to become ready before proceeding ...
@@ -2099,6 +2114,15 @@ static int adap_init0(struct adapter *adapter)
                 return err;
         }
 
+        switch (adapter->pdev->device >> 12) {
+        case CHELSIO_T4:
+                adapter->chip = CHELSIO_CHIP_CODE(CHELSIO_T4, 0);
+                break;
+        case CHELSIO_T5:
+                adapter->chip = CHELSIO_CHIP_CODE(CHELSIO_T5, 0);
+                break;
+        }
+
         /*
          * Grab basic operational parameters.  These will predominantly have
          * been set up by the Physical Function Driver or will be hard coded
@@ -2144,6 +2168,16 @@ static int adap_init0(struct adapter *adapter)
                 return err;
         }
 
+        /* If we're running on newer firmware, let it know that we're
+         * prepared to deal with encapsulated CPL messages.  Older
+         * firmware won't understand this and we'll just get
+         * unencapsulated messages ...
+         */
+        param = FW_PARAMS_MNEM(FW_PARAMS_MNEM_PFVF) |
+                FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_PFVF_CPLFW4MSG_ENCAP);
+        val = 1;
+        (void) t4vf_set_params(adapter, 1, &param, &val);
+
         /*
          * Retrieve our RX interrupt holdoff timer values and counter
          * threshold values from the SGE parameters.
@@ -2614,11 +2648,12 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
 
                 netdev->hw_features = NETIF_F_SG | TSO_FLAGS |
                         NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-                        NETIF_F_HW_VLAN_RX | NETIF_F_RXCSUM;
+                        NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_RXCSUM;
                 netdev->vlan_features = NETIF_F_SG | TSO_FLAGS |
                         NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                         NETIF_F_HIGHDMA;
-                netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX;
+                netdev->features = netdev->hw_features |
+                                   NETIF_F_HW_VLAN_CTAG_TX;
                 if (pci_using_dac)
                         netdev->features |= NETIF_F_HIGHDMA;
 
@@ -2888,6 +2923,26 @@ static struct pci_device_id cxgb4vf_pci_tbl[] = {
         CH_DEVICE(0x480a, 0),   /* T404-bt */
         CH_DEVICE(0x480d, 0),   /* T480-cr */
         CH_DEVICE(0x480e, 0),   /* T440-lp-cr */
+        CH_DEVICE(0x5800, 0),   /* T580-dbg */
+        CH_DEVICE(0x5801, 0),   /* T520-cr */
+        CH_DEVICE(0x5802, 0),   /* T522-cr */
+        CH_DEVICE(0x5803, 0),   /* T540-cr */
+        CH_DEVICE(0x5804, 0),   /* T520-bch */
+        CH_DEVICE(0x5805, 0),   /* T540-bch */
+        CH_DEVICE(0x5806, 0),   /* T540-ch */
+        CH_DEVICE(0x5807, 0),   /* T520-so */
+        CH_DEVICE(0x5808, 0),   /* T520-cx */
+        CH_DEVICE(0x5809, 0),   /* T520-bt */
+        CH_DEVICE(0x580a, 0),   /* T504-bt */
+        CH_DEVICE(0x580b, 0),   /* T520-sr */
+        CH_DEVICE(0x580c, 0),   /* T504-bt */
+        CH_DEVICE(0x580d, 0),   /* T580-cr */
+        CH_DEVICE(0x580e, 0),   /* T540-lp-cr */
+        CH_DEVICE(0x580f, 0),   /* Amsterdam */
+        CH_DEVICE(0x5810, 0),   /* T580-lp-cr */
+        CH_DEVICE(0x5811, 0),   /* T520-lp-cr */
+        CH_DEVICE(0x5812, 0),   /* T560-cr */
+        CH_DEVICE(0x5813, 0),   /* T580-cr */
         { 0, }
 };
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index 9488032d6d2d..df296af20bd5 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -528,17 +528,21 @@ static void unmap_rx_buf(struct adapter *adapter, struct sge_fl *fl)
  */
 static inline void ring_fl_db(struct adapter *adapter, struct sge_fl *fl)
 {
+        u32 val;
+
         /*
          * The SGE keeps track of its Producer and Consumer Indices in terms
          * of Egress Queue Units so we can only tell it about integral numbers
          * of multiples of Free List Entries per Egress Queue Units ...
          */
         if (fl->pend_cred >= FL_PER_EQ_UNIT) {
+                val = PIDX(fl->pend_cred / FL_PER_EQ_UNIT);
+                if (!is_t4(adapter->chip))
+                        val |= DBTYPE(1);
                 wmb();
                 t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL,
                              DBPRIO(1) |
-                             QID(fl->cntxt_id) |
-                             PIDX(fl->pend_cred / FL_PER_EQ_UNIT));
+                             QID(fl->cntxt_id) | val);
                 fl->pend_cred %= FL_PER_EQ_UNIT;
         }
 }
@@ -1478,7 +1482,8 @@ static void do_gro(struct sge_eth_rxq *rxq, const struct pkt_gl *gl,
         skb_record_rx_queue(skb, rxq->rspq.idx);
 
         if (pkt->vlan_ex) {
-                __vlan_hwaccel_put_tag(skb, be16_to_cpu(pkt->vlan));
+                __vlan_hwaccel_put_tag(skb, cpu_to_be16(ETH_P_8021Q),
+                                        be16_to_cpu(pkt->vlan));
                 rxq->stats.vlan_ex++;
         }
         ret = napi_gro_frags(&rxq->rspq.napi);
@@ -1547,7 +1552,7 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
 
         if (pkt->vlan_ex) {
                 rxq->stats.vlan_ex++;
-                __vlan_hwaccel_put_tag(skb, be16_to_cpu(pkt->vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(pkt->vlan));
         }
 
         netif_receive_skb(skb);
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
index 283f9d0d37fd..53cbfed21d0b 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
@@ -38,6 +38,25 @@
 
 #include "../cxgb4/t4fw_api.h"
 
+#define CHELSIO_CHIP_CODE(version, revision) (((version) << 4) | (revision))
+#define CHELSIO_CHIP_VERSION(code) ((code) >> 4)
+#define CHELSIO_CHIP_RELEASE(code) ((code) & 0xf)
+
+#define CHELSIO_T4              0x4
+#define CHELSIO_T5              0x5
+
+enum chip_type {
+        T4_A1 = CHELSIO_CHIP_CODE(CHELSIO_T4, 0),
+        T4_A2 = CHELSIO_CHIP_CODE(CHELSIO_T4, 1),
+        T4_A3 = CHELSIO_CHIP_CODE(CHELSIO_T4, 2),
+        T4_FIRST_REV    = T4_A1,
+        T4_LAST_REV     = T4_A3,
+
+        T5_A1 = CHELSIO_CHIP_CODE(CHELSIO_T5, 0),
+        T5_FIRST_REV    = T5_A1,
+        T5_LAST_REV     = T5_A1,
+};
+
 /*
  * The "len16" field of a Firmware Command Structure ...
  */
@@ -232,6 +251,11 @@ static inline int t4vf_wr_mbox_ns(struct adapter *adapter, const void *cmd,
         return t4vf_wr_mbox_core(adapter, cmd, size, rpl, false);
 }
 
+static inline int is_t4(enum chip_type chip)
+{
+        return (chip >= T4_FIRST_REV && chip <= T4_LAST_REV);
+}
+
 int t4vf_wait_dev_ready(struct adapter *);
 int t4vf_port_init(struct adapter *, int);
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
index 7127c7b9efde..9f96dc3bb112 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
@@ -1027,8 +1027,11 @@ int t4vf_alloc_mac_filt(struct adapter *adapter, unsigned int viid, bool free,
         unsigned nfilters = 0;
         unsigned int rem = naddr;
         struct fw_vi_mac_cmd cmd, rpl;
+        unsigned int max_naddr = is_t4(adapter->chip) ?
+                                 NUM_MPS_CLS_SRAM_L_INSTANCES :
+                                 NUM_MPS_T5_CLS_SRAM_L_INSTANCES;
 
-        if (naddr > FW_CLS_TCAM_NUM_ENTRIES)
+        if (naddr > max_naddr)
                 return -EINVAL;
 
         for (offset = 0; offset < naddr; /**/) {
@@ -1069,10 +1072,10 @@ int t4vf_alloc_mac_filt(struct adapter *adapter, unsigned int viid, bool free,
 
                         if (idx)
                                 idx[offset+i] =
-                                        (index >= FW_CLS_TCAM_NUM_ENTRIES
+                                        (index >= max_naddr
                                          ? 0xffff
                                          : index);
-                        if (index < FW_CLS_TCAM_NUM_ENTRIES)
+                        if (index < max_naddr)
                                 nfilters++;
                         else if (hash)
                                 *hash |= (1ULL << hash_mac_addr(addr[offset+i]));
@@ -1118,6 +1121,9 @@ int t4vf_change_mac(struct adapter *adapter, unsigned int viid,
         struct fw_vi_mac_exact *p = &cmd.u.exact[0];
         size_t len16 = DIV_ROUND_UP(offsetof(struct fw_vi_mac_cmd,
                                              u.exact[1]), 16);
+        unsigned int max_naddr = is_t4(adapter->chip) ?
+                                 NUM_MPS_CLS_SRAM_L_INSTANCES :
+                                 NUM_MPS_T5_CLS_SRAM_L_INSTANCES;
 
         /*
          * If this is a new allocation, determine whether it should be
@@ -1140,7 +1146,7 @@ int t4vf_change_mac(struct adapter *adapter, unsigned int viid,
         if (ret == 0) {
                 p = &rpl.u.exact[0];
                 ret = FW_VI_MAC_CMD_IDX_GET(be16_to_cpu(p->valid_to_idx));
-                if (ret >= FW_CLS_TCAM_NUM_ENTRIES)
+                if (ret >= max_naddr)
                         ret = -ENOMEM;
         }
         return ret;
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index 138446957786..19f642a45f40 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -101,23 +101,6 @@ static char version[] __initdata =
  * them to system IRQ numbers. This mapping is card specific and is set to
  * the configuration of the Cirrus Eval board for this chip.
  */
-#if defined(CONFIG_MACH_IXDP2351)
-#define CS89x0_NONISA_IRQ
-static unsigned int netcard_portlist[] __used __initdata = {
-        IXDP2351_VIRT_CS8900_BASE, 0
-};
-static unsigned int cs8900_irq_map[] = {
-        IRQ_IXDP2351_CS8900, 0, 0, 0
-};
-#elif defined(CONFIG_ARCH_IXDP2X01)
-#define CS89x0_NONISA_IRQ
-static unsigned int netcard_portlist[] __used __initdata = {
-        IXDP2X01_CS8900_VIRT_BASE, 0
-};
-static unsigned int cs8900_irq_map[] = {
-        IRQ_IXDP2X01_CS8900, 0, 0, 0
-};
-#else
 #ifndef CONFIG_CS89x0_PLATFORM
 static unsigned int netcard_portlist[] __used __initdata = {
         0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240,
@@ -127,7 +110,6 @@ static unsigned int cs8900_irq_map[] = {
         10, 11, 12, 5
 };
 #endif
-#endif
 
 #if DEBUGGING
 static unsigned int net_debug = DEBUGGING;
@@ -210,32 +192,6 @@ static int __init media_fn(char *str)
 __setup("cs89x0_media=", media_fn);
 #endif
 
-#if defined(CONFIG_MACH_IXDP2351)
-static u16
-readword(unsigned long base_addr, int portno)
-{
-        return __raw_readw(base_addr + (portno << 1));
-}
-
-static void
-writeword(unsigned long base_addr, int portno, u16 value)
-{
-        __raw_writew(value, base_addr + (portno << 1));
-}
-#elif defined(CONFIG_ARCH_IXDP2X01)
-static u16
-readword(unsigned long base_addr, int portno)
-{
-        return __raw_readl(base_addr + (portno << 1));
-}
-
-static void
-writeword(unsigned long base_addr, int portno, u16 value)
-{
-        __raw_writel(value, base_addr + (portno << 1));
-}
-#endif
-
 static void readwords(struct net_local *lp, int portno, void *buf, int length)
 {
         u8 *buf8 = (u8 *)buf;
@@ -478,9 +434,6 @@ dma_rx(struct net_device *dev)
         /* Malloc up new buffer. */
         skb = netdev_alloc_skb(dev, length + 2);
         if (skb == NULL) {
-                /* I don't think we want to do this to a stressed system */
-                cs89_dbg(0, err, "%s: Memory squeeze, dropping packet\n",
-                         dev->name);
                 dev->stats.rx_dropped++;
 
                 /* AKPM: advance bp to the next frame */
@@ -731,9 +684,6 @@ net_rx(struct net_device *dev)
         /* Malloc up new buffer. */
         skb = netdev_alloc_skb(dev, length + 2);
         if (skb == NULL) {
-#if 0           /* Again, this seems a cruel thing to do */
-                pr_warn("%s: Memory squeeze, dropping packet\n", dev->name);
-#endif
                 dev->stats.rx_dropped++;
                 return;
         }
@@ -908,7 +858,7 @@ net_open(struct net_device *dev)
                         goto bad_out;
                 }
         } else {
-#if !defined(CS89x0_NONISA_IRQ) && !defined(CONFIG_CS89x0_PLATFORM)
+#if !defined(CONFIG_CS89x0_PLATFORM)
                 if (((1 << dev->irq) & lp->irq_map) == 0) {
                         pr_err("%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
                                dev->name, dev->irq, lp->irq_map);
@@ -1321,9 +1271,7 @@ static const struct net_device_ops net_ops = {
 static void __init reset_chip(struct net_device *dev)
 {
 #if !defined(CONFIG_MACH_MX31ADS)
-#if !defined(CS89x0_NONISA_IRQ)
         struct net_local *lp = netdev_priv(dev);
-#endif /* CS89x0_NONISA_IRQ */
         int reset_start_time;
 
         writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
@@ -1331,7 +1279,6 @@ static void __init reset_chip(struct net_device *dev)
         /* wait 30 ms */
         msleep(30);
 
-#if !defined(CS89x0_NONISA_IRQ)
         if (lp->chip_type != CS8900) {
                 /* Hardware problem requires PNP registers to be reconfigured after a reset */
                 iowrite16(PP_CS8920_ISAINT, lp->virt_addr + ADD_PORT);
@@ -1344,7 +1291,6 @@ static void __init reset_chip(struct net_device *dev)
                 iowrite8((dev->mem_start >> 8) & 0xff,
                          lp->virt_addr + DATA_PORT + 1);
         }
-#endif /* CS89x0_NONISA_IRQ */
 
         /* Wait until the chip is reset */
         reset_start_time = jiffies;
@@ -1579,9 +1525,6 @@ cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)
                 i = lp->isa_config & INT_NO_MASK;
 #ifndef CONFIG_CS89x0_PLATFORM
                 if (lp->chip_type == CS8900) {
-#ifdef CS89x0_NONISA_IRQ
-                        i = cs8900_irq_map[0];
-#else
                         /* Translate the IRQ using the IRQ mapping table. */
                         if (i >= ARRAY_SIZE(cs8900_irq_map))
                                 pr_err("invalid ISA interrupt number %d\n", i);
@@ -1599,7 +1542,6 @@ cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)
                                         lp->irq_map = ((irq_map_buff[0] >> 8) |
                                                        (irq_map_buff[1] << 8));
                         }
-#endif
                 }
 #endif
                 if (!dev->irq)
@@ -1978,18 +1920,6 @@ static struct platform_driver cs89x0_driver = {
         .remove = cs89x0_platform_remove,
 };
 
-static int __init cs89x0_init(void)
-{
-        return platform_driver_probe(&cs89x0_driver, cs89x0_platform_probe);
-}
-
-module_init(cs89x0_init);
-
-static void __exit cs89x0_cleanup(void)
-{
-        platform_driver_unregister(&cs89x0_driver);
-}
-
-module_exit(cs89x0_cleanup);
+module_platform_driver_probe(cs89x0_driver, cs89x0_platform_probe);
 
 #endif /* CONFIG_CS89x0_PLATFORM */
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index 354cbb78ed50..67b0388b6e68 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -887,18 +887,7 @@ static struct platform_driver ep93xx_eth_driver = {
         },
 };
 
-static int __init ep93xx_eth_init_module(void)
-{
-        printk(KERN_INFO DRV_MODULE_NAME " version " DRV_MODULE_VERSION " loading\n");
-        return platform_driver_register(&ep93xx_eth_driver);
-}
-
-static void __exit ep93xx_eth_cleanup_module(void)
-{
-        platform_driver_unregister(&ep93xx_eth_driver);
-}
+module_platform_driver(ep93xx_eth_driver);
 
-module_init(ep93xx_eth_init_module);
-module_exit(ep93xx_eth_cleanup_module);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:ep93xx-eth");
diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c
index bf0fc56dba19..4b6e5695b263 100644
--- a/drivers/net/ethernet/cisco/enic/enic_dev.c
+++ b/drivers/net/ethernet/cisco/enic/enic_dev.c
@@ -212,7 +212,7 @@ int enic_dev_deinit_done(struct enic *enic, int *status)
 }
 
 /* rtnl lock is held */
-int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+int enic_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct enic *enic = netdev_priv(netdev);
         int err;
@@ -225,7 +225,7 @@ int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 }
 
 /* rtnl lock is held */
-int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+int enic_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct enic *enic = netdev_priv(netdev);
         int err;
diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h
index da1cba3c410e..08bded051b93 100644
--- a/drivers/net/ethernet/cisco/enic/enic_dev.h
+++ b/drivers/net/ethernet/cisco/enic/enic_dev.h
@@ -46,8 +46,8 @@ int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
         int broadcast, int promisc, int allmulti);
 int enic_dev_add_addr(struct enic *enic, u8 *addr);
 int enic_dev_del_addr(struct enic *enic, u8 *addr);
-int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+int enic_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid);
+int enic_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid);
 int enic_dev_notify_unset(struct enic *enic);
 int enic_dev_hang_notify(struct enic *enic);
 int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index ec1a233622c6..635f55992d7e 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1300,7 +1300,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
                 }
 
                 if (vlan_stripped)
-                        __vlan_hwaccel_put_tag(skb, vlan_tci);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tci);
 
                 if (netdev->features & NETIF_F_GRO)
                         napi_gro_receive(&enic->napi[q_number], skb);
@@ -2496,9 +2496,9 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->watchdog_timeo = 2 * HZ;
         netdev->ethtool_ops = &enic_ethtool_ops;
 
-        netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        netdev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
         if (ENIC_SETTING(enic, LOOP)) {
-                netdev->features &= ~NETIF_F_HW_VLAN_TX;
+                netdev->features &= ~NETIF_F_HW_VLAN_CTAG_TX;
                 enic->loop_enable = 1;
                 enic->loop_tag = enic->config.loop_tag;
                 dev_info(dev, "loopback tag=0x%04x\n", enic->loop_tag);
diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
index 605b22283be1..97455c573db5 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_dev.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_dev.c
@@ -308,6 +308,9 @@ static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
 
                         if (status & STAT_ERROR) {
                                 err = (int)readq(&devcmd->args[0]);
+                                if (err == ERR_EINVAL &&
+                                    cmd == CMD_CAPABILITY)
+                                        return err;
                                 if (err != ERR_ECMDUNKNOWN ||
                                     cmd != CMD_CAPABILITY)
                                         pr_err("Error %d devcmd %d\n",
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 9eada8e86078..9105465b2a1a 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1693,22 +1693,7 @@ static struct platform_driver dm9000_driver = {
         .remove  = dm9000_drv_remove,
 };
 
-static int __init
-dm9000_init(void)
-{
-        printk(KERN_INFO "%s Ethernet Driver, V%s\n", CARDNAME, DRV_VERSION);
-
-        return platform_driver_register(&dm9000_driver);
-}
-
-static void __exit
-dm9000_cleanup(void)
-{
-        platform_driver_unregister(&dm9000_driver);
-}
-
-module_init(dm9000_init);
-module_exit(dm9000_cleanup);
+module_platform_driver(dm9000_driver);
 
 MODULE_AUTHOR("Sascha Hauer, Ben Dooks");
 MODULE_DESCRIPTION("Davicom DM9000 network driver");
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 88feced9a629..cdbcd1643141 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -236,17 +236,14 @@ static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         private->rx_buffer = dma_alloc_coherent(d, 8192,
                                                 &private->rx_dma_handle,
                                                 GFP_KERNEL);
-        if (private->rx_buffer == NULL) {
-                pr_err("%s: no memory for rx buffer\n", __func__);
+        if (private->rx_buffer == NULL)
                 goto rx_buf_fail;
-        }
+
         private->tx_buffer = dma_alloc_coherent(d, 8192,
                                                 &private->tx_dma_handle,
                                                 GFP_KERNEL);
-        if (private->tx_buffer == NULL) {
-                pr_err("%s: no memory for tx buffer\n", __func__);
+        if (private->tx_buffer == NULL)
                 goto tx_buf_fail;
-        }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
index 110d26f4c602..afa8e3af2c4d 100644
--- a/drivers/net/ethernet/dlink/dl2k.c
+++ b/drivers/net/ethernet/dlink/dl2k.c
@@ -580,12 +580,9 @@ alloc_list (struct net_device *dev)
 
                 skb = netdev_alloc_skb_ip_align(dev, np->rx_buf_sz);
                 np->rx_skbuff[i] = skb;
-                if (skb == NULL) {
-                        printk (KERN_ERR
-                                "%s: alloc_list: allocate Rx buffer error! ",
-                                dev->name);
+                if (skb == NULL)
                         break;
-                }
+
                 /* Rubicon now supports 40 bits of addressing space. */
                 np->rx_ring[i].fraginfo =
                     cpu_to_le64 ( pci_map_single (
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 29aff55f2eea..234ce6f07544 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -214,6 +214,7 @@ struct be_tx_stats {
 };
 
 struct be_tx_obj {
+        u32 db_offset;
         struct be_queue_info q;
         struct be_queue_info cq;
         /* Remember the skbs that were transmitted */
@@ -292,7 +293,7 @@ struct be_drv_stats {
         u32 rx_in_range_errors;
         u32 rx_out_range_errors;
         u32 rx_frame_too_long;
-        u32 rx_address_mismatch_drops;
+        u32 rx_address_filtered;
         u32 rx_dropped_too_small;
         u32 rx_dropped_too_short;
         u32 rx_dropped_header_too_small;
@@ -328,6 +329,7 @@ enum vf_state {
 #define BE_FLAGS_WORKER_SCHEDULED               (1 << 3)
 #define BE_UC_PMAC_COUNT                30
 #define BE_VF_UC_PMAC_COUNT             2
+#define BE_FLAGS_QNQ_ASYNC_EVT_RCVD             (1 << 11)
 
 struct phy_info {
         u8 transceiver;
@@ -434,6 +436,8 @@ struct be_adapter {
         u8 wol_cap;
         bool wol;
         u32 uc_macs;            /* Count of secondary UC MAC programmed */
+        u16 asic_rev;
+        u16 qnq_vid;
         u32 msg_enable;
         int be_get_temp_freq;
         u16 max_mcast_mac;
@@ -445,6 +449,7 @@ struct be_adapter {
         u16 max_event_queues;
         u32 if_cap_flags;
         u8 pf_number;
+        u64 rss_flags;
 };
 
 #define be_physfn(adapter)              (!adapter->virtfn)
@@ -648,6 +653,11 @@ static inline bool be_is_wol_excluded(struct be_adapter *adapter)
         }
 }
 
+static inline int qnq_async_evt_rcvd(struct be_adapter *adapter)
+{
+        return adapter->flags & BE_FLAGS_QNQ_ASYNC_EVT_RCVD;
+}
+
 extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
                 u16 num_popped);
 extern void be_link_status_update(struct be_adapter *adapter, u8 link_status);
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 3c9b4f12e3e5..25d3290b8cac 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -263,6 +263,27 @@ static void be_async_grp5_evt_process(struct be_adapter *adapter,
         }
 }
 
+static void be_async_dbg_evt_process(struct be_adapter *adapter,
+                u32 trailer, struct be_mcc_compl *cmp)
+{
+        u8 event_type = 0;
+        struct be_async_event_qnq *evt = (struct be_async_event_qnq *) cmp;
+
+        event_type = (trailer >> ASYNC_TRAILER_EVENT_TYPE_SHIFT) &
+                ASYNC_TRAILER_EVENT_TYPE_MASK;
+
+        switch (event_type) {
+        case ASYNC_DEBUG_EVENT_TYPE_QNQ:
+                if (evt->valid)
+                        adapter->qnq_vid = le16_to_cpu(evt->vlan_tag);
+                adapter->flags |= BE_FLAGS_QNQ_ASYNC_EVT_RCVD;
+        break;
+        default:
+                dev_warn(&adapter->pdev->dev, "Unknown debug event\n");
+        break;
+        }
+}
+
 static inline bool is_link_state_evt(u32 trailer)
 {
         return ((trailer >> ASYNC_TRAILER_EVENT_CODE_SHIFT) &
@@ -277,6 +298,13 @@ static inline bool is_grp5_evt(u32 trailer)
                                 ASYNC_EVENT_CODE_GRP_5);
 }
 
+static inline bool is_dbg_evt(u32 trailer)
+{
+        return (((trailer >> ASYNC_TRAILER_EVENT_CODE_SHIFT) &
+                ASYNC_TRAILER_EVENT_CODE_MASK) ==
+                                ASYNC_EVENT_CODE_QNQ);
+}
+
 static struct be_mcc_compl *be_mcc_compl_get(struct be_adapter *adapter)
 {
         struct be_queue_info *mcc_cq = &adapter->mcc_obj.cq;
@@ -325,6 +353,9 @@ int be_process_mcc(struct be_adapter *adapter)
                         else if (is_grp5_evt(compl->flags))
                                 be_async_grp5_evt_process(adapter,
                                 compl->flags, compl);
+                        else if (is_dbg_evt(compl->flags))
+                                be_async_dbg_evt_process(adapter,
+                                compl->flags, compl);
                 } else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) {
                                 status = be_mcc_compl_process(adapter, compl);
                                 atomic_dec(&mcc_obj->q.used);
@@ -687,10 +718,8 @@ static struct be_mcc_wrb *wrb_from_mccq(struct be_adapter *adapter)
         if (!mccq->created)
                 return NULL;
 
-        if (atomic_read(&mccq->used) >= mccq->len) {
-                dev_err(&adapter->pdev->dev, "Out of MCCQ wrbs\n");
+        if (atomic_read(&mccq->used) >= mccq->len)
                 return NULL;
-        }
 
         wrb = queue_head_node(mccq);
         queue_head_inc(mccq);
@@ -1022,6 +1051,7 @@ int be_cmd_mccq_ext_create(struct be_adapter *adapter,
 
         /* Subscribe to Link State and Group 5 Events(bits 1 and 5 set) */
         req->async_event_bitmap[0] = cpu_to_le32(0x00000022);
+        req->async_event_bitmap[0] |= cpu_to_le32(1 << ASYNC_EVENT_CODE_QNQ);
         be_dws_cpu_to_le(ctxt, sizeof(req->context));
 
         be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
@@ -1095,15 +1125,14 @@ int be_cmd_mccq_create(struct be_adapter *adapter,
         return status;
 }
 
-int be_cmd_txq_create(struct be_adapter *adapter,
-                        struct be_queue_info *txq,
-                        struct be_queue_info *cq)
+int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_eth_tx_create *req;
+        struct be_queue_info *txq = &txo->q;
+        struct be_queue_info *cq = &txo->cq;
         struct be_dma_mem *q_mem = &txq->dma_mem;
-        void *ctxt;
-        int status;
+        int status, ver = 0;
 
         spin_lock_bh(&adapter->mcc_lock);
 
@@ -1114,34 +1143,37 @@ int be_cmd_txq_create(struct be_adapter *adapter,
         }
 
         req = embedded_payload(wrb);
-        ctxt = &req->context;
 
         be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
                 OPCODE_ETH_TX_CREATE, sizeof(*req), wrb, NULL);
 
         if (lancer_chip(adapter)) {
                 req->hdr.version = 1;
-                AMAP_SET_BITS(struct amap_tx_context, if_id, ctxt,
-                                        adapter->if_handle);
+                req->if_id = cpu_to_le16(adapter->if_handle);
+        } else if (BEx_chip(adapter)) {
+                if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC)
+                        req->hdr.version = 2;
+        } else { /* For SH */
+                req->hdr.version = 2;
         }
 
         req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);
         req->ulp_num = BE_ULP1_NUM;
         req->type = BE_ETH_TX_RING_TYPE_STANDARD;
-
-        AMAP_SET_BITS(struct amap_tx_context, tx_ring_size, ctxt,
-                be_encoded_q_len(txq->len));
-        AMAP_SET_BITS(struct amap_tx_context, ctx_valid, ctxt, 1);
-        AMAP_SET_BITS(struct amap_tx_context, cq_id_send, ctxt, cq->id);
-
-        be_dws_cpu_to_le(ctxt, sizeof(req->context));
-
+        req->cq_id = cpu_to_le16(cq->id);
+        req->queue_size = be_encoded_q_len(txq->len);
         be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
 
+        ver = req->hdr.version;
+
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_eth_tx_create *resp = embedded_payload(wrb);
                 txq->id = le16_to_cpu(resp->cid);
+                if (ver == 2)
+                        txo->db_offset = le32_to_cpu(resp->db_offset);
+                else
+                        txo->db_offset = DB_TXULP1_OFFSET;
                 txq->created = true;
         }
 
@@ -1834,7 +1866,7 @@ err:
 
 /* Uses mbox */
 int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
-                u32 *mode, u32 *caps)
+                        u32 *mode, u32 *caps, u16 *asic_rev)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_query_fw_cfg *req;
@@ -1855,6 +1887,7 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
                 *port_num = le32_to_cpu(resp->phys_port);
                 *mode = le32_to_cpu(resp->function_mode);
                 *caps = le32_to_cpu(resp->function_caps);
+                *asic_rev = le32_to_cpu(resp->asic_revision) & 0xFF;
         }
 
         mutex_unlock(&adapter->mbox_lock);
@@ -1897,7 +1930,8 @@ int be_cmd_reset_function(struct be_adapter *adapter)
         return status;
 }
 
-int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size)
+int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,
+                        u32 rss_hash_opts, u16 table_size)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_rss_config *req;
@@ -1916,16 +1950,12 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size)
                 OPCODE_ETH_RSS_CONFIG, sizeof(*req), wrb, NULL);
 
         req->if_id = cpu_to_le32(adapter->if_handle);
-        req->enable_rss = cpu_to_le16(RSS_ENABLE_TCP_IPV4 | RSS_ENABLE_IPV4 |
-                                      RSS_ENABLE_TCP_IPV6 | RSS_ENABLE_IPV6);
+        req->enable_rss = cpu_to_le16(rss_hash_opts);
+        req->cpu_table_size_log2 = cpu_to_le16(fls(table_size) - 1);
 
-        if (lancer_chip(adapter) || skyhawk_chip(adapter)) {
+        if (lancer_chip(adapter) || skyhawk_chip(adapter))
                 req->hdr.version = 1;
-                req->enable_rss |= cpu_to_le16(RSS_ENABLE_UDP_IPV4 |
-                                               RSS_ENABLE_UDP_IPV6);
-        }
 
-        req->cpu_table_size_log2 = cpu_to_le16(fls(table_size) - 1);
         memcpy(req->cpu_table, rsstable, table_size);
         memcpy(req->hash, myhash, sizeof(myhash));
         be_dws_cpu_to_le(req->hash, sizeof(req->hash));
@@ -2343,7 +2373,6 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_seeprom_read *req;
-        struct be_sge *sge;
         int status;
 
         spin_lock_bh(&adapter->mcc_lock);
@@ -2354,7 +2383,6 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
                 goto err;
         }
         req = nonemb_cmd->va;
-        sge = nonembedded_sgl(wrb);
 
         be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                         OPCODE_COMMON_SEEPROM_READ, sizeof(*req), wrb,
@@ -2461,6 +2489,9 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
         struct mgmt_controller_attrib *attribs;
         struct be_dma_mem attribs_cmd;
 
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
         memset(&attribs_cmd, 0, sizeof(struct be_dma_mem));
         attribs_cmd.size = sizeof(struct be_cmd_resp_cntl_attribs);
         attribs_cmd.va = pci_alloc_consistent(adapter->pdev, attribs_cmd.size,
@@ -2468,12 +2499,10 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
         if (!attribs_cmd.va) {
                 dev_err(&adapter->pdev->dev,
                                 "Memory allocation failure\n");
-                return -ENOMEM;
+                status = -ENOMEM;
+                goto err;
         }
 
-        if (mutex_lock_interruptible(&adapter->mbox_lock))
-                return -1;
-
         wrb = wrb_from_mbox(adapter);
         if (!wrb) {
                 status = -EBUSY;
@@ -2493,8 +2522,9 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
 
 err:
         mutex_unlock(&adapter->mbox_lock);
-        pci_free_consistent(adapter->pdev, attribs_cmd.size, attribs_cmd.va,
-                                        attribs_cmd.dma);
+        if (attribs_cmd.va)
+                pci_free_consistent(adapter->pdev, attribs_cmd.size,
+                                    attribs_cmd.va, attribs_cmd.dma);
         return status;
 }
 
@@ -2667,10 +2697,8 @@ int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,
         cmd.size = sizeof(struct be_cmd_req_set_mac_list);
         cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size,
                         &cmd.dma, GFP_KERNEL);
-        if (!cmd.va) {
-                dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
+        if (!cmd.va)
                 return -ENOMEM;
-        }
 
         spin_lock_bh(&adapter->mcc_lock);
 
@@ -2794,6 +2822,9 @@ int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter)
                             CMD_SUBSYSTEM_ETH))
                 return -EPERM;
 
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_resp_acpi_wol_magic_config_v1);
         cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size,
@@ -2801,12 +2832,10 @@ int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter)
         if (!cmd.va) {
                 dev_err(&adapter->pdev->dev,
                                 "Memory allocation failure\n");
-                return -ENOMEM;
+                status = -ENOMEM;
+                goto err;
         }
 
-        if (mutex_lock_interruptible(&adapter->mbox_lock))
-                return -1;
-
         wrb = wrb_from_mbox(adapter);
         if (!wrb) {
                 status = -EBUSY;
@@ -2837,7 +2866,8 @@ int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter)
         }
 err:
         mutex_unlock(&adapter->mbox_lock);
-        pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+        if (cmd.va)
+                pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
         return status;
 
 }
@@ -2942,14 +2972,15 @@ static struct be_nic_resource_desc *be_get_nic_desc(u8 *buf, u32 desc_count,
         int i;
 
         for (i = 0; i < desc_count; i++) {
-                desc->desc_len = RESOURCE_DESC_SIZE;
+                desc->desc_len = desc->desc_len ? : RESOURCE_DESC_SIZE;
                 if (((void *)desc + desc->desc_len) >
                     (void *)(buf + max_buf_size)) {
                         desc = NULL;
                         break;
                 }
 
-                if (desc->desc_type == NIC_RESOURCE_DESC_TYPE_ID)
+                if (desc->desc_type == NIC_RESOURCE_DESC_TYPE_V0 ||
+                    desc->desc_type == NIC_RESOURCE_DESC_TYPE_V1)
                         break;
 
                 desc = (void *)desc + desc->desc_len;
@@ -2969,16 +3000,18 @@ int be_cmd_get_func_config(struct be_adapter *adapter)
         int status;
         struct be_dma_mem cmd;
 
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_resp_get_func_config);
         cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size,
                                       &cmd.dma);
         if (!cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
-                return -ENOMEM;
+                status = -ENOMEM;
+                goto err;
         }
-        if (mutex_lock_interruptible(&adapter->mbox_lock))
-                return -1;
 
         wrb = wrb_from_mbox(adapter);
         if (!wrb) {
@@ -2992,6 +3025,9 @@ int be_cmd_get_func_config(struct be_adapter *adapter)
                                OPCODE_COMMON_GET_FUNC_CONFIG,
                                cmd.size, wrb, &cmd);
 
+        if (skyhawk_chip(adapter))
+                req->hdr.version = 1;
+
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_get_func_config *resp = cmd.va;
@@ -3018,28 +3054,46 @@ int be_cmd_get_func_config(struct be_adapter *adapter)
         }
 err:
         mutex_unlock(&adapter->mbox_lock);
-        pci_free_consistent(adapter->pdev, cmd.size,
-                            cmd.va, cmd.dma);
+        if (cmd.va)
+                pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
         return status;
 }
 
- /* Uses sync mcc */
-int be_cmd_get_profile_config(struct be_adapter *adapter, u32 *cap_flags,
-                              u8 domain)
+/* Uses mbox */
+int be_cmd_get_profile_config_mbox(struct be_adapter *adapter,
+                                   u8 domain, struct be_dma_mem *cmd)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_profile_config *req;
         int status;
-        struct be_dma_mem cmd;
 
-        memset(&cmd, 0, sizeof(struct be_dma_mem));
-        cmd.size = sizeof(struct be_cmd_resp_get_profile_config);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size,
-                                      &cmd.dma);
-        if (!cmd.va) {
-                dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
-                return -ENOMEM;
-        }
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+        wrb = wrb_from_mbox(adapter);
+
+        req = cmd->va;
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                               OPCODE_COMMON_GET_PROFILE_CONFIG,
+                               cmd->size, wrb, cmd);
+
+        req->type = ACTIVE_PROFILE_TYPE;
+        req->hdr.domain = domain;
+        if (!lancer_chip(adapter))
+                req->hdr.version = 1;
+
+        status = be_mbox_notify_wait(adapter);
+
+        mutex_unlock(&adapter->mbox_lock);
+        return status;
+}
+
+/* Uses sync mcc */
+int be_cmd_get_profile_config_mccq(struct be_adapter *adapter,
+                                   u8 domain, struct be_dma_mem *cmd)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_get_profile_config *req;
+        int status;
 
         spin_lock_bh(&adapter->mcc_lock);
 
@@ -3049,16 +3103,47 @@ int be_cmd_get_profile_config(struct be_adapter *adapter, u32 *cap_flags,
                 goto err;
         }
 
-        req = cmd.va;
-
+        req = cmd->va;
         be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                                OPCODE_COMMON_GET_PROFILE_CONFIG,
-                               cmd.size, wrb, &cmd);
+                               cmd->size, wrb, cmd);
 
         req->type = ACTIVE_PROFILE_TYPE;
         req->hdr.domain = domain;
+        if (!lancer_chip(adapter))
+                req->hdr.version = 1;
 
         status = be_mcc_notify_wait(adapter);
+
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
+}
+
+/* Uses sync mcc, if MCCQ is already created otherwise mbox */
+int be_cmd_get_profile_config(struct be_adapter *adapter, u32 *cap_flags,
+                              u16 *txq_count, u8 domain)
+{
+        struct be_queue_info *mccq = &adapter->mcc_obj.q;
+        struct be_dma_mem cmd;
+        int status;
+
+        memset(&cmd, 0, sizeof(struct be_dma_mem));
+        if (!lancer_chip(adapter))
+                cmd.size = sizeof(struct be_cmd_resp_get_profile_config_v1);
+        else
+                cmd.size = sizeof(struct be_cmd_resp_get_profile_config);
+        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size,
+                                      &cmd.dma);
+        if (!cmd.va) {
+                dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
+                return -ENOMEM;
+        }
+
+        if (!mccq->created)
+                status = be_cmd_get_profile_config_mbox(adapter, domain, &cmd);
+        else
+                status = be_cmd_get_profile_config_mccq(adapter, domain, &cmd);
         if (!status) {
                 struct be_cmd_resp_get_profile_config *resp = cmd.va;
                 u32 desc_count = le32_to_cpu(resp->desc_count);
@@ -3071,12 +3156,15 @@ int be_cmd_get_profile_config(struct be_adapter *adapter, u32 *cap_flags,
                         status = -EINVAL;
                         goto err;
                 }
-                *cap_flags = le32_to_cpu(desc->cap_flags);
+                if (cap_flags)
+                        *cap_flags = le32_to_cpu(desc->cap_flags);
+                if (txq_count)
+                        *txq_count = le32_to_cpu(desc->txq_count);
         }
 err:
-        spin_unlock_bh(&adapter->mcc_lock);
-        pci_free_consistent(adapter->pdev, cmd.size,
-                            cmd.va, cmd.dma);
+        if (cmd.va)
+                pci_free_consistent(adapter->pdev, cmd.size,
+                                    cmd.va, cmd.dma);
         return status;
 }
 
@@ -3105,7 +3193,7 @@ int be_cmd_set_profile_config(struct be_adapter *adapter, u32 bps,
         req->hdr.domain = domain;
         req->desc_count = cpu_to_le32(1);
 
-        req->nic_desc.desc_type = NIC_RESOURCE_DESC_TYPE_ID;
+        req->nic_desc.desc_type = NIC_RESOURCE_DESC_TYPE_V0;
         req->nic_desc.desc_len = RESOURCE_DESC_SIZE;
         req->nic_desc.flags = (1 << QUN) | (1 << IMM) | (1 << NOSV);
         req->nic_desc.pf_num = adapter->pf_number;
@@ -3202,6 +3290,31 @@ err:
         return status;
 }
 
+int be_cmd_intr_set(struct be_adapter *adapter, bool intr_enable)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_intr_set *req;
+        int status;
+
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
+        wrb = wrb_from_mbox(adapter);
+
+        req = embedded_payload(wrb);
+
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                               OPCODE_COMMON_SET_INTERRUPT_ENABLE, sizeof(*req),
+                               wrb, NULL);
+
+        req->intr_enabled = intr_enable;
+
+        status = be_mbox_notify_wait(adapter);
+
+        mutex_unlock(&adapter->mbox_lock);
+        return status;
+}
+
 int be_roce_mcc_cmd(void *netdev_handle, void *wrb_payload,
                         int wrb_payload_size, u16 *cmd_status, u16 *ext_status)
 {
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 96970860c915..a855668e0cc5 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -84,6 +84,9 @@ struct be_mcc_compl {
 #define ASYNC_EVENT_QOS_SPEED           0x1
 #define ASYNC_EVENT_COS_PRIORITY        0x2
 #define ASYNC_EVENT_PVID_STATE          0x3
+#define ASYNC_EVENT_CODE_QNQ            0x6
+#define ASYNC_DEBUG_EVENT_TYPE_QNQ      1
+
 struct be_async_event_trailer {
         u32 code;
 };
@@ -144,6 +147,16 @@ struct be_async_event_grp5_pvid_state {
         struct be_async_event_trailer trailer;
 } __packed;
 
+/* async event indicating outer VLAN tag in QnQ */
+struct be_async_event_qnq {
+        u8 valid;       /* Indicates if outer VLAN is valid */
+        u8 rsvd0;
+        u16 vlan_tag;
+        u32 event_tag;
+        u8 rsvd1[4];
+        struct be_async_event_trailer trailer;
+} __packed;
+
 struct be_mcc_mailbox {
         struct be_mcc_wrb wrb;
         struct be_mcc_compl compl;
@@ -188,6 +201,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_GET_BEACON_STATE                  70
 #define OPCODE_COMMON_READ_TRANSRECV_DATA               73
 #define OPCODE_COMMON_GET_PORT_NAME                     77
+#define OPCODE_COMMON_SET_INTERRUPT_ENABLE              89
 #define OPCODE_COMMON_GET_PHY_DETAILS                   102
 #define OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP           103
 #define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES    121
@@ -473,46 +487,27 @@ struct be_cmd_resp_mcc_create {
 #define BE_ETH_TX_RING_TYPE_STANDARD            2
 #define BE_ULP1_NUM                             1
 
-/* Pseudo amap definition in which each bit of the actual structure is defined
- * as a byte: used to calculate offset/shift/mask of each field */
-struct amap_tx_context {
-        u8 if_id[16];           /* dword 0 */
-        u8 tx_ring_size[4];     /* dword 0 */
-        u8 rsvd1[26];           /* dword 0 */
-        u8 pci_func_id[8];      /* dword 1 */
-        u8 rsvd2[9];            /* dword 1 */
-        u8 ctx_valid;           /* dword 1 */
-        u8 cq_id_send[16];      /* dword 2 */
-        u8 rsvd3[16];           /* dword 2 */
-        u8 rsvd4[32];           /* dword 3 */
-        u8 rsvd5[32];           /* dword 4 */
-        u8 rsvd6[32];           /* dword 5 */
-        u8 rsvd7[32];           /* dword 6 */
-        u8 rsvd8[32];           /* dword 7 */
-        u8 rsvd9[32];           /* dword 8 */
-        u8 rsvd10[32];          /* dword 9 */
-        u8 rsvd11[32];          /* dword 10 */
-        u8 rsvd12[32];          /* dword 11 */
-        u8 rsvd13[32];          /* dword 12 */
-        u8 rsvd14[32];          /* dword 13 */
-        u8 rsvd15[32];          /* dword 14 */
-        u8 rsvd16[32];          /* dword 15 */
-} __packed;
-
 struct be_cmd_req_eth_tx_create {
         struct be_cmd_req_hdr hdr;
         u8 num_pages;
         u8 ulp_num;
-        u8 type;
-        u8 bound_port;
-        u8 context[sizeof(struct amap_tx_context) / 8];
+        u16 type;
+        u16 if_id;
+        u8 queue_size;
+        u8 rsvd0;
+        u32 rsvd1;
+        u16 cq_id;
+        u16 rsvd2;
+        u32 rsvd3[13];
         struct phys_addr pages[8];
 } __packed;
 
 struct be_cmd_resp_eth_tx_create {
         struct be_cmd_resp_hdr hdr;
         u16 cid;
-        u16 rsvd0;
+        u16 rid;
+        u32 db_offset;
+        u32 rsvd0[4];
 } __packed;
 
 /******************** Create RxQ ***************************/
@@ -608,8 +603,8 @@ struct be_port_rxf_stats_v0 {
         u32 rx_in_range_errors; /* dword 10*/
         u32 rx_out_range_errors;        /* dword 11*/
         u32 rx_frame_too_long;  /* dword 12*/
-        u32 rx_address_mismatch_drops;  /* dword 13*/
-        u32 rx_vlan_mismatch_drops;     /* dword 14*/
+        u32 rx_address_filtered;        /* dword 13*/
+        u32 rx_vlan_filtered;   /* dword 14*/
         u32 rx_dropped_too_small;       /* dword 15*/
         u32 rx_dropped_too_short;       /* dword 16*/
         u32 rx_dropped_header_too_small;        /* dword 17*/
@@ -815,8 +810,8 @@ struct lancer_pport_stats {
         u32 rx_control_frames_unknown_opcode_hi;
         u32 rx_in_range_errors;
         u32 rx_out_of_range_errors;
-        u32 rx_address_mismatch_drops;
-        u32 rx_vlan_mismatch_drops;
+        u32 rx_address_filtered;
+        u32 rx_vlan_filtered;
         u32 rx_dropped_too_small;
         u32 rx_dropped_too_short;
         u32 rx_dropped_header_too_small;
@@ -1066,7 +1061,6 @@ struct be_cmd_resp_modify_eq_delay {
 } __packed;
 
 /******************** Get FW Config *******************/
-#define BE_FUNCTION_CAPS_RSS                    0x2
 /* The HW can come up in either of the following multi-channel modes
  * based on the skew/IPL.
  */
@@ -1109,6 +1103,9 @@ struct be_cmd_resp_query_fw_cfg {
 #define RSS_ENABLE_UDP_IPV4                     0x10
 #define RSS_ENABLE_UDP_IPV6                     0x20
 
+#define L3_RSS_FLAGS                            (RXH_IP_DST | RXH_IP_SRC)
+#define L4_RSS_FLAGS                            (RXH_L4_B_0_1 | RXH_L4_B_2_3)
+
 struct be_cmd_req_rss_config {
         struct be_cmd_req_hdr hdr;
         u32 if_id;
@@ -1592,7 +1589,7 @@ struct be_port_rxf_stats_v1 {
         u32 rx_in_range_errors;
         u32 rx_out_range_errors;
         u32 rx_frame_too_long;
-        u32 rx_address_mismatch_drops;
+        u32 rx_address_filtered;
         u32 rx_dropped_too_small;
         u32 rx_dropped_too_short;
         u32 rx_dropped_header_too_small;
@@ -1706,9 +1703,11 @@ struct be_cmd_req_set_ext_fat_caps {
         struct be_fat_conf_params set_params;
 };
 
-#define RESOURCE_DESC_SIZE                      72
-#define NIC_RESOURCE_DESC_TYPE_ID               0x41
+#define RESOURCE_DESC_SIZE                      88
+#define NIC_RESOURCE_DESC_TYPE_V0               0x41
+#define NIC_RESOURCE_DESC_TYPE_V1               0x51
 #define MAX_RESOURCE_DESC                       4
+#define MAX_RESOURCE_DESC_V1                    32
 
 /* QOS unit number */
 #define QUN                                     4
@@ -1755,7 +1754,7 @@ struct be_cmd_req_get_func_config {
 };
 
 struct be_cmd_resp_get_func_config {
-        struct be_cmd_req_hdr hdr;
+        struct be_cmd_resp_hdr hdr;
         u32 desc_count;
         u8 func_param[MAX_RESOURCE_DESC * RESOURCE_DESC_SIZE];
 };
@@ -1774,6 +1773,12 @@ struct be_cmd_resp_get_profile_config {
         u8 func_param[MAX_RESOURCE_DESC * RESOURCE_DESC_SIZE];
 };
 
+struct be_cmd_resp_get_profile_config_v1 {
+        struct be_cmd_req_hdr hdr;
+        u32 desc_count;
+        u8 func_param[MAX_RESOURCE_DESC_V1 * RESOURCE_DESC_SIZE];
+};
+
 struct be_cmd_req_set_profile_config {
         struct be_cmd_req_hdr hdr;
         u32 rsvd;
@@ -1791,6 +1796,12 @@ struct be_cmd_enable_disable_vf {
         u8 rsvd[3];
 };
 
+struct be_cmd_req_intr_set {
+        struct be_cmd_req_hdr hdr;
+        u8 intr_enabled;
+        u8 rsvd[3];
+};
+
 static inline bool check_privilege(struct be_adapter *adapter, u32 flags)
 {
         return flags & adapter->cmd_privileges ? true : false;
@@ -1834,8 +1845,7 @@ extern int be_cmd_mccq_create(struct be_adapter *adapter,
                         struct be_queue_info *mccq,
                         struct be_queue_info *cq);
 extern int be_cmd_txq_create(struct be_adapter *adapter,
-                        struct be_queue_info *txq,
-                        struct be_queue_info *cq);
+                        struct be_tx_obj *txo);
 extern int be_cmd_rxq_create(struct be_adapter *adapter,
                         struct be_queue_info *rxq, u16 cq_id,
                         u16 frag_size, u32 if_id, u32 rss, u8 *rss_id);
@@ -1862,11 +1872,11 @@ extern int be_cmd_set_flow_control(struct be_adapter *adapter,
                         u32 tx_fc, u32 rx_fc);
 extern int be_cmd_get_flow_control(struct be_adapter *adapter,
                         u32 *tx_fc, u32 *rx_fc);
-extern int be_cmd_query_fw_cfg(struct be_adapter *adapter,
-                        u32 *port_num, u32 *function_mode, u32 *function_caps);
+extern int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
+                        u32 *function_mode, u32 *function_caps, u16 *asic_rev);
 extern int be_cmd_reset_function(struct be_adapter *adapter);
 extern int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,
-                        u16 table_size);
+                             u32 rss_hash_opts, u16 table_size);
 extern int be_process_mcc(struct be_adapter *adapter);
 extern int be_cmd_set_beacon_state(struct be_adapter *adapter,
                         u8 port_num, u8 beacon, u8 status, u8 state);
@@ -1931,10 +1941,11 @@ extern int lancer_test_and_set_rdy_state(struct be_adapter *adapter);
 extern int be_cmd_query_port_name(struct be_adapter *adapter, u8 *port_name);
 extern int be_cmd_get_func_config(struct be_adapter *adapter);
 extern int be_cmd_get_profile_config(struct be_adapter *adapter, u32 *cap_flags,
-                                     u8 domain);
+                                     u16 *txq_count, u8 domain);
 
 extern int be_cmd_set_profile_config(struct be_adapter *adapter, u32 bps,
                                      u8 domain);
 extern int be_cmd_get_if_id(struct be_adapter *adapter,
                             struct be_vf_cfg *vf_cfg, int vf_num);
 extern int be_cmd_enable_vf(struct be_adapter *adapter, u8 domain);
+extern int be_cmd_intr_set(struct be_adapter *adapter, bool intr_enable);
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 76b302f30c87..5733cde88e2c 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ static const struct be_ethtool_stat et_stats[] = {
         /* Received packets dropped when they don't pass the unicast or
          * multicast address filtering.
          */
-        {DRVSTAT_INFO(rx_address_mismatch_drops)},
+        {DRVSTAT_INFO(rx_address_filtered)},
         /* Received packets dropped when IP packet length field is less than
          * the IP header length field.
          */
@@ -680,7 +680,8 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 
         if (be_is_wol_supported(adapter)) {
                 wol->supported |= WAKE_MAGIC;
-                wol->wolopts |= WAKE_MAGIC;
+                if (adapter->wol)
+                        wol->wolopts |= WAKE_MAGIC;
         } else
                 wol->wolopts = 0;
         memset(&wol->sopass, 0, sizeof(wol->sopass));
@@ -719,10 +720,8 @@ be_test_ddr_dma(struct be_adapter *adapter)
         ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
         ddrdma_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, ddrdma_cmd.size,
                                            &ddrdma_cmd.dma, GFP_KERNEL);
-        if (!ddrdma_cmd.va) {
-                dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
+        if (!ddrdma_cmd.va)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < 2; i++) {
                 ret = be_cmd_ddr_dma_test(adapter, pattern[i],
@@ -757,6 +756,12 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
         int status;
         u8 link_status = 0;
 
+        if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) {
+                dev_err(&adapter->pdev->dev, "Self test not supported\n");
+                test->flags |= ETH_TEST_FL_FAILED;
+                return;
+        }
+
         memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM);
 
         if (test->flags & ETH_TEST_FL_OFFLINE) {
@@ -845,11 +850,8 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
         eeprom_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, eeprom_cmd.size,
                                            &eeprom_cmd.dma, GFP_KERNEL);
 
-        if (!eeprom_cmd.va) {
-                dev_err(&adapter->pdev->dev,
-                        "Memory allocation failure. Could not read eeprom\n");
+        if (!eeprom_cmd.va)
                 return -ENOMEM;
-        }
 
         status = be_cmd_get_seeprom_data(adapter, &eeprom_cmd);
 
@@ -939,6 +941,159 @@ static void be_set_msg_level(struct net_device *netdev, u32 level)
         return;
 }
 
+static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type)
+{
+        u64 data = 0;
+
+        switch (flow_type) {
+        case TCP_V4_FLOW:
+                if (adapter->rss_flags & RSS_ENABLE_IPV4)
+                        data |= RXH_IP_DST | RXH_IP_SRC;
+                if (adapter->rss_flags & RSS_ENABLE_TCP_IPV4)
+                        data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                break;
+        case UDP_V4_FLOW:
+                if (adapter->rss_flags & RSS_ENABLE_IPV4)
+                        data |= RXH_IP_DST | RXH_IP_SRC;
+                if (adapter->rss_flags & RSS_ENABLE_UDP_IPV4)
+                        data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                break;
+        case TCP_V6_FLOW:
+                if (adapter->rss_flags & RSS_ENABLE_IPV6)
+                        data |= RXH_IP_DST | RXH_IP_SRC;
+                if (adapter->rss_flags & RSS_ENABLE_TCP_IPV6)
+                        data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                break;
+        case UDP_V6_FLOW:
+                if (adapter->rss_flags & RSS_ENABLE_IPV6)
+                        data |= RXH_IP_DST | RXH_IP_SRC;
+                if (adapter->rss_flags & RSS_ENABLE_UDP_IPV6)
+                        data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                break;
+        }
+
+        return data;
+}
+
+static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
+                      u32 *rule_locs)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+
+        if (!be_multi_rxq(adapter)) {
+                dev_info(&adapter->pdev->dev,
+                         "ethtool::get_rxnfc: RX flow hashing is disabled\n");
+                return -EINVAL;
+        }
+
+        switch (cmd->cmd) {
+        case ETHTOOL_GRXFH:
+                cmd->data = be_get_rss_hash_opts(adapter, cmd->flow_type);
+                break;
+        case ETHTOOL_GRXRINGS:
+                cmd->data = adapter->num_rx_qs - 1;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int be_set_rss_hash_opts(struct be_adapter *adapter,
+                                struct ethtool_rxnfc *cmd)
+{
+        struct be_rx_obj *rxo;
+        int status = 0, i, j;
+        u8 rsstable[128];
+        u32 rss_flags = adapter->rss_flags;
+
+        if (cmd->data != L3_RSS_FLAGS &&
+            cmd->data != (L3_RSS_FLAGS | L4_RSS_FLAGS))
+                return -EINVAL;
+
+        switch (cmd->flow_type) {
+        case TCP_V4_FLOW:
+                if (cmd->data == L3_RSS_FLAGS)
+                        rss_flags &= ~RSS_ENABLE_TCP_IPV4;
+                else if (cmd->data == (L3_RSS_FLAGS | L4_RSS_FLAGS))
+                        rss_flags |= RSS_ENABLE_IPV4 |
+                                        RSS_ENABLE_TCP_IPV4;
+                break;
+        case TCP_V6_FLOW:
+                if (cmd->data == L3_RSS_FLAGS)
+                        rss_flags &= ~RSS_ENABLE_TCP_IPV6;
+                else if (cmd->data == (L3_RSS_FLAGS | L4_RSS_FLAGS))
+                        rss_flags |= RSS_ENABLE_IPV6 |
+                                        RSS_ENABLE_TCP_IPV6;
+                break;
+        case UDP_V4_FLOW:
+                if ((cmd->data == (L3_RSS_FLAGS | L4_RSS_FLAGS)) &&
+                    BEx_chip(adapter))
+                        return -EINVAL;
+
+                if (cmd->data == L3_RSS_FLAGS)
+                        rss_flags &= ~RSS_ENABLE_UDP_IPV4;
+                else if (cmd->data == (L3_RSS_FLAGS | L4_RSS_FLAGS))
+                        rss_flags |= RSS_ENABLE_IPV4 |
+                                        RSS_ENABLE_UDP_IPV4;
+                break;
+        case UDP_V6_FLOW:
+                if ((cmd->data == (L3_RSS_FLAGS | L4_RSS_FLAGS)) &&
+                    BEx_chip(adapter))
+                        return -EINVAL;
+
+                if (cmd->data == L3_RSS_FLAGS)
+                        rss_flags &= ~RSS_ENABLE_UDP_IPV6;
+                else if (cmd->data == (L3_RSS_FLAGS | L4_RSS_FLAGS))
+                        rss_flags |= RSS_ENABLE_IPV6 |
+                                        RSS_ENABLE_UDP_IPV6;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (rss_flags == adapter->rss_flags)
+                return status;
+
+        if (be_multi_rxq(adapter)) {
+                for (j = 0; j < 128; j += adapter->num_rx_qs - 1) {
+                        for_all_rss_queues(adapter, rxo, i) {
+                                if ((j + i) >= 128)
+                                        break;
+                                rsstable[j + i] = rxo->rss_id;
+                        }
+                }
+        }
+        status = be_cmd_rss_config(adapter, rsstable, rss_flags, 128);
+        if (!status)
+                adapter->rss_flags = rss_flags;
+
+        return status;
+}
+
+static int be_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+        int status = 0;
+
+        if (!be_multi_rxq(adapter)) {
+                dev_err(&adapter->pdev->dev,
+                        "ethtool::set_rxnfc: RX flow hashing is disabled\n");
+                return -EINVAL;
+        }
+
+        switch (cmd->cmd) {
+        case ETHTOOL_SRXFH:
+                status = be_set_rss_hash_opts(adapter, cmd);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return status;
+}
+
 const struct ethtool_ops be_ethtool_ops = {
         .get_settings = be_get_settings,
         .get_drvinfo = be_get_drvinfo,
@@ -962,4 +1117,6 @@ const struct ethtool_ops be_ethtool_ops = {
         .get_regs = be_get_regs,
         .flash_device = be_do_flash,
         .self_test = be_self_test,
+        .get_rxnfc = be_get_rxnfc,
+        .set_rxnfc = be_set_rxnfc,
 };
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index 62dc220695f7..3c1099b47f2a 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -72,6 +72,10 @@
  */
 #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK      (1 << 29) /* bit 29 */
 
+/********* PCI Function Capability *********/
+#define BE_FUNCTION_CAPS_RSS                    0x2
+#define BE_FUNCTION_CAPS_SUPER_NIC              0x40
+
 /********* Power management (WOL) **********/
 #define PCICFG_PM_CONTROL_OFFSET                0x44
 #define PCICFG_PM_CONTROL_MASK                  0x108   /* bits 3 & 8 */
@@ -495,7 +499,8 @@ struct flash_file_hdr_g3 {
         u32 antidote;
         u32 num_imgs;
         u8 build[24];
-        u8 rsvd[32];
+        u8 asic_type_rev;
+        u8 rsvd[31];
 };
 
 struct flash_section_hdr {
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 2886c9b63f90..4babc8a4a543 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -146,20 +146,16 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
         q->entry_size = entry_size;
         mem->size = len * entry_size;
         mem->va = dma_alloc_coherent(&adapter->pdev->dev, mem->size, &mem->dma,
-                                     GFP_KERNEL);
+                                     GFP_KERNEL | __GFP_ZERO);
         if (!mem->va)
                 return -ENOMEM;
-        memset(mem->va, 0, mem->size);
         return 0;
 }
 
-static void be_intr_set(struct be_adapter *adapter, bool enable)
+static void be_reg_intr_set(struct be_adapter *adapter, bool enable)
 {
         u32 reg, enabled;
 
-        if (adapter->eeh_error)
-                return;
-
         pci_read_config_dword(adapter->pdev, PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET,
                                 &reg);
         enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK;
@@ -175,6 +171,22 @@ static void be_intr_set(struct be_adapter *adapter, bool enable)
                         PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET, reg);
 }
 
+static void be_intr_set(struct be_adapter *adapter, bool enable)
+{
+        int status = 0;
+
+        /* On lancer interrupts can't be controlled via this register */
+        if (lancer_chip(adapter))
+                return;
+
+        if (adapter->eeh_error)
+                return;
+
+        status = be_cmd_intr_set(adapter, enable);
+        if (status)
+                be_reg_intr_set(adapter, enable);
+}
+
 static void be_rxq_notify(struct be_adapter *adapter, u16 qid, u16 posted)
 {
         u32 val = 0;
@@ -185,14 +197,15 @@ static void be_rxq_notify(struct be_adapter *adapter, u16 qid, u16 posted)
         iowrite32(val, adapter->db + DB_RQ_OFFSET);
 }
 
-static void be_txq_notify(struct be_adapter *adapter, u16 qid, u16 posted)
+static void be_txq_notify(struct be_adapter *adapter, struct be_tx_obj *txo,
+                          u16 posted)
 {
         u32 val = 0;
-        val |= qid & DB_TXULP_RING_ID_MASK;
+        val |= txo->q.id & DB_TXULP_RING_ID_MASK;
         val |= (posted & DB_TXULP_NUM_POSTED_MASK) << DB_TXULP_NUM_POSTED_SHIFT;
 
         wmb();
-        iowrite32(val, adapter->db + DB_TXULP1_OFFSET);
+        iowrite32(val, adapter->db + txo->db_offset);
 }
 
 static void be_eq_notify(struct be_adapter *adapter, u16 qid,
@@ -340,9 +353,9 @@ static void populate_be_v0_stats(struct be_adapter *adapter)
         drvs->rx_input_fifo_overflow_drop = port_stats->rx_input_fifo_overflow;
         drvs->rx_dropped_header_too_small =
                 port_stats->rx_dropped_header_too_small;
-        drvs->rx_address_mismatch_drops =
-                                        port_stats->rx_address_mismatch_drops +
-                                        port_stats->rx_vlan_mismatch_drops;
+        drvs->rx_address_filtered =
+                                        port_stats->rx_address_filtered +
+                                        port_stats->rx_vlan_filtered;
         drvs->rx_alignment_symbol_errors =
                 port_stats->rx_alignment_symbol_errors;
 
@@ -391,7 +404,7 @@ static void populate_be_v1_stats(struct be_adapter *adapter)
                 port_stats->rx_dropped_header_too_small;
         drvs->rx_input_fifo_overflow_drop =
                 port_stats->rx_input_fifo_overflow_drop;
-        drvs->rx_address_mismatch_drops = port_stats->rx_address_mismatch_drops;
+        drvs->rx_address_filtered = port_stats->rx_address_filtered;
         drvs->rx_alignment_symbol_errors =
                 port_stats->rx_alignment_symbol_errors;
         drvs->rxpp_fifo_overflow_drop = port_stats->rxpp_fifo_overflow_drop;
@@ -432,9 +445,9 @@ static void populate_lancer_stats(struct be_adapter *adapter)
         drvs->rx_dropped_header_too_small =
                                 pport_stats->rx_dropped_header_too_small;
         drvs->rx_input_fifo_overflow_drop = pport_stats->rx_fifo_overflow;
-        drvs->rx_address_mismatch_drops =
-                                        pport_stats->rx_address_mismatch_drops +
-                                        pport_stats->rx_vlan_mismatch_drops;
+        drvs->rx_address_filtered =
+                                        pport_stats->rx_address_filtered +
+                                        pport_stats->rx_vlan_filtered;
         drvs->rx_alignment_symbol_errors = pport_stats->rx_symbol_errors_lo;
         drvs->rxpp_fifo_overflow_drop = pport_stats->rx_fifo_overflow;
         drvs->tx_pauseframes = pport_stats->tx_pause_frames_lo;
@@ -626,13 +639,8 @@ static inline u16 be_get_tx_vlan_tag(struct be_adapter *adapter,
         return vlan_tag;
 }
 
-static int be_vlan_tag_chk(struct be_adapter *adapter, struct sk_buff *skb)
-{
-        return vlan_tx_tag_present(skb) || adapter->pvid;
-}
-
 static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,
-                struct sk_buff *skb, u32 wrb_cnt, u32 len)
+                struct sk_buff *skb, u32 wrb_cnt, u32 len, bool skip_hw_vlan)
 {
         u16 vlan_tag;
 
@@ -659,8 +667,9 @@ static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, vlan_tag, hdr, vlan_tag);
         }
 
+        /* To skip HW VLAN tagging: evt = 1, compl = 0 */
+        AMAP_SET_BITS(struct amap_eth_hdr_wrb, complete, hdr, !skip_hw_vlan);
         AMAP_SET_BITS(struct amap_eth_hdr_wrb, event, hdr, 1);
-        AMAP_SET_BITS(struct amap_eth_hdr_wrb, complete, hdr, 1);
         AMAP_SET_BITS(struct amap_eth_hdr_wrb, num_wrb, hdr, wrb_cnt);
         AMAP_SET_BITS(struct amap_eth_hdr_wrb, len, hdr, len);
 }
@@ -683,7 +692,8 @@ static void unmap_tx_frag(struct device *dev, struct be_eth_wrb *wrb,
 }
 
 static int make_tx_wrbs(struct be_adapter *adapter, struct be_queue_info *txq,
-                struct sk_buff *skb, u32 wrb_cnt, bool dummy_wrb)
+                struct sk_buff *skb, u32 wrb_cnt, bool dummy_wrb,
+                bool skip_hw_vlan)
 {
         dma_addr_t busaddr;
         int i, copied = 0;
@@ -732,7 +742,7 @@ static int make_tx_wrbs(struct be_adapter *adapter, struct be_queue_info *txq,
                 queue_head_inc(txq);
         }
 
-        wrb_fill_hdr(adapter, hdr, first_skb, wrb_cnt, copied);
+        wrb_fill_hdr(adapter, hdr, first_skb, wrb_cnt, copied, skip_hw_vlan);
         be_dws_cpu_to_le(hdr, sizeof(*hdr));
 
         return copied;
@@ -749,7 +759,8 @@ dma_err:
 }
 
 static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
-                                             struct sk_buff *skb)
+                                             struct sk_buff *skb,
+                                             bool *skip_hw_vlan)
 {
         u16 vlan_tag = 0;
 
@@ -759,14 +770,72 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
 
         if (vlan_tx_tag_present(skb)) {
                 vlan_tag = be_get_tx_vlan_tag(adapter, skb);
-                skb = __vlan_put_tag(skb, vlan_tag);
+                skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                 if (skb)
                         skb->vlan_tci = 0;
         }
 
+        if (qnq_async_evt_rcvd(adapter) && adapter->pvid) {
+                if (!vlan_tag)
+                        vlan_tag = adapter->pvid;
+                if (skip_hw_vlan)
+                        *skip_hw_vlan = true;
+        }
+
+        if (vlan_tag) {
+                skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+                if (unlikely(!skb))
+                        return skb;
+
+                skb->vlan_tci = 0;
+        }
+
+        /* Insert the outer VLAN, if any */
+        if (adapter->qnq_vid) {
+                vlan_tag = adapter->qnq_vid;
+                skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+                if (unlikely(!skb))
+                        return skb;
+                if (skip_hw_vlan)
+                        *skip_hw_vlan = true;
+        }
+
         return skb;
 }
 
+static bool be_ipv6_exthdr_check(struct sk_buff *skb)
+{
+        struct ethhdr *eh = (struct ethhdr *)skb->data;
+        u16 offset = ETH_HLEN;
+
+        if (eh->h_proto == htons(ETH_P_IPV6)) {
+                struct ipv6hdr *ip6h = (struct ipv6hdr *)(skb->data + offset);
+
+                offset += sizeof(struct ipv6hdr);
+                if (ip6h->nexthdr != NEXTHDR_TCP &&
+                    ip6h->nexthdr != NEXTHDR_UDP) {
+                        struct ipv6_opt_hdr *ehdr =
+                                (struct ipv6_opt_hdr *) (skb->data + offset);
+
+                        /* offending pkt: 2nd byte following IPv6 hdr is 0xff */
+                        if (ehdr->hdrlen == 0xff)
+                                return true;
+                }
+        }
+        return false;
+}
+
+static int be_vlan_tag_tx_chk(struct be_adapter *adapter, struct sk_buff *skb)
+{
+        return vlan_tx_tag_present(skb) || adapter->pvid || adapter->qnq_vid;
+}
+
+static int be_ipv6_tx_stall_chk(struct be_adapter *adapter, struct sk_buff *skb)
+{
+        return BE3_chip(adapter) &&
+                be_ipv6_exthdr_check(skb);
+}
+
 static netdev_tx_t be_xmit(struct sk_buff *skb,
                         struct net_device *netdev)
 {
@@ -777,33 +846,64 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
         u32 wrb_cnt = 0, copied = 0;
         u32 start = txq->head, eth_hdr_len;
         bool dummy_wrb, stopped = false;
+        bool skip_hw_vlan = false;
+        struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
 
         eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ?
                 VLAN_ETH_HLEN : ETH_HLEN;
 
-        /* HW has a bug which considers padding bytes as legal
-         * and modifies the IPv4 hdr's 'tot_len' field
+        /* For padded packets, BE HW modifies tot_len field in IP header
+         * incorrecly when VLAN tag is inserted by HW.
          */
-        if (skb->len <= 60 && be_vlan_tag_chk(adapter, skb) &&
-                        is_ipv4_pkt(skb)) {
+        if (skb->len <= 60 && vlan_tx_tag_present(skb) && is_ipv4_pkt(skb)) {
                 ip = (struct iphdr *)ip_hdr(skb);
                 pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len));
         }
 
+        /* If vlan tag is already inlined in the packet, skip HW VLAN
+         * tagging in UMC mode
+         */
+        if ((adapter->function_mode & UMC_ENABLED) &&
+            veh->h_vlan_proto == htons(ETH_P_8021Q))
+                        skip_hw_vlan = true;
+
         /* HW has a bug wherein it will calculate CSUM for VLAN
          * pkts even though it is disabled.
          * Manually insert VLAN in pkt.
          */
         if (skb->ip_summed != CHECKSUM_PARTIAL &&
-                        be_vlan_tag_chk(adapter, skb)) {
-                skb = be_insert_vlan_in_pkt(adapter, skb);
+                        vlan_tx_tag_present(skb)) {
+                skb = be_insert_vlan_in_pkt(adapter, skb, &skip_hw_vlan);
+                if (unlikely(!skb))
+                        goto tx_drop;
+        }
+
+        /* HW may lockup when VLAN HW tagging is requested on
+         * certain ipv6 packets. Drop such pkts if the HW workaround to
+         * skip HW tagging is not enabled by FW.
+         */
+        if (unlikely(be_ipv6_tx_stall_chk(adapter, skb) &&
+                     (adapter->pvid || adapter->qnq_vid) &&
+                     !qnq_async_evt_rcvd(adapter)))
+                goto tx_drop;
+
+        /* Manual VLAN tag insertion to prevent:
+         * ASIC lockup when the ASIC inserts VLAN tag into
+         * certain ipv6 packets. Insert VLAN tags in driver,
+         * and set event, completion, vlan bits accordingly
+         * in the Tx WRB.
+         */
+        if (be_ipv6_tx_stall_chk(adapter, skb) &&
+            be_vlan_tag_tx_chk(adapter, skb)) {
+                skb = be_insert_vlan_in_pkt(adapter, skb, &skip_hw_vlan);
                 if (unlikely(!skb))
                         goto tx_drop;
         }
 
         wrb_cnt = wrb_cnt_for_skb(adapter, skb, &dummy_wrb);
 
-        copied = make_tx_wrbs(adapter, txq, skb, wrb_cnt, dummy_wrb);
+        copied = make_tx_wrbs(adapter, txq, skb, wrb_cnt, dummy_wrb,
+                              skip_hw_vlan);
         if (copied) {
                 int gso_segs = skb_shinfo(skb)->gso_segs;
 
@@ -822,7 +922,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
                         stopped = true;
                 }
 
-                be_txq_notify(adapter, txq->id, wrb_cnt);
+                be_txq_notify(adapter, txo, wrb_cnt);
 
                 be_tx_stats_update(txo, wrb_cnt, copied, gso_segs, stopped);
         } else {
@@ -891,7 +991,7 @@ set_vlan_promisc:
         return status;
 }
 
-static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
+static int be_vlan_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
         int status = 0;
@@ -917,7 +1017,7 @@ ret:
         return status;
 }
 
-static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)
+static int be_vlan_rem_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
         int status = 0;
@@ -1372,7 +1472,7 @@ static void be_rx_compl_process(struct be_rx_obj *rxo,
 
 
         if (rxcp->vlanf)
-                __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), rxcp->vlan_tag);
 
         netif_receive_skb(skb);
 }
@@ -1428,7 +1528,7 @@ void be_rx_compl_process_gro(struct be_rx_obj *rxo, struct napi_struct *napi,
                 skb->rxhash = rxcp->rss_hash;
 
         if (rxcp->vlanf)
-                __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), rxcp->vlan_tag);
 
         napi_gro_frags(napi);
 }
@@ -1958,7 +2058,7 @@ static int be_tx_qs_create(struct be_adapter *adapter)
                 if (status)
                         return status;
 
-                status = be_cmd_txq_create(adapter, &txo->q, &txo->cq);
+                status = be_cmd_txq_create(adapter, txo);
                 if (status)
                         return status;
         }
@@ -2436,9 +2536,6 @@ static int be_close(struct net_device *netdev)
 
         be_roce_dev_close(adapter);
 
-        if (!lancer_chip(adapter))
-                be_intr_set(adapter, false);
-
         for_all_evt_queues(adapter, eqo, i)
                 napi_disable(&eqo->napi);
 
@@ -2500,9 +2597,19 @@ static int be_rx_qs_create(struct be_adapter *adapter)
                                 rsstable[j + i] = rxo->rss_id;
                         }
                 }
-                rc = be_cmd_rss_config(adapter, rsstable, 128);
-                if (rc)
+                adapter->rss_flags = RSS_ENABLE_TCP_IPV4 | RSS_ENABLE_IPV4 |
+                                        RSS_ENABLE_TCP_IPV6 | RSS_ENABLE_IPV6;
+
+                if (!BEx_chip(adapter))
+                        adapter->rss_flags |= RSS_ENABLE_UDP_IPV4 |
+                                                RSS_ENABLE_UDP_IPV6;
+
+                rc = be_cmd_rss_config(adapter, rsstable, adapter->rss_flags,
+                                       128);
+                if (rc) {
+                        adapter->rss_flags = 0;
                         return rc;
+                }
         }
 
         /* First time posting */
@@ -2526,9 +2633,6 @@ static int be_open(struct net_device *netdev)
 
         be_irq_register(adapter);
 
-        if (!lancer_chip(adapter))
-                be_intr_set(adapter, true);
-
         for_all_rx_queues(adapter, rxo, i)
                 be_cq_notify(adapter, rxo->cq.id, true, 0);
 
@@ -2563,10 +2667,9 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
 
         cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config);
         cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
-                                    GFP_KERNEL);
+                                    GFP_KERNEL | __GFP_ZERO);
         if (cmd.va == NULL)
                 return -1;
-        memset(cmd.va, 0, cmd.size);
 
         if (enable) {
                 status = pci_write_config_dword(adapter->pdev,
@@ -2714,7 +2817,8 @@ static int be_vfs_if_create(struct be_adapter *adapter)
 
         for_all_vfs(adapter, vf_cfg, vf) {
                 if (!BE3_chip(adapter))
-                        be_cmd_get_profile_config(adapter, &cap_flags, vf + 1);
+                        be_cmd_get_profile_config(adapter, &cap_flags,
+                                                  NULL, vf + 1);
 
                 /* If a FW profile exists, then cap_flags are updated */
                 en_flags = cap_flags & (BE_IF_FLAGS_UNTAGGED |
@@ -2878,11 +2982,14 @@ static void be_get_resources(struct be_adapter *adapter)
         u16 dev_num_vfs;
         int pos, status;
         bool profile_present = false;
+        u16 txq_count = 0;
 
         if (!BEx_chip(adapter)) {
                 status = be_cmd_get_func_config(adapter);
                 if (!status)
                         profile_present = true;
+        } else if (BE3_chip(adapter) && be_physfn(adapter)) {
+                be_cmd_get_profile_config(adapter, NULL, &txq_count, 0);
         }
 
         if (profile_present) {
@@ -2920,7 +3027,9 @@ static void be_get_resources(struct be_adapter *adapter)
                         adapter->max_vlans = BE_NUM_VLANS_SUPPORTED;
 
                 adapter->max_mcast_mac = BE_MAX_MC;
-                adapter->max_tx_queues = MAX_TX_QS;
+                adapter->max_tx_queues = txq_count ? txq_count : MAX_TX_QS;
+                adapter->max_tx_queues = min_t(u16, adapter->max_tx_queues,
+                                               MAX_TX_QS);
                 adapter->max_rss_queues = (adapter->be3_native) ?
                                            BE3_MAX_RSS_QS : BE2_MAX_RSS_QS;
                 adapter->max_event_queues = BE3_MAX_RSS_QS;
@@ -2954,7 +3063,8 @@ static int be_get_config(struct be_adapter *adapter)
 
         status = be_cmd_query_fw_cfg(adapter, &adapter->port_num,
                                      &adapter->function_mode,
-                                     &adapter->function_caps);
+                                     &adapter->function_caps,
+                                     &adapter->asic_rev);
         if (status)
                 goto err;
 
@@ -3215,7 +3325,7 @@ static int be_flash(struct be_adapter *adapter, const u8 *img,
         return 0;
 }
 
-/* For BE2 and BE3 */
+/* For BE2, BE3 and BE3-R */
 static int be_flash_BEx(struct be_adapter *adapter,
                          const struct firmware *fw,
                          struct be_dma_mem *flash_cmd,
@@ -3458,11 +3568,9 @@ static int lancer_fw_download(struct be_adapter *adapter,
         flash_cmd.size = sizeof(struct lancer_cmd_req_write_object)
                                 + LANCER_FW_DOWNLOAD_CHUNK;
         flash_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, flash_cmd.size,
-                                                &flash_cmd.dma, GFP_KERNEL);
+                                          &flash_cmd.dma, GFP_KERNEL);
         if (!flash_cmd.va) {
                 status = -ENOMEM;
-                dev_err(&adapter->pdev->dev,
-                        "Memory allocation failure while flashing\n");
                 goto lancer_fw_exit;
         }
 
@@ -3530,18 +3638,22 @@ lancer_fw_exit:
 
 #define UFI_TYPE2               2
 #define UFI_TYPE3               3
+#define UFI_TYPE3R              10
 #define UFI_TYPE4               4
 static int be_get_ufi_type(struct be_adapter *adapter,
-                           struct flash_file_hdr_g2 *fhdr)
+                           struct flash_file_hdr_g3 *fhdr)
 {
         if (fhdr == NULL)
                 goto be_get_ufi_exit;
 
         if (skyhawk_chip(adapter) && fhdr->build[0] == '4')
                 return UFI_TYPE4;
-        else if (BE3_chip(adapter) && fhdr->build[0] == '3')
-                return UFI_TYPE3;
-        else if (BE2_chip(adapter) && fhdr->build[0] == '2')
+        else if (BE3_chip(adapter) && fhdr->build[0] == '3') {
+                if (fhdr->asic_type_rev == 0x10)
+                        return UFI_TYPE3R;
+                else
+                        return UFI_TYPE3;
+        } else if (BE2_chip(adapter) && fhdr->build[0] == '2')
                 return UFI_TYPE2;
 
 be_get_ufi_exit:
@@ -3552,7 +3664,6 @@ be_get_ufi_exit:
 
 static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw)
 {
-        struct flash_file_hdr_g2 *fhdr;
         struct flash_file_hdr_g3 *fhdr3;
         struct image_hdr *img_hdr_ptr = NULL;
         struct be_dma_mem flash_cmd;
@@ -3564,29 +3675,41 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw)
                                           &flash_cmd.dma, GFP_KERNEL);
         if (!flash_cmd.va) {
                 status = -ENOMEM;
-                dev_err(&adapter->pdev->dev,
-                        "Memory allocation failure while flashing\n");
                 goto be_fw_exit;
         }
 
         p = fw->data;
-        fhdr = (struct flash_file_hdr_g2 *)p;
+        fhdr3 = (struct flash_file_hdr_g3 *)p;
 
-        ufi_type = be_get_ufi_type(adapter, fhdr);
+        ufi_type = be_get_ufi_type(adapter, fhdr3);
 
-        fhdr3 = (struct flash_file_hdr_g3 *)fw->data;
         num_imgs = le32_to_cpu(fhdr3->num_imgs);
         for (i = 0; i < num_imgs; i++) {
                 img_hdr_ptr = (struct image_hdr *)(fw->data +
                                 (sizeof(struct flash_file_hdr_g3) +
                                  i * sizeof(struct image_hdr)));
                 if (le32_to_cpu(img_hdr_ptr->imageid) == 1) {
-                        if (ufi_type == UFI_TYPE4)
+                        switch (ufi_type) {
+                        case UFI_TYPE4:
                                 status = be_flash_skyhawk(adapter, fw,
                                                         &flash_cmd, num_imgs);
-                        else if (ufi_type == UFI_TYPE3)
+                                break;
+                        case UFI_TYPE3R:
                                 status = be_flash_BEx(adapter, fw, &flash_cmd,
                                                       num_imgs);
+                                break;
+                        case UFI_TYPE3:
+                                /* Do not flash this ufi on BE3-R cards */
+                                if (adapter->asic_rev < 0x10)
+                                        status = be_flash_BEx(adapter, fw,
+                                                              &flash_cmd,
+                                                              num_imgs);
+                                else {
+                                        status = -1;
+                                        dev_err(&adapter->pdev->dev,
+                                                "Can't load BE3 UFI on BE3R\n");
+                                }
+                        }
                 }
         }
 
@@ -3663,12 +3786,12 @@ static void be_netdev_init(struct net_device *netdev)
 
         netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
-                NETIF_F_HW_VLAN_TX;
+                NETIF_F_HW_VLAN_CTAG_TX;
         if (be_multi_rxq(adapter))
                 netdev->hw_features |= NETIF_F_RXHASH;
 
         netdev->features |= netdev->hw_features |
-                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+                NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
@@ -3792,12 +3915,13 @@ static int be_ctrl_init(struct be_adapter *adapter)
 
         rx_filter->size = sizeof(struct be_cmd_req_rx_filter);
         rx_filter->va = dma_alloc_coherent(&adapter->pdev->dev, rx_filter->size,
-                                        &rx_filter->dma, GFP_KERNEL);
+                                           &rx_filter->dma,
+                                           GFP_KERNEL | __GFP_ZERO);
         if (rx_filter->va == NULL) {
                 status = -ENOMEM;
                 goto free_mbox;
         }
-        memset(rx_filter->va, 0, rx_filter->size);
+
         mutex_init(&adapter->mbox_lock);
         spin_lock_init(&adapter->mcc_lock);
         spin_lock_init(&adapter->mcc_cq_lock);
@@ -3839,10 +3963,9 @@ static int be_stats_init(struct be_adapter *adapter)
                 cmd->size = sizeof(struct be_cmd_req_get_stats_v1);
 
         cmd->va = dma_alloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma,
-                                     GFP_KERNEL);
+                                     GFP_KERNEL | __GFP_ZERO);
         if (cmd->va == NULL)
                 return -1;
-        memset(cmd->va, 0, cmd->size);
         return 0;
 }
 
@@ -3854,6 +3977,7 @@ static void be_remove(struct pci_dev *pdev)
                 return;
 
         be_roce_dev_remove(adapter);
+        be_intr_set(adapter, false);
 
         cancel_delayed_work_sync(&adapter->func_recovery_work);
 
@@ -4108,6 +4232,11 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
 
         status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
         if (!status) {
+                status = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+                if (status < 0) {
+                        dev_err(&pdev->dev, "dma_set_coherent_mask failed\n");
+                        goto free_netdev;
+                }
                 netdev->features |= NETIF_F_HIGHDMA;
         } else {
                 status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
@@ -4132,22 +4261,22 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
                         goto ctrl_clean;
         }
 
-        /* tell fw we're ready to fire cmds */
-        status = be_cmd_fw_init(adapter);
-        if (status)
-                goto ctrl_clean;
-
         if (be_reset_required(adapter)) {
                 status = be_cmd_reset_function(adapter);
                 if (status)
                         goto ctrl_clean;
+
+                /* Wait for interrupts to quiesce after an FLR */
+                msleep(100);
         }
 
-        /* The INTR bit may be set in the card when probed by a kdump kernel
-         * after a crash.
-         */
-        if (!lancer_chip(adapter))
-                be_intr_set(adapter, false);
+        /* Allow interrupts for other ULPs running on NIC function */
+        be_intr_set(adapter, true);
+
+        /* tell fw we're ready to fire cmds */
+        status = be_cmd_fw_init(adapter);
+        if (status)
+                goto ctrl_clean;
 
         status = be_stats_init(adapter);
         if (status)
@@ -4358,12 +4487,12 @@ static void be_eeh_resume(struct pci_dev *pdev)
 
         pci_save_state(pdev);
 
-        /* tell fw we're ready to fire cmds */
-        status = be_cmd_fw_init(adapter);
+        status = be_cmd_reset_function(adapter);
         if (status)
                 goto err;
 
-        status = be_cmd_reset_function(adapter);
+        /* tell fw we're ready to fire cmds */
+        status = be_cmd_fw_init(adapter);
         if (status)
                 goto err;
 
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c
index 55d32aa0a093..f3d126dcc104 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.c
+++ b/drivers/net/ethernet/emulex/benet/be_roce.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.h b/drivers/net/ethernet/emulex/benet/be_roce.h
index db4ea8081c07..276572998463 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.h
+++ b/drivers/net/ethernet/emulex/benet/be_roce.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2011 Emulex
+ * Copyright (C) 2005 - 2013 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 7c361d1db94c..21b85fb7d05f 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -780,12 +780,11 @@ static int ftgmac100_alloc_buffers(struct ftgmac100 *priv)
 
         priv->descs = dma_alloc_coherent(priv->dev,
                                          sizeof(struct ftgmac100_descs),
-                                         &priv->descs_dma_addr, GFP_KERNEL);
+                                         &priv->descs_dma_addr,
+                                         GFP_KERNEL | __GFP_ZERO);
         if (!priv->descs)
                 return -ENOMEM;
 
-        memset(priv->descs, 0, sizeof(struct ftgmac100_descs));
-
         /* initialize RX ring */
         ftgmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]);
 
@@ -1350,22 +1349,7 @@ static struct platform_driver ftgmac100_driver = {
         },
 };
 
-/******************************************************************************
- * initialization / finalization
- *****************************************************************************/
-static int __init ftgmac100_init(void)
-{
-        pr_info("Loading version " DRV_VERSION " ...\n");
-        return platform_driver_register(&ftgmac100_driver);
-}
-
-static void __exit ftgmac100_exit(void)
-{
-        platform_driver_unregister(&ftgmac100_driver);
-}
-
-module_init(ftgmac100_init);
-module_exit(ftgmac100_exit);
+module_platform_driver(ftgmac100_driver);
 
 MODULE_AUTHOR("Po-Yu Chuang <ratbert@faraday-tech.com>");
 MODULE_DESCRIPTION("FTGMAC100 driver");
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index b5ea8fbd8a76..a6eda8d83138 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -732,13 +732,13 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv)
 {
         int i;
 
-        priv->descs = dma_alloc_coherent(priv->dev, sizeof(struct ftmac100_descs),
-                                         &priv->descs_dma_addr, GFP_KERNEL);
+        priv->descs = dma_alloc_coherent(priv->dev,
+                                         sizeof(struct ftmac100_descs),
+                                         &priv->descs_dma_addr,
+                                         GFP_KERNEL | __GFP_ZERO);
         if (!priv->descs)
                 return -ENOMEM;
 
-        memset(priv->descs, 0, sizeof(struct ftmac100_descs));
-
         /* initialize RX ring */
         ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]);
 
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
index b7d58fe6f531..549ce13b92ac 100644
--- a/drivers/net/ethernet/freescale/Makefile
+++ b/drivers/net/ethernet/freescale/Makefile
@@ -2,7 +2,8 @@
 # Makefile for the Freescale network device drivers.
 #
 
-obj-$(CONFIG_FEC) += fec.o fec_ptp.o
+obj-$(CONFIG_FEC) += fec.o
+fec-objs :=fec_main.o fec_ptp.o
 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
 ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
         obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index eb4372962839..d44f65bac1d4 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -52,6 +52,7 @@
 #define FEC_R_FIFO_RSEM         0x194 /* Receive FIFO section empty threshold */
 #define FEC_R_FIFO_RAEM         0x198 /* Receive FIFO almost empty threshold */
 #define FEC_R_FIFO_RAFL         0x19c /* Receive FIFO almost full threshold */
+#define FEC_RACC                0x1C4 /* Receive Accelerator function */
 #define FEC_MIIGSK_CFGR         0x300 /* MIIGSK Configuration reg */
 #define FEC_MIIGSK_ENR          0x308 /* MIIGSK Enable reg */
 
@@ -164,9 +165,11 @@ struct bufdesc_ex {
 #define BD_ENET_TX_CSL          ((ushort)0x0001)
 #define BD_ENET_TX_STATS        ((ushort)0x03ff)        /* All status bits */
 
-/*enhanced buffer desciptor control/status used by Ethernet transmit*/
+/*enhanced buffer descriptor control/status used by Ethernet transmit*/
 #define BD_ENET_TX_INT          0x40000000
 #define BD_ENET_TX_TS           0x20000000
+#define BD_ENET_TX_PINS         0x10000000
+#define BD_ENET_TX_IINS         0x08000000
 
 
 /* This device has up to three irqs on some platforms */
@@ -190,6 +193,10 @@ struct bufdesc_ex {
 
 #define BD_ENET_RX_INT          0x00800000
 #define BD_ENET_RX_PTP          ((ushort)0x0400)
+#define BD_ENET_RX_ICE          0x00000020
+#define BD_ENET_RX_PCR          0x00000010
+#define FLAG_RX_CSUM_ENABLED    (BD_ENET_RX_ICE | BD_ENET_RX_PCR)
+#define FLAG_RX_CSUM_ERROR      (BD_ENET_RX_ICE | BD_ENET_RX_PCR)
 
 /* The FEC buffer descriptors track the ring buffers.  The rx_bd_base and
  * tx_bd_base always point to the base of the buffer descriptors.  The
@@ -247,6 +254,7 @@ struct fec_enet_private {
         int     pause_flag;
 
         struct  napi_struct napi;
+        int     csum_flags;
 
         struct ptp_clock *ptp_clock;
         struct ptp_clock_info ptp_caps;
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec_main.c
index 73195f643c9c..b9748f14ea78 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -29,12 +29,17 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <net/ip.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/icmp.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/bitops.h>
@@ -53,11 +58,6 @@
 
 #include <asm/cacheflush.h>
 
-#ifndef CONFIG_ARM
-#include <asm/coldfire.h>
-#include <asm/mcfsim.h>
-#endif
-
 #include "fec.h"
 
 #if defined(CONFIG_ARM)
@@ -107,6 +107,9 @@ static struct platform_device_id fec_devtype[] = {
                 .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
                                 FEC_QUIRK_HAS_BUFDESC_EX,
         }, {
+                .name = "mvf-fec",
+                .driver_data = FEC_QUIRK_ENET_MAC,
+        }, {
                 /* sentinel */
         }
 };
@@ -117,6 +120,7 @@ enum imx_fec_type {
         IMX27_FEC,      /* runs on i.mx27/35/51 */
         IMX28_FEC,
         IMX6Q_FEC,
+        MVF_FEC,
 };
 
 static const struct of_device_id fec_dt_ids[] = {
@@ -124,6 +128,7 @@ static const struct of_device_id fec_dt_ids[] = {
         { .compatible = "fsl,imx27-fec", .data = &fec_devtype[IMX27_FEC], },
         { .compatible = "fsl,imx28-fec", .data = &fec_devtype[IMX28_FEC], },
         { .compatible = "fsl,imx6q-fec", .data = &fec_devtype[IMX6Q_FEC], },
+        { .compatible = "fsl,mvf-fec", .data = &fec_devtype[MVF_FEC], },
         { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, fec_dt_ids);
@@ -177,6 +182,11 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
 #define PKT_MINBUF_SIZE         64
 #define PKT_MAXBLR_SIZE         1520
 
+/* FEC receive acceleration */
+#define FEC_RACC_IPDIS          (1 << 1)
+#define FEC_RACC_PRODIS         (1 << 2)
+#define FEC_RACC_OPTIONS        (FEC_RACC_IPDIS | FEC_RACC_PRODIS)
+
 /*
  * The 5270/5271/5280/5282/532x RX control register also contains maximum frame
  * size bits. Other FEC hardware does not, so we need to take that into
@@ -237,6 +247,21 @@ static void *swap_buffer(void *bufaddr, int len)
         return bufaddr;
 }
 
+static int
+fec_enet_clear_csum(struct sk_buff *skb, struct net_device *ndev)
+{
+        /* Only run for packets requiring a checksum. */
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
+                return 0;
+
+        if (unlikely(skb_cow_head(skb, 0)))
+                return -1;
+
+        *(__sum16 *)(skb->head + skb->csum_start + skb->csum_offset) = 0;
+
+        return 0;
+}
+
 static netdev_tx_t
 fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
@@ -249,7 +274,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         unsigned int index;
 
         if (!fep->link) {
-                /* Link is down or autonegotiation is in progress. */
+                /* Link is down or auto-negotiation is in progress. */
                 return NETDEV_TX_BUSY;
         }
 
@@ -262,10 +287,16 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 /* Ooops.  All transmit buffers are full.  Bail out.
                  * This should not happen, since ndev->tbusy should be set.
                  */
-                printk("%s: tx queue full!.\n", ndev->name);
+                netdev_err(ndev, "tx queue full!\n");
                 return NETDEV_TX_BUSY;
         }
 
+        /* Protocol checksum off-load for TCP and UDP. */
+        if (fec_enet_clear_csum(skb, ndev)) {
+                kfree_skb(skb);
+                return NETDEV_TX_OK;
+        }
+
         /* Clear all of the status flags */
         status &= ~BD_ENET_TX_STATS;
 
@@ -322,8 +353,14 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                         ebdp->cbd_esc = (BD_ENET_TX_TS | BD_ENET_TX_INT);
                         skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
                 } else {
-
                         ebdp->cbd_esc = BD_ENET_TX_INT;
+
+                        /* Enable protocol checksum flags
+                         * We do not bother with the IP Checksum bits as they
+                         * are done by the kernel
+                         */
+                        if (skb->ip_summed == CHECKSUM_PARTIAL)
+                                ebdp->cbd_esc |= BD_ENET_TX_PINS;
                 }
         }
         /* If this was the last BD in the ring, start at the beginning again. */
@@ -403,6 +440,7 @@ fec_restart(struct net_device *ndev, int duplex)
         const struct platform_device_id *id_entry =
                                 platform_get_device_id(fep->pdev);
         int i;
+        u32 val;
         u32 temp_mac[2];
         u32 rcntl = OPT_FRAME_SIZE | 0x04;
         u32 ecntl = 0x2; /* ETHEREN */
@@ -469,6 +507,14 @@ fec_restart(struct net_device *ndev, int duplex)
         /* Set MII speed */
         writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
 
+        /* set RX checksum */
+        val = readl(fep->hwp + FEC_RACC);
+        if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
+                val |= FEC_RACC_OPTIONS;
+        else
+                val &= ~FEC_RACC_OPTIONS;
+        writel(val, fep->hwp + FEC_RACC);
+
         /*
          * The phy interface and speed need to get configured
          * differently on enet-mac.
@@ -526,7 +572,7 @@ fec_restart(struct net_device *ndev, int duplex)
              fep->phy_dev && fep->phy_dev->pause)) {
                 rcntl |= FEC_ENET_FCE;
 
-                /* set FIFO thresh hold parameter to reduce overrun */
+                /* set FIFO threshold parameter to reduce overrun */
                 writel(FEC_ENET_RSEM_V, fep->hwp + FEC_R_FIFO_RSEM);
                 writel(FEC_ENET_RSFL_V, fep->hwp + FEC_R_FIFO_RSFL);
                 writel(FEC_ENET_RAEM_V, fep->hwp + FEC_R_FIFO_RAEM);
@@ -574,7 +620,7 @@ fec_stop(struct net_device *ndev)
                 writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
                 udelay(10);
                 if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
-                        printk("fec_stop : Graceful transmit stop did not complete !\n");
+                        netdev_err(ndev, "Graceful transmit stop did not complete!\n");
         }
 
         /* Whack a reset.  We should wait for this. */
@@ -672,7 +718,7 @@ fec_enet_tx(struct net_device *ndev)
                 }
 
                 if (status & BD_ENET_TX_READY)
-                        printk("HEY! Enet xmit interrupt and TX_READY.\n");
+                        netdev_err(ndev, "HEY! Enet xmit interrupt and TX_READY\n");
 
                 /* Deferred means some collisions occurred during transmit,
                  * but we eventually sent the packet OK.
@@ -740,7 +786,7 @@ fec_enet_rx(struct net_device *ndev, int budget)
                  * the last indicator should be set.
                  */
                 if ((status & BD_ENET_RX_LAST) == 0)
-                        printk("FEC ENET: rcv is not +last\n");
+                        netdev_err(ndev, "rcv is not +last\n");
 
                 if (!fep->opened)
                         goto rx_processing_done;
@@ -791,8 +837,6 @@ fec_enet_rx(struct net_device *ndev, int budget)
                 skb = netdev_alloc_skb(ndev, pkt_len - 4 + NET_IP_ALIGN);
 
                 if (unlikely(!skb)) {
-                        printk("%s: Memory squeeze, dropping packet.\n",
-                                        ndev->name);
                         ndev->stats.rx_dropped++;
                 } else {
                         skb_reserve(skb, NET_IP_ALIGN);
@@ -816,6 +860,18 @@ fec_enet_rx(struct net_device *ndev, int budget)
                                 spin_unlock_irqrestore(&fep->tmreg_lock, flags);
                         }
 
+                        if (fep->bufdesc_ex &&
+                                (fep->csum_flags & FLAG_RX_CSUM_ENABLED)) {
+                                struct bufdesc_ex *ebdp =
+                                        (struct bufdesc_ex *)bdp;
+                                if (!(ebdp->cbd_esc & FLAG_RX_CSUM_ERROR)) {
+                                        /* don't check it */
+                                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                                } else {
+                                        skb_checksum_none_assert(skb);
+                                }
+                        }
+
                         if (!skb_defer_rx_timestamp(skb))
                                 napi_gro_receive(&fep->napi, skb);
                 }
@@ -916,7 +972,6 @@ static void fec_get_mac(struct net_device *ndev)
          */
         iap = macaddr;
 
-#ifdef CONFIG_OF
         /*
          * 2) from device tree data
          */
@@ -928,7 +983,6 @@ static void fec_get_mac(struct net_device *ndev)
                                 iap = (unsigned char *) mac;
                 }
         }
-#endif
 
         /*
          * 3) from flash or fuse (via platform data)
@@ -1032,7 +1086,7 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
                         usecs_to_jiffies(FEC_MII_TIMEOUT));
         if (time_left == 0) {
                 fep->mii_timeout = 1;
-                printk(KERN_ERR "FEC: MDIO read timeout\n");
+                netdev_err(fep->netdev, "MDIO read timeout\n");
                 return -ETIMEDOUT;
         }
 
@@ -1060,7 +1114,7 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
                         usecs_to_jiffies(FEC_MII_TIMEOUT));
         if (time_left == 0) {
                 fep->mii_timeout = 1;
-                printk(KERN_ERR "FEC: MDIO write timeout\n");
+                netdev_err(fep->netdev, "MDIO write timeout\n");
                 return -ETIMEDOUT;
         }
 
@@ -1100,9 +1154,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
         }
 
         if (phy_id >= PHY_MAX_ADDR) {
-                printk(KERN_INFO
-                        "%s: no PHY, assuming direct connection to switch\n",
-                        ndev->name);
+                netdev_info(ndev, "no PHY, assuming direct connection to switch\n");
                 strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE);
                 phy_id = 0;
         }
@@ -1111,7 +1163,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
         phy_dev = phy_connect(ndev, phy_name, &fec_enet_adjust_link,
                               fep->phy_interface);
         if (IS_ERR(phy_dev)) {
-                printk(KERN_ERR "%s: could not attach to PHY\n", ndev->name);
+                netdev_err(ndev, "could not attach to PHY\n");
                 return PTR_ERR(phy_dev);
         }
 
@@ -1129,11 +1181,9 @@ static int fec_enet_mii_probe(struct net_device *ndev)
         fep->link = 0;
         fep->full_duplex = 0;
 
-        printk(KERN_INFO
-                "%s: Freescale FEC PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                ndev->name,
-                fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
-                fep->phy_dev->irq);
+        netdev_info(ndev, "Freescale FEC PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
+                    fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
+                    fep->phy_dev->irq);
 
         return 0;
 }
@@ -1443,7 +1493,7 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
 
                 if (fep->bufdesc_ex) {
                         struct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp;
-                        ebdp->cbd_esc = BD_ENET_RX_INT;
+                        ebdp->cbd_esc = BD_ENET_TX_INT;
                 }
 
                 bdp = fec_enet_get_nextdesc(bdp, fep->bufdesc_ex);
@@ -1608,7 +1658,7 @@ fec_set_mac_address(struct net_device *ndev, void *p)
  * Polled functionality used by netconsole and others in non interrupt mode
  *
  */
-void fec_poll_controller(struct net_device *dev)
+static void fec_poll_controller(struct net_device *dev)
 {
         int i;
         struct fec_enet_private *fep = netdev_priv(dev);
@@ -1623,6 +1673,33 @@ void fec_poll_controller(struct net_device *dev)
 }
 #endif
 
+static int fec_set_features(struct net_device *netdev,
+        netdev_features_t features)
+{
+        struct fec_enet_private *fep = netdev_priv(netdev);
+        netdev_features_t changed = features ^ netdev->features;
+
+        netdev->features = features;
+
+        /* Receive checksum has been changed */
+        if (changed & NETIF_F_RXCSUM) {
+                if (features & NETIF_F_RXCSUM)
+                        fep->csum_flags |= FLAG_RX_CSUM_ENABLED;
+                else
+                        fep->csum_flags &= ~FLAG_RX_CSUM_ENABLED;
+
+                if (netif_running(netdev)) {
+                        fec_stop(netdev);
+                        fec_restart(netdev, fep->phy_dev->duplex);
+                        netif_wake_queue(netdev);
+                } else {
+                        fec_restart(netdev, fep->phy_dev->duplex);
+                }
+        }
+
+        return 0;
+}
+
 static const struct net_device_ops fec_netdev_ops = {
         .ndo_open               = fec_enet_open,
         .ndo_stop               = fec_enet_close,
@@ -1636,6 +1713,7 @@ static const struct net_device_ops fec_netdev_ops = {
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = fec_poll_controller,
 #endif
+        .ndo_set_features       = fec_set_features,
 };
 
  /*
@@ -1649,11 +1727,9 @@ static int fec_enet_init(struct net_device *ndev)
 
         /* Allocate memory for buffer descriptors. */
         cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma,
-                        GFP_KERNEL);
-        if (!cbd_base) {
-                printk("FEC: allocate descriptor memory failed?\n");
+                                      GFP_KERNEL);
+        if (!cbd_base)
                 return -ENOMEM;
-        }
 
         memset(cbd_base, 0, PAGE_SIZE);
         spin_lock_init(&fep->hw_lock);
@@ -1679,22 +1755,19 @@ static int fec_enet_init(struct net_device *ndev)
         writel(FEC_RX_DISABLED_IMASK, fep->hwp + FEC_IMASK);
         netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi, FEC_NAPI_WEIGHT);
 
+        /* enable hw accelerator */
+        ndev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
+                        | NETIF_F_RXCSUM);
+        ndev->hw_features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
+                        | NETIF_F_RXCSUM);
+        fep->csum_flags |= FLAG_RX_CSUM_ENABLED;
+
         fec_restart(ndev, 0);
 
         return 0;
 }
 
 #ifdef CONFIG_OF
-static int fec_get_phy_mode_dt(struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-
-        if (np)
-                return of_get_phy_mode(np);
-
-        return -ENODEV;
-}
-
 static void fec_reset_phy(struct platform_device *pdev)
 {
         int err, phy_reset;
@@ -1723,11 +1796,6 @@ static void fec_reset_phy(struct platform_device *pdev)
         gpio_set_value(phy_reset, 1);
 }
 #else /* CONFIG_OF */
-static int fec_get_phy_mode_dt(struct platform_device *pdev)
-{
-        return -ENODEV;
-}
-
 static void fec_reset_phy(struct platform_device *pdev)
 {
         /*
@@ -1758,16 +1826,10 @@ fec_probe(struct platform_device *pdev)
         if (!r)
                 return -ENXIO;
 
-        r = request_mem_region(r->start, resource_size(r), pdev->name);
-        if (!r)
-                return -EBUSY;
-
         /* Init network device */
         ndev = alloc_etherdev(sizeof(struct fec_enet_private));
-        if (!ndev) {
-                ret = -ENOMEM;
-                goto failed_alloc_etherdev;
-        }
+        if (!ndev)
+                return -ENOMEM;
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
@@ -1779,7 +1841,7 @@ fec_probe(struct platform_device *pdev)
             (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
                 fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
 
-        fep->hwp = ioremap(r->start, resource_size(r));
+        fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
         fep->pdev = pdev;
         fep->dev_id = dev_id++;
 
@@ -1792,7 +1854,7 @@ fec_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ndev);
 
-        ret = fec_get_phy_mode_dt(pdev);
+        ret = of_get_phy_mode(pdev->dev.of_node);
         if (ret < 0) {
                 pdata = pdev->dev.platform_data;
                 if (pdata)
@@ -1882,6 +1944,9 @@ fec_probe(struct platform_device *pdev)
         if (ret)
                 goto failed_register;
 
+        if (fep->bufdesc_ex && fep->ptp_clock)
+                netdev_info(ndev, "registered PHC device %d\n", fep->dev_id);
+
         return 0;
 
 failed_register:
@@ -1901,11 +1966,8 @@ failed_regulator:
                 clk_disable_unprepare(fep->clk_ptp);
 failed_pin:
 failed_clk:
-        iounmap(fep->hwp);
 failed_ioremap:
         free_netdev(ndev);
-failed_alloc_etherdev:
-        release_mem_region(r->start, resource_size(r));
 
         return ret;
 }
@@ -1915,7 +1977,6 @@ fec_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct fec_enet_private *fep = netdev_priv(ndev);
-        struct resource *r;
         int i;
 
         unregister_netdev(ndev);
@@ -1931,19 +1992,14 @@ fec_drv_remove(struct platform_device *pdev)
                 if (irq > 0)
                         free_irq(irq, ndev);
         }
-        iounmap(fep->hwp);
         free_netdev(ndev);
 
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        BUG_ON(!r);
-        release_mem_region(r->start, resource_size(r));
-
         platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int
 fec_suspend(struct device *dev)
 {
@@ -1975,24 +2031,15 @@ fec_resume(struct device *dev)
 
         return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
-static const struct dev_pm_ops fec_pm_ops = {
-        .suspend        = fec_suspend,
-        .resume         = fec_resume,
-        .freeze         = fec_suspend,
-        .thaw           = fec_resume,
-        .poweroff       = fec_suspend,
-        .restore        = fec_resume,
-};
-#endif
+static SIMPLE_DEV_PM_OPS(fec_pm_ops, fec_suspend, fec_resume);
 
 static struct platform_driver fec_driver = {
         .driver = {
                 .name   = DRIVER_NAME,
                 .owner  = THIS_MODULE,
-#ifdef CONFIG_PM
                 .pm     = &fec_pm_ops,
-#endif
                 .of_match_table = fec_dt_ids,
         },
         .id_table = fec_devtype,
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 77943a6a1b8c..9bc15e2365bb 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -14,6 +14,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 
@@ -858,13 +860,11 @@ static int mpc52xx_fec_probe(struct platform_device *op)
         /* Reserve FEC control zone */
         rv = of_address_to_resource(np, 0, &mem);
         if (rv) {
-                printk(KERN_ERR DRIVER_NAME ": "
-                                "Error while parsing device node resource\n" );
+                pr_err("Error while parsing device node resource\n");
                 goto err_netdev;
         }
         if (resource_size(&mem) < sizeof(struct mpc52xx_fec)) {
-                printk(KERN_ERR DRIVER_NAME
-                       " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
+                pr_err("invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
                        (unsigned long)resource_size(&mem),
                        sizeof(struct mpc52xx_fec));
                 rv = -EINVAL;
@@ -902,7 +902,7 @@ static int mpc52xx_fec_probe(struct platform_device *op)
         priv->tx_dmatsk = bcom_fec_tx_init(FEC_TX_NUM_BD, tx_fifo);
 
         if (!priv->rx_dmatsk || !priv->tx_dmatsk) {
-                printk(KERN_ERR DRIVER_NAME ": Can not init SDMA tasks\n" );
+                pr_err("Can not init SDMA tasks\n");
                 rv = -ENOMEM;
                 goto err_rx_tx_dmatsk;
         }
@@ -982,8 +982,8 @@ static int mpc52xx_fec_probe(struct platform_device *op)
 
         /* We're done ! */
         dev_set_drvdata(&op->dev, ndev);
-        printk(KERN_INFO "%s: %s MAC %pM\n",
-               ndev->name, op->dev.of_node->full_name, ndev->dev_addr);
+        netdev_info(ndev, "%s MAC %pM\n",
+                    op->dev.of_node->full_name, ndev->dev_addr);
 
         return 0;
 
@@ -1094,7 +1094,7 @@ mpc52xx_fec_init(void)
         int ret;
         ret = platform_driver_register(&mpc52xx_fec_mdio_driver);
         if (ret) {
-                printk(KERN_ERR DRIVER_NAME ": failed to register mdio driver\n");
+                pr_err("failed to register mdio driver\n");
                 return ret;
         }
 #endif
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 0d8df400a479..25fc960cbf0e 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -17,6 +17,8 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -128,7 +130,6 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev)
 
         spin_unlock_irqrestore(&fep->tmreg_lock, flags);
 }
-EXPORT_SYMBOL(fec_ptp_start_cyclecounter);
 
 /**
  * fec_ptp_adjfreq - adjust ptp cycle frequency
@@ -319,7 +320,6 @@ int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
         return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
             -EFAULT : 0;
 }
-EXPORT_SYMBOL(fec_ptp_ioctl);
 
 /**
  * fec_time_keep - call timecounter_read every second to avoid timer overrun
@@ -381,8 +381,5 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev)
         if (IS_ERR(fep->ptp_clock)) {
                 fep->ptp_clock = NULL;
                 pr_err("ptp_clock_register failed\n");
-        } else {
-                pr_info("registered PHC device on %s\n", ndev->name);
         }
 }
-EXPORT_SYMBOL(fec_ptp_init);
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 46df28893c10..edc120094c34 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -177,8 +177,6 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
                                 received++;
                                 netif_receive_skb(skb);
                         } else {
-                                dev_warn(fep->dev,
-                                         "Memory squeeze, dropping packet.\n");
                                 fep->stats.rx_dropped++;
                                 skbn = skb;
                         }
@@ -309,8 +307,6 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
                                 received++;
                                 netif_rx(skb);
                         } else {
-                                dev_warn(fep->dev,
-                                         "Memory squeeze, dropping packet.\n");
                                 fep->stats.rx_dropped++;
                                 skbn = skb;
                         }
@@ -505,11 +501,9 @@ void fs_init_bds(struct net_device *dev)
          */
         for (i = 0, bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) {
                 skb = netdev_alloc_skb(dev, ENET_RX_FRSIZE);
-                if (skb == NULL) {
-                        dev_warn(fep->dev,
-                                 "Memory squeeze, unable to allocate skb\n");
+                if (skb == NULL)
                         break;
-                }
+
                 skb_align(skb, ENET_RX_ALIGN);
                 fep->rx_skbuff[i] = skb;
                 CBDW_BUFADDR(bdp,
@@ -593,13 +587,8 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
 
         /* Alloc new skb */
         new_skb = netdev_alloc_skb(dev, skb->len + 4);
-        if (!new_skb) {
-                if (net_ratelimit()) {
-                        dev_warn(fep->dev,
-                                 "Memory squeeze, dropping tx packet.\n");
-                }
+        if (!new_skb)
                 return NULL;
-        }
 
         /* Make sure new skb is properly aligned */
         skb_align(new_skb, 4);
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index d2c5441d1bf0..2375a01715a0 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -132,7 +132,7 @@ static int gfar_poll(struct napi_struct *napi, int budget);
 static void gfar_netpoll(struct net_device *dev);
 #endif
 int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit);
-static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue);
+static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue);
 static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
                                int amount_pull, struct napi_struct *napi);
 void gfar_halt(struct net_device *dev);
@@ -245,14 +245,13 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
 
         /* Allocate memory for the buffer descriptors */
         vaddr = dma_alloc_coherent(dev,
-                        sizeof(struct txbd8) * priv->total_tx_ring_size +
-                        sizeof(struct rxbd8) * priv->total_rx_ring_size,
-                        &addr, GFP_KERNEL);
-        if (!vaddr) {
-                netif_err(priv, ifup, ndev,
-                          "Could not allocate buffer descriptors!\n");
+                                   (priv->total_tx_ring_size *
+                                    sizeof(struct txbd8)) +
+                                   (priv->total_rx_ring_size *
+                                    sizeof(struct rxbd8)),
+                                   &addr, GFP_KERNEL);
+        if (!vaddr)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < priv->num_tx_queues; i++) {
                 tx_queue = priv->tx_queue[i];
@@ -342,7 +341,7 @@ static void gfar_init_mac(struct net_device *ndev)
         gfar_init_tx_rx_base(priv);
 
         /* Configure the coalescing support */
-        gfar_configure_coalescing(priv, 0xFF, 0xFF);
+        gfar_configure_coalescing_all(priv);
 
         /* set this when rx hw offload (TOE) functions are being used */
         priv->uses_rxfcb = 0;
@@ -387,7 +386,7 @@ static void gfar_init_mac(struct net_device *ndev)
                 priv->uses_rxfcb = 1;
         }
 
-        if (ndev->features & NETIF_F_HW_VLAN_RX) {
+        if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) {
                 rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT;
                 priv->uses_rxfcb = 1;
         }
@@ -691,7 +690,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         }
 
         for (i = 0; i < priv->num_tx_queues; i++)
-               priv->tx_queue[i] = NULL;
+                priv->tx_queue[i] = NULL;
         for (i = 0; i < priv->num_rx_queues; i++)
                 priv->rx_queue[i] = NULL;
 
@@ -1051,8 +1050,9 @@ static int gfar_probe(struct platform_device *ofdev)
         }
 
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) {
-                dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-                dev->features |= NETIF_F_HW_VLAN_RX;
+                dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX |
+                                    NETIF_F_HW_VLAN_CTAG_RX;
+                dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
         }
 
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_EXTENDED_HASH) {
@@ -1817,25 +1817,15 @@ void gfar_start(struct net_device *dev)
         dev->trans_start = jiffies; /* prevent tx timeout */
 }
 
-void gfar_configure_coalescing(struct gfar_private *priv,
+static void gfar_configure_coalescing(struct gfar_private *priv,
                                unsigned long tx_mask, unsigned long rx_mask)
 {
         struct gfar __iomem *regs = priv->gfargrp[0].regs;
         u32 __iomem *baddr;
-        int i = 0;
-
-        /* Backward compatible case ---- even if we enable
-         * multiple queues, there's only single reg to program
-         */
-        gfar_write(&regs->txic, 0);
-        if (likely(priv->tx_queue[0]->txcoalescing))
-                gfar_write(&regs->txic, priv->tx_queue[0]->txic);
-
-        gfar_write(&regs->rxic, 0);
-        if (unlikely(priv->rx_queue[0]->rxcoalescing))
-                gfar_write(&regs->rxic, priv->rx_queue[0]->rxic);
 
         if (priv->mode == MQ_MG_MODE) {
+                int i = 0;
+
                 baddr = &regs->txic0;
                 for_each_set_bit(i, &tx_mask, priv->num_tx_queues) {
                         gfar_write(baddr + i, 0);
@@ -1849,9 +1839,25 @@ void gfar_configure_coalescing(struct gfar_private *priv,
                         if (likely(priv->rx_queue[i]->rxcoalescing))
                                 gfar_write(baddr + i, priv->rx_queue[i]->rxic);
                 }
+        } else {
+                /* Backward compatible case -- even if we enable
+                 * multiple queues, there's only single reg to program
+                 */
+                gfar_write(&regs->txic, 0);
+                if (likely(priv->tx_queue[0]->txcoalescing))
+                        gfar_write(&regs->txic, priv->tx_queue[0]->txic);
+
+                gfar_write(&regs->rxic, 0);
+                if (unlikely(priv->rx_queue[0]->rxcoalescing))
+                        gfar_write(&regs->rxic, priv->rx_queue[0]->rxic);
         }
 }
 
+void gfar_configure_coalescing_all(struct gfar_private *priv)
+{
+        gfar_configure_coalescing(priv, 0xFF, 0xFF);
+}
+
 static int register_grp_irqs(struct gfar_priv_grp *grp)
 {
         struct gfar_private *priv = grp->priv;
@@ -1941,7 +1947,7 @@ int startup_gfar(struct net_device *ndev)
 
         phy_start(priv->phydev);
 
-        gfar_configure_coalescing(priv, 0xFF, 0xFF);
+        gfar_configure_coalescing_all(priv);
 
         return 0;
 
@@ -2343,7 +2349,7 @@ void gfar_vlan_mode(struct net_device *dev, netdev_features_t features)
         local_irq_save(flags);
         lock_rx_qs(priv);
 
-        if (features & NETIF_F_HW_VLAN_TX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_TX) {
                 /* Enable VLAN tag insertion */
                 tempval = gfar_read(&regs->tctrl);
                 tempval |= TCTRL_VLINS;
@@ -2355,7 +2361,7 @@ void gfar_vlan_mode(struct net_device *dev, netdev_features_t features)
                 gfar_write(&regs->tctrl, tempval);
         }
 
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* Enable VLAN tag extraction */
                 tempval = gfar_read(&regs->rctrl);
                 tempval |= (RCTRL_VLEX | RCTRL_PRSDEP_INIT);
@@ -2469,12 +2475,11 @@ static void gfar_align_skb(struct sk_buff *skb)
 }
 
 /* Interrupt Handler for Transmit complete */
-static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
+static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 {
         struct net_device *dev = tx_queue->dev;
         struct netdev_queue *txq;
         struct gfar_private *priv = netdev_priv(dev);
-        struct gfar_priv_rx_q *rx_queue = NULL;
         struct txbd8 *bdp, *next = NULL;
         struct txbd8 *lbdp = NULL;
         struct txbd8 *base = tx_queue->tx_bd_base;
@@ -2489,7 +2494,6 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
         u32 lstatus;
         size_t buflen;
 
-        rx_queue = priv->rx_queue[tqi];
         txq = netdev_get_tx_queue(dev, tqi);
         bdp = tx_queue->dirty_tx;
         skb_dirtytx = tx_queue->skb_dirtytx;
@@ -2571,8 +2575,6 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
         tx_queue->dirty_tx = bdp;
 
         netdev_tx_completed_queue(txq, howmany, bytes_sent);
-
-        return howmany;
 }
 
 static void gfar_schedule_cleanup(struct gfar_priv_grp *gfargrp)
@@ -2694,8 +2696,6 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         struct gfar_private *priv = netdev_priv(dev);
         struct rxfcb *fcb = NULL;
 
-        gro_result_t ret;
-
         /* fcb is at the beginning if exists */
         fcb = (struct rxfcb *)skb->data;
 
@@ -2725,19 +2725,17 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         /* Tell the skb what kind of packet this is */
         skb->protocol = eth_type_trans(skb, dev);
 
-        /* There's need to check for NETIF_F_HW_VLAN_RX here.
+        /* There's need to check for NETIF_F_HW_VLAN_CTAG_RX here.
          * Even if vlan rx accel is disabled, on some chips
          * RXFCB_VLN is pseudo randomly set.
          */
-        if (dev->features & NETIF_F_HW_VLAN_RX &&
+        if (dev->features & NETIF_F_HW_VLAN_CTAG_RX &&
             fcb->flags & RXFCB_VLN)
-                __vlan_hwaccel_put_tag(skb, fcb->vlctl);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), fcb->vlctl);
 
         /* Send the packet up the stack */
-        ret = napi_gro_receive(napi, skb);
+        napi_gro_receive(napi, skb);
 
-        if (unlikely(GRO_DROP == ret))
-                atomic64_inc(&priv->extra_stats.kernel_dropped);
 }
 
 /* gfar_clean_rx_ring() -- Processes each frame in the rx ring
@@ -2835,62 +2833,82 @@ static int gfar_poll(struct napi_struct *napi, int budget)
         struct gfar __iomem *regs = gfargrp->regs;
         struct gfar_priv_tx_q *tx_queue = NULL;
         struct gfar_priv_rx_q *rx_queue = NULL;
-        int rx_cleaned = 0, budget_per_queue = 0, rx_cleaned_per_queue = 0;
-        int tx_cleaned = 0, i, left_over_budget = budget;
-        unsigned long serviced_queues = 0;
-        int num_queues = 0;
-
-        num_queues = gfargrp->num_rx_queues;
-        budget_per_queue = budget/num_queues;
+        int work_done = 0, work_done_per_q = 0;
+        int i, budget_per_q = 0;
+        int has_tx_work;
+        unsigned long rstat_rxf;
+        int num_act_queues;
 
         /* Clear IEVENT, so interrupts aren't called again
          * because of the packets that have already arrived
          */
         gfar_write(&regs->ievent, IEVENT_RTX_MASK);
 
-        while (num_queues && left_over_budget) {
-                budget_per_queue = left_over_budget/num_queues;
-                left_over_budget = 0;
+        rstat_rxf = gfar_read(&regs->rstat) & RSTAT_RXF_MASK;
+
+        num_act_queues = bitmap_weight(&rstat_rxf, MAX_RX_QS);
+        if (num_act_queues)
+                budget_per_q = budget/num_act_queues;
+
+        while (1) {
+                has_tx_work = 0;
+                for_each_set_bit(i, &gfargrp->tx_bit_map, priv->num_tx_queues) {
+                        tx_queue = priv->tx_queue[i];
+                        /* run Tx cleanup to completion */
+                        if (tx_queue->tx_skbuff[tx_queue->skb_dirtytx]) {
+                                gfar_clean_tx_ring(tx_queue);
+                                has_tx_work = 1;
+                        }
+                }
 
                 for_each_set_bit(i, &gfargrp->rx_bit_map, priv->num_rx_queues) {
-                        if (test_bit(i, &serviced_queues))
+                        /* skip queue if not active */
+                        if (!(rstat_rxf & (RSTAT_CLEAR_RXF0 >> i)))
                                 continue;
+
                         rx_queue = priv->rx_queue[i];
-                        tx_queue = priv->tx_queue[rx_queue->qindex];
-
-                        tx_cleaned += gfar_clean_tx_ring(tx_queue);
-                        rx_cleaned_per_queue =
-                                gfar_clean_rx_ring(rx_queue, budget_per_queue);
-                        rx_cleaned += rx_cleaned_per_queue;
-                        if (rx_cleaned_per_queue < budget_per_queue) {
-                                left_over_budget = left_over_budget +
-                                        (budget_per_queue -
-                                         rx_cleaned_per_queue);
-                                set_bit(i, &serviced_queues);
-                                num_queues--;
+                        work_done_per_q =
+                                gfar_clean_rx_ring(rx_queue, budget_per_q);
+                        work_done += work_done_per_q;
+
+                        /* finished processing this queue */
+                        if (work_done_per_q < budget_per_q) {
+                                /* clear active queue hw indication */
+                                gfar_write(&regs->rstat,
+                                           RSTAT_CLEAR_RXF0 >> i);
+                                rstat_rxf &= ~(RSTAT_CLEAR_RXF0 >> i);
+                                num_act_queues--;
+
+                                if (!num_act_queues)
+                                        break;
+                                /* recompute budget per Rx queue */
+                                budget_per_q =
+                                        (budget - work_done) / num_act_queues;
                         }
                 }
-        }
 
-        if (tx_cleaned)
-                return budget;
+                if (work_done >= budget)
+                        break;
 
-        if (rx_cleaned < budget) {
-                napi_complete(napi);
+                if (!num_act_queues && !has_tx_work) {
 
-                /* Clear the halt bit in RSTAT */
-                gfar_write(&regs->rstat, gfargrp->rstat);
+                        napi_complete(napi);
 
-                gfar_write(&regs->imask, IMASK_DEFAULT);
+                        /* Clear the halt bit in RSTAT */
+                        gfar_write(&regs->rstat, gfargrp->rstat);
 
-                /* If we are coalescing interrupts, update the timer
-                 * Otherwise, clear it
-                 */
-                gfar_configure_coalescing(priv, gfargrp->rx_bit_map,
-                                          gfargrp->tx_bit_map);
+                        gfar_write(&regs->imask, IMASK_DEFAULT);
+
+                        /* If we are coalescing interrupts, update the timer
+                         * Otherwise, clear it
+                         */
+                        gfar_configure_coalescing(priv, gfargrp->rx_bit_map,
+                                                  gfargrp->tx_bit_map);
+                        break;
+                }
         }
 
-        return rx_cleaned;
+        return work_done;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 63a28d294e20..04b552cd419d 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -291,7 +291,9 @@ extern const char gfar_driver_version[];
 #define RCTRL_PADDING(x)        ((x << 16) & RCTRL_PAL_MASK)
 
 
-#define RSTAT_CLEAR_RHALT       0x00800000
+#define RSTAT_CLEAR_RHALT       0x00800000
+#define RSTAT_CLEAR_RXF0        0x00000080
+#define RSTAT_RXF_MASK          0x000000ff
 
 #define TCTRL_IPCSEN            0x00004000
 #define TCTRL_TUCSEN            0x00002000
@@ -627,7 +629,6 @@ struct rmon_mib
 };
 
 struct gfar_extra_stats {
-        atomic64_t kernel_dropped;
         atomic64_t rx_large;
         atomic64_t rx_short;
         atomic64_t rx_nonoctet;
@@ -1180,8 +1181,7 @@ extern void stop_gfar(struct net_device *dev);
 extern void gfar_halt(struct net_device *dev);
 extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,
                 int enable, u32 regnum, u32 read);
-extern void gfar_configure_coalescing(struct gfar_private *priv,
-                unsigned long tx_mask, unsigned long rx_mask);
+extern void gfar_configure_coalescing_all(struct gfar_private *priv);
 void gfar_init_sysfs(struct net_device *dev);
 int gfar_set_features(struct net_device *dev, netdev_features_t features);
 extern void gfar_check_rx_parser_mode(struct gfar_private *priv);
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 75e89acf4912..21cd88124ca9 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -66,7 +66,6 @@ static void gfar_gdrvinfo(struct net_device *dev,
                           struct ethtool_drvinfo *drvinfo);
 
 static const char stat_gstrings[][ETH_GSTRING_LEN] = {
-        "rx-dropped-by-kernel",
         "rx-large-frame-errors",
         "rx-short-frame-errors",
         "rx-non-octet-errors",
@@ -390,14 +389,14 @@ static int gfar_scoalesce(struct net_device *dev,
 
         /* Check the bounds of the values */
         if (cvals->rx_coalesce_usecs > GFAR_MAX_COAL_USECS) {
-                pr_info("Coalescing is limited to %d microseconds\n",
-                        GFAR_MAX_COAL_USECS);
+                netdev_info(dev, "Coalescing is limited to %d microseconds\n",
+                            GFAR_MAX_COAL_USECS);
                 return -EINVAL;
         }
 
         if (cvals->rx_max_coalesced_frames > GFAR_MAX_COAL_FRAMES) {
-                pr_info("Coalescing is limited to %d frames\n",
-                        GFAR_MAX_COAL_FRAMES);
+                netdev_info(dev, "Coalescing is limited to %d frames\n",
+                            GFAR_MAX_COAL_FRAMES);
                 return -EINVAL;
         }
 
@@ -419,14 +418,14 @@ static int gfar_scoalesce(struct net_device *dev,
 
         /* Check the bounds of the values */
         if (cvals->tx_coalesce_usecs > GFAR_MAX_COAL_USECS) {
-                pr_info("Coalescing is limited to %d microseconds\n",
-                        GFAR_MAX_COAL_USECS);
+                netdev_info(dev, "Coalescing is limited to %d microseconds\n",
+                            GFAR_MAX_COAL_USECS);
                 return -EINVAL;
         }
 
         if (cvals->tx_max_coalesced_frames > GFAR_MAX_COAL_FRAMES) {
-                pr_info("Coalescing is limited to %d frames\n",
-                        GFAR_MAX_COAL_FRAMES);
+                netdev_info(dev, "Coalescing is limited to %d frames\n",
+                            GFAR_MAX_COAL_FRAMES);
                 return -EINVAL;
         }
 
@@ -436,7 +435,7 @@ static int gfar_scoalesce(struct net_device *dev,
                         gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs));
         }
 
-        gfar_configure_coalescing(priv, 0xFF, 0xFF);
+        gfar_configure_coalescing_all(priv);
 
         return 0;
 }
@@ -543,7 +542,7 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
         int err = 0, i = 0;
         netdev_features_t changed = dev->features ^ features;
 
-        if (changed & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))
+        if (changed & (NETIF_F_HW_VLAN_CTAG_TX|NETIF_F_HW_VLAN_CTAG_RX))
                 gfar_vlan_mode(dev, features);
 
         if (!(changed & NETIF_F_RXCSUM))
@@ -736,7 +735,8 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow,
                 cmp_rqfpr = RQFPR_IPV6 |RQFPR_UDP;
                 break;
         default:
-                pr_err("Right now this class is not supported\n");
+                netdev_err(priv->ndev,
+                           "Right now this class is not supported\n");
                 ret = 0;
                 goto err;
         }
@@ -752,7 +752,8 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow,
         }
 
         if (i == MAX_FILER_IDX + 1) {
-                pr_err("No parse rule found, can't create hash rules\n");
+                netdev_err(priv->ndev,
+                           "No parse rule found, can't create hash rules\n");
                 ret = 0;
                 goto err;
         }
@@ -1569,7 +1570,7 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
         gfar_cluster_filer(tab);
         gfar_optimize_filer_masks(tab);
 
-        pr_debug("\n\tSummary:\n"
+        pr_debug("\tSummary:\n"
                  "\tData on hardware: %d\n"
                  "\tCompression rate: %d%%\n",
                  tab->index, 100 - (100 * tab->index) / i);
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index 2e5daee0438a..576e4b858fce 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -17,6 +17,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/hrtimer.h>
 #include <linux/init.h>
@@ -127,7 +130,6 @@ struct gianfar_ptp_registers {
 
 #define DRIVER          "gianfar_ptp"
 #define DEFAULT_CKSEL   1
-#define N_ALARM         1 /* first alarm is used internally to reset fipers */
 #define N_EXT_TS        2
 #define REG_SIZE        sizeof(struct gianfar_ptp_registers)
 
@@ -410,7 +412,7 @@ static struct ptp_clock_info ptp_gianfar_caps = {
         .owner          = THIS_MODULE,
         .name           = "gianfar clock",
         .max_adj        = 512000,
-        .n_alarm        = N_ALARM,
+        .n_alarm        = 0,
         .n_ext_ts       = N_EXT_TS,
         .n_per_out      = 0,
         .pps            = 1,
diff --git a/drivers/net/ethernet/freescale/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c
index cd14a4d449c2..acb55af7e3f3 100644
--- a/drivers/net/ethernet/freescale/gianfar_sysfs.c
+++ b/drivers/net/ethernet/freescale/gianfar_sysfs.c
@@ -337,5 +337,5 @@ void gfar_init_sysfs(struct net_device *dev)
         rc |= device_create_file(&dev->dev, &dev_attr_fifo_starve);
         rc |= device_create_file(&dev->dev, &dev_attr_fifo_starve_off);
         if (rc)
-                dev_err(&dev->dev, "Error creating gianfar sysfs files.\n");
+                dev_err(&dev->dev, "Error creating gianfar sysfs files\n");
 }
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 0a70bb55d1b0..e04c59818f60 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -12,6 +12,9 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/errno.h>
@@ -50,12 +53,6 @@
 
 #define ugeth_dbg(format, arg...)            \
         ugeth_printk(KERN_DEBUG , format , ## arg)
-#define ugeth_err(format, arg...)            \
-        ugeth_printk(KERN_ERR , format , ## arg)
-#define ugeth_info(format, arg...)           \
-        ugeth_printk(KERN_INFO , format , ## arg)
-#define ugeth_warn(format, arg...)           \
-        ugeth_printk(KERN_WARNING , format , ## arg)
 
 #ifdef UGETH_VERBOSE_DEBUG
 #define ugeth_vdbg ugeth_dbg
@@ -281,7 +278,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
         for (i = 0; i < num_entries; i++) {
                 if ((snum = qe_get_snum()) < 0) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err("fill_init_enet_entries: Can not get SNUM.");
+                                pr_err("Can not get SNUM\n");
                         return snum;
                 }
                 if ((i == 0) && skip_page_for_first_entry)
@@ -292,7 +289,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
                             qe_muram_alloc(thread_size, thread_alignment);
                         if (IS_ERR_VALUE(init_enet_offset)) {
                                 if (netif_msg_ifup(ugeth))
-                                        ugeth_err("fill_init_enet_entries: Can not allocate DPRAM memory.");
+                                        pr_err("Can not allocate DPRAM memory\n");
                                 qe_put_snum((u8) snum);
                                 return -ENOMEM;
                         }
@@ -365,10 +362,9 @@ static int dump_init_enet_entries(struct ucc_geth_private *ugeth,
                                 init_enet_offset =
                                     (in_be32(p_start) &
                                      ENET_INIT_PARAM_PTR_MASK);
-                                ugeth_info("Init enet entry %d:", i);
-                                ugeth_info("Base address: 0x%08x",
-                                           (u32)
-                                           qe_muram_addr(init_enet_offset));
+                                pr_info("Init enet entry %d:\n", i);
+                                pr_info("Base address: 0x%08x\n",
+                                        (u32)qe_muram_addr(init_enet_offset));
                                 mem_disp(qe_muram_addr(init_enet_offset),
                                          thread_size);
                         }
@@ -396,8 +392,8 @@ static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num)
 {
         struct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt;
 
-        if (!(paddr_num < NUM_OF_PADDRS)) {
-                ugeth_warn("%s: Illagel paddr_num.", __func__);
+        if (paddr_num >= NUM_OF_PADDRS) {
+                pr_warn("%s: Invalid paddr_num: %u\n", __func__, paddr_num);
                 return -EINVAL;
         }
 
@@ -573,7 +569,7 @@ static void dump_bds(struct ucc_geth_private *ugeth)
                         length =
                             (ugeth->ug_info->bdRingLenTx[i] *
                              sizeof(struct qe_bd));
-                        ugeth_info("TX BDs[%d]", i);
+                        pr_info("TX BDs[%d]\n", i);
                         mem_disp(ugeth->p_tx_bd_ring[i], length);
                 }
         }
@@ -582,7 +578,7 @@ static void dump_bds(struct ucc_geth_private *ugeth)
                         length =
                             (ugeth->ug_info->bdRingLenRx[i] *
                              sizeof(struct qe_bd));
-                        ugeth_info("RX BDs[%d]", i);
+                        pr_info("RX BDs[%d]\n", i);
                         mem_disp(ugeth->p_rx_bd_ring[i], length);
                 }
         }
@@ -592,93 +588,93 @@ static void dump_regs(struct ucc_geth_private *ugeth)
 {
         int i;
 
-        ugeth_info("UCC%d Geth registers:", ugeth->ug_info->uf_info.ucc_num + 1);
-        ugeth_info("Base address: 0x%08x", (u32) ugeth->ug_regs);
-
-        ugeth_info("maccfg1    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->maccfg1,
-                   in_be32(&ugeth->ug_regs->maccfg1));
-        ugeth_info("maccfg2    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->maccfg2,
-                   in_be32(&ugeth->ug_regs->maccfg2));
-        ugeth_info("ipgifg     : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->ipgifg,
-                   in_be32(&ugeth->ug_regs->ipgifg));
-        ugeth_info("hafdup     : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->hafdup,
-                   in_be32(&ugeth->ug_regs->hafdup));
-        ugeth_info("ifctl      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->ifctl,
-                   in_be32(&ugeth->ug_regs->ifctl));
-        ugeth_info("ifstat     : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->ifstat,
-                   in_be32(&ugeth->ug_regs->ifstat));
-        ugeth_info("macstnaddr1: addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->macstnaddr1,
-                   in_be32(&ugeth->ug_regs->macstnaddr1));
-        ugeth_info("macstnaddr2: addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->macstnaddr2,
-                   in_be32(&ugeth->ug_regs->macstnaddr2));
-        ugeth_info("uempr      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->uempr,
-                   in_be32(&ugeth->ug_regs->uempr));
-        ugeth_info("utbipar    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->utbipar,
-                   in_be32(&ugeth->ug_regs->utbipar));
-        ugeth_info("uescr      : addr - 0x%08x, val - 0x%04x",
-                   (u32) & ugeth->ug_regs->uescr,
-                   in_be16(&ugeth->ug_regs->uescr));
-        ugeth_info("tx64       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->tx64,
-                   in_be32(&ugeth->ug_regs->tx64));
-        ugeth_info("tx127      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->tx127,
-                   in_be32(&ugeth->ug_regs->tx127));
-        ugeth_info("tx255      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->tx255,
-                   in_be32(&ugeth->ug_regs->tx255));
-        ugeth_info("rx64       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rx64,
-                   in_be32(&ugeth->ug_regs->rx64));
-        ugeth_info("rx127      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rx127,
-                   in_be32(&ugeth->ug_regs->rx127));
-        ugeth_info("rx255      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rx255,
-                   in_be32(&ugeth->ug_regs->rx255));
-        ugeth_info("txok       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->txok,
-                   in_be32(&ugeth->ug_regs->txok));
-        ugeth_info("txcf       : addr - 0x%08x, val - 0x%04x",
-                   (u32) & ugeth->ug_regs->txcf,
-                   in_be16(&ugeth->ug_regs->txcf));
-        ugeth_info("tmca       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->tmca,
-                   in_be32(&ugeth->ug_regs->tmca));
-        ugeth_info("tbca       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->tbca,
-                   in_be32(&ugeth->ug_regs->tbca));
-        ugeth_info("rxfok      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rxfok,
-                   in_be32(&ugeth->ug_regs->rxfok));
-        ugeth_info("rxbok      : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rxbok,
-                   in_be32(&ugeth->ug_regs->rxbok));
-        ugeth_info("rbyt       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rbyt,
-                   in_be32(&ugeth->ug_regs->rbyt));
-        ugeth_info("rmca       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rmca,
-                   in_be32(&ugeth->ug_regs->rmca));
-        ugeth_info("rbca       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->rbca,
-                   in_be32(&ugeth->ug_regs->rbca));
-        ugeth_info("scar       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->scar,
-                   in_be32(&ugeth->ug_regs->scar));
-        ugeth_info("scam       : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->scam,
-                   in_be32(&ugeth->ug_regs->scam));
+        pr_info("UCC%d Geth registers:\n", ugeth->ug_info->uf_info.ucc_num + 1);
+        pr_info("Base address: 0x%08x\n", (u32)ugeth->ug_regs);
+
+        pr_info("maccfg1    : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->maccfg1,
+                in_be32(&ugeth->ug_regs->maccfg1));
+        pr_info("maccfg2    : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->maccfg2,
+                in_be32(&ugeth->ug_regs->maccfg2));
+        pr_info("ipgifg     : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->ipgifg,
+                in_be32(&ugeth->ug_regs->ipgifg));
+        pr_info("hafdup     : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->hafdup,
+                in_be32(&ugeth->ug_regs->hafdup));
+        pr_info("ifctl      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->ifctl,
+                in_be32(&ugeth->ug_regs->ifctl));
+        pr_info("ifstat     : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->ifstat,
+                in_be32(&ugeth->ug_regs->ifstat));
+        pr_info("macstnaddr1: addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->macstnaddr1,
+                in_be32(&ugeth->ug_regs->macstnaddr1));
+        pr_info("macstnaddr2: addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->macstnaddr2,
+                in_be32(&ugeth->ug_regs->macstnaddr2));
+        pr_info("uempr      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->uempr,
+                in_be32(&ugeth->ug_regs->uempr));
+        pr_info("utbipar    : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->utbipar,
+                in_be32(&ugeth->ug_regs->utbipar));
+        pr_info("uescr      : addr - 0x%08x, val - 0x%04x\n",
+                (u32)&ugeth->ug_regs->uescr,
+                in_be16(&ugeth->ug_regs->uescr));
+        pr_info("tx64       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->tx64,
+                in_be32(&ugeth->ug_regs->tx64));
+        pr_info("tx127      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->tx127,
+                in_be32(&ugeth->ug_regs->tx127));
+        pr_info("tx255      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->tx255,
+                in_be32(&ugeth->ug_regs->tx255));
+        pr_info("rx64       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rx64,
+                in_be32(&ugeth->ug_regs->rx64));
+        pr_info("rx127      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rx127,
+                in_be32(&ugeth->ug_regs->rx127));
+        pr_info("rx255      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rx255,
+                in_be32(&ugeth->ug_regs->rx255));
+        pr_info("txok       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->txok,
+                in_be32(&ugeth->ug_regs->txok));
+        pr_info("txcf       : addr - 0x%08x, val - 0x%04x\n",
+                (u32)&ugeth->ug_regs->txcf,
+                in_be16(&ugeth->ug_regs->txcf));
+        pr_info("tmca       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->tmca,
+                in_be32(&ugeth->ug_regs->tmca));
+        pr_info("tbca       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->tbca,
+                in_be32(&ugeth->ug_regs->tbca));
+        pr_info("rxfok      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rxfok,
+                in_be32(&ugeth->ug_regs->rxfok));
+        pr_info("rxbok      : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rxbok,
+                in_be32(&ugeth->ug_regs->rxbok));
+        pr_info("rbyt       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rbyt,
+                in_be32(&ugeth->ug_regs->rbyt));
+        pr_info("rmca       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rmca,
+                in_be32(&ugeth->ug_regs->rmca));
+        pr_info("rbca       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->rbca,
+                in_be32(&ugeth->ug_regs->rbca));
+        pr_info("scar       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->scar,
+                in_be32(&ugeth->ug_regs->scar));
+        pr_info("scam       : addr - 0x%08x, val - 0x%08x\n",
+                (u32)&ugeth->ug_regs->scam,
+                in_be32(&ugeth->ug_regs->scam));
 
         if (ugeth->p_thread_data_tx) {
                 int numThreadsTxNumerical;
@@ -703,13 +699,13 @@ static void dump_regs(struct ucc_geth_private *ugeth)
                         break;
                 }
 
-                ugeth_info("Thread data TXs:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_thread_data_tx);
+                pr_info("Thread data TXs:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32)ugeth->p_thread_data_tx);
                 for (i = 0; i < numThreadsTxNumerical; i++) {
-                        ugeth_info("Thread data TX[%d]:", i);
-                        ugeth_info("Base address: 0x%08x",
-                                   (u32) & ugeth->p_thread_data_tx[i]);
+                        pr_info("Thread data TX[%d]:\n", i);
+                        pr_info("Base address: 0x%08x\n",
+                                (u32)&ugeth->p_thread_data_tx[i]);
                         mem_disp((u8 *) & ugeth->p_thread_data_tx[i],
                                  sizeof(struct ucc_geth_thread_data_tx));
                 }
@@ -737,270 +733,260 @@ static void dump_regs(struct ucc_geth_private *ugeth)
                         break;
                 }
 
-                ugeth_info("Thread data RX:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_thread_data_rx);
+                pr_info("Thread data RX:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32)ugeth->p_thread_data_rx);
                 for (i = 0; i < numThreadsRxNumerical; i++) {
-                        ugeth_info("Thread data RX[%d]:", i);
-                        ugeth_info("Base address: 0x%08x",
-                                   (u32) & ugeth->p_thread_data_rx[i]);
+                        pr_info("Thread data RX[%d]:\n", i);
+                        pr_info("Base address: 0x%08x\n",
+                                (u32)&ugeth->p_thread_data_rx[i]);
                         mem_disp((u8 *) & ugeth->p_thread_data_rx[i],
                                  sizeof(struct ucc_geth_thread_data_rx));
                 }
         }
         if (ugeth->p_exf_glbl_param) {
-                ugeth_info("EXF global param:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_exf_glbl_param);
+                pr_info("EXF global param:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32)ugeth->p_exf_glbl_param);
                 mem_disp((u8 *) ugeth->p_exf_glbl_param,
                          sizeof(*ugeth->p_exf_glbl_param));
         }
         if (ugeth->p_tx_glbl_pram) {
-                ugeth_info("TX global param:");
-                ugeth_info("Base address: 0x%08x", (u32) ugeth->p_tx_glbl_pram);
-                ugeth_info("temoder      : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_tx_glbl_pram->temoder,
-                           in_be16(&ugeth->p_tx_glbl_pram->temoder));
-                ugeth_info("sqptr        : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->sqptr,
-                           in_be32(&ugeth->p_tx_glbl_pram->sqptr));
-                ugeth_info("schedulerbasepointer: addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->schedulerbasepointer,
-                           in_be32(&ugeth->p_tx_glbl_pram->
-                                   schedulerbasepointer));
-                ugeth_info("txrmonbaseptr: addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->txrmonbaseptr,
-                           in_be32(&ugeth->p_tx_glbl_pram->txrmonbaseptr));
-                ugeth_info("tstate       : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->tstate,
-                           in_be32(&ugeth->p_tx_glbl_pram->tstate));
-                ugeth_info("iphoffset[0] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[0],
-                           ugeth->p_tx_glbl_pram->iphoffset[0]);
-                ugeth_info("iphoffset[1] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[1],
-                           ugeth->p_tx_glbl_pram->iphoffset[1]);
-                ugeth_info("iphoffset[2] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[2],
-                           ugeth->p_tx_glbl_pram->iphoffset[2]);
-                ugeth_info("iphoffset[3] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[3],
-                           ugeth->p_tx_glbl_pram->iphoffset[3]);
-                ugeth_info("iphoffset[4] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[4],
-                           ugeth->p_tx_glbl_pram->iphoffset[4]);
-                ugeth_info("iphoffset[5] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[5],
-                           ugeth->p_tx_glbl_pram->iphoffset[5]);
-                ugeth_info("iphoffset[6] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[6],
-                           ugeth->p_tx_glbl_pram->iphoffset[6]);
-                ugeth_info("iphoffset[7] : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_tx_glbl_pram->iphoffset[7],
-                           ugeth->p_tx_glbl_pram->iphoffset[7]);
-                ugeth_info("vtagtable[0] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[0],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[0]));
-                ugeth_info("vtagtable[1] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[1],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[1]));
-                ugeth_info("vtagtable[2] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[2],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[2]));
-                ugeth_info("vtagtable[3] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[3],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[3]));
-                ugeth_info("vtagtable[4] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[4],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[4]));
-                ugeth_info("vtagtable[5] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[5],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[5]));
-                ugeth_info("vtagtable[6] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[6],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[6]));
-                ugeth_info("vtagtable[7] : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->vtagtable[7],
-                           in_be32(&ugeth->p_tx_glbl_pram->vtagtable[7]));
-                ugeth_info("tqptr        : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_tx_glbl_pram->tqptr,
-                           in_be32(&ugeth->p_tx_glbl_pram->tqptr));
+                pr_info("TX global param:\n");
+                pr_info("Base address: 0x%08x\n", (u32)ugeth->p_tx_glbl_pram);
+                pr_info("temoder      : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->temoder,
+                        in_be16(&ugeth->p_tx_glbl_pram->temoder));
+               pr_info("sqptr        : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->sqptr,
+                        in_be32(&ugeth->p_tx_glbl_pram->sqptr));
+                pr_info("schedulerbasepointer: addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->schedulerbasepointer,
+                        in_be32(&ugeth->p_tx_glbl_pram->schedulerbasepointer));
+                pr_info("txrmonbaseptr: addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->txrmonbaseptr,
+                        in_be32(&ugeth->p_tx_glbl_pram->txrmonbaseptr));
+                pr_info("tstate       : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->tstate,
+                        in_be32(&ugeth->p_tx_glbl_pram->tstate));
+                pr_info("iphoffset[0] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[0],
+                        ugeth->p_tx_glbl_pram->iphoffset[0]);
+                pr_info("iphoffset[1] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[1],
+                        ugeth->p_tx_glbl_pram->iphoffset[1]);
+                pr_info("iphoffset[2] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[2],
+                        ugeth->p_tx_glbl_pram->iphoffset[2]);
+                pr_info("iphoffset[3] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[3],
+                        ugeth->p_tx_glbl_pram->iphoffset[3]);
+                pr_info("iphoffset[4] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[4],
+                        ugeth->p_tx_glbl_pram->iphoffset[4]);
+                pr_info("iphoffset[5] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[5],
+                        ugeth->p_tx_glbl_pram->iphoffset[5]);
+                pr_info("iphoffset[6] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[6],
+                        ugeth->p_tx_glbl_pram->iphoffset[6]);
+                pr_info("iphoffset[7] : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->iphoffset[7],
+                        ugeth->p_tx_glbl_pram->iphoffset[7]);
+                pr_info("vtagtable[0] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[0],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[0]));
+                pr_info("vtagtable[1] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[1],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[1]));
+                pr_info("vtagtable[2] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[2],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[2]));
+                pr_info("vtagtable[3] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[3],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[3]));
+                pr_info("vtagtable[4] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[4],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[4]));
+                pr_info("vtagtable[5] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[5],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[5]));
+                pr_info("vtagtable[6] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[6],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[6]));
+                pr_info("vtagtable[7] : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->vtagtable[7],
+                        in_be32(&ugeth->p_tx_glbl_pram->vtagtable[7]));
+                pr_info("tqptr        : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_tx_glbl_pram->tqptr,
+                        in_be32(&ugeth->p_tx_glbl_pram->tqptr));
         }
         if (ugeth->p_rx_glbl_pram) {
-                ugeth_info("RX global param:");
-                ugeth_info("Base address: 0x%08x", (u32) ugeth->p_rx_glbl_pram);
-                ugeth_info("remoder         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->remoder,
-                           in_be32(&ugeth->p_rx_glbl_pram->remoder));
-                ugeth_info("rqptr           : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->rqptr,
-                           in_be32(&ugeth->p_rx_glbl_pram->rqptr));
-                ugeth_info("typeorlen       : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->typeorlen,
-                           in_be16(&ugeth->p_rx_glbl_pram->typeorlen));
-                ugeth_info("rxgstpack       : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_rx_glbl_pram->rxgstpack,
-                           ugeth->p_rx_glbl_pram->rxgstpack);
-                ugeth_info("rxrmonbaseptr   : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->rxrmonbaseptr,
-                           in_be32(&ugeth->p_rx_glbl_pram->rxrmonbaseptr));
-                ugeth_info("intcoalescingptr: addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->intcoalescingptr,
-                           in_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr));
-                ugeth_info("rstate          : addr - 0x%08x, val - 0x%02x",
-                           (u32) & ugeth->p_rx_glbl_pram->rstate,
-                           ugeth->p_rx_glbl_pram->rstate);
-                ugeth_info("mrblr           : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->mrblr,
-                           in_be16(&ugeth->p_rx_glbl_pram->mrblr));
-                ugeth_info("rbdqptr         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->rbdqptr,
-                           in_be32(&ugeth->p_rx_glbl_pram->rbdqptr));
-                ugeth_info("mflr            : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->mflr,
-                           in_be16(&ugeth->p_rx_glbl_pram->mflr));
-                ugeth_info("minflr          : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->minflr,
-                           in_be16(&ugeth->p_rx_glbl_pram->minflr));
-                ugeth_info("maxd1           : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->maxd1,
-                           in_be16(&ugeth->p_rx_glbl_pram->maxd1));
-                ugeth_info("maxd2           : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->maxd2,
-                           in_be16(&ugeth->p_rx_glbl_pram->maxd2));
-                ugeth_info("ecamptr         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->ecamptr,
-                           in_be32(&ugeth->p_rx_glbl_pram->ecamptr));
-                ugeth_info("l2qt            : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l2qt,
-                           in_be32(&ugeth->p_rx_glbl_pram->l2qt));
-                ugeth_info("l3qt[0]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[0],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[0]));
-                ugeth_info("l3qt[1]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[1],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[1]));
-                ugeth_info("l3qt[2]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[2],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[2]));
-                ugeth_info("l3qt[3]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[3],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[3]));
-                ugeth_info("l3qt[4]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[4],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[4]));
-                ugeth_info("l3qt[5]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[5],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[5]));
-                ugeth_info("l3qt[6]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[6],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[6]));
-                ugeth_info("l3qt[7]         : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->l3qt[7],
-                           in_be32(&ugeth->p_rx_glbl_pram->l3qt[7]));
-                ugeth_info("vlantype        : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->vlantype,
-                           in_be16(&ugeth->p_rx_glbl_pram->vlantype));
-                ugeth_info("vlantci         : addr - 0x%08x, val - 0x%04x",
-                           (u32) & ugeth->p_rx_glbl_pram->vlantci,
-                           in_be16(&ugeth->p_rx_glbl_pram->vlantci));
+                pr_info("RX global param:\n");
+                pr_info("Base address: 0x%08x\n", (u32)ugeth->p_rx_glbl_pram);
+                pr_info("remoder         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->remoder,
+                        in_be32(&ugeth->p_rx_glbl_pram->remoder));
+                pr_info("rqptr           : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->rqptr,
+                        in_be32(&ugeth->p_rx_glbl_pram->rqptr));
+                pr_info("typeorlen       : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->typeorlen,
+                        in_be16(&ugeth->p_rx_glbl_pram->typeorlen));
+                pr_info("rxgstpack       : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->rxgstpack,
+                        ugeth->p_rx_glbl_pram->rxgstpack);
+                pr_info("rxrmonbaseptr   : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->rxrmonbaseptr,
+                        in_be32(&ugeth->p_rx_glbl_pram->rxrmonbaseptr));
+                pr_info("intcoalescingptr: addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->intcoalescingptr,
+                        in_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr));
+                pr_info("rstate          : addr - 0x%08x, val - 0x%02x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->rstate,
+                        ugeth->p_rx_glbl_pram->rstate);
+                pr_info("mrblr           : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->mrblr,
+                        in_be16(&ugeth->p_rx_glbl_pram->mrblr));
+                pr_info("rbdqptr         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->rbdqptr,
+                        in_be32(&ugeth->p_rx_glbl_pram->rbdqptr));
+                pr_info("mflr            : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->mflr,
+                        in_be16(&ugeth->p_rx_glbl_pram->mflr));
+                pr_info("minflr          : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->minflr,
+                        in_be16(&ugeth->p_rx_glbl_pram->minflr));
+                pr_info("maxd1           : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->maxd1,
+                        in_be16(&ugeth->p_rx_glbl_pram->maxd1));
+                pr_info("maxd2           : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->maxd2,
+                        in_be16(&ugeth->p_rx_glbl_pram->maxd2));
+                pr_info("ecamptr         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->ecamptr,
+                        in_be32(&ugeth->p_rx_glbl_pram->ecamptr));
+                pr_info("l2qt            : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l2qt,
+                        in_be32(&ugeth->p_rx_glbl_pram->l2qt));
+                pr_info("l3qt[0]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[0],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[0]));
+                pr_info("l3qt[1]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[1],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[1]));
+                pr_info("l3qt[2]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[2],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[2]));
+                pr_info("l3qt[3]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[3],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[3]));
+                pr_info("l3qt[4]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[4],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[4]));
+                pr_info("l3qt[5]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[5],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[5]));
+                pr_info("l3qt[6]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[6],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[6]));
+                pr_info("l3qt[7]         : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->l3qt[7],
+                        in_be32(&ugeth->p_rx_glbl_pram->l3qt[7]));
+                pr_info("vlantype        : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->vlantype,
+                        in_be16(&ugeth->p_rx_glbl_pram->vlantype));
+                pr_info("vlantci         : addr - 0x%08x, val - 0x%04x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->vlantci,
+                        in_be16(&ugeth->p_rx_glbl_pram->vlantci));
                 for (i = 0; i < 64; i++)
-                        ugeth_info
-                    ("addressfiltering[%d]: addr - 0x%08x, val - 0x%02x",
-                             i,
-                             (u32) & ugeth->p_rx_glbl_pram->addressfiltering[i],
-                             ugeth->p_rx_glbl_pram->addressfiltering[i]);
-                ugeth_info("exfGlobalParam  : addr - 0x%08x, val - 0x%08x",
-                           (u32) & ugeth->p_rx_glbl_pram->exfGlobalParam,
-                           in_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam));
+                        pr_info("addressfiltering[%d]: addr - 0x%08x, val - 0x%02x\n",
+                                i,
+                                (u32)&ugeth->p_rx_glbl_pram->addressfiltering[i],
+                                ugeth->p_rx_glbl_pram->addressfiltering[i]);
+                pr_info("exfGlobalParam  : addr - 0x%08x, val - 0x%08x\n",
+                        (u32)&ugeth->p_rx_glbl_pram->exfGlobalParam,
+                        in_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam));
         }
         if (ugeth->p_send_q_mem_reg) {
-                ugeth_info("Send Q memory registers:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_send_q_mem_reg);
+                pr_info("Send Q memory registers:\n");
+                pr_info("Base address: 0x%08x\n", (u32)ugeth->p_send_q_mem_reg);
                 for (i = 0; i < ugeth->ug_info->numQueuesTx; i++) {
-                        ugeth_info("SQQD[%d]:", i);
-                        ugeth_info("Base address: 0x%08x",
-                                   (u32) & ugeth->p_send_q_mem_reg->sqqd[i]);
+                        pr_info("SQQD[%d]:\n", i);
+                        pr_info("Base address: 0x%08x\n",
+                                (u32)&ugeth->p_send_q_mem_reg->sqqd[i]);
                         mem_disp((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i],
                                  sizeof(struct ucc_geth_send_queue_qd));
                 }
         }
         if (ugeth->p_scheduler) {
-                ugeth_info("Scheduler:");
-                ugeth_info("Base address: 0x%08x", (u32) ugeth->p_scheduler);
+                pr_info("Scheduler:\n");
+                pr_info("Base address: 0x%08x\n", (u32)ugeth->p_scheduler);
                 mem_disp((u8 *) ugeth->p_scheduler,
                          sizeof(*ugeth->p_scheduler));
         }
         if (ugeth->p_tx_fw_statistics_pram) {
-                ugeth_info("TX FW statistics pram:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_tx_fw_statistics_pram);
+                pr_info("TX FW statistics pram:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32)ugeth->p_tx_fw_statistics_pram);
                 mem_disp((u8 *) ugeth->p_tx_fw_statistics_pram,
                          sizeof(*ugeth->p_tx_fw_statistics_pram));
         }
         if (ugeth->p_rx_fw_statistics_pram) {
-                ugeth_info("RX FW statistics pram:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_rx_fw_statistics_pram);
+                pr_info("RX FW statistics pram:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32)ugeth->p_rx_fw_statistics_pram);
                 mem_disp((u8 *) ugeth->p_rx_fw_statistics_pram,
                          sizeof(*ugeth->p_rx_fw_statistics_pram));
         }
         if (ugeth->p_rx_irq_coalescing_tbl) {
-                ugeth_info("RX IRQ coalescing tables:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_rx_irq_coalescing_tbl);
+                pr_info("RX IRQ coalescing tables:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32)ugeth->p_rx_irq_coalescing_tbl);
                 for (i = 0; i < ugeth->ug_info->numQueuesRx; i++) {
-                        ugeth_info("RX IRQ coalescing table entry[%d]:", i);
-                        ugeth_info("Base address: 0x%08x",
-                                   (u32) & ugeth->p_rx_irq_coalescing_tbl->
-                                   coalescingentry[i]);
-                        ugeth_info
-                ("interruptcoalescingmaxvalue: addr - 0x%08x, val - 0x%08x",
-                             (u32) & ugeth->p_rx_irq_coalescing_tbl->
-                             coalescingentry[i].interruptcoalescingmaxvalue,
-                             in_be32(&ugeth->p_rx_irq_coalescing_tbl->
-                                     coalescingentry[i].
-                                     interruptcoalescingmaxvalue));
-                        ugeth_info
-                ("interruptcoalescingcounter : addr - 0x%08x, val - 0x%08x",
-                             (u32) & ugeth->p_rx_irq_coalescing_tbl->
-                             coalescingentry[i].interruptcoalescingcounter,
-                             in_be32(&ugeth->p_rx_irq_coalescing_tbl->
-                                     coalescingentry[i].
-                                     interruptcoalescingcounter));
+                        pr_info("RX IRQ coalescing table entry[%d]:\n", i);
+                        pr_info("Base address: 0x%08x\n",
+                                (u32)&ugeth->p_rx_irq_coalescing_tbl->
+                                coalescingentry[i]);
+                        pr_info("interruptcoalescingmaxvalue: addr - 0x%08x, val - 0x%08x\n",
+                                (u32)&ugeth->p_rx_irq_coalescing_tbl->
+                                coalescingentry[i].interruptcoalescingmaxvalue,
+                                in_be32(&ugeth->p_rx_irq_coalescing_tbl->
+                                        coalescingentry[i].
+                                        interruptcoalescingmaxvalue));
+                        pr_info("interruptcoalescingcounter : addr - 0x%08x, val - 0x%08x\n",
+                                (u32)&ugeth->p_rx_irq_coalescing_tbl->
+                                coalescingentry[i].interruptcoalescingcounter,
+                                in_be32(&ugeth->p_rx_irq_coalescing_tbl->
+                                        coalescingentry[i].
+                                        interruptcoalescingcounter));
                 }
         }
         if (ugeth->p_rx_bd_qs_tbl) {
-                ugeth_info("RX BD QS tables:");
-                ugeth_info("Base address: 0x%08x", (u32) ugeth->p_rx_bd_qs_tbl);
+                pr_info("RX BD QS tables:\n");
+                pr_info("Base address: 0x%08x\n", (u32)ugeth->p_rx_bd_qs_tbl);
                 for (i = 0; i < ugeth->ug_info->numQueuesRx; i++) {
-                        ugeth_info("RX BD QS table[%d]:", i);
-                        ugeth_info("Base address: 0x%08x",
-                                   (u32) & ugeth->p_rx_bd_qs_tbl[i]);
-                        ugeth_info
-                            ("bdbaseptr        : addr - 0x%08x, val - 0x%08x",
-                             (u32) & ugeth->p_rx_bd_qs_tbl[i].bdbaseptr,
-                             in_be32(&ugeth->p_rx_bd_qs_tbl[i].bdbaseptr));
-                        ugeth_info
-                            ("bdptr            : addr - 0x%08x, val - 0x%08x",
-                             (u32) & ugeth->p_rx_bd_qs_tbl[i].bdptr,
-                             in_be32(&ugeth->p_rx_bd_qs_tbl[i].bdptr));
-                        ugeth_info
-                            ("externalbdbaseptr: addr - 0x%08x, val - 0x%08x",
-                             (u32) & ugeth->p_rx_bd_qs_tbl[i].externalbdbaseptr,
-                             in_be32(&ugeth->p_rx_bd_qs_tbl[i].
-                                     externalbdbaseptr));
-                        ugeth_info
-                            ("externalbdptr    : addr - 0x%08x, val - 0x%08x",
-                             (u32) & ugeth->p_rx_bd_qs_tbl[i].externalbdptr,
-                             in_be32(&ugeth->p_rx_bd_qs_tbl[i].externalbdptr));
-                        ugeth_info("ucode RX Prefetched BDs:");
-                        ugeth_info("Base address: 0x%08x",
-                                   (u32)
-                                   qe_muram_addr(in_be32
-                                                 (&ugeth->p_rx_bd_qs_tbl[i].
-                                                  bdbaseptr)));
+                        pr_info("RX BD QS table[%d]:\n", i);
+                        pr_info("Base address: 0x%08x\n",
+                                (u32)&ugeth->p_rx_bd_qs_tbl[i]);
+                        pr_info("bdbaseptr        : addr - 0x%08x, val - 0x%08x\n",
+                                (u32)&ugeth->p_rx_bd_qs_tbl[i].bdbaseptr,
+                                in_be32(&ugeth->p_rx_bd_qs_tbl[i].bdbaseptr));
+                        pr_info("bdptr            : addr - 0x%08x, val - 0x%08x\n",
+                                (u32)&ugeth->p_rx_bd_qs_tbl[i].bdptr,
+                                in_be32(&ugeth->p_rx_bd_qs_tbl[i].bdptr));
+                        pr_info("externalbdbaseptr: addr - 0x%08x, val - 0x%08x\n",
+                                (u32)&ugeth->p_rx_bd_qs_tbl[i].externalbdbaseptr,
+                                in_be32(&ugeth->p_rx_bd_qs_tbl[i].
+                                        externalbdbaseptr));
+                        pr_info("externalbdptr    : addr - 0x%08x, val - 0x%08x\n",
+                                (u32)&ugeth->p_rx_bd_qs_tbl[i].externalbdptr,
+                                in_be32(&ugeth->p_rx_bd_qs_tbl[i].externalbdptr));
+                        pr_info("ucode RX Prefetched BDs:\n");
+                        pr_info("Base address: 0x%08x\n",
+                                (u32)qe_muram_addr(in_be32
+                                                   (&ugeth->p_rx_bd_qs_tbl[i].
+                                                    bdbaseptr)));
                         mem_disp((u8 *)
                                  qe_muram_addr(in_be32
                                                (&ugeth->p_rx_bd_qs_tbl[i].
@@ -1010,9 +996,9 @@ static void dump_regs(struct ucc_geth_private *ugeth)
         }
         if (ugeth->p_init_enet_param_shadow) {
                 int size;
-                ugeth_info("Init enet param shadow:");
-                ugeth_info("Base address: 0x%08x",
-                           (u32) ugeth->p_init_enet_param_shadow);
+                pr_info("Init enet param shadow:\n");
+                pr_info("Base address: 0x%08x\n",
+                        (u32) ugeth->p_init_enet_param_shadow);
                 mem_disp((u8 *) ugeth->p_init_enet_param_shadow,
                          sizeof(*ugeth->p_init_enet_param_shadow));
 
@@ -1392,12 +1378,11 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
                 struct phy_device *tbiphy;
 
                 if (!ug_info->tbi_node)
-                        ugeth_warn("TBI mode requires that the device "
-                                "tree specify a tbi-handle\n");
+                        pr_warn("TBI mode requires that the device tree specify a tbi-handle\n");
 
                 tbiphy = of_phy_find_device(ug_info->tbi_node);
                 if (!tbiphy)
-                        ugeth_warn("Could not get TBI device\n");
+                        pr_warn("Could not get TBI device\n");
 
                 value = phy_read(tbiphy, ENET_TBI_MII_CR);
                 value &= ~0x1000;       /* Turn off autonegotiation */
@@ -1409,8 +1394,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         ret_val = init_preamble_length(ug_info->prel, &ug_regs->maccfg2);
         if (ret_val != 0) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Preamble length must be between 3 and 7 inclusive.",
-                             __func__);
+                        pr_err("Preamble length must be between 3 and 7 inclusive\n");
                 return ret_val;
         }
 
@@ -1520,7 +1504,7 @@ static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode)
         /* check if the UCC number is in range. */
         if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: ucc_num out of range.", __func__);
+                        pr_err("ucc_num out of range\n");
                 return -EINVAL;
         }
 
@@ -1549,7 +1533,7 @@ static int ugeth_disable(struct ucc_geth_private *ugeth, enum comm_dir mode)
         /* check if the UCC number is in range. */
         if (ugeth->ug_info->uf_info.ucc_num >= UCC_MAX_NUM) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: ucc_num out of range.", __func__);
+                        pr_err("ucc_num out of range\n");
                 return -EINVAL;
         }
 
@@ -1648,7 +1632,7 @@ static void adjust_link(struct net_device *dev)
                                 break;
                         default:
                                 if (netif_msg_link(ugeth))
-                                        ugeth_warn(
+                                        pr_warn(
                                                 "%s: Ack!  Speed (%d) is not 10/100/1000!",
                                                 dev->name, phydev->speed);
                                 break;
@@ -2103,8 +2087,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         if (!((uf_info->bd_mem_part == MEM_PART_SYSTEM) ||
               (uf_info->bd_mem_part == MEM_PART_MURAM))) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Bad memory partition value.",
-                                        __func__);
+                        pr_err("Bad memory partition value\n");
                 return -EINVAL;
         }
 
@@ -2114,9 +2097,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                     (ug_info->bdRingLenRx[i] %
                      UCC_GETH_RX_BD_RING_SIZE_ALIGNMENT)) {
                         if (netif_msg_probe(ugeth))
-                                ugeth_err
-                                    ("%s: Rx BD ring length must be multiple of 4, no smaller than 8.",
-                                        __func__);
+                                pr_err("Rx BD ring length must be multiple of 4, no smaller than 8\n");
                         return -EINVAL;
                 }
         }
@@ -2125,9 +2106,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         for (i = 0; i < ug_info->numQueuesTx; i++) {
                 if (ug_info->bdRingLenTx[i] < UCC_GETH_TX_BD_RING_SIZE_MIN) {
                         if (netif_msg_probe(ugeth))
-                                ugeth_err
-                                    ("%s: Tx BD ring length must be no smaller than 2.",
-                                     __func__);
+                                pr_err("Tx BD ring length must be no smaller than 2\n");
                         return -EINVAL;
                 }
         }
@@ -2136,23 +2115,21 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         if ((uf_info->max_rx_buf_length == 0) ||
             (uf_info->max_rx_buf_length % UCC_GETH_MRBLR_ALIGNMENT)) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err
-                            ("%s: max_rx_buf_length must be non-zero multiple of 128.",
-                             __func__);
+                        pr_err("max_rx_buf_length must be non-zero multiple of 128\n");
                 return -EINVAL;
         }
 
         /* num Tx queues */
         if (ug_info->numQueuesTx > NUM_TX_QUEUES) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: number of tx queues too large.", __func__);
+                        pr_err("number of tx queues too large\n");
                 return -EINVAL;
         }
 
         /* num Rx queues */
         if (ug_info->numQueuesRx > NUM_RX_QUEUES) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: number of rx queues too large.", __func__);
+                        pr_err("number of rx queues too large\n");
                 return -EINVAL;
         }
 
@@ -2160,10 +2137,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         for (i = 0; i < UCC_GETH_VLAN_PRIORITY_MAX; i++) {
                 if (ug_info->l2qt[i] >= ug_info->numQueuesRx) {
                         if (netif_msg_probe(ugeth))
-                                ugeth_err
-                                    ("%s: VLAN priority table entry must not be"
-                                        " larger than number of Rx queues.",
-                                     __func__);
+                                pr_err("VLAN priority table entry must not be larger than number of Rx queues\n");
                         return -EINVAL;
                 }
         }
@@ -2172,18 +2146,14 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         for (i = 0; i < UCC_GETH_IP_PRIORITY_MAX; i++) {
                 if (ug_info->l3qt[i] >= ug_info->numQueuesRx) {
                         if (netif_msg_probe(ugeth))
-                                ugeth_err
-                                    ("%s: IP priority table entry must not be"
-                                        " larger than number of Rx queues.",
-                                     __func__);
+                                pr_err("IP priority table entry must not be larger than number of Rx queues\n");
                         return -EINVAL;
                 }
         }
 
         if (ug_info->cam && !ug_info->ecamptr) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: If cam mode is chosen, must supply cam ptr.",
-                                  __func__);
+                        pr_err("If cam mode is chosen, must supply cam ptr\n");
                 return -EINVAL;
         }
 
@@ -2191,9 +2161,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
              UCC_GETH_NUM_OF_STATION_ADDRESSES_1) &&
             ug_info->rxExtendedFiltering) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Number of station addresses greater than 1 "
-                                  "not allowed in extended parsing mode.",
-                                  __func__);
+                        pr_err("Number of station addresses greater than 1 not allowed in extended parsing mode\n");
                 return -EINVAL;
         }
 
@@ -2207,7 +2175,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         /* Initialize the general fast UCC block. */
         if (ucc_fast_init(uf_info, &ugeth->uccf)) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Failed to init uccf.", __func__);
+                        pr_err("Failed to init uccf\n");
                 return -ENOMEM;
         }
 
@@ -2222,7 +2190,7 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         ugeth->ug_regs = ioremap(uf_info->regs, sizeof(*ugeth->ug_regs));
         if (!ugeth->ug_regs) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Failed to ioremap regs.", __func__);
+                        pr_err("Failed to ioremap regs\n");
                 return -ENOMEM;
         }
 
@@ -2273,9 +2241,7 @@ static int ucc_geth_alloc_tx(struct ucc_geth_private *ugeth)
                 }
                 if (!ugeth->p_tx_bd_ring[j]) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err
-                                    ("%s: Can not allocate memory for Tx bd rings.",
-                                     __func__);
+                                pr_err("Can not allocate memory for Tx bd rings\n");
                         return -ENOMEM;
                 }
                 /* Zero unused end of bd ring, according to spec */
@@ -2293,8 +2259,7 @@ static int ucc_geth_alloc_tx(struct ucc_geth_private *ugeth)
 
                 if (ugeth->tx_skbuff[j] == NULL) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err("%s: Could not allocate tx_skbuff",
-                                          __func__);
+                                pr_err("Could not allocate tx_skbuff\n");
                         return -ENOMEM;
                 }
 
@@ -2353,9 +2318,7 @@ static int ucc_geth_alloc_rx(struct ucc_geth_private *ugeth)
                 }
                 if (!ugeth->p_rx_bd_ring[j]) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err
-                                    ("%s: Can not allocate memory for Rx bd rings.",
-                                     __func__);
+                                pr_err("Can not allocate memory for Rx bd rings\n");
                         return -ENOMEM;
                 }
         }
@@ -2369,8 +2332,7 @@ static int ucc_geth_alloc_rx(struct ucc_geth_private *ugeth)
 
                 if (ugeth->rx_skbuff[j] == NULL) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err("%s: Could not allocate rx_skbuff",
-                                          __func__);
+                                pr_err("Could not allocate rx_skbuff\n");
                         return -ENOMEM;
                 }
 
@@ -2438,8 +2400,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 break;
         default:
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Bad number of Rx threads value.",
-                                        __func__);
+                        pr_err("Bad number of Rx threads value\n");
                 return -EINVAL;
                 break;
         }
@@ -2462,8 +2423,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 break;
         default:
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Bad number of Tx threads value.",
-                                        __func__);
+                        pr_err("Bad number of Tx threads value\n");
                 return -EINVAL;
                 break;
         }
@@ -2512,8 +2472,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                               &ug_regs->ipgifg);
         if (ret_val != 0) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: IPGIFG initialization parameter too large.",
-                                  __func__);
+                        pr_err("IPGIFG initialization parameter too large\n");
                 return ret_val;
         }
 
@@ -2529,8 +2488,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                           &ug_regs->hafdup);
         if (ret_val != 0) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Half Duplex initialization parameter too large.",
-                          __func__);
+                        pr_err("Half Duplex initialization parameter too large\n");
                 return ret_val;
         }
 
@@ -2567,9 +2525,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->tx_glbl_pram_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_tx_glbl_pram.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_tx_glbl_pram\n");
                 return -ENOMEM;
         }
         ugeth->p_tx_glbl_pram =
@@ -2589,9 +2545,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            UCC_GETH_THREAD_DATA_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->thread_dat_tx_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_thread_data_tx.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_thread_data_tx\n");
                 return -ENOMEM;
         }
 
@@ -2618,9 +2572,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->send_q_mem_reg_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_send_q_mem_reg.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_send_q_mem_reg\n");
                 return -ENOMEM;
         }
 
@@ -2661,9 +2613,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                    UCC_GETH_SCHEDULER_ALIGNMENT);
                 if (IS_ERR_VALUE(ugeth->scheduler_offset)) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err
-                                 ("%s: Can not allocate DPRAM memory for p_scheduler.",
-                                     __func__);
+                                pr_err("Can not allocate DPRAM memory for p_scheduler\n");
                         return -ENOMEM;
                 }
 
@@ -2710,10 +2660,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                    UCC_GETH_TX_STATISTICS_ALIGNMENT);
                 if (IS_ERR_VALUE(ugeth->tx_fw_statistics_pram_offset)) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err
-                                    ("%s: Can not allocate DPRAM memory for"
-                                        " p_tx_fw_statistics_pram.",
-                                        __func__);
+                                pr_err("Can not allocate DPRAM memory for p_tx_fw_statistics_pram\n");
                         return -ENOMEM;
                 }
                 ugeth->p_tx_fw_statistics_pram =
@@ -2750,9 +2697,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->rx_glbl_pram_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_rx_glbl_pram.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_rx_glbl_pram\n");
                 return -ENOMEM;
         }
         ugeth->p_rx_glbl_pram =
@@ -2771,9 +2716,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            UCC_GETH_THREAD_DATA_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->thread_dat_rx_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_thread_data_rx.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_thread_data_rx\n");
                 return -ENOMEM;
         }
 
@@ -2794,9 +2737,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                    UCC_GETH_RX_STATISTICS_ALIGNMENT);
                 if (IS_ERR_VALUE(ugeth->rx_fw_statistics_pram_offset)) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err
-                                        ("%s: Can not allocate DPRAM memory for"
-                                        " p_rx_fw_statistics_pram.", __func__);
+                                pr_err("Can not allocate DPRAM memory for p_rx_fw_statistics_pram\n");
                         return -ENOMEM;
                 }
                 ugeth->p_rx_fw_statistics_pram =
@@ -2816,9 +2757,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            + 4, UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->rx_irq_coalescing_tbl_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for"
-                                " p_rx_irq_coalescing_tbl.", __func__);
+                        pr_err("Can not allocate DPRAM memory for p_rx_irq_coalescing_tbl\n");
                 return -ENOMEM;
         }
 
@@ -2884,9 +2823,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            UCC_GETH_RX_BD_QUEUES_ALIGNMENT);
         if (IS_ERR_VALUE(ugeth->rx_bd_qs_tbl_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_rx_bd_qs_tbl\n");
                 return -ENOMEM;
         }
 
@@ -2961,8 +2898,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         if (ug_info->rxExtendedFiltering) {
                 if (!ug_info->extendedFilteringChainPointer) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err("%s: Null Extended Filtering Chain Pointer.",
-                                          __func__);
+                                pr_err("Null Extended Filtering Chain Pointer\n");
                         return -EINVAL;
                 }
 
@@ -2973,9 +2909,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT);
                 if (IS_ERR_VALUE(ugeth->exf_glbl_param_offset)) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err
-                                        ("%s: Can not allocate DPRAM memory for"
-                                        " p_exf_glbl_param.", __func__);
+                                pr_err("Can not allocate DPRAM memory for p_exf_glbl_param\n");
                         return -ENOMEM;
                 }
 
@@ -3020,9 +2954,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         if (!(ugeth->p_init_enet_param_shadow =
               kmalloc(sizeof(struct ucc_geth_init_pram), GFP_KERNEL))) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate memory for"
-                                " p_UccInitEnetParamShadows.", __func__);
+                        pr_err("Can not allocate memory for p_UccInitEnetParamShadows\n");
                 return -ENOMEM;
         }
         /* Zero out *p_init_enet_param_shadow */
@@ -3055,8 +2987,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
             (ug_info->largestexternallookupkeysize !=
              QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Invalid largest External Lookup Key Size.",
-                                  __func__);
+                        pr_err("Invalid largest External Lookup Key Size\n");
                 return -EINVAL;
         }
         ugeth->p_init_enet_param_shadow->largestexternallookupkeysize =
@@ -3081,8 +3012,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 , size, UCC_GETH_THREAD_RX_PRAM_ALIGNMENT,
                 ug_info->riscRx, 1)) != 0) {
                 if (netif_msg_ifup(ugeth))
-                                ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
-                                        __func__);
+                        pr_err("Can not fill p_init_enet_param_shadow\n");
                 return ret_val;
         }
 
@@ -3096,8 +3026,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                                     UCC_GETH_THREAD_TX_PRAM_ALIGNMENT,
                                     ug_info->riscTx, 0)) != 0) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
-                                  __func__);
+                        pr_err("Can not fill p_init_enet_param_shadow\n");
                 return ret_val;
         }
 
@@ -3105,8 +3034,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         for (i = 0; i < ug_info->numQueuesRx; i++) {
                 if ((ret_val = rx_bd_buffer_set(ugeth, (u8) i)) != 0) {
                         if (netif_msg_ifup(ugeth))
-                                ugeth_err("%s: Can not fill Rx bds with buffers.",
-                                          __func__);
+                                pr_err("Can not fill Rx bds with buffers\n");
                         return ret_val;
                 }
         }
@@ -3115,9 +3043,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         init_enet_pram_offset = qe_muram_alloc(sizeof(struct ucc_geth_init_pram), 4);
         if (IS_ERR_VALUE(init_enet_pram_offset)) {
                 if (netif_msg_ifup(ugeth))
-                        ugeth_err
-                            ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",
-                             __func__);
+                        pr_err("Can not allocate DPRAM memory for p_init_enet_pram\n");
                 return -ENOMEM;
         }
         p_init_enet_pram =
@@ -3266,8 +3192,8 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                     (!(bd_status & (R_F | R_L))) ||
                     (bd_status & R_ERRORS_FATAL)) {
                         if (netif_msg_rx_err(ugeth))
-                                ugeth_err("%s, %d: ERROR!!! skb - 0x%08x",
-                                           __func__, __LINE__, (u32) skb);
+                                pr_err("%d: ERROR!!! skb - 0x%08x\n",
+                                       __LINE__, (u32)skb);
                         dev_kfree_skb(skb);
 
                         ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]] = NULL;
@@ -3290,7 +3216,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                 skb = get_new_skb(ugeth, bd);
                 if (!skb) {
                         if (netif_msg_rx_err(ugeth))
-                                ugeth_warn("%s: No Rx Data Buffer", __func__);
+                                pr_warn("No Rx Data Buffer\n");
                         dev->stats.rx_dropped++;
                         break;
                 }
@@ -3481,25 +3407,19 @@ static int ucc_geth_init_mac(struct ucc_geth_private *ugeth)
 
         err = ucc_struct_init(ugeth);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot configure internal struct, "
-                                  "aborting.", dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot configure internal struct, aborting\n");
                 goto err;
         }
 
         err = ucc_geth_startup(ugeth);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot configure net device, aborting.",
-                                  dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot configure net device, aborting\n");
                 goto err;
         }
 
         err = adjust_enet_interface(ugeth);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot configure net device, aborting.",
-                                  dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot configure net device, aborting\n");
                 goto err;
         }
 
@@ -3516,8 +3436,7 @@ static int ucc_geth_init_mac(struct ucc_geth_private *ugeth)
 
         err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot enable net device, aborting.", dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot enable net device, aborting\n");
                 goto err;
         }
 
@@ -3538,35 +3457,27 @@ static int ucc_geth_open(struct net_device *dev)
 
         /* Test station address */
         if (dev->dev_addr[0] & ENET_GROUP_ADDR) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Multicast address used for station "
-                                  "address - is this what you wanted?",
-                                  __func__);
+                netif_err(ugeth, ifup, dev,
+                          "Multicast address used for station address - is this what you wanted?\n");
                 return -EINVAL;
         }
 
         err = init_phy(dev);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot initialize PHY, aborting.",
-                                  dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot initialize PHY, aborting\n");
                 return err;
         }
 
         err = ucc_geth_init_mac(ugeth);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot initialize MAC, aborting.",
-                                  dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot initialize MAC, aborting\n");
                 goto err;
         }
 
         err = request_irq(ugeth->ug_info->uf_info.irq, ucc_geth_irq_handler,
                           0, "UCC Geth", dev);
         if (err) {
-                if (netif_msg_ifup(ugeth))
-                        ugeth_err("%s: Cannot get IRQ for net device, aborting.",
-                                  dev->name);
+                netif_err(ugeth, ifup, dev, "Cannot get IRQ for net device, aborting\n");
                 goto err;
         }
 
@@ -3704,8 +3615,7 @@ static int ucc_geth_resume(struct platform_device *ofdev)
 
                 err = ucc_geth_init_mac(ugeth);
                 if (err) {
-                        ugeth_err("%s: Cannot initialize MAC, aborting.",
-                                  ndev->name);
+                        netdev_err(ndev, "Cannot initialize MAC, aborting\n");
                         return err;
                 }
         }
@@ -3825,8 +3735,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
         ug_info = &ugeth_info[ucc_num];
         if (ug_info == NULL) {
                 if (netif_msg_probe(&debug))
-                        ugeth_err("%s: [%d] Missing additional data!",
-                                        __func__, ucc_num);
+                        pr_err("[%d] Missing additional data!\n", ucc_num);
                 return -ENODEV;
         }
 
@@ -3837,8 +3746,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                 ug_info->uf_info.rx_clock = qe_clock_source(sprop);
                 if ((ug_info->uf_info.rx_clock < QE_CLK_NONE) ||
                     (ug_info->uf_info.rx_clock > QE_CLK24)) {
-                        printk(KERN_ERR
-                                "ucc_geth: invalid rx-clock-name property\n");
+                        pr_err("invalid rx-clock-name property\n");
                         return -EINVAL;
                 }
         } else {
@@ -3846,13 +3754,11 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                 if (!prop) {
                         /* If both rx-clock-name and rx-clock are missing,
                            we want to tell people to use rx-clock-name. */
-                        printk(KERN_ERR
-                                "ucc_geth: missing rx-clock-name property\n");
+                        pr_err("missing rx-clock-name property\n");
                         return -EINVAL;
                 }
                 if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) {
-                        printk(KERN_ERR
-                                "ucc_geth: invalid rx-clock propperty\n");
+                        pr_err("invalid rx-clock propperty\n");
                         return -EINVAL;
                 }
                 ug_info->uf_info.rx_clock = *prop;
@@ -3863,20 +3769,17 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                 ug_info->uf_info.tx_clock = qe_clock_source(sprop);
                 if ((ug_info->uf_info.tx_clock < QE_CLK_NONE) ||
                     (ug_info->uf_info.tx_clock > QE_CLK24)) {
-                        printk(KERN_ERR
-                                "ucc_geth: invalid tx-clock-name property\n");
+                        pr_err("invalid tx-clock-name property\n");
                         return -EINVAL;
                 }
         } else {
                 prop = of_get_property(np, "tx-clock", NULL);
                 if (!prop) {
-                        printk(KERN_ERR
-                                "ucc_geth: missing tx-clock-name property\n");
+                        pr_err("missing tx-clock-name property\n");
                         return -EINVAL;
                 }
                 if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) {
-                        printk(KERN_ERR
-                                "ucc_geth: invalid tx-clock property\n");
+                        pr_err("invalid tx-clock property\n");
                         return -EINVAL;
                 }
                 ug_info->uf_info.tx_clock = *prop;
@@ -3949,7 +3852,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
         }
 
         if (netif_msg_probe(&debug))
-                printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d)\n",
+                pr_info("UCC%1d at 0x%8x (irq = %d)\n",
                         ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
                         ug_info->uf_info.irq);
 
@@ -3988,8 +3891,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
         err = register_netdev(dev);
         if (err) {
                 if (netif_msg_probe(ugeth))
-                        ugeth_err("%s: Cannot register net device, aborting.",
-                                  dev->name);
+                        pr_err("%s: Cannot register net device, aborting\n",
+                               dev->name);
                 free_netdev(dev);
                 return err;
         }
@@ -4047,7 +3950,7 @@ static int __init ucc_geth_init(void)
         int i, ret;
 
         if (netif_msg_drv(&debug))
-                printk(KERN_INFO "ucc_geth: " DRV_DESC "\n");
+                pr_info(DRV_DESC "\n");
         for (i = 0; i < 8; i++)
                 memcpy(&(ugeth_info[i]), &ugeth_primary_info,
                        sizeof(ugeth_primary_info));
diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index 1ebf7128ec04..e79aaf9ae52a 100644
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -38,7 +38,7 @@
 
 #include "ucc_geth.h"
 
-static char hw_stat_gstrings[][ETH_GSTRING_LEN] = {
+static const char hw_stat_gstrings[][ETH_GSTRING_LEN] = {
         "tx-64-frames",
         "tx-65-127-frames",
         "tx-128-255-frames",
@@ -59,7 +59,7 @@ static char hw_stat_gstrings[][ETH_GSTRING_LEN] = {
         "rx-dropped-frames",
 };
 
-static char tx_fw_stat_gstrings[][ETH_GSTRING_LEN] = {
+static const char tx_fw_stat_gstrings[][ETH_GSTRING_LEN] = {
         "tx-single-collision",
         "tx-multiple-collision",
         "tx-late-collsion",
@@ -74,7 +74,7 @@ static char tx_fw_stat_gstrings[][ETH_GSTRING_LEN] = {
         "tx-jumbo-frames",
 };
 
-static char rx_fw_stat_gstrings[][ETH_GSTRING_LEN] = {
+static const char rx_fw_stat_gstrings[][ETH_GSTRING_LEN] = {
         "rx-crc-errors",
         "rx-alignment-errors",
         "rx-in-range-length-errors",
@@ -160,8 +160,7 @@ uec_set_pauseparam(struct net_device *netdev,
         if (ugeth->phydev->autoneg) {
                 if (netif_running(netdev)) {
                         /* FIXME: automatically restart */
-                        printk(KERN_INFO
-                                "Please re-open the interface.\n");
+                        netdev_info(netdev, "Please re-open the interface\n");
                 }
         } else {
                 struct ucc_geth_info *ug_info = ugeth->ug_info;
@@ -240,18 +239,18 @@ uec_set_ringparam(struct net_device *netdev,
         int queue = 0, ret = 0;
 
         if (ring->rx_pending < UCC_GETH_RX_BD_RING_SIZE_MIN) {
-                printk("%s: RxBD ring size must be no smaller than %d.\n",
-                                netdev->name, UCC_GETH_RX_BD_RING_SIZE_MIN);
+                netdev_info(netdev, "RxBD ring size must be no smaller than %d\n",
+                            UCC_GETH_RX_BD_RING_SIZE_MIN);
                 return -EINVAL;
         }
         if (ring->rx_pending % UCC_GETH_RX_BD_RING_SIZE_ALIGNMENT) {
-                printk("%s: RxBD ring size must be multiple of %d.\n",
-                        netdev->name, UCC_GETH_RX_BD_RING_SIZE_ALIGNMENT);
+                netdev_info(netdev, "RxBD ring size must be multiple of %d\n",
+                            UCC_GETH_RX_BD_RING_SIZE_ALIGNMENT);
                 return -EINVAL;
         }
         if (ring->tx_pending < UCC_GETH_TX_BD_RING_SIZE_MIN) {
-                printk("%s: TxBD ring size must be no smaller than %d.\n",
-                                netdev->name, UCC_GETH_TX_BD_RING_SIZE_MIN);
+                netdev_info(netdev, "TxBD ring size must be no smaller than %d\n",
+                            UCC_GETH_TX_BD_RING_SIZE_MIN);
                 return -EINVAL;
         }
 
@@ -260,8 +259,7 @@ uec_set_ringparam(struct net_device *netdev,
 
         if (netif_running(netdev)) {
                 /* FIXME: restart automatically */
-                printk(KERN_INFO
-                        "Please re-open the interface.\n");
+                netdev_info(netdev, "Please re-open the interface\n");
         }
 
         return ret;
diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
index ab98b77df309..ef46b58cb4e9 100644
--- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
@@ -991,8 +991,6 @@ static void fjn_rx(struct net_device *dev)
             }
             skb = netdev_alloc_skb(dev, pkt_len + 2);
             if (skb == NULL) {
-                netdev_notice(dev, "Memory squeeze, dropping packet (len %d)\n",
-                              pkt_len);
                 outb(F_SKP_PKT, ioaddr + RX_SKIP);
                 dev->stats.rx_dropped++;
                 break;
diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index 1c54e229e3cc..e38816145395 100644
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -798,16 +798,14 @@ static inline int i596_rx(struct net_device *dev)
 #ifdef __mc68000__
                                 cache_clear(virt_to_phys(newskb->data), PKT_BUF_SZ);
 #endif
-                        }
-                        else
+                        } else {
                                 skb = netdev_alloc_skb(dev, pkt_len + 2);
+                        }
 memory_squeeze:
                         if (skb == NULL) {
                                 /* XXX tulip.c can defer packets here!! */
-                                printk(KERN_WARNING "%s: i596_rx Memory squeeze, dropping packet.\n", dev->name);
                                 dev->stats.rx_dropped++;
-                        }
-                        else {
+                        } else {
                                 if (!rx_in_place) {
                                         /* 16 byte align the data fields */
                                         skb_reserve(skb, 2);
diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index f045ea4dc514..d653bac4cfc4 100644
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -715,14 +715,12 @@ static inline int i596_rx(struct net_device *dev)
                                 rbd->v_data = newskb->data;
                                 rbd->b_data = SWAP32(dma_addr);
                                 DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
-                        } else
+                        } else {
                                 skb = netdev_alloc_skb_ip_align(dev, pkt_len);
+                        }
 memory_squeeze:
                         if (skb == NULL) {
                                 /* XXX tulip.c can defer packets here!! */
-                                printk(KERN_ERR
-                                       "%s: i596_rx Memory squeeze, dropping packet.\n",
-                                       dev->name);
                                 dev->stats.rx_dropped++;
                         } else {
                                 if (!rx_in_place) {
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 328f47c92e26..90ea0b1673ca 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -402,7 +402,6 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
                         skb_arr_rq1[index] = netdev_alloc_skb(dev,
                                                               EHEA_L_PKT_SIZE);
                         if (!skb_arr_rq1[index]) {
-                                netdev_info(dev, "Unable to allocate enough skb in the array\n");
                                 pr->rq1_skba.os_skbs = fill_wqes - i;
                                 break;
                         }
@@ -432,10 +431,8 @@ static void ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
 
         for (i = 0; i < nr_rq1a; i++) {
                 skb_arr_rq1[i] = netdev_alloc_skb(dev, EHEA_L_PKT_SIZE);
-                if (!skb_arr_rq1[i]) {
-                        netdev_info(dev, "Not enough memory to allocate skb array\n");
+                if (!skb_arr_rq1[i])
                         break;
-                }
         }
         /* Ring doorbell */
         ehea_update_rq1a(pr->qp, i - 1);
@@ -695,10 +692,8 @@ static int ehea_proc_rwqes(struct net_device *dev,
 
                                         skb = netdev_alloc_skb(dev,
                                                                EHEA_L_PKT_SIZE);
-                                        if (!skb) {
-                                                netdev_err(dev, "Not enough memory to allocate skb\n");
+                                        if (!skb)
                                                 break;
-                                        }
                                 }
                                 skb_copy_to_linear_data(skb, ((char *)cqe) + 64,
                                                  cqe->num_bytes_transfered - 4);
@@ -730,7 +725,8 @@ static int ehea_proc_rwqes(struct net_device *dev,
                         processed_bytes += skb->len;
 
                         if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT)
-                                __vlan_hwaccel_put_tag(skb, cqe->vlan_tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+                                                       cqe->vlan_tag);
 
                         napi_gro_receive(&pr->napi, skb);
                 } else {
@@ -2115,7 +2111,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
-static int ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int ehea_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct ehea_port *port = netdev_priv(dev);
         struct ehea_adapter *adapter = port->adapter;
@@ -2153,7 +2149,7 @@ out:
         return err;
 }
 
-static int ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int ehea_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct ehea_port *port = netdev_priv(dev);
         struct ehea_adapter *adapter = port->adapter;
@@ -3025,12 +3021,12 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
         dev->netdev_ops = &ehea_netdev_ops;
         ehea_set_ethtool_ops(dev);
 
-        dev->hw_features = NETIF_F_SG | NETIF_F_TSO
-                      | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX;
-        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
-                      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
-                      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
-                      | NETIF_F_RXCSUM;
+        dev->hw_features = NETIF_F_SG | NETIF_F_TSO |
+                      NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX;
+        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO |
+                      NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |
+                      NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
+                      NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM;
         dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA |
                         NETIF_F_IP_CSUM;
         dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 1f7ecf57181e..610ed223d1db 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -637,17 +637,12 @@ static int mal_probe(struct platform_device *ofdev)
         bd_size = sizeof(struct mal_descriptor) *
                 (NUM_TX_BUFF * mal->num_tx_chans +
                  NUM_RX_BUFF * mal->num_rx_chans);
-        mal->bd_virt =
-                dma_alloc_coherent(&ofdev->dev, bd_size, &mal->bd_dma,
-                                   GFP_KERNEL);
+        mal->bd_virt = dma_alloc_coherent(&ofdev->dev, bd_size, &mal->bd_dma,
+                                          GFP_KERNEL | __GFP_ZERO);
         if (mal->bd_virt == NULL) {
-                printk(KERN_ERR
-                       "mal%d: out of memory allocating RX/TX descriptors!\n",
-                       index);
                 err = -ENOMEM;
                 goto fail_unmap;
         }
-        memset(mal->bd_virt, 0, bd_size);
 
         for (i = 0; i < mal->num_tx_chans; ++i)
                 set_mal_dcrn(mal, MAL_TXCTPR(i), mal->bd_dma +
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index c859771a9902..302d59401065 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -556,11 +556,9 @@ static int ibmveth_open(struct net_device *netdev)
         adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
                                                 rxq_entries;
         adapter->rx_queue.queue_addr =
-            dma_alloc_coherent(dev, adapter->rx_queue.queue_len,
-                               &adapter->rx_queue.queue_dma, GFP_KERNEL);
-
+                dma_alloc_coherent(dev, adapter->rx_queue.queue_len,
+                                   &adapter->rx_queue.queue_dma, GFP_KERNEL);
         if (!adapter->rx_queue.queue_addr) {
-                netdev_err(netdev, "unable to allocate rx queue pages\n");
                 rc = -ENOMEM;
                 goto err_out;
         }
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index ffd287196bf8..82a967c95598 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -1020,12 +1020,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
         txdr->size = ALIGN(txdr->size, 4096);
         txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                        GFP_KERNEL);
+                                        GFP_KERNEL | __GFP_ZERO);
         if (!txdr->desc) {
                 ret_val = 2;
                 goto err_nomem;
         }
-        memset(txdr->desc, 0, txdr->size);
         txdr->next_to_use = txdr->next_to_clean = 0;
 
         ew32(TDBAL, ((u64)txdr->dma & 0x00000000FFFFFFFF));
@@ -1079,12 +1078,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
 
         rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
         rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                        GFP_KERNEL);
+                                        GFP_KERNEL | __GFP_ZERO);
         if (!rxdr->desc) {
                 ret_val = 6;
                 goto err_nomem;
         }
-        memset(rxdr->desc, 0, rxdr->size);
         rxdr->next_to_use = rxdr->next_to_clean = 0;
 
         rctl = er32(RCTL);
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 8502c625dbef..59ad007dd5aa 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -166,8 +166,10 @@ static void e1000_vlan_mode(struct net_device *netdev,
                             netdev_features_t features);
 static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
                                      bool filter_on);
-static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+static int e1000_vlan_rx_add_vid(struct net_device *netdev,
+                                 __be16 proto, u16 vid);
+static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
+                                  __be16 proto, u16 vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);
 
 #ifdef CONFIG_PM
@@ -333,7 +335,7 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
         if (!test_bit(vid, adapter->active_vlans)) {
                 if (hw->mng_cookie.status &
                     E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
-                        e1000_vlan_rx_add_vid(netdev, vid);
+                        e1000_vlan_rx_add_vid(netdev, htons(ETH_P_8021Q), vid);
                         adapter->mng_vlan_id = vid;
                 } else {
                         adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
@@ -341,7 +343,8 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
                 if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
                     (vid != old_vid) &&
                     !test_bit(old_vid, adapter->active_vlans))
-                        e1000_vlan_rx_kill_vid(netdev, old_vid);
+                        e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
+                                               old_vid);
         } else {
                 adapter->mng_vlan_id = vid;
         }
@@ -809,10 +812,10 @@ static netdev_features_t e1000_fix_features(struct net_device *netdev,
         /* Since there is no support for separate Rx/Tx vlan accel
          * enable/disable make sure Tx flag is always in same state as Rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -823,7 +826,7 @@ static int e1000_set_features(struct net_device *netdev,
         struct e1000_adapter *adapter = netdev_priv(netdev);
         netdev_features_t changed = features ^ netdev->features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 e1000_vlan_mode(netdev, features);
 
         if (!(changed & (NETIF_F_RXCSUM | NETIF_F_RXALL)))
@@ -1058,9 +1061,9 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (hw->mac_type >= e1000_82543) {
                 netdev->hw_features = NETIF_F_SG |
                                    NETIF_F_HW_CSUM |
-                                   NETIF_F_HW_VLAN_RX;
-                netdev->features = NETIF_F_HW_VLAN_TX |
-                                   NETIF_F_HW_VLAN_FILTER;
+                                   NETIF_F_HW_VLAN_CTAG_RX;
+                netdev->features = NETIF_F_HW_VLAN_CTAG_TX |
+                                   NETIF_F_HW_VLAN_CTAG_FILTER;
         }
 
         if ((hw->mac_type >= e1000_82544) &&
@@ -1457,7 +1460,8 @@ static int e1000_close(struct net_device *netdev)
         if ((hw->mng_cookie.status &
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
             !test_bit(adapter->mng_vlan_id, adapter->active_vlans)) {
-                e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
+                e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
+                                       adapter->mng_vlan_id);
         }
 
         return 0;
@@ -1516,8 +1520,6 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
         if (!txdr->desc) {
 setup_tx_desc_die:
                 vfree(txdr->buffer_info);
-                e_err(probe, "Unable to allocate memory for the Tx descriptor "
-                      "ring\n");
                 return -ENOMEM;
         }
 
@@ -1707,10 +1709,7 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
 
         rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
                                         GFP_KERNEL);
-
         if (!rxdr->desc) {
-                e_err(probe, "Unable to allocate memory for the Rx descriptor "
-                      "ring\n");
 setup_rx_desc_die:
                 vfree(rxdr->buffer_info);
                 return -ENOMEM;
@@ -1729,8 +1728,6 @@ setup_rx_desc_die:
                 if (!rxdr->desc) {
                         dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
                                           olddma);
-                        e_err(probe, "Unable to allocate memory for the Rx "
-                              "descriptor ring\n");
                         goto setup_rx_desc_die;
                 }
 
@@ -4006,7 +4003,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter, u8 status,
         if (status & E1000_RXD_STAT_VP) {
                 u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
 
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         }
         napi_gro_receive(&adapter->napi, skb);
 }
@@ -4792,7 +4789,7 @@ static void __e1000_vlan_mode(struct e1000_adapter *adapter,
         u32 ctrl;
 
         ctrl = er32(CTRL);
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* enable VLAN tag insert/strip */
                 ctrl |= E1000_CTRL_VME;
         } else {
@@ -4844,7 +4841,8 @@ static void e1000_vlan_mode(struct net_device *netdev,
                 e1000_irq_enable(adapter);
 }
 
-static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+static int e1000_vlan_rx_add_vid(struct net_device *netdev,
+                                 __be16 proto, u16 vid)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -4869,7 +4867,8 @@ static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         return 0;
 }
 
-static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
+                                  __be16 proto, u16 vid)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -4903,7 +4902,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
 
         e1000_vlan_filter_on_off(adapter, true);
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                e1000_vlan_rx_add_vid(adapter->netdev, vid);
+                e1000_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 }
 
 int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index e0991388664c..b71c8502a2b3 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -37,7 +37,9 @@
  * "index + 5".
  */
 static const u16 e1000_gg82563_cable_length_table[] = {
-         0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF };
+        0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF
+};
+
 #define GG82563_CABLE_LENGTH_TABLE_SIZE \
                 ARRAY_SIZE(e1000_gg82563_cable_length_table)
 
@@ -116,7 +118,7 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
         nvm->type = e1000_nvm_eeprom_spi;
 
         size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                          E1000_EECD_SIZE_EX_SHIFT);
+                     E1000_EECD_SIZE_EX_SHIFT);
 
         /* Added to a constant, "size" becomes the left-shift value
          * for setting word_size.
@@ -393,7 +395,7 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                  * before the device has completed the "Page Select" MDI
                  * transaction.  So we wait 200us after each MDI command...
                  */
-                udelay(200);
+                usleep_range(200, 400);
 
                 /* ...and verify the command was successful. */
                 ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
@@ -403,17 +405,17 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                         return -E1000_ERR_PHY;
                 }
 
-                udelay(200);
+                usleep_range(200, 400);
 
                 ret_val = e1000e_read_phy_reg_mdic(hw,
-                                                  MAX_PHY_REG_ADDRESS & offset,
-                                                  data);
+                                                   MAX_PHY_REG_ADDRESS & offset,
+                                                   data);
 
-                udelay(200);
+                usleep_range(200, 400);
         } else {
                 ret_val = e1000e_read_phy_reg_mdic(hw,
-                                                  MAX_PHY_REG_ADDRESS & offset,
-                                                  data);
+                                                   MAX_PHY_REG_ADDRESS & offset,
+                                                   data);
         }
 
         e1000_release_phy_80003es2lan(hw);
@@ -462,7 +464,7 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                  * before the device has completed the "Page Select" MDI
                  * transaction.  So we wait 200us after each MDI command...
                  */
-                udelay(200);
+                usleep_range(200, 400);
 
                 /* ...and verify the command was successful. */
                 ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
@@ -472,17 +474,17 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                         return -E1000_ERR_PHY;
                 }
 
-                udelay(200);
+                usleep_range(200, 400);
 
                 ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                  MAX_PHY_REG_ADDRESS & offset,
-                                                  data);
+                                                    MAX_PHY_REG_ADDRESS &
+                                                    offset, data);
 
-                udelay(200);
+                usleep_range(200, 400);
         } else {
                 ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                  MAX_PHY_REG_ADDRESS & offset,
-                                                  data);
+                                                    MAX_PHY_REG_ADDRESS &
+                                                    offset, data);
         }
 
         e1000_release_phy_80003es2lan(hw);
@@ -580,7 +582,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
                 e_dbg("Waiting for forced speed/duplex link on GG82563 phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                     100000, &link);
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
 
@@ -595,7 +597,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 
                 /* Try once more */
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                     100000, &link);
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
         }
@@ -666,14 +668,12 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
         s32 ret_val;
 
         if (hw->phy.media_type == e1000_media_type_copper) {
-                ret_val = e1000e_get_speed_and_duplex_copper(hw,
-                                                                    speed,
-                                                                    duplex);
+                ret_val = e1000e_get_speed_and_duplex_copper(hw, speed, duplex);
                 hw->phy.ops.cfg_on_link_up(hw);
         } else {
                 ret_val = e1000e_get_speed_and_duplex_fiber_serdes(hw,
-                                                                  speed,
-                                                                  duplex);
+                                                                   speed,
+                                                                   duplex);
         }
 
         return ret_val;
@@ -754,9 +754,9 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
 
         /* Initialize identification LED */
         ret_val = mac->ops.id_led_init(hw);
+        /* An error is not fatal and we should not stop init due to this */
         if (ret_val)
                 e_dbg("Error initializing identification LED\n");
-                /* This is not fatal and we should not stop init due to this */
 
         /* Disabling VLAN filtering */
         e_dbg("Initializing the IEEE VLAN\n");
@@ -784,14 +784,14 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
 
         /* Set the transmit descriptor write-back policy */
         reg_data = er32(TXDCTL(0));
-        reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
+        reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);
         ew32(TXDCTL(0), reg_data);
 
         /* ...for both queues. */
         reg_data = er32(TXDCTL(1));
-        reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
+        reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);
         ew32(TXDCTL(1), reg_data);
 
         /* Enable retransmit on late collisions */
@@ -818,13 +818,12 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
         /* default to true to enable the MDIC W/A */
         hw->dev_spec.e80003es2lan.mdic_wa_enable = true;
 
-        ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET >>
-                                      E1000_KMRNCTRLSTA_OFFSET_SHIFT,
-                                      &i);
+        ret_val =
+            e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET >>
+                                            E1000_KMRNCTRLSTA_OFFSET_SHIFT, &i);
         if (!ret_val) {
                 if ((i & E1000_KMRNCTRLSTA_OPMODE_MASK) ==
-                     E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
+                    E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
                         hw->dev_spec.e80003es2lan.mdic_wa_enable = false;
         }
 
@@ -891,7 +890,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 {
         struct e1000_phy_info *phy = &hw->phy;
         s32 ret_val;
-        u32 ctrl_ext;
+        u32 reg;
         u16 data;
 
         ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL, &data);
@@ -954,22 +953,19 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
         }
 
         /* Bypass Rx and Tx FIFO's */
-        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                        E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL,
-                                        E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
-                                        E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS);
+        reg = E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL;
+        data = (E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
+                E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS);
+        ret_val = e1000_write_kmrn_reg_80003es2lan(hw, reg, data);
         if (ret_val)
                 return ret_val;
 
-        ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
-                                       &data);
+        reg = E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE;
+        ret_val = e1000_read_kmrn_reg_80003es2lan(hw, reg, &data);
         if (ret_val)
                 return ret_val;
         data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE;
-        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                        E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
-                                        data);
+        ret_val = e1000_write_kmrn_reg_80003es2lan(hw, reg, data);
         if (ret_val)
                 return ret_val;
 
@@ -982,9 +978,9 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        ctrl_ext = er32(CTRL_EXT);
-        ctrl_ext &= ~(E1000_CTRL_EXT_LINK_MODE_MASK);
-        ew32(CTRL_EXT, ctrl_ext);
+        reg = er32(CTRL_EXT);
+        reg &= ~E1000_CTRL_EXT_LINK_MODE_MASK;
+        ew32(CTRL_EXT, reg);
 
         ret_val = e1e_rphy(hw, GG82563_PHY_PWR_MGMT_CTRL, &data);
         if (ret_val)
@@ -1049,27 +1045,29 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
          * polling the phy; this fixes erroneous timeouts at 10Mbps.
          */
         ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),
-                                                   0xFFFF);
+                                                   0xFFFF);
         if (ret_val)
                 return ret_val;
         ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                  &reg_data);
+                                                  &reg_data);
         if (ret_val)
                 return ret_val;
         reg_data |= 0x3F;
         ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                   reg_data);
+                                                   reg_data);
         if (ret_val)
                 return ret_val;
-        ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                      &reg_data);
+        ret_val =
+            e1000_read_kmrn_reg_80003es2lan(hw,
+                                            E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+                                            &reg_data);
         if (ret_val)
                 return ret_val;
         reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;
-        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                        E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                        reg_data);
+        ret_val =
+            e1000_write_kmrn_reg_80003es2lan(hw,
+                                             E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+                                             reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -1096,7 +1094,7 @@ static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
 
         if (hw->phy.media_type == e1000_media_type_copper) {
                 ret_val = e1000e_get_speed_and_duplex_copper(hw, &speed,
-                                                             &duplex);
+                                                             &duplex);
                 if (ret_val)
                         return ret_val;
 
@@ -1125,9 +1123,10 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
         u16 reg_data, reg_data2;
 
         reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
-        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                       reg_data);
+        ret_val =
+            e1000_write_kmrn_reg_80003es2lan(hw,
+                                             E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                             reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -1171,9 +1170,10 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
         u32 i = 0;
 
         reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
-        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                       reg_data);
+        ret_val =
+            e1000_write_kmrn_reg_80003es2lan(hw,
+                                             E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                             reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -1220,7 +1220,7 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
                 return ret_val;
 
         kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                       E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
+                       E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
         ew32(KMRNCTRLSTA, kmrnctrlsta);
         e1e_flush();
 
@@ -1255,7 +1255,7 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
                 return ret_val;
 
         kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                       E1000_KMRNCTRLSTA_OFFSET) | data;
+                       E1000_KMRNCTRLSTA_OFFSET) | data;
         ew32(KMRNCTRLSTA, kmrnctrlsta);
         e1e_flush();
 
@@ -1419,4 +1419,3 @@ const struct e1000_info e1000_es2_info = {
         .phy_ops                = &es2_phy_ops,
         .nvm_ops                = &es2_nvm_ops,
 };
-
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 2faffbde179e..7380442a3829 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -184,7 +184,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
         default:
                 nvm->type = e1000_nvm_eeprom_spi;
                 size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                                  E1000_EECD_SIZE_EX_SHIFT);
+                             E1000_EECD_SIZE_EX_SHIFT);
                 /* Added to a constant, "size" becomes the left-shift value
                  * for setting word_size.
                  */
@@ -437,7 +437,7 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
                         return ret_val;
 
                 phy->id = (u32)(phy_id << 16);
-                udelay(20);
+                usleep_range(20, 40);
                 ret_val = e1e_rphy(hw, MII_PHYSID2, &phy_id);
                 if (ret_val)
                         return ret_val;
@@ -482,7 +482,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
                 if (!(swsm & E1000_SWSM_SMBI))
                         break;
 
-                udelay(50);
+                usleep_range(50, 100);
                 i++;
         }
 
@@ -499,7 +499,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
                 if (er32(SWSM) & E1000_SWSM_SWESMBI)
                         break;
 
-                udelay(50);
+                usleep_range(50, 100);
         }
 
         if (i == fw_timeout) {
@@ -526,6 +526,7 @@ static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw)
         swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
         ew32(SWSM, swsm);
 }
+
 /**
  *  e1000_get_hw_semaphore_82573 - Acquire hardware semaphore
  *  @hw: pointer to the HW structure
@@ -846,9 +847,9 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
         }
 
         for (i = 0; i < words; i++) {
-                eewr = (data[i] << E1000_NVM_RW_REG_DATA) |
-                       ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) |
-                       E1000_NVM_RW_REG_START;
+                eewr = ((data[i] << E1000_NVM_RW_REG_DATA) |
+                        ((offset + i) << E1000_NVM_RW_ADDR_SHIFT) |
+                        E1000_NVM_RW_REG_START);
 
                 ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_WRITE);
                 if (ret_val)
@@ -875,8 +876,7 @@ static s32 e1000_get_cfg_done_82571(struct e1000_hw *hw)
         s32 timeout = PHY_CFG_TIMEOUT;
 
         while (timeout) {
-                if (er32(EEMNGCTL) &
-                    E1000_NVM_CFG_DONE_PORT_0)
+                if (er32(EEMNGCTL) & E1000_NVM_CFG_DONE_PORT_0)
                         break;
                 usleep_range(1000, 2000);
                 timeout--;
@@ -1022,7 +1022,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
         }
 
         if (hw->nvm.type == e1000_nvm_flash_hw) {
-                udelay(10);
+                usleep_range(10, 20);
                 ctrl_ext = er32(CTRL_EXT);
                 ctrl_ext |= E1000_CTRL_EXT_EE_RST;
                 ew32(CTRL_EXT, ctrl_ext);
@@ -1095,9 +1095,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
 
         /* Initialize identification LED */
         ret_val = mac->ops.id_led_init(hw);
+        /* An error is not fatal and we should not stop init due to this */
         if (ret_val)
                 e_dbg("Error initializing identification LED\n");
-                /* This is not fatal and we should not stop init due to this */
 
         /* Disabling VLAN filtering */
         e_dbg("Initializing the IEEE VLAN\n");
@@ -1122,9 +1122,8 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
 
         /* Set the transmit descriptor write-back policy */
         reg_data = er32(TXDCTL(0));
-        reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                   E1000_TXDCTL_FULL_TX_DESC_WB |
-                   E1000_TXDCTL_COUNT_DESC;
+        reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);
         ew32(TXDCTL(0), reg_data);
 
         /* ...for both queues. */
@@ -1140,9 +1139,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
                 break;
         default:
                 reg_data = er32(TXDCTL(1));
-                reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                           E1000_TXDCTL_FULL_TX_DESC_WB |
-                           E1000_TXDCTL_COUNT_DESC;
+                reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+                            E1000_TXDCTL_FULL_TX_DESC_WB |
+                            E1000_TXDCTL_COUNT_DESC);
                 ew32(TXDCTL(1), reg_data);
                 break;
         }
@@ -1530,7 +1529,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
         status = er32(STATUS);
         er32(RXCW);
         /* SYNCH bit and IV bit are sticky */
-        udelay(10);
+        usleep_range(10, 20);
         rxcw = er32(RXCW);
 
         if ((rxcw & E1000_RXCW_SYNCH) && !(rxcw & E1000_RXCW_IV)) {
@@ -1633,7 +1632,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                          * the IV bit and restart Autoneg
                          */
                         for (i = 0; i < AN_RETRY_COUNT; i++) {
-                                udelay(10);
+                                usleep_range(10, 20);
                                 rxcw = er32(RXCW);
                                 if ((rxcw & E1000_RXCW_SYNCH) &&
                                     (rxcw & E1000_RXCW_C))
@@ -2066,4 +2065,3 @@ const struct e1000_info e1000_82583_info = {
         .phy_ops                = &e82_phy_ops_bm,
         .nvm_ops                = &e82571_nvm_ops,
 };
-
diff --git a/drivers/net/ethernet/intel/e1000e/82571.h b/drivers/net/ethernet/intel/e1000e/82571.h
index 85cb1a3b7cd4..08e24dc3dc0e 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.h
+++ b/drivers/net/ethernet/intel/e1000e/82571.h
@@ -44,6 +44,8 @@
 #define E1000_EIAC_82574        0x000DC /* Ext. Interrupt Auto Clear - RW */
 #define E1000_EIAC_MASK_82574   0x01F00000
 
+#define E1000_IVAR_INT_ALLOC_VALID      0x8
+
 /* Manageability Operation Mode mask */
 #define E1000_NVM_INIT_CTRL2_MNGM       0x6000
 
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index fc3a4fe1ac71..351c94a0cf74 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -66,7 +66,7 @@
 #define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
 #define E1000_CTRL_EXT_EIAME          0x01000000
 #define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
-#define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge Auto-mask */
+#define E1000_CTRL_EXT_IAME             0x08000000 /* Int ACK Auto-mask */
 #define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
 #define E1000_CTRL_EXT_LSECCK         0x00001000
 #define E1000_CTRL_EXT_PHYPDEN        0x00100000
@@ -216,6 +216,8 @@
 #define E1000_CTRL_MEHE     0x00080000  /* Memory Error Handling Enable */
 #define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
 #define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
+#define E1000_CTRL_ADVD3WUC 0x00100000  /* D3 WUC */
+#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000 /* PHY PM enable */
 #define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
 #define E1000_CTRL_RST      0x04000000  /* Global reset */
 #define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
@@ -234,17 +236,17 @@
 #define E1000_STATUS_FUNC_SHIFT 2
 #define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
 #define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
+#define E1000_STATUS_SPEED_MASK 0x000000C0
 #define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
 #define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
 #define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
 #define E1000_STATUS_LAN_INIT_DONE 0x00000200   /* Lan Init Completion by NVM */
 #define E1000_STATUS_PHYRA      0x00000400      /* PHY Reset Asserted */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */
+#define E1000_STATUS_GIO_MASTER_ENABLE  0x00080000      /* Master Req status */
 
 #define HALF_DUPLEX 1
 #define FULL_DUPLEX 2
 
-
 #define ADVERTISE_10_HALF                 0x0001
 #define ADVERTISE_10_FULL                 0x0002
 #define ADVERTISE_100_HALF                0x0004
@@ -311,6 +313,7 @@
 
 /* SerDes Control */
 #define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
+#define E1000_SCTL_ENABLE_SERDES_LOOPBACK       0x0410
 
 /* Receive Checksum Control */
 #define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
@@ -400,7 +403,8 @@
 #define E1000_ICR_RXDMT0        0x00000010 /* Rx desc min. threshold (0) */
 #define E1000_ICR_RXT0          0x00000080 /* Rx timer intr (ring 0) */
 #define E1000_ICR_ECCER         0x00400000 /* Uncorrectable ECC Error */
-#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver should claim the interrupt */
+/* If this bit asserted, the driver should claim the interrupt */
+#define E1000_ICR_INT_ASSERTED  0x80000000
 #define E1000_ICR_RXQ0          0x00100000 /* Rx Queue 0 Interrupt */
 #define E1000_ICR_RXQ1          0x00200000 /* Rx Queue 1 Interrupt */
 #define E1000_ICR_TXQ0          0x00400000 /* Tx Queue 0 Interrupt */
@@ -583,13 +587,13 @@
 #define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
 #define E1000_EECD_SEC1VAL_VALID_MASK (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
 
-#define E1000_NVM_RW_REG_DATA   16   /* Offset to data in NVM read/write registers */
-#define E1000_NVM_RW_REG_DONE   2    /* Offset to READ/WRITE done bit */
-#define E1000_NVM_RW_REG_START  1    /* Start operation */
-#define E1000_NVM_RW_ADDR_SHIFT 2    /* Shift to the address bits */
-#define E1000_NVM_POLL_WRITE    1    /* Flag for polling for write complete */
-#define E1000_NVM_POLL_READ     0    /* Flag for polling for read complete */
-#define E1000_FLASH_UPDATES  2000
+#define E1000_NVM_RW_REG_DATA   16      /* Offset to data in NVM r/w regs */
+#define E1000_NVM_RW_REG_DONE   2       /* Offset to READ/WRITE done bit */
+#define E1000_NVM_RW_REG_START  1       /* Start operation */
+#define E1000_NVM_RW_ADDR_SHIFT 2       /* Shift to the address bits */
+#define E1000_NVM_POLL_WRITE    1       /* Flag for polling write complete */
+#define E1000_NVM_POLL_READ     0       /* Flag for polling read complete */
+#define E1000_FLASH_UPDATES     2000
 
 /* NVM Word Offsets */
 #define NVM_COMPAT                 0x0003
@@ -785,6 +789,7 @@
         GG82563_REG(194, 18) /* Inband Control */
 
 /* MDI Control */
+#define E1000_MDIC_REG_MASK     0x001F0000
 #define E1000_MDIC_REG_SHIFT 16
 #define E1000_MDIC_PHY_SHIFT 21
 #define E1000_MDIC_OP_WRITE  0x04000000
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index fcc758138b8a..82f1c84282db 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -46,6 +46,7 @@
 #include <linux/ptp_clock_kernel.h>
 #include <linux/ptp_classify.h>
 #include <linux/mii.h>
+#include <linux/mdio.h>
 #include "hw.h"
 
 struct e1000_info;
@@ -61,7 +62,6 @@ struct e1000_info;
 #define e_notice(format, arg...) \
         netdev_notice(adapter->netdev, format, ## arg)
 
-
 /* Interrupt modes, as used by the IntMode parameter */
 #define E1000E_INT_MODE_LEGACY          0
 #define E1000E_INT_MODE_MSI             1
@@ -239,9 +239,8 @@ struct e1000_adapter {
         u16 tx_itr;
         u16 rx_itr;
 
-        /* Tx */
-        struct e1000_ring *tx_ring /* One per active queue */
-                                                ____cacheline_aligned_in_smp;
+        /* Tx - one ring per active queue */
+        struct e1000_ring *tx_ring ____cacheline_aligned_in_smp;
         u32 tx_fifo_limit;
 
         struct napi_struct napi;
@@ -352,6 +351,8 @@ struct e1000_adapter {
         struct timecounter tc;
         struct ptp_clock *ptp_clock;
         struct ptp_clock_info ptp_clock_info;
+
+        u16 eee_advert;
 };
 
 struct e1000_info {
@@ -487,8 +488,8 @@ extern int e1000e_setup_tx_resources(struct e1000_ring *ring);
 extern void e1000e_free_rx_resources(struct e1000_ring *ring);
 extern void e1000e_free_tx_resources(struct e1000_ring *ring);
 extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
-                                                    struct rtnl_link_stats64
-                                                    *stats);
+                                                    struct rtnl_link_stats64
+                                                    *stats);
 extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_get_hw_control(struct e1000_adapter *adapter);
@@ -558,12 +559,14 @@ static inline s32 e1000e_update_nvm_checksum(struct e1000_hw *hw)
         return hw->nvm.ops.update(hw);
 }
 
-static inline s32 e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+static inline s32 e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words,
+                                 u16 *data)
 {
         return hw->nvm.ops.read(hw, offset, words, data);
 }
 
-static inline s32 e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+static inline s32 e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words,
+                                  u16 *data)
 {
         return hw->nvm.ops.write(hw, offset, words, data);
 }
@@ -597,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw)
         s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT;
 
         while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i)
-                udelay(50);
+                usleep_range(50, 100);
 
         return i;
 }
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index f91a8f3f9d48..7c8ca658d553 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -35,12 +35,11 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
-#include <linux/mdio.h>
 #include <linux/pm_runtime.h>
 
 #include "e1000.h"
 
-enum {NETDEV_STATS, E1000_STATS};
+enum { NETDEV_STATS, E1000_STATS };
 
 struct e1000_stats {
         char stat_string[ETH_GSTRING_LEN];
@@ -121,6 +120,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
         "Interrupt test (offline)", "Loopback test  (offline)",
         "Link test   (on/offline)"
 };
+
 #define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
 
 static int e1000_get_settings(struct net_device *netdev,
@@ -197,8 +197,7 @@ static int e1000_get_settings(struct net_device *netdev,
         /* MDI-X => 2; MDI =>1; Invalid =>0 */
         if ((hw->phy.media_type == e1000_media_type_copper) &&
             netif_carrier_ok(netdev))
-                ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :
-                                                      ETH_TP_MDI;
+                ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X : ETH_TP_MDI;
         else
                 ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
 
@@ -224,8 +223,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
 
         /* Fiber NICs only allow 1000 gbps Full duplex */
         if ((adapter->hw.phy.media_type == e1000_media_type_fiber) &&
-            spd != SPEED_1000 &&
-            dplx != DUPLEX_FULL) {
+            (spd != SPEED_1000) && (dplx != DUPLEX_FULL)) {
                 goto err_inval;
         }
 
@@ -298,12 +296,10 @@ static int e1000_set_settings(struct net_device *netdev,
                 hw->mac.autoneg = 1;
                 if (hw->phy.media_type == e1000_media_type_fiber)
                         hw->phy.autoneg_advertised = ADVERTISED_1000baseT_Full |
-                                                     ADVERTISED_FIBRE |
-                                                     ADVERTISED_Autoneg;
+                            ADVERTISED_FIBRE | ADVERTISED_Autoneg;
                 else
                         hw->phy.autoneg_advertised = ecmd->advertising |
-                                                     ADVERTISED_TP |
-                                                     ADVERTISED_Autoneg;
+                            ADVERTISED_TP | ADVERTISED_Autoneg;
                 ecmd->advertising = hw->phy.autoneg_advertised;
                 if (adapter->fc_autoneg)
                         hw->fc.requested_mode = e1000_fc_default;
@@ -346,7 +342,7 @@ static void e1000_get_pauseparam(struct net_device *netdev,
         struct e1000_hw *hw = &adapter->hw;
 
         pause->autoneg =
-                (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
+            (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
 
         if (hw->fc.current_mode == e1000_fc_rx_pause) {
                 pause->rx_pause = 1;
@@ -435,7 +431,7 @@ static void e1000_get_regs(struct net_device *netdev,
         memset(p, 0, E1000_REGS_LEN * sizeof(u32));
 
         regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
-                        adapter->pdev->device;
+            adapter->pdev->device;
 
         regs_buff[0]  = er32(CTRL);
         regs_buff[1]  = er32(STATUS);
@@ -503,8 +499,8 @@ static int e1000_get_eeprom(struct net_device *netdev,
         first_word = eeprom->offset >> 1;
         last_word = (eeprom->offset + eeprom->len - 1) >> 1;
 
-        eeprom_buff = kmalloc(sizeof(u16) *
-                        (last_word - first_word + 1), GFP_KERNEL);
+        eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
+                              GFP_KERNEL);
         if (!eeprom_buff)
                 return -ENOMEM;
 
@@ -515,7 +511,7 @@ static int e1000_get_eeprom(struct net_device *netdev,
         } else {
                 for (i = 0; i < last_word - first_word + 1; i++) {
                         ret_val = e1000_read_nvm(hw, first_word + i, 1,
-                                                      &eeprom_buff[i]);
+                                                 &eeprom_buff[i]);
                         if (ret_val)
                                 break;
                 }
@@ -553,7 +549,8 @@ static int e1000_set_eeprom(struct net_device *netdev,
         if (eeprom->len == 0)
                 return -EOPNOTSUPP;
 
-        if (eeprom->magic != (adapter->pdev->vendor | (adapter->pdev->device << 16)))
+        if (eeprom->magic !=
+            (adapter->pdev->vendor | (adapter->pdev->device << 16)))
                 return -EFAULT;
 
         if (adapter->flags & FLAG_READ_ONLY_NVM)
@@ -579,7 +576,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
                 /* need read/modify/write of last changed EEPROM word */
                 /* only the first byte of the word is being modified */
                 ret_val = e1000_read_nvm(hw, last_word, 1,
-                                  &eeprom_buff[last_word - first_word]);
+                                         &eeprom_buff[last_word - first_word]);
 
         if (ret_val)
                 goto out;
@@ -618,8 +615,7 @@ static void e1000_get_drvinfo(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
-        strlcpy(drvinfo->driver,  e1000e_driver_name,
-                sizeof(drvinfo->driver));
+        strlcpy(drvinfo->driver, e1000e_driver_name, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, e1000e_driver_version,
                 sizeof(drvinfo->version));
 
@@ -627,10 +623,10 @@ static void e1000_get_drvinfo(struct net_device *netdev,
          * PCI-E controllers
          */
         snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
-                "%d.%d-%d",
-                (adapter->eeprom_vers & 0xF000) >> 12,
-                (adapter->eeprom_vers & 0x0FF0) >> 4,
-                (adapter->eeprom_vers & 0x000F));
+                 "%d.%d-%d",
+                 (adapter->eeprom_vers & 0xF000) >> 12,
+                 (adapter->eeprom_vers & 0x0FF0) >> 4,
+                 (adapter->eeprom_vers & 0x000F));
 
         strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
                 sizeof(drvinfo->bus_info));
@@ -756,7 +752,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
 {
         u32 pat, val;
         static const u32 test[] = {
-                0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
+                0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF
+        };
         for (pat = 0; pat < ARRAY_SIZE(test); pat++) {
                 E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset,
                                       (test[pat] & write));
@@ -786,6 +783,7 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
         }
         return 0;
 }
+
 #define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write)                       \
         do {                                                                   \
                 if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \
@@ -813,16 +811,16 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         u32 wlock_mac = 0;
 
         /* The status register is Read Only, so a write should fail.
-         * Some bits that get toggled are ignored.
+         * Some bits that get toggled are ignored.  There are several bits
+         * on newer hardware that are r/w.
          */
         switch (mac->type) {
-        /* there are several bits on newer hardware that are r/w */
         case e1000_82571:
         case e1000_82572:
         case e1000_80003es2lan:
                 toggle = 0x7FFFF3FF;
                 break;
-        default:
+        default:
                 toggle = 0x7FFFF033;
                 break;
         }
@@ -928,7 +926,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
         }
 
         /* If Checksum is not Correct return error else test passed */
-        if ((checksum != (u16) NVM_SUM) && !(*data))
+        if ((checksum != (u16)NVM_SUM) && !(*data))
                 *data = 2;
 
         return *data;
@@ -936,7 +934,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
 
 static irqreturn_t e1000_test_intr(int __always_unused irq, void *data)
 {
-        struct net_device *netdev = (struct net_device *) data;
+        struct net_device *netdev = (struct net_device *)data;
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
@@ -969,8 +967,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
         if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
                          netdev)) {
                 shared_int = 0;
-        } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
-                 netdev->name, netdev)) {
+        } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED, netdev->name,
+                               netdev)) {
                 *data = 1;
                 ret_val = -1;
                 goto out;
@@ -1080,28 +1078,33 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
         struct e1000_ring *tx_ring = &adapter->test_tx_ring;
         struct e1000_ring *rx_ring = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
+        struct e1000_buffer *buffer_info;
         int i;
 
         if (tx_ring->desc && tx_ring->buffer_info) {
                 for (i = 0; i < tx_ring->count; i++) {
-                        if (tx_ring->buffer_info[i].dma)
+                        buffer_info = &tx_ring->buffer_info[i];
+
+                        if (buffer_info->dma)
                                 dma_unmap_single(&pdev->dev,
-                                        tx_ring->buffer_info[i].dma,
-                                        tx_ring->buffer_info[i].length,
-                                        DMA_TO_DEVICE);
-                        if (tx_ring->buffer_info[i].skb)
-                                dev_kfree_skb(tx_ring->buffer_info[i].skb);
+                                                 buffer_info->dma,
+                                                 buffer_info->length,
+                                                 DMA_TO_DEVICE);
+                        if (buffer_info->skb)
+                                dev_kfree_skb(buffer_info->skb);
                 }
         }
 
         if (rx_ring->desc && rx_ring->buffer_info) {
                 for (i = 0; i < rx_ring->count; i++) {
-                        if (rx_ring->buffer_info[i].dma)
+                        buffer_info = &rx_ring->buffer_info[i];
+
+                        if (buffer_info->dma)
                                 dma_unmap_single(&pdev->dev,
-                                        rx_ring->buffer_info[i].dma,
-                                        2048, DMA_FROM_DEVICE);
-                        if (rx_ring->buffer_info[i].skb)
-                                dev_kfree_skb(rx_ring->buffer_info[i].skb);
+                                                 buffer_info->dma,
+                                                 2048, DMA_FROM_DEVICE);
+                        if (buffer_info->skb)
+                                dev_kfree_skb(buffer_info->skb);
                 }
         }
 
@@ -1138,8 +1141,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 tx_ring->count = E1000_DEFAULT_TXD;
 
         tx_ring->buffer_info = kcalloc(tx_ring->count,
-                                       sizeof(struct e1000_buffer),
-                                       GFP_KERNEL);
+                                       sizeof(struct e1000_buffer), GFP_KERNEL);
         if (!tx_ring->buffer_info) {
                 ret_val = 1;
                 goto err_nomem;
@@ -1156,8 +1158,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         tx_ring->next_to_use = 0;
         tx_ring->next_to_clean = 0;
 
-        ew32(TDBAL(0), ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
-        ew32(TDBAH(0), ((u64) tx_ring->dma >> 32));
+        ew32(TDBAL(0), ((u64)tx_ring->dma & 0x00000000FFFFFFFF));
+        ew32(TDBAH(0), ((u64)tx_ring->dma >> 32));
         ew32(TDLEN(0), tx_ring->count * sizeof(struct e1000_tx_desc));
         ew32(TDH(0), 0);
         ew32(TDT(0), 0);
@@ -1179,8 +1181,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 tx_ring->buffer_info[i].skb = skb;
                 tx_ring->buffer_info[i].length = skb->len;
                 tx_ring->buffer_info[i].dma =
-                        dma_map_single(&pdev->dev, skb->data, skb->len,
-                                       DMA_TO_DEVICE);
+                    dma_map_single(&pdev->dev, skb->data, skb->len,
+                                   DMA_TO_DEVICE);
                 if (dma_mapping_error(&pdev->dev,
                                       tx_ring->buffer_info[i].dma)) {
                         ret_val = 4;
@@ -1200,8 +1202,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 rx_ring->count = E1000_DEFAULT_RXD;
 
         rx_ring->buffer_info = kcalloc(rx_ring->count,
-                                       sizeof(struct e1000_buffer),
-                                       GFP_KERNEL);
+                                       sizeof(struct e1000_buffer), GFP_KERNEL);
         if (!rx_ring->buffer_info) {
                 ret_val = 5;
                 goto err_nomem;
@@ -1220,16 +1221,16 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         rctl = er32(RCTL);
         if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX))
                 ew32(RCTL, rctl & ~E1000_RCTL_EN);
-        ew32(RDBAL(0), ((u64) rx_ring->dma & 0xFFFFFFFF));
-        ew32(RDBAH(0), ((u64) rx_ring->dma >> 32));
+        ew32(RDBAL(0), ((u64)rx_ring->dma & 0xFFFFFFFF));
+        ew32(RDBAH(0), ((u64)rx_ring->dma >> 32));
         ew32(RDLEN(0), rx_ring->size);
         ew32(RDH(0), 0);
         ew32(RDT(0), 0);
         rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
-                E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_LPE |
-                E1000_RCTL_SBP | E1000_RCTL_SECRC |
-                E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-                (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
+            E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_LPE |
+            E1000_RCTL_SBP | E1000_RCTL_SECRC |
+            E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+            (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
         ew32(RCTL, rctl);
 
         for (i = 0; i < rx_ring->count; i++) {
@@ -1244,8 +1245,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 skb_reserve(skb, NET_IP_ALIGN);
                 rx_ring->buffer_info[i].skb = skb;
                 rx_ring->buffer_info[i].dma =
-                        dma_map_single(&pdev->dev, skb->data, 2048,
-                                       DMA_FROM_DEVICE);
+                    dma_map_single(&pdev->dev, skb->data, 2048,
+                                   DMA_FROM_DEVICE);
                 if (dma_mapping_error(&pdev->dev,
                                       rx_ring->buffer_info[i].dma)) {
                         ret_val = 8;
@@ -1296,7 +1297,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
                 ew32(CTRL, ctrl_reg);
                 e1e_flush();
-                udelay(500);
+                usleep_range(500, 1000);
 
                 return 0;
         }
@@ -1322,7 +1323,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                 e1e_wphy(hw, PHY_REG(2, 21), phy_reg);
                 /* Assert SW reset for above settings to take effect */
                 hw->phy.ops.commit(hw);
-                mdelay(1);
+                usleep_range(1000, 2000);
                 /* Force Full Duplex */
                 e1e_rphy(hw, PHY_REG(769, 16), &phy_reg);
                 e1e_wphy(hw, PHY_REG(769, 16), phy_reg | 0x000C);
@@ -1363,7 +1364,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
         /* force 1000, set loopback */
         e1e_wphy(hw, MII_BMCR, 0x4140);
-        mdelay(250);
+        msleep(250);
 
         /* Now set up the MAC to the same speed/duplex as the PHY. */
         ctrl_reg = er32(CTRL);
@@ -1395,7 +1396,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
         if (hw->phy.type == e1000_phy_m88)
                 e1000_phy_disable_receiver(adapter);
 
-        udelay(500);
+        usleep_range(500, 1000);
 
         return 0;
 }
@@ -1431,8 +1432,7 @@ static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter)
         /* special write to serdes control register to enable SerDes analog
          * loopback
          */
-#define E1000_SERDES_LB_ON 0x410
-        ew32(SCTL, E1000_SERDES_LB_ON);
+        ew32(SCTL, E1000_SCTL_ENABLE_SERDES_LOOPBACK);
         e1e_flush();
         usleep_range(10000, 20000);
 
@@ -1526,8 +1526,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
         case e1000_82572:
                 if (hw->phy.media_type == e1000_media_type_fiber ||
                     hw->phy.media_type == e1000_media_type_internal_serdes) {
-#define E1000_SERDES_LB_OFF 0x400
-                        ew32(SCTL, E1000_SERDES_LB_OFF);
+                        ew32(SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
                         e1e_flush();
                         usleep_range(10000, 20000);
                         break;
@@ -1564,7 +1563,7 @@ static int e1000_check_lbtest_frame(struct sk_buff *skb,
         frame_size &= ~1;
         if (*(skb->data + 3) == 0xFF)
                 if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
-                   (*(skb->data + frame_size / 2 + 12) == 0xAF))
+                    (*(skb->data + frame_size / 2 + 12) == 0xAF))
                         return 0;
         return 13;
 }
@@ -1575,6 +1574,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
         struct e1000_ring *rx_ring = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
         struct e1000_hw *hw = &adapter->hw;
+        struct e1000_buffer *buffer_info;
         int i, j, k, l;
         int lc;
         int good_cnt;
@@ -1595,14 +1595,17 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
 
         k = 0;
         l = 0;
-        for (j = 0; j <= lc; j++) { /* loop count loop */
-                for (i = 0; i < 64; i++) { /* send the packets */
-                        e1000_create_lbtest_frame(tx_ring->buffer_info[k].skb,
-                                                  1024);
+        /* loop count loop */
+        for (j = 0; j <= lc; j++) {
+                /* send the packets */
+                for (i = 0; i < 64; i++) {
+                        buffer_info = &tx_ring->buffer_info[k];
+
+                        e1000_create_lbtest_frame(buffer_info->skb, 1024);
                         dma_sync_single_for_device(&pdev->dev,
-                                        tx_ring->buffer_info[k].dma,
-                                        tx_ring->buffer_info[k].length,
-                                        DMA_TO_DEVICE);
+                                                   buffer_info->dma,
+                                                   buffer_info->length,
+                                                   DMA_TO_DEVICE);
                         k++;
                         if (k == tx_ring->count)
                                 k = 0;
@@ -1612,13 +1615,16 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                 msleep(200);
                 time = jiffies; /* set the start time for the receive */
                 good_cnt = 0;
-                do { /* receive the sent packets */
+                /* receive the sent packets */
+                do {
+                        buffer_info = &rx_ring->buffer_info[l];
+
                         dma_sync_single_for_cpu(&pdev->dev,
-                                        rx_ring->buffer_info[l].dma, 2048,
-                                        DMA_FROM_DEVICE);
+                                                buffer_info->dma, 2048,
+                                                DMA_FROM_DEVICE);
 
-                        ret_val = e1000_check_lbtest_frame(
-                                        rx_ring->buffer_info[l].skb, 1024);
+                        ret_val = e1000_check_lbtest_frame(buffer_info->skb,
+                                                           1024);
                         if (!ret_val)
                                 good_cnt++;
                         l++;
@@ -1637,7 +1643,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                         ret_val = 14; /* error code for time out error */
                         break;
                 }
-        } /* end loop count loop */
+        }
         return ret_val;
 }
 
@@ -1696,7 +1702,7 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
                         /* On some Phy/switch combinations, link establishment
                          * can take a few seconds more than expected.
                          */
-                        msleep(5000);
+                        msleep_interruptible(5000);
 
                 if (!(er32(STATUS) & E1000_STATUS_LU))
                         *data = 1;
@@ -1980,12 +1986,12 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
         for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
                 switch (e1000_gstrings_stats[i].type) {
                 case NETDEV_STATS:
-                        p = (char *) &net_stats +
-                                        e1000_gstrings_stats[i].stat_offset;
+                        p = (char *)&net_stats +
+                            e1000_gstrings_stats[i].stat_offset;
                         break;
                 case E1000_STATS:
-                        p = (char *) adapter +
-                                        e1000_gstrings_stats[i].stat_offset;
+                        p = (char *)adapter +
+                            e1000_gstrings_stats[i].stat_offset;
                         break;
                 default:
                         data[i] = 0;
@@ -1993,7 +1999,7 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
                 }
 
                 data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
-                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+                           sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
 }
 
@@ -2069,23 +2075,20 @@ static int e1000e_get_eee(struct net_device *netdev, struct ethtool_eee *edata)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        u16 cap_addr, adv_addr, lpa_addr, pcs_stat_addr, phy_data, lpi_ctrl;
-        u32 status, ret_val;
+        u16 cap_addr, lpa_addr, pcs_stat_addr, phy_data;
+        u32 ret_val;
 
-        if (!(adapter->flags & FLAG_IS_ICH) ||
-            !(adapter->flags2 & FLAG2_HAS_EEE))
+        if (!(adapter->flags2 & FLAG2_HAS_EEE))
                 return -EOPNOTSUPP;
 
         switch (hw->phy.type) {
         case e1000_phy_82579:
                 cap_addr = I82579_EEE_CAPABILITY;
-                adv_addr = I82579_EEE_ADVERTISEMENT;
                 lpa_addr = I82579_EEE_LP_ABILITY;
                 pcs_stat_addr = I82579_EEE_PCS_STATUS;
                 break;
         case e1000_phy_i217:
                 cap_addr = I217_EEE_CAPABILITY;
-                adv_addr = I217_EEE_ADVERTISEMENT;
                 lpa_addr = I217_EEE_LP_ABILITY;
                 pcs_stat_addr = I217_EEE_PCS_STATUS;
                 break;
@@ -2104,10 +2107,7 @@ static int e1000e_get_eee(struct net_device *netdev, struct ethtool_eee *edata)
         edata->supported = mmd_eee_cap_to_ethtool_sup_t(phy_data);
 
         /* EEE Advertised */
-        ret_val = e1000_read_emi_reg_locked(hw, adv_addr, &phy_data);
-        if (ret_val)
-                goto release;
-        edata->advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data);
+        edata->advertised = mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert);
 
         /* EEE Link Partner Advertised */
         ret_val = e1000_read_emi_reg_locked(hw, lpa_addr, &phy_data);
@@ -2125,25 +2125,11 @@ release:
         if (ret_val)
                 return -ENODATA;
 
-        e1e_rphy(hw, I82579_LPI_CTRL, &lpi_ctrl);
-        status = er32(STATUS);
-
         /* Result of the EEE auto negotiation - there is no register that
          * has the status of the EEE negotiation so do a best-guess based
-         * on whether both Tx and Rx LPI indications have been received or
-         * base it on the link speed, the EEE advertised speeds on both ends
-         * and the speeds on which EEE is enabled locally.
+         * on whether Tx or Rx LPI indications have been received.
          */
-        if (((phy_data & E1000_EEE_TX_LPI_RCVD) &&
-             (phy_data & E1000_EEE_RX_LPI_RCVD)) ||
-            ((status & E1000_STATUS_SPEED_100) &&
-             (edata->advertised & ADVERTISED_100baseT_Full) &&
-             (edata->lp_advertised & ADVERTISED_100baseT_Full) &&
-             (lpi_ctrl & I82579_LPI_CTRL_100_ENABLE)) ||
-            ((status & E1000_STATUS_SPEED_1000) &&
-             (edata->advertised & ADVERTISED_1000baseT_Full) &&
-             (edata->lp_advertised & ADVERTISED_1000baseT_Full) &&
-             (lpi_ctrl & I82579_LPI_CTRL_1000_ENABLE)))
+        if (phy_data & (E1000_EEE_TX_LPI_RCVD | E1000_EEE_RX_LPI_RCVD))
                 edata->eee_active = true;
 
         edata->eee_enabled = !hw->dev_spec.ich8lan.eee_disable;
@@ -2160,19 +2146,10 @@ static int e1000e_set_eee(struct net_device *netdev, struct ethtool_eee *edata)
         struct ethtool_eee eee_curr;
         s32 ret_val;
 
-        if (!(adapter->flags & FLAG_IS_ICH) ||
-            !(adapter->flags2 & FLAG2_HAS_EEE))
-                return -EOPNOTSUPP;
-
         ret_val = e1000e_get_eee(netdev, &eee_curr);
         if (ret_val)
                 return ret_val;
 
-        if (eee_curr.advertised != edata->advertised) {
-                e_err("Setting EEE advertisement is not supported\n");
-                return -EINVAL;
-        }
-
         if (eee_curr.tx_lpi_enabled != edata->tx_lpi_enabled) {
                 e_err("Setting EEE tx-lpi is not supported\n");
                 return -EINVAL;
@@ -2183,16 +2160,21 @@ static int e1000e_set_eee(struct net_device *netdev, struct ethtool_eee *edata)
                 return -EINVAL;
         }
 
-        if (hw->dev_spec.ich8lan.eee_disable != !edata->eee_enabled) {
-                hw->dev_spec.ich8lan.eee_disable = !edata->eee_enabled;
-
-                /* reset the link */
-                if (netif_running(netdev))
-                        e1000e_reinit_locked(adapter);
-                else
-                        e1000e_reset(adapter);
+        if (edata->advertised & ~(ADVERTISE_100_FULL | ADVERTISE_1000_FULL)) {
+                e_err("EEE advertisement supports only 100TX and/or 1000T full-duplex\n");
+                return -EINVAL;
         }
 
+        adapter->eee_advert = ethtool_adv_to_mmd_eee_adv_t(edata->advertised);
+
+        hw->dev_spec.ich8lan.eee_disable = !edata->eee_enabled;
+
+        /* reset the link */
+        if (netif_running(netdev))
+                e1000e_reinit_locked(adapter);
+        else
+                e1000e_reset(adapter);
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index 1e6b889aee87..84850f7a23e4 100644
--- a/drivers/net/ethernet/intel/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
@@ -167,7 +167,7 @@ enum e1000_1000t_rx_status {
         e1000_1000t_rx_status_undefined = 0xFF
 };
 
-enum e1000_rev_polarity{
+enum e1000_rev_polarity {
         e1000_rev_polarity_normal = 0,
         e1000_rev_polarity_reversed,
         e1000_rev_polarity_undefined = 0xFF
@@ -545,7 +545,7 @@ struct e1000_mac_info {
         u16 mta_reg_count;
 
         /* Maximum size of the MTA register table in all supported adapters */
-        #define MAX_MTA_REG 128
+#define MAX_MTA_REG 128
         u32 mta_shadow[MAX_MTA_REG];
         u16 rar_entry_count;
 
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 121a865c7fbd..ad9d8f2dd868 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -61,15 +61,15 @@
 /* Offset 04h HSFSTS */
 union ich8_hws_flash_status {
         struct ich8_hsfsts {
-                u16 flcdone    :1; /* bit 0 Flash Cycle Done */
-                u16 flcerr     :1; /* bit 1 Flash Cycle Error */
-                u16 dael       :1; /* bit 2 Direct Access error Log */
-                u16 berasesz   :2; /* bit 4:3 Sector Erase Size */
-                u16 flcinprog  :1; /* bit 5 flash cycle in Progress */
-                u16 reserved1  :2; /* bit 13:6 Reserved */
-                u16 reserved2  :6; /* bit 13:6 Reserved */
-                u16 fldesvalid :1; /* bit 14 Flash Descriptor Valid */
-                u16 flockdn    :1; /* bit 15 Flash Config Lock-Down */
+                u16 flcdone:1;  /* bit 0 Flash Cycle Done */
+                u16 flcerr:1;   /* bit 1 Flash Cycle Error */
+                u16 dael:1;     /* bit 2 Direct Access error Log */
+                u16 berasesz:2; /* bit 4:3 Sector Erase Size */
+                u16 flcinprog:1;        /* bit 5 flash cycle in Progress */
+                u16 reserved1:2;        /* bit 13:6 Reserved */
+                u16 reserved2:6;        /* bit 13:6 Reserved */
+                u16 fldesvalid:1;       /* bit 14 Flash Descriptor Valid */
+                u16 flockdn:1;  /* bit 15 Flash Config Lock-Down */
         } hsf_status;
         u16 regval;
 };
@@ -78,11 +78,11 @@ union ich8_hws_flash_status {
 /* Offset 06h FLCTL */
 union ich8_hws_flash_ctrl {
         struct ich8_hsflctl {
-                u16 flcgo      :1;   /* 0 Flash Cycle Go */
-                u16 flcycle    :2;   /* 2:1 Flash Cycle */
-                u16 reserved   :5;   /* 7:3 Reserved  */
-                u16 fldbcount  :2;   /* 9:8 Flash Data Byte Count */
-                u16 flockdn    :6;   /* 15:10 Reserved */
+                u16 flcgo:1;    /* 0 Flash Cycle Go */
+                u16 flcycle:2;  /* 2:1 Flash Cycle */
+                u16 reserved:5; /* 7:3 Reserved  */
+                u16 fldbcount:2;        /* 9:8 Flash Data Byte Count */
+                u16 flockdn:6;  /* 15:10 Reserved */
         } hsf_ctrl;
         u16 regval;
 };
@@ -90,10 +90,10 @@ union ich8_hws_flash_ctrl {
 /* ICH Flash Region Access Permissions */
 union ich8_hws_flash_regacc {
         struct ich8_flracc {
-                u32 grra      :8; /* 0:7 GbE region Read Access */
-                u32 grwa      :8; /* 8:15 GbE region Write Access */
-                u32 gmrag     :8; /* 23:16 GbE Master Read Access Grant */
-                u32 gmwag     :8; /* 31:24 GbE Master Write Access Grant */
+                u32 grra:8;     /* 0:7 GbE region Read Access */
+                u32 grwa:8;     /* 8:15 GbE region Write Access */
+                u32 gmrag:8;    /* 23:16 GbE Master Read Access Grant */
+                u32 gmwag:8;    /* 31:24 GbE Master Write Access Grant */
         } hsf_flregacc;
         u16 regval;
 };
@@ -142,6 +142,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
 static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
 static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
 static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
+static s32 e1000_setup_copper_link_pch_lpt(struct e1000_hw *hw);
 
 static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
 {
@@ -312,7 +313,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
                 mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE;
                 ew32(CTRL, mac_reg);
                 e1e_flush();
-                udelay(10);
+                usleep_range(10, 20);
                 mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
                 ew32(CTRL, mac_reg);
                 e1e_flush();
@@ -548,8 +549,8 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
         /* find total size of the NVM, then cut in half since the total
          * size represents two separate NVM banks.
          */
-        nvm->flash_bank_size = (sector_end_addr - sector_base_addr)
-                                << FLASH_SECTOR_ADDR_SHIFT;
+        nvm->flash_bank_size = ((sector_end_addr - sector_base_addr)
+                                << FLASH_SECTOR_ADDR_SHIFT);
         nvm->flash_bank_size /= 2;
         /* Adjust to word count */
         nvm->flash_bank_size /= sizeof(u16);
@@ -636,6 +637,8 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
         if (mac->type == e1000_pch_lpt) {
                 mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;
                 mac->ops.rar_set = e1000_rar_set_pch_lpt;
+                mac->ops.setup_physical_interface =
+                    e1000_setup_copper_link_pch_lpt;
         }
 
         /* Enable PCS Lock-loss workaround for ICH8 */
@@ -692,7 +695,7 @@ s32 e1000_read_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 *data)
  *
  *  Assumes the SW/FW/HW Semaphore is already acquired.
  **/
-static s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data)
+s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data)
 {
         return __e1000_access_emi_reg_locked(hw, addr, &data, false);
 }
@@ -709,11 +712,22 @@ static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 {
         struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
         s32 ret_val;
-        u16 lpi_ctrl;
+        u16 lpa, pcs_status, adv, adv_addr, lpi_ctrl, data;
 
-        if ((hw->phy.type != e1000_phy_82579) &&
-            (hw->phy.type != e1000_phy_i217))
+        switch (hw->phy.type) {
+        case e1000_phy_82579:
+                lpa = I82579_EEE_LP_ABILITY;
+                pcs_status = I82579_EEE_PCS_STATUS;
+                adv_addr = I82579_EEE_ADVERTISEMENT;
+                break;
+        case e1000_phy_i217:
+                lpa = I217_EEE_LP_ABILITY;
+                pcs_status = I217_EEE_PCS_STATUS;
+                adv_addr = I217_EEE_ADVERTISEMENT;
+                break;
+        default:
                 return 0;
+        }
 
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
@@ -728,34 +742,24 @@ static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 
         /* Enable EEE if not disabled by user */
         if (!dev_spec->eee_disable) {
-                u16 lpa, pcs_status, data;
-
                 /* Save off link partner's EEE ability */
-                switch (hw->phy.type) {
-                case e1000_phy_82579:
-                        lpa = I82579_EEE_LP_ABILITY;
-                        pcs_status = I82579_EEE_PCS_STATUS;
-                        break;
-                case e1000_phy_i217:
-                        lpa = I217_EEE_LP_ABILITY;
-                        pcs_status = I217_EEE_PCS_STATUS;
-                        break;
-                default:
-                        ret_val = -E1000_ERR_PHY;
-                        goto release;
-                }
                 ret_val = e1000_read_emi_reg_locked(hw, lpa,
                                                     &dev_spec->eee_lp_ability);
                 if (ret_val)
                         goto release;
 
+                /* Read EEE advertisement */
+                ret_val = e1000_read_emi_reg_locked(hw, adv_addr, &adv);
+                if (ret_val)
+                        goto release;
+
                 /* Enable EEE only for speeds in which the link partner is
-                 * EEE capable.
+                 * EEE capable and for which we advertise EEE.
                  */
-                if (dev_spec->eee_lp_ability & I82579_EEE_1000_SUPPORTED)
+                if (adv & dev_spec->eee_lp_ability & I82579_EEE_1000_SUPPORTED)
                         lpi_ctrl |= I82579_LPI_CTRL_1000_ENABLE;
 
-                if (dev_spec->eee_lp_ability & I82579_EEE_100_SUPPORTED) {
+                if (adv & dev_spec->eee_lp_ability & I82579_EEE_100_SUPPORTED) {
                         e1e_rphy_locked(hw, MII_LPA, &data);
                         if (data & LPA_100FULL)
                                 lpi_ctrl |= I82579_LPI_CTRL_100_ENABLE;
@@ -767,13 +771,13 @@ static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
                                 dev_spec->eee_lp_ability &=
                                     ~I82579_EEE_100_SUPPORTED;
                 }
-
-                /* R/Clr IEEE MMD 3.1 bits 11:10 - Tx/Rx LPI Received */
-                ret_val = e1000_read_emi_reg_locked(hw, pcs_status, &data);
-                if (ret_val)
-                        goto release;
         }
 
+        /* R/Clr IEEE MMD 3.1 bits 11:10 - Tx/Rx LPI Received */
+        ret_val = e1000_read_emi_reg_locked(hw, pcs_status, &data);
+        if (ret_val)
+                goto release;
+
         ret_val = e1e_wphy_locked(hw, I82579_LPI_CTRL, lpi_ctrl);
 release:
         hw->phy.ops.release(hw);
@@ -835,6 +839,94 @@ release:
 }
 
 /**
+ *  e1000_platform_pm_pch_lpt - Set platform power management values
+ *  @hw: pointer to the HW structure
+ *  @link: bool indicating link status
+ *
+ *  Set the Latency Tolerance Reporting (LTR) values for the "PCIe-like"
+ *  GbE MAC in the Lynx Point PCH based on Rx buffer size and link speed
+ *  when link is up (which must not exceed the maximum latency supported
+ *  by the platform), otherwise specify there is no LTR requirement.
+ *  Unlike true-PCIe devices which set the LTR maximum snoop/no-snoop
+ *  latencies in the LTR Extended Capability Structure in the PCIe Extended
+ *  Capability register set, on this device LTR is set by writing the
+ *  equivalent snoop/no-snoop latencies in the LTRV register in the MAC and
+ *  set the SEND bit to send an Intel On-chip System Fabric sideband (IOSF-SB)
+ *  message to the PMC.
+ **/
+static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
+{
+        u32 reg = link << (E1000_LTRV_REQ_SHIFT + E1000_LTRV_NOSNOOP_SHIFT) |
+            link << E1000_LTRV_REQ_SHIFT | E1000_LTRV_SEND;
+        u16 lat_enc = 0;        /* latency encoded */
+
+        if (link) {
+                u16 speed, duplex, scale = 0;
+                u16 max_snoop, max_nosnoop;
+                u16 max_ltr_enc;        /* max LTR latency encoded */
+                s64 lat_ns;     /* latency (ns) */
+                s64 value;
+                u32 rxa;
+
+                if (!hw->adapter->max_frame_size) {
+                        e_dbg("max_frame_size not set.\n");
+                        return -E1000_ERR_CONFIG;
+                }
+
+                hw->mac.ops.get_link_up_info(hw, &speed, &duplex);
+                if (!speed) {
+                        e_dbg("Speed not set.\n");
+                        return -E1000_ERR_CONFIG;
+                }
+
+                /* Rx Packet Buffer Allocation size (KB) */
+                rxa = er32(PBA) & E1000_PBA_RXA_MASK;
+
+                /* Determine the maximum latency tolerated by the device.
+                 *
+                 * Per the PCIe spec, the tolerated latencies are encoded as
+                 * a 3-bit encoded scale (only 0-5 are valid) multiplied by
+                 * a 10-bit value (0-1023) to provide a range from 1 ns to
+                 * 2^25*(2^10-1) ns.  The scale is encoded as 0=2^0ns,
+                 * 1=2^5ns, 2=2^10ns,...5=2^25ns.
+                 */
+                lat_ns = ((s64)rxa * 1024 -
+                          (2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000;
+                if (lat_ns < 0)
+                        lat_ns = 0;
+                else
+                        do_div(lat_ns, speed);
+
+                value = lat_ns;
+                while (value > PCI_LTR_VALUE_MASK) {
+                        scale++;
+                        value = DIV_ROUND_UP(value, (1 << 5));
+                }
+                if (scale > E1000_LTRV_SCALE_MAX) {
+                        e_dbg("Invalid LTR latency scale %d\n", scale);
+                        return -E1000_ERR_CONFIG;
+                }
+                lat_enc = (u16)((scale << PCI_LTR_SCALE_SHIFT) | value);
+
+                /* Determine the maximum latency tolerated by the platform */
+                pci_read_config_word(hw->adapter->pdev, E1000_PCI_LTR_CAP_LPT,
+                                     &max_snoop);
+                pci_read_config_word(hw->adapter->pdev,
+                                     E1000_PCI_LTR_CAP_LPT + 2, &max_nosnoop);
+                max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
+
+                if (lat_enc > max_ltr_enc)
+                        lat_enc = max_ltr_enc;
+        }
+
+        /* Set Snoop and No-Snoop latencies the same */
+        reg |= lat_enc | (lat_enc << E1000_LTRV_NOSNOOP_SHIFT);
+        ew32(LTRV, reg);
+
+        return 0;
+}
+
+/**
  *  e1000_check_for_copper_link_ich8lan - Check for link (Copper)
  *  @hw: pointer to the HW structure
  *
@@ -871,6 +963,34 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
                         return ret_val;
         }
 
+        /* When connected at 10Mbps half-duplex, 82579 parts are excessively
+         * aggressive resulting in many collisions. To avoid this, increase
+         * the IPG and reduce Rx latency in the PHY.
+         */
+        if ((hw->mac.type == e1000_pch2lan) && link) {
+                u32 reg;
+                reg = er32(STATUS);
+                if (!(reg & (E1000_STATUS_FD | E1000_STATUS_SPEED_MASK))) {
+                        reg = er32(TIPG);
+                        reg &= ~E1000_TIPG_IPGT_MASK;
+                        reg |= 0xFF;
+                        ew32(TIPG, reg);
+
+                        /* Reduce Rx latency in analog PHY */
+                        ret_val = hw->phy.ops.acquire(hw);
+                        if (ret_val)
+                                return ret_val;
+
+                        ret_val =
+                            e1000_write_emi_reg_locked(hw, I82579_RX_CONFIG, 0);
+
+                        hw->phy.ops.release(hw);
+
+                        if (ret_val)
+                                return ret_val;
+                }
+        }
+
         /* Work-around I218 hang issue */
         if ((hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||
             (hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_V)) {
@@ -879,6 +999,15 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
                         return ret_val;
         }
 
+        if (hw->mac.type == e1000_pch_lpt) {
+                /* Set platform power management values for
+                 * Latency Tolerance Reporting (LTR)
+                 */
+                ret_val = e1000_platform_pm_pch_lpt(hw, link);
+                if (ret_val)
+                        return ret_val;
+        }
+
         /* Clear link partner's EEE ability */
         hw->dev_spec.ich8lan.eee_lp_ability = 0;
 
@@ -1002,10 +1131,6 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
             (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
                 adapter->flags2 |= FLAG2_PCIM2PCI_ARBITER_WA;
 
-        /* Disable EEE by default until IEEE802.3az spec is finalized */
-        if (adapter->flags2 & FLAG2_HAS_EEE)
-                adapter->hw.dev_spec.ich8lan.eee_disable = true;
-
         return 0;
 }
 
@@ -1134,9 +1259,9 @@ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
         u32 fwsm;
 
         fwsm = er32(FWSM);
-        return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-               ((fwsm & E1000_FWSM_MODE_MASK) ==
-                (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+        return ((fwsm & E1000_ICH_FWSM_FW_VALID) &&
+                ((fwsm & E1000_FWSM_MODE_MASK) ==
+                 (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT)));
 }
 
 /**
@@ -1153,7 +1278,7 @@ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
 
         fwsm = er32(FWSM);
         return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-               (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+            (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
 }
 
 /**
@@ -1440,8 +1565,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
         word_addr = (u16)(cnf_base_addr << 1);
 
         for (i = 0; i < cnf_size; i++) {
-                ret_val = e1000_read_nvm(hw, (word_addr + i * 2), 1,
-                                         &reg_data);
+                ret_val = e1000_read_nvm(hw, (word_addr + i * 2), 1, &reg_data);
                 if (ret_val)
                         goto release;
 
@@ -1501,13 +1625,13 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
                         if (ret_val)
                                 goto release;
 
-                        status_reg &= BM_CS_STATUS_LINK_UP |
-                                      BM_CS_STATUS_RESOLVED |
-                                      BM_CS_STATUS_SPEED_MASK;
+                        status_reg &= (BM_CS_STATUS_LINK_UP |
+                                       BM_CS_STATUS_RESOLVED |
+                                       BM_CS_STATUS_SPEED_MASK);
 
                         if (status_reg == (BM_CS_STATUS_LINK_UP |
-                                           BM_CS_STATUS_RESOLVED |
-                                           BM_CS_STATUS_SPEED_1000))
+                                           BM_CS_STATUS_RESOLVED |
+                                           BM_CS_STATUS_SPEED_1000))
                                 k1_enable = false;
                 }
 
@@ -1516,13 +1640,13 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
                         if (ret_val)
                                 goto release;
 
-                        status_reg &= HV_M_STATUS_LINK_UP |
-                                      HV_M_STATUS_AUTONEG_COMPLETE |
-                                      HV_M_STATUS_SPEED_MASK;
+                        status_reg &= (HV_M_STATUS_LINK_UP |
+                                       HV_M_STATUS_AUTONEG_COMPLETE |
+                                       HV_M_STATUS_SPEED_MASK);
 
                         if (status_reg == (HV_M_STATUS_LINK_UP |
-                                           HV_M_STATUS_AUTONEG_COMPLETE |
-                                           HV_M_STATUS_SPEED_1000))
+                                           HV_M_STATUS_AUTONEG_COMPLETE |
+                                           HV_M_STATUS_SPEED_1000))
                                 k1_enable = false;
                 }
 
@@ -1579,7 +1703,7 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
         if (ret_val)
                 return ret_val;
 
-        udelay(20);
+        usleep_range(20, 40);
         ctrl_ext = er32(CTRL_EXT);
         ctrl_reg = er32(CTRL);
 
@@ -1589,11 +1713,11 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
 
         ew32(CTRL_EXT, ctrl_ext | E1000_CTRL_EXT_SPD_BYPS);
         e1e_flush();
-        udelay(20);
+        usleep_range(20, 40);
         ew32(CTRL, ctrl_reg);
         ew32(CTRL_EXT, ctrl_ext);
         e1e_flush();
-        udelay(20);
+        usleep_range(20, 40);
 
         return 0;
 }
@@ -1667,7 +1791,6 @@ release:
         return ret_val;
 }
 
-
 /**
  *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
  *  @hw:   pointer to the HW structure
@@ -1834,7 +1957,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                  * SHRAL/H) and initial CRC values to the MAC
                  */
                 for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
-                        u8 mac_addr[ETH_ALEN] = {0};
+                        u8 mac_addr[ETH_ALEN] = { 0 };
                         u32 addr_high, addr_low;
 
                         addr_high = er32(RAH(i));
@@ -1865,8 +1988,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                 ew32(RCTL, mac_reg);
 
                 ret_val = e1000e_read_kmrn_reg(hw,
-                                                E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                                &data);
+                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                               &data);
                 if (ret_val)
                         return ret_val;
                 ret_val = e1000e_write_kmrn_reg(hw,
@@ -1875,8 +1998,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                 if (ret_val)
                         return ret_val;
                 ret_val = e1000e_read_kmrn_reg(hw,
-                                                E1000_KMRNCTRLSTA_HD_CTRL,
-                                                &data);
+                                               E1000_KMRNCTRLSTA_HD_CTRL,
+                                               &data);
                 if (ret_val)
                         return ret_val;
                 data &= ~(0xF << 8);
@@ -1923,8 +2046,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                 ew32(RCTL, mac_reg);
 
                 ret_val = e1000e_read_kmrn_reg(hw,
-                                                E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                                &data);
+                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                               &data);
                 if (ret_val)
                         return ret_val;
                 ret_val = e1000e_write_kmrn_reg(hw,
@@ -1933,8 +2056,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                 if (ret_val)
                         return ret_val;
                 ret_val = e1000e_read_kmrn_reg(hw,
-                                                E1000_KMRNCTRLSTA_HD_CTRL,
-                                                &data);
+                                               E1000_KMRNCTRLSTA_HD_CTRL,
+                                               &data);
                 if (ret_val)
                         return ret_val;
                 data &= ~(0xF << 8);
@@ -2100,7 +2223,7 @@ static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw)
         do {
                 data = er32(STATUS);
                 data &= E1000_STATUS_LAN_INIT_DONE;
-                udelay(100);
+                usleep_range(100, 200);
         } while ((!data) && --loop);
 
         /* If basic configuration is incomplete before the above loop
@@ -2445,7 +2568,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 
                 /* Check bank 0 */
                 ret_val = e1000_read_flash_byte_ich8lan(hw, act_offset,
-                                                        &sig_byte);
+                                                        &sig_byte);
                 if (ret_val)
                         return ret_val;
                 if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
@@ -2456,8 +2579,8 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 
                 /* Check bank 1 */
                 ret_val = e1000_read_flash_byte_ich8lan(hw, act_offset +
-                                                        bank1_offset,
-                                                        &sig_byte);
+                                                        bank1_offset,
+                                                        &sig_byte);
                 if (ret_val)
                         return ret_val;
                 if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
@@ -2510,8 +2633,8 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
         ret_val = 0;
         for (i = 0; i < words; i++) {
-                if (dev_spec->shadow_ram[offset+i].modified) {
-                        data[i] = dev_spec->shadow_ram[offset+i].value;
+                if (dev_spec->shadow_ram[offset + i].modified) {
+                        data[i] = dev_spec->shadow_ram[offset + i].value;
                 } else {
                         ret_val = e1000_read_flash_word_ich8lan(hw,
                                                                 act_offset + i,
@@ -2696,8 +2819,8 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
         if (size < 1  || size > 2 || offset > ICH_FLASH_LINEAR_ADDR_MASK)
                 return -E1000_ERR_NVM;
 
-        flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                            hw->nvm.flash_base_addr;
+        flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +
+                             hw->nvm.flash_base_addr);
 
         do {
                 udelay(1);
@@ -2714,8 +2837,9 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
                 ew32flash(ICH_FLASH_FADDR, flash_linear_addr);
 
-                ret_val = e1000_flash_cycle_ich8lan(hw,
-                                                ICH_FLASH_READ_COMMAND_TIMEOUT);
+                ret_val =
+                    e1000_flash_cycle_ich8lan(hw,
+                                              ICH_FLASH_READ_COMMAND_TIMEOUT);
 
                 /* Check if FCERR is set to 1, if set to 1, clear it
                  * and try the whole sequence a few more times, else
@@ -2774,8 +2898,8 @@ static s32 e1000_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
         nvm->ops.acquire(hw);
 
         for (i = 0; i < words; i++) {
-                dev_spec->shadow_ram[offset+i].modified = true;
-                dev_spec->shadow_ram[offset+i].value = data[i];
+                dev_spec->shadow_ram[offset + i].modified = true;
+                dev_spec->shadow_ram[offset + i].value = data[i];
         }
 
         nvm->ops.release(hw);
@@ -2844,8 +2968,8 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                         data = dev_spec->shadow_ram[i].value;
                 } else {
                         ret_val = e1000_read_flash_word_ich8lan(hw, i +
-                                                                old_bank_offset,
-                                                                &data);
+                                                                old_bank_offset,
+                                                                &data);
                         if (ret_val)
                                 break;
                 }
@@ -2863,7 +2987,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                 /* Convert offset to bytes. */
                 act_offset = (i + new_bank_offset) << 1;
 
-                udelay(100);
+                usleep_range(100, 200);
                 /* Write the bytes to the new bank. */
                 ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
                                                                act_offset,
@@ -2871,10 +2995,10 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                 if (ret_val)
                         break;
 
-                udelay(100);
+                usleep_range(100, 200);
                 ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
-                                                          act_offset + 1,
-                                                          (u8)(data >> 8));
+                                                               act_offset + 1,
+                                                               (u8)(data >> 8));
                 if (ret_val)
                         break;
         }
@@ -3050,8 +3174,8 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
             offset > ICH_FLASH_LINEAR_ADDR_MASK)
                 return -E1000_ERR_NVM;
 
-        flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                            hw->nvm.flash_base_addr;
+        flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +
+                             hw->nvm.flash_base_addr);
 
         do {
                 udelay(1);
@@ -3062,7 +3186,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
                 hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
                 /* 0b/1b corresponds to 1 or 2 byte size, respectively. */
-                hsflctl.hsf_ctrl.fldbcount = size -1;
+                hsflctl.hsf_ctrl.fldbcount = size - 1;
                 hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_WRITE;
                 ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
 
@@ -3078,8 +3202,9 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                 /* check if FCERR is set to 1 , if set to 1, clear it
                  * and try the whole sequence a few more times else done
                  */
-                ret_val = e1000_flash_cycle_ich8lan(hw,
-                                               ICH_FLASH_WRITE_COMMAND_TIMEOUT);
+                ret_val =
+                    e1000_flash_cycle_ich8lan(hw,
+                                              ICH_FLASH_WRITE_COMMAND_TIMEOUT);
                 if (!ret_val)
                         break;
 
@@ -3138,7 +3263,7 @@ static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
 
         for (program_retries = 0; program_retries < 100; program_retries++) {
                 e_dbg("Retrying Byte %2.2X at offset %u\n", byte, offset);
-                udelay(100);
+                usleep_range(100, 200);
                 ret_val = e1000_write_flash_byte_ich8lan(hw, offset, byte);
                 if (!ret_val)
                         break;
@@ -3209,8 +3334,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
         flash_linear_addr = hw->nvm.flash_base_addr;
         flash_linear_addr += (bank) ? flash_bank_size : 0;
 
-        for (j = 0; j < iteration ; j++) {
+        for (j = 0; j < iteration; j++) {
                 do {
+                        u32 timeout = ICH_FLASH_ERASE_COMMAND_TIMEOUT;
+
                         /* Steps */
                         ret_val = e1000_flash_cycle_init_ich8lan(hw);
                         if (ret_val)
@@ -3230,8 +3357,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
                         flash_linear_addr += (j * sector_size);
                         ew32flash(ICH_FLASH_FADDR, flash_linear_addr);
 
-                        ret_val = e1000_flash_cycle_ich8lan(hw,
-                                               ICH_FLASH_ERASE_COMMAND_TIMEOUT);
+                        ret_val = e1000_flash_cycle_ich8lan(hw, timeout);
                         if (!ret_val)
                                 break;
 
@@ -3270,8 +3396,7 @@ static s32 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
                 return ret_val;
         }
 
-        if (*data == ID_LED_RESERVED_0000 ||
-            *data == ID_LED_RESERVED_FFFF)
+        if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
                 *data = ID_LED_DEFAULT_ICH8LAN;
 
         return 0;
@@ -3511,9 +3636,9 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
 
         /* Initialize identification LED */
         ret_val = mac->ops.id_led_init(hw);
+        /* An error is not fatal and we should not stop init due to this */
         if (ret_val)
                 e_dbg("Error initializing identification LED\n");
-                /* This is not fatal and we should not stop init due to this */
 
         /* Setup the receive address. */
         e1000e_init_rx_addrs(hw, mac->rar_entry_count);
@@ -3541,16 +3666,16 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
 
         /* Set the transmit descriptor write-back policy for both queues */
         txdctl = er32(TXDCTL(0));
-        txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                 E1000_TXDCTL_FULL_TX_DESC_WB;
-        txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-                 E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
+        txdctl = ((txdctl & ~E1000_TXDCTL_WTHRESH) |
+                  E1000_TXDCTL_FULL_TX_DESC_WB);
+        txdctl = ((txdctl & ~E1000_TXDCTL_PTHRESH) |
+                  E1000_TXDCTL_MAX_TX_DESC_PREFETCH);
         ew32(TXDCTL(0), txdctl);
         txdctl = er32(TXDCTL(1));
-        txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                 E1000_TXDCTL_FULL_TX_DESC_WB;
-        txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-                 E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
+        txdctl = ((txdctl & ~E1000_TXDCTL_WTHRESH) |
+                  E1000_TXDCTL_FULL_TX_DESC_WB);
+        txdctl = ((txdctl & ~E1000_TXDCTL_PTHRESH) |
+                  E1000_TXDCTL_MAX_TX_DESC_PREFETCH);
         ew32(TXDCTL(1), txdctl);
 
         /* ICH8 has opposite polarity of no_snoop bits.
@@ -3559,7 +3684,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
         if (mac->type == e1000_ich8lan)
                 snoop = PCIE_ICH8_SNOOP_ALL;
         else
-                snoop = (u32) ~(PCIE_NO_SNOOP_ALL);
+                snoop = (u32)~(PCIE_NO_SNOOP_ALL);
         e1000e_set_pcie_no_snoop(hw, snoop);
 
         ctrl_ext = er32(CTRL_EXT);
@@ -3575,6 +3700,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
 
         return ret_val;
 }
+
 /**
  *  e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits
  *  @hw: pointer to the HW structure
@@ -3686,8 +3812,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
          */
         hw->fc.current_mode = hw->fc.requested_mode;
 
-        e_dbg("After fix-ups FlowControl is now = %x\n",
-                hw->fc.current_mode);
+        e_dbg("After fix-ups FlowControl is now = %x\n", hw->fc.current_mode);
 
         /* Continue to configure the copper link. */
         ret_val = hw->mac.ops.setup_physical_interface(hw);
@@ -3737,12 +3862,12 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
         ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                       &reg_data);
+                                       &reg_data);
         if (ret_val)
                 return ret_val;
         reg_data |= 0x3F;
         ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                        reg_data);
+                                        reg_data);
         if (ret_val)
                 return ret_val;
 
@@ -3760,7 +3885,6 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
                 break;
         case e1000_phy_82577:
         case e1000_phy_82579:
-        case e1000_phy_i217:
                 ret_val = e1000_copper_link_setup_82577(hw);
                 if (ret_val)
                         return ret_val;
@@ -3796,6 +3920,31 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
 }
 
 /**
+ *  e1000_setup_copper_link_pch_lpt - Configure MAC/PHY interface
+ *  @hw: pointer to the HW structure
+ *
+ *  Calls the PHY specific link setup function and then calls the
+ *  generic setup_copper_link to finish configuring the link for
+ *  Lynxpoint PCH devices
+ **/
+static s32 e1000_setup_copper_link_pch_lpt(struct e1000_hw *hw)
+{
+        u32 ctrl;
+        s32 ret_val;
+
+        ctrl = er32(CTRL);
+        ctrl |= E1000_CTRL_SLU;
+        ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
+        ew32(CTRL, ctrl);
+
+        ret_val = e1000_copper_link_setup_82577(hw);
+        if (ret_val)
+                return ret_val;
+
+        return e1000e_setup_copper_link(hw);
+}
+
+/**
  *  e1000_get_link_up_info_ich8lan - Get current link speed and duplex
  *  @hw: pointer to the HW structure
  *  @speed: pointer to store current link speed
@@ -3815,8 +3964,7 @@ static s32 e1000_get_link_up_info_ich8lan(struct e1000_hw *hw, u16 *speed,
                 return ret_val;
 
         if ((hw->mac.type == e1000_ich8lan) &&
-            (hw->phy.type == e1000_phy_igp_3) &&
-            (*speed == SPEED_1000)) {
+            (hw->phy.type == e1000_phy_igp_3) && (*speed == SPEED_1000)) {
                 ret_val = e1000_kmrn_lock_loss_workaround_ich8lan(hw);
         }
 
@@ -3899,7 +4047,7 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
  *  /disabled - false).
  **/
 void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
-                                                 bool state)
+                                                  bool state)
 {
         struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
 
@@ -3981,12 +4129,12 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
                 return;
 
         ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                      &reg_data);
+                                       &reg_data);
         if (ret_val)
                 return;
         reg_data |= E1000_KMRNCTRLSTA_DIAG_NELPBK;
         ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                       reg_data);
+                                        reg_data);
         if (ret_val)
                 return;
         reg_data &= ~E1000_KMRNCTRLSTA_DIAG_NELPBK;
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.h b/drivers/net/ethernet/intel/e1000e/ich8lan.h
index 8bf4655c2e17..80034a2b297c 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.h
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.h
@@ -211,7 +211,8 @@
 #define I82579_MSE_THRESHOLD    0x084F  /* 82579 Mean Square Error Threshold */
 #define I82577_MSE_THRESHOLD    0x0887  /* 82577 Mean Square Error Threshold */
 #define I82579_MSE_LINK_DOWN    0x2411  /* MSE count before dropping link */
-#define I82579_EEE_PCS_STATUS           0x182D  /* IEEE MMD Register 3.1 >> 8 */
+#define I82579_RX_CONFIG                0x3412  /* Receive configuration */
+#define I82579_EEE_PCS_STATUS           0x182E  /* IEEE MMD Register 3.1 >> 8 */
 #define I82579_EEE_CAPABILITY           0x0410  /* IEEE MMD Register 3.20 */
 #define I82579_EEE_ADVERTISEMENT        0x040E  /* IEEE MMD Register 7.60 */
 #define I82579_EEE_LP_ABILITY           0x040F  /* IEEE MMD Register 7.61 */
@@ -249,13 +250,6 @@
 /* Proprietary Latency Tolerance Reporting PCI Capability */
 #define E1000_PCI_LTR_CAP_LPT           0xA8
 
-/* OBFF Control & Threshold Defines */
-#define E1000_SVCR_OFF_EN               0x00000001
-#define E1000_SVCR_OFF_MASKINT          0x00001000
-#define E1000_SVCR_OFF_TIMER_MASK       0xFFFF0000
-#define E1000_SVCR_OFF_TIMER_SHIFT      16
-#define E1000_SVT_OFF_HWM_MASK          0x0000001F
-
 void e1000e_write_protect_nvm_ich8lan(struct e1000_hw *hw);
 void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
                                                   bool state);
@@ -267,4 +261,5 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
 void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw);
 s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
 s32 e1000_read_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 *data);
+s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data);
 #endif /* _E1000E_ICH8LAN_H_ */
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index b78e02174601..2480c1091873 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -596,7 +596,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                  * serdes media type.
                  */
                 /* SYNCH bit and IV bit are sticky. */
-                udelay(10);
+                usleep_range(10, 20);
                 rxcw = er32(RXCW);
                 if (rxcw & E1000_RXCW_SYNCH) {
                         if (!(rxcw & E1000_RXCW_IV)) {
@@ -613,7 +613,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                 status = er32(STATUS);
                 if (status & E1000_STATUS_LU) {
                         /* SYNCH bit and IV bit are sticky, so reread rxcw. */
-                        udelay(10);
+                        usleep_range(10, 20);
                         rxcw = er32(RXCW);
                         if (rxcw & E1000_RXCW_SYNCH) {
                                 if (!(rxcw & E1000_RXCW_IV)) {
@@ -1382,7 +1382,7 @@ s32 e1000e_get_hw_semaphore(struct e1000_hw *hw)
                 if (!(swsm & E1000_SWSM_SMBI))
                         break;
 
-                udelay(50);
+                usleep_range(50, 100);
                 i++;
         }
 
@@ -1400,7 +1400,7 @@ s32 e1000e_get_hw_semaphore(struct e1000_hw *hw)
                 if (er32(SWSM) & E1000_SWSM_SWESMBI)
                         break;
 
-                udelay(50);
+                usleep_range(50, 100);
         }
 
         if (i == timeout) {
@@ -1600,15 +1600,28 @@ s32 e1000e_blink_led_generic(struct e1000_hw *hw)
                 ledctl_blink = E1000_LEDCTL_LED0_BLINK |
                     (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
         } else {
-                /* set the blink bit for each LED that's "on" (0x0E)
-                 * in ledctl_mode2
+                /* Set the blink bit for each LED that's "on" (0x0E)
+                 * (or "off" if inverted) in ledctl_mode2.  The blink
+                 * logic in hardware only works when mode is set to "on"
+                 * so it must be changed accordingly when the mode is
+                 * "off" and inverted.
                  */
                 ledctl_blink = hw->mac.ledctl_mode2;
-                for (i = 0; i < 4; i++)
-                        if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
-                            E1000_LEDCTL_MODE_LED_ON)
-                                ledctl_blink |= (E1000_LEDCTL_LED0_BLINK <<
-                                                 (i * 8));
+                for (i = 0; i < 32; i += 8) {
+                        u32 mode = (hw->mac.ledctl_mode2 >> i) &
+                            E1000_LEDCTL_LED0_MODE_MASK;
+                        u32 led_default = hw->mac.ledctl_default >> i;
+
+                        if ((!(led_default & E1000_LEDCTL_LED0_IVRT) &&
+                             (mode == E1000_LEDCTL_MODE_LED_ON)) ||
+                            ((led_default & E1000_LEDCTL_LED0_IVRT) &&
+                             (mode == E1000_LEDCTL_MODE_LED_OFF))) {
+                                ledctl_blink &=
+                                    ~(E1000_LEDCTL_LED0_MODE_MASK << i);
+                                ledctl_blink |= (E1000_LEDCTL_LED0_BLINK |
+                                                 E1000_LEDCTL_MODE_LED_ON) << i;
+                        }
+                }
         }
 
         ew32(LEDCTL, ledctl_blink);
@@ -1712,7 +1725,7 @@ s32 e1000e_disable_pcie_master(struct e1000_hw *hw)
         while (timeout) {
                 if (!(er32(STATUS) & E1000_STATUS_GIO_MASTER_ENABLE))
                         break;
-                udelay(100);
+                usleep_range(100, 200);
                 timeout--;
         }
 
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 7e615e2bf7e6..a27e3bcc3249 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -55,7 +55,7 @@
 
 #define DRV_EXTRAVERSION "-k"
 
-#define DRV_VERSION "2.2.14" DRV_EXTRAVERSION
+#define DRV_VERSION "2.3.2" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -219,9 +219,8 @@ static void e1000e_dump(struct e1000_adapter *adapter)
         if (netdev) {
                 dev_info(&adapter->pdev->dev, "Net device Info\n");
                 pr_info("Device Name     state            trans_start      last_rx\n");
-                pr_info("%-15s %016lX %016lX %016lX\n",
-                        netdev->name, netdev->state, netdev->trans_start,
-                        netdev->last_rx);
+                pr_info("%-15s %016lX %016lX %016lX\n", netdev->name,
+                        netdev->state, netdev->trans_start, netdev->last_rx);
         }
 
         /* Print Registers */
@@ -555,7 +554,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
         skb->protocol = eth_type_trans(skb, netdev);
 
         if (staterr & E1000_RXD_STAT_VP)
-                __vlan_hwaccel_put_tag(skb, tag);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), tag);
 
         napi_gro_receive(&adapter->napi, skb);
 }
@@ -755,8 +754,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_ring *rx_ring,
                             cpu_to_le64(ps_page->dma);
                 }
 
-                skb = __netdev_alloc_skb_ip_align(netdev,
-                                                  adapter->rx_ps_bsize0,
+                skb = __netdev_alloc_skb_ip_align(netdev, adapter->rx_ps_bsize0,
                                                   gfp);
 
                 if (!skb) {
@@ -850,8 +848,8 @@ check_page:
 
                 if (!buffer_info->dma) {
                         buffer_info->dma = dma_map_page(&pdev->dev,
-                                                        buffer_info->page, 0,
-                                                        PAGE_SIZE,
+                                                        buffer_info->page, 0,
+                                                        PAGE_SIZE,
                                                         DMA_FROM_DEVICE);
                         if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
                                 adapter->alloc_rx_buff_failed++;
@@ -942,10 +940,8 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
 
                 cleaned = true;
                 cleaned_count++;
-                dma_unmap_single(&pdev->dev,
-                                 buffer_info->dma,
-                                 adapter->rx_buffer_len,
-                                 DMA_FROM_DEVICE);
+                dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                 adapter->rx_buffer_len, DMA_FROM_DEVICE);
                 buffer_info->dma = 0;
 
                 length = le16_to_cpu(rx_desc->wb.upper.length);
@@ -1073,8 +1069,8 @@ static void e1000_put_txbuf(struct e1000_ring *tx_ring,
 static void e1000_print_hw_hang(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
-                                                     struct e1000_adapter,
-                                                     print_hang_task);
+                                                     struct e1000_adapter,
+                                                     print_hang_task);
         struct net_device *netdev = adapter->netdev;
         struct e1000_ring *tx_ring = adapter->tx_ring;
         unsigned int i = tx_ring->next_to_clean;
@@ -1087,8 +1083,7 @@ static void e1000_print_hw_hang(struct work_struct *work)
         if (test_bit(__E1000_DOWN, &adapter->state))
                 return;
 
-        if (!adapter->tx_hang_recheck &&
-            (adapter->flags2 & FLAG2_DMA_BURST)) {
+        if (!adapter->tx_hang_recheck && (adapter->flags2 & FLAG2_DMA_BURST)) {
                 /* May be block on write-back, flush and detect again
                  * flush pending descriptor writebacks to memory
                  */
@@ -1130,19 +1125,10 @@ static void e1000_print_hw_hang(struct work_struct *work)
               "PHY 1000BASE-T Status  <%x>\n"
               "PHY Extended Status    <%x>\n"
               "PCI Status             <%x>\n",
-              readl(tx_ring->head),
-              readl(tx_ring->tail),
-              tx_ring->next_to_use,
-              tx_ring->next_to_clean,
-              tx_ring->buffer_info[eop].time_stamp,
-              eop,
-              jiffies,
-              eop_desc->upper.fields.status,
-              er32(STATUS),
-              phy_status,
-              phy_1000t_status,
-              phy_ext_status,
-              pci_status);
+              readl(tx_ring->head), readl(tx_ring->tail), tx_ring->next_to_use,
+              tx_ring->next_to_clean, tx_ring->buffer_info[eop].time_stamp,
+              eop, jiffies, eop_desc->upper.fields.status, er32(STATUS),
+              phy_status, phy_1000t_status, phy_ext_status, pci_status);
 
         /* Suggest workaround for known h/w issue */
         if ((hw->mac.type == e1000_pchlan) && (er32(CTRL) & E1000_CTRL_TFCE))
@@ -1435,7 +1421,7 @@ copydone:
                 e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
                 if (rx_desc->wb.upper.header_status &
-                           cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
+                    cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
                         adapter->rx_hdr_split++;
 
                 e1000_receive_skb(adapter, netdev, skb, staterr,
@@ -1473,7 +1459,7 @@ next_desc:
  * e1000_consume_page - helper function
  **/
 static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
-                               u16 length)
+                               u16 length)
 {
         bi->page = NULL;
         skb->len += length;
@@ -1500,7 +1486,8 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
         unsigned int i;
         int cleaned_count = 0;
         bool cleaned = false;
-        unsigned int total_rx_bytes=0, total_rx_packets=0;
+        unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+        struct skb_shared_info *shinfo;
 
         i = rx_ring->next_to_clean;
         rx_desc = E1000_RX_DESC_EXT(*rx_ring, i);
@@ -1546,7 +1533,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                         rx_ring->rx_skb_top = NULL;
                         goto next_desc;
                 }
-
 #define rxtop (rx_ring->rx_skb_top)
                 if (!(staterr & E1000_RXD_STAT_EOP)) {
                         /* this descriptor is only the beginning (or middle) */
@@ -1554,12 +1540,13 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                 /* this is the beginning of a chain */
                                 rxtop = skb;
                                 skb_fill_page_desc(rxtop, 0, buffer_info->page,
-                                                   0, length);
+                                                   0, length);
                         } else {
                                 /* this is the middle of a chain */
-                                skb_fill_page_desc(rxtop,
-                                    skb_shinfo(rxtop)->nr_frags,
-                                    buffer_info->page, 0, length);
+                                shinfo = skb_shinfo(rxtop);
+                                skb_fill_page_desc(rxtop, shinfo->nr_frags,
+                                                   buffer_info->page, 0,
+                                                   length);
                                 /* re-use the skb, only consumed the page */
                                 buffer_info->skb = skb;
                         }
@@ -1568,9 +1555,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                 } else {
                         if (rxtop) {
                                 /* end of the chain */
-                                skb_fill_page_desc(rxtop,
-                                    skb_shinfo(rxtop)->nr_frags,
-                                    buffer_info->page, 0, length);
+                                shinfo = skb_shinfo(rxtop);
+                                skb_fill_page_desc(rxtop, shinfo->nr_frags,
+                                                   buffer_info->page, 0,
+                                                   length);
                                 /* re-use the current skb, we only consumed the
                                  * page
                                  */
@@ -1595,10 +1583,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                         skb_put(skb, length);
                                 } else {
                                         skb_fill_page_desc(skb, 0,
-                                                           buffer_info->page, 0,
-                                                           length);
+                                                           buffer_info->page, 0,
+                                                           length);
                                         e1000_consume_page(buffer_info, skb,
-                                                           length);
+                                                           length);
                                 }
                         }
                 }
@@ -1671,8 +1659,7 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
                                                  DMA_FROM_DEVICE);
                         else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq)
                                 dma_unmap_page(&pdev->dev, buffer_info->dma,
-                                               PAGE_SIZE,
-                                               DMA_FROM_DEVICE);
+                                               PAGE_SIZE, DMA_FROM_DEVICE);
                         else if (adapter->clean_rx == e1000_clean_rx_irq_ps)
                                 dma_unmap_single(&pdev->dev, buffer_info->dma,
                                                  adapter->rx_ps_bsize0,
@@ -1725,7 +1712,8 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
 static void e1000e_downshift_workaround(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
-                                        struct e1000_adapter, downshift_task);
+                                                     struct e1000_adapter,
+                                                     downshift_task);
 
         if (test_bit(__E1000_DOWN, &adapter->state))
                 return;
@@ -1918,7 +1906,6 @@ static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data)
         struct e1000_hw *hw = &adapter->hw;
         struct e1000_ring *tx_ring = adapter->tx_ring;
 
-
         adapter->total_tx_bytes = 0;
         adapter->total_tx_packets = 0;
 
@@ -1975,7 +1962,6 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)
                 ew32(RFCTL, rfctl);
         }
 
-#define E1000_IVAR_INT_ALLOC_VALID      0x8
         /* Configure Rx vector */
         rx_ring->ims_val = E1000_IMS_RXQ0;
         adapter->eiac_mask |= rx_ring->ims_val;
@@ -2050,8 +2036,9 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
                 if (adapter->flags & FLAG_HAS_MSIX) {
                         adapter->num_vectors = 3; /* RxQ0, TxQ0 and other */
                         adapter->msix_entries = kcalloc(adapter->num_vectors,
-                                                      sizeof(struct msix_entry),
-                                                      GFP_KERNEL);
+                                                        sizeof(struct
+                                                               msix_entry),
+                                                        GFP_KERNEL);
                         if (adapter->msix_entries) {
                                 for (i = 0; i < adapter->num_vectors; i++)
                                         adapter->msix_entries[i].entry = i;
@@ -2495,7 +2482,7 @@ static unsigned int e1000_update_itr(u16 itr_setting, int packets, int bytes)
         switch (itr_setting) {
         case lowest_latency:
                 /* handle TSO and jumbo frames */
-                if (bytes/packets > 8000)
+                if (bytes / packets > 8000)
                         retval = bulk_latency;
                 else if ((packets < 5) && (bytes > 512))
                         retval = low_latency;
@@ -2503,13 +2490,13 @@ static unsigned int e1000_update_itr(u16 itr_setting, int packets, int bytes)
         case low_latency:  /* 50 usec aka 20000 ints/s */
                 if (bytes > 10000) {
                         /* this if handles the TSO accounting */
-                        if (bytes/packets > 8000)
+                        if (bytes / packets > 8000)
                                 retval = bulk_latency;
-                        else if ((packets < 10) || ((bytes/packets) > 1200))
+                        else if ((packets < 10) || ((bytes / packets) > 1200))
                                 retval = bulk_latency;
                         else if ((packets > 35))
                                 retval = lowest_latency;
-                } else if (bytes/packets > 2000) {
+                } else if (bytes / packets > 2000) {
                         retval = bulk_latency;
                 } else if (packets <= 2 && bytes < 512) {
                         retval = lowest_latency;
@@ -2561,8 +2548,8 @@ static void e1000_set_itr(struct e1000_adapter *adapter)
 
         current_itr = max(adapter->rx_itr, adapter->tx_itr);
 
-        switch (current_itr) {
         /* counts and packets in update_itr are dependent on these numbers */
+        switch (current_itr) {
         case lowest_latency:
                 new_itr = 70000;
                 break;
@@ -2583,8 +2570,7 @@ set_itr_now:
                  * increasing
                  */
                 new_itr = new_itr > adapter->itr ?
-                             min(adapter->itr + (new_itr >> 2), new_itr) :
-                             new_itr;
+                    min(adapter->itr + (new_itr >> 2), new_itr) : new_itr;
                 adapter->itr = new_itr;
                 adapter->rx_ring->itr_val = new_itr;
                 if (adapter->msix_entries)
@@ -2686,7 +2672,8 @@ static int e1000e_poll(struct napi_struct *napi, int weight)
         return work_done;
 }
 
-static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+static int e1000_vlan_rx_add_vid(struct net_device *netdev,
+                                 __be16 proto, u16 vid)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -2711,7 +2698,8 @@ static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         return 0;
 }
 
-static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
+                                  __be16 proto, u16 vid)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -2755,7 +2743,8 @@ static void e1000e_vlan_filter_disable(struct e1000_adapter *adapter)
                 ew32(RCTL, rctl);
 
                 if (adapter->mng_vlan_id != (u16)E1000_MNG_VLAN_NONE) {
-                        e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
+                        e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
+                                               adapter->mng_vlan_id);
                         adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
                 }
         }
@@ -2815,24 +2804,23 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
         u16 vid = adapter->hw.mng_cookie.vlan_id;
         u16 old_vid = adapter->mng_vlan_id;
 
-        if (adapter->hw.mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
-                e1000_vlan_rx_add_vid(netdev, vid);
+        if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
+                e1000_vlan_rx_add_vid(netdev, htons(ETH_P_8021Q), vid);
                 adapter->mng_vlan_id = vid;
         }
 
         if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && (vid != old_vid))
-                e1000_vlan_rx_kill_vid(netdev, old_vid);
+                e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q), old_vid);
 }
 
 static void e1000_restore_vlan(struct e1000_adapter *adapter)
 {
         u16 vid;
 
-        e1000_vlan_rx_add_vid(adapter->netdev, 0);
+        e1000_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                e1000_vlan_rx_add_vid(adapter->netdev, vid);
+            e1000_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 }
 
 static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
@@ -3007,8 +2995,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         rctl = er32(RCTL);
         rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
         rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
-                E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-                (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
+            E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+            (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
 
         /* Do not Store bad packets */
         rctl &= ~E1000_RCTL_SBP;
@@ -3094,19 +3082,17 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                 /* Enable Packet split descriptors */
                 rctl |= E1000_RCTL_DTYP_PS;
 
-                psrctl |= adapter->rx_ps_bsize0 >>
-                        E1000_PSRCTL_BSIZE0_SHIFT;
+                psrctl |= adapter->rx_ps_bsize0 >> E1000_PSRCTL_BSIZE0_SHIFT;
 
                 switch (adapter->rx_ps_pages) {
                 case 3:
-                        psrctl |= PAGE_SIZE <<
-                                E1000_PSRCTL_BSIZE3_SHIFT;
+                        psrctl |= PAGE_SIZE << E1000_PSRCTL_BSIZE3_SHIFT;
+                        /* fall-through */
                 case 2:
-                        psrctl |= PAGE_SIZE <<
-                                E1000_PSRCTL_BSIZE2_SHIFT;
+                        psrctl |= PAGE_SIZE << E1000_PSRCTL_BSIZE2_SHIFT;
+                        /* fall-through */
                 case 1:
-                        psrctl |= PAGE_SIZE >>
-                                E1000_PSRCTL_BSIZE1_SHIFT;
+                        psrctl |= PAGE_SIZE >> E1000_PSRCTL_BSIZE1_SHIFT;
                         break;
                 }
 
@@ -3280,7 +3266,7 @@ static int e1000e_write_mc_addr_list(struct net_device *netdev)
         /* update_mc_addr_list expects a packed array of only addresses. */
         i = 0;
         netdev_for_each_mc_addr(ha, netdev)
-                memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
+            memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
 
         hw->mac.ops.update_mc_addr_list(hw, mta_list, i);
         kfree(mta_list);
@@ -3390,7 +3376,7 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
 
         ew32(RCTL, rctl);
 
-        if (netdev->features & NETIF_F_HW_VLAN_RX)
+        if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 e1000e_vlan_strip_enable(adapter);
         else
                 e1000e_vlan_strip_disable(adapter);
@@ -3757,8 +3743,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                  * but don't include ethernet FCS because hardware appends it
                  */
                 min_tx_space = (adapter->max_frame_size +
-                                sizeof(struct e1000_tx_desc) -
-                                ETH_FCS_LEN) * 2;
+                                sizeof(struct e1000_tx_desc) - ETH_FCS_LEN) * 2;
                 min_tx_space = ALIGN(min_tx_space, 1024);
                 min_tx_space >>= 10;
                 /* software strips receive CRC, so leave room for it */
@@ -3861,13 +3846,13 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 if ((adapter->max_frame_size * 2) > (pba << 10)) {
                         if (!(adapter->flags2 & FLAG2_DISABLE_AIM)) {
                                 dev_info(&adapter->pdev->dev,
-                                        "Interrupt Throttle Rate turned off\n");
+                                         "Interrupt Throttle Rate off\n");
                                 adapter->flags2 |= FLAG2_DISABLE_AIM;
                                 e1000e_write_itr(adapter, 0);
                         }
                 } else if (adapter->flags2 & FLAG2_DISABLE_AIM) {
                         dev_info(&adapter->pdev->dev,
-                                 "Interrupt Throttle Rate turned on\n");
+                                 "Interrupt Throttle Rate on\n");
                         adapter->flags2 &= ~FLAG2_DISABLE_AIM;
                         adapter->itr = 20000;
                         e1000e_write_itr(adapter, adapter->itr);
@@ -3898,6 +3883,38 @@ void e1000e_reset(struct e1000_adapter *adapter)
         /* initialize systim and reset the ns time counter */
         e1000e_config_hwtstamp(adapter);
 
+        /* Set EEE advertisement as appropriate */
+        if (adapter->flags2 & FLAG2_HAS_EEE) {
+                s32 ret_val;
+                u16 adv_addr;
+
+                switch (hw->phy.type) {
+                case e1000_phy_82579:
+                        adv_addr = I82579_EEE_ADVERTISEMENT;
+                        break;
+                case e1000_phy_i217:
+                        adv_addr = I217_EEE_ADVERTISEMENT;
+                        break;
+                default:
+                        dev_err(&adapter->pdev->dev,
+                                "Invalid PHY type setting EEE advertisement\n");
+                        return;
+                }
+
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val) {
+                        dev_err(&adapter->pdev->dev,
+                                "EEE advertisement - unable to acquire PHY\n");
+                        return;
+                }
+
+                e1000_write_emi_reg_locked(hw, adv_addr,
+                                           hw->dev_spec.ich8lan.eee_disable ?
+                                           0 : adapter->eee_advert);
+
+                hw->phy.ops.release(hw);
+        }
+
         if (!netif_running(adapter->netdev) &&
             !test_bit(__E1000_TESTING, &adapter->state)) {
                 e1000_power_down_phy(adapter);
@@ -3999,6 +4016,8 @@ void e1000e_down(struct e1000_adapter *adapter)
 
         e1000_irq_disable(adapter);
 
+        napi_synchronize(&adapter->napi);
+
         del_timer_sync(&adapter->watchdog_timer);
         del_timer_sync(&adapter->phy_info_timer);
 
@@ -4266,8 +4285,7 @@ static int e1000_open(struct net_device *netdev)
         e1000e_power_up_phy(adapter);
 
         adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-        if ((adapter->hw.mng_cookie.status &
-             E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
+        if ((adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
                 e1000_update_mng_vlan(adapter);
 
         /* DMA latency requirement to workaround jumbo issue */
@@ -4356,12 +4374,13 @@ static int e1000_close(struct net_device *netdev)
 
         pm_runtime_get_sync(&pdev->dev);
 
-        napi_disable(&adapter->napi);
-
         if (!test_bit(__E1000_DOWN, &adapter->state)) {
                 e1000e_down(adapter);
                 e1000_free_irq(adapter);
         }
+
+        napi_disable(&adapter->napi);
+
         e1000_power_down_phy(adapter);
 
         e1000e_free_tx_resources(adapter->tx_ring);
@@ -4370,9 +4389,9 @@ static int e1000_close(struct net_device *netdev)
         /* kill manageability vlan ID if supported, but not if a vlan with
          * the same ID is registered on the host OS (let 8021q kill it)
          */
-        if (adapter->hw.mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN)
-                e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
+        if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN)
+                e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
+                                       adapter->mng_vlan_id);
 
         /* If AMT is enabled, let the firmware know that the network
          * interface is now closed
@@ -4387,6 +4406,7 @@ static int e1000_close(struct net_device *netdev)
 
         return 0;
 }
+
 /**
  * e1000_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
@@ -4437,7 +4457,8 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
 static void e1000e_update_phy_task(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
-                                        struct e1000_adapter, update_phy_task);
+                                                     struct e1000_adapter,
+                                                     update_phy_task);
 
         if (test_bit(__E1000_DOWN, &adapter->state))
                 return;
@@ -4454,7 +4475,7 @@ static void e1000e_update_phy_task(struct work_struct *work)
  **/
 static void e1000_update_phy_info(unsigned long data)
 {
-        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+        struct e1000_adapter *adapter = (struct e1000_adapter *)data;
 
         if (test_bit(__E1000_DOWN, &adapter->state))
                 return;
@@ -4621,18 +4642,16 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
          * our own version based on RUC and ROC
          */
         netdev->stats.rx_errors = adapter->stats.rxerrc +
-                adapter->stats.crcerrs + adapter->stats.algnerrc +
-                adapter->stats.ruc + adapter->stats.roc +
-                adapter->stats.cexterr;
+            adapter->stats.crcerrs + adapter->stats.algnerrc +
+            adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;
         netdev->stats.rx_length_errors = adapter->stats.ruc +
-                                              adapter->stats.roc;
+            adapter->stats.roc;
         netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
         netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
         netdev->stats.rx_missed_errors = adapter->stats.mpc;
 
         /* Tx Errors */
-        netdev->stats.tx_errors = adapter->stats.ecol +
-                                       adapter->stats.latecol;
+        netdev->stats.tx_errors = adapter->stats.ecol + adapter->stats.latecol;
         netdev->stats.tx_aborted_errors = adapter->stats.ecol;
         netdev->stats.tx_window_errors = adapter->stats.latecol;
         netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
@@ -4790,7 +4809,7 @@ static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
  **/
 static void e1000_watchdog(unsigned long data)
 {
-        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+        struct e1000_adapter *adapter = (struct e1000_adapter *)data;
 
         /* Do the rest outside of interrupt context */
         schedule_work(&adapter->watchdog_task);
@@ -4801,7 +4820,8 @@ static void e1000_watchdog(unsigned long data)
 static void e1000_watchdog_task(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
-                                        struct e1000_adapter, watchdog_task);
+                                                     struct e1000_adapter,
+                                                     watchdog_task);
         struct net_device *netdev = adapter->netdev;
         struct e1000_mac_info *mac = &adapter->hw.mac;
         struct e1000_phy_info *phy = &adapter->hw.phy;
@@ -4835,8 +4855,8 @@ static void e1000_watchdog_task(struct work_struct *work)
                         /* update snapshot of PHY registers on LSC */
                         e1000_phy_read_status(adapter);
                         mac->ops.get_link_up_info(&adapter->hw,
-                                                   &adapter->link_speed,
-                                                   &adapter->link_duplex);
+                                                  &adapter->link_speed,
+                                                  &adapter->link_duplex);
                         e1000_print_link_info(adapter);
 
                         /* check if SmartSpeed worked */
@@ -4949,7 +4969,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                                 adapter->flags |= FLAG_RESTART_NOW;
                         else
                                 pm_schedule_suspend(netdev->dev.parent,
-                                                        LINK_TIMEOUT);
+                                                    LINK_TIMEOUT);
                 }
         }
 
@@ -4984,8 +5004,8 @@ link_up:
                  */
                 u32 goc = (adapter->gotc + adapter->gorc) / 10000;
                 u32 dif = (adapter->gotc > adapter->gorc ?
-                            adapter->gotc - adapter->gorc :
-                            adapter->gorc - adapter->gotc) / 10000;
+                           adapter->gotc - adapter->gorc :
+                           adapter->gorc - adapter->gotc) / 10000;
                 u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
 
                 e1000e_write_itr(adapter, itr);
@@ -5064,14 +5084,14 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
                 iph->tot_len = 0;
                 iph->check = 0;
                 tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
-                                                         0, IPPROTO_TCP, 0);
+                                                         0, IPPROTO_TCP, 0);
                 cmd_length = E1000_TXD_CMD_IP;
                 ipcse = skb_transport_offset(skb) - 1;
         } else if (skb_is_gso_v6(skb)) {
                 ipv6_hdr(skb)->payload_len = 0;
                 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                       &ipv6_hdr(skb)->daddr,
-                                                       0, IPPROTO_TCP, 0);
+                                                       &ipv6_hdr(skb)->daddr,
+                                                       0, IPPROTO_TCP, 0);
                 ipcse = 0;
         }
         ipcss = skb_network_offset(skb);
@@ -5080,7 +5100,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
 
         cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
-                       E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
+                       E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
 
         i = tx_ring->next_to_use;
         context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
@@ -5150,8 +5170,7 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
 
         context_desc->lower_setup.ip_config = 0;
         context_desc->upper_setup.tcp_fields.tucss = css;
-        context_desc->upper_setup.tcp_fields.tucso =
-                                css + skb->csum_offset;
+        context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
         context_desc->upper_setup.tcp_fields.tucse = 0;
         context_desc->tcp_seg_setup.data = 0;
         context_desc->cmd_and_length = cpu_to_le32(cmd_len);
@@ -5224,7 +5243,8 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
                         buffer_info->time_stamp = jiffies;
                         buffer_info->next_to_watch = i;
                         buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag,
-                                                offset, size, DMA_TO_DEVICE);
+                                                            offset, size,
+                                                            DMA_TO_DEVICE);
                         buffer_info->mapped_as_page = true;
                         if (dma_mapping_error(&pdev->dev, buffer_info->dma))
                                 goto dma_error;
@@ -5273,7 +5293,7 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
 
         if (tx_flags & E1000_TX_FLAGS_TSO) {
                 txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
-                             E1000_TXD_CMD_TSE;
+                    E1000_TXD_CMD_TSE;
                 txd_upper |= E1000_TXD_POPTS_TXSM << 8;
 
                 if (tx_flags & E1000_TX_FLAGS_IPV4)
@@ -5304,8 +5324,8 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
                 buffer_info = &tx_ring->buffer_info[i];
                 tx_desc = E1000_TX_DESC(*tx_ring, i);
                 tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-                tx_desc->lower.data =
-                        cpu_to_le32(txd_lower | buffer_info->length);
+                tx_desc->lower.data = cpu_to_le32(txd_lower |
+                                                  buffer_info->length);
                 tx_desc->upper.data = cpu_to_le32(txd_upper);
 
                 i++;
@@ -5355,11 +5375,11 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
         if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
                 return 0;
 
-        if (((struct ethhdr *) skb->data)->h_proto != htons(ETH_P_IP))
+        if (((struct ethhdr *)skb->data)->h_proto != htons(ETH_P_IP))
                 return 0;
 
         {
-                const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data+14);
+                const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data + 14);
                 struct udphdr *udp;
 
                 if (ip->protocol != IPPROTO_UDP)
@@ -5584,7 +5604,7 @@ static void e1000_reset_task(struct work_struct *work)
  * Returns the address of the device statistics structure.
  **/
 struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
-                                             struct rtnl_link_stats64 *stats)
+                                             struct rtnl_link_stats64 *stats)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
@@ -5605,18 +5625,15 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
          * our own version based on RUC and ROC
          */
         stats->rx_errors = adapter->stats.rxerrc +
-                adapter->stats.crcerrs + adapter->stats.algnerrc +
-                adapter->stats.ruc + adapter->stats.roc +
-                adapter->stats.cexterr;
-        stats->rx_length_errors = adapter->stats.ruc +
-                                              adapter->stats.roc;
+            adapter->stats.crcerrs + adapter->stats.algnerrc +
+            adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;
+        stats->rx_length_errors = adapter->stats.ruc + adapter->stats.roc;
         stats->rx_crc_errors = adapter->stats.crcerrs;
         stats->rx_frame_errors = adapter->stats.algnerrc;
         stats->rx_missed_errors = adapter->stats.mpc;
 
         /* Tx Errors */
-        stats->tx_errors = adapter->stats.ecol +
-                                       adapter->stats.latecol;
+        stats->tx_errors = adapter->stats.ecol + adapter->stats.latecol;
         stats->tx_aborted_errors = adapter->stats.ecol;
         stats->tx_window_errors = adapter->stats.latecol;
         stats->tx_carrier_errors = adapter->stats.tncrs;
@@ -5685,9 +5702,9 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 
         /* adjust allocation if LPE protects us, and we aren't using SBP */
         if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||
-             (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
+            (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
                 adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN
-                                         + ETH_FCS_LEN;
+                    + ETH_FCS_LEN;
 
         if (netif_running(netdev))
                 e1000e_up(adapter);
@@ -5866,7 +5883,7 @@ static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
         phy_reg &= ~(BM_RCTL_MO_MASK);
         if (mac_reg & E1000_RCTL_MO_3)
                 phy_reg |= (((mac_reg & E1000_RCTL_MO_3) >> E1000_RCTL_MO_SHIFT)
-                                << BM_RCTL_MO_SHIFT);
+                            << BM_RCTL_MO_SHIFT);
         if (mac_reg & E1000_RCTL_BAM)
                 phy_reg |= BM_RCTL_BAM;
         if (mac_reg & E1000_RCTL_PMCF)
@@ -5935,10 +5952,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
                 }
 
                 ctrl = er32(CTRL);
-                /* advertise wake from D3Cold */
-                #define E1000_CTRL_ADVD3WUC 0x00100000
-                /* phy power management enable */
-                #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
                 ctrl |= E1000_CTRL_ADVD3WUC;
                 if (!(adapter->flags2 & FLAG2_HAS_PHY_WAKEUP))
                         ctrl |= E1000_CTRL_EN_PHY_PWR_MGMT;
@@ -5982,8 +5995,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
          */
         e1000e_release_hw_control(adapter);
 
-        pci_clear_master(pdev);
-
         /* The pci-e switch on some quad port adapters will report a
          * correctable error when the MAC transitions from D0 to D3.  To
          * prevent this we need to mask off the correctable errors on the
@@ -6082,24 +6093,24 @@ static int __e1000_resume(struct pci_dev *pdev)
                 e1e_rphy(&adapter->hw, BM_WUS, &phy_data);
                 if (phy_data) {
                         e_info("PHY Wakeup cause - %s\n",
-                                phy_data & E1000_WUS_EX ? "Unicast Packet" :
-                                phy_data & E1000_WUS_MC ? "Multicast Packet" :
-                                phy_data & E1000_WUS_BC ? "Broadcast Packet" :
-                                phy_data & E1000_WUS_MAG ? "Magic Packet" :
-                                phy_data & E1000_WUS_LNKC ?
-                                "Link Status Change" : "other");
+                               phy_data & E1000_WUS_EX ? "Unicast Packet" :
+                               phy_data & E1000_WUS_MC ? "Multicast Packet" :
+                               phy_data & E1000_WUS_BC ? "Broadcast Packet" :
+                               phy_data & E1000_WUS_MAG ? "Magic Packet" :
+                               phy_data & E1000_WUS_LNKC ?
+                               "Link Status Change" : "other");
                 }
                 e1e_wphy(&adapter->hw, BM_WUS, ~0);
         } else {
                 u32 wus = er32(WUS);
                 if (wus) {
                         e_info("MAC Wakeup cause - %s\n",
-                                wus & E1000_WUS_EX ? "Unicast Packet" :
-                                wus & E1000_WUS_MC ? "Multicast Packet" :
-                                wus & E1000_WUS_BC ? "Broadcast Packet" :
-                                wus & E1000_WUS_MAG ? "Magic Packet" :
-                                wus & E1000_WUS_LNKC ? "Link Status Change" :
-                                "other");
+                               wus & E1000_WUS_EX ? "Unicast Packet" :
+                               wus & E1000_WUS_MC ? "Multicast Packet" :
+                               wus & E1000_WUS_BC ? "Broadcast Packet" :
+                               wus & E1000_WUS_MAG ? "Magic Packet" :
+                               wus & E1000_WUS_LNKC ? "Link Status Change" :
+                               "other");
                 }
                 ew32(WUS, ~0);
         }
@@ -6374,7 +6385,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         e_info("(PCI Express:2.5GT/s:%s) %pM\n",
                /* bus width */
                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
-                "Width x1"),
+                "Width x1"),
                /* MAC address */
                netdev->dev_addr);
         e_info("Intel(R) PRO/%s Network Connection\n",
@@ -6414,7 +6425,7 @@ static int e1000_set_features(struct net_device *netdev,
         if (changed & (NETIF_F_TSO | NETIF_F_TSO6))
                 adapter->flags |= FLAG_TSO_FORCE;
 
-        if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
+        if (!(changed & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX |
                          NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_RXFCS |
                          NETIF_F_RXALL)))
                 return 0;
@@ -6484,7 +6495,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         resource_size_t flash_start, flash_len;
         static int cards_found;
         u16 aspm_disable_flag = 0;
-        int i, err, pci_using_dac;
+        int bars, i, err, pci_using_dac;
         u16 eeprom_data = 0;
         u16 eeprom_apme_mask = E1000_EEPROM_APME;
 
@@ -6511,15 +6522,16 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         err = dma_set_coherent_mask(&pdev->dev,
                                                     DMA_BIT_MASK(32));
                         if (err) {
-                                dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
+                                dev_err(&pdev->dev,
+                                        "No usable DMA configuration, aborting\n");
                                 goto err_dma;
                         }
                 }
         }
 
-        err = pci_request_selected_regions_exclusive(pdev,
-                                          pci_select_bars(pdev, IORESOURCE_MEM),
-                                          e1000e_driver_name);
+        bars = pci_select_bars(pdev, IORESOURCE_MEM);
+        err = pci_request_selected_regions_exclusive(pdev, bars,
+                                                     e1000e_driver_name);
         if (err)
                 goto err_pci_reg;
 
@@ -6572,6 +6584,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         goto err_flashmap;
         }
 
+        /* Set default EEE advertisement */
+        if (adapter->flags2 & FLAG2_HAS_EEE)
+                adapter->eee_advert = MDIO_EEE_100TX | MDIO_EEE_1000T;
+
         /* construct the net_device struct */
         netdev->netdev_ops              = &e1000e_netdev_ops;
         e1000e_set_ethtool_ops(netdev);
@@ -6620,8 +6636,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Set initial default active device features */
         netdev->features = (NETIF_F_SG |
-                            NETIF_F_HW_VLAN_RX |
-                            NETIF_F_HW_VLAN_TX |
+                            NETIF_F_HW_VLAN_CTAG_RX |
+                            NETIF_F_HW_VLAN_CTAG_TX |
                             NETIF_F_TSO |
                             NETIF_F_TSO6 |
                             NETIF_F_RXHASH |
@@ -6635,7 +6651,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->hw_features |= NETIF_F_RXALL;
 
         if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
-                netdev->features |= NETIF_F_HW_VLAN_FILTER;
+                netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= (NETIF_F_SG |
                                   NETIF_F_TSO |
@@ -6688,11 +6704,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         init_timer(&adapter->watchdog_timer);
         adapter->watchdog_timer.function = e1000_watchdog;
-        adapter->watchdog_timer.data = (unsigned long) adapter;
+        adapter->watchdog_timer.data = (unsigned long)adapter;
 
         init_timer(&adapter->phy_info_timer);
         adapter->phy_info_timer.function = e1000_update_phy_info;
-        adapter->phy_info_timer.data = (unsigned long) adapter;
+        adapter->phy_info_timer.data = (unsigned long)adapter;
 
         INIT_WORK(&adapter->reset_task, e1000_reset_task);
         INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
@@ -6800,7 +6816,7 @@ err_ioremap:
         free_netdev(netdev);
 err_alloc_etherdev:
         pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+                                     pci_select_bars(pdev, IORESOURCE_MEM));
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -6870,7 +6886,7 @@ static void e1000_remove(struct pci_dev *pdev)
         if (adapter->hw.flash_address)
                 iounmap(adapter->hw.flash_address);
         pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+                                     pci_select_bars(pdev, IORESOURCE_MEM));
 
         free_netdev(netdev);
 
@@ -6891,7 +6907,8 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_COPPER), board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_FIBER), board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER), board_82571 },
-        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER_LP), board_82571 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER_LP),
+          board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_FIBER), board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES), board_82571 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_DUAL), board_82571 },
@@ -6967,8 +6984,8 @@ MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
 #ifdef CONFIG_PM
 static const struct dev_pm_ops e1000_pm_ops = {
         SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
-        SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
-                                e1000_runtime_resume, e1000_idle)
+        SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume,
+                           e1000_idle)
 };
 #endif
 
diff --git a/drivers/net/ethernet/intel/e1000e/nvm.c b/drivers/net/ethernet/intel/e1000e/nvm.c
index 84fecc268162..44ddc0a0ee0e 100644
--- a/drivers/net/ethernet/intel/e1000e/nvm.c
+++ b/drivers/net/ethernet/intel/e1000e/nvm.c
@@ -630,7 +630,7 @@ void e1000e_reload_nvm_generic(struct e1000_hw *hw)
 {
         u32 ctrl_ext;
 
-        udelay(10);
+        usleep_range(10, 20);
         ctrl_ext = er32(CTRL_EXT);
         ctrl_ext |= E1000_CTRL_EXT_EE_RST;
         ew32(CTRL_EXT, ctrl_ext);
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 98da75dff936..c16bd75b6caa 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -45,7 +45,7 @@
 unsigned int copybreak = COPYBREAK_DEFAULT;
 module_param(copybreak, uint, 0644);
 MODULE_PARM_DESC(copybreak,
-        "Maximum size of packet that is copied to a new buffer on receive");
+                 "Maximum size of packet that is copied to a new buffer on receive");
 
 /* All parameters are treated the same, as an integer array of values.
  * This macro just reduces the need to repeat the same declaration code
@@ -143,7 +143,8 @@ E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
  *
  * Default Value: 1 (enabled)
  */
-E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
+E1000_PARAM(WriteProtectNVM,
+            "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
 
 /* Enable CRC Stripping
  *
@@ -160,13 +161,18 @@ struct e1000_option {
         const char *err;
         int def;
         union {
-                struct { /* range_option info */
+                /* range_option info */
+                struct {
                         int min;
                         int max;
                 } r;
-                struct { /* list_option info */
+                /* list_option info */
+                struct {
                         int nr;
-                        struct e1000_opt_list { int i; char *str; } *p;
+                        struct e1000_opt_list {
+                                int i;
+                                char *str;
+                        } *p;
                 } l;
         } arg;
 };
@@ -246,7 +252,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                            "Using defaults for all values\n");
         }
 
-        { /* Transmit Interrupt Delay */
+        /* Transmit Interrupt Delay */
+        {
                 static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Transmit Interrupt Delay",
@@ -265,7 +272,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                         adapter->tx_int_delay = opt.def;
                 }
         }
-        { /* Transmit Absolute Interrupt Delay */
+        /* Transmit Absolute Interrupt Delay */
+        {
                 static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Transmit Absolute Interrupt Delay",
@@ -284,7 +292,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                         adapter->tx_abs_int_delay = opt.def;
                 }
         }
-        { /* Receive Interrupt Delay */
+        /* Receive Interrupt Delay */
+        {
                 static struct e1000_option opt = {
                         .type = range_option,
                         .name = "Receive Interrupt Delay",
@@ -303,7 +312,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                         adapter->rx_int_delay = opt.def;
                 }
         }
-        { /* Receive Absolute Interrupt Delay */
+        /* Receive Absolute Interrupt Delay */
+        {
                 static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Receive Absolute Interrupt Delay",
@@ -322,7 +332,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                         adapter->rx_abs_int_delay = opt.def;
                 }
         }
-        { /* Interrupt Throttling Rate */
+        /* Interrupt Throttling Rate */
+        {
                 static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Interrupt Throttling Rate (ints/sec)",
@@ -392,7 +403,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                         break;
                 }
         }
-        { /* Interrupt Mode */
+        /* Interrupt Mode */
+        {
                 static struct e1000_option opt = {
                         .type = range_option,
                         .name = "Interrupt Mode",
@@ -435,7 +447,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                 kfree(opt.err);
 #endif
         }
-        { /* Smart Power Down */
+        /* Smart Power Down */
+        {
                 static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "PHY Smart Power Down",
@@ -450,7 +463,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                                 adapter->flags |= FLAG_SMART_POWER_DOWN;
                 }
         }
-        { /* CRC Stripping */
+        /* CRC Stripping */
+        {
                 static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "CRC Stripping",
@@ -470,27 +484,28 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                         adapter->flags2 |= FLAG2_DFLT_CRC_STRIPPING;
                 }
         }
-        { /* Kumeran Lock Loss Workaround */
+        /* Kumeran Lock Loss Workaround */
+        {
                 static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "Kumeran Lock Loss Workaround",
                         .err  = "defaulting to Enabled",
                         .def  = OPTION_ENABLED
                 };
+                bool enabled = opt.def;
 
                 if (num_KumeranLockLoss > bd) {
                         unsigned int kmrn_lock_loss = KumeranLockLoss[bd];
                         e1000_validate_option(&kmrn_lock_loss, &opt, adapter);
-                        if (hw->mac.type == e1000_ich8lan)
-                                e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                                kmrn_lock_loss);
-                } else {
-                        if (hw->mac.type == e1000_ich8lan)
-                                e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                                       opt.def);
+                        enabled = kmrn_lock_loss;
                 }
+
+                if (hw->mac.type == e1000_ich8lan)
+                        e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
+                                                                     enabled);
         }
-        { /* Write-protect NVM */
+        /* Write-protect NVM */
+        {
                 static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "Write-protect NVM",
@@ -500,7 +515,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 
                 if (adapter->flags & FLAG_IS_ICH) {
                         if (num_WriteProtectNVM > bd) {
-                                unsigned int write_protect_nvm = WriteProtectNVM[bd];
+                                unsigned int write_protect_nvm =
+                                    WriteProtectNVM[bd];
                                 e1000_validate_option(&write_protect_nvm, &opt,
                                                       adapter);
                                 if (write_protect_nvm)
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 0930c136aa31..59c76a6815a0 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -37,7 +37,9 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
 
 /* Cable length tables */
 static const u16 e1000_m88_cable_length_table[] = {
-        0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
+        0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED
+};
+
 #define M88E1000_CABLE_LENGTH_TABLE_SIZE \
                 ARRAY_SIZE(e1000_m88_cable_length_table)
 
@@ -49,7 +51,9 @@ static const u16 e1000_igp_2_cable_length_table[] = {
         66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104, 60, 66, 72, 77, 82,
         87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95,
         100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121,
-        124};
+        124
+};
+
 #define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
                 ARRAY_SIZE(e1000_igp_2_cable_length_table)
 
@@ -67,8 +71,7 @@ s32 e1000e_check_reset_block_generic(struct e1000_hw *hw)
 
         manc = er32(MANC);
 
-        return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-               E1000_BLK_PHY_RESET : 0;
+        return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ? E1000_BLK_PHY_RESET : 0;
 }
 
 /**
@@ -94,7 +97,7 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
                         return ret_val;
 
                 phy->id = (u32)(phy_id << 16);
-                udelay(20);
+                usleep_range(20, 40);
                 ret_val = e1e_rphy(hw, MII_PHYSID2, &phy_id);
                 if (ret_val)
                         return ret_val;
@@ -175,7 +178,13 @@ s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
                 e_dbg("MDI Error\n");
                 return -E1000_ERR_PHY;
         }
-        *data = (u16) mdic;
+        if (((mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT) != offset) {
+                e_dbg("MDI Read offset error - requested %d, returned %d\n",
+                      offset,
+                      (mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT);
+                return -E1000_ERR_PHY;
+        }
+        *data = (u16)mdic;
 
         /* Allow some time after each MDIC transaction to avoid
          * reading duplicate data in the next MDIC transaction.
@@ -233,6 +242,12 @@ s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
                 e_dbg("MDI Error\n");
                 return -E1000_ERR_PHY;
         }
+        if (((mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT) != offset) {
+                e_dbg("MDI Write offset error - requested %d, returned %d\n",
+                      offset,
+                      (mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT);
+                return -E1000_ERR_PHY;
+        }
 
         /* Allow some time after each MDIC transaction to avoid
          * reading duplicate data in the next MDIC transaction.
@@ -324,7 +339,7 @@ s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page)
  *  semaphores before exiting.
  **/
 static s32 __e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
-                                    bool locked)
+                                     bool locked)
 {
         s32 ret_val = 0;
 
@@ -391,7 +406,7 @@ s32 e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data)
  *  at the offset.  Release any acquired semaphores before exiting.
  **/
 static s32 __e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
-                                     bool locked)
+                                      bool locked)
 {
         s32 ret_val = 0;
 
@@ -410,8 +425,7 @@ static s32 __e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
                                                     (u16)offset);
         if (!ret_val)
                 ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS &
-                                                        offset,
-                                                    data);
+                                                    offset, data);
         if (!locked)
                 hw->phy.ops.release(hw);
 
@@ -458,7 +472,7 @@ s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data)
  *  Release any acquired semaphores before exiting.
  **/
 static s32 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
-                                 bool locked)
+                                 bool locked)
 {
         u32 kmrnctrlsta;
 
@@ -531,7 +545,7 @@ s32 e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data)
  *  before exiting.
  **/
 static s32 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
-                                  bool locked)
+                                  bool locked)
 {
         u32 kmrnctrlsta;
 
@@ -772,8 +786,7 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
 
                 phy_data |= M88E1000_EPSCR_TX_CLK_25;
 
-                if ((phy->revision == 2) &&
-                    (phy->id == M88E1111_I_PHY_ID)) {
+                if ((phy->revision == 2) && (phy->id == M88E1111_I_PHY_ID)) {
                         /* 82573L PHY - set the downshift counter to 5x. */
                         phy_data &= ~M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK;
                         phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
@@ -1296,7 +1309,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                 e_dbg("Waiting for forced speed/duplex link on M88 phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                     100000, &link);
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
 
@@ -1319,7 +1332,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
                 /* Try once more */
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                     100000, &link);
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
         }
@@ -1609,9 +1622,9 @@ s32 e1000_check_polarity_m88(struct e1000_hw *hw)
         ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &data);
 
         if (!ret_val)
-                phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+                phy->cable_polarity = ((data & M88E1000_PSSR_REV_POLARITY)
+                                       ? e1000_rev_polarity_reversed
+                                       : e1000_rev_polarity_normal);
 
         return ret_val;
 }
@@ -1653,9 +1666,9 @@ s32 e1000_check_polarity_igp(struct e1000_hw *hw)
         ret_val = e1e_rphy(hw, offset, &data);
 
         if (!ret_val)
-                phy->cable_polarity = (data & mask)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+                phy->cable_polarity = ((data & mask)
+                                       ? e1000_rev_polarity_reversed
+                                       : e1000_rev_polarity_normal);
 
         return ret_val;
 }
@@ -1685,9 +1698,9 @@ s32 e1000_check_polarity_ife(struct e1000_hw *hw)
         ret_val = e1e_rphy(hw, offset, &phy_data);
 
         if (!ret_val)
-                phy->cable_polarity = (phy_data & mask)
-                                       ? e1000_rev_polarity_reversed
-                                       : e1000_rev_polarity_normal;
+                phy->cable_polarity = ((phy_data & mask)
+                                       ? e1000_rev_polarity_reversed
+                                       : e1000_rev_polarity_normal);
 
         return ret_val;
 }
@@ -1733,7 +1746,7 @@ static s32 e1000_wait_autoneg(struct e1000_hw *hw)
  *  Polls the PHY status register for link, 'iterations' number of times.
  **/
 s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success)
+                                u32 usec_interval, bool *success)
 {
         s32 ret_val = 0;
         u16 i, phy_status;
@@ -1756,7 +1769,7 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
                 if (phy_status & BMSR_LSTATUS)
                         break;
                 if (usec_interval >= 1000)
-                        mdelay(usec_interval/1000);
+                        mdelay(usec_interval / 1000);
                 else
                         udelay(usec_interval);
         }
@@ -1791,8 +1804,8 @@ s32 e1000e_get_cable_length_m88(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-                M88E1000_PSSR_CABLE_LENGTH_SHIFT;
+        index = ((phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
+                 M88E1000_PSSR_CABLE_LENGTH_SHIFT);
 
         if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1)
                 return -E1000_ERR_PHY;
@@ -1824,10 +1837,10 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
         u16 cur_agc_index, max_agc_index = 0;
         u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
         static const u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] = {
-               IGP02E1000_PHY_AGC_A,
-               IGP02E1000_PHY_AGC_B,
-               IGP02E1000_PHY_AGC_C,
-               IGP02E1000_PHY_AGC_D
+                IGP02E1000_PHY_AGC_A,
+                IGP02E1000_PHY_AGC_B,
+                IGP02E1000_PHY_AGC_C,
+                IGP02E1000_PHY_AGC_D
         };
 
         /* Read the AGC registers for all channels */
@@ -1841,8 +1854,8 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
                  * that can be put into the lookup table to obtain the
                  * approximate cable length.
                  */
-                cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                                IGP02E1000_AGC_LENGTH_MASK;
+                cur_agc_index = ((phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
+                                 IGP02E1000_AGC_LENGTH_MASK);
 
                 /* Array index bound check. */
                 if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
@@ -1865,8 +1878,8 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
         agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
 
         /* Calculate cable length with the error range of +/- 10 meters. */
-        phy->min_cable_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-                                 (agc_value - IGP02E1000_AGC_RANGE) : 0;
+        phy->min_cable_length = (((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
+                                 (agc_value - IGP02E1000_AGC_RANGE) : 0);
         phy->max_cable_length = agc_value + IGP02E1000_AGC_RANGE;
 
         phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
@@ -2040,9 +2053,9 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
                         return ret_val;
         } else {
                 /* Polarity is forced */
-                phy->cable_polarity = (data & IFE_PSC_FORCE_POLARITY)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+                phy->cable_polarity = ((data & IFE_PSC_FORCE_POLARITY)
+                                       ? e1000_rev_polarity_reversed
+                                       : e1000_rev_polarity_normal);
         }
 
         ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL, &data);
@@ -2119,7 +2132,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
         ew32(CTRL, ctrl);
         e1e_flush();
 
-        udelay(150);
+        usleep_range(150, 300);
 
         phy->ops.release(hw);
 
@@ -2375,13 +2388,13 @@ s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
 
                 /* Page is shifted left, PHY expects (page x 32) */
                 ret_val = e1000e_write_phy_reg_mdic(hw, page_select,
-                                                    (page << page_shift));
+                                                    (page << page_shift));
                 if (ret_val)
                         goto release;
         }
 
         ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                            data);
+                                            data);
 
 release:
         hw->phy.ops.release(hw);
@@ -2433,13 +2446,13 @@ s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
 
                 /* Page is shifted left, PHY expects (page x 32) */
                 ret_val = e1000e_write_phy_reg_mdic(hw, page_select,
-                                                    (page << page_shift));
+                                                    (page << page_shift));
                 if (ret_val)
                         goto release;
         }
 
         ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                           data);
+                                           data);
 release:
         hw->phy.ops.release(hw);
         return ret_val;
@@ -2674,7 +2687,7 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
         if (read) {
                 /* Read the Wakeup register page value using opcode 0x12 */
                 ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
-                                                   data);
+                                                   data);
         } else {
                 /* Write the Wakeup register page value using opcode 0x12 */
                 ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
@@ -2763,7 +2776,7 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
 
         if (page > 0 && page < HV_INTC_FC_PAGE_START) {
                 ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
-                                                         data, true);
+                                                         data, true);
                 goto out;
         }
 
@@ -2786,8 +2799,7 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
         e_dbg("reading PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
               page << IGP_PAGE_SHIFT, reg);
 
-        ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                          data);
+        ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg, data);
 out:
         if (!locked)
                 hw->phy.ops.release(hw);
@@ -2871,7 +2883,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
 
         if (page > 0 && page < HV_INTC_FC_PAGE_START) {
                 ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
-                                                         &data, false);
+                                                         &data, false);
                 goto out;
         }
 
@@ -2910,7 +2922,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
               page << IGP_PAGE_SHIFT, reg);
 
         ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                          data);
+                                            data);
 
 out:
         if (!locked)
@@ -2988,15 +3000,15 @@ static u32 e1000_get_phy_addr_for_hv_page(u32 page)
  *  These accesses done with PHY address 2 and without using pages.
  **/
 static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
-                                          u16 *data, bool read)
+                                          u16 *data, bool read)
 {
         s32 ret_val;
         u32 addr_reg;
         u32 data_reg;
 
         /* This takes care of the difference with desktop vs mobile phy */
-        addr_reg = (hw->phy.type == e1000_phy_82578) ?
-                   I82578_ADDR_REG : I82577_ADDR_REG;
+        addr_reg = ((hw->phy.type == e1000_phy_82578) ?
+                    I82578_ADDR_REG : I82577_ADDR_REG);
         data_reg = addr_reg + 1;
 
         /* All operations in this function are phy address 2 */
@@ -3050,8 +3062,8 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        data &= BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
-                BM_CS_STATUS_SPEED_MASK;
+        data &= (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+                 BM_CS_STATUS_SPEED_MASK);
 
         if (data != (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
                      BM_CS_STATUS_SPEED_1000))
@@ -3086,9 +3098,9 @@ s32 e1000_check_polarity_82577(struct e1000_hw *hw)
         ret_val = e1e_rphy(hw, I82577_PHY_STATUS_2, &data);
 
         if (!ret_val)
-                phy->cable_polarity = (data & I82577_PHY_STATUS2_REV_POLARITY)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+                phy->cable_polarity = ((data & I82577_PHY_STATUS2_REV_POLARITY)
+                                       ? e1000_rev_polarity_reversed
+                                       : e1000_rev_polarity_normal);
 
         return ret_val;
 }
@@ -3215,8 +3227,8 @@ s32 e1000_get_cable_length_82577(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        length = (phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
-                 I82577_DSTATUS_CABLE_LENGTH_SHIFT;
+        length = ((phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
+                  I82577_DSTATUS_CABLE_LENGTH_SHIFT);
 
         if (length == E1000_CABLE_LENGTH_UNDEFINED)
                 return -E1000_ERR_PHY;
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c
index b477fa53ec94..065f8c80d4f2 100644
--- a/drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/drivers/net/ethernet/intel/e1000e/ptp.c
@@ -145,8 +145,7 @@ static int e1000e_phc_settime(struct ptp_clock_info *ptp,
         unsigned long flags;
         u64 ns;
 
-        ns = ts->tv_sec * NSEC_PER_SEC;
-        ns += ts->tv_nsec;
+        ns = timespec_to_ns(ts);
 
         /* reset the timecounter */
         spin_lock_irqsave(&adapter->systim_lock, flags);
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index 12b1d8480808..ff6a17cb1362 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -100,6 +100,7 @@ static bool igb_sgmii_uses_mdio_82575(struct e1000_hw *hw)
                 break;
         case e1000_82580:
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         case e1000_i211:
                 reg = rd32(E1000_MDICNFG);
@@ -149,6 +150,7 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw)
                 switch (hw->mac.type) {
                 case e1000_82580:
                 case e1000_i350:
+                case e1000_i354:
                         phy->ops.read_reg = igb_read_phy_reg_82580;
                         phy->ops.write_reg = igb_write_phy_reg_82580;
                         break;
@@ -174,13 +176,14 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw)
 
         /* Verify phy id and set remaining function pointers */
         switch (phy->id) {
+        case M88E1545_E_PHY_ID:
         case I347AT4_E_PHY_ID:
         case M88E1112_E_PHY_ID:
         case M88E1111_I_PHY_ID:
                 phy->type               = e1000_phy_m88;
+                phy->ops.check_polarity = igb_check_polarity_m88;
                 phy->ops.get_phy_info   = igb_get_phy_info_m88;
-                if (phy->id == I347AT4_E_PHY_ID ||
-                    phy->id == M88E1112_E_PHY_ID)
+                if (phy->id != M88E1111_I_PHY_ID)
                         phy->ops.get_cable_length =
                                          igb_get_cable_length_m88_gen2;
                 else
@@ -227,7 +230,7 @@ out:
  *  igb_init_nvm_params_82575 - Init NVM func ptrs.
  *  @hw: pointer to the HW structure
  **/
-s32 igb_init_nvm_params_82575(struct e1000_hw *hw)
+static s32 igb_init_nvm_params_82575(struct e1000_hw *hw)
 {
         struct e1000_nvm_info *nvm = &hw->nvm;
         u32 eecd = rd32(E1000_EECD);
@@ -287,6 +290,7 @@ s32 igb_init_nvm_params_82575(struct e1000_hw *hw)
                         nvm->ops.read = igb_read_nvm_spi;
                 nvm->ops.write = igb_write_nvm_spi;
                 break;
+        case e1000_i354:
         case e1000_i350:
                 nvm->ops.validate = igb_validate_nvm_checksum_i350;
                 nvm->ops.update = igb_update_nvm_checksum_i350;
@@ -352,6 +356,7 @@ static s32 igb_init_mac_params_82575(struct e1000_hw *hw)
                 mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
                 break;
         case e1000_i350:
+        case e1000_i354:
                 mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
                 break;
         default:
@@ -384,6 +389,9 @@ static s32 igb_init_mac_params_82575(struct e1000_hw *hw)
                 dev_spec->eee_disable = false;
         else
                 dev_spec->eee_disable = true;
+        /* Allow a single clear of the SW semaphore on I210 and newer */
+        if (mac->type >= e1000_i210)
+                dev_spec->clear_semaphore_once = true;
         /* physical interface link setup */
         mac->ops.setup_physical_interface =
                 (hw->phy.media_type == e1000_media_type_copper)
@@ -435,8 +443,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 mac->type = e1000_i350;
                 break;
         case E1000_DEV_ID_I210_COPPER:
-        case E1000_DEV_ID_I210_COPPER_OEM1:
-        case E1000_DEV_ID_I210_COPPER_IT:
         case E1000_DEV_ID_I210_FIBER:
         case E1000_DEV_ID_I210_SERDES:
         case E1000_DEV_ID_I210_SGMII:
@@ -445,14 +451,18 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         case E1000_DEV_ID_I211_COPPER:
                 mac->type = e1000_i211;
                 break;
+        case E1000_DEV_ID_I354_BACKPLANE_1GBPS:
+        case E1000_DEV_ID_I354_SGMII:
+        case E1000_DEV_ID_I354_BACKPLANE_2_5GBPS:
+                mac->type = e1000_i354;
+                break;
         default:
                 return -E1000_ERR_MAC_INIT;
                 break;
         }
 
         /* Set media type */
-        /*
-         * The 82575 uses bits 22:23 for link mode. The mode can be changed
+        /* The 82575 uses bits 22:23 for link mode. The mode can be changed
          * based on the EEPROM. We cannot rely upon device ID. There
          * is no distinguishable difference between fiber and internal
          * SerDes mode on the 82575. There can be an external PHY attached
@@ -621,8 +631,7 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
         u32 ctrl_ext;
         u32 mdic;
 
-        /*
-         * For SGMII PHYs, we try the list of possible addresses until
+        /* For SGMII PHYs, we try the list of possible addresses until
          * we find one that works.  For non-SGMII PHYs
          * (e.g. integrated copper PHYs), an address of 1 should
          * work.  The result of this function should mean phy->phy_addr
@@ -644,6 +653,7 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
                         break;
                 case e1000_82580:
                 case e1000_i350:
+                case e1000_i354:
                 case e1000_i210:
                 case e1000_i211:
                         mdic = rd32(E1000_MDICNFG);
@@ -665,8 +675,7 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
         wrfl();
         msleep(300);
 
-        /*
-         * The address field in the I2CCMD register is 3 bits and 0 is invalid.
+        /* The address field in the I2CCMD register is 3 bits and 0 is invalid.
          * Therefore, we need to test 1-7
          */
         for (phy->addr = 1; phy->addr < 8; phy->addr++) {
@@ -674,8 +683,7 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
                 if (ret_val == 0) {
                         hw_dbg("Vendor ID 0x%08X read at address %u\n",
                                phy_id, phy->addr);
-                        /*
-                         * At the time of this writing, The M88 part is
+                        /* At the time of this writing, The M88 part is
                          * the only supported SGMII PHY product.
                          */
                         if (phy_id == M88_VENDOR)
@@ -711,15 +719,13 @@ static s32 igb_phy_hw_reset_sgmii_82575(struct e1000_hw *hw)
 {
         s32 ret_val;
 
-        /*
-         * This isn't a true "hard" reset, but is the only reset
+        /* This isn't a true "hard" reset, but is the only reset
          * available to us at this time.
          */
 
         hw_dbg("Soft resetting SGMII attached PHY...\n");
 
-        /*
-         * SFP documentation requires the following to configure the SPF module
+        /* SFP documentation requires the following to configure the SPF module
          * to work on SGMII.  No further documentation is given.
          */
         ret_val = hw->phy.ops.write_reg(hw, 0x1B, 0x8084);
@@ -774,8 +780,7 @@ static s32 igb_set_d0_lplu_state_82575(struct e1000_hw *hw, bool active)
                 data &= ~IGP02E1000_PM_D0_LPLU;
                 ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
                                                  data);
-                /*
-                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
                  * SmartSpeed, so performance is maintained.
@@ -838,8 +843,7 @@ static s32 igb_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active)
         } else {
                 data &= ~E1000_82580_PM_D0_LPLU;
 
-                /*
-                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
                  * SmartSpeed, so performance is maintained.
@@ -867,7 +871,7 @@ static s32 igb_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active)
  *  During driver activity, SmartSpeed should be enabled so performance is
  *  maintained.
  **/
-s32 igb_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
+static s32 igb_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
 {
         struct e1000_phy_info *phy = &hw->phy;
         s32 ret_val = 0;
@@ -877,8 +881,7 @@ s32 igb_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
 
         if (!active) {
                 data &= ~E1000_82580_PM_D3_LPLU;
-                /*
-                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
                  * SmartSpeed, so performance is maintained.
@@ -964,8 +967,7 @@ static s32 igb_acquire_swfw_sync_82575(struct e1000_hw *hw, u16 mask)
                 if (!(swfw_sync & (fwmask | swmask)))
                         break;
 
-                /*
-                 * Firmware currently using resource (fwmask)
+                /* Firmware currently using resource (fwmask)
                  * or other software thread using resource (swmask)
                  */
                 igb_put_hw_semaphore(hw);
@@ -1065,8 +1067,7 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw)
         if (hw->phy.media_type != e1000_media_type_copper) {
                 ret_val = igb_get_pcs_speed_and_duplex_82575(hw, &speed,
                                                              &duplex);
-                /*
-                 * Use this flag to determine if link needs to be checked or
+                /* Use this flag to determine if link needs to be checked or
                  * not.  If  we have link clear the flag so that we do not
                  * continue to check for link.
                  */
@@ -1135,15 +1136,13 @@ static s32 igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw, u16 *speed,
         *speed = 0;
         *duplex = 0;
 
-        /*
-         * Read the PCS Status register for link state. For non-copper mode,
+        /* Read the PCS Status register for link state. For non-copper mode,
          * the status register is not accurate. The PCS status register is
          * used instead.
          */
         pcs = rd32(E1000_PCS_LSTAT);
 
-        /*
-         * The link up bit determines when link is up on autoneg. The sync ok
+        /* The link up bit determines when link is up on autoneg. The sync ok
          * gets set once both sides sync up and agree upon link. Stable link
          * can be determined by checking for both link up and link sync ok
          */
@@ -1214,8 +1213,7 @@ static s32 igb_reset_hw_82575(struct e1000_hw *hw)
         u32 ctrl, icr;
         s32 ret_val;
 
-        /*
-         * Prevent the PCI-E bus from sticking if there is no TLP connection
+        /* Prevent the PCI-E bus from sticking if there is no TLP connection
          * on the last TLP read/write transaction when MAC is reset.
          */
         ret_val = igb_disable_pcie_master(hw);
@@ -1244,8 +1242,7 @@ static s32 igb_reset_hw_82575(struct e1000_hw *hw)
 
         ret_val = igb_get_auto_rd_done(hw);
         if (ret_val) {
-                /*
-                 * When auto config read does not complete, do not
+                /* When auto config read does not complete, do not
                  * return with an error. This can happen in situations
                  * where there is no eeprom and prevents getting link.
                  */
@@ -1287,7 +1284,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw)
 
         /* Disabling VLAN filtering */
         hw_dbg("Initializing the IEEE VLAN\n");
-        if (hw->mac.type == e1000_i350)
+        if ((hw->mac.type == e1000_i350) || (hw->mac.type == e1000_i354))
                 igb_clear_vfta_i350(hw);
         else
                 igb_clear_vfta(hw);
@@ -1308,8 +1305,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw)
         /* Setup link and flow control */
         ret_val = igb_setup_link(hw);
 
-        /*
-         * Clear all of the statistics registers (clear on read).  It is
+        /* Clear all of the statistics registers (clear on read).  It is
          * important that we do this after we have tried to establish link
          * because the symbol error count will increment wildly if there
          * is no link.
@@ -1364,6 +1360,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
                 switch (hw->phy.id) {
                 case I347AT4_E_PHY_ID:
                 case M88E1112_E_PHY_ID:
+                case M88E1545_E_PHY_ID:
                 case I210_I_PHY_ID:
                         ret_val = igb_copper_link_setup_m88_gen2(hw);
                         break;
@@ -1412,17 +1409,17 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw)
                 return ret_val;
 
 
-        /*
-         * On the 82575, SerDes loopback mode persists until it is
+        /* On the 82575, SerDes loopback mode persists until it is
          * explicitly turned off or a power cycle is performed.  A read to
          * the register does not indicate its status.  Therefore, we ensure
          * loopback mode is disabled during initialization.
          */
         wr32(E1000_SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
 
-        /* power on the sfp cage if present */
+        /* power on the sfp cage if present and turn on I2C */
         ctrl_ext = rd32(E1000_CTRL_EXT);
         ctrl_ext &= ~E1000_CTRL_EXT_SDP3_DATA;
+        ctrl_ext |= E1000_CTRL_I2C_ENA;
         wr32(E1000_CTRL_EXT, ctrl_ext);
 
         ctrl_reg = rd32(E1000_CTRL);
@@ -1466,8 +1463,7 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw)
                                 pcs_autoneg = false;
                 }
 
-                /*
-                 * non-SGMII modes only supports a speed of 1000/Full for the
+                /* non-SGMII modes only supports a speed of 1000/Full for the
                  * link so it is best to just force the MAC and let the pcs
                  * link either autoneg or be forced to 1000/Full
                  */
@@ -1481,8 +1477,7 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw)
 
         wr32(E1000_CTRL, ctrl_reg);
 
-        /*
-         * New SerDes mode allows for forcing speed or autonegotiating speed
+        /* New SerDes mode allows for forcing speed or autonegotiating speed
          * at 1gb. Autoneg should be default set by most drivers. This is the
          * mode that will be compatible with older link partners and switches.
          * However, both are supported by the hardware and some drivers/tools.
@@ -1592,8 +1587,7 @@ static s32 igb_read_mac_addr_82575(struct e1000_hw *hw)
 {
         s32 ret_val = 0;
 
-        /*
-         * If there's an alternate MAC address place it in RAR0
+        /* If there's an alternate MAC address place it in RAR0
          * so that it will override the Si installed default perm
          * address.
          */
@@ -1777,8 +1771,7 @@ static s32 igb_set_pcie_completion_timeout(struct e1000_hw *hw)
         if (gcr & E1000_GCR_CMPL_TMOUT_MASK)
                 goto out;
 
-        /*
-         * if capababilities version is type 1 we can write the
+        /* if capabilities version is type 1 we can write the
          * timeout of 10ms to 200ms through the GCR register
          */
         if (!(gcr & E1000_GCR_CAP_VER2)) {
@@ -1786,8 +1779,7 @@ static s32 igb_set_pcie_completion_timeout(struct e1000_hw *hw)
                 goto out;
         }
 
-        /*
-         * for version 2 capabilities we need to write the config space
+        /* for version 2 capabilities we need to write the config space
          * directly in order to set the completion timeout value for
          * 16ms to 55ms
          */
@@ -1825,6 +1817,7 @@ void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *hw, bool enable, int pf)
                 reg_offset = E1000_DTXSWC;
                 break;
         case e1000_i350:
+        case e1000_i354:
                 reg_offset = E1000_TXSWC;
                 break;
         default:
@@ -1866,6 +1859,7 @@ void igb_vmdq_set_loopback_pf(struct e1000_hw *hw, bool enable)
                         dtxswc &= ~E1000_DTXSWC_VMDQ_LOOPBACK_EN;
                 wr32(E1000_DTXSWC, dtxswc);
                 break;
+        case e1000_i354:
         case e1000_i350:
                 dtxswc = rd32(E1000_TXSWC);
                 if (enable)
@@ -1879,7 +1873,6 @@ void igb_vmdq_set_loopback_pf(struct e1000_hw *hw, bool enable)
                 break;
         }
 
-
 }
 
 /**
@@ -1914,7 +1907,6 @@ static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)
 {
         s32 ret_val;
 
-
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
                 goto out;
@@ -2016,8 +2008,7 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
         /* Get current control state. */
         ctrl = rd32(E1000_CTRL);
 
-        /*
-         * Prevent the PCI-E bus from sticking if there is no TLP connection
+        /* Prevent the PCI-E bus from sticking if there is no TLP connection
          * on the last TLP read/write transaction when MAC is reset.
          */
         ret_val = igb_disable_pcie_master(hw);
@@ -2052,18 +2043,13 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
 
         ret_val = igb_get_auto_rd_done(hw);
         if (ret_val) {
-                /*
-                 * When auto config read does not complete, do not
+                /* When auto config read does not complete, do not
                  * return with an error. This can happen in situations
                  * where there is no eeprom and prevents getting link.
                  */
                 hw_dbg("Auto Read Done did not complete\n");
         }
 
-        /* If EEPROM is not present, run manual init scripts */
-        if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0)
-                igb_reset_init_script_82575(hw);
-
         /* clear global device reset status bit */
         wr32(E1000_STATUS, E1000_STAT_DEV_RST_SET);
 
@@ -2197,7 +2183,8 @@ static s32 igb_validate_nvm_checksum_82580(struct e1000_hw *hw)
 
         if (nvm_data & NVM_COMPATIBILITY_BIT_MASK) {
                 /* if checksums compatibility bit is set validate checksums
-                 * for all 4 ports. */
+                 * for all 4 ports.
+                 */
                 eeprom_regions_count = 4;
         }
 
@@ -2309,6 +2296,41 @@ out:
 }
 
 /**
+ *  __igb_access_emi_reg - Read/write EMI register
+ *  @hw: pointer to the HW structure
+ *  @addr: EMI address to program
+ *  @data: pointer to value to read/write from/to the EMI address
+ *  @read: boolean flag to indicate read or write
+ **/
+static s32 __igb_access_emi_reg(struct e1000_hw *hw, u16 address,
+                                  u16 *data, bool read)
+{
+        s32 ret_val = E1000_SUCCESS;
+
+        ret_val = hw->phy.ops.write_reg(hw, E1000_EMIADD, address);
+        if (ret_val)
+                return ret_val;
+
+        if (read)
+                ret_val = hw->phy.ops.read_reg(hw, E1000_EMIDATA, data);
+        else
+                ret_val = hw->phy.ops.write_reg(hw, E1000_EMIDATA, *data);
+
+        return ret_val;
+}
+
+/**
+ *  igb_read_emi_reg - Read Extended Management Interface register
+ *  @hw: pointer to the HW structure
+ *  @addr: EMI address to program
+ *  @data: value to be read from the EMI address
+ **/
+s32 igb_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data)
+{
+        return __igb_access_emi_reg(hw, addr, data, true);
+}
+
+/**
  *  igb_set_eee_i350 - Enable/disable EEE support
  *  @hw: pointer to the HW structure
  *
@@ -2338,7 +2360,6 @@ s32 igb_set_eee_i350(struct e1000_hw *hw)
                 if (eee_su & E1000_EEE_SU_LPI_CLK_STP)
                         hw_dbg("LPI Clock Stop Bit should not be set!\n");
 
-
         } else {
                 ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN |
                         E1000_IPCNFG_EEE_100M_AN);
@@ -2355,6 +2376,108 @@ out:
         return ret_val;
 }
 
+/**
+ *  igb_set_eee_i354 - Enable/disable EEE support
+ *  @hw: pointer to the HW structure
+ *
+ *  Enable/disable EEE legacy mode based on setting in dev_spec structure.
+ *
+ **/
+s32 igb_set_eee_i354(struct e1000_hw *hw)
+{
+        struct e1000_phy_info *phy = &hw->phy;
+        s32 ret_val = 0;
+        u16 phy_data;
+
+        if ((hw->phy.media_type != e1000_media_type_copper) ||
+            (phy->id != M88E1545_E_PHY_ID))
+                goto out;
+
+        if (!hw->dev_spec._82575.eee_disable) {
+                /* Switch to PHY page 18. */
+                ret_val = phy->ops.write_reg(hw, E1000_M88E1545_PAGE_ADDR, 18);
+                if (ret_val)
+                        goto out;
+
+                ret_val = phy->ops.read_reg(hw, E1000_M88E1545_EEE_CTRL_1,
+                                            &phy_data);
+                if (ret_val)
+                        goto out;
+
+                phy_data |= E1000_M88E1545_EEE_CTRL_1_MS;
+                ret_val = phy->ops.write_reg(hw, E1000_M88E1545_EEE_CTRL_1,
+                                             phy_data);
+                if (ret_val)
+                        goto out;
+
+                /* Return the PHY to page 0. */
+                ret_val = phy->ops.write_reg(hw, E1000_M88E1545_PAGE_ADDR, 0);
+                if (ret_val)
+                        goto out;
+
+                /* Turn on EEE advertisement. */
+                ret_val = igb_read_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+                                             E1000_EEE_ADV_DEV_I354,
+                                             &phy_data);
+                if (ret_val)
+                        goto out;
+
+                phy_data |= E1000_EEE_ADV_100_SUPPORTED |
+                            E1000_EEE_ADV_1000_SUPPORTED;
+                ret_val = igb_write_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+                                                E1000_EEE_ADV_DEV_I354,
+                                                phy_data);
+        } else {
+                /* Turn off EEE advertisement. */
+                ret_val = igb_read_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+                                             E1000_EEE_ADV_DEV_I354,
+                                             &phy_data);
+                if (ret_val)
+                        goto out;
+
+                phy_data &= ~(E1000_EEE_ADV_100_SUPPORTED |
+                              E1000_EEE_ADV_1000_SUPPORTED);
+                ret_val = igb_write_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+                                              E1000_EEE_ADV_DEV_I354,
+                                              phy_data);
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_get_eee_status_i354 - Get EEE status
+ *  @hw: pointer to the HW structure
+ *  @status: EEE status
+ *
+ *  Get EEE status by guessing based on whether Tx or Rx LPI indications have
+ *  been received.
+ **/
+s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status)
+{
+        struct e1000_phy_info *phy = &hw->phy;
+        s32 ret_val = 0;
+        u16 phy_data;
+
+        /* Check if EEE is supported on this device. */
+        if ((hw->phy.media_type != e1000_media_type_copper) ||
+            (phy->id != M88E1545_E_PHY_ID))
+                goto out;
+
+        ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
+                                     E1000_PCS_STATUS_DEV_I354,
+                                     &phy_data);
+        if (ret_val)
+                goto out;
+
+        *status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
+                              E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
+
+out:
+        return ret_val;
+}
+
 static const u8 e1000_emc_temp_data[4] = {
         E1000_EMC_INTERNAL_DATA,
         E1000_EMC_DIODE1_DATA,
@@ -2368,11 +2491,12 @@ static const u8 e1000_emc_therm_limit[4] = {
         E1000_EMC_DIODE3_THERM_LIMIT
 };
 
-/* igb_get_thermal_sensor_data_generic - Gathers thermal sensor data
+/**
+ *  igb_get_thermal_sensor_data_generic - Gathers thermal sensor data
  *  @hw: pointer to hardware structure
  *
  *  Updates the temperatures in mac.thermal_sensor_data
- */
+ **/
 s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw)
 {
         s32 status = E1000_SUCCESS;
@@ -2420,12 +2544,13 @@ s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw)
         return status;
 }
 
-/* igb_init_thermal_sensor_thresh_generic - Sets thermal sensor thresholds
+/**
+ *  igb_init_thermal_sensor_thresh_generic - Sets thermal sensor thresholds
  *  @hw: pointer to hardware structure
  *
  *  Sets the thermal sensor thresholds according to the NVM map
  *  and save off the threshold and location values into mac.thermal_sensor_data
- */
+ **/
 s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *hw)
 {
         s32 status = E1000_SUCCESS;
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
index 73ab41f0e032..74a1506b4235 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.h
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.h
@@ -263,7 +263,9 @@ void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *, bool, int);
 void igb_vmdq_set_loopback_pf(struct e1000_hw *, bool);
 void igb_vmdq_set_replication_pf(struct e1000_hw *, bool);
 u16 igb_rxpbs_adjust_82580(u32 data);
+s32 igb_read_emi_reg(struct e1000_hw *, u16 addr, u16 *data);
 s32 igb_set_eee_i350(struct e1000_hw *);
+s32 igb_set_eee_i354(struct e1000_hw *);
 s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *);
 s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw);
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index 7e13337d3b9d..31a0f82cc650 100644
--- a/drivers/net/ethernet/intel/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
@@ -138,8 +138,7 @@
 #define E1000_RCTL_PMCF           0x00800000    /* pass MAC control frames */
 #define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
 
-/*
- * Use byte values for the following shift parameters
+/* Use byte values for the following shift parameters
  * Usage:
  *     psrctl |= (((ROUNDUP(value0, 128) >> E1000_PSRCTL_BSIZE0_SHIFT) &
  *                  E1000_PSRCTL_BSIZE0_MASK) |
@@ -237,11 +236,14 @@
 #define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000
 /* BMC external code execution disabled */
 
+#define E1000_STATUS_2P5_SKU            0x00001000 /* Val of 2.5GBE SKU strap */
+#define E1000_STATUS_2P5_SKU_OVER       0x00002000 /* Val of 2.5GBE SKU Over */
 /* Constants used to intrepret the masked PCI-X bus speed. */
 
 #define SPEED_10    10
 #define SPEED_100   100
 #define SPEED_1000  1000
+#define SPEED_2500  2500
 #define HALF_DUPLEX 1
 #define FULL_DUPLEX 2
 
@@ -382,8 +384,7 @@
 #define E1000_EICR_OTHER        0x80000000 /* Interrupt Cause Active */
 /* TCP Timer */
 
-/*
- * This defines the bits that are set in the Interrupt Mask
+/* This defines the bits that are set in the Interrupt Mask
  * Set/Read Register.  Each bit is documented below:
  *   o RXT0   = Receiver Timer Interrupt (ring 0)
  *   o TXDW   = Transmit Descriptor Written Back
@@ -440,8 +441,7 @@
 #define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
 
 /* Receive Address */
-/*
- * Number of high/low register pairs in the RAR. The RAR (Receive Address
+/* Number of high/low register pairs in the RAR. The RAR (Receive Address
  * Registers) holds the directed and multicast addresses that we monitor.
  * Technically, we have 16 spots.  However, we reserve one of these spots
  * (RAR[15]) for our directed address used by controllers with
@@ -760,8 +760,7 @@
 #define MAX_PHY_MULTI_PAGE_REG 0xF
 
 /* Bit definitions for valid PHY IDs. */
-/*
- * I = Integrated
+/* I = Integrated
  * E = External
  */
 #define M88E1111_I_PHY_ID    0x01410CC0
@@ -772,6 +771,7 @@
 #define I350_I_PHY_ID        0x015403B0
 #define M88_VENDOR           0x0141
 #define I210_I_PHY_ID        0x01410C00
+#define M88E1545_E_PHY_ID    0x01410EA0
 
 /* M88E1000 Specific Registers */
 #define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
@@ -791,8 +791,7 @@
 #define M88E1000_PSCR_AUTO_X_1000T     0x0040
 /* Auto crossover enabled all speeds */
 #define M88E1000_PSCR_AUTO_X_MODE      0x0060
-/*
- * 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold
+/* 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold
  * 0=Normal 10BASE-T Rx Threshold
  */
 /* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
@@ -802,8 +801,7 @@
 #define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
 #define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
 #define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-/*
- * 0 = <50M
+/* 0 = <50M
  * 1 = 50-80M
  * 2 = 80-110M
  * 3 = 110-140M
@@ -816,20 +814,17 @@
 #define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
 
 /* M88E1000 Extended PHY Specific Control Register */
-/*
- * 1 = Lost lock detect enabled.
+/* 1 = Lost lock detect enabled.
  * Will assert lost lock and bring
  * link down if idle not seen
  * within 1ms in 1000BASE-T
  */
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
+/* Number of times we will attempt to autonegotiate before downshifting if we
  * are the master
  */
 #define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
 #define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
+/* Number of times we will attempt to autonegotiate before downshifting if we
  * are the slave
  */
 #define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
@@ -844,8 +839,7 @@
 
 /* i347-AT4 Extended PHY Specific Control Register */
 
-/*
- *  Number of times we will attempt to autonegotiate before downshifting if we
+/*  Number of times we will attempt to autonegotiate before downshifting if we
  *  are the master
  */
 #define I347AT4_PSCR_DOWNSHIFT_ENABLE 0x0800
@@ -895,6 +889,22 @@
 #define E1000_EEER_LPI_FC            0x00040000  /* EEE Enable on FC */
 #define E1000_EEE_SU_LPI_CLK_STP     0X00800000  /* EEE LPI Clock Stop */
 #define E1000_EEER_EEE_NEG           0x20000000  /* EEE capability nego */
+#define E1000_EEE_LP_ADV_ADDR_I350   0x040F      /* EEE LP Advertisement */
+#define E1000_EEE_LP_ADV_DEV_I210    7           /* EEE LP Adv Device */
+#define E1000_EEE_LP_ADV_ADDR_I210   61          /* EEE LP Adv Register */
+#define E1000_MMDAC_FUNC_DATA        0x4000      /* Data, no post increment */
+#define E1000_M88E1545_PAGE_ADDR        0x16       /* Page Offset Register */
+#define E1000_M88E1545_EEE_CTRL_1       0x0
+#define E1000_M88E1545_EEE_CTRL_1_MS    0x0001     /* EEE Master/Slave */
+#define E1000_EEE_ADV_DEV_I354          7
+#define E1000_EEE_ADV_ADDR_I354         60
+#define E1000_EEE_ADV_100_SUPPORTED     (1 << 1)   /* 100BaseTx EEE Supported */
+#define E1000_EEE_ADV_1000_SUPPORTED    (1 << 2)   /* 1000BaseT EEE Supported */
+#define E1000_PCS_STATUS_DEV_I354       3
+#define E1000_PCS_STATUS_ADDR_I354      1
+#define E1000_PCS_STATUS_TX_LPI_IND     0x0200     /* Tx in LPI state */
+#define E1000_PCS_STATUS_RX_LPI_RCVD    0x0400
+#define E1000_PCS_STATUS_TX_LPI_RCVD    0x0800
 
 /* SerDes Control */
 #define E1000_GEN_CTL_READY             0x80000000
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 0d5cf9c63d0d..488abb24a54f 100644
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -38,38 +38,39 @@
 
 struct e1000_hw;
 
-#define E1000_DEV_ID_82576                    0x10C9
-#define E1000_DEV_ID_82576_FIBER              0x10E6
-#define E1000_DEV_ID_82576_SERDES             0x10E7
-#define E1000_DEV_ID_82576_QUAD_COPPER        0x10E8
-#define E1000_DEV_ID_82576_QUAD_COPPER_ET2    0x1526
-#define E1000_DEV_ID_82576_NS                 0x150A
-#define E1000_DEV_ID_82576_NS_SERDES          0x1518
-#define E1000_DEV_ID_82576_SERDES_QUAD        0x150D
-#define E1000_DEV_ID_82575EB_COPPER           0x10A7
-#define E1000_DEV_ID_82575EB_FIBER_SERDES     0x10A9
-#define E1000_DEV_ID_82575GB_QUAD_COPPER      0x10D6
-#define E1000_DEV_ID_82580_COPPER             0x150E
-#define E1000_DEV_ID_82580_FIBER              0x150F
-#define E1000_DEV_ID_82580_SERDES             0x1510
-#define E1000_DEV_ID_82580_SGMII              0x1511
-#define E1000_DEV_ID_82580_COPPER_DUAL        0x1516
-#define E1000_DEV_ID_82580_QUAD_FIBER         0x1527
-#define E1000_DEV_ID_DH89XXCC_SGMII           0x0438
-#define E1000_DEV_ID_DH89XXCC_SERDES          0x043A
-#define E1000_DEV_ID_DH89XXCC_BACKPLANE       0x043C
-#define E1000_DEV_ID_DH89XXCC_SFP             0x0440
-#define E1000_DEV_ID_I350_COPPER              0x1521
-#define E1000_DEV_ID_I350_FIBER               0x1522
-#define E1000_DEV_ID_I350_SERDES              0x1523
-#define E1000_DEV_ID_I350_SGMII               0x1524
+#define E1000_DEV_ID_82576                      0x10C9
+#define E1000_DEV_ID_82576_FIBER                0x10E6
+#define E1000_DEV_ID_82576_SERDES               0x10E7
+#define E1000_DEV_ID_82576_QUAD_COPPER          0x10E8
+#define E1000_DEV_ID_82576_QUAD_COPPER_ET2      0x1526
+#define E1000_DEV_ID_82576_NS                   0x150A
+#define E1000_DEV_ID_82576_NS_SERDES            0x1518
+#define E1000_DEV_ID_82576_SERDES_QUAD          0x150D
+#define E1000_DEV_ID_82575EB_COPPER             0x10A7
+#define E1000_DEV_ID_82575EB_FIBER_SERDES       0x10A9
+#define E1000_DEV_ID_82575GB_QUAD_COPPER        0x10D6
+#define E1000_DEV_ID_82580_COPPER               0x150E
+#define E1000_DEV_ID_82580_FIBER                0x150F
+#define E1000_DEV_ID_82580_SERDES               0x1510
+#define E1000_DEV_ID_82580_SGMII                0x1511
+#define E1000_DEV_ID_82580_COPPER_DUAL          0x1516
+#define E1000_DEV_ID_82580_QUAD_FIBER           0x1527
+#define E1000_DEV_ID_DH89XXCC_SGMII             0x0438
+#define E1000_DEV_ID_DH89XXCC_SERDES            0x043A
+#define E1000_DEV_ID_DH89XXCC_BACKPLANE         0x043C
+#define E1000_DEV_ID_DH89XXCC_SFP               0x0440
+#define E1000_DEV_ID_I350_COPPER                0x1521
+#define E1000_DEV_ID_I350_FIBER                 0x1522
+#define E1000_DEV_ID_I350_SERDES                0x1523
+#define E1000_DEV_ID_I350_SGMII                 0x1524
 #define E1000_DEV_ID_I210_COPPER                0x1533
-#define E1000_DEV_ID_I210_COPPER_OEM1           0x1534
-#define E1000_DEV_ID_I210_COPPER_IT             0x1535
 #define E1000_DEV_ID_I210_FIBER                 0x1536
 #define E1000_DEV_ID_I210_SERDES                0x1537
 #define E1000_DEV_ID_I210_SGMII                 0x1538
 #define E1000_DEV_ID_I211_COPPER                0x1539
+#define E1000_DEV_ID_I354_BACKPLANE_1GBPS       0x1F40
+#define E1000_DEV_ID_I354_SGMII                 0x1F41
+#define E1000_DEV_ID_I354_BACKPLANE_2_5GBPS     0x1F45
 
 #define E1000_REVISION_2 2
 #define E1000_REVISION_4 4
@@ -90,6 +91,7 @@ enum e1000_mac_type {
         e1000_82576,
         e1000_82580,
         e1000_i350,
+        e1000_i354,
         e1000_i210,
         e1000_i211,
         e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
@@ -98,7 +100,8 @@ enum e1000_mac_type {
 enum e1000_media_type {
         e1000_media_type_unknown = 0,
         e1000_media_type_copper = 1,
-        e1000_media_type_internal_serdes = 2,
+        e1000_media_type_fiber = 2,
+        e1000_media_type_internal_serdes = 3,
         e1000_num_media_types
 };
 
@@ -524,6 +527,7 @@ struct e1000_dev_spec_82575 {
         bool sgmii_active;
         bool global_device_reset;
         bool eee_disable;
+        bool clear_semaphore_once;
 };
 
 struct e1000_hw {
diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
index 6a42344f24f1..ddb3cf51b9b9 100644
--- a/drivers/net/ethernet/intel/igb/e1000_i210.c
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
@@ -44,10 +44,42 @@
 static s32 igb_get_hw_semaphore_i210(struct e1000_hw *hw)
 {
         u32 swsm;
-        s32 ret_val = E1000_SUCCESS;
         s32 timeout = hw->nvm.word_size + 1;
         s32 i = 0;
 
+        /* Get the SW semaphore */
+        while (i < timeout) {
+                swsm = rd32(E1000_SWSM);
+                if (!(swsm & E1000_SWSM_SMBI))
+                        break;
+
+                udelay(50);
+                i++;
+        }
+
+        if (i == timeout) {
+                /* In rare circumstances, the SW semaphore may already be held
+                 * unintentionally. Clear the semaphore once before giving up.
+                 */
+                if (hw->dev_spec._82575.clear_semaphore_once) {
+                        hw->dev_spec._82575.clear_semaphore_once = false;
+                        igb_put_hw_semaphore(hw);
+                        for (i = 0; i < timeout; i++) {
+                                swsm = rd32(E1000_SWSM);
+                                if (!(swsm & E1000_SWSM_SMBI))
+                                        break;
+
+                                udelay(50);
+                        }
+                }
+
+                /* If we do not have the semaphore here, we have to give up. */
+                if (i == timeout) {
+                        hw_dbg("Driver can't access device - SMBI bit is set.\n");
+                        return -E1000_ERR_NVM;
+                }
+        }
+
         /* Get the FW semaphore. */
         for (i = 0; i < timeout; i++) {
                 swsm = rd32(E1000_SWSM);
@@ -64,12 +96,10 @@ static s32 igb_get_hw_semaphore_i210(struct e1000_hw *hw)
                 /* Release semaphores */
                 igb_put_hw_semaphore(hw);
                 hw_dbg("Driver can't access the NVM\n");
-                ret_val = -E1000_ERR_NVM;
-                goto out;
+                return -E1000_ERR_NVM;
         }
 
-out:
-        return ret_val;
+        return E1000_SUCCESS;
 }
 
 /**
@@ -99,23 +129,6 @@ void igb_release_nvm_i210(struct e1000_hw *hw)
 }
 
 /**
- *  igb_put_hw_semaphore_i210 - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- */
-static void igb_put_hw_semaphore_i210(struct e1000_hw *hw)
-{
-        u32 swsm;
-
-        swsm = rd32(E1000_SWSM);
-
-        swsm &= ~E1000_SWSM_SWESMBI;
-
-        wr32(E1000_SWSM, swsm);
-}
-
-/**
  *  igb_acquire_swfw_sync_i210 - Acquire SW/FW semaphore
  *  @hw: pointer to the HW structure
  *  @mask: specifies which semaphore to acquire
@@ -138,13 +151,11 @@ s32 igb_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask)
                 }
 
                 swfw_sync = rd32(E1000_SW_FW_SYNC);
-                if (!(swfw_sync & fwmask))
+                if (!(swfw_sync & (fwmask | swmask)))
                         break;
 
-                /*
-                 * Firmware currently using resource (fwmask)
-                 */
-                igb_put_hw_semaphore_i210(hw);
+                /* Firmware currently using resource (fwmask) */
+                igb_put_hw_semaphore(hw);
                 mdelay(5);
                 i++;
         }
@@ -158,7 +169,7 @@ s32 igb_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask)
         swfw_sync |= swmask;
         wr32(E1000_SW_FW_SYNC, swfw_sync);
 
-        igb_put_hw_semaphore_i210(hw);
+        igb_put_hw_semaphore(hw);
 out:
         return ret_val;
 }
@@ -182,7 +193,7 @@ void igb_release_swfw_sync_i210(struct e1000_hw *hw, u16 mask)
         swfw_sync &= ~mask;
         wr32(E1000_SW_FW_SYNC, swfw_sync);
 
-        igb_put_hw_semaphore_i210(hw);
+        igb_put_hw_semaphore(hw);
 }
 
 /**
@@ -203,7 +214,8 @@ s32 igb_read_nvm_srrd_i210(struct e1000_hw *hw, u16 offset, u16 words,
 
         /* We cannot hold synchronization semaphores for too long,
          * because of forceful takeover procedure. However it is more efficient
-         * to read in bursts than synchronizing access for each word. */
+         * to read in bursts than synchronizing access for each word.
+         */
         for (i = 0; i < words; i += E1000_EERD_EEWR_MAX_COUNT) {
                 count = (words - i) / E1000_EERD_EEWR_MAX_COUNT > 0 ?
                         E1000_EERD_EEWR_MAX_COUNT : (words - i);
@@ -242,8 +254,7 @@ static s32 igb_write_nvm_srwr(struct e1000_hw *hw, u16 offset, u16 words,
         u32 attempts = 100000;
         s32 ret_val = E1000_SUCCESS;
 
-        /*
-         * A check for invalid values:  offset too large, too many words,
+        /* A check for invalid values:  offset too large, too many words,
          * too many words for the offset, and not enough words.
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
@@ -294,7 +305,7 @@ out:
  *
  *  If error code is returned, data and Shadow RAM may be inconsistent - buffer
  *  partially written.
- */
+ **/
 s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset, u16 words,
                               u16 *data)
 {
@@ -326,7 +337,7 @@ s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset, u16 words,
 /**
  *  igb_read_nvm_i211 - Read NVM wrapper function for I211
  *  @hw: pointer to the HW structure
- *  @address: the word address (aka eeprom offset) to read
+ *  @words: number of words to read
  *  @data: pointer to the data read
  *
  *  Wrapper function to return data formerly found in the NVM.
@@ -549,8 +560,7 @@ s32 igb_validate_nvm_checksum_i210(struct e1000_hw *hw)
 
         if (hw->nvm.ops.acquire(hw) == E1000_SUCCESS) {
 
-                /*
-                 * Replace the read function with semaphore grabbing with
+                /* Replace the read function with semaphore grabbing with
                  * the one that skips this for a while.
                  * We have semaphore taken already here.
                  */
@@ -570,7 +580,6 @@ s32 igb_validate_nvm_checksum_i210(struct e1000_hw *hw)
         return status;
 }
 
-
 /**
  *  igb_update_nvm_checksum_i210 - Update EEPROM checksum
  *  @hw: pointer to the HW structure
@@ -585,8 +594,7 @@ s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw)
         u16 checksum = 0;
         u16 i, nvm_data;
 
-        /*
-         * Read the first word from the EEPROM. If this times out or fails, do
+        /* Read the first word from the EEPROM. If this times out or fails, do
          * not continue or we could be in for a very long wait while every
          * EEPROM read fails
          */
@@ -597,8 +605,7 @@ s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw)
         }
 
         if (hw->nvm.ops.acquire(hw) == E1000_SUCCESS) {
-                /*
-                 * Do not use hw->nvm.ops.write, hw->nvm.ops.read
+                /* Do not use hw->nvm.ops.write, hw->nvm.ops.read
                  * because we do not want to take the synchronization
                  * semaphores twice here.
                  */
@@ -635,7 +642,7 @@ out:
  *  igb_pool_flash_update_done_i210 - Pool FLUDONE status.
  *  @hw: pointer to the HW structure
  *
- */
+ **/
 static s32 igb_pool_flash_update_done_i210(struct e1000_hw *hw)
 {
         s32 ret_val = -E1000_ERR_NVM;
@@ -714,3 +721,68 @@ s32 igb_valid_led_default_i210(struct e1000_hw *hw, u16 *data)
 out:
         return ret_val;
 }
+
+/**
+ *  __igb_access_xmdio_reg - Read/write XMDIO register
+ *  @hw: pointer to the HW structure
+ *  @address: XMDIO address to program
+ *  @dev_addr: device address to program
+ *  @data: pointer to value to read/write from/to the XMDIO address
+ *  @read: boolean flag to indicate read or write
+ **/
+static s32 __igb_access_xmdio_reg(struct e1000_hw *hw, u16 address,
+                                  u8 dev_addr, u16 *data, bool read)
+{
+        s32 ret_val = E1000_SUCCESS;
+
+        ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, dev_addr);
+        if (ret_val)
+                return ret_val;
+
+        ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAAD, address);
+        if (ret_val)
+                return ret_val;
+
+        ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, E1000_MMDAC_FUNC_DATA |
+                                                         dev_addr);
+        if (ret_val)
+                return ret_val;
+
+        if (read)
+                ret_val = hw->phy.ops.read_reg(hw, E1000_MMDAAD, data);
+        else
+                ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAAD, *data);
+        if (ret_val)
+                return ret_val;
+
+        /* Recalibrate the device back to 0 */
+        ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, 0);
+        if (ret_val)
+                return ret_val;
+
+        return ret_val;
+}
+
+/**
+ *  igb_read_xmdio_reg - Read XMDIO register
+ *  @hw: pointer to the HW structure
+ *  @addr: XMDIO address to program
+ *  @dev_addr: device address to program
+ *  @data: value to be read from the EMI address
+ **/
+s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 *data)
+{
+        return __igb_access_xmdio_reg(hw, addr, dev_addr, data, true);
+}
+
+/**
+ *  igb_write_xmdio_reg - Write XMDIO register
+ *  @hw: pointer to the HW structure
+ *  @addr: XMDIO address to program
+ *  @dev_addr: device address to program
+ *  @data: value to be written to the XMDIO address
+ **/
+s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)
+{
+        return __igb_access_xmdio_reg(hw, addr, dev_addr, &data, false);
+}
diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.h b/drivers/net/ethernet/intel/igb/e1000_i210.h
index e4e1a73b7c75..bfc08e05c907 100644
--- a/drivers/net/ethernet/intel/igb/e1000_i210.h
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.h
@@ -45,6 +45,10 @@ extern s32 igb_read_nvm_i211(struct e1000_hw *hw, u16 offset, u16 words,
                                u16 *data);
 extern s32 igb_read_invm_version(struct e1000_hw *hw,
                                  struct e1000_fw_version *invm_ver);
+extern s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,
+                              u16 *data);
+extern s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,
+                               u16 data);
 
 #define E1000_STM_OPCODE                0xDB00
 #define E1000_EEPROM_FLASH_SIZE_WORD    0x11
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
index a5c7200b9a71..2559d70a2321 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mac.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c
@@ -214,7 +214,7 @@ s32 igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add)
                 else
                         vfta &= ~mask;
         }
-        if (hw->mac.type == e1000_i350)
+        if ((hw->mac.type == e1000_i350) || (hw->mac.type == e1000_i354))
                 igb_write_vfta_i350(hw, index, vfta);
         else
                 igb_write_vfta(hw, index, vfta);
@@ -230,8 +230,8 @@ s32 igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add)
  *  Checks the nvm for an alternate MAC address.  An alternate MAC address
  *  can be setup by pre-boot software and must be treated like a permanent
  *  address and must override the actual permanent MAC address.  If an
- *  alternate MAC address is fopund it is saved in the hw struct and
- *  prgrammed into RAR0 and the cuntion returns success, otherwise the
+ *  alternate MAC address is found it is saved in the hw struct and
+ *  programmed into RAR0 and the function returns success, otherwise the
  *  function returns an error.
  **/
 s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
@@ -241,8 +241,7 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
         u16 offset, nvm_alt_mac_addr_offset, nvm_data;
         u8 alt_mac_addr[ETH_ALEN];
 
-        /*
-         * Alternate MAC address is handled by the option ROM for 82580
+        /* Alternate MAC address is handled by the option ROM for 82580
          * and newer. SW support not required.
          */
         if (hw->mac.type >= e1000_82580)
@@ -285,8 +284,7 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
                 goto out;
         }
 
-        /*
-         * We have a valid alternate MAC address, and we want to treat it the
+        /* We have a valid alternate MAC address, and we want to treat it the
          * same as the normal permanent MAC address stored by the HW into the
          * RAR. Do this by mapping this address into RAR0.
          */
@@ -309,8 +307,7 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
 {
         u32 rar_low, rar_high;
 
-        /*
-         * HW expects these in little endian so we reverse the byte order
+        /* HW expects these in little endian so we reverse the byte order
          * from network order (big endian) to little endian
          */
         rar_low = ((u32) addr[0] |
@@ -323,8 +320,7 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
         if (rar_low || rar_high)
                 rar_high |= E1000_RAH_AV;
 
-        /*
-         * Some bridges will combine consecutive 32-bit writes into
+        /* Some bridges will combine consecutive 32-bit writes into
          * a single burst write, which will malfunction on some parts.
          * The flushes avoid this.
          */
@@ -348,8 +344,7 @@ void igb_mta_set(struct e1000_hw *hw, u32 hash_value)
 {
         u32 hash_bit, hash_reg, mta;
 
-        /*
-         * The MTA is a register array of 32-bit registers. It is
+        /* The MTA is a register array of 32-bit registers. It is
          * treated like an array of (32*mta_reg_count) bits.  We want to
          * set bit BitArray[hash_value]. So we figure out what register
          * the bit is in, read it, OR in the new bit, then write
@@ -386,15 +381,13 @@ static u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
         /* Register count multiplied by bits per register */
         hash_mask = (hw->mac.mta_reg_count * 32) - 1;
 
-        /*
-         * For a mc_filter_type of 0, bit_shift is the number of left-shifts
+        /* For a mc_filter_type of 0, bit_shift is the number of left-shifts
          * where 0xFF would still fall within the hash mask.
          */
         while (hash_mask >> bit_shift != 0xFF)
                 bit_shift++;
 
-        /*
-         * The portion of the address that is used for the hash table
+        /* The portion of the address that is used for the hash table
          * is determined by the mc_filter_type setting.
          * The algorithm is such that there is a total of 8 bits of shifting.
          * The bit_shift for a mc_filter_type of 0 represents the number of
@@ -536,8 +529,7 @@ s32 igb_check_for_copper_link(struct e1000_hw *hw)
         s32 ret_val;
         bool link;
 
-        /*
-         * We only want to go out to the PHY registers to see if Auto-Neg
+        /* We only want to go out to the PHY registers to see if Auto-Neg
          * has completed and/or if our link status has changed.  The
          * get_link_status flag is set upon receiving a Link Status
          * Change or Rx Sequence Error interrupt.
@@ -547,8 +539,7 @@ s32 igb_check_for_copper_link(struct e1000_hw *hw)
                 goto out;
         }
 
-        /*
-         * First we want to see if the MII Status Register reports
+        /* First we want to see if the MII Status Register reports
          * link.  If so, then we want to get the current speed/duplex
          * of the PHY.
          */
@@ -561,14 +552,12 @@ s32 igb_check_for_copper_link(struct e1000_hw *hw)
 
         mac->get_link_status = false;
 
-        /*
-         * Check if there was DownShift, must be checked
+        /* Check if there was DownShift, must be checked
          * immediately after link-up
          */
         igb_check_downshift(hw);
 
-        /*
-         * If we are forcing speed/duplex, then we simply return since
+        /* If we are forcing speed/duplex, then we simply return since
          * we have already determined whether we have link or not.
          */
         if (!mac->autoneg) {
@@ -576,15 +565,13 @@ s32 igb_check_for_copper_link(struct e1000_hw *hw)
                 goto out;
         }
 
-        /*
-         * Auto-Neg is enabled.  Auto Speed Detection takes care
+        /* Auto-Neg is enabled.  Auto Speed Detection takes care
          * of MAC speed/duplex configuration.  So we only need to
          * configure Collision Distance in the MAC.
          */
         igb_config_collision_dist(hw);
 
-        /*
-         * Configure Flow Control now that Auto-Neg has completed.
+        /* Configure Flow Control now that Auto-Neg has completed.
          * First, we need to restore the desired flow control
          * settings because we may have had to re-autoneg with a
          * different link partner.
@@ -611,15 +598,13 @@ s32 igb_setup_link(struct e1000_hw *hw)
 {
         s32 ret_val = 0;
 
-        /*
-         * In the case of the phy reset being blocked, we already have a link.
+        /* In the case of the phy reset being blocked, we already have a link.
          * We do not need to set it up again.
          */
         if (igb_check_reset_block(hw))
                 goto out;
 
-        /*
-         * If requested flow control is set to default, set flow control
+        /* If requested flow control is set to default, set flow control
          * based on the EEPROM flow control settings.
          */
         if (hw->fc.requested_mode == e1000_fc_default) {
@@ -628,8 +613,7 @@ s32 igb_setup_link(struct e1000_hw *hw)
                         goto out;
         }
 
-        /*
-         * We want to save off the original Flow Control configuration just
+        /* We want to save off the original Flow Control configuration just
          * in case we get disconnected and then reconnected into a different
          * hub or switch with different Flow Control capabilities.
          */
@@ -642,8 +626,7 @@ s32 igb_setup_link(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * Initialize the flow control address, type, and PAUSE timer
+        /* Initialize the flow control address, type, and PAUSE timer
          * registers to their default values.  This is done even if flow
          * control is disabled, because it does not hurt anything to
          * initialize these registers.
@@ -696,16 +679,14 @@ static s32 igb_set_fc_watermarks(struct e1000_hw *hw)
         s32 ret_val = 0;
         u32 fcrtl = 0, fcrth = 0;
 
-        /*
-         * Set the flow control receive threshold registers.  Normally,
+        /* Set the flow control receive threshold registers.  Normally,
          * these registers will be set to a default threshold that may be
          * adjusted later by the driver's runtime code.  However, if the
          * ability to transmit pause frames is not enabled, then these
          * registers will be set to 0.
          */
         if (hw->fc.current_mode & e1000_fc_tx_pause) {
-                /*
-                 * We need to set up the Receive Threshold high and low water
+                /* We need to set up the Receive Threshold high and low water
                  * marks as well as (optionally) enabling the transmission of
                  * XON frames.
                  */
@@ -733,8 +714,7 @@ static s32 igb_set_default_fc(struct e1000_hw *hw)
         s32 ret_val = 0;
         u16 nvm_data;
 
-        /*
-         * Read and store word 0x0F of the EEPROM. This word contains bits
+        /* Read and store word 0x0F of the EEPROM. This word contains bits
          * that determine the hardware's default PAUSE (flow control) mode,
          * a bit that determines whether the HW defaults to enabling or
          * disabling auto-negotiation, and the direction of the
@@ -778,8 +758,7 @@ s32 igb_force_mac_fc(struct e1000_hw *hw)
 
         ctrl = rd32(E1000_CTRL);
 
-        /*
-         * Because we didn't get link via the internal auto-negotiation
+        /* Because we didn't get link via the internal auto-negotiation
          * mechanism (we either forced link or we got link via PHY
          * auto-neg), we have to manually enable/disable transmit an
          * receive flow control.
@@ -843,8 +822,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
         u16 mii_status_reg, mii_nway_adv_reg, mii_nway_lp_ability_reg;
         u16 speed, duplex;
 
-        /*
-         * Check for the case where we have fiber media and auto-neg failed
+        /* Check for the case where we have fiber media and auto-neg failed
          * so we had to force link.  In this case, we need to force the
          * configuration of the MAC to match the "fc" parameter.
          */
@@ -861,15 +839,13 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                 goto out;
         }
 
-        /*
-         * Check for the case where we have copper media and auto-neg is
+        /* Check for the case where we have copper media and auto-neg is
          * enabled.  In this case, we need to check and see if Auto-Neg
          * has completed, and if so, how the PHY and link partner has
          * flow control configured.
          */
         if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg) {
-                /*
-                 * Read the MII Status Register and check to see if AutoNeg
+                /* Read the MII Status Register and check to see if AutoNeg
                  * has completed.  We read this twice because this reg has
                  * some "sticky" (latched) bits.
                  */
@@ -888,8 +864,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                         goto out;
                 }
 
-                /*
-                 * The AutoNeg process has completed, so we now need to
+                /* The AutoNeg process has completed, so we now need to
                  * read both the Auto Negotiation Advertisement
                  * Register (Address 4) and the Auto_Negotiation Base
                  * Page Ability Register (Address 5) to determine how
@@ -904,8 +879,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                 if (ret_val)
                         goto out;
 
-                /*
-                 * Two bits in the Auto Negotiation Advertisement Register
+                /* Two bits in the Auto Negotiation Advertisement Register
                  * (Address 4) and two bits in the Auto Negotiation Base
                  * Page Ability Register (Address 5) determine flow control
                  * for both the PHY and the link partner.  The following
@@ -940,8 +914,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                  */
                 if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
                     (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-                        /*
-                         * Now we need to check if the user selected RX ONLY
+                        /* Now we need to check if the user selected RX ONLY
                          * of pause frames.  In this case, we had to advertise
                          * FULL flow control because we could not advertise RX
                          * ONLY. Hence, we must now check to see if we need to
@@ -956,8 +929,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                                        "RX PAUSE frames only.\r\n");
                         }
                 }
-                /*
-                 * For receiving PAUSE frames ONLY.
+                /* For receiving PAUSE frames ONLY.
                  *
                  *   LOCAL DEVICE  |   LINK PARTNER
                  * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
@@ -971,8 +943,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                         hw->fc.current_mode = e1000_fc_tx_pause;
                         hw_dbg("Flow Control = TX PAUSE frames only.\r\n");
                 }
-                /*
-                 * For transmitting PAUSE frames ONLY.
+                /* For transmitting PAUSE frames ONLY.
                  *
                  *   LOCAL DEVICE  |   LINK PARTNER
                  * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
@@ -986,8 +957,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                         hw->fc.current_mode = e1000_fc_rx_pause;
                         hw_dbg("Flow Control = RX PAUSE frames only.\r\n");
                 }
-                /*
-                 * Per the IEEE spec, at this point flow control should be
+                /* Per the IEEE spec, at this point flow control should be
                  * disabled.  However, we want to consider that we could
                  * be connected to a legacy switch that doesn't advertise
                  * desired flow control, but can be forced on the link
@@ -1007,9 +977,9 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                  * be asked to delay transmission of packets than asking
                  * our link partner to pause transmission of frames.
                  */
-                else if ((hw->fc.requested_mode == e1000_fc_none ||
-                          hw->fc.requested_mode == e1000_fc_tx_pause) ||
-                         hw->fc.strict_ieee) {
+                else if ((hw->fc.requested_mode == e1000_fc_none) ||
+                         (hw->fc.requested_mode == e1000_fc_tx_pause) ||
+                         (hw->fc.strict_ieee)) {
                         hw->fc.current_mode = e1000_fc_none;
                         hw_dbg("Flow Control = NONE.\r\n");
                 } else {
@@ -1017,8 +987,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                         hw_dbg("Flow Control = RX PAUSE frames only.\r\n");
                 }
 
-                /*
-                 * Now we need to do one last check...  If we auto-
+                /* Now we need to do one last check...  If we auto-
                  * negotiated to HALF DUPLEX, flow control should not be
                  * enabled per IEEE 802.3 spec.
                  */
@@ -1031,8 +1000,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                 if (duplex == HALF_DUPLEX)
                         hw->fc.current_mode = e1000_fc_none;
 
-                /*
-                 * Now we call a subroutine to actually force the MAC
+                /* Now we call a subroutine to actually force the MAC
                  * controller to use the correct flow control settings.
                  */
                 ret_val = igb_force_mac_fc(hw);
@@ -1203,6 +1171,17 @@ s32 igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
                 hw_dbg("Half Duplex\n");
         }
 
+        /* Check if it is an I354 2.5Gb backplane connection. */
+        if (hw->mac.type == e1000_i354) {
+                if ((status & E1000_STATUS_2P5_SKU) &&
+                    !(status & E1000_STATUS_2P5_SKU_OVER)) {
+                        *speed = SPEED_2500;
+                        *duplex = FULL_DUPLEX;
+                        hw_dbg("2500 Mbs, ");
+                        hw_dbg("Full Duplex\n");
+                }
+        }
+
         return 0;
 }
 
@@ -1427,8 +1406,7 @@ s32 igb_blink_led(struct e1000_hw *hw)
         u32 ledctl_blink = 0;
         u32 i;
 
-        /*
-         * set the blink bit for each LED that's "on" (0x0E)
+        /* set the blink bit for each LED that's "on" (0x0E)
          * in ledctl_mode2
          */
         ledctl_blink = hw->mac.ledctl_mode2;
@@ -1467,7 +1445,7 @@ s32 igb_led_off(struct e1000_hw *hw)
  *  @hw: pointer to the HW structure
  *
  *  Returns 0 (0) if successful, else returns -10
- *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not casued
+ *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not caused
  *  the master requests to be disabled.
  *
  *  Disables PCI-Express master access and verifies there are no pending
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h
index e6d6ce433261..5e13e83cc608 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mac.h
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.h
@@ -35,8 +35,7 @@
 #include "e1000_defines.h"
 #include "e1000_i210.h"
 
-/*
- * Functions that should not be called directly from drivers but can be used
+/* Functions that should not be called directly from drivers but can be used
  * by other files in this 'shared code'
  */
 s32  igb_blink_led(struct e1000_hw *hw);
@@ -49,15 +48,15 @@ s32  igb_get_auto_rd_done(struct e1000_hw *hw);
 s32  igb_get_bus_info_pcie(struct e1000_hw *hw);
 s32  igb_get_hw_semaphore(struct e1000_hw *hw);
 s32  igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
-                                       u16 *duplex);
+                                     u16 *duplex);
 s32  igb_id_led_init(struct e1000_hw *hw);
 s32  igb_led_off(struct e1000_hw *hw);
 void igb_update_mc_addr_list(struct e1000_hw *hw,
-                             u8 *mc_addr_list, u32 mc_addr_count);
+                             u8 *mc_addr_list, u32 mc_addr_count);
 s32  igb_setup_link(struct e1000_hw *hw);
 s32  igb_validate_mdi_setting(struct e1000_hw *hw);
 s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
-                               u32 offset, u8 data);
+                             u32 offset, u8 data);
 
 void igb_clear_hw_cntrs_base(struct e1000_hw *hw);
 void igb_clear_vfta(struct e1000_hw *hw);
@@ -80,12 +79,12 @@ enum e1000_mng_mode {
         e1000_mng_mode_host_if_only
 };
 
-#define E1000_FACTPS_MNGCG    0x20000000
+#define E1000_FACTPS_MNGCG      0x20000000
 
-#define E1000_FWSM_MODE_MASK  0xE
-#define E1000_FWSM_MODE_SHIFT 1
+#define E1000_FWSM_MODE_MASK    0xE
+#define E1000_FWSM_MODE_SHIFT   1
 
-#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN    0x2
+#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN       0x2
 
 extern void e1000_init_function_pointers_82575(struct e1000_hw *hw);
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c
index 38e0df350904..dac1447fabf7 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mbx.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.c
@@ -196,7 +196,8 @@ out:
  *  returns SUCCESS if it successfully received a message notification and
  *  copied it into the receive buffer.
  **/
-static s32 igb_read_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+static s32 igb_read_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size,
+                               u16 mbx_id)
 {
         struct e1000_mbx_info *mbx = &hw->mbx;
         s32 ret_val = -E1000_ERR_MBX;
@@ -222,7 +223,8 @@ out:
  *  returns SUCCESS if it successfully copied message into the buffer and
  *  received an ack to that message within delay * timeout period
  **/
-static s32 igb_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+static s32 igb_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size,
+                                u16 mbx_id)
 {
         struct e1000_mbx_info *mbx = &hw->mbx;
         s32 ret_val = -E1000_ERR_MBX;
@@ -325,7 +327,6 @@ static s32 igb_obtain_mbx_lock_pf(struct e1000_hw *hw, u16 vf_number)
         s32 ret_val = -E1000_ERR_MBX;
         u32 p2v_mailbox;
 
-
         /* Take ownership of the buffer */
         wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_PFU);
 
@@ -347,7 +348,7 @@ static s32 igb_obtain_mbx_lock_pf(struct e1000_hw *hw, u16 vf_number)
  *  returns SUCCESS if it successfully copied message into the buffer
  **/
 static s32 igb_write_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
-                              u16 vf_number)
+                            u16 vf_number)
 {
         s32 ret_val;
         u16 i;
@@ -388,7 +389,7 @@ out_no_write:
  *  a message due to a VF request so no polling for message is needed.
  **/
 static s32 igb_read_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
-                             u16 vf_number)
+                           u16 vf_number)
 {
         s32 ret_val;
         u16 i;
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h
index c13b56d9edb2..de9bba41acf3 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mbx.h
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.h
@@ -30,42 +30,42 @@
 
 #include "e1000_hw.h"
 
-#define E1000_P2VMAILBOX_STS   0x00000001 /* Initiate message send to VF */
-#define E1000_P2VMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
-#define E1000_P2VMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define E1000_P2VMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define E1000_P2VMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
+#define E1000_P2VMAILBOX_STS    0x00000001 /* Initiate message send to VF */
+#define E1000_P2VMAILBOX_ACK    0x00000002 /* Ack message recv'd from VF */
+#define E1000_P2VMAILBOX_VFU    0x00000004 /* VF owns the mailbox buffer */
+#define E1000_P2VMAILBOX_PFU    0x00000008 /* PF owns the mailbox buffer */
+#define E1000_P2VMAILBOX_RVFU   0x00000010 /* Reset VFU - used when VF stuck */
 
-#define E1000_MBVFICR_VFREQ_MASK 0x000000FF /* bits for VF messages */
-#define E1000_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
-#define E1000_MBVFICR_VFACK_MASK 0x00FF0000 /* bits for VF acks */
-#define E1000_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
+#define E1000_MBVFICR_VFREQ_MASK        0x000000FF /* bits for VF messages */
+#define E1000_MBVFICR_VFREQ_VF1         0x00000001 /* bit for VF 1 message */
+#define E1000_MBVFICR_VFACK_MASK        0x00FF0000 /* bits for VF acks */
+#define E1000_MBVFICR_VFACK_VF1         0x00010000 /* bit for VF 1 ack */
 
-#define E1000_VFMAILBOX_SIZE   16 /* 16 32 bit words - 64 bytes */
+#define E1000_VFMAILBOX_SIZE    16 /* 16 32 bit words - 64 bytes */
 
 /* If it's a E1000_VF_* msg then it originates in the VF and is sent to the
  * PF.  The reverse is true if it is E1000_PF_*.
  * Message ACK's are the value or'd with 0xF0000000
  */
-#define E1000_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
-                                               * this are the ACK */
-#define E1000_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
-                                               * this are the NACK */
-#define E1000_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
-                                                 clear to send requests */
-#define E1000_VT_MSGINFO_SHIFT    16
+/* Messages below or'd with this are the ACK */
+#define E1000_VT_MSGTYPE_ACK    0x80000000
+/* Messages below or'd with this are the NACK */
+#define E1000_VT_MSGTYPE_NACK   0x40000000
+/* Indicates that VF is still clear to send requests */
+#define E1000_VT_MSGTYPE_CTS    0x20000000
+#define E1000_VT_MSGINFO_SHIFT  16
 /* bits 23:16 are used for exra info for certain messages */
-#define E1000_VT_MSGINFO_MASK     (0xFF << E1000_VT_MSGINFO_SHIFT)
+#define E1000_VT_MSGINFO_MASK   (0xFF << E1000_VT_MSGINFO_SHIFT)
 
-#define E1000_VF_RESET            0x01 /* VF requests reset */
-#define E1000_VF_SET_MAC_ADDR     0x02 /* VF requests to set MAC addr */
-#define E1000_VF_SET_MULTICAST    0x03 /* VF requests to set MC addr */
-#define E1000_VF_SET_VLAN         0x04 /* VF requests to set VLAN */
-#define E1000_VF_SET_LPE          0x05 /* VF requests to set VMOLR.LPE */
-#define E1000_VF_SET_PROMISC      0x06 /*VF requests to clear VMOLR.ROPE/MPME*/
-#define E1000_VF_SET_PROMISC_MULTICAST    (0x02 << E1000_VT_MSGINFO_SHIFT)
+#define E1000_VF_RESET          0x01 /* VF requests reset */
+#define E1000_VF_SET_MAC_ADDR   0x02 /* VF requests to set MAC addr */
+#define E1000_VF_SET_MULTICAST  0x03 /* VF requests to set MC addr */
+#define E1000_VF_SET_VLAN       0x04 /* VF requests to set VLAN */
+#define E1000_VF_SET_LPE        0x05 /* VF requests to set VMOLR.LPE */
+#define E1000_VF_SET_PROMISC    0x06 /*VF requests to clear VMOLR.ROPE/MPME*/
+#define E1000_VF_SET_PROMISC_MULTICAST  (0x02 << E1000_VT_MSGINFO_SHIFT)
 
-#define E1000_PF_CONTROL_MSG      0x0100 /* PF control message */
+#define E1000_PF_CONTROL_MSG    0x0100 /* PF control message */
 
 s32 igb_read_mbx(struct e1000_hw *, u32 *, u16, u16);
 s32 igb_write_mbx(struct e1000_hw *, u32 *, u16, u16);
diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
index 5b62adbe134d..7f9cd7cbd353 100644
--- a/drivers/net/ethernet/intel/igb/e1000_nvm.c
+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.c
@@ -289,15 +289,14 @@ static s32 igb_ready_nvm_eeprom(struct e1000_hw *hw)
                 udelay(1);
                 timeout = NVM_MAX_RETRY_SPI;
 
-                /*
-                 * Read "Status Register" repeatedly until the LSB is cleared.
+                /* Read "Status Register" repeatedly until the LSB is cleared.
                  * The EEPROM will signal that the command has been completed
                  * by clearing bit 0 of the internal status register.  If it's
                  * not cleared within 'timeout', then error out.
                  */
                 while (timeout) {
                         igb_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
-                                                 hw->nvm.opcode_bits);
+                                               hw->nvm.opcode_bits);
                         spi_stat_reg = (u8)igb_shift_in_eec_bits(hw, 8);
                         if (!(spi_stat_reg & NVM_STATUS_RDY_SPI))
                                 break;
@@ -335,8 +334,7 @@ s32 igb_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         u16 word_in;
         u8 read_opcode = NVM_READ_OPCODE_SPI;
 
-        /*
-         * A check for invalid values:  offset too large, too many words,
+        /* A check for invalid values:  offset too large, too many words,
          * and not enough words.
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
@@ -363,8 +361,7 @@ s32 igb_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         igb_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
         igb_shift_out_eec_bits(hw, (u16)(offset*2), nvm->address_bits);
 
-        /*
-         * Read the data.  SPI NVMs increment the address with each byte
+        /* Read the data.  SPI NVMs increment the address with each byte
          * read and will roll over if reading beyond the end.  This allows
          * us to read the whole NVM from any offset
          */
@@ -395,8 +392,7 @@ s32 igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         u32 i, eerd = 0;
         s32 ret_val = 0;
 
-        /*
-         * A check for invalid values:  offset too large, too many words,
+        /* A check for invalid values:  offset too large, too many words,
          * and not enough words.
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
@@ -408,7 +404,7 @@ s32 igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 
         for (i = 0; i < words; i++) {
                 eerd = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) +
-                       E1000_NVM_RW_REG_START;
+                        E1000_NVM_RW_REG_START;
 
                 wr32(E1000_EERD, eerd);
                 ret_val = igb_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
@@ -441,8 +437,7 @@ s32 igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         s32 ret_val = -E1000_ERR_NVM;
         u16 widx = 0;
 
-        /*
-         * A check for invalid values:  offset too large, too many words,
+        /* A check for invalid values:  offset too large, too many words,
          * and not enough words.
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
@@ -472,8 +467,7 @@ s32 igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 
                 igb_standby_nvm(hw);
 
-                /*
-                 * Some SPI eeproms use the 8th address bit embedded in the
+                /* Some SPI eeproms use the 8th address bit embedded in the
                  * opcode
                  */
                 if ((nvm->address_bits == 8) && (offset >= 128))
@@ -538,8 +532,7 @@ s32 igb_read_part_string(struct e1000_hw *hw, u8 *part_num, u32 part_num_size)
                 goto out;
         }
 
-        /*
-         * if nvm_data is not ptr guard the PBA must be in legacy format which
+        /* if nvm_data is not ptr guard the PBA must be in legacy format which
          * means pointer is actually our second data word for the PBA number
          * and we can decode it into an ascii string
          */
@@ -728,6 +721,7 @@ void igb_get_fw_version(struct e1000_hw *hw, struct e1000_fw_version *fw_vers)
         case e1000_82575:
         case e1000_82576:
         case e1000_82580:
+        case e1000_i354:
         case e1000_i350:
         case e1000_i210:
                 break;
@@ -746,6 +740,7 @@ void igb_get_fw_version(struct e1000_hw *hw, struct e1000_fw_version *fw_vers)
 
         switch (hw->mac.type) {
         case e1000_i210:
+        case e1000_i354:
         case e1000_i350:
                 /* find combo image version */
                 hw->nvm.ops.read(hw, NVM_COMB_VER_PTR, 1, &comb_offset);
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 2918c979b5bb..115b0da6e013 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -33,29 +33,29 @@
 
 static s32  igb_phy_setup_autoneg(struct e1000_hw *hw);
 static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw,
-                                               u16 *phy_ctrl);
+                                             u16 *phy_ctrl);
 static s32  igb_wait_autoneg(struct e1000_hw *hw);
 static s32  igb_set_master_slave_mode(struct e1000_hw *hw);
 
 /* Cable length tables */
-static const u16 e1000_m88_cable_length_table[] =
-        { 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
+static const u16 e1000_m88_cable_length_table[] = {
+        0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
 #define M88E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_m88_cable_length_table) / \
-                 sizeof(e1000_m88_cable_length_table[0]))
-
-static const u16 e1000_igp_2_cable_length_table[] =
-    { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
-      0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
-      6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
-      21, 26, 31, 35, 40, 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82,
-      40, 45, 51, 56, 61, 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104,
-      60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,
-      83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
-      104, 109, 114, 118, 121, 124};
+        (sizeof(e1000_m88_cable_length_table) / \
+        sizeof(e1000_m88_cable_length_table[0]))
+
+static const u16 e1000_igp_2_cable_length_table[] = {
+        0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
+        0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
+        6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
+        21, 26, 31, 35, 40, 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82,
+        40, 45, 51, 56, 61, 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104,
+        60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,
+        83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
+        104, 109, 114, 118, 121, 124};
 #define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_igp_2_cable_length_table) / \
-                 sizeof(e1000_igp_2_cable_length_table[0]))
+        (sizeof(e1000_igp_2_cable_length_table) / \
+         sizeof(e1000_igp_2_cable_length_table[0]))
 
 /**
  *  igb_check_reset_block - Check if PHY reset is blocked
@@ -71,8 +71,7 @@ s32 igb_check_reset_block(struct e1000_hw *hw)
 
         manc = rd32(E1000_MANC);
 
-        return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-               E1000_BLK_PHY_RESET : 0;
+        return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ? E1000_BLK_PHY_RESET : 0;
 }
 
 /**
@@ -149,8 +148,7 @@ s32 igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
                 goto out;
         }
 
-        /*
-         * Set up Op-code, Phy Address, and register offset in the MDI
+        /* Set up Op-code, Phy Address, and register offset in the MDI
          * Control register.  The MAC will take care of interfacing with the
          * PHY to retrieve the desired data.
          */
@@ -160,8 +158,7 @@ s32 igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
 
         wr32(E1000_MDIC, mdic);
 
-        /*
-         * Poll the ready bit to see if the MDI read completed
+        /* Poll the ready bit to see if the MDI read completed
          * Increasing the time out as testing showed failures with
          * the lower time out
          */
@@ -207,8 +204,7 @@ s32 igb_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
                 goto out;
         }
 
-        /*
-         * Set up Op-code, Phy Address, and register offset in the MDI
+        /* Set up Op-code, Phy Address, and register offset in the MDI
          * Control register.  The MAC will take care of interfacing with the
          * PHY to retrieve the desired data.
          */
@@ -219,8 +215,7 @@ s32 igb_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
 
         wr32(E1000_MDIC, mdic);
 
-        /*
-         * Poll the ready bit to see if the MDI read completed
+        /* Poll the ready bit to see if the MDI read completed
          * Increasing the time out as testing showed failures with
          * the lower time out
          */
@@ -259,15 +254,13 @@ s32 igb_read_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 *data)
         struct e1000_phy_info *phy = &hw->phy;
         u32 i, i2ccmd = 0;
 
-
-        /*
-         * Set up Op-code, Phy Address, and register address in the I2CCMD
+        /* Set up Op-code, Phy Address, and register address in the I2CCMD
          * register.  The MAC will take care of interfacing with the
          * PHY to retrieve the desired data.
          */
         i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
-                  (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
-                  (E1000_I2CCMD_OPCODE_READ));
+                  (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
+                  (E1000_I2CCMD_OPCODE_READ));
 
         wr32(E1000_I2CCMD, i2ccmd);
 
@@ -317,15 +310,14 @@ s32 igb_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
         /* Swap the data bytes for the I2C interface */
         phy_data_swapped = ((data >> 8) & 0x00FF) | ((data << 8) & 0xFF00);
 
-        /*
-         * Set up Op-code, Phy Address, and register address in the I2CCMD
+        /* Set up Op-code, Phy Address, and register address in the I2CCMD
          * register.  The MAC will take care of interfacing with the
          * PHY to retrieve the desired data.
          */
         i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
-                  (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
-                  E1000_I2CCMD_OPCODE_WRITE |
-                  phy_data_swapped);
+                  (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
+                  E1000_I2CCMD_OPCODE_WRITE |
+                  phy_data_swapped);
 
         wr32(E1000_I2CCMD, i2ccmd);
 
@@ -371,8 +363,8 @@ s32 igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data)
 
         if (offset > MAX_PHY_MULTI_PAGE_REG) {
                 ret_val = igb_write_phy_reg_mdic(hw,
-                                                   IGP01E1000_PHY_PAGE_SELECT,
-                                                   (u16)offset);
+                                                 IGP01E1000_PHY_PAGE_SELECT,
+                                                 (u16)offset);
                 if (ret_val) {
                         hw->phy.ops.release(hw);
                         goto out;
@@ -410,8 +402,8 @@ s32 igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
 
         if (offset > MAX_PHY_MULTI_PAGE_REG) {
                 ret_val = igb_write_phy_reg_mdic(hw,
-                                                   IGP01E1000_PHY_PAGE_SELECT,
-                                                   (u16)offset);
+                                                 IGP01E1000_PHY_PAGE_SELECT,
+                                                 (u16)offset);
                 if (ret_val) {
                         hw->phy.ops.release(hw);
                         goto out;
@@ -419,7 +411,7 @@ s32 igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
         }
 
         ret_val = igb_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                           data);
+                                         data);
 
         hw->phy.ops.release(hw);
 
@@ -439,7 +431,6 @@ s32 igb_copper_link_setup_82580(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-
         if (phy->reset_disable) {
                 ret_val = 0;
                 goto out;
@@ -472,8 +463,7 @@ s32 igb_copper_link_setup_82580(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
         phy_data &= ~I82580_PHY_CTRL2_MDIX_CFG_MASK;
-        /*
-         * Options:
+        /* Options:
          *   0 - Auto (default)
          *   1 - MDI mode
          *   2 - MDI-X mode
@@ -520,8 +510,7 @@ s32 igb_copper_link_setup_m88(struct e1000_hw *hw)
 
         phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
 
-        /*
-         * Options:
+        /* Options:
          *   MDI/MDI-X = 0 (default)
          *   0 - Auto for all speeds
          *   1 - MDI mode
@@ -546,8 +535,7 @@ s32 igb_copper_link_setup_m88(struct e1000_hw *hw)
                 break;
         }
 
-        /*
-         * Options:
+        /* Options:
          *   disable_polarity_correction = 0 (default)
          *       Automatic Correction for Reversed Cable Polarity
          *   0 - Disabled
@@ -562,12 +550,11 @@ s32 igb_copper_link_setup_m88(struct e1000_hw *hw)
                 goto out;
 
         if (phy->revision < E1000_REVISION_4) {
-                /*
-                 * Force TX_CLK in the Extended PHY Specific Control Register
+                /* Force TX_CLK in the Extended PHY Specific Control Register
                  * to 25MHz clock.
                  */
                 ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                             &phy_data);
+                                            &phy_data);
                 if (ret_val)
                         goto out;
 
@@ -630,8 +617,7 @@ s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * Options:
+        /* Options:
          *   MDI/MDI-X = 0 (default)
          *   0 - Auto for all speeds
          *   1 - MDI mode
@@ -659,8 +645,7 @@ s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw)
                 break;
         }
 
-        /*
-         * Options:
+        /* Options:
          *   disable_polarity_correction = 0 (default)
          *       Automatic Correction for Reversed Cable Polarity
          *   0 - Disabled
@@ -714,14 +699,12 @@ s32 igb_copper_link_setup_igp(struct e1000_hw *hw)
                 goto out;
         }
 
-        /*
-         * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
+        /* Wait 100ms for MAC to configure PHY from NVM settings, to avoid
          * timeout issues when LFS is enabled.
          */
         msleep(100);
 
-        /*
-         * The NVM settings will configure LPLU in D3 for
+        /* The NVM settings will configure LPLU in D3 for
          * non-IGP1 PHYs.
          */
         if (phy->type == e1000_phy_igp) {
@@ -765,8 +748,7 @@ s32 igb_copper_link_setup_igp(struct e1000_hw *hw)
 
         /* set auto-master slave resolution settings */
         if (hw->mac.autoneg) {
-                /*
-                 * when autonegotiation advertisement is only 1000Mbps then we
+                /* when autonegotiation advertisement is only 1000Mbps then we
                  * should disable SmartSpeed and enable Auto MasterSlave
                  * resolution as hardware default.
                  */
@@ -844,14 +826,12 @@ static s32 igb_copper_link_autoneg(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_ctrl;
 
-        /*
-         * Perform some bounds checking on the autoneg advertisement
+        /* Perform some bounds checking on the autoneg advertisement
          * parameter.
          */
         phy->autoneg_advertised &= phy->autoneg_mask;
 
-        /*
-         * If autoneg_advertised is zero, we assume it was not defaulted
+        /* If autoneg_advertised is zero, we assume it was not defaulted
          * by the calling code so we set to advertise full capability.
          */
         if (phy->autoneg_advertised == 0)
@@ -865,8 +845,7 @@ static s32 igb_copper_link_autoneg(struct e1000_hw *hw)
         }
         hw_dbg("Restarting Auto-Neg\n");
 
-        /*
-         * Restart auto-negotiation by setting the Auto Neg Enable bit and
+        /* Restart auto-negotiation by setting the Auto Neg Enable bit and
          * the Auto Neg Restart bit in the PHY control register.
          */
         ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
@@ -878,8 +857,7 @@ static s32 igb_copper_link_autoneg(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * Does the user want to wait for Auto-Neg to complete here, or
+        /* Does the user want to wait for Auto-Neg to complete here, or
          * check at a later time (for example, callback routine).
          */
         if (phy->autoneg_wait_to_complete) {
@@ -928,16 +906,14 @@ static s32 igb_phy_setup_autoneg(struct e1000_hw *hw)
                         goto out;
         }
 
-        /*
-         * Need to parse both autoneg_advertised and fc and set up
+        /* Need to parse both autoneg_advertised and fc and set up
          * the appropriate PHY registers.  First we will parse for
          * autoneg_advertised software override.  Since we can advertise
          * a plethora of combinations, we need to check each bit
          * individually.
          */
 
-        /*
-         * First we clear all the 10/100 mb speed bits in the Auto-Neg
+        /* First we clear all the 10/100 mb speed bits in the Auto-Neg
          * Advertisement Register (Address 4) and the 1000 mb speed bits in
          * the  1000Base-T Control Register (Address 9).
          */
@@ -983,8 +959,7 @@ static s32 igb_phy_setup_autoneg(struct e1000_hw *hw)
                 mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
         }
 
-        /*
-         * Check for a software override of the flow control settings, and
+        /* Check for a software override of the flow control settings, and
          * setup the PHY advertisement registers accordingly.  If
          * auto-negotiation is enabled, then software will have to set the
          * "PAUSE" bits to the correct value in the Auto-Negotiation
@@ -1003,15 +978,13 @@ static s32 igb_phy_setup_autoneg(struct e1000_hw *hw)
          */
         switch (hw->fc.current_mode) {
         case e1000_fc_none:
-                /*
-                 * Flow control (RX & TX) is completely disabled by a
+                /* Flow control (RX & TX) is completely disabled by a
                  * software over-ride.
                  */
                 mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                 break;
         case e1000_fc_rx_pause:
-                /*
-                 * RX Flow control is enabled, and TX Flow control is
+                /* RX Flow control is enabled, and TX Flow control is
                  * disabled, by a software over-ride.
                  *
                  * Since there really isn't a way to advertise that we are
@@ -1023,16 +996,14 @@ static s32 igb_phy_setup_autoneg(struct e1000_hw *hw)
                 mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                 break;
         case e1000_fc_tx_pause:
-                /*
-                 * TX Flow control is enabled, and RX Flow control is
+                /* TX Flow control is enabled, and RX Flow control is
                  * disabled, by a software over-ride.
                  */
                 mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
                 mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
                 break;
         case e1000_fc_full:
-                /*
-                 * Flow control (both RX and TX) is enabled by a software
+                /* Flow control (both RX and TX) is enabled by a software
                  * over-ride.
                  */
                 mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
@@ -1075,18 +1046,15 @@ s32 igb_setup_copper_link(struct e1000_hw *hw)
         s32 ret_val;
         bool link;
 
-
         if (hw->mac.autoneg) {
-                /*
-                 * Setup autoneg and flow control advertisement and perform
+                /* Setup autoneg and flow control advertisement and perform
                  * autonegotiation.
                  */
                 ret_val = igb_copper_link_autoneg(hw);
                 if (ret_val)
                         goto out;
         } else {
-                /*
-                 * PHY will be set to 10H, 10F, 100H or 100F
+                /* PHY will be set to 10H, 10F, 100H or 100F
                  * depending on user settings.
                  */
                 hw_dbg("Forcing Speed and Duplex\n");
@@ -1097,14 +1065,10 @@ s32 igb_setup_copper_link(struct e1000_hw *hw)
                 }
         }
 
-        /*
-         * Check link status. Wait up to 100 microseconds for link to become
+        /* Check link status. Wait up to 100 microseconds for link to become
          * valid.
          */
-        ret_val = igb_phy_has_link(hw,
-                                   COPPER_LINK_UP_LIMIT,
-                                   10,
-                                   &link);
+        ret_val = igb_phy_has_link(hw, COPPER_LINK_UP_LIMIT, 10, &link);
         if (ret_val)
                 goto out;
 
@@ -1145,8 +1109,7 @@ s32 igb_phy_force_speed_duplex_igp(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * Clear Auto-Crossover to force MDI manually.  IGP requires MDI
+        /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
          * forced whenever speed and duplex are forced.
          */
         ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
@@ -1167,10 +1130,7 @@ s32 igb_phy_force_speed_duplex_igp(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 hw_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
 
-                ret_val = igb_phy_has_link(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT, 10000, &link);
                 if (ret_val)
                         goto out;
 
@@ -1178,10 +1138,7 @@ s32 igb_phy_force_speed_duplex_igp(struct e1000_hw *hw)
                         hw_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
-                ret_val = igb_phy_has_link(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT, 10000, &link);
                 if (ret_val)
                         goto out;
         }
@@ -1209,8 +1166,7 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
         /* I210 and I211 devices support Auto-Crossover in forced operation. */
         if (phy->type != e1000_phy_i210) {
-                /*
-                 * Clear Auto-Crossover to force MDI manually.  M88E1000
+                /* Clear Auto-Crossover to force MDI manually.  M88E1000
                  * requires MDI forced whenever speed and duplex are forced.
                  */
                 ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL,
@@ -1266,13 +1222,12 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                         if (!reset_dsp)
                                 hw_dbg("Link taking longer than expected.\n");
                         else {
-                                /*
-                                 * We didn't get link.
+                                /* We didn't get link.
                                  * Reset the DSP and cross our fingers.
                                  */
                                 ret_val = phy->ops.write_reg(hw,
-                                                             M88E1000_PHY_PAGE_SELECT,
-                                                             0x001d);
+                                                M88E1000_PHY_PAGE_SELECT,
+                                                0x001d);
                                 if (ret_val)
                                         goto out;
                                 ret_val = igb_phy_reset_dsp(hw);
@@ -1298,8 +1253,7 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * Resetting the phy means we need to re-force TX_CLK in the
+        /* Resetting the phy means we need to re-force TX_CLK in the
          * Extended PHY Specific Control Register to 25MHz clock from
          * the reset value of 2.5MHz.
          */
@@ -1308,8 +1262,7 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * In addition, we must re-enable CRS on Tx for both half and full
+        /* In addition, we must re-enable CRS on Tx for both half and full
          * duplex.
          */
         ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
@@ -1336,7 +1289,7 @@ out:
  *  take affect.
  **/
 static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw,
-                                               u16 *phy_ctrl)
+                                             u16 *phy_ctrl)
 {
         struct e1000_mac_info *mac = &hw->mac;
         u32 ctrl;
@@ -1417,8 +1370,7 @@ s32 igb_set_d3_lplu_state(struct e1000_hw *hw, bool active)
                                              data);
                 if (ret_val)
                         goto out;
-                /*
-                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                  * during Dx states where the power conservation is most
                  * important.  During driver activity we should enable
                  * SmartSpeed, so performance is maintained.
@@ -1461,13 +1413,13 @@ s32 igb_set_d3_lplu_state(struct e1000_hw *hw, bool active)
 
                 /* When LPLU is enabled, we should disable SmartSpeed */
                 ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                             &data);
+                                            &data);
                 if (ret_val)
                         goto out;
 
                 data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                 ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                              data);
+                                             data);
         }
 
 out:
@@ -1556,8 +1508,7 @@ static s32 igb_check_polarity_igp(struct e1000_hw *hw)
         s32 ret_val;
         u16 data, offset, mask;
 
-        /*
-         * Polarity is determined based on the speed of
+        /* Polarity is determined based on the speed of
          * our connection.
          */
         ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
@@ -1569,8 +1520,7 @@ static s32 igb_check_polarity_igp(struct e1000_hw *hw)
                 offset  = IGP01E1000_PHY_PCS_INIT_REG;
                 mask    = IGP01E1000_PHY_POLARITY_MASK;
         } else {
-                /*
-                 * This really only applies to 10Mbps since
+                /* This really only applies to 10Mbps since
                  * there is no polarity for 100Mbps (always 0).
                  */
                 offset  = IGP01E1000_PHY_PORT_STATUS;
@@ -1589,7 +1539,7 @@ out:
 }
 
 /**
- *  igb_wait_autoneg - Wait for auto-neg compeletion
+ *  igb_wait_autoneg - Wait for auto-neg completion
  *  @hw: pointer to the HW structure
  *
  *  Waits for auto-negotiation to complete or for the auto-negotiation time
@@ -1613,8 +1563,7 @@ static s32 igb_wait_autoneg(struct e1000_hw *hw)
                 msleep(100);
         }
 
-        /*
-         * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
+        /* PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
          * has completed.
          */
         return ret_val;
@@ -1630,21 +1579,19 @@ static s32 igb_wait_autoneg(struct e1000_hw *hw)
  *  Polls the PHY status register for link, 'iterations' number of times.
  **/
 s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success)
+                     u32 usec_interval, bool *success)
 {
         s32 ret_val = 0;
         u16 i, phy_status;
 
         for (i = 0; i < iterations; i++) {
-                /*
-                 * Some PHYs require the PHY_STATUS register to be read
+                /* Some PHYs require the PHY_STATUS register to be read
                  * twice due to the link bit being sticky.  No harm doing
                  * it across the board.
                  */
                 ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-                if (ret_val) {
-                        /*
-                         * If the first read fails, another entity may have
+                if (ret_val && usec_interval > 0) {
+                        /* If the first read fails, another entity may have
                          * ownership of the resources, wait and try again to
                          * see if they have relinquished the resources yet.
                          */
@@ -1735,6 +1682,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
                 phy->max_cable_length = phy_data / (is_cm ? 100 : 1);
                 phy->cable_length = phy_data / (is_cm ? 100 : 1);
                 break;
+        case M88E1545_E_PHY_ID:
         case I347AT4_E_PHY_ID:
                 /* Remember the original page select and set it to 7 */
                 ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
@@ -1834,10 +1782,10 @@ s32 igb_get_cable_length_igp_2(struct e1000_hw *hw)
         u16 cur_agc_index, max_agc_index = 0;
         u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
         static const u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] = {
-               IGP02E1000_PHY_AGC_A,
-               IGP02E1000_PHY_AGC_B,
-               IGP02E1000_PHY_AGC_C,
-               IGP02E1000_PHY_AGC_D
+                IGP02E1000_PHY_AGC_A,
+                IGP02E1000_PHY_AGC_B,
+                IGP02E1000_PHY_AGC_C,
+                IGP02E1000_PHY_AGC_D
         };
 
         /* Read the AGC registers for all channels */
@@ -1846,8 +1794,7 @@ s32 igb_get_cable_length_igp_2(struct e1000_hw *hw)
                 if (ret_val)
                         goto out;
 
-                /*
-                 * Getting bits 15:9, which represent the combination of
+                /* Getting bits 15:9, which represent the combination of
                  * coarse and fine gain values.  The result is a number
                  * that can be put into the lookup table to obtain the
                  * approximate cable length.
@@ -2167,15 +2114,13 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw)
         hw->phy.ops.write_reg(hw, 0x1796, 0x0008);
         /* Change cg_icount + enable integbp for channels BCD */
         hw->phy.ops.write_reg(hw, 0x1798, 0xD008);
-        /*
-         * Change cg_icount + enable integbp + change prop_factor_master
+        /* Change cg_icount + enable integbp + change prop_factor_master
          * to 8 for channel A
          */
         hw->phy.ops.write_reg(hw, 0x1898, 0xD918);
         /* Disable AHT in Slave mode on channel A */
         hw->phy.ops.write_reg(hw, 0x187A, 0x0800);
-        /*
-         * Enable LPLU and disable AN to 1000 in non-D0a states,
+        /* Enable LPLU and disable AN to 1000 in non-D0a states,
          * Enable SPD+B2B
          */
         hw->phy.ops.write_reg(hw, 0x0019, 0x008D);
@@ -2257,8 +2202,8 @@ static s32 igb_check_polarity_82580(struct e1000_hw *hw)
 
         if (!ret_val)
                 phy->cable_polarity = (data & I82580_PHY_STATUS2_REV_POLARITY)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+                                      ? e1000_rev_polarity_reversed
+                                      : e1000_rev_polarity_normal;
 
         return ret_val;
 }
@@ -2278,7 +2223,6 @@ s32 igb_phy_force_speed_duplex_82580(struct e1000_hw *hw)
         u16 phy_data;
         bool link;
 
-
         ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
         if (ret_val)
                 goto out;
@@ -2289,8 +2233,7 @@ s32 igb_phy_force_speed_duplex_82580(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /*
-         * Clear Auto-Crossover to force MDI manually.  82580 requires MDI
+        /* Clear Auto-Crossover to force MDI manually.  82580 requires MDI
          * forced whenever speed and duplex are forced.
          */
         ret_val = phy->ops.read_reg(hw, I82580_PHY_CTRL_2, &phy_data);
@@ -2310,10 +2253,7 @@ s32 igb_phy_force_speed_duplex_82580(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 hw_dbg("Waiting for forced speed/duplex link on 82580 phy\n");
 
-                ret_val = igb_phy_has_link(hw,
-                                           PHY_FORCE_LIMIT,
-                                           100000,
-                                           &link);
+                ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT, 100000, &link);
                 if (ret_val)
                         goto out;
 
@@ -2321,10 +2261,7 @@ s32 igb_phy_force_speed_duplex_82580(struct e1000_hw *hw)
                         hw_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
-                ret_val = igb_phy_has_link(hw,
-                                           PHY_FORCE_LIMIT,
-                                           100000,
-                                           &link);
+                ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT, 100000, &link);
                 if (ret_val)
                         goto out;
         }
@@ -2349,7 +2286,6 @@ s32 igb_get_phy_info_82580(struct e1000_hw *hw)
         u16 data;
         bool link;
 
-
         ret_val = igb_phy_has_link(hw, 1, 0, &link);
         if (ret_val)
                 goto out;
@@ -2383,12 +2319,12 @@ s32 igb_get_phy_info_82580(struct e1000_hw *hw)
                         goto out;
 
                 phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
+                                ? e1000_1000t_rx_status_ok
+                                : e1000_1000t_rx_status_not_ok;
 
                 phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                 ? e1000_1000t_rx_status_ok
-                                 : e1000_1000t_rx_status_not_ok;
+                                 ? e1000_1000t_rx_status_ok
+                                 : e1000_1000t_rx_status_not_ok;
         } else {
                 phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
                 phy->local_rx = e1000_1000t_rx_status_undefined;
@@ -2412,13 +2348,12 @@ s32 igb_get_cable_length_82580(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data, length;
 
-
         ret_val = phy->ops.read_reg(hw, I82580_PHY_DIAG_STATUS, &phy_data);
         if (ret_val)
                 goto out;
 
         length = (phy_data & I82580_DSTATUS_CABLE_LENGTH) >>
-                 I82580_DSTATUS_CABLE_LENGTH_SHIFT;
+                 I82580_DSTATUS_CABLE_LENGTH_SHIFT;
 
         if (length == E1000_CABLE_LENGTH_UNDEFINED)
                 ret_val = -E1000_ERR_PHY;
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index 15343286082e..82632c6c53af 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -65,6 +65,7 @@
 #define E1000_TIPG     0x00410  /* TX Inter-packet gap -RW */
 #define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
 #define E1000_LEDCTL   0x00E00  /* LED Control - RW */
+#define E1000_LEDMUX   0x08130  /* LED MUX Control */
 #define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
 #define E1000_PBS      0x01008  /* Packet Buffer Size */
 #define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
@@ -83,6 +84,9 @@
 #define E1000_I2C_DATA_IN   0x00001000  /* I2C- Data In */
 #define E1000_I2C_CLK_OE_N  0x00002000  /* I2C- Clock Output Enable */
 #define E1000_I2C_CLK_IN    0x00004000  /* I2C- Clock In */
+#define E1000_MPHY_ADDR_CTRL    0x0024 /* GbE MPHY Address Control */
+#define E1000_MPHY_DATA         0x0E10 /* GBE MPHY Data */
+#define E1000_MPHY_STAT         0x0E0C /* GBE MPHY Statistics */
 
 /* IEEE 1588 TIMESYNCH */
 #define E1000_TSYNCRXCTL 0x0B620 /* Rx Time Sync Control register - RW */
@@ -117,21 +121,21 @@
 #define E1000_RQDPC(_n) (0x0C030 + ((_n) * 0x40))
 
 /* DMA Coalescing registers */
-#define E1000_DMACR             0x02508 /* Control Register */
-#define E1000_DMCTXTH           0x03550 /* Transmit Threshold */
-#define E1000_DMCTLX            0x02514 /* Time to Lx Request */
-#define E1000_DMCRTRH           0x05DD0 /* Receive Packet Rate Threshold */
-#define E1000_DMCCNT            0x05DD4 /* Current Rx Count */
-#define E1000_FCRTC             0x02170 /* Flow Control Rx high watermark */
-#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
+#define E1000_DMACR     0x02508 /* Control Register */
+#define E1000_DMCTXTH   0x03550 /* Transmit Threshold */
+#define E1000_DMCTLX    0x02514 /* Time to Lx Request */
+#define E1000_DMCRTRH   0x05DD0 /* Receive Packet Rate Threshold */
+#define E1000_DMCCNT    0x05DD4 /* Current Rx Count */
+#define E1000_FCRTC     0x02170 /* Flow Control Rx high watermark */
+#define E1000_PCIEMISC  0x05BB8 /* PCIE misc config register */
 
 /* TX Rate Limit Registers */
-#define E1000_RTTDQSEL  0x3604  /* Tx Desc Plane Queue Select - WO */
-#define E1000_RTTBCNRM  0x3690  /* Tx BCN Rate-scheduler MMW */
-#define E1000_RTTBCNRC  0x36B0  /* Tx BCN Rate-Scheduler Config - WO */
+#define E1000_RTTDQSEL  0x3604 /* Tx Desc Plane Queue Select - WO */
+#define E1000_RTTBCNRM  0x3690 /* Tx BCN Rate-scheduler MMW */
+#define E1000_RTTBCNRC  0x36B0 /* Tx BCN Rate-Scheduler Config - WO */
 
 /* Split and Replication RX Control - RW */
-#define E1000_RXPBS    0x02404  /* Rx Packet Buffer Size - RW */
+#define E1000_RXPBS     0x02404 /* Rx Packet Buffer Size - RW */
 
 /* Thermal sensor configuration and status registers */
 #define E1000_THMJT     0x08100 /* Junction Temperature */
@@ -140,8 +144,7 @@
 #define E1000_THHIGHTC  0x0810C /* High Threshold Control */
 #define E1000_THSTAT    0x08110 /* Thermal Sensor Status */
 
-/*
- * Convenience macros
+/* Convenience macros
  *
  * Note: "_n" is the queue number of the register to be written to.
  *
@@ -287,7 +290,7 @@
 #define E1000_RFCTL    0x05008  /* Receive Filter Control*/
 #define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
 #define E1000_RA       0x05400  /* Receive Address - RW Array */
-#define E1000_RA2      0x054E0  /* 2nd half of receive address array - RW Array */
+#define E1000_RA2      0x054E0  /* 2nd half of Rx address array - RW Array */
 #define E1000_PSRTYPE(_i)       (0x05480 + ((_i) * 4))
 #define E1000_RAL(_i)  (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
                                        (0x054E0 + ((_i - 16) * 8)))
@@ -360,21 +363,25 @@
         (readl(hw->hw_addr + reg + ((offset) << 2)))
 
 /* DMA Coalescing registers */
-#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
+#define E1000_PCIEMISC  0x05BB8 /* PCIE misc config register */
 
 /* Energy Efficient Ethernet "EEE" register */
-#define E1000_IPCNFG  0x0E38  /* Internal PHY Configuration */
-#define E1000_EEER    0x0E30  /* Energy Efficient Ethernet */
-#define E1000_EEE_SU  0X0E34  /* EEE Setup */
+#define E1000_IPCNFG    0x0E38 /* Internal PHY Configuration */
+#define E1000_EEER      0x0E30 /* Energy Efficient Ethernet */
+#define E1000_EEE_SU    0X0E34 /* EEE Setup */
+#define E1000_EMIADD    0x10   /* Extended Memory Indirect Address */
+#define E1000_EMIDATA   0x11   /* Extended Memory Indirect Data */
+#define E1000_MMDAC     13     /* MMD Access Control */
+#define E1000_MMDAAD    14     /* MMD Access Address/Data */
 
 /* Thermal Sensor Register */
-#define E1000_THSTAT    0x08110 /* Thermal Sensor Status */
+#define E1000_THSTAT    0x08110 /* Thermal Sensor Status */
 
 /* OS2BMC Registers */
-#define E1000_B2OSPC    0x08FE0 /* BMC2OS packets sent by BMC */
-#define E1000_B2OGPRC   0x04158 /* BMC2OS packets received by host */
-#define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */
-#define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */
+#define E1000_B2OSPC    0x08FE0 /* BMC2OS packets sent by BMC */
+#define E1000_B2OGPRC   0x04158 /* BMC2OS packets received by host */
+#define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */
+#define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */
 
 #define E1000_SRWR              0x12018  /* Shadow Ram Write Register - RW */
 #define E1000_I210_FLMNGCTL     0x12038
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index ab577a763a20..9d6c075e232d 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -44,54 +44,54 @@
 
 struct igb_adapter;
 
-#define E1000_PCS_CFG_IGN_SD               1
+#define E1000_PCS_CFG_IGN_SD    1
 
 /* Interrupt defines */
-#define IGB_START_ITR                    648 /* ~6000 ints/sec */
-#define IGB_4K_ITR                       980
-#define IGB_20K_ITR                      196
-#define IGB_70K_ITR                       56
+#define IGB_START_ITR           648 /* ~6000 ints/sec */
+#define IGB_4K_ITR              980
+#define IGB_20K_ITR             196
+#define IGB_70K_ITR             56
 
 /* TX/RX descriptor defines */
-#define IGB_DEFAULT_TXD                  256
-#define IGB_DEFAULT_TX_WORK              128
-#define IGB_MIN_TXD                       80
-#define IGB_MAX_TXD                     4096
+#define IGB_DEFAULT_TXD         256
+#define IGB_DEFAULT_TX_WORK     128
+#define IGB_MIN_TXD             80
+#define IGB_MAX_TXD             4096
 
-#define IGB_DEFAULT_RXD                  256
-#define IGB_MIN_RXD                       80
-#define IGB_MAX_RXD                     4096
+#define IGB_DEFAULT_RXD         256
+#define IGB_MIN_RXD             80
+#define IGB_MAX_RXD             4096
 
-#define IGB_DEFAULT_ITR                    3 /* dynamic */
-#define IGB_MAX_ITR_USECS              10000
-#define IGB_MIN_ITR_USECS                 10
-#define NON_Q_VECTORS                      1
-#define MAX_Q_VECTORS                      8
+#define IGB_DEFAULT_ITR         3 /* dynamic */
+#define IGB_MAX_ITR_USECS       10000
+#define IGB_MIN_ITR_USECS       10
+#define NON_Q_VECTORS           1
+#define MAX_Q_VECTORS           8
 
 /* Transmit and receive queues */
-#define IGB_MAX_RX_QUEUES                  8
-#define IGB_MAX_RX_QUEUES_82575            4
-#define IGB_MAX_RX_QUEUES_I211             2
-#define IGB_MAX_TX_QUEUES                  8
-#define IGB_MAX_VF_MC_ENTRIES              30
-#define IGB_MAX_VF_FUNCTIONS               8
-#define IGB_MAX_VFTA_ENTRIES               128
-#define IGB_82576_VF_DEV_ID                0x10CA
-#define IGB_I350_VF_DEV_ID                 0x1520
+#define IGB_MAX_RX_QUEUES       8
+#define IGB_MAX_RX_QUEUES_82575 4
+#define IGB_MAX_RX_QUEUES_I211  2
+#define IGB_MAX_TX_QUEUES       8
+#define IGB_MAX_VF_MC_ENTRIES   30
+#define IGB_MAX_VF_FUNCTIONS    8
+#define IGB_MAX_VFTA_ENTRIES    128
+#define IGB_82576_VF_DEV_ID     0x10CA
+#define IGB_I350_VF_DEV_ID      0x1520
 
 /* NVM version defines */
-#define IGB_MAJOR_MASK                  0xF000
-#define IGB_MINOR_MASK                  0x0FF0
-#define IGB_BUILD_MASK                  0x000F
-#define IGB_COMB_VER_MASK               0x00FF
-#define IGB_MAJOR_SHIFT                 12
-#define IGB_MINOR_SHIFT                 4
-#define IGB_COMB_VER_SHFT               8
-#define IGB_NVM_VER_INVALID             0xFFFF
-#define IGB_ETRACK_SHIFT                16
-#define NVM_ETRACK_WORD                 0x0042
-#define NVM_COMB_VER_OFF                0x0083
-#define NVM_COMB_VER_PTR                0x003d
+#define IGB_MAJOR_MASK          0xF000
+#define IGB_MINOR_MASK          0x0FF0
+#define IGB_BUILD_MASK          0x000F
+#define IGB_COMB_VER_MASK       0x00FF
+#define IGB_MAJOR_SHIFT         12
+#define IGB_MINOR_SHIFT         4
+#define IGB_COMB_VER_SHFT       8
+#define IGB_NVM_VER_INVALID     0xFFFF
+#define IGB_ETRACK_SHIFT        16
+#define NVM_ETRACK_WORD         0x0042
+#define NVM_COMB_VER_OFF        0x0083
+#define NVM_COMB_VER_PTR        0x003d
 
 struct vf_data_storage {
         unsigned char vf_mac_addresses[ETH_ALEN];
@@ -103,6 +103,7 @@ struct vf_data_storage {
         u16 pf_vlan; /* When set, guest VLAN config not allowed. */
         u16 pf_qos;
         u16 tx_rate;
+        bool spoofchk_enabled;
 };
 
 #define IGB_VF_FLAG_CTS            0x00000001 /* VF is clear to send data */
@@ -121,14 +122,14 @@ struct vf_data_storage {
  *           descriptors until either it has this many to write back, or the
  *           ITR timer expires.
  */
-#define IGB_RX_PTHRESH                     8
-#define IGB_RX_HTHRESH                     8
-#define IGB_TX_PTHRESH                     8
-#define IGB_TX_HTHRESH                     1
-#define IGB_RX_WTHRESH                     ((hw->mac.type == e1000_82576 && \
-                                             adapter->msix_entries) ? 1 : 4)
-#define IGB_TX_WTHRESH                     ((hw->mac.type == e1000_82576 && \
-                                             adapter->msix_entries) ? 1 : 16)
+#define IGB_RX_PTHRESH  ((hw->mac.type == e1000_i354) ? 12 : 8)
+#define IGB_RX_HTHRESH  8
+#define IGB_TX_PTHRESH  ((hw->mac.type == e1000_i354) ? 20 : 8)
+#define IGB_TX_HTHRESH  1
+#define IGB_RX_WTHRESH  ((hw->mac.type == e1000_82576 && \
+                          adapter->msix_entries) ? 1 : 4)
+#define IGB_TX_WTHRESH  ((hw->mac.type == e1000_82576 && \
+                          adapter->msix_entries) ? 1 : 16)
 
 /* this is the size past which hardware will drop packets when setting LPE=0 */
 #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
@@ -140,17 +141,17 @@ struct vf_data_storage {
 #define IGB_RX_BUFSZ            IGB_RXBUFFER_2048
 
 /* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IGB_RX_BUFFER_WRITE     16      /* Must be power of 2 */
+#define IGB_RX_BUFFER_WRITE     16 /* Must be power of 2 */
 
-#define AUTO_ALL_MODES            0
-#define IGB_EEPROM_APME         0x0400
+#define AUTO_ALL_MODES          0
+#define IGB_EEPROM_APME         0x0400
 
 #ifndef IGB_MASTER_SLAVE
 /* Switch to override PHY master/slave setting */
 #define IGB_MASTER_SLAVE        e1000_ms_hw_default
 #endif
 
-#define IGB_MNG_VLAN_NONE -1
+#define IGB_MNG_VLAN_NONE       -1
 
 enum igb_tx_flags {
         /* cmd_type flags */
@@ -164,11 +165,10 @@ enum igb_tx_flags {
 };
 
 /* VLAN info */
-#define IGB_TX_FLAGS_VLAN_MASK          0xffff0000
+#define IGB_TX_FLAGS_VLAN_MASK  0xffff0000
 #define IGB_TX_FLAGS_VLAN_SHIFT 16
 
-/*
- * The largest size we can write to the descriptor is 65535.  In order to
+/* The largest size we can write to the descriptor is 65535.  In order to
  * maintain a power of two alignment we have to limit ourselves to 32K.
  */
 #define IGB_MAX_TXD_PWR 15
@@ -178,8 +178,17 @@ enum igb_tx_flags {
 #define TXD_USE_COUNT(S) DIV_ROUND_UP((S), IGB_MAX_DATA_PER_TXD)
 #define DESC_NEEDED (MAX_SKB_FRAGS + 4)
 
+/* EEPROM byte offsets */
+#define IGB_SFF_8472_SWAP               0x5C
+#define IGB_SFF_8472_COMP               0x5E
+
+/* Bitmasks */
+#define IGB_SFF_ADDRESSING_MODE         0x4
+#define IGB_SFF_8472_UNSUP              0x00
+
 /* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
+ * so a DMA handle can be stored along with the buffer
+ */
 struct igb_tx_buffer {
         union e1000_adv_tx_desc *next_to_watch;
         unsigned long time_stamp;
@@ -290,11 +299,11 @@ enum e1000_ring_flags_t {
 
 #define IGB_TXD_DCMD (E1000_ADVTXD_DCMD_EOP | E1000_ADVTXD_DCMD_RS)
 
-#define IGB_RX_DESC(R, i)           \
+#define IGB_RX_DESC(R, i)       \
         (&(((union e1000_adv_rx_desc *)((R)->desc))[i]))
-#define IGB_TX_DESC(R, i)           \
+#define IGB_TX_DESC(R, i)       \
         (&(((union e1000_adv_tx_desc *)((R)->desc))[i]))
-#define IGB_TX_CTXTDESC(R, i)       \
+#define IGB_TX_CTXTDESC(R, i)   \
         (&(((struct e1000_adv_tx_context_desc *)((R)->desc))[i]))
 
 /* igb_test_staterr - tests bits within Rx descriptor status and error fields */
@@ -453,12 +462,12 @@ struct igb_adapter {
 #define IGB_FLAG_WOL_SUPPORTED          (1 << 8)
 
 /* DMA Coalescing defines */
-#define IGB_MIN_TXPBSIZE           20408
-#define IGB_TX_BUF_4096            4096
-#define IGB_DMCTLX_DCFLUSH_DIS     0x80000000  /* Disable DMA Coal Flush */
+#define IGB_MIN_TXPBSIZE        20408
+#define IGB_TX_BUF_4096         4096
+#define IGB_DMCTLX_DCFLUSH_DIS  0x80000000  /* Disable DMA Coal Flush */
 
-#define IGB_82576_TSYNC_SHIFT 19
-#define IGB_TS_HDR_LEN        16
+#define IGB_82576_TSYNC_SHIFT   19
+#define IGB_TS_HDR_LEN          16
 enum e1000_state_t {
         __IGB_TESTING,
         __IGB_RESETTING,
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index a3830a8ba4c1..7876240fa74e 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -38,6 +38,7 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 #include <linux/highmem.h>
+#include <linux/mdio.h>
 
 #include "igb.h"
 
@@ -178,44 +179,67 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 
                 ecmd->port = PORT_TP;
                 ecmd->phy_address = hw->phy.addr;
+                ecmd->transceiver = XCVR_INTERNAL;
         } else {
-                ecmd->supported   = (SUPPORTED_1000baseT_Full |
-                                     SUPPORTED_FIBRE |
-                                     SUPPORTED_Autoneg);
+                ecmd->supported = (SUPPORTED_1000baseT_Full |
+                                   SUPPORTED_100baseT_Full |
+                                   SUPPORTED_FIBRE |
+                                   SUPPORTED_Autoneg |
+                                   SUPPORTED_Pause);
+                if (hw->mac.type == e1000_i354)
+                                ecmd->supported |= SUPPORTED_2500baseX_Full;
+
+                ecmd->advertising = ADVERTISED_FIBRE;
+
+                switch (adapter->link_speed) {
+                case SPEED_2500:
+                        ecmd->advertising = ADVERTISED_2500baseX_Full;
+                        break;
+                case SPEED_1000:
+                        ecmd->advertising = ADVERTISED_1000baseT_Full;
+                        break;
+                case SPEED_100:
+                        ecmd->advertising = ADVERTISED_100baseT_Full;
+                        break;
+                default:
+                        break;
+                }
 
-                ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                     ADVERTISED_FIBRE |
-                                     ADVERTISED_Autoneg |
-                                     ADVERTISED_Pause);
+                if (hw->mac.autoneg == 1)
+                        ecmd->advertising |= ADVERTISED_Autoneg;
 
                 ecmd->port = PORT_FIBRE;
+                ecmd->transceiver = XCVR_EXTERNAL;
         }
 
-        ecmd->transceiver = XCVR_INTERNAL;
-
         status = rd32(E1000_STATUS);
 
         if (status & E1000_STATUS_LU) {
-
-                if ((status & E1000_STATUS_SPEED_1000) ||
-                    hw->phy.media_type != e1000_media_type_copper)
-                        ethtool_cmd_speed_set(ecmd, SPEED_1000);
+                if ((hw->mac.type == e1000_i354) &&
+                    (status & E1000_STATUS_2P5_SKU) &&
+                    !(status & E1000_STATUS_2P5_SKU_OVER))
+                        ecmd->speed = SPEED_2500;
+                else if (status & E1000_STATUS_SPEED_1000)
+                        ecmd->speed = SPEED_1000;
                 else if (status & E1000_STATUS_SPEED_100)
-                        ethtool_cmd_speed_set(ecmd, SPEED_100);
+                        ecmd->speed = SPEED_100;
                 else
-                        ethtool_cmd_speed_set(ecmd, SPEED_10);
-
+                        ecmd->speed = SPEED_10;
                 if ((status & E1000_STATUS_FD) ||
                     hw->phy.media_type != e1000_media_type_copper)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ethtool_cmd_speed_set(ecmd, -1);
+                ecmd->speed = -1;
                 ecmd->duplex = -1;
         }
 
-        ecmd->autoneg = hw->mac.autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+        if ((hw->phy.media_type == e1000_media_type_fiber) ||
+            hw->mac.autoneg)
+                ecmd->autoneg = AUTONEG_ENABLE;
+        else
+                ecmd->autoneg = AUTONEG_DISABLE;
 
         /* MDI-X => 2; MDI =>1; Invalid =>0 */
         if (hw->phy.media_type == e1000_media_type_copper)
@@ -238,15 +262,15 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
         struct e1000_hw *hw = &adapter->hw;
 
         /* When SoL/IDER sessions are active, autoneg/speed/duplex
-         * cannot be changed */
+         * cannot be changed
+         */
         if (igb_check_reset_block(hw)) {
                 dev_err(&adapter->pdev->dev,
                         "Cannot change link characteristics when SoL/IDER is active.\n");
                 return -EINVAL;
         }
 
-        /*
-         * MDI setting is only allowed when autoneg enabled because
+        /* MDI setting is only allowed when autoneg enabled because
          * some hardware doesn't allow MDI setting when speed or
          * duplex is forced.
          */
@@ -266,9 +290,31 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 
         if (ecmd->autoneg == AUTONEG_ENABLE) {
                 hw->mac.autoneg = 1;
-                hw->phy.autoneg_advertised = ecmd->advertising |
-                                             ADVERTISED_TP |
-                                             ADVERTISED_Autoneg;
+                if (hw->phy.media_type == e1000_media_type_fiber) {
+                        hw->phy.autoneg_advertised = ecmd->advertising |
+                                                     ADVERTISED_FIBRE |
+                                                     ADVERTISED_Autoneg;
+                        switch (adapter->link_speed) {
+                        case SPEED_2500:
+                                hw->phy.autoneg_advertised =
+                                        ADVERTISED_2500baseX_Full;
+                                break;
+                        case SPEED_1000:
+                                hw->phy.autoneg_advertised =
+                                        ADVERTISED_1000baseT_Full;
+                                break;
+                        case SPEED_100:
+                                hw->phy.autoneg_advertised =
+                                        ADVERTISED_100baseT_Full;
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        hw->phy.autoneg_advertised = ecmd->advertising |
+                                                     ADVERTISED_TP |
+                                                     ADVERTISED_Autoneg;
+                }
                 ecmd->advertising = hw->phy.autoneg_advertised;
                 if (adapter->fc_autoneg)
                         hw->fc.requested_mode = e1000_fc_default;
@@ -283,8 +329,7 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 
         /* MDI-X => 2; MDI => 1; Auto => 3 */
         if (ecmd->eth_tp_mdix_ctrl) {
-                /*
-                 * fix up the value for auto (3 => 0) as zero is mapped
+                /* fix up the value for auto (3 => 0) as zero is mapped
                  * internally to auto
                  */
                 if (ecmd->eth_tp_mdix_ctrl == ETH_TP_MDI_AUTO)
@@ -309,8 +354,7 @@ static u32 igb_get_link(struct net_device *netdev)
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_mac_info *mac = &adapter->hw.mac;
 
-        /*
-         * If the link is not reported up to netdev, interrupts are disabled,
+        /* If the link is not reported up to netdev, interrupts are disabled,
          * and so the physical link state may have changed since we last
          * looked. Set get_link_status to make sure that the true link
          * state is interrogated, rather than pulling a cached and possibly
@@ -430,7 +474,8 @@ static void igb_get_regs(struct net_device *netdev,
 
         /* Interrupt */
         /* Reading EICS for EICR because they read the
-         * same but EICS does not clear on read */
+         * same but EICS does not clear on read
+         */
         regs_buff[13] = rd32(E1000_EICS);
         regs_buff[14] = rd32(E1000_EICS);
         regs_buff[15] = rd32(E1000_EIMS);
@@ -438,7 +483,8 @@ static void igb_get_regs(struct net_device *netdev,
         regs_buff[17] = rd32(E1000_EIAC);
         regs_buff[18] = rd32(E1000_EIAM);
         /* Reading ICS for ICR because they read the
-         * same but ICS does not clear on read */
+         * same but ICS does not clear on read
+         */
         regs_buff[19] = rd32(E1000_ICS);
         regs_buff[20] = rd32(E1000_ICS);
         regs_buff[21] = rd32(E1000_IMS);
@@ -688,12 +734,12 @@ static int igb_get_eeprom(struct net_device *netdev,
 
         if (hw->nvm.type == e1000_nvm_eeprom_spi)
                 ret_val = hw->nvm.ops.read(hw, first_word,
-                                            last_word - first_word + 1,
-                                            eeprom_buff);
+                                           last_word - first_word + 1,
+                                           eeprom_buff);
         else {
                 for (i = 0; i < last_word - first_word + 1; i++) {
                         ret_val = hw->nvm.ops.read(hw, first_word + i, 1,
-                                                    &eeprom_buff[i]);
+                                                   &eeprom_buff[i]);
                         if (ret_val)
                                 break;
                 }
@@ -740,15 +786,17 @@ static int igb_set_eeprom(struct net_device *netdev,
         ptr = (void *)eeprom_buff;
 
         if (eeprom->offset & 1) {
-                /* need read/modify/write of first changed EEPROM word */
-                /* only the second byte of the word is being modified */
+                /* need read/modify/write of first changed EEPROM word
+                 * only the second byte of the word is being modified
+                 */
                 ret_val = hw->nvm.ops.read(hw, first_word, 1,
                                             &eeprom_buff[0]);
                 ptr++;
         }
         if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {
-                /* need read/modify/write of last changed EEPROM word */
-                /* only the first byte of the word is being modified */
+                /* need read/modify/write of last changed EEPROM word
+                 * only the first byte of the word is being modified
+                 */
                 ret_val = hw->nvm.ops.read(hw, last_word, 1,
                                    &eeprom_buff[last_word - first_word]);
         }
@@ -763,10 +811,11 @@ static int igb_set_eeprom(struct net_device *netdev,
                 eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
 
         ret_val = hw->nvm.ops.write(hw, first_word,
-                                     last_word - first_word + 1, eeprom_buff);
+                                    last_word - first_word + 1, eeprom_buff);
 
         /* Update the checksum over the first part of the EEPROM if needed
-         * and flush shadow RAM for 82573 controllers */
+         * and flush shadow RAM for 82573 controllers
+         */
         if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG)))
                 hw->nvm.ops.update(hw);
 
@@ -783,8 +832,7 @@ static void igb_get_drvinfo(struct net_device *netdev,
         strlcpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, igb_driver_version, sizeof(drvinfo->version));
 
-        /*
-         * EEPROM image version # is reported as firmware version # for
+        /* EEPROM image version # is reported as firmware version # for
          * 82575 controllers
          */
         strlcpy(drvinfo->fw_version, adapter->fw_version,
@@ -847,9 +895,11 @@ static int igb_set_ringparam(struct net_device *netdev,
         }
 
         if (adapter->num_tx_queues > adapter->num_rx_queues)
-                temp_ring = vmalloc(adapter->num_tx_queues * sizeof(struct igb_ring));
+                temp_ring = vmalloc(adapter->num_tx_queues *
+                                    sizeof(struct igb_ring));
         else
-                temp_ring = vmalloc(adapter->num_rx_queues * sizeof(struct igb_ring));
+                temp_ring = vmalloc(adapter->num_rx_queues *
+                                    sizeof(struct igb_ring));
 
         if (!temp_ring) {
                 err = -ENOMEM;
@@ -858,10 +908,9 @@ static int igb_set_ringparam(struct net_device *netdev,
 
         igb_down(adapter);
 
-        /*
-         * We can't just free everything and then setup again,
+        /* We can't just free everything and then setup again,
          * because the ISRs in MSI-X mode get passed pointers
-         * to the tx and rx ring structs.
+         * to the Tx and Rx ring structs.
          */
         if (new_tx_count != adapter->tx_ring_count) {
                 for (i = 0; i < adapter->num_tx_queues; i++) {
@@ -1199,6 +1248,7 @@ static int igb_reg_test(struct igb_adapter *adapter, u64 *data)
 
         switch (adapter->hw.mac.type) {
         case e1000_i350:
+        case e1000_i354:
                 test = reg_test_i350;
                 toggle = 0x7FEFF3FF;
                 break;
@@ -1361,6 +1411,7 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data)
                 ics_mask = 0x77DCFED5;
                 break;
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         case e1000_i211:
                 ics_mask = 0x77DCFED5;
@@ -1627,17 +1678,12 @@ static int igb_setup_loopback_test(struct igb_adapter *adapter)
                 wr32(E1000_CONNSW, reg);
 
                 /* Unset sigdetect for SERDES loopback on
-                 * 82580 and i350 devices.
+                 * 82580 and newer devices.
                  */
-                switch (hw->mac.type) {
-                case e1000_82580:
-                case e1000_i350:
+                if (hw->mac.type >= e1000_82580) {
                         reg = rd32(E1000_PCS_CFG0);
                         reg |= E1000_PCS_CFG_IGN_SD;
                         wr32(E1000_PCS_CFG0, reg);
-                        break;
-                default:
-                        break;
                 }
 
                 /* Set PCS register for forced speed */
@@ -1723,8 +1769,8 @@ static int igb_check_lbtest_frame(struct igb_rx_buffer *rx_buffer,
 }
 
 static int igb_clean_test_rings(struct igb_ring *rx_ring,
-                                struct igb_ring *tx_ring,
-                                unsigned int size)
+                                struct igb_ring *tx_ring,
+                                unsigned int size)
 {
         union e1000_adv_rx_desc *rx_desc;
         struct igb_rx_buffer *rx_buffer_info;
@@ -1737,7 +1783,7 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
         rx_desc = IGB_RX_DESC(rx_ring, rx_ntc);
 
         while (igb_test_staterr(rx_desc, E1000_RXD_STAT_DD)) {
-                /* check rx buffer */
+                /* check Rx buffer */
                 rx_buffer_info = &rx_ring->rx_buffer_info[rx_ntc];
 
                 /* sync Rx buffer for CPU read */
@@ -1756,11 +1802,11 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
                                            IGB_RX_BUFSZ,
                                            DMA_FROM_DEVICE);
 
-                /* unmap buffer on tx side */
+                /* unmap buffer on Tx side */
                 tx_buffer_info = &tx_ring->tx_buffer_info[tx_ntc];
                 igb_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
 
-                /* increment rx/tx next to clean counters */
+                /* increment Rx/Tx next to clean counters */
                 rx_ntc++;
                 if (rx_ntc == rx_ring->count)
                         rx_ntc = 0;
@@ -1801,8 +1847,7 @@ static int igb_run_loopback_test(struct igb_adapter *adapter)
         igb_create_lbtest_frame(skb, size);
         skb_put(skb, size);
 
-        /*
-         * Calculate the loop count based on the largest descriptor ring
+        /* Calculate the loop count based on the largest descriptor ring
          * The idea is to wrap the largest ring a number of times using 64
          * send/receive pairs during each loop
          */
@@ -1829,7 +1874,7 @@ static int igb_run_loopback_test(struct igb_adapter *adapter)
                         break;
                 }
 
-                /* allow 200 milliseconds for packets to go from tx to rx */
+                /* allow 200 milliseconds for packets to go from Tx to Rx */
                 msleep(200);
 
                 good_cnt = igb_clean_test_rings(rx_ring, tx_ring, size);
@@ -1848,13 +1893,21 @@ static int igb_run_loopback_test(struct igb_adapter *adapter)
 static int igb_loopback_test(struct igb_adapter *adapter, u64 *data)
 {
         /* PHY loopback cannot be performed if SoL/IDER
-         * sessions are active */
+         * sessions are active
+         */
         if (igb_check_reset_block(&adapter->hw)) {
                 dev_err(&adapter->pdev->dev,
                         "Cannot do PHY loopback test when SoL/IDER is active.\n");
                 *data = 0;
                 goto out;
         }
+
+        if (adapter->hw.mac.type == e1000_i354) {
+                dev_info(&adapter->pdev->dev,
+                        "Loopback test not supported on i354.\n");
+                *data = 0;
+                goto out;
+        }
         *data = igb_setup_desc_rings(adapter);
         if (*data)
                 goto out;
@@ -1879,7 +1932,8 @@ static int igb_link_test(struct igb_adapter *adapter, u64 *data)
                 hw->mac.serdes_has_link = false;
 
                 /* On some blade server designs, link establishment
-                 * could take as long as 2-3 minutes */
+                 * could take as long as 2-3 minutes
+                 */
                 do {
                         hw->mac.ops.check_for_link(&adapter->hw);
                         if (hw->mac.serdes_has_link)
@@ -1922,7 +1976,8 @@ static void igb_diag_test(struct net_device *netdev,
                 igb_power_up_link(adapter);
 
                 /* Link test performed before hardware reset so autoneg doesn't
-                 * interfere with test result */
+                 * interfere with test result
+                 */
                 if (igb_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1987,8 +2042,8 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         struct igb_adapter *adapter = netdev_priv(netdev);
 
         wol->supported = WAKE_UCAST | WAKE_MCAST |
-                         WAKE_BCAST | WAKE_MAGIC |
-                         WAKE_PHY;
+                         WAKE_BCAST | WAKE_MAGIC |
+                         WAKE_PHY;
         wol->wolopts = 0;
 
         if (!(adapter->flags & IGB_FLAG_WOL_SUPPORTED))
@@ -2263,7 +2318,7 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
                         sprintf(p, "rx_queue_%u_alloc_failed", i);
                         p += ETH_GSTRING_LEN;
                 }
-/*              BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */
+                /* BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */
                 break;
         }
 }
@@ -2283,6 +2338,7 @@ static int igb_get_ts_info(struct net_device *dev,
         case e1000_82576:
         case e1000_82580:
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         case e1000_i211:
                 info->so_timestamping =
@@ -2362,7 +2418,7 @@ static int igb_get_rss_hash_opts(struct igb_adapter *adapter,
 }
 
 static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-                           u32 *rule_locs)
+                         u32 *rule_locs)
 {
         struct igb_adapter *adapter = netdev_priv(dev);
         int ret = -EOPNOTSUPP;
@@ -2506,7 +2562,8 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        u32 ipcnfg, eeer;
+        u32 ipcnfg, eeer, ret_val;
+        u16 phy_data;
 
         if ((hw->mac.type < e1000_i350) ||
             (hw->phy.media_type != e1000_media_type_copper))
@@ -2525,6 +2582,32 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata)
         if (ipcnfg & E1000_IPCNFG_EEE_100M_AN)
                 edata->advertised |= ADVERTISED_100baseT_Full;
 
+        /* EEE Link Partner Advertised */
+        switch (hw->mac.type) {
+        case e1000_i350:
+                ret_val = igb_read_emi_reg(hw, E1000_EEE_LP_ADV_ADDR_I350,
+                                           &phy_data);
+                if (ret_val)
+                        return -ENODATA;
+
+                edata->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data);
+
+                break;
+        case e1000_i210:
+        case e1000_i211:
+                ret_val = igb_read_xmdio_reg(hw, E1000_EEE_LP_ADV_ADDR_I210,
+                                             E1000_EEE_LP_ADV_DEV_I210,
+                                             &phy_data);
+                if (ret_val)
+                        return -ENODATA;
+
+                edata->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data);
+
+                break;
+        default:
+                break;
+        }
+
         if (eeer & E1000_EEER_EEE_NEG)
                 edata->eee_active = true;
 
@@ -2600,6 +2683,85 @@ static int igb_set_eee(struct net_device *netdev,
         return 0;
 }
 
+static int igb_get_module_info(struct net_device *netdev,
+                               struct ethtool_modinfo *modinfo)
+{
+        struct igb_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
+        u32 status = E1000_SUCCESS;
+        u16 sff8472_rev, addr_mode;
+        bool page_swap = false;
+
+        if ((hw->phy.media_type == e1000_media_type_copper) ||
+            (hw->phy.media_type == e1000_media_type_unknown))
+                return -EOPNOTSUPP;
+
+        /* Check whether we support SFF-8472 or not */
+        status = igb_read_phy_reg_i2c(hw, IGB_SFF_8472_COMP, &sff8472_rev);
+        if (status != E1000_SUCCESS)
+                return -EIO;
+
+        /* addressing mode is not supported */
+        status = igb_read_phy_reg_i2c(hw, IGB_SFF_8472_SWAP, &addr_mode);
+        if (status != E1000_SUCCESS)
+                return -EIO;
+
+        /* addressing mode is not supported */
+        if ((addr_mode & 0xFF) & IGB_SFF_ADDRESSING_MODE) {
+                hw_dbg("Address change required to access page 0xA2, but not supported. Please report the module type to the driver maintainers.\n");
+                page_swap = true;
+        }
+
+        if ((sff8472_rev & 0xFF) == IGB_SFF_8472_UNSUP || page_swap) {
+                /* We have an SFP, but it does not support SFF-8472 */
+                modinfo->type = ETH_MODULE_SFF_8079;
+                modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;
+        } else {
+                /* We have an SFP which supports a revision of SFF-8472 */
+                modinfo->type = ETH_MODULE_SFF_8472;
+                modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
+        }
+
+        return 0;
+}
+
+static int igb_get_module_eeprom(struct net_device *netdev,
+                                 struct ethtool_eeprom *ee, u8 *data)
+{
+        struct igb_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
+        u32 status = E1000_SUCCESS;
+        u16 *dataword;
+        u16 first_word, last_word;
+        int i = 0;
+
+        if (ee->len == 0)
+                return -EINVAL;
+
+        first_word = ee->offset >> 1;
+        last_word = (ee->offset + ee->len - 1) >> 1;
+
+        dataword = kmalloc(sizeof(u16) * (last_word - first_word + 1),
+                           GFP_KERNEL);
+        if (!dataword)
+                return -ENOMEM;
+
+        /* Read EEPROM block, SFF-8079/SFF-8472, word at a time */
+        for (i = 0; i < last_word - first_word + 1; i++) {
+                status = igb_read_phy_reg_i2c(hw, first_word + i, &dataword[i]);
+                if (status != E1000_SUCCESS)
+                        /* Error occurred while reading module */
+                        return -EIO;
+
+                be16_to_cpus(&dataword[i]);
+        }
+
+        memcpy(data, (u8 *)dataword + (ee->offset & 1), ee->len);
+        kfree(dataword);
+
+        return 0;
+}
+
 static int igb_ethtool_begin(struct net_device *netdev)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
@@ -2614,36 +2776,38 @@ static void igb_ethtool_complete(struct net_device *netdev)
 }
 
 static const struct ethtool_ops igb_ethtool_ops = {
-        .get_settings           = igb_get_settings,
-        .set_settings           = igb_set_settings,
-        .get_drvinfo            = igb_get_drvinfo,
-        .get_regs_len           = igb_get_regs_len,
-        .get_regs               = igb_get_regs,
-        .get_wol                = igb_get_wol,
-        .set_wol                = igb_set_wol,
-        .get_msglevel           = igb_get_msglevel,
-        .set_msglevel           = igb_set_msglevel,
-        .nway_reset             = igb_nway_reset,
-        .get_link               = igb_get_link,
-        .get_eeprom_len         = igb_get_eeprom_len,
-        .get_eeprom             = igb_get_eeprom,
-        .set_eeprom             = igb_set_eeprom,
-        .get_ringparam          = igb_get_ringparam,
-        .set_ringparam          = igb_set_ringparam,
-        .get_pauseparam         = igb_get_pauseparam,
-        .set_pauseparam         = igb_set_pauseparam,
-        .self_test              = igb_diag_test,
-        .get_strings            = igb_get_strings,
-        .set_phys_id            = igb_set_phys_id,
-        .get_sset_count         = igb_get_sset_count,
-        .get_ethtool_stats      = igb_get_ethtool_stats,
-        .get_coalesce           = igb_get_coalesce,
-        .set_coalesce           = igb_set_coalesce,
-        .get_ts_info            = igb_get_ts_info,
+        .get_settings           = igb_get_settings,
+        .set_settings           = igb_set_settings,
+        .get_drvinfo            = igb_get_drvinfo,
+        .get_regs_len           = igb_get_regs_len,
+        .get_regs               = igb_get_regs,
+        .get_wol                = igb_get_wol,
+        .set_wol                = igb_set_wol,
+        .get_msglevel           = igb_get_msglevel,
+        .set_msglevel           = igb_set_msglevel,
+        .nway_reset             = igb_nway_reset,
+        .get_link               = igb_get_link,
+        .get_eeprom_len         = igb_get_eeprom_len,
+        .get_eeprom             = igb_get_eeprom,
+        .set_eeprom             = igb_set_eeprom,
+        .get_ringparam          = igb_get_ringparam,
+        .set_ringparam          = igb_set_ringparam,
+        .get_pauseparam         = igb_get_pauseparam,
+        .set_pauseparam         = igb_set_pauseparam,
+        .self_test              = igb_diag_test,
+        .get_strings            = igb_get_strings,
+        .set_phys_id            = igb_set_phys_id,
+        .get_sset_count         = igb_get_sset_count,
+        .get_ethtool_stats      = igb_get_ethtool_stats,
+        .get_coalesce           = igb_get_coalesce,
+        .set_coalesce           = igb_set_coalesce,
+        .get_ts_info            = igb_get_ts_info,
         .get_rxnfc              = igb_get_rxnfc,
         .set_rxnfc              = igb_set_rxnfc,
         .get_eee                = igb_get_eee,
         .set_eee                = igb_set_eee,
+        .get_module_info        = igb_get_module_info,
+        .get_module_eeprom      = igb_get_module_eeprom,
         .begin                  = igb_ethtool_begin,
         .complete               = igb_ethtool_complete,
 };
diff --git a/drivers/net/ethernet/intel/igb/igb_hwmon.c b/drivers/net/ethernet/intel/igb/igb_hwmon.c
index 0478a1abe541..58f1ce967aeb 100644
--- a/drivers/net/ethernet/intel/igb/igb_hwmon.c
+++ b/drivers/net/ethernet/intel/igb/igb_hwmon.c
@@ -45,21 +45,21 @@ static struct i2c_board_info i350_sensor_info = {
 
 /* hwmon callback functions */
 static ssize_t igb_hwmon_show_location(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
+                                       struct device_attribute *attr,
+                                       char *buf)
 {
         struct hwmon_attr *igb_attr = container_of(attr, struct hwmon_attr,
-                                                     dev_attr);
+                                                   dev_attr);
         return sprintf(buf, "loc%u\n",
                        igb_attr->sensor->location);
 }
 
 static ssize_t igb_hwmon_show_temp(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+                                   struct device_attribute *attr,
+                                   char *buf)
 {
         struct hwmon_attr *igb_attr = container_of(attr, struct hwmon_attr,
-                                                     dev_attr);
+                                                   dev_attr);
         unsigned int value;
 
         /* reset the temp field */
@@ -74,11 +74,11 @@ static ssize_t igb_hwmon_show_temp(struct device *dev,
 }
 
 static ssize_t igb_hwmon_show_cautionthresh(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+                                            struct device_attribute *attr,
+                                            char *buf)
 {
         struct hwmon_attr *igb_attr = container_of(attr, struct hwmon_attr,
-                                                     dev_attr);
+                                                   dev_attr);
         unsigned int value = igb_attr->sensor->caution_thresh;
 
         /* display millidegree */
@@ -88,11 +88,11 @@ static ssize_t igb_hwmon_show_cautionthresh(struct device *dev,
 }
 
 static ssize_t igb_hwmon_show_maxopthresh(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+                                          struct device_attribute *attr,
+                                          char *buf)
 {
         struct hwmon_attr *igb_attr = container_of(attr, struct hwmon_attr,
-                                                     dev_attr);
+                                                   dev_attr);
         unsigned int value = igb_attr->sensor->max_op_thresh;
 
         /* display millidegree */
@@ -111,7 +111,8 @@ static ssize_t igb_hwmon_show_maxopthresh(struct device *dev,
  * the data structures we need to get the data to display.
  */
 static int igb_add_hwmon_attr(struct igb_adapter *adapter,
-                                unsigned int offset, int type) {
+                              unsigned int offset, int type)
+{
         int rc;
         unsigned int n_attr;
         struct hwmon_attr *igb_attr;
@@ -217,7 +218,7 @@ int igb_sysfs_init(struct igb_adapter *adapter)
          */
         n_attrs = E1000_MAX_SENSORS * 4;
         igb_hwmon->hwmon_list = kcalloc(n_attrs, sizeof(struct hwmon_attr),
-                                          GFP_KERNEL);
+                                        GFP_KERNEL);
         if (!igb_hwmon->hwmon_list) {
                 rc = -ENOMEM;
                 goto err;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 64f75291e3a5..64cbe0dfe043 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -60,9 +60,9 @@
 #include <linux/i2c.h>
 #include "igb.h"
 
-#define MAJ 4
-#define MIN 1
-#define BUILD 2
+#define MAJ 5
+#define MIN 0
+#define BUILD 3
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
 __stringify(BUILD) "-k"
 char igb_driver_name[] = "igb";
@@ -77,6 +77,9 @@ static const struct e1000_info *igb_info_tbl[] = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_COPPER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER), board_82575 },
@@ -156,8 +159,8 @@ static int igb_ioctl(struct net_device *, struct ifreq *, int cmd);
 static void igb_tx_timeout(struct net_device *);
 static void igb_reset_task(struct work_struct *);
 static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features);
-static int igb_vlan_rx_add_vid(struct net_device *, u16);
-static int igb_vlan_rx_kill_vid(struct net_device *, u16);
+static int igb_vlan_rx_add_vid(struct net_device *, __be16, u16);
+static int igb_vlan_rx_kill_vid(struct net_device *, __be16, u16);
 static void igb_restore_vlan(struct igb_adapter *);
 static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
 static void igb_ping_all_vfs(struct igb_adapter *);
@@ -169,13 +172,14 @@ static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
 static int igb_ndo_set_vf_vlan(struct net_device *netdev,
                                int vf, u16 vlan, u8 qos);
 static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
+static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
+                                   bool setting);
 static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,
                                  struct ifla_vf_info *ivi);
 static void igb_check_vf_rate_limit(struct igb_adapter *);
 
 #ifdef CONFIG_PCI_IOV
 static int igb_vf_configure(struct igb_adapter *adapter, int vf);
-static bool igb_vfs_are_assigned(struct igb_adapter *adapter);
 #endif
 
 #ifdef CONFIG_PM
@@ -292,9 +296,7 @@ static const struct igb_reg_info igb_reg_info_tbl[] = {
         {}
 };
 
-/*
- * igb_regdump - register printout routine
- */
+/* igb_regdump - register printout routine */
 static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo)
 {
         int n = 0;
@@ -360,9 +362,7 @@ static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo)
                 regs[2], regs[3]);
 }
 
-/*
- * igb_dump - Print registers, tx-rings and rx-rings
- */
+/* igb_dump - Print registers, Tx-rings and Rx-rings */
 static void igb_dump(struct igb_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -569,12 +569,13 @@ exit:
         return;
 }
 
-/*  igb_get_i2c_data - Reads the I2C SDA data bit
+/**
+ *  igb_get_i2c_data - Reads the I2C SDA data bit
  *  @hw: pointer to hardware structure
  *  @i2cctl: Current value of I2CCTL register
  *
  *  Returns the I2C data bit value
- */
+ **/
 static int igb_get_i2c_data(void *data)
 {
         struct igb_adapter *adapter = (struct igb_adapter *)data;
@@ -584,12 +585,13 @@ static int igb_get_i2c_data(void *data)
         return ((i2cctl & E1000_I2C_DATA_IN) != 0);
 }
 
-/* igb_set_i2c_data - Sets the I2C data bit
+/**
+ *  igb_set_i2c_data - Sets the I2C data bit
  *  @data: pointer to hardware structure
  *  @state: I2C data value (0 or 1) to set
  *
  *  Sets the I2C data bit
- */
+ **/
 static void igb_set_i2c_data(void *data, int state)
 {
         struct igb_adapter *adapter = (struct igb_adapter *)data;
@@ -608,12 +610,13 @@ static void igb_set_i2c_data(void *data, int state)
 
 }
 
-/* igb_set_i2c_clk - Sets the I2C SCL clock
+/**
+ *  igb_set_i2c_clk - Sets the I2C SCL clock
  *  @data: pointer to hardware structure
  *  @state: state to set clock
  *
  *  Sets the I2C clock line to state
- */
+ **/
 static void igb_set_i2c_clk(void *data, int state)
 {
         struct igb_adapter *adapter = (struct igb_adapter *)data;
@@ -631,11 +634,12 @@ static void igb_set_i2c_clk(void *data, int state)
         wrfl();
 }
 
-/* igb_get_i2c_clk - Gets the I2C SCL clock state
+/**
+ *  igb_get_i2c_clk - Gets the I2C SCL clock state
  *  @data: pointer to hardware structure
  *
  *  Gets the I2C clock state
- */
+ **/
 static int igb_get_i2c_clk(void *data)
 {
         struct igb_adapter *adapter = (struct igb_adapter *)data;
@@ -655,8 +659,10 @@ static const struct i2c_algo_bit_data igb_i2c_algo = {
 };
 
 /**
- * igb_get_hw_dev - return device
- * used by hardware layer to print debugging information
+ *  igb_get_hw_dev - return device
+ *  @hw: pointer to hardware structure
+ *
+ *  used by hardware layer to print debugging information
  **/
 struct net_device *igb_get_hw_dev(struct e1000_hw *hw)
 {
@@ -665,10 +671,10 @@ struct net_device *igb_get_hw_dev(struct e1000_hw *hw)
 }
 
 /**
- * igb_init_module - Driver Registration Routine
+ *  igb_init_module - Driver Registration Routine
  *
- * igb_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
+ *  igb_init_module is the first routine called when the driver is
+ *  loaded. All it does is register with the PCI subsystem.
  **/
 static int __init igb_init_module(void)
 {
@@ -688,10 +694,10 @@ static int __init igb_init_module(void)
 module_init(igb_init_module);
 
 /**
- * igb_exit_module - Driver Exit Cleanup Routine
+ *  igb_exit_module - Driver Exit Cleanup Routine
  *
- * igb_exit_module is called just before the driver is removed
- * from memory.
+ *  igb_exit_module is called just before the driver is removed
+ *  from memory.
  **/
 static void __exit igb_exit_module(void)
 {
@@ -705,11 +711,11 @@ module_exit(igb_exit_module);
 
 #define Q_IDX_82576(i) (((i & 0x1) << 3) + (i >> 1))
 /**
- * igb_cache_ring_register - Descriptor ring to register mapping
- * @adapter: board private structure to initialize
+ *  igb_cache_ring_register - Descriptor ring to register mapping
+ *  @adapter: board private structure to initialize
  *
- * Once we know the feature-set enabled for the device, we'll cache
- * the register offset the descriptor ring is assigned to.
+ *  Once we know the feature-set enabled for the device, we'll cache
+ *  the register offset the descriptor ring is assigned to.
  **/
 static void igb_cache_ring_register(struct igb_adapter *adapter)
 {
@@ -726,11 +732,12 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)
                 if (adapter->vfs_allocated_count) {
                         for (; i < adapter->rss_queues; i++)
                                 adapter->rx_ring[i]->reg_idx = rbase_offset +
-                                                               Q_IDX_82576(i);
+                                                               Q_IDX_82576(i);
                 }
         case e1000_82575:
         case e1000_82580:
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         case e1000_i211:
         default:
@@ -785,9 +792,10 @@ static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
         switch (hw->mac.type) {
         case e1000_82575:
                 /* The 82575 assigns vectors using a bitmask, which matches the
-                   bitmask for the EICR/EIMS/EIMC registers.  To assign one
-                   or more queues to a vector, we write the appropriate bits
-                   into the MSIXBM register for that vector. */
+                 * bitmask for the EICR/EIMS/EIMC registers.  To assign one
+                 * or more queues to a vector, we write the appropriate bits
+                 * into the MSIXBM register for that vector.
+                 */
                 if (rx_queue > IGB_N0_QUEUE)
                         msixbm = E1000_EICR_RX_QUEUE0 << rx_queue;
                 if (tx_queue > IGB_N0_QUEUE)
@@ -798,8 +806,7 @@ static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
                 q_vector->eims_value = msixbm;
                 break;
         case e1000_82576:
-                /*
-                 * 82576 uses a table that essentially consists of 2 columns
+                /* 82576 uses a table that essentially consists of 2 columns
                  * with 8 rows.  The ordering is column-major so we use the
                  * lower 3 bits as the row index, and the 4th bit as the
                  * column offset.
@@ -816,10 +823,10 @@ static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
                 break;
         case e1000_82580:
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         case e1000_i211:
-                /*
-                 * On 82580 and newer adapters the scheme is similar to 82576
+                /* On 82580 and newer adapters the scheme is similar to 82576
                  * however instead of ordering column-major we have things
                  * ordered row-major.  So we traverse the table by using
                  * bit 0 as the column offset, and the remaining bits as the
@@ -848,10 +855,11 @@ static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
 }
 
 /**
- * igb_configure_msix - Configure MSI-X hardware
+ *  igb_configure_msix - Configure MSI-X hardware
+ *  @adapter: board private structure to initialize
  *
- * igb_configure_msix sets up the hardware to properly
- * generate MSI-X interrupts.
+ *  igb_configure_msix sets up the hardware to properly
+ *  generate MSI-X interrupts.
  **/
 static void igb_configure_msix(struct igb_adapter *adapter)
 {
@@ -875,8 +883,7 @@ static void igb_configure_msix(struct igb_adapter *adapter)
                 wr32(E1000_CTRL_EXT, tmp);
 
                 /* enable msix_other interrupt */
-                array_wr32(E1000_MSIXBM(0), vector++,
-                                      E1000_EIMS_OTHER);
+                array_wr32(E1000_MSIXBM(0), vector++, E1000_EIMS_OTHER);
                 adapter->eims_other = E1000_EIMS_OTHER;
 
                 break;
@@ -884,13 +891,15 @@ static void igb_configure_msix(struct igb_adapter *adapter)
         case e1000_82576:
         case e1000_82580:
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         case e1000_i211:
                 /* Turn on MSI-X capability first, or our settings
-                 * won't stick.  And it will take days to debug. */
+                 * won't stick.  And it will take days to debug.
+                 */
                 wr32(E1000_GPIE, E1000_GPIE_MSIX_MODE |
-                                E1000_GPIE_PBA | E1000_GPIE_EIAME |
-                                E1000_GPIE_NSICR);
+                     E1000_GPIE_PBA | E1000_GPIE_EIAME |
+                     E1000_GPIE_NSICR);
 
                 /* enable msix_other interrupt */
                 adapter->eims_other = 1 << vector;
@@ -912,10 +921,11 @@ static void igb_configure_msix(struct igb_adapter *adapter)
 }
 
 /**
- * igb_request_msix - Initialize MSI-X interrupts
+ *  igb_request_msix - Initialize MSI-X interrupts
+ *  @adapter: board private structure to initialize
  *
- * igb_request_msix allocates MSI-X vectors and requests interrupts from the
- * kernel.
+ *  igb_request_msix allocates MSI-X vectors and requests interrupts from the
+ *  kernel.
  **/
 static int igb_request_msix(struct igb_adapter *adapter)
 {
@@ -924,7 +934,7 @@ static int igb_request_msix(struct igb_adapter *adapter)
         int i, err = 0, vector = 0, free_vector = 0;
 
         err = request_irq(adapter->msix_entries[vector].vector,
-                          igb_msix_other, 0, netdev->name, adapter);
+                          igb_msix_other, 0, netdev->name, adapter);
         if (err)
                 goto err_out;
 
@@ -948,8 +958,8 @@ static int igb_request_msix(struct igb_adapter *adapter)
                         sprintf(q_vector->name, "%s-unused", netdev->name);
 
                 err = request_irq(adapter->msix_entries[vector].vector,
-                                  igb_msix_ring, 0, q_vector->name,
-                                  q_vector);
+                                  igb_msix_ring, 0, q_vector->name,
+                                  q_vector);
                 if (err)
                         goto err_free;
         }
@@ -982,13 +992,13 @@ static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
 }
 
 /**
- * igb_free_q_vector - Free memory allocated for specific interrupt vector
- * @adapter: board private structure to initialize
- * @v_idx: Index of vector to be freed
+ *  igb_free_q_vector - Free memory allocated for specific interrupt vector
+ *  @adapter: board private structure to initialize
+ *  @v_idx: Index of vector to be freed
  *
- * This function frees the memory allocated to the q_vector.  In addition if
- * NAPI is enabled it will delete any references to the NAPI struct prior
- * to freeing the q_vector.
+ *  This function frees the memory allocated to the q_vector.  In addition if
+ *  NAPI is enabled it will delete any references to the NAPI struct prior
+ *  to freeing the q_vector.
  **/
 static void igb_free_q_vector(struct igb_adapter *adapter, int v_idx)
 {
@@ -1003,20 +1013,19 @@ static void igb_free_q_vector(struct igb_adapter *adapter, int v_idx)
         adapter->q_vector[v_idx] = NULL;
         netif_napi_del(&q_vector->napi);
 
-        /*
-         * ixgbe_get_stats64() might access the rings on this vector,
+        /* ixgbe_get_stats64() might access the rings on this vector,
          * we must wait a grace period before freeing it.
          */
         kfree_rcu(q_vector, rcu);
 }
 
 /**
- * igb_free_q_vectors - Free memory allocated for interrupt vectors
- * @adapter: board private structure to initialize
+ *  igb_free_q_vectors - Free memory allocated for interrupt vectors
+ *  @adapter: board private structure to initialize
  *
- * This function frees the memory allocated to the q_vectors.  In addition if
- * NAPI is enabled it will delete any references to the NAPI struct prior
- * to freeing the q_vector.
+ *  This function frees the memory allocated to the q_vectors.  In addition if
+ *  NAPI is enabled it will delete any references to the NAPI struct prior
+ *  to freeing the q_vector.
  **/
 static void igb_free_q_vectors(struct igb_adapter *adapter)
 {
@@ -1031,10 +1040,11 @@ static void igb_free_q_vectors(struct igb_adapter *adapter)
 }
 
 /**
- * igb_clear_interrupt_scheme - reset the device to a state of no interrupts
+ *  igb_clear_interrupt_scheme - reset the device to a state of no interrupts
+ *  @adapter: board private structure to initialize
  *
- * This function resets the device so that it has 0 rx queues, tx queues, and
- * MSI-X interrupts allocated.
+ *  This function resets the device so that it has 0 Rx queues, Tx queues, and
+ *  MSI-X interrupts allocated.
  */
 static void igb_clear_interrupt_scheme(struct igb_adapter *adapter)
 {
@@ -1043,10 +1053,12 @@ static void igb_clear_interrupt_scheme(struct igb_adapter *adapter)
 }
 
 /**
- * igb_set_interrupt_capability - set MSI or MSI-X if supported
+ *  igb_set_interrupt_capability - set MSI or MSI-X if supported
+ *  @adapter: board private structure to initialize
+ *  @msix: boolean value of MSIX capability
  *
- * Attempt to configure interrupts using the best available
- * capabilities of the hardware and kernel.
+ *  Attempt to configure interrupts using the best available
+ *  capabilities of the hardware and kernel.
  **/
 static void igb_set_interrupt_capability(struct igb_adapter *adapter, bool msix)
 {
@@ -1063,10 +1075,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter, bool msix)
         else
                 adapter->num_tx_queues = adapter->rss_queues;
 
-        /* start with one vector for every rx queue */
+        /* start with one vector for every Rx queue */
         numvecs = adapter->num_rx_queues;
 
-        /* if tx handler is separate add 1 for every tx queue */
+        /* if Tx handler is separate add 1 for every Tx queue */
         if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
                 numvecs += adapter->num_tx_queues;
 
@@ -1128,16 +1140,16 @@ static void igb_add_ring(struct igb_ring *ring,
 }
 
 /**
- * igb_alloc_q_vector - Allocate memory for a single interrupt vector
- * @adapter: board private structure to initialize
- * @v_count: q_vectors allocated on adapter, used for ring interleaving
- * @v_idx: index of vector in adapter struct
- * @txr_count: total number of Tx rings to allocate
- * @txr_idx: index of first Tx ring to allocate
- * @rxr_count: total number of Rx rings to allocate
- * @rxr_idx: index of first Rx ring to allocate
+ *  igb_alloc_q_vector - Allocate memory for a single interrupt vector
+ *  @adapter: board private structure to initialize
+ *  @v_count: q_vectors allocated on adapter, used for ring interleaving
+ *  @v_idx: index of vector in adapter struct
+ *  @txr_count: total number of Tx rings to allocate
+ *  @txr_idx: index of first Tx ring to allocate
+ *  @rxr_count: total number of Rx rings to allocate
+ *  @rxr_idx: index of first Rx ring to allocate
  *
- * We allocate one q_vector.  If allocation fails we return -ENOMEM.
+ *  We allocate one q_vector.  If allocation fails we return -ENOMEM.
  **/
 static int igb_alloc_q_vector(struct igb_adapter *adapter,
                               int v_count, int v_idx,
@@ -1179,6 +1191,17 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
         /* initialize pointer to rings */
         ring = q_vector->ring;
 
+        /* intialize ITR */
+        if (rxr_count) {
+                /* rx or rx/tx vector */
+                if (!adapter->rx_itr_setting || adapter->rx_itr_setting > 3)
+                        q_vector->itr_val = adapter->rx_itr_setting;
+        } else {
+                /* tx only vector */
+                if (!adapter->tx_itr_setting || adapter->tx_itr_setting > 3)
+                        q_vector->itr_val = adapter->tx_itr_setting;
+        }
+
         if (txr_count) {
                 /* assign generic ring traits */
                 ring->dev = &adapter->pdev->dev;
@@ -1221,9 +1244,9 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
                         set_bit(IGB_RING_FLAG_RX_SCTP_CSUM, &ring->flags);
 
                 /*
-                 * On i350, i210, and i211, loopback VLAN packets
+                 * On i350, i354, i210, and i211, loopback VLAN packets
                  * have the tag byte-swapped.
-                 * */
+                 */
                 if (adapter->hw.mac.type >= e1000_i350)
                         set_bit(IGB_RING_FLAG_RX_LB_VLAN_BSWAP, &ring->flags);
 
@@ -1240,11 +1263,11 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
 
 
 /**
- * igb_alloc_q_vectors - Allocate memory for interrupt vectors
- * @adapter: board private structure to initialize
+ *  igb_alloc_q_vectors - Allocate memory for interrupt vectors
+ *  @adapter: board private structure to initialize
  *
- * We allocate one q_vector per queue interrupt.  If allocation fails we
- * return -ENOMEM.
+ *  We allocate one q_vector per queue interrupt.  If allocation fails we
+ *  return -ENOMEM.
  **/
 static int igb_alloc_q_vectors(struct igb_adapter *adapter)
 {
@@ -1298,9 +1321,11 @@ err_out:
 }
 
 /**
- * igb_init_interrupt_scheme - initialize interrupts, allocate queues/vectors
+ *  igb_init_interrupt_scheme - initialize interrupts, allocate queues/vectors
+ *  @adapter: board private structure to initialize
+ *  @msix: boolean value of MSIX capability
  *
- * This function initializes the interrupts and allocates all of the queues.
+ *  This function initializes the interrupts and allocates all of the queues.
  **/
 static int igb_init_interrupt_scheme(struct igb_adapter *adapter, bool msix)
 {
@@ -1325,10 +1350,11 @@ err_alloc_q_vectors:
 }
 
 /**
- * igb_request_irq - initialize interrupts
+ *  igb_request_irq - initialize interrupts
+ *  @adapter: board private structure to initialize
  *
- * Attempts to configure interrupts using the best available
- * capabilities of the hardware and kernel.
+ *  Attempts to configure interrupts using the best available
+ *  capabilities of the hardware and kernel.
  **/
 static int igb_request_irq(struct igb_adapter *adapter)
 {
@@ -1394,15 +1420,14 @@ static void igb_free_irq(struct igb_adapter *adapter)
 }
 
 /**
- * igb_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
+ *  igb_irq_disable - Mask off interrupt generation on the NIC
+ *  @adapter: board private structure
  **/
 static void igb_irq_disable(struct igb_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
 
-        /*
-         * we need to be careful when disabling interrupts.  The VFs are also
+        /* we need to be careful when disabling interrupts.  The VFs are also
          * mapped into these registers and so clearing the bits can cause
          * issues on the VF drivers so we only need to clear what we set
          */
@@ -1427,8 +1452,8 @@ static void igb_irq_disable(struct igb_adapter *adapter)
 }
 
 /**
- * igb_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
+ *  igb_irq_enable - Enable default interrupt generation settings
+ *  @adapter: board private structure
  **/
 static void igb_irq_enable(struct igb_adapter *adapter)
 {
@@ -1477,13 +1502,12 @@ static void igb_update_mng_vlan(struct igb_adapter *adapter)
 }
 
 /**
- * igb_release_hw_control - release control of the h/w to f/w
- * @adapter: address of board private structure
- *
- * igb_release_hw_control resets CTRL_EXT:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that the
- * driver is no longer loaded.
+ *  igb_release_hw_control - release control of the h/w to f/w
+ *  @adapter: address of board private structure
  *
+ *  igb_release_hw_control resets CTRL_EXT:DRV_LOAD bit.
+ *  For ASF and Pass Through versions of f/w this means that the
+ *  driver is no longer loaded.
  **/
 static void igb_release_hw_control(struct igb_adapter *adapter)
 {
@@ -1497,13 +1521,12 @@ static void igb_release_hw_control(struct igb_adapter *adapter)
 }
 
 /**
- * igb_get_hw_control - get control of the h/w from f/w
- * @adapter: address of board private structure
- *
- * igb_get_hw_control sets CTRL_EXT:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that
- * the driver is loaded.
+ *  igb_get_hw_control - get control of the h/w from f/w
+ *  @adapter: address of board private structure
  *
+ *  igb_get_hw_control sets CTRL_EXT:DRV_LOAD bit.
+ *  For ASF and Pass Through versions of f/w this means that
+ *  the driver is loaded.
  **/
 static void igb_get_hw_control(struct igb_adapter *adapter)
 {
@@ -1517,8 +1540,8 @@ static void igb_get_hw_control(struct igb_adapter *adapter)
 }
 
 /**
- * igb_configure - configure the hardware for RX and TX
- * @adapter: private board structure
+ *  igb_configure - configure the hardware for RX and TX
+ *  @adapter: private board structure
  **/
 static void igb_configure(struct igb_adapter *adapter)
 {
@@ -1541,7 +1564,8 @@ static void igb_configure(struct igb_adapter *adapter)
 
         /* call igb_desc_unused which always leaves
          * at least 1 descriptor unused to make sure
-         * next_to_use != next_to_clean */
+         * next_to_use != next_to_clean
+         */
         for (i = 0; i < adapter->num_rx_queues; i++) {
                 struct igb_ring *ring = adapter->rx_ring[i];
                 igb_alloc_rx_buffers(ring, igb_desc_unused(ring));
@@ -1549,8 +1573,8 @@ static void igb_configure(struct igb_adapter *adapter)
 }
 
 /**
- * igb_power_up_link - Power up the phy/serdes link
- * @adapter: address of board private structure
+ *  igb_power_up_link - Power up the phy/serdes link
+ *  @adapter: address of board private structure
  **/
 void igb_power_up_link(struct igb_adapter *adapter)
 {
@@ -1563,8 +1587,8 @@ void igb_power_up_link(struct igb_adapter *adapter)
 }
 
 /**
- * igb_power_down_link - Power down the phy/serdes link
- * @adapter: address of board private structure
+ *  igb_power_down_link - Power down the phy/serdes link
+ *  @adapter: address of board private structure
  */
 static void igb_power_down_link(struct igb_adapter *adapter)
 {
@@ -1575,8 +1599,8 @@ static void igb_power_down_link(struct igb_adapter *adapter)
 }
 
 /**
- * igb_up - Open the interface and prepare it to handle traffic
- * @adapter: board private structure
+ *  igb_up - Open the interface and prepare it to handle traffic
+ *  @adapter: board private structure
  **/
 int igb_up(struct igb_adapter *adapter)
 {
@@ -1624,7 +1648,8 @@ void igb_down(struct igb_adapter *adapter)
         int i;
 
         /* signal that we're down so the interrupt handler does not
-         * reschedule our watchdog timer */
+         * reschedule our watchdog timer
+         */
         set_bit(__IGB_DOWN, &adapter->state);
 
         /* disable receives in the hardware */
@@ -1694,6 +1719,7 @@ void igb_reset(struct igb_adapter *adapter)
          */
         switch (mac->type) {
         case e1000_i350:
+        case e1000_i354:
         case e1000_82580:
                 pba = rd32(E1000_RXPBS);
                 pba = igb_rxpbs_adjust_82580(pba);
@@ -1720,14 +1746,16 @@ void igb_reset(struct igb_adapter *adapter)
                  * rounded up to the next 1KB and expressed in KB.  Likewise,
                  * the Rx FIFO should be large enough to accommodate at least
                  * one full receive packet and is similarly rounded up and
-                 * expressed in KB. */
+                 * expressed in KB.
+                 */
                 pba = rd32(E1000_PBA);
                 /* upper 16 bits has Tx packet buffer allocation size in KB */
                 tx_space = pba >> 16;
                 /* lower 16 bits has Rx packet buffer allocation size in KB */
                 pba &= 0xffff;
-                /* the tx fifo also stores 16 bytes of information about the tx
-                 * but don't include ethernet FCS because hardware appends it */
+                /* the Tx fifo also stores 16 bytes of information about the Tx
+                 * but don't include ethernet FCS because hardware appends it
+                 */
                 min_tx_space = (adapter->max_frame_size +
                                 sizeof(union e1000_adv_tx_desc) -
                                 ETH_FCS_LEN) * 2;
@@ -1740,13 +1768,15 @@ void igb_reset(struct igb_adapter *adapter)
 
                 /* If current Tx allocation is less than the min Tx FIFO size,
                  * and the min Tx FIFO size is less than the current Rx FIFO
-                 * allocation, take space away from current Rx allocation */
+                 * allocation, take space away from current Rx allocation
+                 */
                 if (tx_space < min_tx_space &&
                     ((min_tx_space - tx_space) < pba)) {
                         pba = pba - (min_tx_space - tx_space);
 
-                        /* if short on rx space, rx wins and must trump tx
-                         * adjustment */
+                        /* if short on Rx space, Rx wins and must trump Tx
+                         * adjustment
+                         */
                         if (pba < min_rx_space)
                                 pba = min_rx_space;
                 }
@@ -1758,7 +1788,8 @@ void igb_reset(struct igb_adapter *adapter)
          * (or the size used for early receive) above it in the Rx FIFO.
          * Set it to the lower of:
          * - 90% of the Rx FIFO size, or
-         * - the full Rx FIFO size minus one full frame */
+         * - the full Rx FIFO size minus one full frame
+         */
         hwm = min(((pba << 10) * 9 / 10),
                         ((pba << 10) - 2 * adapter->max_frame_size));
 
@@ -1789,8 +1820,7 @@ void igb_reset(struct igb_adapter *adapter)
         if (hw->mac.ops.init_hw(hw))
                 dev_err(&pdev->dev, "Hardware Error\n");
 
-        /*
-         * Flow control settings reset on hardware reset, so guarantee flow
+        /* Flow control settings reset on hardware reset, so guarantee flow
          * control is off when forcing speed.
          */
         if (!hw->mac.autoneg)
@@ -1826,14 +1856,13 @@ void igb_reset(struct igb_adapter *adapter)
 static netdev_features_t igb_fix_features(struct net_device *netdev,
         netdev_features_t features)
 {
-        /*
-         * Since there is no support for separate rx/tx vlan accel
-         * enable/disable make sure tx flag is always in same state as rx.
+        /* Since there is no support for separate Rx/Tx vlan accel
+         * enable/disable make sure Tx flag is always in same state as Rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -1844,7 +1873,7 @@ static int igb_set_features(struct net_device *netdev,
         netdev_features_t changed = netdev->features ^ features;
         struct igb_adapter *adapter = netdev_priv(netdev);
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 igb_vlan_mode(netdev, features);
 
         if (!(changed & NETIF_F_RXALL))
@@ -1876,6 +1905,7 @@ static const struct net_device_ops igb_netdev_ops = {
         .ndo_set_vf_mac         = igb_ndo_set_vf_mac,
         .ndo_set_vf_vlan        = igb_ndo_set_vf_vlan,
         .ndo_set_vf_tx_rate     = igb_ndo_set_vf_bw,
+        .ndo_set_vf_spoofchk    = igb_ndo_set_vf_spoofchk,
         .ndo_get_vf_config      = igb_ndo_get_vf_config,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = igb_netpoll,
@@ -1887,7 +1917,6 @@ static const struct net_device_ops igb_netdev_ops = {
 /**
  * igb_set_fw_version - Configure version string for ethtool
  * @adapter: adapter struct
- *
  **/
 void igb_set_fw_version(struct igb_adapter *adapter)
 {
@@ -1923,10 +1952,10 @@ void igb_set_fw_version(struct igb_adapter *adapter)
         return;
 }
 
-/*  igb_init_i2c - Init I2C interface
+/**
+ *  igb_init_i2c - Init I2C interface
  *  @adapter: pointer to adapter structure
- *
- */
+ **/
 static s32 igb_init_i2c(struct igb_adapter *adapter)
 {
         s32 status = E1000_SUCCESS;
@@ -1951,15 +1980,15 @@ static s32 igb_init_i2c(struct igb_adapter *adapter)
 }
 
 /**
- * igb_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in igb_pci_tbl
+ *  igb_probe - Device Initialization Routine
+ *  @pdev: PCI device information struct
+ *  @ent: entry in igb_pci_tbl
  *
- * Returns 0 on success, negative on failure
+ *  Returns 0 on success, negative on failure
  *
- * igb_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
+ *  igb_probe initializes an adapter identified by a pci_dev structure.
+ *  The OS initialization, configuring of the adapter private structure,
+ *  and a hardware reset occur.
  **/
 static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -1996,18 +2025,19 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         } else {
                 err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                 if (err) {
-                        err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+                        err = dma_set_coherent_mask(&pdev->dev,
+                                                    DMA_BIT_MASK(32));
                         if (err) {
-                                dev_err(&pdev->dev, "No usable DMA "
-                                        "configuration, aborting\n");
+                                dev_err(&pdev->dev,
+                                        "No usable DMA configuration, aborting\n");
                                 goto err_dma;
                         }
                 }
         }
 
         err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
-                                           IORESOURCE_MEM),
-                                           igb_driver_name);
+                                           IORESOURCE_MEM),
+                                           igb_driver_name);
         if (err)
                 goto err_pci_reg;
 
@@ -2085,8 +2115,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_info(&pdev->dev,
                         "PHY reset is blocked due to SOL/IDER session.\n");
 
-        /*
-         * features is initialized to 0 in allocation, it might have bits
+        /* features is initialized to 0 in allocation, it might have bits
          * set by igb_sw_init so we should use an or instead of an
          * assignment.
          */
@@ -2097,15 +2126,15 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                             NETIF_F_TSO6 |
                             NETIF_F_RXHASH |
                             NETIF_F_RXCSUM |
-                            NETIF_F_HW_VLAN_RX |
-                            NETIF_F_HW_VLAN_TX;
+                            NETIF_F_HW_VLAN_CTAG_RX |
+                            NETIF_F_HW_VLAN_CTAG_TX;
 
         /* copy netdev features into list of user selectable features */
         netdev->hw_features |= netdev->features;
         netdev->hw_features |= NETIF_F_RXALL;
 
         /* set this bit last since it cannot be part of hw_features */
-        netdev->features |= NETIF_F_HW_VLAN_FILTER;
+        netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= NETIF_F_TSO |
                                  NETIF_F_TSO6 |
@@ -2130,11 +2159,11 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->en_mng_pt = igb_enable_mng_pass_thru(hw);
 
         /* before reading the NVM, reset the controller to put the device in a
-         * known good starting state */
+         * known good starting state
+         */
         hw->mac.ops.reset_hw(hw);
 
-        /*
-         * make sure the NVM is good , i211 parts have special NVM that
+        /* make sure the NVM is good , i211 parts have special NVM that
          * doesn't contain a checksum
          */
         if (hw->mac.type != e1000_i211) {
@@ -2161,9 +2190,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         igb_set_fw_version(adapter);
 
         setup_timer(&adapter->watchdog_timer, igb_watchdog,
-                    (unsigned long) adapter);
+                    (unsigned long) adapter);
         setup_timer(&adapter->phy_info_timer, igb_update_phy_info,
-                    (unsigned long) adapter);
+                    (unsigned long) adapter);
 
         INIT_WORK(&adapter->reset_task, igb_reset_task);
         INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);
@@ -2185,8 +2214,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* Check the NVM for wake support on non-port A ports */
         if (hw->mac.type >= e1000_82580)
                 hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
-                                 NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
-                                 &eeprom_data);
+                                 NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
+                                 &eeprom_data);
         else if (hw->bus.func == 1)
                 hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
 
@@ -2195,7 +2224,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* now that we have the eeprom settings, apply the special cases where
          * the eeprom may be wrong or the board simply won't support wake on
-         * lan on a particular port */
+         * lan on a particular port
+         */
         switch (pdev->device) {
         case E1000_DEV_ID_82575GB_QUAD_COPPER:
                 adapter->flags &= ~IGB_FLAG_WOL_SUPPORTED;
@@ -2204,7 +2234,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         case E1000_DEV_ID_82576_FIBER:
         case E1000_DEV_ID_82576_SERDES:
                 /* Wake events only supported on port A for dual fiber
-                 * regardless of eeprom setting */
+                 * regardless of eeprom setting
+                 */
                 if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)
                         adapter->flags &= ~IGB_FLAG_WOL_SUPPORTED;
                 break;
@@ -2274,8 +2305,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (hw->mac.type == e1000_i350 && hw->bus.func == 0) {
                 u16 ets_word;
 
-                /*
-                 * Read the NVM to determine if this i350 device supports an
+                /* Read the NVM to determine if this i350 device supports an
                  * external thermal sensor.
                  */
                 hw->nvm.ops.read(hw, NVM_ETS_CFG, 1, &ets_word);
@@ -2294,17 +2324,20 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         igb_ptp_init(adapter);
 
         dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
-        /* print bus type/speed/width info */
-        dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
-                 netdev->name,
-                 ((hw->bus.speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
-                  (hw->bus.speed == e1000_bus_speed_5000) ? "5.0Gb/s" :
-                                                            "unknown"),
-                 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
-                  (hw->bus.width == e1000_bus_width_pcie_x2) ? "Width x2" :
-                  (hw->bus.width == e1000_bus_width_pcie_x1) ? "Width x1" :
-                   "unknown"),
-                 netdev->dev_addr);
+        /* print bus type/speed/width info, not applicable to i354 */
+        if (hw->mac.type != e1000_i354) {
+                dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
+                         netdev->name,
+                         ((hw->bus.speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
+                          (hw->bus.speed == e1000_bus_speed_5000) ? "5.0Gb/s" :
+                           "unknown"),
+                         ((hw->bus.width == e1000_bus_width_pcie_x4) ?
+                          "Width x4" :
+                          (hw->bus.width == e1000_bus_width_pcie_x2) ?
+                          "Width x2" :
+                          (hw->bus.width == e1000_bus_width_pcie_x1) ?
+                          "Width x1" : "unknown"), netdev->dev_addr);
+        }
 
         ret_val = igb_read_part_string(hw, part_str, E1000_PBANUM_LENGTH);
         if (ret_val)
@@ -2321,6 +2354,13 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         case e1000_i211:
                 igb_set_eee_i350(hw);
                 break;
+        case e1000_i354:
+                if (hw->phy.media_type == e1000_media_type_copper) {
+                        if ((rd32(E1000_CTRL_EXT) &
+                            E1000_CTRL_EXT_LINK_MODE_SGMII))
+                                igb_set_eee_i354(hw);
+                }
+                break;
         default:
                 break;
         }
@@ -2344,7 +2384,7 @@ err_ioremap:
         free_netdev(netdev);
 err_alloc_etherdev:
         pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+                                     pci_select_bars(pdev, IORESOURCE_MEM));
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -2361,7 +2401,7 @@ static int  igb_disable_sriov(struct pci_dev *pdev)
         /* reclaim resources allocated to VFs */
         if (adapter->vf_data) {
                 /* disable iov and allow time for transactions to clear */
-                if (igb_vfs_are_assigned(adapter)) {
+                if (pci_vfs_assigned(pdev)) {
                         dev_warn(&pdev->dev,
                                  "Cannot deallocate SR-IOV virtual functions while they are assigned - VFs will not be deallocated\n");
                         return -EPERM;
@@ -2444,26 +2484,24 @@ out:
 }
 
 #endif
-/*
+/**
  *  igb_remove_i2c - Cleanup  I2C interface
  *  @adapter: pointer to adapter structure
- *
- */
+ **/
 static void igb_remove_i2c(struct igb_adapter *adapter)
 {
-
         /* free the adapter bus structure */
         i2c_del_adapter(&adapter->i2c_adap);
 }
 
 /**
- * igb_remove - Device Removal Routine
- * @pdev: PCI device information struct
+ *  igb_remove - Device Removal Routine
+ *  @pdev: PCI device information struct
  *
- * igb_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
+ *  igb_remove is called by the PCI subsystem to alert the driver
+ *  that it should release a PCI device.  The could be caused by a
+ *  Hot-Plug event, or because the driver is going to be removed from
+ *  memory.
  **/
 static void igb_remove(struct pci_dev *pdev)
 {
@@ -2477,8 +2515,7 @@ static void igb_remove(struct pci_dev *pdev)
 #endif
         igb_remove_i2c(adapter);
         igb_ptp_stop(adapter);
-        /*
-         * The watchdog timer may be rescheduled, so explicitly
+        /* The watchdog timer may be rescheduled, so explicitly
          * disable watchdog from being rescheduled.
          */
         set_bit(__IGB_DOWN, &adapter->state);
@@ -2498,7 +2535,8 @@ static void igb_remove(struct pci_dev *pdev)
 #endif
 
         /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-         * would have already happened in close and is redundant. */
+         * would have already happened in close and is redundant.
+         */
         igb_release_hw_control(adapter);
 
         unregister_netdev(netdev);
@@ -2513,7 +2551,7 @@ static void igb_remove(struct pci_dev *pdev)
         if (hw->flash_address)
                 iounmap(hw->flash_address);
         pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+                                     pci_select_bars(pdev, IORESOURCE_MEM));
 
         kfree(adapter->shadow_vfta);
         free_netdev(netdev);
@@ -2524,13 +2562,13 @@ static void igb_remove(struct pci_dev *pdev)
 }
 
 /**
- * igb_probe_vfs - Initialize vf data storage and add VFs to pci config space
- * @adapter: board private structure to initialize
+ *  igb_probe_vfs - Initialize vf data storage and add VFs to pci config space
+ *  @adapter: board private structure to initialize
  *
- * This function initializes the vf specific data storage and then attempts to
- * allocate the VFs.  The reason for ordering it this way is because it is much
- * mor expensive time wise to disable SR-IOV than it is to allocate and free
- * the memory for the VFs.
+ *  This function initializes the vf specific data storage and then attempts to
+ *  allocate the VFs.  The reason for ordering it this way is because it is much
+ *  mor expensive time wise to disable SR-IOV than it is to allocate and free
+ *  the memory for the VFs.
  **/
 static void igb_probe_vfs(struct igb_adapter *adapter)
 {
@@ -2576,6 +2614,7 @@ static void igb_init_queue_configuration(struct igb_adapter *adapter)
                 }
                 /* fall through */
         case e1000_82580:
+        case e1000_i354:
         default:
                 max_rss_queues = IGB_MAX_RX_QUEUES;
                 break;
@@ -2590,8 +2629,7 @@ static void igb_init_queue_configuration(struct igb_adapter *adapter)
                 /* Device supports enough interrupts without queue pairing. */
                 break;
         case e1000_82576:
-                /*
-                 * If VFs are going to be allocated with RSS queues then we
+                /* If VFs are going to be allocated with RSS queues then we
                  * should pair the queues in order to conserve interrupts due
                  * to limited supply.
                  */
@@ -2601,10 +2639,10 @@ static void igb_init_queue_configuration(struct igb_adapter *adapter)
                 /* fall through */
         case e1000_82580:
         case e1000_i350:
+        case e1000_i354:
         case e1000_i210:
         default:
-                /*
-                 * If rss_queues > half of max_rss_queues, pair the queues in
+                /* If rss_queues > half of max_rss_queues, pair the queues in
                  * order to conserve interrupts due to limited supply.
                  */
                 if (adapter->rss_queues > (max_rss_queues / 2))
@@ -2614,12 +2652,12 @@ static void igb_init_queue_configuration(struct igb_adapter *adapter)
 }
 
 /**
- * igb_sw_init - Initialize general software structures (struct igb_adapter)
- * @adapter: board private structure to initialize
+ *  igb_sw_init - Initialize general software structures (struct igb_adapter)
+ *  @adapter: board private structure to initialize
  *
- * igb_sw_init initializes the Adapter private data structure.
- * Fields are initialized based on PCI device information and
- * OS network device settings (MTU size).
+ *  igb_sw_init initializes the Adapter private data structure.
+ *  Fields are initialized based on PCI device information and
+ *  OS network device settings (MTU size).
  **/
 static int igb_sw_init(struct igb_adapter *adapter)
 {
@@ -2689,16 +2727,16 @@ static int igb_sw_init(struct igb_adapter *adapter)
 }
 
 /**
- * igb_open - Called when a network interface is made active
- * @netdev: network interface device structure
+ *  igb_open - Called when a network interface is made active
+ *  @netdev: network interface device structure
  *
- * Returns 0 on success, negative value on failure
+ *  Returns 0 on success, negative value on failure
  *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
+ *  The open entry point is called when a network interface is made
+ *  active by the system (IFF_UP).  At this point all resources needed
+ *  for transmit and receive operations are allocated, the interrupt
+ *  handler is registered with the OS, the watchdog timer is started,
+ *  and the stack is notified that the interface is ready.
  **/
 static int __igb_open(struct net_device *netdev, bool resuming)
 {
@@ -2734,7 +2772,8 @@ static int __igb_open(struct net_device *netdev, bool resuming)
         /* before we allocate an interrupt, we must be ready to handle it.
          * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
          * as soon as we call pci_request_irq, so we have to setup our
-         * clean_rx handler before we do so.  */
+         * clean_rx handler before we do so.
+         */
         igb_configure(adapter);
 
         err = igb_request_irq(adapter);
@@ -2803,15 +2842,15 @@ static int igb_open(struct net_device *netdev)
 }
 
 /**
- * igb_close - Disables a network interface
- * @netdev: network interface device structure
+ *  igb_close - Disables a network interface
+ *  @netdev: network interface device structure
  *
- * Returns 0, this is not allowed to fail
+ *  Returns 0, this is not allowed to fail
  *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the driver's control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
+ *  The close entry point is called when an interface is de-activated
+ *  by the OS.  The hardware is still under the driver's control, but
+ *  needs to be disabled.  A global MAC reset is issued to stop the
+ *  hardware, and all transmit and receive resources are freed.
  **/
 static int __igb_close(struct net_device *netdev, bool suspending)
 {
@@ -2840,10 +2879,10 @@ static int igb_close(struct net_device *netdev)
 }
 
 /**
- * igb_setup_tx_resources - allocate Tx resources (Descriptors)
- * @tx_ring: tx descriptor ring (for a specific queue) to setup
+ *  igb_setup_tx_resources - allocate Tx resources (Descriptors)
+ *  @tx_ring: tx descriptor ring (for a specific queue) to setup
  *
- * Return 0 on success, negative on failure
+ *  Return 0 on success, negative on failure
  **/
 int igb_setup_tx_resources(struct igb_ring *tx_ring)
 {
@@ -2878,11 +2917,11 @@ err:
 }
 
 /**
- * igb_setup_all_tx_resources - wrapper to allocate Tx resources
- *                                (Descriptors) for all queues
- * @adapter: board private structure
+ *  igb_setup_all_tx_resources - wrapper to allocate Tx resources
+ *                               (Descriptors) for all queues
+ *  @adapter: board private structure
  *
- * Return 0 on success, negative on failure
+ *  Return 0 on success, negative on failure
  **/
 static int igb_setup_all_tx_resources(struct igb_adapter *adapter)
 {
@@ -2904,8 +2943,8 @@ static int igb_setup_all_tx_resources(struct igb_adapter *adapter)
 }
 
 /**
- * igb_setup_tctl - configure the transmit control registers
- * @adapter: Board private structure
+ *  igb_setup_tctl - configure the transmit control registers
+ *  @adapter: Board private structure
  **/
 void igb_setup_tctl(struct igb_adapter *adapter)
 {
@@ -2930,11 +2969,11 @@ void igb_setup_tctl(struct igb_adapter *adapter)
 }
 
 /**
- * igb_configure_tx_ring - Configure transmit ring after Reset
- * @adapter: board private structure
- * @ring: tx ring to configure
+ *  igb_configure_tx_ring - Configure transmit ring after Reset
+ *  @adapter: board private structure
+ *  @ring: tx ring to configure
  *
- * Configure a transmit ring after a reset.
+ *  Configure a transmit ring after a reset.
  **/
 void igb_configure_tx_ring(struct igb_adapter *adapter,
                            struct igb_ring *ring)
@@ -2950,9 +2989,9 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
         mdelay(10);
 
         wr32(E1000_TDLEN(reg_idx),
-                        ring->count * sizeof(union e1000_adv_tx_desc));
+             ring->count * sizeof(union e1000_adv_tx_desc));
         wr32(E1000_TDBAL(reg_idx),
-                        tdba & 0x00000000ffffffffULL);
+             tdba & 0x00000000ffffffffULL);
         wr32(E1000_TDBAH(reg_idx), tdba >> 32);
 
         ring->tail = hw->hw_addr + E1000_TDT(reg_idx);
@@ -2968,10 +3007,10 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
 }
 
 /**
- * igb_configure_tx - Configure transmit Unit after Reset
- * @adapter: board private structure
+ *  igb_configure_tx - Configure transmit Unit after Reset
+ *  @adapter: board private structure
  *
- * Configure the Tx unit of the MAC after a reset.
+ *  Configure the Tx unit of the MAC after a reset.
  **/
 static void igb_configure_tx(struct igb_adapter *adapter)
 {
@@ -2982,10 +3021,10 @@ static void igb_configure_tx(struct igb_adapter *adapter)
 }
 
 /**
- * igb_setup_rx_resources - allocate Rx resources (Descriptors)
- * @rx_ring:    rx descriptor ring (for a specific queue) to setup
+ *  igb_setup_rx_resources - allocate Rx resources (Descriptors)
+ *  @rx_ring: Rx descriptor ring (for a specific queue) to setup
  *
- * Returns 0 on success, negative on failure
+ *  Returns 0 on success, negative on failure
  **/
 int igb_setup_rx_resources(struct igb_ring *rx_ring)
 {
@@ -3021,11 +3060,11 @@ err:
 }
 
 /**
- * igb_setup_all_rx_resources - wrapper to allocate Rx resources
- *                                (Descriptors) for all queues
- * @adapter: board private structure
+ *  igb_setup_all_rx_resources - wrapper to allocate Rx resources
+ *                               (Descriptors) for all queues
+ *  @adapter: board private structure
  *
- * Return 0 on success, negative on failure
+ *  Return 0 on success, negative on failure
  **/
 static int igb_setup_all_rx_resources(struct igb_adapter *adapter)
 {
@@ -3047,8 +3086,8 @@ static int igb_setup_all_rx_resources(struct igb_adapter *adapter)
 }
 
 /**
- * igb_setup_mrqc - configure the multiple receive queue control registers
- * @adapter: Board private structure
+ *  igb_setup_mrqc - configure the multiple receive queue control registers
+ *  @adapter: Board private structure
  **/
 static void igb_setup_mrqc(struct igb_adapter *adapter)
 {
@@ -3081,8 +3120,7 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
                 break;
         }
 
-        /*
-         * Populate the indirection table 4 entries at a time.  To do this
+        /* Populate the indirection table 4 entries at a time.  To do this
          * we are generating the results for n and n+2 and then interleaving
          * those with the results with n+1 and n+3.
          */
@@ -3098,8 +3136,7 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
                 wr32(E1000_RETA(j), reta);
         }
 
-        /*
-         * Disable raw packet checksumming so that RSS hash is placed in
+        /* Disable raw packet checksumming so that RSS hash is placed in
          * descriptor on writeback.  No need to enable TCP/UDP/IP checksum
          * offloads as they are enabled by default
          */
@@ -3129,7 +3166,8 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
 
         /* If VMDq is enabled then we set the appropriate mode for that, else
          * we default to RSS so that an RSS hash is calculated per packet even
-         * if we are only using one queue */
+         * if we are only using one queue
+         */
         if (adapter->vfs_allocated_count) {
                 if (hw->mac.type > e1000_82575) {
                         /* Set the default pool for the PF's first queue */
@@ -3154,8 +3192,8 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
 }
 
 /**
- * igb_setup_rctl - configure the receive control registers
- * @adapter: Board private structure
+ *  igb_setup_rctl - configure the receive control registers
+ *  @adapter: Board private structure
  **/
 void igb_setup_rctl(struct igb_adapter *adapter)
 {
@@ -3170,8 +3208,7 @@ void igb_setup_rctl(struct igb_adapter *adapter)
         rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF |
                 (hw->mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
 
-        /*
-         * enable stripping of CRC. It's unlikely this will break BMC
+        /* enable stripping of CRC. It's unlikely this will break BMC
          * redirection as it did with e1000. Newer features require
          * that the HW strips the CRC.
          */
@@ -3198,7 +3235,8 @@ void igb_setup_rctl(struct igb_adapter *adapter)
         /* This is useful for sniffing bad packets. */
         if (adapter->netdev->features & NETIF_F_RXALL) {
                 /* UPE and MPE will be handled by normal PROMISC logic
-                 * in e1000e_set_rx_mode */
+                 * in e1000e_set_rx_mode
+                 */
                 rctl |= (E1000_RCTL_SBP | /* Receive bad packets */
                          E1000_RCTL_BAM | /* RX All Bcast Pkts */
                          E1000_RCTL_PMCF); /* RX All MAC Ctrl Pkts */
@@ -3221,7 +3259,8 @@ static inline int igb_set_vf_rlpml(struct igb_adapter *adapter, int size,
         u32 vmolr;
 
         /* if it isn't the PF check to see if VFs are enabled and
-         * increase the size to support vlan tags */
+         * increase the size to support vlan tags
+         */
         if (vfn < adapter->vfs_allocated_count &&
             adapter->vf_data[vfn].vlans_enabled)
                 size += VLAN_TAG_SIZE;
@@ -3235,10 +3274,10 @@ static inline int igb_set_vf_rlpml(struct igb_adapter *adapter, int size,
 }
 
 /**
- * igb_rlpml_set - set maximum receive packet size
- * @adapter: board private structure
+ *  igb_rlpml_set - set maximum receive packet size
+ *  @adapter: board private structure
  *
- * Configure maximum receivable packet size.
+ *  Configure maximum receivable packet size.
  **/
 static void igb_rlpml_set(struct igb_adapter *adapter)
 {
@@ -3248,8 +3287,7 @@ static void igb_rlpml_set(struct igb_adapter *adapter)
 
         if (pf_id) {
                 igb_set_vf_rlpml(adapter, max_frame_size, pf_id);
-                /*
-                 * If we're in VMDQ or SR-IOV mode, then set global RLPML
+                /* If we're in VMDQ or SR-IOV mode, then set global RLPML
                  * to our max jumbo frame size, in case we need to enable
                  * jumbo frames on one of the rings later.
                  * This will not pass over-length frames into the default
@@ -3267,17 +3305,16 @@ static inline void igb_set_vmolr(struct igb_adapter *adapter,
         struct e1000_hw *hw = &adapter->hw;
         u32 vmolr;
 
-        /*
-         * This register exists only on 82576 and newer so if we are older then
+        /* This register exists only on 82576 and newer so if we are older then
          * we should exit and do nothing
          */
         if (hw->mac.type < e1000_82576)
                 return;
 
         vmolr = rd32(E1000_VMOLR(vfn));
-        vmolr |= E1000_VMOLR_STRVLAN;      /* Strip vlan tags */
+        vmolr |= E1000_VMOLR_STRVLAN; /* Strip vlan tags */
         if (aupe)
-                vmolr |= E1000_VMOLR_AUPE;        /* Accept untagged packets */
+                vmolr |= E1000_VMOLR_AUPE; /* Accept untagged packets */
         else
                 vmolr &= ~(E1000_VMOLR_AUPE); /* Tagged packets ONLY */
 
@@ -3286,25 +3323,24 @@ static inline void igb_set_vmolr(struct igb_adapter *adapter,
 
         if (adapter->rss_queues > 1 && vfn == adapter->vfs_allocated_count)
                 vmolr |= E1000_VMOLR_RSSE; /* enable RSS */
-        /*
-         * for VMDq only allow the VFs and pool 0 to accept broadcast and
+        /* for VMDq only allow the VFs and pool 0 to accept broadcast and
          * multicast packets
          */
         if (vfn <= adapter->vfs_allocated_count)
-                vmolr |= E1000_VMOLR_BAM;          /* Accept broadcast */
+                vmolr |= E1000_VMOLR_BAM; /* Accept broadcast */
 
         wr32(E1000_VMOLR(vfn), vmolr);
 }
 
 /**
- * igb_configure_rx_ring - Configure a receive ring after Reset
- * @adapter: board private structure
- * @ring: receive ring to be configured
+ *  igb_configure_rx_ring - Configure a receive ring after Reset
+ *  @adapter: board private structure
+ *  @ring: receive ring to be configured
  *
- * Configure the Rx unit of the MAC after a reset.
+ *  Configure the Rx unit of the MAC after a reset.
  **/
 void igb_configure_rx_ring(struct igb_adapter *adapter,
-                           struct igb_ring *ring)
+                           struct igb_ring *ring)
 {
         struct e1000_hw *hw = &adapter->hw;
         u64 rdba = ring->dma;
@@ -3319,7 +3355,7 @@ void igb_configure_rx_ring(struct igb_adapter *adapter,
              rdba & 0x00000000ffffffffULL);
         wr32(E1000_RDBAH(reg_idx), rdba >> 32);
         wr32(E1000_RDLEN(reg_idx),
-                       ring->count * sizeof(union e1000_adv_rx_desc));
+             ring->count * sizeof(union e1000_adv_rx_desc));
 
         /* initialize head and tail */
         ring->tail = hw->hw_addr + E1000_RDT(reg_idx);
@@ -3351,10 +3387,10 @@ void igb_configure_rx_ring(struct igb_adapter *adapter,
 }
 
 /**
- * igb_configure_rx - Configure receive Unit after Reset
- * @adapter: board private structure
+ *  igb_configure_rx - Configure receive Unit after Reset
+ *  @adapter: board private structure
  *
- * Configure the Rx unit of the MAC after a reset.
+ *  Configure the Rx unit of the MAC after a reset.
  **/
 static void igb_configure_rx(struct igb_adapter *adapter)
 {
@@ -3365,19 +3401,20 @@ static void igb_configure_rx(struct igb_adapter *adapter)
 
         /* set the correct pool for the PF default MAC address in entry 0 */
         igb_rar_set_qsel(adapter, adapter->hw.mac.addr, 0,
-                         adapter->vfs_allocated_count);
+                         adapter->vfs_allocated_count);
 
         /* Setup the HW Rx Head and Tail Descriptor Pointers and
-         * the Base and Length of the Rx Descriptor Ring */
+         * the Base and Length of the Rx Descriptor Ring
+         */
         for (i = 0; i < adapter->num_rx_queues; i++)
                 igb_configure_rx_ring(adapter, adapter->rx_ring[i]);
 }
 
 /**
- * igb_free_tx_resources - Free Tx Resources per Queue
- * @tx_ring: Tx descriptor ring for a specific queue
+ *  igb_free_tx_resources - Free Tx Resources per Queue
+ *  @tx_ring: Tx descriptor ring for a specific queue
  *
- * Free all transmit software resources
+ *  Free all transmit software resources
  **/
 void igb_free_tx_resources(struct igb_ring *tx_ring)
 {
@@ -3397,10 +3434,10 @@ void igb_free_tx_resources(struct igb_ring *tx_ring)
 }
 
 /**
- * igb_free_all_tx_resources - Free Tx Resources for All Queues
- * @adapter: board private structure
+ *  igb_free_all_tx_resources - Free Tx Resources for All Queues
+ *  @adapter: board private structure
  *
- * Free all transmit software resources
+ *  Free all transmit software resources
  **/
 static void igb_free_all_tx_resources(struct igb_adapter *adapter)
 {
@@ -3433,8 +3470,8 @@ void igb_unmap_and_free_tx_resource(struct igb_ring *ring,
 }
 
 /**
- * igb_clean_tx_ring - Free Tx Buffers
- * @tx_ring: ring to be cleaned
+ *  igb_clean_tx_ring - Free Tx Buffers
+ *  @tx_ring: ring to be cleaned
  **/
 static void igb_clean_tx_ring(struct igb_ring *tx_ring)
 {
@@ -3464,8 +3501,8 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)
 }
 
 /**
- * igb_clean_all_tx_rings - Free Tx Buffers for all queues
- * @adapter: board private structure
+ *  igb_clean_all_tx_rings - Free Tx Buffers for all queues
+ *  @adapter: board private structure
  **/
 static void igb_clean_all_tx_rings(struct igb_adapter *adapter)
 {
@@ -3476,10 +3513,10 @@ static void igb_clean_all_tx_rings(struct igb_adapter *adapter)
 }
 
 /**
- * igb_free_rx_resources - Free Rx Resources
- * @rx_ring: ring to clean the resources from
+ *  igb_free_rx_resources - Free Rx Resources
+ *  @rx_ring: ring to clean the resources from
  *
- * Free all receive software resources
+ *  Free all receive software resources
  **/
 void igb_free_rx_resources(struct igb_ring *rx_ring)
 {
@@ -3499,10 +3536,10 @@ void igb_free_rx_resources(struct igb_ring *rx_ring)
 }
 
 /**
- * igb_free_all_rx_resources - Free Rx Resources for All Queues
- * @adapter: board private structure
+ *  igb_free_all_rx_resources - Free Rx Resources for All Queues
+ *  @adapter: board private structure
  *
- * Free all receive software resources
+ *  Free all receive software resources
  **/
 static void igb_free_all_rx_resources(struct igb_adapter *adapter)
 {
@@ -3513,8 +3550,8 @@ static void igb_free_all_rx_resources(struct igb_adapter *adapter)
 }
 
 /**
- * igb_clean_rx_ring - Free Rx Buffers per Queue
- * @rx_ring: ring to free buffers from
+ *  igb_clean_rx_ring - Free Rx Buffers per Queue
+ *  @rx_ring: ring to free buffers from
  **/
 static void igb_clean_rx_ring(struct igb_ring *rx_ring)
 {
@@ -3556,8 +3593,8 @@ static void igb_clean_rx_ring(struct igb_ring *rx_ring)
 }
 
 /**
- * igb_clean_all_rx_rings - Free Rx Buffers for all queues
- * @adapter: board private structure
+ *  igb_clean_all_rx_rings - Free Rx Buffers for all queues
+ *  @adapter: board private structure
  **/
 static void igb_clean_all_rx_rings(struct igb_adapter *adapter)
 {
@@ -3568,11 +3605,11 @@ static void igb_clean_all_rx_rings(struct igb_adapter *adapter)
 }
 
 /**
- * igb_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
+ *  igb_set_mac - Change the Ethernet Address of the NIC
+ *  @netdev: network interface device structure
+ *  @p: pointer to an address structure
  *
- * Returns 0 on success, negative on failure
+ *  Returns 0 on success, negative on failure
  **/
 static int igb_set_mac(struct net_device *netdev, void *p)
 {
@@ -3588,19 +3625,19 @@ static int igb_set_mac(struct net_device *netdev, void *p)
 
         /* set the correct pool for the new PF MAC address in entry 0 */
         igb_rar_set_qsel(adapter, hw->mac.addr, 0,
-                         adapter->vfs_allocated_count);
+                         adapter->vfs_allocated_count);
 
         return 0;
 }
 
 /**
- * igb_write_mc_addr_list - write multicast addresses to MTA
- * @netdev: network interface device structure
+ *  igb_write_mc_addr_list - write multicast addresses to MTA
+ *  @netdev: network interface device structure
  *
- * Writes multicast address list to the MTA hash table.
- * Returns: -ENOMEM on failure
- *                0 on no addresses written
- *                X on writing X addresses to MTA
+ *  Writes multicast address list to the MTA hash table.
+ *  Returns: -ENOMEM on failure
+ *           0 on no addresses written
+ *           X on writing X addresses to MTA
  **/
 static int igb_write_mc_addr_list(struct net_device *netdev)
 {
@@ -3633,13 +3670,13 @@ static int igb_write_mc_addr_list(struct net_device *netdev)
 }
 
 /**
- * igb_write_uc_addr_list - write unicast addresses to RAR table
- * @netdev: network interface device structure
+ *  igb_write_uc_addr_list - write unicast addresses to RAR table
+ *  @netdev: network interface device structure
  *
- * Writes unicast address list to the RAR table.
- * Returns: -ENOMEM on failure/insufficient address space
- *                0 on no addresses written
- *                X on writing X addresses to the RAR table
+ *  Writes unicast address list to the RAR table.
+ *  Returns: -ENOMEM on failure/insufficient address space
+ *           0 on no addresses written
+ *           X on writing X addresses to the RAR table
  **/
 static int igb_write_uc_addr_list(struct net_device *netdev)
 {
@@ -3660,8 +3697,8 @@ static int igb_write_uc_addr_list(struct net_device *netdev)
                         if (!rar_entries)
                                 break;
                         igb_rar_set_qsel(adapter, ha->addr,
-                                         rar_entries--,
-                                         vfn);
+                                         rar_entries--,
+                                         vfn);
                         count++;
                 }
         }
@@ -3676,13 +3713,13 @@ static int igb_write_uc_addr_list(struct net_device *netdev)
 }
 
 /**
- * igb_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
- * @netdev: network interface device structure
+ *  igb_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
+ *  @netdev: network interface device structure
  *
- * The set_rx_mode entry point is called whenever the unicast or multicast
- * address lists or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper unicast, multicast,
- * promiscuous mode, and all-multi behavior.
+ *  The set_rx_mode entry point is called whenever the unicast or multicast
+ *  address lists or the network interface flags are updated.  This routine is
+ *  responsible for configuring the hardware for proper unicast, multicast,
+ *  promiscuous mode, and all-multi behavior.
  **/
 static void igb_set_rx_mode(struct net_device *netdev)
 {
@@ -3699,6 +3736,10 @@ static void igb_set_rx_mode(struct net_device *netdev)
         rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_VFE);
 
         if (netdev->flags & IFF_PROMISC) {
+                u32 mrqc = rd32(E1000_MRQC);
+                /* retain VLAN HW filtering if in VT mode */
+                if (mrqc & E1000_MRQC_ENABLE_VMDQ)
+                        rctl |= E1000_RCTL_VFE;
                 rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
                 vmolr |= (E1000_VMOLR_ROPE | E1000_VMOLR_MPME);
         } else {
@@ -3706,8 +3747,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
                         rctl |= E1000_RCTL_MPE;
                         vmolr |= E1000_VMOLR_MPME;
                 } else {
-                        /*
-                         * Write addresses to the MTA, if the attempt fails
+                        /* Write addresses to the MTA, if the attempt fails
                          * then we should just turn on promiscuous mode so
                          * that we can at least receive multicast traffic
                          */
@@ -3719,8 +3759,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
                                 vmolr |= E1000_VMOLR_ROMPE;
                         }
                 }
-                /*
-                 * Write addresses to available RAR registers, if there is not
+                /* Write addresses to available RAR registers, if there is not
                  * sufficient space to store all the addresses then enable
                  * unicast promiscuous mode
                  */
@@ -3733,8 +3772,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
         }
         wr32(E1000_RCTL, rctl);
 
-        /*
-         * In order to support SR-IOV and eventually VMDq it is necessary to set
+        /* In order to support SR-IOV and eventually VMDq it is necessary to set
          * the VMOLR to enable the appropriate modes.  Without this workaround
          * we will have issues with VLAN tag stripping not being done for frames
          * that are only arriving because we are the default pool
@@ -3743,7 +3781,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
                 return;
 
         vmolr |= rd32(E1000_VMOLR(vfn)) &
-                 ~(E1000_VMOLR_ROPE | E1000_VMOLR_MPME | E1000_VMOLR_ROMPE);
+                 ~(E1000_VMOLR_ROPE | E1000_VMOLR_MPME | E1000_VMOLR_ROMPE);
         wr32(E1000_VMOLR(vfn), vmolr);
         igb_restore_vf_multicasts(adapter);
 }
@@ -3788,7 +3826,8 @@ static void igb_spoof_check(struct igb_adapter *adapter)
 }
 
 /* Need to wait a few seconds after link up to get diagnostic information from
- * the phy */
+ * the phy
+ */
 static void igb_update_phy_info(unsigned long data)
 {
         struct igb_adapter *adapter = (struct igb_adapter *) data;
@@ -3796,8 +3835,8 @@ static void igb_update_phy_info(unsigned long data)
 }
 
 /**
- * igb_has_link - check shared code for link and determine up/down
- * @adapter: pointer to driver private info
+ *  igb_has_link - check shared code for link and determine up/down
+ *  @adapter: pointer to driver private info
  **/
 bool igb_has_link(struct igb_adapter *adapter)
 {
@@ -3842,17 +3881,16 @@ static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
                 ctrl_ext = rd32(E1000_CTRL_EXT);
 
                 if ((hw->phy.media_type == e1000_media_type_copper) &&
-                    !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII)) {
+                    !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII))
                         ret = !!(thstat & event);
-                }
         }
 
         return ret;
 }
 
 /**
- * igb_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
+ *  igb_watchdog - Timer Call-back
+ *  @data: pointer to adapter cast into an unsigned long
  **/
 static void igb_watchdog(unsigned long data)
 {
@@ -3864,9 +3902,10 @@ static void igb_watchdog(unsigned long data)
 static void igb_watchdog_task(struct work_struct *work)
 {
         struct igb_adapter *adapter = container_of(work,
-                                                   struct igb_adapter,
-                                                   watchdog_task);
+                                                   struct igb_adapter,
+                                                   watchdog_task);
         struct e1000_hw *hw = &adapter->hw;
+        struct e1000_phy_info *phy = &hw->phy;
         struct net_device *netdev = adapter->netdev;
         u32 link;
         int i;
@@ -3879,8 +3918,8 @@ static void igb_watchdog_task(struct work_struct *work)
                 if (!netif_carrier_ok(netdev)) {
                         u32 ctrl;
                         hw->mac.ops.get_speed_and_duplex(hw,
-                                                         &adapter->link_speed,
-                                                         &adapter->link_duplex);
+                                                         &adapter->link_speed,
+                                                         &adapter->link_duplex);
 
                         ctrl = rd32(E1000_CTRL);
                         /* Links status message must follow this format */
@@ -3895,6 +3934,11 @@ static void igb_watchdog_task(struct work_struct *work)
                                (ctrl & E1000_CTRL_RFCE) ?  "RX" :
                                (ctrl & E1000_CTRL_TFCE) ?  "TX" : "None");
 
+                        /* check if SmartSpeed worked */
+                        igb_check_downshift(hw);
+                        if (phy->speed_downgraded)
+                                netdev_warn(netdev, "Link Speed was downgraded by SmartSpeed\n");
+
                         /* check for thermal sensor event */
                         if (igb_thermal_sensor_event(hw,
                             E1000_THSTAT_LINK_THROTTLE)) {
@@ -3963,7 +4007,8 @@ static void igb_watchdog_task(struct work_struct *work)
                         /* We've lost link, so the controller stops DMA,
                          * but we've got queued Tx work that's never going
                          * to get done, so reset controller to flush Tx.
-                         * (Do the reset outside of interrupt context). */
+                         * (Do the reset outside of interrupt context).
+                         */
                         if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) {
                                 adapter->tx_timeout_count++;
                                 schedule_work(&adapter->reset_task);
@@ -3976,7 +4021,7 @@ static void igb_watchdog_task(struct work_struct *work)
                 set_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags);
         }
 
-        /* Cause software interrupt to ensure rx ring is cleaned */
+        /* Cause software interrupt to ensure Rx ring is cleaned */
         if (adapter->msix_entries) {
                 u32 eics = 0;
                 for (i = 0; i < adapter->num_q_vectors; i++)
@@ -4003,20 +4048,20 @@ enum latency_range {
 };
 
 /**
- * igb_update_ring_itr - update the dynamic ITR value based on packet size
+ *  igb_update_ring_itr - update the dynamic ITR value based on packet size
+ *  @q_vector: pointer to q_vector
  *
- *      Stores a new ITR value based on strictly on packet size.  This
- *      algorithm is less sophisticated than that used in igb_update_itr,
- *      due to the difficulty of synchronizing statistics across multiple
- *      receive rings.  The divisors and thresholds used by this function
- *      were determined based on theoretical maximum wire speed and testing
- *      data, in order to minimize response time while increasing bulk
- *      throughput.
- *      This functionality is controlled by the InterruptThrottleRate module
- *      parameter (see igb_param.c)
- *      NOTE:  This function is called only when operating in a multiqueue
- *             receive environment.
- * @q_vector: pointer to q_vector
+ *  Stores a new ITR value based on strictly on packet size.  This
+ *  algorithm is less sophisticated than that used in igb_update_itr,
+ *  due to the difficulty of synchronizing statistics across multiple
+ *  receive rings.  The divisors and thresholds used by this function
+ *  were determined based on theoretical maximum wire speed and testing
+ *  data, in order to minimize response time while increasing bulk
+ *  throughput.
+ *  This functionality is controlled by the InterruptThrottleRate module
+ *  parameter (see igb_param.c)
+ *  NOTE:  This function is called only when operating in a multiqueue
+ *         receive environment.
  **/
 static void igb_update_ring_itr(struct igb_q_vector *q_vector)
 {
@@ -4077,20 +4122,21 @@ clear_counts:
 }
 
 /**
- * igb_update_itr - update the dynamic ITR value based on statistics
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- *      this functionality is controlled by the InterruptThrottleRate module
- *      parameter (see igb_param.c)
- *      NOTE:  These calculations are only valid when operating in a single-
- *             queue environment.
- * @q_vector: pointer to q_vector
- * @ring_container: ring info to update the itr for
+ *  igb_update_itr - update the dynamic ITR value based on statistics
+ *  @q_vector: pointer to q_vector
+ *  @ring_container: ring info to update the itr for
+ *
+ *  Stores a new ITR value based on packets and byte
+ *  counts during the last interrupt.  The advantage of per interrupt
+ *  computation is faster updates and more accurate ITR for the current
+ *  traffic pattern.  Constants in this function were computed
+ *  based on theoretical maximum wire speed and thresholds were set based
+ *  on testing data as well as attempting to minimize response time
+ *  while increasing bulk throughput.
+ *  this functionality is controlled by the InterruptThrottleRate module
+ *  parameter (see igb_param.c)
+ *  NOTE:  These calculations are only valid when operating in a single-
+ *         queue environment.
  **/
 static void igb_update_itr(struct igb_q_vector *q_vector,
                            struct igb_ring_container *ring_container)
@@ -4188,12 +4234,12 @@ set_itr_now:
         if (new_itr != q_vector->itr_val) {
                 /* this attempts to bias the interrupt rate towards Bulk
                  * by adding intermediate steps when interrupt rate is
-                 * increasing */
+                 * increasing
+                 */
                 new_itr = new_itr > q_vector->itr_val ?
-                             max((new_itr * q_vector->itr_val) /
-                                 (new_itr + (q_vector->itr_val >> 2)),
-                                 new_itr) :
-                             new_itr;
+                          max((new_itr * q_vector->itr_val) /
+                          (new_itr + (q_vector->itr_val >> 2)),
+                          new_itr) : new_itr;
                 /* Don't write the value here; it resets the adapter's
                  * internal timer, and causes us to delay far longer than
                  * we should between interrupts.  Instead, we write the ITR
@@ -4320,8 +4366,8 @@ static void igb_tx_csum(struct igb_ring *tx_ring, struct igb_tx_buffer *first)
                 default:
                         if (unlikely(net_ratelimit())) {
                                 dev_warn(tx_ring->dev,
-                                 "partial checksum but proto=%x!\n",
-                                 first->protocol);
+                                         "partial checksum but proto=%x!\n",
+                                         first->protocol);
                         }
                         break;
                 }
@@ -4344,8 +4390,8 @@ static void igb_tx_csum(struct igb_ring *tx_ring, struct igb_tx_buffer *first)
                 default:
                         if (unlikely(net_ratelimit())) {
                                 dev_warn(tx_ring->dev,
-                                 "partial checksum but l4 proto=%x!\n",
-                                 l4_hdr);
+                                         "partial checksum but l4 proto=%x!\n",
+                                         l4_hdr);
                         }
                         break;
                 }
@@ -4497,8 +4543,7 @@ static void igb_tx_map(struct igb_ring *tx_ring,
         /* set the timestamp */
         first->time_stamp = jiffies;
 
-        /*
-         * Force memory writes to complete before letting h/w know there
+        /* Force memory writes to complete before letting h/w know there
          * are new descriptors to fetch.  (Only applicable for weak-ordered
          * memory model archs, such as IA-64).
          *
@@ -4519,7 +4564,8 @@ static void igb_tx_map(struct igb_ring *tx_ring,
         writel(i, tx_ring->tail);
 
         /* we need this if more than one processor can write to our tail
-         * at a time, it syncronizes IO on IA64/Altix systems */
+         * at a time, it synchronizes IO on IA64/Altix systems
+         */
         mmiowb();
 
         return;
@@ -4549,11 +4595,13 @@ static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)
 
         /* Herbert's original patch had:
          *  smp_mb__after_netif_stop_queue();
-         * but since that doesn't exist yet, just open code it. */
+         * but since that doesn't exist yet, just open code it.
+         */
         smp_mb();
 
         /* We need to check again in a case another CPU has just
-         * made room available. */
+         * made room available.
+         */
         if (igb_desc_unused(tx_ring) < size)
                 return -EBUSY;
 
@@ -4577,7 +4625,6 @@ static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)
 netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
                                 struct igb_ring *tx_ring)
 {
-        struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
         struct igb_tx_buffer *first;
         int tso;
         u32 tx_flags = 0;
@@ -4612,15 +4659,18 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
 
         skb_tx_timestamp(skb);
 
-        if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
-                     !(adapter->ptp_tx_skb))) {
-                skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
-                tx_flags |= IGB_TX_FLAGS_TSTAMP;
+        if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
+                struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
 
-                adapter->ptp_tx_skb = skb_get(skb);
-                adapter->ptp_tx_start = jiffies;
-                if (adapter->hw.mac.type == e1000_82576)
-                        schedule_work(&adapter->ptp_tx_work);
+                if (!(adapter->ptp_tx_skb)) {
+                        skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
+                        tx_flags |= IGB_TX_FLAGS_TSTAMP;
+
+                        adapter->ptp_tx_skb = skb_get(skb);
+                        adapter->ptp_tx_start = jiffies;
+                        if (adapter->hw.mac.type == e1000_82576)
+                                schedule_work(&adapter->ptp_tx_work);
+                }
         }
 
         if (vlan_tx_tag_present(skb)) {
@@ -4677,8 +4727,7 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb,
                 return NETDEV_TX_OK;
         }
 
-        /*
-         * The minimum packet size with TCTL.PSP set is 17 so pad the skb
+        /* The minimum packet size with TCTL.PSP set is 17 so pad the skb
          * in order to meet this minimum size requirement.
          */
         if (unlikely(skb->len < 17)) {
@@ -4692,8 +4741,8 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb,
 }
 
 /**
- * igb_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
+ *  igb_tx_timeout - Respond to a Tx Hang
+ *  @netdev: network interface device structure
  **/
 static void igb_tx_timeout(struct net_device *netdev)
 {
@@ -4722,13 +4771,12 @@ static void igb_reset_task(struct work_struct *work)
 }
 
 /**
- * igb_get_stats64 - Get System Network Statistics
- * @netdev: network interface device structure
- * @stats: rtnl_link_stats64 pointer
- *
+ *  igb_get_stats64 - Get System Network Statistics
+ *  @netdev: network interface device structure
+ *  @stats: rtnl_link_stats64 pointer
  **/
 static struct rtnl_link_stats64 *igb_get_stats64(struct net_device *netdev,
-                                                 struct rtnl_link_stats64 *stats)
+                                                struct rtnl_link_stats64 *stats)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
 
@@ -4741,11 +4789,11 @@ static struct rtnl_link_stats64 *igb_get_stats64(struct net_device *netdev,
 }
 
 /**
- * igb_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
+ *  igb_change_mtu - Change the Maximum Transfer Unit
+ *  @netdev: network interface device structure
+ *  @new_mtu: new value for maximum frame size
  *
- * Returns 0 on success, negative on failure
+ *  Returns 0 on success, negative on failure
  **/
 static int igb_change_mtu(struct net_device *netdev, int new_mtu)
 {
@@ -4788,10 +4836,9 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu)
 }
 
 /**
- * igb_update_stats - Update the board statistics counters
- * @adapter: board private structure
+ *  igb_update_stats - Update the board statistics counters
+ *  @adapter: board private structure
  **/
-
 void igb_update_stats(struct igb_adapter *adapter,
                       struct rtnl_link_stats64 *net_stats)
 {
@@ -4806,8 +4853,7 @@ void igb_update_stats(struct igb_adapter *adapter,
 
 #define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
 
-        /*
-         * Prevent stats update while adapter is being reset, or if the pci
+        /* Prevent stats update while adapter is being reset, or if the pci
          * connection is down.
          */
         if (adapter->link_speed == 0)
@@ -4941,7 +4987,8 @@ void igb_update_stats(struct igb_adapter *adapter,
         /* Rx Errors */
 
         /* RLEC on some newer hardware can be incorrect so build
-         * our own version based on RUC and ROC */
+         * our own version based on RUC and ROC
+         */
         net_stats->rx_errors = adapter->stats.rxerrc +
                 adapter->stats.crcerrs + adapter->stats.algnerrc +
                 adapter->stats.ruc + adapter->stats.roc +
@@ -5000,7 +5047,8 @@ static irqreturn_t igb_msix_other(int irq, void *data)
                 adapter->stats.doosync++;
                 /* The DMA Out of Sync is also indication of a spoof event
                  * in IOV mode. Check the Wrong VM Behavior register to
-                 * see if it is really a spoof event. */
+                 * see if it is really a spoof event.
+                 */
                 igb_check_wvbr(adapter);
         }
 
@@ -5074,8 +5122,7 @@ static void igb_update_tx_dca(struct igb_adapter *adapter,
         if (hw->mac.type != e1000_82575)
                 txctrl <<= E1000_DCA_TXCTRL_CPUID_SHIFT;
 
-        /*
-         * We can enable relaxed ordering for reads, but not writes when
+        /* We can enable relaxed ordering for reads, but not writes when
          * DCA is enabled.  This is due to a known issue in some chipsets
          * which will cause the DCA tag to be cleared.
          */
@@ -5096,8 +5143,7 @@ static void igb_update_rx_dca(struct igb_adapter *adapter,
         if (hw->mac.type != e1000_82575)
                 rxctrl <<= E1000_DCA_RXCTRL_CPUID_SHIFT;
 
-        /*
-         * We can enable relaxed ordering for reads, but not writes when
+        /* We can enable relaxed ordering for reads, but not writes when
          * DCA is enabled.  This is due to a known issue in some chipsets
          * which will cause the DCA tag to be cleared.
          */
@@ -5166,7 +5212,8 @@ static int __igb_notify_dca(struct device *dev, void *data)
         case DCA_PROVIDER_REMOVE:
                 if (adapter->flags & IGB_FLAG_DCA_ENABLED) {
                         /* without this a class_device is left
-                         * hanging around in the sysfs model */
+                         * hanging around in the sysfs model
+                         */
                         dca_remove_requester(dev);
                         dev_info(&pdev->dev, "DCA disabled\n");
                         adapter->flags &= ~IGB_FLAG_DCA_ENABLED;
@@ -5179,12 +5226,12 @@ static int __igb_notify_dca(struct device *dev, void *data)
 }
 
 static int igb_notify_dca(struct notifier_block *nb, unsigned long event,
-                          void *p)
+                          void *p)
 {
         int ret_val;
 
         ret_val = driver_for_each_device(&igb_driver.driver, NULL, &event,
-                                         __igb_notify_dca);
+                                         __igb_notify_dca);
 
         return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
 }
@@ -5198,40 +5245,10 @@ static int igb_vf_configure(struct igb_adapter *adapter, int vf)
         eth_zero_addr(mac_addr);
         igb_set_vf_mac(adapter, vf, mac_addr);
 
-        return 0;
-}
-
-static bool igb_vfs_are_assigned(struct igb_adapter *adapter)
-{
-        struct pci_dev *pdev = adapter->pdev;
-        struct pci_dev *vfdev;
-        int dev_id;
-
-        switch (adapter->hw.mac.type) {
-        case e1000_82576:
-                dev_id = IGB_82576_VF_DEV_ID;
-                break;
-        case e1000_i350:
-                dev_id = IGB_I350_VF_DEV_ID;
-                break;
-        default:
-                return false;
-        }
-
-        /* loop through all the VFs to see if we own any that are assigned */
-        vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, dev_id, NULL);
-        while (vfdev) {
-                /* if we don't own it we don't care */
-                if (vfdev->is_virtfn && vfdev->physfn == pdev) {
-                        /* if it is assigned we cannot release it */
-                        if (vfdev->dev_flags & PCI_DEV_FLAGS_ASSIGNED)
-                                return true;
-                }
-
-                vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, dev_id, vfdev);
-        }
+        /* By default spoof check is enabled for all VFs */
+        adapter->vf_data[vf].spoofchk_enabled = true;
 
-        return false;
+        return 0;
 }
 
 #endif
@@ -5256,7 +5273,7 @@ static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
         struct vf_data_storage *vf_data = &adapter->vf_data[vf];
 
         vf_data->flags &= ~(IGB_VF_FLAG_UNI_PROMISC |
-                            IGB_VF_FLAG_MULTI_PROMISC);
+                            IGB_VF_FLAG_MULTI_PROMISC);
         vmolr &= ~(E1000_VMOLR_ROPE | E1000_VMOLR_ROMPE | E1000_VMOLR_MPME);
 
         if (*msgbuf & E1000_VF_SET_PROMISC_MULTICAST) {
@@ -5264,8 +5281,7 @@ static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
                 vf_data->flags |= IGB_VF_FLAG_MULTI_PROMISC;
                 *msgbuf &= ~E1000_VF_SET_PROMISC_MULTICAST;
         } else {
-                /*
-                 * if we have hashes and we are clearing a multicast promisc
+                /* if we have hashes and we are clearing a multicast promisc
                  * flag we need to write the hashes to the MTA as this step
                  * was previously skipped
                  */
@@ -5286,7 +5302,6 @@ static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
                 return -EINVAL;
 
         return 0;
-
 }
 
 static int igb_set_vf_multicasts(struct igb_adapter *adapter,
@@ -5493,30 +5508,91 @@ static int igb_ndo_set_vf_vlan(struct net_device *netdev,
                          "Setting VLAN %d, QOS 0x%x on VF %d\n", vlan, qos, vf);
                 if (test_bit(__IGB_DOWN, &adapter->state)) {
                         dev_warn(&adapter->pdev->dev,
-                                 "The VF VLAN has been set,"
-                                 " but the PF device is not up.\n");
+                                 "The VF VLAN has been set, but the PF device is not up.\n");
                         dev_warn(&adapter->pdev->dev,
-                                 "Bring the PF device up before"
-                                 " attempting to use the VF device.\n");
+                                 "Bring the PF device up before attempting to use the VF device.\n");
                 }
         } else {
                 igb_vlvf_set(adapter, adapter->vf_data[vf].pf_vlan,
-                                   false, vf);
+                             false, vf);
                 igb_set_vmvir(adapter, vlan, vf);
                 igb_set_vmolr(adapter, vf, true);
                 adapter->vf_data[vf].pf_vlan = 0;
                 adapter->vf_data[vf].pf_qos = 0;
-       }
+        }
 out:
-       return err;
+        return err;
+}
+
+static int igb_find_vlvf_entry(struct igb_adapter *adapter, int vid)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        int i;
+        u32 reg;
+
+        /* Find the vlan filter for this id */
+        for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
+                reg = rd32(E1000_VLVF(i));
+                if ((reg & E1000_VLVF_VLANID_ENABLE) &&
+                    vid == (reg & E1000_VLVF_VLANID_MASK))
+                        break;
+        }
+
+        if (i >= E1000_VLVF_ARRAY_SIZE)
+                i = -1;
+
+        return i;
 }
 
 static int igb_set_vf_vlan(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
 {
+        struct e1000_hw *hw = &adapter->hw;
         int add = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >> E1000_VT_MSGINFO_SHIFT;
         int vid = (msgbuf[1] & E1000_VLVF_VLANID_MASK);
+        int err = 0;
+
+        /* If in promiscuous mode we need to make sure the PF also has
+         * the VLAN filter set.
+         */
+        if (add && (adapter->netdev->flags & IFF_PROMISC))
+                err = igb_vlvf_set(adapter, vid, add,
+                                   adapter->vfs_allocated_count);
+        if (err)
+                goto out;
 
-        return igb_vlvf_set(adapter, vid, add, vf);
+        err = igb_vlvf_set(adapter, vid, add, vf);
+
+        if (err)
+                goto out;
+
+        /* Go through all the checks to see if the VLAN filter should
+         * be wiped completely.
+         */
+        if (!add && (adapter->netdev->flags & IFF_PROMISC)) {
+                u32 vlvf, bits;
+
+                int regndx = igb_find_vlvf_entry(adapter, vid);
+                if (regndx < 0)
+                        goto out;
+                /* See if any other pools are set for this VLAN filter
+                 * entry other than the PF.
+                 */
+                vlvf = bits = rd32(E1000_VLVF(regndx));
+                bits &= 1 << (E1000_VLVF_POOLSEL_SHIFT +
+                              adapter->vfs_allocated_count);
+                /* If the filter was removed then ensure PF pool bit
+                 * is cleared if the PF only added itself to the pool
+                 * because the PF is in promiscuous mode.
+                 */
+                if ((vlvf & VLAN_VID_MASK) == vid &&
+                    !test_bit(vid, adapter->active_vlans) &&
+                    !bits)
+                        igb_vlvf_set(adapter, vid, add,
+                                     adapter->vfs_allocated_count);
+        }
+
+out:
+        return err;
 }
 
 static inline void igb_vf_reset(struct igb_adapter *adapter, u32 vf)
@@ -5586,8 +5662,7 @@ static void igb_vf_reset_msg(struct igb_adapter *adapter, u32 vf)
 
 static int igb_set_vf_mac_addr(struct igb_adapter *adapter, u32 *msg, int vf)
 {
-        /*
-         * The VF MAC Address is stored in a packed array of bytes
+        /* The VF MAC Address is stored in a packed array of bytes
          * starting at the second 32 bit word of the msg array
          */
         unsigned char *addr = (char *)&msg[1];
@@ -5636,11 +5711,9 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
         if (msgbuf[0] & (E1000_VT_MSGTYPE_ACK | E1000_VT_MSGTYPE_NACK))
                 return;
 
-        /*
-         * until the vf completes a reset it should not be
+        /* until the vf completes a reset it should not be
          * allowed to start any configuration.
          */
-
         if (msgbuf[0] == E1000_VF_RESET) {
                 igb_vf_reset_msg(adapter, vf);
                 return;
@@ -5660,9 +5733,8 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
                         retval = igb_set_vf_mac_addr(adapter, msgbuf, vf);
                 else
                         dev_warn(&pdev->dev,
-                                 "VF %d attempted to override administratively "
-                                 "set MAC address\nReload the VF driver to "
-                                 "resume operations\n", vf);
+                                 "VF %d attempted to override administratively set MAC address\nReload the VF driver to resume operations\n",
+                                 vf);
                 break;
         case E1000_VF_SET_PROMISC:
                 retval = igb_set_vf_promisc(adapter, msgbuf, vf);
@@ -5677,9 +5749,8 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
                 retval = -1;
                 if (vf_data->pf_vlan)
                         dev_warn(&pdev->dev,
-                                 "VF %d attempted to override administratively "
-                                 "set VLAN tag\nReload the VF driver to "
-                                 "resume operations\n", vf);
+                                 "VF %d attempted to override administratively set VLAN tag\nReload the VF driver to resume operations\n",
+                                 vf);
                 else
                         retval = igb_set_vf_vlan(adapter, msgbuf, vf);
                 break;
@@ -5748,9 +5819,9 @@ static void igb_set_uta(struct igb_adapter *adapter)
 }
 
 /**
- * igb_intr_msi - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
+ *  igb_intr_msi - Interrupt Handler
+ *  @irq: interrupt number
+ *  @data: pointer to a network interface device structure
  **/
 static irqreturn_t igb_intr_msi(int irq, void *data)
 {
@@ -5793,9 +5864,9 @@ static irqreturn_t igb_intr_msi(int irq, void *data)
 }
 
 /**
- * igb_intr - Legacy Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
+ *  igb_intr - Legacy Interrupt Handler
+ *  @irq: interrupt number
+ *  @data: pointer to a network interface device structure
  **/
 static irqreturn_t igb_intr(int irq, void *data)
 {
@@ -5803,11 +5874,13 @@ static irqreturn_t igb_intr(int irq, void *data)
         struct igb_q_vector *q_vector = adapter->q_vector[0];
         struct e1000_hw *hw = &adapter->hw;
         /* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No
-         * need for the IMC write */
+         * need for the IMC write
+         */
         u32 icr = rd32(E1000_ICR);
 
         /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is
-         * not set, then the adapter didn't send an interrupt */
+         * not set, then the adapter didn't send an interrupt
+         */
         if (!(icr & E1000_ICR_INT_ASSERTED))
                 return IRQ_NONE;
 
@@ -5866,15 +5939,15 @@ static void igb_ring_irq_enable(struct igb_q_vector *q_vector)
 }
 
 /**
- * igb_poll - NAPI Rx polling callback
- * @napi: napi polling structure
- * @budget: count of how many packets we should handle
+ *  igb_poll - NAPI Rx polling callback
+ *  @napi: napi polling structure
+ *  @budget: count of how many packets we should handle
  **/
 static int igb_poll(struct napi_struct *napi, int budget)
 {
         struct igb_q_vector *q_vector = container_of(napi,
-                                                     struct igb_q_vector,
-                                                     napi);
+                                                     struct igb_q_vector,
+                                                     napi);
         bool clean_complete = true;
 
 #ifdef CONFIG_IGB_DCA
@@ -5899,10 +5972,10 @@ static int igb_poll(struct napi_struct *napi, int budget)
 }
 
 /**
- * igb_clean_tx_irq - Reclaim resources after transmit completes
- * @q_vector: pointer to q_vector containing needed info
+ *  igb_clean_tx_irq - Reclaim resources after transmit completes
+ *  @q_vector: pointer to q_vector containing needed info
  *
- * returns true if ring is completely cleaned
+ *  returns true if ring is completely cleaned
  **/
 static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
 {
@@ -6008,7 +6081,8 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
                 struct e1000_hw *hw = &adapter->hw;
 
                 /* Detect a transmit hang in hardware, this serializes the
-                 * check with the clearing of time_stamp and movement of i */
+                 * check with the clearing of time_stamp and movement of i
+                 */
                 clear_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags);
                 if (tx_buffer->next_to_watch &&
                     time_after(jiffies, tx_buffer->time_stamp +
@@ -6047,8 +6121,8 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
 
 #define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
         if (unlikely(total_packets &&
-                     netif_carrier_ok(tx_ring->netdev) &&
-                     igb_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD)) {
+            netif_carrier_ok(tx_ring->netdev) &&
+            igb_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD)) {
                 /* Make sure that anybody stopping the queue after this
                  * sees the new next_to_clean.
                  */
@@ -6069,11 +6143,11 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
 }
 
 /**
- * igb_reuse_rx_page - page flip buffer and store it back on the ring
- * @rx_ring: rx descriptor ring to store buffers on
- * @old_buff: donor buffer to have page reused
+ *  igb_reuse_rx_page - page flip buffer and store it back on the ring
+ *  @rx_ring: rx descriptor ring to store buffers on
+ *  @old_buff: donor buffer to have page reused
  *
- * Synchronizes page for reuse by the adapter
+ *  Synchronizes page for reuse by the adapter
  **/
 static void igb_reuse_rx_page(struct igb_ring *rx_ring,
                               struct igb_rx_buffer *old_buff)
@@ -6133,19 +6207,19 @@ static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
 }
 
 /**
- * igb_add_rx_frag - Add contents of Rx buffer to sk_buff
- * @rx_ring: rx descriptor ring to transact packets on
- * @rx_buffer: buffer containing page to add
- * @rx_desc: descriptor containing length of buffer written by hardware
- * @skb: sk_buff to place the data into
+ *  igb_add_rx_frag - Add contents of Rx buffer to sk_buff
+ *  @rx_ring: rx descriptor ring to transact packets on
+ *  @rx_buffer: buffer containing page to add
+ *  @rx_desc: descriptor containing length of buffer written by hardware
+ *  @skb: sk_buff to place the data into
  *
- * This function will add the data contained in rx_buffer->page to the skb.
- * This is done either through a direct copy if the data in the buffer is
- * less than the skb header size, otherwise it will just attach the page as
- * a frag to the skb.
+ *  This function will add the data contained in rx_buffer->page to the skb.
+ *  This is done either through a direct copy if the data in the buffer is
+ *  less than the skb header size, otherwise it will just attach the page as
+ *  a frag to the skb.
  *
- * The function will then update the page offset if necessary and return
- * true if the buffer can be reused by the adapter.
+ *  The function will then update the page offset if necessary and return
+ *  true if the buffer can be reused by the adapter.
  **/
 static bool igb_add_rx_frag(struct igb_ring *rx_ring,
                             struct igb_rx_buffer *rx_buffer,
@@ -6216,8 +6290,7 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring,
                         return NULL;
                 }
 
-                /*
-                 * we will be copying header into skb->data in
+                /* we will be copying header into skb->data in
                  * pskb_may_pull so it is in our interest to prefetch
                  * it now to avoid a possible cache miss
                  */
@@ -6265,8 +6338,7 @@ static inline void igb_rx_checksum(struct igb_ring *ring,
         if (igb_test_staterr(rx_desc,
                              E1000_RXDEXT_STATERR_TCPE |
                              E1000_RXDEXT_STATERR_IPE)) {
-                /*
-                 * work around errata with sctp packets where the TCPE aka
+                /* work around errata with sctp packets where the TCPE aka
                  * L4E bit is set incorrectly on 64 byte (60 byte w/o crc)
                  * packets, (aka let the stack check the crc32c)
                  */
@@ -6297,15 +6369,15 @@ static inline void igb_rx_hash(struct igb_ring *ring,
 }
 
 /**
- * igb_is_non_eop - process handling of non-EOP buffers
- * @rx_ring: Rx ring being processed
- * @rx_desc: Rx descriptor for current buffer
- * @skb: current socket buffer containing buffer in progress
+ *  igb_is_non_eop - process handling of non-EOP buffers
+ *  @rx_ring: Rx ring being processed
+ *  @rx_desc: Rx descriptor for current buffer
+ *  @skb: current socket buffer containing buffer in progress
  *
- * This function updates next to clean.  If the buffer is an EOP buffer
- * this function exits returning false, otherwise it will place the
- * sk_buff in the next buffer to be chained and return true indicating
- * that this is in fact a non-EOP buffer.
+ *  This function updates next to clean.  If the buffer is an EOP buffer
+ *  this function exits returning false, otherwise it will place the
+ *  sk_buff in the next buffer to be chained and return true indicating
+ *  that this is in fact a non-EOP buffer.
  **/
 static bool igb_is_non_eop(struct igb_ring *rx_ring,
                            union e1000_adv_rx_desc *rx_desc)
@@ -6325,15 +6397,15 @@ static bool igb_is_non_eop(struct igb_ring *rx_ring,
 }
 
 /**
- * igb_get_headlen - determine size of header for LRO/GRO
- * @data: pointer to the start of the headers
- * @max_len: total length of section to find headers in
+ *  igb_get_headlen - determine size of header for LRO/GRO
+ *  @data: pointer to the start of the headers
+ *  @max_len: total length of section to find headers in
  *
- * This function is meant to determine the length of headers that will
- * be recognized by hardware for LRO, and GRO offloads.  The main
- * motivation of doing this is to only perform one pull for IPv4 TCP
- * packets so that we can do basic things like calculating the gso_size
- * based on the average data per packet.
+ *  This function is meant to determine the length of headers that will
+ *  be recognized by hardware for LRO, and GRO offloads.  The main
+ *  motivation of doing this is to only perform one pull for IPv4 TCP
+ *  packets so that we can do basic things like calculating the gso_size
+ *  based on the average data per packet.
  **/
 static unsigned int igb_get_headlen(unsigned char *data,
                                     unsigned int max_len)
@@ -6384,7 +6456,7 @@ static unsigned int igb_get_headlen(unsigned char *data,
                         return hdr.network - data;
 
                 /* record next protocol if header is present */
-                if (!hdr.ipv4->frag_off)
+                if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))
                         nexthdr = hdr.ipv4->protocol;
         } else if (protocol == __constant_htons(ETH_P_IPV6)) {
                 if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))
@@ -6420,8 +6492,7 @@ static unsigned int igb_get_headlen(unsigned char *data,
                 hdr.network += sizeof(struct udphdr);
         }
 
-        /*
-         * If everything has gone correctly hdr.network should be the
+        /* If everything has gone correctly hdr.network should be the
          * data section of the packet and will be the end of the header.
          * If not then it probably represents the end of the last recognized
          * header.
@@ -6433,17 +6504,17 @@ static unsigned int igb_get_headlen(unsigned char *data,
 }
 
 /**
- * igb_pull_tail - igb specific version of skb_pull_tail
- * @rx_ring: rx descriptor ring packet is being transacted on
- * @rx_desc: pointer to the EOP Rx descriptor
- * @skb: pointer to current skb being adjusted
+ *  igb_pull_tail - igb specific version of skb_pull_tail
+ *  @rx_ring: rx descriptor ring packet is being transacted on
+ *  @rx_desc: pointer to the EOP Rx descriptor
+ *  @skb: pointer to current skb being adjusted
  *
- * This function is an igb specific version of __pskb_pull_tail.  The
- * main difference between this version and the original function is that
- * this function can make several assumptions about the state of things
- * that allow for significant optimizations versus the standard function.
- * As a result we can do things like drop a frag and maintain an accurate
- * truesize for the skb.
+ *  This function is an igb specific version of __pskb_pull_tail.  The
+ *  main difference between this version and the original function is that
+ *  this function can make several assumptions about the state of things
+ *  that allow for significant optimizations versus the standard function.
+ *  As a result we can do things like drop a frag and maintain an accurate
+ *  truesize for the skb.
  */
 static void igb_pull_tail(struct igb_ring *rx_ring,
                           union e1000_adv_rx_desc *rx_desc,
@@ -6453,8 +6524,7 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
         unsigned char *va;
         unsigned int pull_len;
 
-        /*
-         * it is valid to use page_address instead of kmap since we are
+        /* it is valid to use page_address instead of kmap since we are
          * working with pages allocated out of the lomem pool per
          * alloc_page(GFP_ATOMIC)
          */
@@ -6474,8 +6544,7 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
                 va += IGB_TS_HDR_LEN;
         }
 
-        /*
-         * we need the header to contain the greater of either ETH_HLEN or
+        /* we need the header to contain the greater of either ETH_HLEN or
          * 60 bytes if the skb->len is less than 60 for skb_pad.
          */
         pull_len = igb_get_headlen(va, IGB_RX_HDR_LEN);
@@ -6491,24 +6560,23 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
 }
 
 /**
- * igb_cleanup_headers - Correct corrupted or empty headers
- * @rx_ring: rx descriptor ring packet is being transacted on
- * @rx_desc: pointer to the EOP Rx descriptor
- * @skb: pointer to current skb being fixed
+ *  igb_cleanup_headers - Correct corrupted or empty headers
+ *  @rx_ring: rx descriptor ring packet is being transacted on
+ *  @rx_desc: pointer to the EOP Rx descriptor
+ *  @skb: pointer to current skb being fixed
  *
- * Address the case where we are pulling data in on pages only
- * and as such no data is present in the skb header.
+ *  Address the case where we are pulling data in on pages only
+ *  and as such no data is present in the skb header.
  *
- * In addition if skb is not at least 60 bytes we need to pad it so that
- * it is large enough to qualify as a valid Ethernet frame.
+ *  In addition if skb is not at least 60 bytes we need to pad it so that
+ *  it is large enough to qualify as a valid Ethernet frame.
  *
- * Returns true if an error was encountered and skb was freed.
+ *  Returns true if an error was encountered and skb was freed.
  **/
 static bool igb_cleanup_headers(struct igb_ring *rx_ring,
                                 union e1000_adv_rx_desc *rx_desc,
                                 struct sk_buff *skb)
 {
-
         if (unlikely((igb_test_staterr(rx_desc,
                                        E1000_RXDEXT_ERR_FRAME_ERR_MASK)))) {
                 struct net_device *netdev = rx_ring->netdev;
@@ -6535,14 +6603,14 @@ static bool igb_cleanup_headers(struct igb_ring *rx_ring,
 }
 
 /**
- * igb_process_skb_fields - Populate skb header fields from Rx descriptor
- * @rx_ring: rx descriptor ring packet is being transacted on
- * @rx_desc: pointer to the EOP Rx descriptor
- * @skb: pointer to current skb being populated
+ *  igb_process_skb_fields - Populate skb header fields from Rx descriptor
+ *  @rx_ring: rx descriptor ring packet is being transacted on
+ *  @rx_desc: pointer to the EOP Rx descriptor
+ *  @skb: pointer to current skb being populated
  *
- * This function checks the ring, descriptor, and packet information in
- * order to populate the hash, checksum, VLAN, timestamp, protocol, and
- * other fields within the skb.
+ *  This function checks the ring, descriptor, and packet information in
+ *  order to populate the hash, checksum, VLAN, timestamp, protocol, and
+ *  other fields within the skb.
  **/
 static void igb_process_skb_fields(struct igb_ring *rx_ring,
                                    union e1000_adv_rx_desc *rx_desc,
@@ -6556,7 +6624,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring,
 
         igb_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
 
-        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+        if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
             igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {
                 u16 vid;
                 if (igb_test_staterr(rx_desc, E1000_RXDEXT_STATERR_LB) &&
@@ -6565,7 +6633,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring,
                 else
                         vid = le16_to_cpu(rx_desc->wb.upper.vlan);
 
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         }
 
         skb_record_rx_queue(skb, rx_ring->queue_index);
@@ -6670,8 +6738,7 @@ static bool igb_alloc_mapped_page(struct igb_ring *rx_ring,
         /* map page for use */
         dma = dma_map_page(rx_ring->dev, page, 0, PAGE_SIZE, DMA_FROM_DEVICE);
 
-        /*
-         * if mapping failed free memory back to system since
+        /* if mapping failed free memory back to system since
          * there isn't much point in holding memory we can't use
          */
         if (dma_mapping_error(rx_ring->dev, dma)) {
@@ -6689,8 +6756,8 @@ static bool igb_alloc_mapped_page(struct igb_ring *rx_ring,
 }
 
 /**
- * igb_alloc_rx_buffers - Replace used receive buffers; packet split
- * @adapter: address of board private structure
+ *  igb_alloc_rx_buffers - Replace used receive buffers; packet split
+ *  @adapter: address of board private structure
  **/
 void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
 {
@@ -6710,8 +6777,7 @@ void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
                 if (!igb_alloc_mapped_page(rx_ring, bi))
                         break;
 
-                /*
-                 * Refresh the desc even if buffer_addrs didn't change
+                /* Refresh the desc even if buffer_addrs didn't change
                  * because each write-back erases this info.
                  */
                 rx_desc->read.pkt_addr = cpu_to_le64(bi->dma + bi->page_offset);
@@ -6740,8 +6806,7 @@ void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
                 /* update next to alloc since we have filled the ring */
                 rx_ring->next_to_alloc = i;
 
-                /*
-                 * Force memory writes to complete before letting h/w
+                /* Force memory writes to complete before letting h/w
                  * know there are new descriptors to fetch.  (Only
                  * applicable for weak-ordered memory model archs,
                  * such as IA-64).
@@ -6826,7 +6891,7 @@ static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features)
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         u32 ctrl, rctl;
-        bool enable = !!(features & NETIF_F_HW_VLAN_RX);
+        bool enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX);
 
         if (enable) {
                 /* enable VLAN tag insert/strip */
@@ -6848,7 +6913,8 @@ static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features)
         igb_rlpml_set(adapter);
 }
 
-static int igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+static int igb_vlan_rx_add_vid(struct net_device *netdev,
+                               __be16 proto, u16 vid)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -6865,7 +6931,8 @@ static int igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         return 0;
 }
 
-static int igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+static int igb_vlan_rx_kill_vid(struct net_device *netdev,
+                                __be16 proto, u16 vid)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -6891,7 +6958,7 @@ static void igb_restore_vlan(struct igb_adapter *adapter)
         igb_vlan_mode(adapter->netdev, adapter->netdev->features);
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                igb_vlan_rx_add_vid(adapter->netdev, vid);
+                igb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 }
 
 int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)
@@ -6902,15 +6969,24 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)
         mac->autoneg = 0;
 
         /* Make sure dplx is at most 1 bit and lsb of speed is not set
-         * for the switch() below to work */
+         * for the switch() below to work
+         */
         if ((spd & 1) || (dplx & ~1))
                 goto err_inval;
 
-        /* Fiber NIC's only allow 1000 Gbps Full duplex */
-        if ((adapter->hw.phy.media_type == e1000_media_type_internal_serdes) &&
-            spd != SPEED_1000 &&
-            dplx != DUPLEX_FULL)
-                goto err_inval;
+        /* Fiber NIC's only allow 1000 gbps Full duplex
+         * and 100Mbps Full duplex for 100baseFx sfp
+         */
+        if (adapter->hw.phy.media_type == e1000_media_type_internal_serdes) {
+                switch (spd + dplx) {
+                case SPEED_10 + DUPLEX_HALF:
+                case SPEED_10 + DUPLEX_FULL:
+                case SPEED_100 + DUPLEX_HALF:
+                        goto err_inval;
+                default:
+                        break;
+                }
+        }
 
         switch (spd + dplx) {
         case SPEED_10 + DUPLEX_HALF:
@@ -7009,7 +7085,8 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,
                 igb_power_up_link(adapter);
 
         /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-         * would have already happened in close and is redundant. */
+         * would have already happened in close and is redundant.
+         */
         igb_release_hw_control(adapter);
 
         pci_disable_device(pdev);
@@ -7071,7 +7148,8 @@ static int igb_resume(struct device *dev)
         igb_reset(adapter);
 
         /* let the f/w know that the h/w is now under the control of the
-         * driver. */
+         * driver.
+         */
         igb_get_hw_control(adapter);
 
         wr32(E1000_WUS, ~0);
@@ -7207,8 +7285,7 @@ static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
+/* Polling 'interrupt' - used by things like netconsole to send skbs
  * without having to re-enable interrupts. It's not called while
  * the interrupt routine is executing.
  */
@@ -7231,13 +7308,13 @@ static void igb_netpoll(struct net_device *netdev)
 #endif /* CONFIG_NET_POLL_CONTROLLER */
 
 /**
- * igb_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
+ *  igb_io_error_detected - called when PCI error is detected
+ *  @pdev: Pointer to PCI device
+ *  @state: The current pci connection state
  *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
+ *  This function is called after a PCI bus error affecting
+ *  this device has been detected.
+ **/
 static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev,
                                               pci_channel_state_t state)
 {
@@ -7258,12 +7335,12 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev,
 }
 
 /**
- * igb_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
+ *  igb_io_slot_reset - called after the pci bus has been reset.
+ *  @pdev: Pointer to PCI device
  *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the igb_resume routine.
- */
+ *  Restart the card from scratch, as if from a cold-boot. Implementation
+ *  resembles the first-half of the igb_resume routine.
+ **/
 static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
@@ -7291,8 +7368,9 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
 
         err = pci_cleanup_aer_uncorrect_error_status(pdev);
         if (err) {
-                dev_err(&pdev->dev, "pci_cleanup_aer_uncorrect_error_status "
-                        "failed 0x%0x\n", err);
+                dev_err(&pdev->dev,
+                        "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n",
+                        err);
                 /* non-fatal, continue */
         }
 
@@ -7300,12 +7378,12 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
 }
 
 /**
- * igb_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
+ *  igb_io_resume - called when traffic can start flowing again.
+ *  @pdev: Pointer to PCI device
  *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the igb_resume routine.
+ *  This callback is called when the error recovery driver tells us that
+ *  its OK to resume normal operation. Implementation resembles the
+ *  second-half of the igb_resume routine.
  */
 static void igb_io_resume(struct pci_dev *pdev)
 {
@@ -7322,12 +7400,13 @@ static void igb_io_resume(struct pci_dev *pdev)
         netif_device_attach(netdev);
 
         /* let the f/w know that the h/w is now under the control of the
-         * driver. */
+         * driver.
+         */
         igb_get_hw_control(adapter);
 }
 
 static void igb_rar_set_qsel(struct igb_adapter *adapter, u8 *addr, u32 index,
-                             u8 qsel)
+                             u8 qsel)
 {
         u32 rar_low, rar_high;
         struct e1000_hw *hw = &adapter->hw;
@@ -7336,7 +7415,7 @@ static void igb_rar_set_qsel(struct igb_adapter *adapter, u8 *addr, u32 index,
          * from network order (big endian) to little endian
          */
         rar_low = ((u32) addr[0] | ((u32) addr[1] << 8) |
-                  ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
+                   ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
         rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
 
         /* Indicate to hardware the Address is Valid. */
@@ -7354,11 +7433,12 @@ static void igb_rar_set_qsel(struct igb_adapter *adapter, u8 *addr, u32 index,
 }
 
 static int igb_set_vf_mac(struct igb_adapter *adapter,
-                          int vf, unsigned char *mac_addr)
+                          int vf, unsigned char *mac_addr)
 {
         struct e1000_hw *hw = &adapter->hw;
         /* VF MAC addresses start at end of receive addresses and moves
-         * torwards the first, as a result a collision should not be possible */
+         * towards the first, as a result a collision should not be possible
+         */
         int rar_entry = hw->mac.rar_entry_count - (vf + 1);
 
         memcpy(adapter->vf_data[vf].vf_mac_addresses, mac_addr, ETH_ALEN);
@@ -7375,13 +7455,13 @@ static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
                 return -EINVAL;
         adapter->vf_data[vf].flags |= IGB_VF_FLAG_PF_SET_MAC;
         dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n", mac, vf);
-        dev_info(&adapter->pdev->dev, "Reload the VF driver to make this"
-                                      " change effective.");
+        dev_info(&adapter->pdev->dev,
+                 "Reload the VF driver to make this change effective.");
         if (test_bit(__IGB_DOWN, &adapter->state)) {
-                dev_warn(&adapter->pdev->dev, "The VF MAC address has been set,"
-                         " but the PF device is not up.\n");
-                dev_warn(&adapter->pdev->dev, "Bring the PF device up before"
-                         " attempting to use the VF device.\n");
+                dev_warn(&adapter->pdev->dev,
+                         "The VF MAC address has been set, but the PF device is not up.\n");
+                dev_warn(&adapter->pdev->dev,
+                         "Bring the PF device up before attempting to use the VF device.\n");
         }
         return igb_set_vf_mac(adapter, vf, mac);
 }
@@ -7408,19 +7488,19 @@ static void igb_set_vf_rate_limit(struct e1000_hw *hw, int vf, int tx_rate,
                 /* Calculate the rate factor values to set */
                 rf_int = link_speed / tx_rate;
                 rf_dec = (link_speed - (rf_int * tx_rate));
-                rf_dec = (rf_dec * (1<<E1000_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
+                rf_dec = (rf_dec * (1 << E1000_RTTBCNRC_RF_INT_SHIFT)) /
+                         tx_rate;
 
                 bcnrc_val = E1000_RTTBCNRC_RS_ENA;
-                bcnrc_val |= ((rf_int<<E1000_RTTBCNRC_RF_INT_SHIFT) &
-                               E1000_RTTBCNRC_RF_INT_MASK);
+                bcnrc_val |= ((rf_int << E1000_RTTBCNRC_RF_INT_SHIFT) &
+                              E1000_RTTBCNRC_RF_INT_MASK);
                 bcnrc_val |= (rf_dec & E1000_RTTBCNRC_RF_DEC_MASK);
         } else {
                 bcnrc_val = 0;
         }
 
         wr32(E1000_RTTDQSEL, vf); /* vf X uses queue X */
-        /*
-         * Set global transmit compensation time to the MMW_SIZE in RTTBCNRM
+        /* Set global transmit compensation time to the MMW_SIZE in RTTBCNRM
          * register. MMW_SIZE=0x014 if 9728-byte jumbo is supported.
          */
         wr32(E1000_RTTBCNRM, 0x14);
@@ -7442,8 +7522,7 @@ static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
                 reset_rate = true;
                 adapter->vf_rate_link_speed = 0;
                 dev_info(&adapter->pdev->dev,
-                         "Link speed has been changed. VF Transmit "
-                         "rate is disabled\n");
+                         "Link speed has been changed. VF Transmit rate is disabled\n");
         }
 
         for (i = 0; i < adapter->vfs_allocated_count; i++) {
@@ -7451,8 +7530,8 @@ static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
                         adapter->vf_data[i].tx_rate = 0;
 
                 igb_set_vf_rate_limit(&adapter->hw, i,
-                                      adapter->vf_data[i].tx_rate,
-                                      actual_link_speed);
+                                      adapter->vf_data[i].tx_rate,
+                                      actual_link_speed);
         }
 }
 
@@ -7478,6 +7557,33 @@ static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
         return 0;
 }
 
+static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
+                                   bool setting)
+{
+        struct igb_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
+        u32 reg_val, reg_offset;
+
+        if (!adapter->vfs_allocated_count)
+                return -EOPNOTSUPP;
+
+        if (vf >= adapter->vfs_allocated_count)
+                return -EINVAL;
+
+        reg_offset = (hw->mac.type == e1000_82576) ? E1000_DTXSWC : E1000_TXSWC;
+        reg_val = rd32(reg_offset);
+        if (setting)
+                reg_val |= ((1 << vf) |
+                            (1 << (vf + E1000_DTXSWC_VLAN_SPOOF_SHIFT)));
+        else
+                reg_val &= ~((1 << vf) |
+                             (1 << (vf + E1000_DTXSWC_VLAN_SPOOF_SHIFT)));
+        wr32(reg_offset, reg_val);
+
+        adapter->vf_data[vf].spoofchk_enabled = setting;
+        return E1000_SUCCESS;
+}
+
 static int igb_ndo_get_vf_config(struct net_device *netdev,
                                  int vf, struct ifla_vf_info *ivi)
 {
@@ -7489,6 +7595,7 @@ static int igb_ndo_get_vf_config(struct net_device *netdev,
         ivi->tx_rate = adapter->vf_data[vf].tx_rate;
         ivi->vlan = adapter->vf_data[vf].pf_vlan;
         ivi->qos = adapter->vf_data[vf].pf_qos;
+        ivi->spoofchk = adapter->vf_data[vf].spoofchk_enabled;
         return 0;
 }
 
@@ -7501,6 +7608,7 @@ static void igb_vmm_control(struct igb_adapter *adapter)
         case e1000_82575:
         case e1000_i210:
         case e1000_i211:
+        case e1000_i354:
         default:
                 /* replication is not supported for 82575 */
                 return;
@@ -7523,7 +7631,7 @@ static void igb_vmm_control(struct igb_adapter *adapter)
                 igb_vmdq_set_loopback_pf(hw, true);
                 igb_vmdq_set_replication_pf(hw, true);
                 igb_vmdq_set_anti_spoofing_pf(hw, true,
-                                                adapter->vfs_allocated_count);
+                                              adapter->vfs_allocated_count);
         } else {
                 igb_vmdq_set_loopback_pf(hw, false);
                 igb_vmdq_set_replication_pf(hw, false);
@@ -7543,8 +7651,7 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
                         /* force threshold to 0. */
                         wr32(E1000_DMCTXTH, 0);
 
-                        /*
-                         * DMA Coalescing high water mark needs to be greater
+                        /* DMA Coalescing high water mark needs to be greater
                          * than the Rx threshold. Set hwm to PBA - max frame
                          * size in 16B units, capping it at PBA - 6KB.
                          */
@@ -7557,8 +7664,7 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
                                 & E1000_FCRTC_RTH_COAL_MASK);
                         wr32(E1000_FCRTC, reg);
 
-                        /*
-                         * Set the DMA Coalescing Rx threshold to PBA - 2 * max
+                        /* Set the DMA Coalescing Rx threshold to PBA - 2 * max
                          * frame size, capping it at PBA - 10KB.
                          */
                         dmac_thr = pba - adapter->max_frame_size / 512;
@@ -7576,11 +7682,12 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
                         reg |= (1000 >> 5);
 
                         /* Disable BMC-to-OS Watchdog Enable */
-                        reg &= ~E1000_DMACR_DC_BMC2OSW_EN;
+                        if (hw->mac.type != e1000_i354)
+                                reg &= ~E1000_DMACR_DC_BMC2OSW_EN;
+
                         wr32(E1000_DMACR, reg);
 
-                        /*
-                         * no lower threshold to disable
+                        /* no lower threshold to disable
                          * coalescing(smart fifb)-UTRESH=0
                          */
                         wr32(E1000_DMCRTRH, 0);
@@ -7589,15 +7696,13 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
 
                         wr32(E1000_DMCTLX, reg);
 
-                        /*
-                         * free space in tx packet buffer to wake from
+                        /* free space in tx packet buffer to wake from
                          * DMA coal
                          */
                         wr32(E1000_DMCTXTH, (IGB_MIN_TXPBSIZE -
                              (IGB_TX_BUF_4096 + adapter->max_frame_size)) >> 6);
 
-                        /*
-                         * make low power state decision controlled
+                        /* make low power state decision controlled
                          * by DMA coal
                          */
                         reg = rd32(E1000_PCIEMISC);
@@ -7611,7 +7716,8 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
         }
 }
 
-/*  igb_read_i2c_byte - Reads 8 bit word over I2C
+/**
+ *  igb_read_i2c_byte - Reads 8 bit word over I2C
  *  @hw: pointer to hardware structure
  *  @byte_offset: byte offset to read
  *  @dev_addr: device address
@@ -7619,9 +7725,9 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
  *
  *  Performs byte read operation over I2C interface at
  *  a specified device address.
- */
+ **/
 s32 igb_read_i2c_byte(struct e1000_hw *hw, u8 byte_offset,
-                                u8 dev_addr, u8 *data)
+                      u8 dev_addr, u8 *data)
 {
         struct igb_adapter *adapter = container_of(hw, struct igb_adapter, hw);
         struct i2c_client *this_client = adapter->i2c_client;
@@ -7648,7 +7754,8 @@ s32 igb_read_i2c_byte(struct e1000_hw *hw, u8 byte_offset,
         }
 }
 
-/*  igb_write_i2c_byte - Writes 8 bit word over I2C
+/**
+ *  igb_write_i2c_byte - Writes 8 bit word over I2C
  *  @hw: pointer to hardware structure
  *  @byte_offset: byte offset to write
  *  @dev_addr: device address
@@ -7656,9 +7763,9 @@ s32 igb_read_i2c_byte(struct e1000_hw *hw, u8 byte_offset,
  *
  *  Performs byte write operation over I2C interface at
  *  a specified device address.
- */
+ **/
 s32 igb_write_i2c_byte(struct e1000_hw *hw, u8 byte_offset,
-                                 u8 dev_addr, u8 data)
+                       u8 dev_addr, u8 data)
 {
         struct igb_adapter *adapter = container_of(hw, struct igb_adapter, hw);
         struct i2c_client *this_client = adapter->i2c_client;
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index 0a237507ee85..7e8c477b0ab9 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -1,5 +1,4 @@
-/*
- * PTP Hardware Clock (PHC) driver for the Intel 82576 and 82580
+/* PTP Hardware Clock (PHC) driver for the Intel 82576 and 82580
  *
  * Copyright (C) 2011 Richard Cochran <richardcochran@gmail.com>
  *
@@ -27,8 +26,7 @@
 #define INCVALUE_MASK           0x7fffffff
 #define ISGN                    0x80000000
 
-/*
- * The 82580 timesync updates the system timer every 8ns by 8ns,
+/* The 82580 timesync updates the system timer every 8ns by 8ns,
  * and this update value cannot be reprogrammed.
  *
  * Neither the 82576 nor the 82580 offer registers wide enough to hold
@@ -77,10 +75,7 @@
 #define INCVALUE_82576                  (16 << IGB_82576_TSYNC_SHIFT)
 #define IGB_NBITS_82580                 40
 
-/*
- * SYSTIM read access for the 82576
- */
-
+/* SYSTIM read access for the 82576 */
 static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
 {
         struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
@@ -97,10 +92,7 @@ static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
         return val;
 }
 
-/*
- * SYSTIM read access for the 82580
- */
-
+/* SYSTIM read access for the 82580 */
 static cycle_t igb_ptp_read_82580(const struct cyclecounter *cc)
 {
         struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
@@ -108,8 +100,7 @@ static cycle_t igb_ptp_read_82580(const struct cyclecounter *cc)
         u64 val;
         u32 lo, hi, jk;
 
-        /*
-         * The timestamp latches on lowest register read. For the 82580
+        /* The timestamp latches on lowest register read. For the 82580
          * the lowest register is SYSTIMR instead of SYSTIML.  However we only
          * need to provide nanosecond resolution, so we just ignore it.
          */
@@ -123,17 +114,13 @@ static cycle_t igb_ptp_read_82580(const struct cyclecounter *cc)
         return val;
 }
 
-/*
- * SYSTIM read access for I210/I211
- */
-
+/* SYSTIM read access for I210/I211 */
 static void igb_ptp_read_i210(struct igb_adapter *adapter, struct timespec *ts)
 {
         struct e1000_hw *hw = &adapter->hw;
         u32 sec, nsec, jk;
 
-        /*
-         * The timestamp latches on lowest register read. For I210/I211, the
+        /* The timestamp latches on lowest register read. For I210/I211, the
          * lowest register is SYSTIMR. Since we only need to provide nanosecond
          * resolution, we can ignore it.
          */
@@ -150,8 +137,7 @@ static void igb_ptp_write_i210(struct igb_adapter *adapter,
 {
         struct e1000_hw *hw = &adapter->hw;
 
-        /*
-         * Writing the SYSTIMR register is not necessary as it only provides
+        /* Writing the SYSTIMR register is not necessary as it only provides
          * sub-nanosecond resolution.
          */
         wr32(E1000_SYSTIML, ts->tv_nsec);
@@ -185,6 +171,7 @@ static void igb_ptp_systim_to_hwtstamp(struct igb_adapter *adapter,
         switch (adapter->hw.mac.type) {
         case e1000_82576:
         case e1000_82580:
+        case e1000_i354:
         case e1000_i350:
                 spin_lock_irqsave(&adapter->tmreg_lock, flags);
 
@@ -207,10 +194,7 @@ static void igb_ptp_systim_to_hwtstamp(struct igb_adapter *adapter,
         }
 }
 
-/*
- * PTP clock operations
- */
-
+/* PTP clock operations */
 static int igb_ptp_adjfreq_82576(struct ptp_clock_info *ptp, s32 ppb)
 {
         struct igb_adapter *igb = container_of(ptp, struct igb_adapter,
@@ -387,7 +371,7 @@ static int igb_ptp_enable(struct ptp_clock_info *ptp,
  *
  * This work function polls the TSYNCTXCTL valid bit to determine when a
  * timestamp has been taken for the current stored skb.
- */
+ **/
 void igb_ptp_tx_work(struct work_struct *work)
 {
         struct igb_adapter *adapter = container_of(work, struct igb_adapter,
@@ -437,7 +421,7 @@ static void igb_ptp_overflow_check(struct work_struct *work)
  * dropped an Rx packet that was timestamped when the ring is full. The
  * particular error is rare but leaves the device in a state unable to timestamp
  * any future packets.
- */
+ **/
 void igb_ptp_rx_hang(struct igb_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
@@ -481,7 +465,7 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter)
  * If we were asked to do hardware stamping and such a time stamp is
  * available, then it must have been for this skb here because we only
  * allow only one such packet into the queue.
- */
+ **/
 void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
@@ -506,15 +490,14 @@ void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter)
  * This function is meant to retrieve a timestamp from the first buffer of an
  * incoming frame.  The value is stored in little endian format starting on
  * byte 8.
- */
+ **/
 void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector,
                          unsigned char *va,
                          struct sk_buff *skb)
 {
         __le64 *regval = (__le64 *)va;
 
-        /*
-         * The timestamp is recorded in little endian format.
+        /* The timestamp is recorded in little endian format.
          * DWORD: 0        1        2        3
          * Field: Reserved Reserved SYSTIML  SYSTIMH
          */
@@ -529,7 +512,7 @@ void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector,
  *
  * This function is meant to retrieve a timestamp from the internal registers
  * of the adapter and store it in the skb.
- */
+ **/
 void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector,
                          struct sk_buff *skb)
 {
@@ -537,8 +520,7 @@ void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector,
         struct e1000_hw *hw = &adapter->hw;
         u64 regval;
 
-        /*
-         * If this bit is set, then the RX registers contain the time stamp. No
+        /* If this bit is set, then the RX registers contain the time stamp. No
          * other packet will be time stamped until we read these registers, so
          * read the registers to make them available again. Because only one
          * packet can be time stamped at a time, we know that the register
@@ -574,7 +556,6 @@ void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector,
  * type has to be specified. Matching the kind of event packet is
  * not supported, with the exception of "all V2 events regardless of
  * level 2 or 4".
- *
  **/
 int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
                            struct ifreq *ifr, int cmd)
@@ -655,10 +636,9 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
                 return 0;
         }
 
-        /*
-         * Per-packet timestamping only works if all packets are
+        /* Per-packet timestamping only works if all packets are
          * timestamped, so enable timestamping in all packets as
-         * long as one rx filter was configured.
+         * long as one Rx filter was configured.
          */
         if ((hw->mac.type >= e1000_82580) && tsync_rx_ctl) {
                 tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
@@ -756,6 +736,7 @@ void igb_ptp_init(struct igb_adapter *adapter)
                 wr32(E1000_TIMINCA, INCPERIOD_82576 | INCVALUE_82576);
                 break;
         case e1000_82580:
+        case e1000_i354:
         case e1000_i350:
                 snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr);
                 adapter->ptp_caps.owner = THIS_MODULE;
@@ -844,6 +825,7 @@ void igb_ptp_stop(struct igb_adapter *adapter)
         switch (adapter->hw.mac.type) {
         case e1000_82576:
         case e1000_82580:
+        case e1000_i354:
         case e1000_i350:
                 cancel_delayed_work_sync(&adapter->ptp_overflow_work);
                 break;
@@ -888,6 +870,7 @@ void igb_ptp_reset(struct igb_adapter *adapter)
                 wr32(E1000_TIMINCA, INCPERIOD_82576 | INCVALUE_82576);
                 break;
         case e1000_82580:
+        case e1000_i354:
         case e1000_i350:
         case e1000_i210:
         case e1000_i211:
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index d60cd4393415..93eb7ee06d3e 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -116,7 +116,7 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
                 else
                         vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
                 if (test_bit(vid, adapter->active_vlans))
-                        __vlan_hwaccel_put_tag(skb, vid);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         }
 
         napi_gro_receive(&adapter->rx_ring->napi, skb);
@@ -447,7 +447,6 @@ int igbvf_setup_tx_resources(struct igbvf_adapter *adapter,
 
         tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
                                            &tx_ring->dma, GFP_KERNEL);
-
         if (!tx_ring->desc)
                 goto err;
 
@@ -488,7 +487,6 @@ int igbvf_setup_rx_resources(struct igbvf_adapter *adapter,
 
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
                                            &rx_ring->dma, GFP_KERNEL);
-
         if (!rx_ring->desc)
                 goto err;
 
@@ -1232,7 +1230,8 @@ static void igbvf_set_rlpml(struct igbvf_adapter *adapter)
         e1000_rlpml_set_vf(hw, max_frame_size);
 }
 
-static int igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+static int igbvf_vlan_rx_add_vid(struct net_device *netdev,
+                                 __be16 proto, u16 vid)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -1245,7 +1244,8 @@ static int igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         return 0;
 }
 
-static int igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+static int igbvf_vlan_rx_kill_vid(struct net_device *netdev,
+                                  __be16 proto, u16 vid)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -1264,7 +1264,7 @@ static void igbvf_restore_vlan(struct igbvf_adapter *adapter)
         u16 vid;
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                igbvf_vlan_rx_add_vid(adapter->netdev, vid);
+                igbvf_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 }
 
 /**
@@ -2724,9 +2724,9 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                            NETIF_F_RXCSUM;
 
         netdev->features = netdev->hw_features |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
 
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index b5f94abe3cff..fce3e92f9d11 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -101,8 +101,10 @@ static void ixgb_tx_timeout_task(struct work_struct *work);
 
 static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);
 static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);
-static int ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-static int ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+static int ixgb_vlan_rx_add_vid(struct net_device *netdev,
+                                __be16 proto, u16 vid);
+static int ixgb_vlan_rx_kill_vid(struct net_device *netdev,
+                                 __be16 proto, u16 vid);
 static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -332,8 +334,8 @@ ixgb_fix_features(struct net_device *netdev, netdev_features_t features)
          * Tx VLAN insertion does not work per HW design when Rx stripping is
          * disabled.
          */
-        if (!(features & NETIF_F_HW_VLAN_RX))
-                features &= ~NETIF_F_HW_VLAN_TX;
+        if (!(features & NETIF_F_HW_VLAN_CTAG_RX))
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -344,7 +346,7 @@ ixgb_set_features(struct net_device *netdev, netdev_features_t features)
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         netdev_features_t changed = features ^ netdev->features;
 
-        if (!(changed & (NETIF_F_RXCSUM|NETIF_F_HW_VLAN_RX)))
+        if (!(changed & (NETIF_F_RXCSUM|NETIF_F_HW_VLAN_CTAG_RX)))
                 return 0;
 
         adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
@@ -479,10 +481,10 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->hw_features = NETIF_F_SG |
                            NETIF_F_TSO |
                            NETIF_F_HW_CSUM |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX;
         netdev->features = netdev->hw_features |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
         netdev->hw_features |= NETIF_F_RXCSUM;
 
         if (pci_using_dac) {
@@ -717,14 +719,11 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         txdr->size = ALIGN(txdr->size, 4096);
 
         txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                        GFP_KERNEL);
+                                        GFP_KERNEL | __GFP_ZERO);
         if (!txdr->desc) {
                 vfree(txdr->buffer_info);
-                netif_err(adapter, probe, adapter->netdev,
-                          "Unable to allocate transmit descriptor memory\n");
                 return -ENOMEM;
         }
-        memset(txdr->desc, 0, txdr->size);
 
         txdr->next_to_use = 0;
         txdr->next_to_clean = 0;
@@ -807,8 +806,6 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
 
         if (!rxdr->desc) {
                 vfree(rxdr->buffer_info);
-                netif_err(adapter, probe, adapter->netdev,
-                          "Unable to allocate receive descriptors\n");
                 return -ENOMEM;
         }
         memset(rxdr->desc, 0, rxdr->size);
@@ -1145,7 +1142,7 @@ ixgb_set_multi(struct net_device *netdev)
         }
 
 alloc_failed:
-        if (netdev->features & NETIF_F_HW_VLAN_RX)
+        if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 ixgb_vlan_strip_enable(adapter);
         else
                 ixgb_vlan_strip_disable(adapter);
@@ -2085,8 +2082,8 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
 
                 skb->protocol = eth_type_trans(skb, netdev);
                 if (status & IXGB_RX_DESC_STATUS_VP)
-                        __vlan_hwaccel_put_tag(skb,
-                                               le16_to_cpu(rx_desc->special));
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+                                       le16_to_cpu(rx_desc->special));
 
                 netif_receive_skb(skb);
 
@@ -2214,7 +2211,7 @@ ixgb_vlan_strip_disable(struct ixgb_adapter *adapter)
 }
 
 static int
-ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+ixgb_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         u32 vfta, index;
@@ -2231,7 +2228,7 @@ ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 }
 
 static int
-ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+ixgb_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         u32 vfta, index;
@@ -2253,7 +2250,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter)
         u16 vid;
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                ixgb_vlan_rx_add_vid(adapter->netdev, vid);
+                ixgb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index a8e10cff7a89..ca932387a80f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -740,6 +740,11 @@ extern void ixgbe_dbg_adapter_init(struct ixgbe_adapter *adapter);
 extern void ixgbe_dbg_adapter_exit(struct ixgbe_adapter *adapter);
 extern void ixgbe_dbg_init(void);
 extern void ixgbe_dbg_exit(void);
+#else
+static inline void ixgbe_dbg_adapter_init(struct ixgbe_adapter *adapter) {}
+static inline void ixgbe_dbg_adapter_exit(struct ixgbe_adapter *adapter) {}
+static inline void ixgbe_dbg_init(void) {}
+static inline void ixgbe_dbg_exit(void) {}
 #endif /* CONFIG_DEBUG_FS */
 static inline struct netdev_queue *txring_txq(const struct ixgbe_ring *ring)
 {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index d0113fc97b6f..4a5bfb6b3af0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
@@ -1305,6 +1305,7 @@ static struct ixgbe_mac_operations mac_ops_82598 = {
         .release_swfw_sync      = &ixgbe_release_swfw_sync,
         .get_thermal_sensor_data = NULL,
         .init_thermal_sensor_thresh = NULL,
+        .mng_fw_enabled         = NULL,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_82598 = {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 203a00c24330..0b82d38bc97d 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -59,12 +59,34 @@ static s32 ixgbe_setup_copper_link_82599(struct ixgbe_hw *hw,
                                          bool autoneg_wait_to_complete);
 static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw);
 
+static bool ixgbe_mng_enabled(struct ixgbe_hw *hw)
+{
+        u32 fwsm, manc, factps;
+
+        fwsm = IXGBE_READ_REG(hw, IXGBE_FWSM);
+        if ((fwsm & IXGBE_FWSM_MODE_MASK) != IXGBE_FWSM_FW_MODE_PT)
+                return false;
+
+        manc = IXGBE_READ_REG(hw, IXGBE_MANC);
+        if (!(manc & IXGBE_MANC_RCV_TCO_EN))
+                return false;
+
+        factps = IXGBE_READ_REG(hw, IXGBE_FACTPS);
+        if (factps & IXGBE_FACTPS_MNGCG)
+                return false;
+
+        return true;
+}
+
 static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw)
 {
         struct ixgbe_mac_info *mac = &hw->mac;
 
-        /* enable the laser control functions for SFP+ fiber */
-        if (mac->ops.get_media_type(hw) == ixgbe_media_type_fiber) {
+        /* enable the laser control functions for SFP+ fiber
+         * and MNG not enabled
+         */
+        if ((mac->ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+            !hw->mng_fw_enabled) {
                 mac->ops.disable_tx_laser =
                                        &ixgbe_disable_tx_laser_multispeed_fiber;
                 mac->ops.enable_tx_laser =
@@ -145,9 +167,9 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
                 }
 
                 /* Restart DSP and set SFI mode */
-                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (IXGBE_READ_REG(hw,
-                                IXGBE_AUTOC) | IXGBE_AUTOC_LMS_10G_SERIAL));
-
+                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, ((hw->mac.orig_autoc) |
+                                IXGBE_AUTOC_LMS_10G_SERIAL));
+                hw->mac.cached_autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
                 ret_val = ixgbe_reset_pipeline_82599(hw);
 
                 if (got_lock) {
@@ -244,6 +266,8 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
         /* Determine 1G link capabilities off of SFP+ type */
         if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
             hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+            hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
+            hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
             hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
             hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {
                 *speed = IXGBE_LINK_SPEED_1GB_FULL;
@@ -563,7 +587,8 @@ static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                         return status;
 
                 /* Flap the tx laser if it has not already been done */
-                hw->mac.ops.flap_tx_laser(hw);
+                if (hw->mac.ops.flap_tx_laser)
+                        hw->mac.ops.flap_tx_laser(hw);
 
                 /*
                  * Wait for the controller to acquire link.  Per IEEE 802.3ap,
@@ -615,7 +640,8 @@ static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                         return status;
 
                 /* Flap the tx laser if it has not already been done */
-                hw->mac.ops.flap_tx_laser(hw);
+                if (hw->mac.ops.flap_tx_laser)
+                        hw->mac.ops.flap_tx_laser(hw);
 
                 /* Wait for the link partner to also set speed */
                 msleep(100);
@@ -777,12 +803,9 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
                                       bool autoneg_wait_to_complete)
 {
         s32 status = 0;
-        u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+        u32 autoc, pma_pmd_1g, link_mode, start_autoc;
         u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
-        u32 start_autoc = autoc;
         u32 orig_autoc = 0;
-        u32 link_mode = autoc & IXGBE_AUTOC_LMS_MASK;
-        u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
         u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
         u32 links_reg;
         u32 i;
@@ -805,9 +828,14 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
 
         /* Use stored value (EEPROM defaults) of AUTOC to find KR/KX4 support*/
         if (hw->mac.orig_link_settings_stored)
-                orig_autoc = hw->mac.orig_autoc;
+                autoc = hw->mac.orig_autoc;
         else
-                orig_autoc = autoc;
+                autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+
+        orig_autoc = autoc;
+        start_autoc = hw->mac.cached_autoc;
+        link_mode = autoc & IXGBE_AUTOC_LMS_MASK;
+        pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
 
         if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
             link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
@@ -861,6 +889,7 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
 
                 /* Restart link */
                 IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
+                hw->mac.cached_autoc = autoc;
                 ixgbe_reset_pipeline_82599(hw);
 
                 if (got_lock)
@@ -932,7 +961,8 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
 {
         ixgbe_link_speed link_speed;
         s32 status;
-        u32 ctrl, i, autoc, autoc2;
+        u32 ctrl, i, autoc2;
+        u32 curr_lms;
         bool link_up = false;
 
         /* Call adapter stop to disable tx/rx and clear interrupts */
@@ -964,6 +994,13 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
         if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
                 hw->phy.ops.reset(hw);
 
+        /* remember AUTOC from before we reset */
+        if (hw->mac.cached_autoc)
+                curr_lms = hw->mac.cached_autoc & IXGBE_AUTOC_LMS_MASK;
+        else
+                curr_lms = IXGBE_READ_REG(hw, IXGBE_AUTOC) &
+                           IXGBE_AUTOC_LMS_MASK;
+
 mac_reset_top:
         /*
          * Issue global reset to the MAC. Needs to be SW reset if link is up.
@@ -1012,14 +1049,35 @@ mac_reset_top:
          * stored off yet.  Otherwise restore the stored original
          * values since the reset operation sets back to defaults.
          */
-        autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+        hw->mac.cached_autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
         autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+
+        /* Enable link if disabled in NVM */
+        if (autoc2 & IXGBE_AUTOC2_LINK_DISABLE_MASK) {
+                autoc2 &= ~IXGBE_AUTOC2_LINK_DISABLE_MASK;
+                IXGBE_WRITE_REG(hw, IXGBE_AUTOC2, autoc2);
+                IXGBE_WRITE_FLUSH(hw);
+        }
+
         if (hw->mac.orig_link_settings_stored == false) {
-                hw->mac.orig_autoc = autoc;
+                hw->mac.orig_autoc = hw->mac.cached_autoc;
                 hw->mac.orig_autoc2 = autoc2;
                 hw->mac.orig_link_settings_stored = true;
         } else {
-                if (autoc != hw->mac.orig_autoc) {
+
+                /* If MNG FW is running on a multi-speed device that
+                 * doesn't autoneg with out driver support we need to
+                 * leave LMS in the state it was before we MAC reset.
+                 * Likewise if we support WoL we don't want change the
+                 * LMS state either.
+                 */
+                if ((hw->phy.multispeed_fiber && hw->mng_fw_enabled) ||
+                    hw->wol_enabled)
+                        hw->mac.orig_autoc =
+                                (hw->mac.orig_autoc & ~IXGBE_AUTOC_LMS_MASK) |
+                                curr_lms;
+
+                if (hw->mac.cached_autoc != hw->mac.orig_autoc) {
                         /* Need SW/FW semaphore around AUTOC writes if LESM is
                          * on, likewise reset_pipeline requires us to hold
                          * this lock as it also writes to AUTOC.
@@ -1035,6 +1093,7 @@ mac_reset_top:
                         }
 
                         IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
+                        hw->mac.cached_autoc = hw->mac.orig_autoc;
                         ixgbe_reset_pipeline_82599(hw);
 
                         if (got_lock)
@@ -2135,10 +2194,19 @@ static s32 ixgbe_read_eeprom_82599(struct ixgbe_hw *hw,
  **/
 s32 ixgbe_reset_pipeline_82599(struct ixgbe_hw *hw)
 {
-        s32 i, autoc_reg, ret_val;
-        s32 anlp1_reg = 0;
+        s32 ret_val;
+        u32 anlp1_reg = 0;
+        u32 i, autoc_reg, autoc2_reg;
+
+        /* Enable link if disabled in NVM */
+        autoc2_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+        if (autoc2_reg & IXGBE_AUTOC2_LINK_DISABLE_MASK) {
+                autoc2_reg &= ~IXGBE_AUTOC2_LINK_DISABLE_MASK;
+                IXGBE_WRITE_REG(hw, IXGBE_AUTOC2, autoc2_reg);
+                IXGBE_WRITE_FLUSH(hw);
+        }
 
-        autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+        autoc_reg = hw->mac.cached_autoc;
         autoc_reg |= IXGBE_AUTOC_AN_RESTART;
 
         /* Write AUTOC register with toggled LMS[2] bit and Restart_AN */
@@ -2216,7 +2284,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
         .release_swfw_sync      = &ixgbe_release_swfw_sync,
         .get_thermal_sensor_data = &ixgbe_get_thermal_sensor_data_generic,
         .init_thermal_sensor_thresh = &ixgbe_init_thermal_sensor_thresh_generic,
-
+        .mng_fw_enabled         = &ixgbe_mng_enabled,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_82599 = {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 99e472ebaa75..9bcdeb89af5a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -592,6 +592,36 @@ s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr)
         return 0;
 }
 
+enum ixgbe_bus_width ixgbe_convert_bus_width(u16 link_status)
+{
+        switch (link_status & IXGBE_PCI_LINK_WIDTH) {
+        case IXGBE_PCI_LINK_WIDTH_1:
+                return ixgbe_bus_width_pcie_x1;
+        case IXGBE_PCI_LINK_WIDTH_2:
+                return ixgbe_bus_width_pcie_x2;
+        case IXGBE_PCI_LINK_WIDTH_4:
+                return ixgbe_bus_width_pcie_x4;
+        case IXGBE_PCI_LINK_WIDTH_8:
+                return ixgbe_bus_width_pcie_x8;
+        default:
+                return ixgbe_bus_width_unknown;
+        }
+}
+
+enum ixgbe_bus_speed ixgbe_convert_bus_speed(u16 link_status)
+{
+        switch (link_status & IXGBE_PCI_LINK_SPEED) {
+        case IXGBE_PCI_LINK_SPEED_2500:
+                return ixgbe_bus_speed_2500;
+        case IXGBE_PCI_LINK_SPEED_5000:
+                return ixgbe_bus_speed_5000;
+        case IXGBE_PCI_LINK_SPEED_8000:
+                return ixgbe_bus_speed_8000;
+        default:
+                return ixgbe_bus_speed_unknown;
+        }
+}
+
 /**
  *  ixgbe_get_bus_info_generic - Generic set PCI bus info
  *  @hw: pointer to hardware structure
@@ -610,35 +640,8 @@ s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw)
         pci_read_config_word(adapter->pdev, IXGBE_PCI_LINK_STATUS,
                              &link_status);
 
-        switch (link_status & IXGBE_PCI_LINK_WIDTH) {
-        case IXGBE_PCI_LINK_WIDTH_1:
-                hw->bus.width = ixgbe_bus_width_pcie_x1;
-                break;
-        case IXGBE_PCI_LINK_WIDTH_2:
-                hw->bus.width = ixgbe_bus_width_pcie_x2;
-                break;
-        case IXGBE_PCI_LINK_WIDTH_4:
-                hw->bus.width = ixgbe_bus_width_pcie_x4;
-                break;
-        case IXGBE_PCI_LINK_WIDTH_8:
-                hw->bus.width = ixgbe_bus_width_pcie_x8;
-                break;
-        default:
-                hw->bus.width = ixgbe_bus_width_unknown;
-                break;
-        }
-
-        switch (link_status & IXGBE_PCI_LINK_SPEED) {
-        case IXGBE_PCI_LINK_SPEED_2500:
-                hw->bus.speed = ixgbe_bus_speed_2500;
-                break;
-        case IXGBE_PCI_LINK_SPEED_5000:
-                hw->bus.speed = ixgbe_bus_speed_5000;
-                break;
-        default:
-                hw->bus.speed = ixgbe_bus_speed_unknown;
-                break;
-        }
+        hw->bus.width = ixgbe_convert_bus_width(link_status);
+        hw->bus.speed = ixgbe_convert_bus_speed(link_status);
 
         mac->ops.set_lan_id(hw);
 
@@ -1125,7 +1128,7 @@ s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset,
         }
 
         for (i = 0; i < words; i++) {
-                eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) +
+                eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) |
                        IXGBE_EEPROM_RW_REG_START;
 
                 IXGBE_WRITE_REG(hw, IXGBE_EERD, eerd);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
index bc3948ead6e0..22eee38868f1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
@@ -40,6 +40,8 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);
 s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
                                   u32 pba_num_size);
 s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);
+enum ixgbe_bus_width ixgbe_convert_bus_width(u16 link_status);
+enum ixgbe_bus_speed ixgbe_convert_bus_speed(u16 link_status);
 s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);
 void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw);
 s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index c3f1afd86906..d3754722adb4 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -231,6 +231,10 @@ static int ixgbe_get_settings(struct net_device *netdev,
                 case ixgbe_sfp_type_lr:
                 case ixgbe_sfp_type_srlr_core0:
                 case ixgbe_sfp_type_srlr_core1:
+                case ixgbe_sfp_type_1g_sx_core0:
+                case ixgbe_sfp_type_1g_sx_core1:
+                case ixgbe_sfp_type_1g_lx_core0:
+                case ixgbe_sfp_type_1g_lx_core1:
                         ecmd->supported |= SUPPORTED_FIBRE;
                         ecmd->advertising |= ADVERTISED_FIBRE;
                         ecmd->port = PORT_FIBRE;
@@ -246,12 +250,6 @@ static int ixgbe_get_settings(struct net_device *netdev,
                         ecmd->advertising |= ADVERTISED_TP;
                         ecmd->port = PORT_TP;
                         break;
-                case ixgbe_sfp_type_1g_sx_core0:
-                case ixgbe_sfp_type_1g_sx_core1:
-                        ecmd->supported |= SUPPORTED_FIBRE;
-                        ecmd->advertising |= ADVERTISED_FIBRE;
-                        ecmd->port = PORT_FIBRE;
-                        break;
                 case ixgbe_sfp_type_unknown:
                 default:
                         ecmd->supported |= SUPPORTED_FIBRE;
@@ -442,7 +440,8 @@ static void ixgbe_get_regs(struct net_device *netdev,
 
         memset(p, 0, IXGBE_REGS_LEN * sizeof(u32));
 
-        regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id;
+        regs->version = hw->mac.type << 24 | hw->revision_id << 16 |
+                        hw->device_id;
 
         /* General Registers */
         regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_CTRL);
@@ -1611,16 +1610,9 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
         struct ixgbe_hw *hw = &adapter->hw;
         u32 reg_data;
 
-        /* X540 needs to set the MACC.FLU bit to force link up */
-        if (adapter->hw.mac.type == ixgbe_mac_X540) {
-                reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);
-                reg_data |= IXGBE_MACC_FLU;
-                IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);
-        }
 
-        /* right now we only support MAC loopback in the driver */
-        reg_data = IXGBE_READ_REG(hw, IXGBE_HLREG0);
         /* Setup MAC loopback */
+        reg_data = IXGBE_READ_REG(hw, IXGBE_HLREG0);
         reg_data |= IXGBE_HLREG0_LPBK;
         IXGBE_WRITE_REG(hw, IXGBE_HLREG0, reg_data);
 
@@ -1628,10 +1620,19 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
         reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;
         IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg_data);
 
-        reg_data = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-        reg_data &= ~IXGBE_AUTOC_LMS_MASK;
-        reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;
-        IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_data);
+        /* X540 needs to set the MACC.FLU bit to force link up */
+        if (adapter->hw.mac.type == ixgbe_mac_X540) {
+                reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);
+                reg_data |= IXGBE_MACC_FLU;
+                IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);
+        } else {
+                if (hw->mac.orig_autoc) {
+                        reg_data = hw->mac.orig_autoc | IXGBE_AUTOC_FLU;
+                        IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_data);
+                } else {
+                        return 10;
+                }
+        }
         IXGBE_WRITE_FLUSH(hw);
         usleep_range(10000, 20000);
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 79f4a26ea6cc..d30fbdd81fca 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -63,7 +63,7 @@ char ixgbe_default_device_descr[] =
 static char ixgbe_default_device_descr[] =
                               "Intel(R) 10 Gigabit Network Connection";
 #endif
-#define DRV_VERSION "3.11.33-k"
+#define DRV_VERSION "3.13.10-k"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static const char ixgbe_copyright[] =
                                 "Copyright (c) 1999-2013 Intel Corporation.";
@@ -149,6 +149,52 @@ MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
+                                          u32 reg, u16 *value)
+{
+        int pos = 0;
+        struct pci_dev *parent_dev;
+        struct pci_bus *parent_bus;
+
+        parent_bus = adapter->pdev->bus->parent;
+        if (!parent_bus)
+                return -1;
+
+        parent_dev = parent_bus->self;
+        if (!parent_dev)
+                return -1;
+
+        pos = pci_find_capability(parent_dev, PCI_CAP_ID_EXP);
+        if (!pos)
+                return -1;
+
+        pci_read_config_word(parent_dev, pos + reg, value);
+        return 0;
+}
+
+static s32 ixgbe_get_parent_bus_info(struct ixgbe_adapter *adapter)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        u16 link_status = 0;
+        int err;
+
+        hw->bus.type = ixgbe_bus_type_pci_express;
+
+        /* Get the negotiated link width and speed from PCI config space of the
+         * parent, as this device is behind a switch
+         */
+        err = ixgbe_read_pci_cfg_word_parent(adapter, 18, &link_status);
+
+        /* assume caller will handle error case */
+        if (err)
+                return err;
+
+        hw->bus.width = ixgbe_convert_bus_width(link_status);
+        hw->bus.speed = ixgbe_convert_bus_speed(link_status);
+
+        return 0;
+}
+
 static void ixgbe_service_event_schedule(struct ixgbe_adapter *adapter)
 {
         if (!test_bit(__IXGBE_DOWN, &adapter->state) &&
@@ -1337,7 +1383,7 @@ static unsigned int ixgbe_get_headlen(unsigned char *data,
                         return hdr.network - data;
 
                 /* record next protocol if header is present */
-                if (!hdr.ipv4->frag_off)
+                if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))
                         nexthdr = hdr.ipv4->protocol;
         } else if (protocol == __constant_htons(ETH_P_IPV6)) {
                 if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))
@@ -1442,10 +1488,10 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
 
         ixgbe_ptp_rx_hwtstamp(rx_ring, rx_desc, skb);
 
-        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+        if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
             ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
                 u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         }
 
         skb_record_rx_queue(skb, rx_ring->queue_index);
@@ -2049,6 +2095,9 @@ static void ixgbe_update_itr(struct ixgbe_q_vector *q_vector,
          */
         /* what was last interrupt timeslice? */
         timepassed_us = q_vector->itr >> 2;
+        if (timepassed_us == 0)
+                return;
+
         bytes_perint = bytes / timepassed_us; /* bytes/usec */
 
         switch (itr_setting) {
@@ -2405,6 +2454,16 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data)
          * with the write to EICR.
          */
         eicr = IXGBE_READ_REG(hw, IXGBE_EICS);
+
+        /* The lower 16bits of the EICR register are for the queue interrupts
+         * which should be masked here in order to not accidently clear them if
+         * the bits are high when ixgbe_msix_other is called. There is a race
+         * condition otherwise which results in possible performance loss
+         * especially if the ixgbe_msix_other interrupt is triggering
+         * consistently (as it would when PPS is turned on for the X540 device)
+         */
+        eicr &= 0xFFFF0000;
+
         IXGBE_WRITE_REG(hw, IXGBE_EICR, eicr);
 
         if (eicr & IXGBE_EICR_LSC)
@@ -3421,7 +3480,8 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
         hw->mac.ops.enable_rx_dma(hw, rxctrl);
 }
 
-static int ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+static int ixgbe_vlan_rx_add_vid(struct net_device *netdev,
+                                 __be16 proto, u16 vid)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
@@ -3433,7 +3493,8 @@ static int ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         return 0;
 }
 
-static int ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+static int ixgbe_vlan_rx_kill_vid(struct net_device *netdev,
+                                  __be16 proto, u16 vid)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
@@ -3538,10 +3599,10 @@ static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
 {
         u16 vid;
 
-        ixgbe_vlan_rx_add_vid(adapter->netdev, 0);
+        ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                ixgbe_vlan_rx_add_vid(adapter->netdev, vid);
+                ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 }
 
 /**
@@ -3676,7 +3737,7 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
 
         IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
 
-        if (netdev->features & NETIF_F_HW_VLAN_RX)
+        if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 ixgbe_vlan_strip_enable(adapter);
         else
                 ixgbe_vlan_strip_disable(adapter);
@@ -5077,14 +5138,14 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
 
         netif_device_detach(netdev);
 
+        rtnl_lock();
         if (netif_running(netdev)) {
-                rtnl_lock();
                 ixgbe_down(adapter);
                 ixgbe_free_irq(adapter);
                 ixgbe_free_all_tx_resources(adapter);
                 ixgbe_free_all_rx_resources(adapter);
-                rtnl_unlock();
         }
+        rtnl_unlock();
 
         ixgbe_clear_interrupt_scheme(adapter);
 
@@ -6425,9 +6486,7 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
         struct ixgbe_tx_buffer *first;
         int tso;
         u32 tx_flags = 0;
-#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD
         unsigned short f;
-#endif
         u16 count = TXD_USE_COUNT(skb_headlen(skb));
         __be16 protocol = skb->protocol;
         u8 hdr_len = 0;
@@ -6439,12 +6498,9 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
          *       + 1 desc for context descriptor,
          * otherwise try next time
          */
-#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD
         for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
                 count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
-#else
-        count += skb_shinfo(skb)->nr_frags;
-#endif
+
         if (ixgbe_maybe_stop_tx(tx_ring, count + 3)) {
                 tx_ring->tx_stats.tx_busy++;
                 return NETDEV_TX_BUSY;
@@ -6983,7 +7039,7 @@ static int ixgbe_set_features(struct net_device *netdev,
                 break;
         }
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 ixgbe_vlan_strip_enable(adapter);
         else
                 ixgbe_vlan_strip_disable(adapter);
@@ -7007,7 +7063,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
         int err;
 
         if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
-                return -EOPNOTSUPP;
+                return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags);
 
         /* Hardware does not support aging addresses so if a
          * ndm_state is given only allow permanent addresses
@@ -7038,44 +7094,6 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
         return err;
 }
 
-static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
-                             struct net_device *dev,
-                             const unsigned char *addr)
-{
-        struct ixgbe_adapter *adapter = netdev_priv(dev);
-        int err = -EOPNOTSUPP;
-
-        if (ndm->ndm_state & NUD_PERMANENT) {
-                pr_info("%s: FDB only supports static addresses\n",
-                        ixgbe_driver_name);
-                return -EINVAL;
-        }
-
-        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-                if (is_unicast_ether_addr(addr))
-                        err = dev_uc_del(dev, addr);
-                else if (is_multicast_ether_addr(addr))
-                        err = dev_mc_del(dev, addr);
-                else
-                        err = -EINVAL;
-        }
-
-        return err;
-}
-
-static int ixgbe_ndo_fdb_dump(struct sk_buff *skb,
-                              struct netlink_callback *cb,
-                              struct net_device *dev,
-                              int idx)
-{
-        struct ixgbe_adapter *adapter = netdev_priv(dev);
-
-        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-                idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);
-
-        return idx;
-}
-
 static int ixgbe_ndo_bridge_setlink(struct net_device *dev,
                                     struct nlmsghdr *nlh)
 {
@@ -7171,8 +7189,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_set_features = ixgbe_set_features,
         .ndo_fix_features = ixgbe_fix_features,
         .ndo_fdb_add            = ixgbe_ndo_fdb_add,
-        .ndo_fdb_del            = ixgbe_ndo_fdb_del,
-        .ndo_fdb_dump           = ixgbe_ndo_fdb_dump,
         .ndo_bridge_setlink     = ixgbe_ndo_bridge_setlink,
         .ndo_bridge_getlink     = ixgbe_ndo_bridge_getlink,
 };
@@ -7202,9 +7218,19 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
                         /* only support first port */
                         if (hw->bus.func != 0)
                                 break;
+                case IXGBE_SUBDEV_ID_82599_SP_560FLR:
                 case IXGBE_SUBDEV_ID_82599_SFP:
                 case IXGBE_SUBDEV_ID_82599_RNDC:
                 case IXGBE_SUBDEV_ID_82599_ECNA_DP:
+                case IXGBE_SUBDEV_ID_82599_LOM_SFP:
+                        is_wol_supported = 1;
+                        break;
+                }
+                break;
+        case IXGBE_DEV_ID_82599EN_SFP:
+                /* Only this subdevice supports WOL */
+                switch (subdevice_id) {
+                case IXGBE_SUBDEV_ID_82599EN_SFP_OCP1:
                         is_wol_supported = 1;
                         break;
                 }
@@ -7369,6 +7395,10 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (err)
                 goto err_sw_init;
 
+        /* Cache if MNG FW is up so we don't have to read the REG later */
+        if (hw->mac.ops.mng_fw_enabled)
+                hw->mng_fw_enabled = hw->mac.ops.mng_fw_enabled(hw);
+
         /* Make it possible the adapter to be woken up via WOL */
         switch (adapter->hw.mac.type) {
         case ixgbe_mac_82599EB:
@@ -7425,9 +7455,9 @@ skip_sriov:
         netdev->features = NETIF_F_SG |
                            NETIF_F_IP_CSUM |
                            NETIF_F_IPV6_CSUM |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER |
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_VLAN_CTAG_FILTER |
                            NETIF_F_TSO |
                            NETIF_F_TSO6 |
                            NETIF_F_RXHASH |
@@ -7521,7 +7551,9 @@ skip_sriov:
         /* WOL not supported for all devices */
         adapter->wol = 0;
         hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap);
-        if (ixgbe_wol_supported(adapter, pdev->device, pdev->subsystem_device))
+        hw->wol_enabled = ixgbe_wol_supported(adapter, pdev->device,
+                                                pdev->subsystem_device);
+        if (hw->wol_enabled)
                 adapter->wol = IXGBE_WUFC_MAG;
 
         device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
@@ -7532,10 +7564,13 @@ skip_sriov:
 
         /* pick up the PCI bus settings for reporting later */
         hw->mac.ops.get_bus_info(hw);
+        if (hw->device_id == IXGBE_DEV_ID_82599_SFP_SF_QP)
+                ixgbe_get_parent_bus_info(adapter);
 
         /* print bus type/speed/width info */
         e_dev_info("(PCI Express:%s:%s) %pM\n",
-                   (hw->bus.speed == ixgbe_bus_speed_5000 ? "5.0GT/s" :
+                   (hw->bus.speed == ixgbe_bus_speed_8000 ? "8.0GT/s" :
+                    hw->bus.speed == ixgbe_bus_speed_5000 ? "5.0GT/s" :
                     hw->bus.speed == ixgbe_bus_speed_2500 ? "2.5GT/s" :
                     "Unknown"),
                    (hw->bus.width == ixgbe_bus_width_pcie_x8 ? "Width x8" :
@@ -7615,9 +7650,13 @@ skip_sriov:
                 e_err(probe, "failed to allocate sysfs resources\n");
 #endif /* CONFIG_IXGBE_HWMON */
 
-#ifdef CONFIG_DEBUG_FS
         ixgbe_dbg_adapter_init(adapter);
-#endif /* CONFIG_DEBUG_FS */
+
+        /* Need link setup for MNG FW, else wait for IXGBE_UP */
+        if (hw->mng_fw_enabled && hw->mac.ops.setup_link)
+                hw->mac.ops.setup_link(hw,
+                        IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL,
+                        true);
 
         return 0;
 
@@ -7653,9 +7692,7 @@ static void ixgbe_remove(struct pci_dev *pdev)
         struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
         struct net_device *netdev = adapter->netdev;
 
-#ifdef CONFIG_DEBUG_FS
         ixgbe_dbg_adapter_exit(adapter);
-#endif /*CONFIG_DEBUG_FS */
 
         set_bit(__IXGBE_DOWN, &adapter->state);
         cancel_work_sync(&adapter->service_task);
@@ -7918,15 +7955,11 @@ static int __init ixgbe_init_module(void)
         pr_info("%s - version %s\n", ixgbe_driver_string, ixgbe_driver_version);
         pr_info("%s\n", ixgbe_copyright);
 
-#ifdef CONFIG_DEBUG_FS
         ixgbe_dbg_init();
-#endif /* CONFIG_DEBUG_FS */
 
         ret = pci_register_driver(&ixgbe_driver);
         if (ret) {
-#ifdef CONFIG_DEBUG_FS
                 ixgbe_dbg_exit();
-#endif /* CONFIG_DEBUG_FS */
                 return ret;
         }
 
@@ -7952,9 +7985,7 @@ static void __exit ixgbe_exit_module(void)
 #endif
         pci_unregister_driver(&ixgbe_driver);
 
-#ifdef CONFIG_DEBUG_FS
         ixgbe_dbg_exit();
-#endif /* CONFIG_DEBUG_FS */
 
         rcu_barrier(); /* Wait for completion of call_rcu()'s */
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 060d2ad2ac96..e5691ccbce9d 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -956,6 +956,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                                 else
                                         hw->phy.sfp_type =
                                                 ixgbe_sfp_type_1g_sx_core1;
+                        } else if (comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) {
+                                if (hw->bus.lan_id == 0)
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_lx_core0;
+                                else
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_lx_core1;
                         } else {
                                 hw->phy.sfp_type = ixgbe_sfp_type_unknown;
                         }
@@ -1043,6 +1050,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 if (comp_codes_10g == 0 &&
                     !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
                       hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
                       hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
                       hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) {
                         hw->phy.type = ixgbe_phy_sfp_unsupported;
@@ -1058,10 +1067,12 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 
                 hw->mac.ops.get_device_caps(hw, &enforce_sfp);
                 if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
-                    !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
-                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) ||
-                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0) ||
-                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1))) {
+                    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) {
                         /* Make sure we're a supported PHY type */
                         if (hw->phy.type == ixgbe_phy_sfp_intel) {
                                 status = 0;
@@ -1125,10 +1136,12 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
          * SR modules
          */
         if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
+            sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
             sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
             sfp_type == ixgbe_sfp_type_1g_sx_core0)
                 sfp_type = ixgbe_sfp_type_srlr_core0;
         else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
+                 sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
                  sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
                  sfp_type == ixgbe_sfp_type_1g_sx_core1)
                 sfp_type = ixgbe_sfp_type_srlr_core1;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 97e33669c0b9..1e7d587c4e57 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -35,7 +35,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/ipv6.h>
-#ifdef NETIF_F_HW_VLAN_TX
+#ifdef NETIF_F_HW_VLAN_CTAG_TX
 #include <linux/if_vlan.h>
 #endif
 
@@ -661,13 +661,7 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
         bool enable = ((event_mask & 0x10000000U) != 0);
 
         if (enable) {
-                eth_random_addr(vf_mac_addr);
-                e_info(probe, "IOV: VF %d is enabled MAC %pM\n",
-                       vfn, vf_mac_addr);
-                /*
-                 * Store away the VF "permananet" MAC address, it will ask
-                 * for it later.
-                 */
+                eth_zero_addr(vf_mac_addr);
                 memcpy(adapter->vfinfo[vfn].vf_mac_addresses, vf_mac_addr, 6);
         }
 
@@ -688,7 +682,8 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
         ixgbe_vf_reset_event(adapter, vf);
 
         /* set vf mac address */
-        ixgbe_set_vf_mac(adapter, vf, vf_mac);
+        if (!is_zero_ether_addr(vf_mac))
+                ixgbe_set_vf_mac(adapter, vf, vf_mac);
 
         vf_shift = vf % 32;
         reg_offset = vf / 32;
@@ -729,8 +724,16 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
         IXGBE_WRITE_REG(hw, IXGBE_VMECM(reg_offset), reg);
 
         /* reply to reset with ack and vf mac address */
-        msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK;
-        memcpy(addr, vf_mac, ETH_ALEN);
+        msgbuf[0] = IXGBE_VF_RESET;
+        if (!is_zero_ether_addr(vf_mac)) {
+                msgbuf[0] |= IXGBE_VT_MSGTYPE_ACK;
+                memcpy(addr, vf_mac, ETH_ALEN);
+        } else {
+                msgbuf[0] |= IXGBE_VT_MSGTYPE_NACK;
+                dev_warn(&adapter->pdev->dev,
+                         "VF %d has no MAC address assigned, you may have to assign one manually\n",
+                         vf);
+        }
 
         /*
          * Piggyback the multicast filter type so VF can compute the
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 6652e96c352d..70c6aa3d3f95 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -56,10 +56,13 @@
 #define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
 #define IXGBE_SUBDEV_ID_82599_RNDC       0x1F72
 #define IXGBE_SUBDEV_ID_82599_560FLR     0x17D0
+#define IXGBE_SUBDEV_ID_82599_SP_560FLR  0x211B
 #define IXGBE_SUBDEV_ID_82599_ECNA_DP    0x0470
+#define IXGBE_SUBDEV_ID_82599_LOM_SFP    0x8976
 #define IXGBE_DEV_ID_82599_SFP_EM        0x1507
 #define IXGBE_DEV_ID_82599_SFP_SF2       0x154D
 #define IXGBE_DEV_ID_82599EN_SFP         0x1557
+#define IXGBE_SUBDEV_ID_82599EN_SFP_OCP1 0x0001
 #define IXGBE_DEV_ID_82599_XAUI_LOM      0x10FC
 #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8
 #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ  0x000C
@@ -729,6 +732,13 @@ struct ixgbe_thermal_sensor_data {
 #define IXGBE_MDEF_EXT(_i) (0x05160 + ((_i) * 4)) /* 8 of these (0-7) */
 #define IXGBE_LSWFW     0x15014
 
+/* Management Bit Fields and Masks */
+#define IXGBE_MANC_RCV_TCO_EN   0x00020000 /* Rcv TCO packet enable */
+
+/* Firmware Semaphore Register */
+#define IXGBE_FWSM_MODE_MASK    0xE
+#define IXGBE_FWSM_FW_MODE_PT   0x4
+
 /* ARC Subsystem registers */
 #define IXGBE_HICR      0x15F00
 #define IXGBE_FWSTS     0x15F0C
@@ -1019,6 +1029,7 @@ struct ixgbe_thermal_sensor_data {
 #define IXGBE_CTRL_RST_MASK     (IXGBE_CTRL_LNK_RST | IXGBE_CTRL_RST)
 
 /* FACTPS */
+#define IXGBE_FACTPS_MNGCG      0x20000000 /* Manageblility Clock Gated */
 #define IXGBE_FACTPS_LFS        0x40000000 /* LAN Function Select */
 
 /* MHADD Bit Masks */
@@ -1582,6 +1593,7 @@ enum {
 #define IXGBE_AUTOC2_10G_KR  (0x0 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
 #define IXGBE_AUTOC2_10G_XFI (0x1 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
 #define IXGBE_AUTOC2_10G_SFI (0x2 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC2_LINK_DISABLE_MASK        0x70000000
 
 #define IXGBE_MACC_FLU       0x00000001
 #define IXGBE_MACC_FSV_10G   0x00030000
@@ -1827,6 +1839,7 @@ enum {
 #define IXGBE_PCI_LINK_SPEED      0xF
 #define IXGBE_PCI_LINK_SPEED_2500 0x1
 #define IXGBE_PCI_LINK_SPEED_5000 0x2
+#define IXGBE_PCI_LINK_SPEED_8000 0x3
 #define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E
 #define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
 #define IXGBE_PCI_DEVICE_CONTROL2_16ms  0x0005
@@ -2600,6 +2613,8 @@ enum ixgbe_sfp_type {
         ixgbe_sfp_type_1g_cu_core1 = 10,
         ixgbe_sfp_type_1g_sx_core0 = 11,
         ixgbe_sfp_type_1g_sx_core1 = 12,
+        ixgbe_sfp_type_1g_lx_core0 = 13,
+        ixgbe_sfp_type_1g_lx_core1 = 14,
         ixgbe_sfp_type_not_present = 0xFFFE,
         ixgbe_sfp_type_unknown = 0xFFFF
 };
@@ -2650,6 +2665,7 @@ enum ixgbe_bus_speed {
         ixgbe_bus_speed_133     = 133,
         ixgbe_bus_speed_2500    = 2500,
         ixgbe_bus_speed_5000    = 5000,
+        ixgbe_bus_speed_8000    = 8000,
         ixgbe_bus_speed_reserved
 };
 
@@ -2859,6 +2875,7 @@ struct ixgbe_mac_operations {
         s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
         s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
         s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *hw);
+        bool (*mng_fw_enabled)(struct ixgbe_hw *hw);
 };
 
 struct ixgbe_phy_operations {
@@ -2912,6 +2929,7 @@ struct ixgbe_mac_info {
         u32                             max_tx_queues;
         u32                             max_rx_queues;
         u32                             orig_autoc;
+        u32                             cached_autoc;
         u32                             orig_autoc2;
         bool                            orig_link_settings_stored;
         bool                            autotry_restart;
@@ -2986,6 +3004,8 @@ struct ixgbe_hw {
         bool                            adapter_stopped;
         bool                            force_full_reset;
         bool                            allow_unsupported_sfp;
+        bool                            mng_fw_enabled;
+        bool                            wol_enabled;
 };
 
 struct ixgbe_info {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 66c5e946284e..389324f5929a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -854,6 +854,7 @@ static struct ixgbe_mac_operations mac_ops_X540 = {
         .enable_rx_buff         = &ixgbe_enable_rx_buff_generic,
         .get_thermal_sensor_data = NULL,
         .init_thermal_sensor_thresh = NULL,
+        .mng_fw_enabled         = NULL,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_X540 = {
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index fc0af9a3bb35..fff0d9867529 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -44,8 +44,8 @@ struct ixgbevf_tx_buffer {
         struct sk_buff *skb;
         dma_addr_t dma;
         unsigned long time_stamp;
+        union ixgbe_adv_tx_desc *next_to_watch;
         u16 length;
-        u16 next_to_watch;
         u16 mapped_as_page;
 };
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 2b6cb5ca48ee..1f5166ad6bb5 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -76,12 +76,9 @@ static const struct ixgbevf_info *ixgbevf_info_tbl[] = {
  * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
  *   Class, Class Mask, private data (not used) }
  */
-static struct pci_device_id ixgbevf_pci_tbl[] = {
-        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF),
-        board_82599_vf},
-        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF),
-        board_X540_vf},
-
+static DEFINE_PCI_DEVICE_TABLE(ixgbevf_pci_tbl) = {
+        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF), board_82599_vf },
+        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF), board_X540_vf },
         /* required last entry */
         {0, }
 };
@@ -190,28 +187,37 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_q_vector *q_vector,
         struct ixgbevf_adapter *adapter = q_vector->adapter;
         union ixgbe_adv_tx_desc *tx_desc, *eop_desc;
         struct ixgbevf_tx_buffer *tx_buffer_info;
-        unsigned int i, eop, count = 0;
+        unsigned int i, count = 0;
         unsigned int total_bytes = 0, total_packets = 0;
 
         if (test_bit(__IXGBEVF_DOWN, &adapter->state))
                 return true;
 
         i = tx_ring->next_to_clean;
-        eop = tx_ring->tx_buffer_info[i].next_to_watch;
-        eop_desc = IXGBEVF_TX_DESC(tx_ring, eop);
+        tx_buffer_info = &tx_ring->tx_buffer_info[i];
+        eop_desc = tx_buffer_info->next_to_watch;
 
-        while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
-               (count < tx_ring->count)) {
+        do {
                 bool cleaned = false;
-                rmb(); /* read buffer_info after eop_desc */
-                /* eop could change between read and DD-check */
-                if (unlikely(eop != tx_ring->tx_buffer_info[i].next_to_watch))
-                        goto cont_loop;
+
+                /* if next_to_watch is not set then there is no work pending */
+                if (!eop_desc)
+                        break;
+
+                /* prevent any other reads prior to eop_desc */
+                read_barrier_depends();
+
+                /* if DD is not set pending work has not been completed */
+                if (!(eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)))
+                        break;
+
+                /* clear next_to_watch to prevent false hangs */
+                tx_buffer_info->next_to_watch = NULL;
+
                 for ( ; !cleaned; count++) {
                         struct sk_buff *skb;
                         tx_desc = IXGBEVF_TX_DESC(tx_ring, i);
-                        tx_buffer_info = &tx_ring->tx_buffer_info[i];
-                        cleaned = (i == eop);
+                        cleaned = (tx_desc == eop_desc);
                         skb = tx_buffer_info->skb;
 
                         if (cleaned && skb) {
@@ -234,12 +240,12 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_q_vector *q_vector,
                         i++;
                         if (i == tx_ring->count)
                                 i = 0;
+
+                        tx_buffer_info = &tx_ring->tx_buffer_info[i];
                 }
 
-cont_loop:
-                eop = tx_ring->tx_buffer_info[i].next_to_watch;
-                eop_desc = IXGBEVF_TX_DESC(tx_ring, eop);
-        }
+                eop_desc = tx_buffer_info->next_to_watch;
+        } while (count < tx_ring->count);
 
         tx_ring->next_to_clean = i;
 
@@ -285,7 +291,7 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
         u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
 
         if (is_vlan && test_bit(tag & VLAN_VID_MASK, adapter->active_vlans))
-                __vlan_hwaccel_put_tag(skb, tag);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), tag);
 
         if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
                 napi_gro_receive(&q_vector->napi, skb);
@@ -1173,7 +1179,8 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
         }
 }
 
-static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev,
+                                   __be16 proto, u16 vid)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
@@ -1198,7 +1205,8 @@ static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         return err;
 }
 
-static int ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+static int ixgbevf_vlan_rx_kill_vid(struct net_device *netdev,
+                                    __be16 proto, u16 vid)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
@@ -1221,7 +1229,8 @@ static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)
         u16 vid;
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                ixgbevf_vlan_rx_add_vid(adapter->netdev, vid);
+                ixgbevf_vlan_rx_add_vid(adapter->netdev,
+                                        htons(ETH_P_8021Q), vid);
 }
 
 static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
@@ -2046,6 +2055,7 @@ static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
 {
         struct ixgbe_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
+        struct net_device *netdev = adapter->netdev;
         int err;
 
         /* PCI config space info */
@@ -2065,18 +2075,26 @@ static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
         err = hw->mac.ops.reset_hw(hw);
         if (err) {
                 dev_info(&pdev->dev,
-                         "PF still in reset state, assigning new address\n");
-                eth_hw_addr_random(adapter->netdev);
-                memcpy(adapter->hw.mac.addr, adapter->netdev->dev_addr,
-                        adapter->netdev->addr_len);
+                         "PF still in reset state.  Is the PF interface up?\n");
         } else {
                 err = hw->mac.ops.init_hw(hw);
                 if (err) {
                         pr_err("init_shared_code failed: %d\n", err);
                         goto out;
                 }
-                memcpy(adapter->netdev->dev_addr, adapter->hw.mac.addr,
-                       adapter->netdev->addr_len);
+                err = hw->mac.ops.get_mac_addr(hw, hw->mac.addr);
+                if (err)
+                        dev_info(&pdev->dev, "Error reading MAC address\n");
+                else if (is_zero_ether_addr(adapter->hw.mac.addr))
+                        dev_info(&pdev->dev,
+                                 "MAC address not assigned by administrator.\n");
+                memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);
+        }
+
+        if (!is_valid_ether_addr(netdev->dev_addr)) {
+                dev_info(&pdev->dev, "Assigning random MAC address\n");
+                eth_hw_addr_random(netdev);
+                memcpy(hw->mac.addr, netdev->dev_addr, netdev->addr_len);
         }
 
         /* lock to protect mailbox accesses */
@@ -2425,9 +2443,6 @@ int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
                                            &rx_ring->dma, GFP_KERNEL);
 
         if (!rx_ring->desc) {
-                hw_dbg(&adapter->hw,
-                       "Unable to allocate memory for "
-                       "the receive descriptor ring\n");
                 vfree(rx_ring->rx_buffer_info);
                 rx_ring->rx_buffer_info = NULL;
                 goto alloc_failed;
@@ -2822,8 +2837,7 @@ static bool ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,
 }
 
 static int ixgbevf_tx_map(struct ixgbevf_ring *tx_ring,
-                          struct sk_buff *skb, u32 tx_flags,
-                          unsigned int first)
+                          struct sk_buff *skb, u32 tx_flags)
 {
         struct ixgbevf_tx_buffer *tx_buffer_info;
         unsigned int len;
@@ -2848,7 +2862,6 @@ static int ixgbevf_tx_map(struct ixgbevf_ring *tx_ring,
                                                      size, DMA_TO_DEVICE);
                 if (dma_mapping_error(tx_ring->dev, tx_buffer_info->dma))
                         goto dma_error;
-                tx_buffer_info->next_to_watch = i;
 
                 len -= size;
                 total -= size;
@@ -2878,7 +2891,6 @@ static int ixgbevf_tx_map(struct ixgbevf_ring *tx_ring,
                                               tx_buffer_info->dma))
                                 goto dma_error;
                         tx_buffer_info->mapped_as_page = true;
-                        tx_buffer_info->next_to_watch = i;
 
                         len -= size;
                         total -= size;
@@ -2897,8 +2909,6 @@ static int ixgbevf_tx_map(struct ixgbevf_ring *tx_ring,
         else
                 i = i - 1;
         tx_ring->tx_buffer_info[i].skb = skb;
-        tx_ring->tx_buffer_info[first].next_to_watch = i;
-        tx_ring->tx_buffer_info[first].time_stamp = jiffies;
 
         return count;
 
@@ -2907,7 +2917,6 @@ dma_error:
 
         /* clear timestamp and dma mappings for failed tx_buffer_info map */
         tx_buffer_info->dma = 0;
-        tx_buffer_info->next_to_watch = 0;
         count--;
 
         /* clear timestamp and dma mappings for remaining portion of packet */
@@ -2924,7 +2933,8 @@ dma_error:
 }
 
 static void ixgbevf_tx_queue(struct ixgbevf_ring *tx_ring, int tx_flags,
-                             int count, u32 paylen, u8 hdr_len)
+                             int count, unsigned int first, u32 paylen,
+                             u8 hdr_len)
 {
         union ixgbe_adv_tx_desc *tx_desc = NULL;
         struct ixgbevf_tx_buffer *tx_buffer_info;
@@ -2975,6 +2985,16 @@ static void ixgbevf_tx_queue(struct ixgbevf_ring *tx_ring, int tx_flags,
 
         tx_desc->read.cmd_type_len |= cpu_to_le32(txd_cmd);
 
+        tx_ring->tx_buffer_info[first].time_stamp = jiffies;
+
+        /* Force memory writes to complete before letting h/w
+         * know there are new descriptors to fetch.  (Only
+         * applicable for weak-ordered memory model archs,
+         * such as IA-64).
+         */
+        wmb();
+
+        tx_ring->tx_buffer_info[first].next_to_watch = tx_desc;
         tx_ring->next_to_use = i;
 }
 
@@ -3066,15 +3086,8 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 tx_flags |= IXGBE_TX_FLAGS_CSUM;
 
         ixgbevf_tx_queue(tx_ring, tx_flags,
-                         ixgbevf_tx_map(tx_ring, skb, tx_flags, first),
-                         skb->len, hdr_len);
-        /*
-         * Force memory writes to complete before letting h/w
-         * know there are new descriptors to fetch.  (Only
-         * applicable for weak-ordered memory model archs,
-         * such as IA-64).
-         */
-        wmb();
+                         ixgbevf_tx_map(tx_ring, skb, tx_flags),
+                         first, skb->len, hdr_len);
 
         writel(tx_ring->next_to_use, adapter->hw.hw_addr + tx_ring->tail);
 
@@ -3400,9 +3413,9 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                            NETIF_F_RXCSUM;
 
         netdev->features = netdev->hw_features |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index 0c94557b53df..387b52635bc0 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -109,7 +109,12 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK))
+        /* New versions of the PF may NACK the reset return message
+         * to indicate that no MAC address has yet been assigned for
+         * the VF.
+         */
+        if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK) &&
+            msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_NACK))
                 return IXGBE_ERR_INVALID_MAC_ADDR;
 
         memcpy(hw->mac.perm_addr, addr, ETH_ALEN);
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 0519afa413d2..070a6f1a0577 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -1059,7 +1059,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                 if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
                         u16 vid = le16_to_cpu(rxdesc->descwb.vlan);
 
-                        __vlan_hwaccel_put_tag(skb, vid);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
                         NET_STAT(jme).rx_bytes += 4;
                 }
                 jme->jme_rx(skb);
@@ -3030,8 +3030,8 @@ jme_init_one(struct pci_dev *pdev,
                                                 NETIF_F_SG |
                                                 NETIF_F_TSO |
                                                 NETIF_F_TSO6 |
-                                                NETIF_F_HW_VLAN_TX |
-                                                NETIF_F_HW_VLAN_RX;
+                                                NETIF_F_HW_VLAN_CTAG_TX |
+                                                NETIF_F_HW_VLAN_CTAG_RX;
         if (using_dac)
                 netdev->features        |=      NETIF_F_HIGHDMA;
 
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index 434e33c527df..a49e81bdf8e8 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -21,8 +21,8 @@ if NET_VENDOR_MARVELL
 config MV643XX_ETH
         tristate "Marvell Discovery (643XX) and Orion ethernet support"
         depends on (MV64X60 || PPC32 || PLAT_ORION) && INET
-        select INET_LRO
         select PHYLIB
+        select MVMDIO
         ---help---
           This driver supports the gigabit ethernet MACs in the
           Marvell Discovery PPC/MIPS chipset family (MV643XX) and
@@ -39,9 +39,7 @@ config MVMDIO
           interface units of the Marvell EBU SoCs (Kirkwood, Orion5x,
           Dove, Armada 370 and Armada XP).
 
-          For now, this driver is only needed for the MVNETA driver
-          (used on Armada 370 and XP), but it could be used in the
-          future by the MV643XX_ETH driver.
+          This driver is used by the MV643XX_ETH and MVNETA drivers.
 
 config MVNETA
         tristate "Marvell Armada 370/XP network interface support"
diff --git a/drivers/net/ethernet/marvell/Makefile b/drivers/net/ethernet/marvell/Makefile
index 7f63b4aac434..5c4a7765ff0e 100644
--- a/drivers/net/ethernet/marvell/Makefile
+++ b/drivers/net/ethernet/marvell/Makefile
@@ -2,8 +2,8 @@
 # Makefile for the Marvell device drivers.
 #
 
-obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 obj-$(CONFIG_MVMDIO) += mvmdio.o
+obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 obj-$(CONFIG_MVNETA) += mvneta.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_SKGE) += skge.o
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 6562c736a1d8..d0afeea181fb 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -20,6 +20,8 @@
  * Copyright (C) 2007-2008 Marvell Semiconductor
  *                         Lennert Buytenhek <buytenh@marvell.com>
  *
+ * Copyright (C) 2013 Michael Stapelberg <michael@stapelberg.de>
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -54,8 +56,8 @@
 #include <linux/phy.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/io.h>
+#include <linux/interrupt.h>
 #include <linux/types.h>
-#include <linux/inet_lro.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
 
@@ -67,14 +69,6 @@ static char mv643xx_eth_driver_version[] = "1.4";
  * Registers shared between all ports.
  */
 #define PHY_ADDR                        0x0000
-#define SMI_REG                         0x0004
-#define  SMI_BUSY                       0x10000000
-#define  SMI_READ_VALID                 0x08000000
-#define  SMI_OPCODE_READ                0x04000000
-#define  SMI_OPCODE_WRITE               0x00000000
-#define ERR_INT_CAUSE                   0x0080
-#define  ERR_INT_SMI_DONE               0x00000010
-#define ERR_INT_MASK                    0x0084
 #define WINDOW_BASE(w)                  (0x0200 + ((w) << 3))
 #define WINDOW_SIZE(w)                  (0x0204 + ((w) << 3))
 #define WINDOW_REMAP_HIGH(w)            (0x0280 + ((w) << 2))
@@ -264,25 +258,6 @@ struct mv643xx_eth_shared_private {
         void __iomem *base;
 
         /*
-         * Points at the right SMI instance to use.
-         */
-        struct mv643xx_eth_shared_private *smi;
-
-        /*
-         * Provides access to local SMI interface.
-         */
-        struct mii_bus *smi_bus;
-
-        /*
-         * If we have access to the error interrupt pin (which is
-         * somewhat misnamed as it not only reflects internal errors
-         * but also reflects SMI completion), use that to wait for
-         * SMI access completion instead of polling the SMI busy bit.
-         */
-        int err_interrupt;
-        wait_queue_head_t smi_busy_wait;
-
-        /*
          * Per-port MBUS window access register value.
          */
         u32 win_protect;
@@ -293,7 +268,7 @@ struct mv643xx_eth_shared_private {
         int extended_rx_coal_limit;
         int tx_bw_control;
         int tx_csum_limit;
-
+        struct clk *clk;
 };
 
 #define TX_BW_CONTROL_ABSENT            0
@@ -341,12 +316,6 @@ struct mib_counters {
         u32 rx_overrun;
 };
 
-struct lro_counters {
-        u32 lro_aggregated;
-        u32 lro_flushed;
-        u32 lro_no_desc;
-};
-
 struct rx_queue {
         int index;
 
@@ -360,9 +329,6 @@ struct rx_queue {
         dma_addr_t rx_desc_dma;
         int rx_desc_area_size;
         struct sk_buff **rx_skb;
-
-        struct net_lro_mgr lro_mgr;
-        struct net_lro_desc lro_arr[8];
 };
 
 struct tx_queue {
@@ -398,8 +364,6 @@ struct mv643xx_eth_private {
         spinlock_t mib_counters_lock;
         struct mib_counters mib_counters;
 
-        struct lro_counters lro_counters;
-
         struct work_struct tx_timeout_task;
 
         struct napi_struct napi;
@@ -435,9 +399,7 @@ struct mv643xx_eth_private {
         /*
          * Hardware-specific parameters.
          */
-#if defined(CONFIG_HAVE_CLK)
         struct clk *clk;
-#endif
         unsigned int t_clk;
 };
 
@@ -530,42 +492,12 @@ static void txq_maybe_wake(struct tx_queue *txq)
         }
 }
 
-
-/* rx napi ******************************************************************/
-static int
-mv643xx_get_skb_header(struct sk_buff *skb, void **iphdr, void **tcph,
-                       u64 *hdr_flags, void *priv)
-{
-        unsigned long cmd_sts = (unsigned long)priv;
-
-        /*
-         * Make sure that this packet is Ethernet II, is not VLAN
-         * tagged, is IPv4, has a valid IP header, and is TCP.
-         */
-        if ((cmd_sts & (RX_IP_HDR_OK | RX_PKT_IS_IPV4 |
-                       RX_PKT_IS_ETHERNETV2 | RX_PKT_LAYER4_TYPE_MASK |
-                       RX_PKT_IS_VLAN_TAGGED)) !=
-            (RX_IP_HDR_OK | RX_PKT_IS_IPV4 |
-             RX_PKT_IS_ETHERNETV2 | RX_PKT_LAYER4_TYPE_TCP_IPV4))
-                return -1;
-
-        skb_reset_network_header(skb);
-        skb_set_transport_header(skb, ip_hdrlen(skb));
-        *iphdr = ip_hdr(skb);
-        *tcph = tcp_hdr(skb);
-        *hdr_flags = LRO_IPV4 | LRO_TCP;
-
-        return 0;
-}
-
 static int rxq_process(struct rx_queue *rxq, int budget)
 {
         struct mv643xx_eth_private *mp = rxq_to_mp(rxq);
         struct net_device_stats *stats = &mp->dev->stats;
-        int lro_flush_needed;
         int rx;
 
-        lro_flush_needed = 0;
         rx = 0;
         while (rx < budget && rxq->rx_desc_count) {
                 struct rx_desc *rx_desc;
@@ -626,12 +558,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                 skb->protocol = eth_type_trans(skb, mp->dev);
 
-                if (skb->dev->features & NETIF_F_LRO &&
-                    skb->ip_summed == CHECKSUM_UNNECESSARY) {
-                        lro_receive_skb(&rxq->lro_mgr, skb, (void *)cmd_sts);
-                        lro_flush_needed = 1;
-                } else
-                        netif_receive_skb(skb);
+                napi_gro_receive(&mp->napi, skb);
 
                 continue;
 
@@ -651,9 +578,6 @@ err:
                 dev_kfree_skb(skb);
         }
 
-        if (lro_flush_needed)
-                lro_flush_all(&rxq->lro_mgr);
-
         if (rx < budget)
                 mp->work_rx &= ~(1 << rxq->index);
 
@@ -1120,97 +1044,6 @@ out_write:
         wrlp(mp, PORT_SERIAL_CONTROL, pscr);
 }
 
-static irqreturn_t mv643xx_eth_err_irq(int irq, void *dev_id)
-{
-        struct mv643xx_eth_shared_private *msp = dev_id;
-
-        if (readl(msp->base + ERR_INT_CAUSE) & ERR_INT_SMI_DONE) {
-                writel(~ERR_INT_SMI_DONE, msp->base + ERR_INT_CAUSE);
-                wake_up(&msp->smi_busy_wait);
-                return IRQ_HANDLED;
-        }
-
-        return IRQ_NONE;
-}
-
-static int smi_is_done(struct mv643xx_eth_shared_private *msp)
-{
-        return !(readl(msp->base + SMI_REG) & SMI_BUSY);
-}
-
-static int smi_wait_ready(struct mv643xx_eth_shared_private *msp)
-{
-        if (msp->err_interrupt == NO_IRQ) {
-                int i;
-
-                for (i = 0; !smi_is_done(msp); i++) {
-                        if (i == 10)
-                                return -ETIMEDOUT;
-                        msleep(10);
-                }
-
-                return 0;
-        }
-
-        if (!smi_is_done(msp)) {
-                wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
-                                   msecs_to_jiffies(100));
-                if (!smi_is_done(msp))
-                        return -ETIMEDOUT;
-        }
-
-        return 0;
-}
-
-static int smi_bus_read(struct mii_bus *bus, int addr, int reg)
-{
-        struct mv643xx_eth_shared_private *msp = bus->priv;
-        void __iomem *smi_reg = msp->base + SMI_REG;
-        int ret;
-
-        if (smi_wait_ready(msp)) {
-                pr_warn("SMI bus busy timeout\n");
-                return -ETIMEDOUT;
-        }
-
-        writel(SMI_OPCODE_READ | (reg << 21) | (addr << 16), smi_reg);
-
-        if (smi_wait_ready(msp)) {
-                pr_warn("SMI bus busy timeout\n");
-                return -ETIMEDOUT;
-        }
-
-        ret = readl(smi_reg);
-        if (!(ret & SMI_READ_VALID)) {
-                pr_warn("SMI bus read not valid\n");
-                return -ENODEV;
-        }
-
-        return ret & 0xffff;
-}
-
-static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val)
-{
-        struct mv643xx_eth_shared_private *msp = bus->priv;
-        void __iomem *smi_reg = msp->base + SMI_REG;
-
-        if (smi_wait_ready(msp)) {
-                pr_warn("SMI bus busy timeout\n");
-                return -ETIMEDOUT;
-        }
-
-        writel(SMI_OPCODE_WRITE | (reg << 21) |
-                (addr << 16) | (val & 0xffff), smi_reg);
-
-        if (smi_wait_ready(msp)) {
-                pr_warn("SMI bus busy timeout\n");
-                return -ETIMEDOUT;
-        }
-
-        return 0;
-}
-
-
 /* statistics ***************************************************************/
 static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
 {
@@ -1236,26 +1069,6 @@ static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
         return stats;
 }
 
-static void mv643xx_eth_grab_lro_stats(struct mv643xx_eth_private *mp)
-{
-        u32 lro_aggregated = 0;
-        u32 lro_flushed = 0;
-        u32 lro_no_desc = 0;
-        int i;
-
-        for (i = 0; i < mp->rxq_count; i++) {
-                struct rx_queue *rxq = mp->rxq + i;
-
-                lro_aggregated += rxq->lro_mgr.stats.aggregated;
-                lro_flushed += rxq->lro_mgr.stats.flushed;
-                lro_no_desc += rxq->lro_mgr.stats.no_desc;
-        }
-
-        mp->lro_counters.lro_aggregated = lro_aggregated;
-        mp->lro_counters.lro_flushed = lro_flushed;
-        mp->lro_counters.lro_no_desc = lro_no_desc;
-}
-
 static inline u32 mib_read(struct mv643xx_eth_private *mp, int offset)
 {
         return rdl(mp, MIB_COUNTERS(mp->port_num) + offset);
@@ -1419,10 +1232,6 @@ struct mv643xx_eth_stats {
         { #m, FIELD_SIZEOF(struct mib_counters, m),             \
           -1, offsetof(struct mv643xx_eth_private, mib_counters.m) }
 
-#define LROSTAT(m)                                              \
-        { #m, FIELD_SIZEOF(struct lro_counters, m),             \
-          -1, offsetof(struct mv643xx_eth_private, lro_counters.m) }
-
 static const struct mv643xx_eth_stats mv643xx_eth_stats[] = {
         SSTAT(rx_packets),
         SSTAT(tx_packets),
@@ -1464,9 +1273,6 @@ static const struct mv643xx_eth_stats mv643xx_eth_stats[] = {
         MIBSTAT(late_collision),
         MIBSTAT(rx_discard),
         MIBSTAT(rx_overrun),
-        LROSTAT(lro_aggregated),
-        LROSTAT(lro_flushed),
-        LROSTAT(lro_no_desc),
 };
 
 static int
@@ -1523,6 +1329,34 @@ mv643xx_eth_get_settings_phyless(struct mv643xx_eth_private *mp,
         return 0;
 }
 
+static void
+mv643xx_eth_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct mv643xx_eth_private *mp = netdev_priv(dev);
+        wol->supported = 0;
+        wol->wolopts = 0;
+        if (mp->phy)
+                phy_ethtool_get_wol(mp->phy, wol);
+}
+
+static int
+mv643xx_eth_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct mv643xx_eth_private *mp = netdev_priv(dev);
+        int err;
+
+        if (mp->phy == NULL)
+                return -EOPNOTSUPP;
+
+        err = phy_ethtool_set_wol(mp->phy, wol);
+        /* Given that mv643xx_eth works without the marvell-specific PHY driver,
+         * this debugging hint is useful to have.
+         */
+        if (err == -EOPNOTSUPP)
+                netdev_info(dev, "The PHY does not support set_wol, was CONFIG_MARVELL_PHY enabled?\n");
+        return err;
+}
+
 static int
 mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
@@ -1668,7 +1502,6 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *dev,
 
         mv643xx_eth_get_stats(dev);
         mib_counters_update(mp);
-        mv643xx_eth_grab_lro_stats(mp);
 
         for (i = 0; i < ARRAY_SIZE(mv643xx_eth_stats); i++) {
                 const struct mv643xx_eth_stats *stat;
@@ -1708,6 +1541,8 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
         .get_ethtool_stats      = mv643xx_eth_get_ethtool_stats,
         .get_sset_count         = mv643xx_eth_get_sset_count,
         .get_ts_info            = ethtool_op_get_ts_info,
+        .get_wol                = mv643xx_eth_get_wol,
+        .set_wol                = mv643xx_eth_set_wol,
 };
 
 
@@ -1939,19 +1774,6 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
                                         nexti * sizeof(struct rx_desc);
         }
 
-        rxq->lro_mgr.dev = mp->dev;
-        memset(&rxq->lro_mgr.stats, 0, sizeof(rxq->lro_mgr.stats));
-        rxq->lro_mgr.features = LRO_F_NAPI;
-        rxq->lro_mgr.ip_summed = CHECKSUM_UNNECESSARY;
-        rxq->lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;
-        rxq->lro_mgr.max_desc = ARRAY_SIZE(rxq->lro_arr);
-        rxq->lro_mgr.max_aggr = 32;
-        rxq->lro_mgr.frag_align_pad = 0;
-        rxq->lro_mgr.lro_arr = rxq->lro_arr;
-        rxq->lro_mgr.get_skb_header = mv643xx_get_skb_header;
-
-        memset(&rxq->lro_arr, 0, sizeof(rxq->lro_arr));
-
         return 0;
 
 
@@ -2635,66 +2457,26 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
         struct mv643xx_eth_shared_private *msp;
         const struct mbus_dram_target_info *dram;
         struct resource *res;
-        int ret;
 
         if (!mv643xx_eth_version_printed++)
                 pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n",
                           mv643xx_eth_driver_version);
 
-        ret = -EINVAL;
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL)
-                goto out;
+                return -EINVAL;
 
-        ret = -ENOMEM;
-        msp = kzalloc(sizeof(*msp), GFP_KERNEL);
+        msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
         if (msp == NULL)
-                goto out;
+                return -ENOMEM;
 
         msp->base = ioremap(res->start, resource_size(res));
         if (msp->base == NULL)
-                goto out_free;
-
-        /*
-         * Set up and register SMI bus.
-         */
-        if (pd == NULL || pd->shared_smi == NULL) {
-                msp->smi_bus = mdiobus_alloc();
-                if (msp->smi_bus == NULL)
-                        goto out_unmap;
-
-                msp->smi_bus->priv = msp;
-                msp->smi_bus->name = "mv643xx_eth smi";
-                msp->smi_bus->read = smi_bus_read;
-                msp->smi_bus->write = smi_bus_write,
-                snprintf(msp->smi_bus->id, MII_BUS_ID_SIZE, "%s-%d",
-                        pdev->name, pdev->id);
-                msp->smi_bus->parent = &pdev->dev;
-                msp->smi_bus->phy_mask = 0xffffffff;
-                if (mdiobus_register(msp->smi_bus) < 0)
-                        goto out_free_mii_bus;
-                msp->smi = msp;
-        } else {
-                msp->smi = platform_get_drvdata(pd->shared_smi);
-        }
-
-        msp->err_interrupt = NO_IRQ;
-        init_waitqueue_head(&msp->smi_busy_wait);
+                return -ENOMEM;
 
-        /*
-         * Check whether the error interrupt is hooked up.
-         */
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (res != NULL) {
-                int err;
-
-                err = request_irq(res->start, mv643xx_eth_err_irq,
-                                  IRQF_SHARED, "mv643xx_eth", msp);
-                if (!err) {
-                        writel(ERR_INT_SMI_DONE, msp->base + ERR_INT_MASK);
-                        msp->err_interrupt = res->start;
-                }
-        }
+        msp->clk = devm_clk_get(&pdev->dev, NULL);
+        if (!IS_ERR(msp->clk))
+                clk_prepare_enable(msp->clk);
 
         /*
          * (Re-)program MBUS remapping windows if we are asked to.
@@ -2710,30 +2492,15 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, msp);
 
         return 0;
-
-out_free_mii_bus:
-        mdiobus_free(msp->smi_bus);
-out_unmap:
-        iounmap(msp->base);
-out_free:
-        kfree(msp);
-out:
-        return ret;
 }
 
 static int mv643xx_eth_shared_remove(struct platform_device *pdev)
 {
         struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
-        struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
 
-        if (pd == NULL || pd->shared_smi == NULL) {
-                mdiobus_unregister(msp->smi_bus);
-                mdiobus_free(msp->smi_bus);
-        }
-        if (msp->err_interrupt != NO_IRQ)
-                free_irq(msp->err_interrupt, msp);
         iounmap(msp->base);
-        kfree(msp);
+        if (!IS_ERR(msp->clk))
+                clk_disable_unprepare(msp->clk);
 
         return 0;
 }
@@ -2794,14 +2561,21 @@ static void set_params(struct mv643xx_eth_private *mp,
         mp->txq_count = pd->tx_queue_count ? : 1;
 }
 
+static void mv643xx_eth_adjust_link(struct net_device *dev)
+{
+        struct mv643xx_eth_private *mp = netdev_priv(dev);
+
+        mv643xx_adjust_pscr(mp);
+}
+
 static struct phy_device *phy_scan(struct mv643xx_eth_private *mp,
                                    int phy_addr)
 {
-        struct mii_bus *bus = mp->shared->smi->smi_bus;
         struct phy_device *phydev;
         int start;
         int num;
         int i;
+        char phy_id[MII_BUS_ID_SIZE + 3];
 
         if (phy_addr == MV643XX_ETH_PHY_ADDR_DEFAULT) {
                 start = phy_addr_get(mp) & 0x1f;
@@ -2811,17 +2585,19 @@ static struct phy_device *phy_scan(struct mv643xx_eth_private *mp,
                 num = 1;
         }
 
-        phydev = NULL;
+        /* Attempt to connect to the PHY using orion-mdio */
+        phydev = ERR_PTR(-ENODEV);
         for (i = 0; i < num; i++) {
                 int addr = (start + i) & 0x1f;
 
-                if (bus->phy_map[addr] == NULL)
-                        mdiobus_scan(bus, addr);
+                snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
+                                "orion-mdio-mii", addr);
 
-                if (phydev == NULL) {
-                        phydev = bus->phy_map[addr];
-                        if (phydev != NULL)
-                                phy_addr_set(mp, addr);
+                phydev = phy_connect(mp->dev, phy_id, mv643xx_eth_adjust_link,
+                                PHY_INTERFACE_MODE_GMII);
+                if (!IS_ERR(phydev)) {
+                        phy_addr_set(mp, addr);
+                        break;
                 }
         }
 
@@ -2834,8 +2610,6 @@ static void phy_init(struct mv643xx_eth_private *mp, int speed, int duplex)
 
         phy_reset(mp);
 
-        phy_attach(mp->dev, dev_name(&phy->dev), PHY_INTERFACE_MODE_GMII);
-
         if (speed == 0) {
                 phy->autoneg = AUTONEG_ENABLE;
                 phy->speed = 0;
@@ -2932,22 +2706,27 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
          * it to override the default.
          */
         mp->t_clk = 133000000;
-#if defined(CONFIG_HAVE_CLK)
-        mp->clk = clk_get(&pdev->dev, (pdev->id ? "1" : "0"));
+        mp->clk = devm_clk_get(&pdev->dev, NULL);
         if (!IS_ERR(mp->clk)) {
                 clk_prepare_enable(mp->clk);
                 mp->t_clk = clk_get_rate(mp->clk);
         }
-#endif
+
         set_params(mp, pd);
         netif_set_real_num_tx_queues(dev, mp->txq_count);
         netif_set_real_num_rx_queues(dev, mp->rxq_count);
 
-        if (pd->phy_addr != MV643XX_ETH_PHY_NONE)
+        if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
                 mp->phy = phy_scan(mp, pd->phy_addr);
 
-        if (mp->phy != NULL)
+                if (IS_ERR(mp->phy)) {
+                        err = PTR_ERR(mp->phy);
+                        if (err == -ENODEV)
+                                err = -EPROBE_DEFER;
+                        goto out;
+                }
                 phy_init(mp, pd->speed, pd->duplex);
+        }
 
         SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);
 
@@ -2982,8 +2761,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         dev->watchdog_timeo = 2 * HZ;
         dev->base_addr = 0;
 
-        dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
-                NETIF_F_RXCSUM | NETIF_F_LRO;
+        dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
         dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM;
 
@@ -3014,12 +2792,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         return 0;
 
 out:
-#if defined(CONFIG_HAVE_CLK)
-        if (!IS_ERR(mp->clk)) {
+        if (!IS_ERR(mp->clk))
                 clk_disable_unprepare(mp->clk);
-                clk_put(mp->clk);
-        }
-#endif
         free_netdev(dev);
 
         return err;
@@ -3034,12 +2808,8 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
                 phy_detach(mp->phy);
         cancel_work_sync(&mp->tx_timeout_task);
 
-#if defined(CONFIG_HAVE_CLK)
-        if (!IS_ERR(mp->clk)) {
+        if (!IS_ERR(mp->clk))
                 clk_disable_unprepare(mp->clk);
-                clk_put(mp->clk);
-        }
-#endif
 
         free_netdev(mp->dev);
 
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
index 77b7c80262f4..e2f662660313 100644
--- a/drivers/net/ethernet/marvell/mvmdio.c
+++ b/drivers/net/ethernet/marvell/mvmdio.c
@@ -24,10 +24,14 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/phy.h>
-#include <linux/of_address.h>
-#include <linux/of_mdio.h>
+#include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/of_mdio.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
 
 #define MVMDIO_SMI_DATA_SHIFT              0
 #define MVMDIO_SMI_PHY_ADDR_SHIFT          16
@@ -36,33 +40,59 @@
 #define MVMDIO_SMI_WRITE_OPERATION         0
 #define MVMDIO_SMI_READ_VALID              BIT(27)
 #define MVMDIO_SMI_BUSY                    BIT(28)
+#define MVMDIO_ERR_INT_CAUSE               0x007C
+#define  MVMDIO_ERR_INT_SMI_DONE           0x00000010
+#define MVMDIO_ERR_INT_MASK                0x0080
 
 struct orion_mdio_dev {
         struct mutex lock;
-        void __iomem *smireg;
+        void __iomem *regs;
+        struct clk *clk;
+        /*
+         * If we have access to the error interrupt pin (which is
+         * somewhat misnamed as it not only reflects internal errors
+         * but also reflects SMI completion), use that to wait for
+         * SMI access completion instead of polling the SMI busy bit.
+         */
+        int err_interrupt;
+        wait_queue_head_t smi_busy_wait;
 };
 
+static int orion_mdio_smi_is_done(struct orion_mdio_dev *dev)
+{
+        return !(readl(dev->regs) & MVMDIO_SMI_BUSY);
+}
+
 /* Wait for the SMI unit to be ready for another operation
  */
 static int orion_mdio_wait_ready(struct mii_bus *bus)
 {
         struct orion_mdio_dev *dev = bus->priv;
         int count;
-        u32 val;
 
-        count = 0;
-        while (1) {
-                val = readl(dev->smireg);
-                if (!(val & MVMDIO_SMI_BUSY))
-                        break;
+        if (dev->err_interrupt <= 0) {
+                count = 0;
+                while (1) {
+                        if (orion_mdio_smi_is_done(dev))
+                                break;
 
-                if (count > 100) {
-                        dev_err(bus->parent, "Timeout: SMI busy for too long\n");
-                        return -ETIMEDOUT;
-                }
+                        if (count > 100) {
+                                dev_err(bus->parent,
+                                        "Timeout: SMI busy for too long\n");
+                                return -ETIMEDOUT;
+                        }
 
-                udelay(10);
-                count++;
+                        udelay(10);
+                        count++;
+                }
+        } else {
+                if (!orion_mdio_smi_is_done(dev)) {
+                        wait_event_timeout(dev->smi_busy_wait,
+                                orion_mdio_smi_is_done(dev),
+                                msecs_to_jiffies(100));
+                        if (!orion_mdio_smi_is_done(dev))
+                                return -ETIMEDOUT;
+                }
         }
 
         return 0;
@@ -87,12 +117,12 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id,
         writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) |
                 (regnum << MVMDIO_SMI_PHY_REG_SHIFT)  |
                 MVMDIO_SMI_READ_OPERATION),
-               dev->smireg);
+               dev->regs);
 
         /* Wait for the value to become available */
         count = 0;
         while (1) {
-                val = readl(dev->smireg);
+                val = readl(dev->regs);
                 if (val & MVMDIO_SMI_READ_VALID)
                         break;
 
@@ -129,7 +159,7 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id,
                 (regnum << MVMDIO_SMI_PHY_REG_SHIFT)  |
                 MVMDIO_SMI_WRITE_OPERATION            |
                 (value << MVMDIO_SMI_DATA_SHIFT)),
-               dev->smireg);
+               dev->regs);
 
         mutex_unlock(&dev->lock);
 
@@ -141,13 +171,34 @@ static int orion_mdio_reset(struct mii_bus *bus)
         return 0;
 }
 
+static irqreturn_t orion_mdio_err_irq(int irq, void *dev_id)
+{
+        struct orion_mdio_dev *dev = dev_id;
+
+        if (readl(dev->regs + MVMDIO_ERR_INT_CAUSE) &
+                        MVMDIO_ERR_INT_SMI_DONE) {
+                writel(~MVMDIO_ERR_INT_SMI_DONE,
+                                dev->regs + MVMDIO_ERR_INT_CAUSE);
+                wake_up(&dev->smi_busy_wait);
+                return IRQ_HANDLED;
+        }
+
+        return IRQ_NONE;
+}
+
 static int orion_mdio_probe(struct platform_device *pdev)
 {
-        struct device_node *np = pdev->dev.of_node;
+        struct resource *r;
         struct mii_bus *bus;
         struct orion_mdio_dev *dev;
         int i, ret;
 
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!r) {
+                dev_err(&pdev->dev, "No SMI register address given\n");
+                return -ENODEV;
+        }
+
         bus = mdiobus_alloc_size(sizeof(struct orion_mdio_dev));
         if (!bus) {
                 dev_err(&pdev->dev, "Cannot allocate MDIO bus\n");
@@ -172,36 +223,66 @@ static int orion_mdio_probe(struct platform_device *pdev)
                 bus->irq[i] = PHY_POLL;
 
         dev = bus->priv;
-        dev->smireg = of_iomap(pdev->dev.of_node, 0);
-        if (!dev->smireg) {
-                dev_err(&pdev->dev, "No SMI register address given in DT\n");
-                kfree(bus->irq);
-                mdiobus_free(bus);
-                return -ENODEV;
+        dev->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
+        if (!dev->regs) {
+                dev_err(&pdev->dev, "Unable to remap SMI register\n");
+                ret = -ENODEV;
+                goto out_mdio;
+        }
+
+        init_waitqueue_head(&dev->smi_busy_wait);
+
+        dev->clk = devm_clk_get(&pdev->dev, NULL);
+        if (!IS_ERR(dev->clk))
+                clk_prepare_enable(dev->clk);
+
+        dev->err_interrupt = platform_get_irq(pdev, 0);
+        if (dev->err_interrupt != -ENXIO) {
+                ret = devm_request_irq(&pdev->dev, dev->err_interrupt,
+                                        orion_mdio_err_irq,
+                                        IRQF_SHARED, pdev->name, dev);
+                if (ret)
+                        goto out_mdio;
+
+                writel(MVMDIO_ERR_INT_SMI_DONE,
+                        dev->regs + MVMDIO_ERR_INT_MASK);
         }
 
         mutex_init(&dev->lock);
 
-        ret = of_mdiobus_register(bus, np);
+        if (pdev->dev.of_node)
+                ret = of_mdiobus_register(bus, pdev->dev.of_node);
+        else
+                ret = mdiobus_register(bus);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Cannot register MDIO bus (%d)\n", ret);
-                iounmap(dev->smireg);
-                kfree(bus->irq);
-                mdiobus_free(bus);
-                return ret;
+                goto out_mdio;
         }
 
         platform_set_drvdata(pdev, bus);
 
         return 0;
+
+out_mdio:
+        if (!IS_ERR(dev->clk))
+                clk_disable_unprepare(dev->clk);
+        kfree(bus->irq);
+        mdiobus_free(bus);
+        return ret;
 }
 
 static int orion_mdio_remove(struct platform_device *pdev)
 {
         struct mii_bus *bus = platform_get_drvdata(pdev);
+        struct orion_mdio_dev *dev = bus->priv;
+
+        writel(0, dev->regs + MVMDIO_ERR_INT_MASK);
         mdiobus_unregister(bus);
         kfree(bus->irq);
         mdiobus_free(bus);
+        if (!IS_ERR(dev->clk))
+                clk_disable_unprepare(dev->clk);
+
         return 0;
 }
 
@@ -225,3 +306,4 @@ module_platform_driver(orion_mdio_driver);
 MODULE_DESCRIPTION("Marvell MDIO interface driver");
 MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:orion-mdio");
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index a47a097c21e1..c96678555233 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1969,13 +1969,8 @@ static int mvneta_rxq_init(struct mvneta_port *pp,
         rxq->descs = dma_alloc_coherent(pp->dev->dev.parent,
                                         rxq->size * MVNETA_DESC_ALIGNED_SIZE,
                                         &rxq->descs_phys, GFP_KERNEL);
-        if (rxq->descs == NULL) {
-                netdev_err(pp->dev,
-                           "rxq=%d: Can't allocate %d bytes for %d RX descr\n",
-                           rxq->id, rxq->size * MVNETA_DESC_ALIGNED_SIZE,
-                           rxq->size);
+        if (rxq->descs == NULL)
                 return -ENOMEM;
-        }
 
         BUG_ON(rxq->descs !=
                PTR_ALIGN(rxq->descs, MVNETA_CPU_D_CACHE_LINE_SIZE));
@@ -2029,13 +2024,8 @@ static int mvneta_txq_init(struct mvneta_port *pp,
         txq->descs = dma_alloc_coherent(pp->dev->dev.parent,
                                         txq->size * MVNETA_DESC_ALIGNED_SIZE,
                                         &txq->descs_phys, GFP_KERNEL);
-        if (txq->descs == NULL) {
-                netdev_err(pp->dev,
-                           "txQ=%d: Can't allocate %d bytes for %d TX descr\n",
-                           txq->id, txq->size * MVNETA_DESC_ALIGNED_SIZE,
-                           txq->size);
+        if (txq->descs == NULL)
                 return -ENOMEM;
-        }
 
         /* Make sure descriptor address is cache line size aligned  */
         BUG_ON(txq->descs !=
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 037ed866c22f..339bb323cb0c 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -584,12 +584,14 @@ static int init_hash_table(struct pxa168_eth_private *pep)
          */
         if (pep->htpr == NULL) {
                 pep->htpr = dma_alloc_coherent(pep->dev->dev.parent,
-                                              HASH_ADDR_TABLE_SIZE,
-                                              &pep->htpr_dma, GFP_KERNEL);
+                                               HASH_ADDR_TABLE_SIZE,
+                                               &pep->htpr_dma,
+                                               GFP_KERNEL | __GFP_ZERO);
                 if (pep->htpr == NULL)
                         return -ENOMEM;
+        } else {
+                memset(pep->htpr, 0, HASH_ADDR_TABLE_SIZE);
         }
-        memset(pep->htpr, 0, HASH_ADDR_TABLE_SIZE);
         wrl(pep, HTPR, pep->htpr_dma);
         return 0;
 }
@@ -1023,13 +1025,11 @@ static int rxq_init(struct net_device *dev)
         size = pep->rx_ring_size * sizeof(struct rx_desc);
         pep->rx_desc_area_size = size;
         pep->p_rx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size,
-                                                &pep->rx_desc_dma, GFP_KERNEL);
-        if (!pep->p_rx_desc_area) {
-                printk(KERN_ERR "%s: Cannot alloc RX ring (size %d bytes)\n",
-                       dev->name, size);
+                                                 &pep->rx_desc_dma,
+                                                 GFP_KERNEL | __GFP_ZERO);
+        if (!pep->p_rx_desc_area)
                 goto out;
-        }
-        memset((void *)pep->p_rx_desc_area, 0, size);
+
         /* initialize the next_desc_ptr links in the Rx descriptors ring */
         p_rx_desc = pep->p_rx_desc_area;
         for (i = 0; i < rx_desc_num; i++) {
@@ -1086,13 +1086,10 @@ static int txq_init(struct net_device *dev)
         size = pep->tx_ring_size * sizeof(struct tx_desc);
         pep->tx_desc_area_size = size;
         pep->p_tx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size,
-                                                &pep->tx_desc_dma, GFP_KERNEL);
-        if (!pep->p_tx_desc_area) {
-                printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
-                       dev->name, size);
+                                                 &pep->tx_desc_dma,
+                                                 GFP_KERNEL | __GFP_ZERO);
+        if (!pep->p_tx_desc_area)
                 goto out;
-        }
-        memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size);
         /* Initialize the next_desc_ptr links in the Tx descriptors ring */
         p_tx_desc = pep->p_tx_desc_area;
         for (i = 0; i < tx_desc_num; i++) {
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 6a0e671fcecd..256ae789c143 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -1421,14 +1421,14 @@ static void sky2_vlan_mode(struct net_device *dev, netdev_features_t features)
         struct sky2_hw *hw = sky2->hw;
         u16 port = sky2->port;
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T),
                              RX_VLAN_STRIP_ON);
         else
                 sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T),
                              RX_VLAN_STRIP_OFF);
 
-        if (features & NETIF_F_HW_VLAN_TX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_TX) {
                 sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
                              TX_VLAN_TAG_ON);
 
@@ -2713,7 +2713,7 @@ static void sky2_rx_tag(struct sky2_port *sky2, u16 length)
         struct sk_buff *skb;
 
         skb = sky2->rx_ring[sky2->rx_next].skb;
-        __vlan_hwaccel_put_tag(skb, be16_to_cpu(length));
+        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(length));
 }
 
 static void sky2_rx_hash(struct sky2_port *sky2, u32 status)
@@ -4406,7 +4406,7 @@ static int sky2_set_features(struct net_device *dev, netdev_features_t features)
         if (changed & NETIF_F_RXHASH)
                 rx_set_rss(dev, features);
 
-        if (changed & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))
+        if (changed & (NETIF_F_HW_VLAN_CTAG_TX|NETIF_F_HW_VLAN_CTAG_RX))
                 sky2_vlan_mode(dev, features);
 
         return 0;
@@ -4793,7 +4793,8 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
                 dev->hw_features |= NETIF_F_RXHASH;
 
         if (!(hw->flags & SKY2_HW_VLAN_BROKEN)) {
-                dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX |
+                                    NETIF_F_HW_VLAN_CTAG_RX;
                 dev->vlan_features |= SKY2_VLAN_OFFLOADS;
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile
index 293127d28b33..3e9c70f15b42 100644
--- a/drivers/net/ethernet/mellanox/mlx4/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx4/Makefile
@@ -6,5 +6,5 @@ mlx4_core-y :=	alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \
 obj-$(CONFIG_MLX4_EN)               += mlx4_en.o
 
 mlx4_en-y :=    en_main.o en_tx.o en_rx.o en_ethtool.o en_port.o en_cq.o \
-                en_resources.o en_netdev.o en_selftest.o
+                en_resources.o en_netdev.o en_selftest.o en_clock.o
 mlx4_en-$(CONFIG_MLX4_EN_DCB) += en_dcb_nl.o
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index fdc5f23d8e9f..1df56cc50ee9 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1490,6 +1490,69 @@ out:
         return ret;
 }
 
+static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
+{
+        int port, err;
+        struct mlx4_vport_state *vp_admin;
+        struct mlx4_vport_oper_state *vp_oper;
+
+        for (port = 1; port <= MLX4_MAX_PORTS; port++) {
+                vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+                vp_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
+                vp_oper->state = *vp_admin;
+                if (MLX4_VGT != vp_admin->default_vlan) {
+                        err = __mlx4_register_vlan(&priv->dev, port,
+                                                   vp_admin->default_vlan, &(vp_oper->vlan_idx));
+                        if (err) {
+                                vp_oper->vlan_idx = NO_INDX;
+                                mlx4_warn((&priv->dev),
+                                          "No vlan resorces slave %d, port %d\n",
+                                          slave, port);
+                                return err;
+                        }
+                        mlx4_dbg((&(priv->dev)), "alloc vlan %d idx  %d slave %d port %d\n",
+                                 (int)(vp_oper->state.default_vlan),
+                                 vp_oper->vlan_idx, slave, port);
+                }
+                if (vp_admin->spoofchk) {
+                        vp_oper->mac_idx = __mlx4_register_mac(&priv->dev,
+                                                               port,
+                                                               vp_admin->mac);
+                        if (0 > vp_oper->mac_idx) {
+                                err = vp_oper->mac_idx;
+                                vp_oper->mac_idx = NO_INDX;
+                                mlx4_warn((&priv->dev),
+                                          "No mac resorces slave %d, port %d\n",
+                                          slave, port);
+                                return err;
+                        }
+                        mlx4_dbg((&(priv->dev)), "alloc mac %llx idx  %d slave %d port %d\n",
+                                 vp_oper->state.mac, vp_oper->mac_idx, slave, port);
+                }
+        }
+        return 0;
+}
+
+static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave)
+{
+        int port;
+        struct mlx4_vport_oper_state *vp_oper;
+
+        for (port = 1; port <= MLX4_MAX_PORTS; port++) {
+                vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+                if (NO_INDX != vp_oper->vlan_idx) {
+                        __mlx4_unregister_vlan(&priv->dev,
+                                               port, vp_oper->vlan_idx);
+                        vp_oper->vlan_idx = NO_INDX;
+                }
+                if (NO_INDX != vp_oper->mac_idx) {
+                        __mlx4_unregister_mac(&priv->dev, port, vp_oper->mac_idx);
+                        vp_oper->mac_idx = NO_INDX;
+                }
+        }
+        return;
+}
+
 static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
                                u16 param, u8 toggle)
 {
@@ -1510,6 +1573,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         if (cmd == MLX4_COMM_CMD_RESET) {
                 mlx4_warn(dev, "Received reset from slave:%d\n", slave);
                 slave_state[slave].active = false;
+                mlx4_master_deactivate_admin_state(priv, slave);
                 for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i) {
                                 slave_state[slave].event_eq[i].eqn = -1;
                                 slave_state[slave].event_eq[i].token = 0;
@@ -1556,6 +1620,8 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
                 if (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR2)
                         goto reset_slave;
                 slave_state[slave].vhcr_dma |= param;
+                if (mlx4_master_activate_admin_state(priv, slave))
+                                goto reset_slave;
                 slave_state[slave].active = true;
                 mlx4_dispatch_event(dev, MLX4_DEV_EVENT_SLAVE_INIT, slave);
                 break;
@@ -1732,6 +1798,18 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
                 if (!priv->mfunc.master.slave_state)
                         goto err_comm;
 
+                priv->mfunc.master.vf_admin =
+                        kzalloc(dev->num_slaves *
+                                sizeof(struct mlx4_vf_admin_state), GFP_KERNEL);
+                if (!priv->mfunc.master.vf_admin)
+                        goto err_comm_admin;
+
+                priv->mfunc.master.vf_oper =
+                        kzalloc(dev->num_slaves *
+                                sizeof(struct mlx4_vf_oper_state), GFP_KERNEL);
+                if (!priv->mfunc.master.vf_oper)
+                        goto err_comm_oper;
+
                 for (i = 0; i < dev->num_slaves; ++i) {
                         s_state = &priv->mfunc.master.slave_state[i];
                         s_state->last_cmd = MLX4_COMM_CMD_RESET;
@@ -1752,6 +1830,10 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
                                         goto err_slaves;
                                 }
                                 INIT_LIST_HEAD(&s_state->mcast_filters[port]);
+                                priv->mfunc.master.vf_admin[i].vport[port].default_vlan = MLX4_VGT;
+                                priv->mfunc.master.vf_oper[i].vport[port].state.default_vlan = MLX4_VGT;
+                                priv->mfunc.master.vf_oper[i].vport[port].vlan_idx = NO_INDX;
+                                priv->mfunc.master.vf_oper[i].vport[port].mac_idx = NO_INDX;
                         }
                         spin_lock_init(&s_state->lock);
                 }
@@ -1800,6 +1882,10 @@ err_slaves:
                 for (port = 1; port <= MLX4_MAX_PORTS; port++)
                         kfree(priv->mfunc.master.slave_state[i].vlan_filter[port]);
         }
+        kfree(priv->mfunc.master.vf_oper);
+err_comm_oper:
+        kfree(priv->mfunc.master.vf_admin);
+err_comm_admin:
         kfree(priv->mfunc.master.slave_state);
 err_comm:
         iounmap(priv->mfunc.comm);
@@ -1837,10 +1923,8 @@ int mlx4_cmd_init(struct mlx4_dev *dev)
                 priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE,
                                                       &priv->mfunc.vhcr_dma,
                                                       GFP_KERNEL);
-                if (!priv->mfunc.vhcr) {
-                        mlx4_err(dev, "Couldn't allocate VHCR.\n");
+                if (!priv->mfunc.vhcr)
                         goto err_hcr;
-                }
         }
 
         priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev,
@@ -1876,6 +1960,8 @@ void mlx4_multi_func_cleanup(struct mlx4_dev *dev)
                                 kfree(priv->mfunc.master.slave_state[i].vlan_filter[port]);
                 }
                 kfree(priv->mfunc.master.slave_state);
+                kfree(priv->mfunc.master.vf_admin);
+                kfree(priv->mfunc.master.vf_oper);
         }
 
         iounmap(priv->mfunc.comm);
@@ -1986,3 +2072,115 @@ u32 mlx4_comm_get_version(void)
 {
          return ((u32) CMD_CHAN_IF_REV << 8) | (u32) CMD_CHAN_VER;
 }
+
+static int mlx4_get_slave_indx(struct mlx4_dev *dev, int vf)
+{
+        if ((vf < 0) || (vf >= dev->num_vfs)) {
+                mlx4_err(dev, "Bad vf number:%d (number of activated vf: %d)\n", vf, dev->num_vfs);
+                return -EINVAL;
+        }
+
+        return vf+1;
+}
+
+int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_vport_state *s_info;
+        int slave;
+
+        if (!mlx4_is_master(dev))
+                return -EPROTONOSUPPORT;
+
+        slave = mlx4_get_slave_indx(dev, vf);
+        if (slave < 0)
+                return -EINVAL;
+
+        s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+        s_info->mac = mac;
+        mlx4_info(dev, "default mac on vf %d port %d to %llX will take afect only after vf restart\n",
+                  vf, port, s_info->mac);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);
+
+int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_vport_state *s_info;
+        int slave;
+
+        if ((!mlx4_is_master(dev)) ||
+            !(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VLAN_CONTROL))
+                return -EPROTONOSUPPORT;
+
+        if ((vlan > 4095) || (qos > 7))
+                return -EINVAL;
+
+        slave = mlx4_get_slave_indx(dev, vf);
+        if (slave < 0)
+                return -EINVAL;
+
+        s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+        if ((0 == vlan) && (0 == qos))
+                s_info->default_vlan = MLX4_VGT;
+        else
+                s_info->default_vlan = vlan;
+        s_info->default_qos = qos;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_set_vf_vlan);
+
+int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_vport_state *s_info;
+        int slave;
+
+        if ((!mlx4_is_master(dev)) ||
+            !(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FSM))
+                return -EPROTONOSUPPORT;
+
+        slave = mlx4_get_slave_indx(dev, vf);
+        if (slave < 0)
+                return -EINVAL;
+
+        s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+        s_info->spoofchk = setting;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_set_vf_spoofchk);
+
+int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_info *ivf)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_vport_state *s_info;
+        int slave;
+
+        if (!mlx4_is_master(dev))
+                return -EPROTONOSUPPORT;
+
+        slave = mlx4_get_slave_indx(dev, vf);
+        if (slave < 0)
+                return -EINVAL;
+
+        s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+        ivf->vf = vf;
+
+        /* need to convert it to a func */
+        ivf->mac[0] = ((s_info->mac >> (5*8)) & 0xff);
+        ivf->mac[1] = ((s_info->mac >> (4*8)) & 0xff);
+        ivf->mac[2] = ((s_info->mac >> (3*8)) & 0xff);
+        ivf->mac[3] = ((s_info->mac >> (2*8)) & 0xff);
+        ivf->mac[4] = ((s_info->mac >> (1*8)) & 0xff);
+        ivf->mac[5] = ((s_info->mac)  & 0xff);
+
+        ivf->vlan       = s_info->default_vlan;
+        ivf->qos        = s_info->default_qos;
+        ivf->tx_rate    = s_info->tx_rate;
+        ivf->spoofchk   = s_info->spoofchk;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_get_vf_config);
diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index 0706623cfb96..004e4231af67 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -240,9 +240,10 @@ static void mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)
                 __mlx4_cq_free_icm(dev, cqn);
 }
 
-int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
-                  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,
-                  unsigned vector, int collapsed)
+int mlx4_cq_alloc(struct mlx4_dev *dev, int nent,
+                  struct mlx4_mtt *mtt, struct mlx4_uar *uar, u64 db_rec,
+                  struct mlx4_cq *cq, unsigned vector, int collapsed,
+                  int timestamp_en)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cq_table *cq_table = &priv->cq_table;
@@ -276,6 +277,9 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
         memset(cq_context, 0, sizeof *cq_context);
 
         cq_context->flags           = cpu_to_be32(!!collapsed << 18);
+        if (timestamp_en)
+                cq_context->flags  |= cpu_to_be32(1 << 19);
+
         cq_context->logsize_usrpage = cpu_to_be32((ilog2(nent) << 24) | uar->index);
         cq_context->comp_eqn        = priv->eq_table.eq[vector].eqn;
         cq_context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
new file mode 100644
index 000000000000..fd6441071319
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <linux/mlx4/device.h>
+
+#include "mlx4_en.h"
+
+int mlx4_en_timestamp_config(struct net_device *dev, int tx_type, int rx_filter)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int port_up = 0;
+        int err = 0;
+
+        mutex_lock(&mdev->state_lock);
+        if (priv->port_up) {
+                port_up = 1;
+                mlx4_en_stop_port(dev, 1);
+        }
+
+        mlx4_en_free_resources(priv);
+
+        en_warn(priv, "Changing Time Stamp configuration\n");
+
+        priv->hwtstamp_config.tx_type = tx_type;
+        priv->hwtstamp_config.rx_filter = rx_filter;
+
+        if (rx_filter != HWTSTAMP_FILTER_NONE)
+                dev->features &= ~NETIF_F_HW_VLAN_CTAG_RX;
+        else
+                dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
+
+        err = mlx4_en_alloc_resources(priv);
+        if (err) {
+                en_err(priv, "Failed reallocating port resources\n");
+                goto out;
+        }
+        if (port_up) {
+                err = mlx4_en_start_port(dev);
+                if (err)
+                        en_err(priv, "Failed starting port\n");
+        }
+
+out:
+        mutex_unlock(&mdev->state_lock);
+        netdev_features_change(dev);
+        return err;
+}
+
+/* mlx4_en_read_clock - read raw cycle counter (to be used by time counter)
+ */
+static cycle_t mlx4_en_read_clock(const struct cyclecounter *tc)
+{
+        struct mlx4_en_dev *mdev =
+                container_of(tc, struct mlx4_en_dev, cycles);
+        struct mlx4_dev *dev = mdev->dev;
+
+        return mlx4_read_clock(dev) & tc->mask;
+}
+
+u64 mlx4_en_get_cqe_ts(struct mlx4_cqe *cqe)
+{
+        u64 hi, lo;
+        struct mlx4_ts_cqe *ts_cqe = (struct mlx4_ts_cqe *)cqe;
+
+        lo = (u64)be16_to_cpu(ts_cqe->timestamp_lo);
+        hi = ((u64)be32_to_cpu(ts_cqe->timestamp_hi) + !lo) << 16;
+
+        return hi | lo;
+}
+
+void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev,
+                            struct skb_shared_hwtstamps *hwts,
+                            u64 timestamp)
+{
+        u64 nsec;
+
+        nsec = timecounter_cyc2time(&mdev->clock, timestamp);
+
+        memset(hwts, 0, sizeof(struct skb_shared_hwtstamps));
+        hwts->hwtstamp = ns_to_ktime(nsec);
+}
+
+void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev)
+{
+        struct mlx4_dev *dev = mdev->dev;
+        u64 ns;
+
+        memset(&mdev->cycles, 0, sizeof(mdev->cycles));
+        mdev->cycles.read = mlx4_en_read_clock;
+        mdev->cycles.mask = CLOCKSOURCE_MASK(48);
+        /* Using shift to make calculation more accurate. Since current HW
+         * clock frequency is 427 MHz, and cycles are given using a 48 bits
+         * register, the biggest shift when calculating using u64, is 14
+         * (max_cycles * multiplier < 2^64)
+         */
+        mdev->cycles.shift = 14;
+        mdev->cycles.mult =
+                clocksource_khz2mult(1000 * dev->caps.hca_core_clock, mdev->cycles.shift);
+
+        timecounter_init(&mdev->clock, &mdev->cycles,
+                         ktime_to_ns(ktime_get_real()));
+
+        /* Calculate period in seconds to call the overflow watchdog - to make
+         * sure counter is checked at least once every wrap around.
+         */
+        ns = cyclecounter_cyc2ns(&mdev->cycles, mdev->cycles.mask);
+        do_div(ns, NSEC_PER_SEC / 2 / HZ);
+        mdev->overflow_period = ns;
+}
+
+void mlx4_en_ptp_overflow_check(struct mlx4_en_dev *mdev)
+{
+        bool timeout = time_is_before_jiffies(mdev->last_overflow_check +
+                                              mdev->overflow_period);
+
+        if (timeout) {
+                timecounter_read(&mdev->clock);
+                mdev->last_overflow_check = jiffies;
+        }
+}
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
index b8d0854a7ad1..1e6c594d6d04 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
@@ -77,6 +77,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
         struct mlx4_en_dev *mdev = priv->mdev;
         int err = 0;
         char name[25];
+        int timestamp_en = 0;
         struct cpu_rmap *rmap =
 #ifdef CONFIG_RFS_ACCEL
                 priv->dev->rx_cpu_rmap;
@@ -123,8 +124,13 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
         if (!cq->is_tx)
                 cq->size = priv->rx_ring[cq->ring].actual_size;
 
-        err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar,
-                            cq->wqres.db.dma, &cq->mcq, cq->vector, 0);
+        if ((cq->is_tx && priv->hwtstamp_config.tx_type) ||
+            (!cq->is_tx && priv->hwtstamp_config.rx_filter))
+                timestamp_en = 1;
+
+        err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt,
+                            &mdev->priv_uar, cq->wqres.db.dma, &cq->mcq,
+                            cq->vector, 0, timestamp_en);
         if (err)
                 return err;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
index b799ab12a291..0f91222ea3d7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
@@ -186,7 +186,7 @@ static int mlx4_en_dcbnl_ieee_setpfc(struct net_device *dev,
 
 static u8 mlx4_en_dcbnl_getdcbx(struct net_device *dev)
 {
-        return DCB_CAP_DCBX_VER_IEEE;
+        return DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;
 }
 
 static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode)
@@ -253,3 +253,11 @@ const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
         .getdcbx        = mlx4_en_dcbnl_getdcbx,
         .setdcbx        = mlx4_en_dcbnl_setdcbx,
 };
+
+const struct dcbnl_rtnl_ops mlx4_en_dcbnl_pfc_ops = {
+        .ieee_getpfc    = mlx4_en_dcbnl_ieee_getpfc,
+        .ieee_setpfc    = mlx4_en_dcbnl_ieee_setpfc,
+
+        .getdcbx        = mlx4_en_dcbnl_getdcbx,
+        .setdcbx        = mlx4_en_dcbnl_setdcbx,
+};
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 00f25b5f297f..bcf4d118e98c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1147,6 +1147,35 @@ out:
         return err;
 }
 
+static int mlx4_en_get_ts_info(struct net_device *dev,
+                               struct ethtool_ts_info *info)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int ret;
+
+        ret = ethtool_op_get_ts_info(dev, info);
+        if (ret)
+                return ret;
+
+        if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) {
+                info->so_timestamping |=
+                        SOF_TIMESTAMPING_TX_HARDWARE |
+                        SOF_TIMESTAMPING_RX_HARDWARE |
+                        SOF_TIMESTAMPING_RAW_HARDWARE;
+
+                info->tx_types =
+                        (1 << HWTSTAMP_TX_OFF) |
+                        (1 << HWTSTAMP_TX_ON);
+
+                info->rx_filters =
+                        (1 << HWTSTAMP_FILTER_NONE) |
+                        (1 << HWTSTAMP_FILTER_ALL);
+        }
+
+        return ret;
+}
+
 const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_drvinfo = mlx4_en_get_drvinfo,
         .get_settings = mlx4_en_get_settings,
@@ -1173,6 +1202,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .set_rxfh_indir = mlx4_en_set_rxfh_indir,
         .get_channels = mlx4_en_get_channels,
         .set_channels = mlx4_en_set_channels,
+        .get_ts_info = mlx4_en_get_ts_info,
 };
 
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index fc27800e9c38..a5c9df07a7d0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -300,6 +300,11 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
                 if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i]))
                         mdev->pndev[i] = NULL;
         }
+
+        /* Initialize time stamp mechanism */
+        if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
+                mlx4_en_init_timestamp(mdev);
+
         return mdev;
 
 err_mr:
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 30d78f806dc3..a69a908614e6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -356,7 +356,8 @@ static void mlx4_en_filter_rfs_expire(struct mlx4_en_priv *priv)
 }
 #endif
 
-static int mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int mlx4_en_vlan_rx_add_vid(struct net_device *dev,
+                                   __be16 proto, u16 vid)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
@@ -381,7 +382,8 @@ static int mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
         return 0;
 }
 
-static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
+                                    __be16 proto, u16 vid)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
@@ -1359,6 +1361,27 @@ static void mlx4_en_do_get_stats(struct work_struct *work)
         mutex_unlock(&mdev->state_lock);
 }
 
+/* mlx4_en_service_task - Run service task for tasks that needed to be done
+ * periodically
+ */
+static void mlx4_en_service_task(struct work_struct *work)
+{
+        struct delayed_work *delay = to_delayed_work(work);
+        struct mlx4_en_priv *priv = container_of(delay, struct mlx4_en_priv,
+                                                 service_task);
+        struct mlx4_en_dev *mdev = priv->mdev;
+
+        mutex_lock(&mdev->state_lock);
+        if (mdev->device_up) {
+                if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
+                        mlx4_en_ptp_overflow_check(mdev);
+
+                queue_delayed_work(mdev->workqueue, &priv->service_task,
+                                   SERVICE_TASK_DELAY);
+        }
+        mutex_unlock(&mdev->state_lock);
+}
+
 static void mlx4_en_linkstate(struct work_struct *work)
 {
         struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
@@ -1863,6 +1886,7 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
                 mlx4_free_hwq_res(mdev->dev, &priv->res, MLX4_EN_PAGE_SIZE);
 
         cancel_delayed_work(&priv->stats_task);
+        cancel_delayed_work(&priv->service_task);
         /* flush any pending task for this netdev */
         flush_workqueue(mdev->workqueue);
 
@@ -1914,6 +1938,75 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+static int mlx4_en_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        struct hwtstamp_config config;
+
+        if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
+                return -EFAULT;
+
+        /* reserved for future extensions */
+        if (config.flags)
+                return -EINVAL;
+
+        /* device doesn't support time stamping */
+        if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS))
+                return -EINVAL;
+
+        /* TX HW timestamp */
+        switch (config.tx_type) {
+        case HWTSTAMP_TX_OFF:
+        case HWTSTAMP_TX_ON:
+                break;
+        default:
+                return -ERANGE;
+        }
+
+        /* RX HW timestamp */
+        switch (config.rx_filter) {
+        case HWTSTAMP_FILTER_NONE:
+                break;
+        case HWTSTAMP_FILTER_ALL:
+        case HWTSTAMP_FILTER_SOME:
+        case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
+        case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+        case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
+                config.rx_filter = HWTSTAMP_FILTER_ALL;
+                break;
+        default:
+                return -ERANGE;
+        }
+
+        if (mlx4_en_timestamp_config(dev, config.tx_type, config.rx_filter)) {
+                config.tx_type = HWTSTAMP_TX_OFF;
+                config.rx_filter = HWTSTAMP_FILTER_NONE;
+        }
+
+        return copy_to_user(ifr->ifr_data, &config,
+                            sizeof(config)) ? -EFAULT : 0;
+}
+
+static int mlx4_en_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        switch (cmd) {
+        case SIOCSHWTSTAMP:
+                return mlx4_en_hwtstamp_ioctl(dev, ifr);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
 static int mlx4_en_set_features(struct net_device *netdev,
                 netdev_features_t features)
 {
@@ -1931,77 +2024,40 @@ static int mlx4_en_set_features(struct net_device *netdev,
 
 }
 
-static int mlx4_en_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
-                           struct net_device *dev,
-                           const unsigned char *addr, u16 flags)
+static int mlx4_en_set_vf_mac(struct net_device *dev, int queue, u8 *mac)
 {
-        struct mlx4_en_priv *priv = netdev_priv(dev);
-        struct mlx4_dev *mdev = priv->mdev->dev;
-        int err;
-
-        if (!mlx4_is_mfunc(mdev))
-                return -EOPNOTSUPP;
+        struct mlx4_en_priv *en_priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = en_priv->mdev;
+        u64 mac_u64 = mlx4_en_mac_to_u64(mac);
 
-        /* Hardware does not support aging addresses, allow only
-         * permanent addresses if ndm_state is given
-         */
-        if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) {
-                en_info(priv, "Add FDB only supports static addresses\n");
+        if (!is_valid_ether_addr(mac))
                 return -EINVAL;
-        }
 
-        if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))
-                err = dev_uc_add_excl(dev, addr);
-        else if (is_multicast_ether_addr(addr))
-                err = dev_mc_add_excl(dev, addr);
-        else
-                err = -EINVAL;
-
-        /* Only return duplicate errors if NLM_F_EXCL is set */
-        if (err == -EEXIST && !(flags & NLM_F_EXCL))
-                err = 0;
-
-        return err;
+        return mlx4_set_vf_mac(mdev->dev, en_priv->port, queue, mac_u64);
 }
 
-static int mlx4_en_fdb_del(struct ndmsg *ndm,
-                           struct nlattr *tb[],
-                           struct net_device *dev,
-                           const unsigned char *addr)
+static int mlx4_en_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos)
 {
-        struct mlx4_en_priv *priv = netdev_priv(dev);
-        struct mlx4_dev *mdev = priv->mdev->dev;
-        int err;
-
-        if (!mlx4_is_mfunc(mdev))
-                return -EOPNOTSUPP;
+        struct mlx4_en_priv *en_priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = en_priv->mdev;
 
-        if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) {
-                en_info(priv, "Del FDB only supports static addresses\n");
-                return -EINVAL;
-        }
+        return mlx4_set_vf_vlan(mdev->dev, en_priv->port, vf, vlan, qos);
+}
 
-        if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))
-                err = dev_uc_del(dev, addr);
-        else if (is_multicast_ether_addr(addr))
-                err = dev_mc_del(dev, addr);
-        else
-                err = -EINVAL;
+static int mlx4_en_set_vf_spoofchk(struct net_device *dev, int vf, bool setting)
+{
+        struct mlx4_en_priv *en_priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = en_priv->mdev;
 
-        return err;
+        return mlx4_set_vf_spoofchk(mdev->dev, en_priv->port, vf, setting);
 }
 
-static int mlx4_en_fdb_dump(struct sk_buff *skb,
-                            struct netlink_callback *cb,
-                            struct net_device *dev, int idx)
+static int mlx4_en_get_vf_config(struct net_device *dev, int vf, struct ifla_vf_info *ivf)
 {
-        struct mlx4_en_priv *priv = netdev_priv(dev);
-        struct mlx4_dev *mdev = priv->mdev->dev;
-
-        if (mlx4_is_mfunc(mdev))
-                idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);
+        struct mlx4_en_priv *en_priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = en_priv->mdev;
 
-        return idx;
+        return mlx4_get_vf_config(mdev->dev, en_priv->port, vf, ivf);
 }
 
 static const struct net_device_ops mlx4_netdev_ops = {
@@ -2014,6 +2070,7 @@ static const struct net_device_ops mlx4_netdev_ops = {
         .ndo_set_mac_address    = mlx4_en_set_mac,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_change_mtu         = mlx4_en_change_mtu,
+        .ndo_do_ioctl           = mlx4_en_ioctl,
         .ndo_tx_timeout         = mlx4_en_tx_timeout,
         .ndo_vlan_rx_add_vid    = mlx4_en_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = mlx4_en_vlan_rx_kill_vid,
@@ -2025,9 +2082,33 @@ static const struct net_device_ops mlx4_netdev_ops = {
 #ifdef CONFIG_RFS_ACCEL
         .ndo_rx_flow_steer      = mlx4_en_filter_rfs,
 #endif
-        .ndo_fdb_add            = mlx4_en_fdb_add,
-        .ndo_fdb_del            = mlx4_en_fdb_del,
-        .ndo_fdb_dump           = mlx4_en_fdb_dump,
+};
+
+static const struct net_device_ops mlx4_netdev_ops_master = {
+        .ndo_open               = mlx4_en_open,
+        .ndo_stop               = mlx4_en_close,
+        .ndo_start_xmit         = mlx4_en_xmit,
+        .ndo_select_queue       = mlx4_en_select_queue,
+        .ndo_get_stats          = mlx4_en_get_stats,
+        .ndo_set_rx_mode        = mlx4_en_set_rx_mode,
+        .ndo_set_mac_address    = mlx4_en_set_mac,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_change_mtu         = mlx4_en_change_mtu,
+        .ndo_tx_timeout         = mlx4_en_tx_timeout,
+        .ndo_vlan_rx_add_vid    = mlx4_en_vlan_rx_add_vid,
+        .ndo_vlan_rx_kill_vid   = mlx4_en_vlan_rx_kill_vid,
+        .ndo_set_vf_mac         = mlx4_en_set_vf_mac,
+        .ndo_set_vf_vlan        = mlx4_en_set_vf_vlan,
+        .ndo_set_vf_spoofchk    = mlx4_en_set_vf_spoofchk,
+        .ndo_get_vf_config      = mlx4_en_get_vf_config,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = mlx4_en_netpoll,
+#endif
+        .ndo_set_features       = mlx4_en_set_features,
+        .ndo_setup_tc           = mlx4_en_setup_tc,
+#ifdef CONFIG_RFS_ACCEL
+        .ndo_rx_flow_steer      = mlx4_en_filter_rfs,
+#endif
 };
 
 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
@@ -2088,9 +2169,16 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
         INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);
         INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
+        INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);
 #ifdef CONFIG_MLX4_EN_DCB
-        if (!mlx4_is_slave(priv->mdev->dev))
-                dev->dcbnl_ops = &mlx4_en_dcbnl_ops;
+        if (!mlx4_is_slave(priv->mdev->dev)) {
+                if (mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_SET_ETH_SCHED) {
+                        dev->dcbnl_ops = &mlx4_en_dcbnl_ops;
+                } else {
+                        en_info(priv, "enabling only PFC DCB ops\n");
+                        dev->dcbnl_ops = &mlx4_en_dcbnl_pfc_ops;
+                }
+        }
 #endif
 
         for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i)
@@ -2122,6 +2210,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         spin_lock_init(&priv->filters_lock);
 #endif
 
+        /* Initialize time stamping config */
+        priv->hwtstamp_config.flags = 0;
+        priv->hwtstamp_config.tx_type = HWTSTAMP_TX_OFF;
+        priv->hwtstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;
+
         /* Allocate page for receive rings */
         err = mlx4_alloc_hwq_res(mdev->dev, &priv->res,
                                 MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE);
@@ -2134,7 +2227,10 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         /*
          * Initialize netdev entry points
          */
-        dev->netdev_ops = &mlx4_netdev_ops;
+        if (mlx4_is_master(priv->mdev->dev))
+                dev->netdev_ops = &mlx4_netdev_ops_master;
+        else
+                dev->netdev_ops = &mlx4_netdev_ops;
         dev->watchdog_timeo = MLX4_EN_WATCHDOG_TIMEOUT;
         netif_set_real_num_tx_queues(dev, priv->tx_ring_num);
         netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
@@ -2152,8 +2248,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 
         dev->hw_features |= NETIF_F_RXCSUM | NETIF_F_RXHASH;
         dev->features = dev->hw_features | NETIF_F_HIGHDMA |
-                        NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
-                        NETIF_F_HW_VLAN_FILTER;
+                        NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
+                        NETIF_F_HW_VLAN_CTAG_FILTER;
         dev->hw_features |= NETIF_F_LOOPBACK;
 
         if (mdev->dev->caps.steering_mode ==
@@ -2199,6 +2295,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         }
         mlx4_en_set_default_moderation(priv);
         queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
+
+        if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
+                queue_delayed_work(mdev->workqueue, &priv->service_task,
+                                   SERVICE_TASK_DELAY);
+
         return 0;
 
 out:
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
index 10c24c784b70..91f2b2c43c12 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_resources.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
@@ -42,6 +42,7 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
                              int user_prio, struct mlx4_qp_context *context)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
+        struct net_device *dev = priv->dev;
 
         memset(context, 0, sizeof *context);
         context->flags = cpu_to_be32(7 << 16 | rss << MLX4_RSS_QPC_FLAG_OFFSET);
@@ -65,6 +66,8 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
         context->cqn_send = cpu_to_be32(cqn);
         context->cqn_recv = cpu_to_be32(cqn);
         context->db_rec_addr = cpu_to_be64(priv->res.db.dma << 2);
+        if (!(dev->features & NETIF_F_HW_VLAN_CTAG_RX))
+                context->param3 |= cpu_to_be32(1 << 30);
 }
 
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index c7f856308e1a..02aee1ebd203 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -320,6 +320,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
         }
         ring->buf = ring->wqres.buf.direct.buf;
 
+        ring->hwtstamp_rx_filter = priv->hwtstamp_config.rx_filter;
+
         return 0;
 
 err_hwq:
@@ -554,6 +556,7 @@ static void mlx4_en_refill_rx_buffers(struct mlx4_en_priv *priv,
 int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int budget)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
         struct mlx4_cqe *cqe;
         struct mlx4_en_rx_ring *ring = &priv->rx_ring[cq->ring];
         struct mlx4_en_rx_alloc *frags;
@@ -565,6 +568,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
         int polled = 0;
         int ip_summed;
         int factor = priv->cqe_factor;
+        u64 timestamp;
 
         if (!priv->port_up)
                 return 0;
@@ -669,19 +673,27 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                                         gro_skb->data_len = length;
                                         gro_skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-                                        if (cqe->vlan_my_qpn &
-                                            cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) {
+                                        if ((cqe->vlan_my_qpn &
+                                            cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) &&
+                                            (dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
                                                 u16 vid = be16_to_cpu(cqe->sl_vid);
 
-                                                __vlan_hwaccel_put_tag(gro_skb, vid);
+                                                __vlan_hwaccel_put_tag(gro_skb, htons(ETH_P_8021Q), vid);
                                         }
 
                                         if (dev->features & NETIF_F_RXHASH)
                                                 gro_skb->rxhash = be32_to_cpu(cqe->immed_rss_invalid);
 
                                         skb_record_rx_queue(gro_skb, cq->ring);
-                                        napi_gro_frags(&cq->napi);
 
+                                        if (ring->hwtstamp_rx_filter == HWTSTAMP_FILTER_ALL) {
+                                                timestamp = mlx4_en_get_cqe_ts(cqe);
+                                                mlx4_en_fill_hwtstamps(mdev,
+                                                                       skb_hwtstamps(gro_skb),
+                                                                       timestamp);
+                                        }
+
+                                        napi_gro_frags(&cq->napi);
                                         goto next;
                                 }
 
@@ -714,9 +726,16 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                 if (dev->features & NETIF_F_RXHASH)
                         skb->rxhash = be32_to_cpu(cqe->immed_rss_invalid);
 
-                if (be32_to_cpu(cqe->vlan_my_qpn) &
-                    MLX4_CQE_VLAN_PRESENT_MASK)
-                        __vlan_hwaccel_put_tag(skb, be16_to_cpu(cqe->sl_vid));
+                if ((be32_to_cpu(cqe->vlan_my_qpn) &
+                    MLX4_CQE_VLAN_PRESENT_MASK) &&
+                    (dev->features & NETIF_F_HW_VLAN_CTAG_RX))
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(cqe->sl_vid));
+
+                if (ring->hwtstamp_rx_filter == HWTSTAMP_FILTER_ALL) {
+                        timestamp = mlx4_en_get_cqe_ts(cqe);
+                        mlx4_en_fill_hwtstamps(mdev, skb_hwtstamps(skb),
+                                               timestamp);
+                }
 
                 /* Push it up the stack */
                 netif_receive_skb(skb);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c
index 3488c6d9e6b5..2448f0d669e6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c
@@ -58,10 +58,9 @@ static int mlx4_en_test_loopback_xmit(struct mlx4_en_priv *priv)
 
         /* build the pkt before xmit */
         skb = netdev_alloc_skb(priv->dev, MLX4_LOOPBACK_TEST_PAYLOAD + ETH_HLEN + NET_IP_ALIGN);
-        if (!skb) {
-                en_err(priv, "-LOOPBACK_TEST_XMIT- failed to create skb for xmit\n");
+        if (!skb)
                 return -ENOMEM;
-        }
+
         skb_reserve(skb, NET_IP_ALIGN);
 
         ethh = (struct ethhdr *)skb_put(skb, sizeof(struct ethhdr));
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 49308cc65ee7..4e6877a032a8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -118,6 +118,8 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
         } else
                 ring->bf_enabled = true;
 
+        ring->hwtstamp_tx_type = priv->hwtstamp_config.tx_type;
+
         return 0;
 
 err_map:
@@ -192,8 +194,9 @@ void mlx4_en_deactivate_tx_ring(struct mlx4_en_priv *priv,
 
 static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
                                 struct mlx4_en_tx_ring *ring,
-                                int index, u8 owner)
+                                int index, u8 owner, u64 timestamp)
 {
+        struct mlx4_en_dev *mdev = priv->mdev;
         struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
         struct mlx4_en_tx_desc *tx_desc = ring->buf + index * TXBB_SIZE;
         struct mlx4_wqe_data_seg *data = (void *) tx_desc + tx_info->data_offset;
@@ -204,6 +207,12 @@ static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
         int i;
         __be32 *ptr = (__be32 *)tx_desc;
         __be32 stamp = cpu_to_be32(STAMP_VAL | (!!owner << STAMP_SHIFT));
+        struct skb_shared_hwtstamps hwts;
+
+        if (timestamp) {
+                mlx4_en_fill_hwtstamps(mdev, &hwts, timestamp);
+                skb_tstamp_tx(skb, &hwts);
+        }
 
         /* Optimize the common case when there are no wraparounds */
         if (likely((void *) tx_desc + tx_info->nr_txbb * TXBB_SIZE <= end)) {
@@ -289,7 +298,7 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
         while (ring->cons != ring->prod) {
                 ring->last_nr_txbb = mlx4_en_free_tx_desc(priv, ring,
                                                 ring->cons & ring->size_mask,
-                                                !!(ring->cons & ring->size));
+                                                !!(ring->cons & ring->size), 0);
                 ring->cons += ring->last_nr_txbb;
                 cnt++;
         }
@@ -318,6 +327,7 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
         u32 packets = 0;
         u32 bytes = 0;
         int factor = priv->cqe_factor;
+        u64 timestamp = 0;
 
         if (!priv->port_up)
                 return;
@@ -341,11 +351,14 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
                 do {
                         txbbs_skipped += ring->last_nr_txbb;
                         ring_index = (ring_index + ring->last_nr_txbb) & size_mask;
+                        if (ring->tx_info[ring_index].ts_requested)
+                                timestamp = mlx4_en_get_cqe_ts(cqe);
+
                         /* free next descriptor */
                         ring->last_nr_txbb = mlx4_en_free_tx_desc(
                                         priv, ring, ring_index,
                                         !!((ring->cons + txbbs_skipped) &
-                                                        ring->size));
+                                        ring->size), timestamp);
                         packets++;
                         bytes += ring->tx_info[ring_index].nr_bytes;
                 } while (ring_index != new_index);
@@ -629,6 +642,16 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_info->skb = skb;
         tx_info->nr_txbb = nr_txbb;
 
+        /*
+         * For timestamping add flag to skb_shinfo and
+         * set flag for further reference
+         */
+        if (ring->hwtstamp_tx_type == HWTSTAMP_TX_ON &&
+            skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) {
+                skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
+                tx_info->ts_requested = 1;
+        }
+
         /* Prepare ctrl segement apart opcode+ownership, which depends on
          * whether LSO is used */
         tx_desc->ctrl.vlan_tag = cpu_to_be16(vlan_tag);
@@ -729,6 +752,8 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         if (bounce)
                 tx_desc = mlx4_en_bounce_to_desc(priv, ring, index, desc_size);
 
+        skb_tx_timestamp(skb);
+
         if (ring->bf_enabled && desc_size <= MAX_BF && !bounce && !vlan_tx_tag_present(skb)) {
                 *(__be32 *) (&tx_desc->ctrl.vlan_tag) |= cpu_to_be32(ring->doorbell_qpn);
                 op_own |= htonl((bf_index & 0xffff) << 8);
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index f6245579962d..b147bdd40768 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -91,7 +91,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags)
                 [ 8] = "P_Key violation counter",
                 [ 9] = "Q_Key violation counter",
                 [10] = "VMM",
-                [12] = "DPDP",
+                [12] = "Dual Port Different Protocol (DPDP) support",
                 [15] = "Big LSO headers",
                 [16] = "MW support",
                 [17] = "APM support",
@@ -109,6 +109,8 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags)
                 [41] = "Unicast VEP steering support",
                 [42] = "Multicast VEP steering support",
                 [48] = "Counters support",
+                [53] = "Port ETS Scheduler support",
+                [55] = "Port link type sensing support",
                 [59] = "Port management change event support",
                 [61] = "64 byte EQE support",
                 [62] = "64 byte CQE support",
@@ -128,7 +130,8 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags)
                 [1] = "RSS Toeplitz Hash Function support",
                 [2] = "RSS XOR Hash Function support",
                 [3] = "Device manage flow steering support",
-                [4] = "Automatic mac reassignment support"
+                [4] = "Automatic MAC reassignment support",
+                [5] = "Time stamping support"
         };
         int i;
 
@@ -442,6 +445,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_MAX_MSG_SZ_OFFSET         0x38
 #define QUERY_DEV_CAP_MAX_GID_OFFSET            0x3b
 #define QUERY_DEV_CAP_RATE_SUPPORT_OFFSET       0x3c
+#define QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET      0x3e
 #define QUERY_DEV_CAP_MAX_PKEY_OFFSET           0x3f
 #define QUERY_DEV_CAP_EXT_FLAGS_OFFSET          0x40
 #define QUERY_DEV_CAP_FLAGS_OFFSET              0x44
@@ -464,6 +468,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_RSVD_XRC_OFFSET           0x66
 #define QUERY_DEV_CAP_MAX_XRC_OFFSET            0x67
 #define QUERY_DEV_CAP_MAX_COUNTERS_OFFSET       0x68
+#define QUERY_DEV_CAP_EXT_2_FLAGS_OFFSET        0x70
 #define QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET     0x76
 #define QUERY_DEV_CAP_FLOW_STEERING_MAX_QP_OFFSET       0x77
 #define QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET    0x80
@@ -558,6 +563,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev_cap->fs_max_num_qp_per_entry = field;
         MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);
         dev_cap->stat_rate_support = stat_rate;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);
+        if (field & 0x80)
+                dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_TS;
         MLX4_GET(ext_flags, outbox, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
         MLX4_GET(flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);
         dev_cap->flags = flags | (u64)ext_flags << 32;
@@ -648,6 +656,12 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
                 MLX4_GET(dev_cap->max_counters, outbox,
                          QUERY_DEV_CAP_MAX_COUNTERS_OFFSET);
 
+        MLX4_GET(field32, outbox, QUERY_DEV_CAP_EXT_2_FLAGS_OFFSET);
+        if (field32 & (1 << 26))
+                dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_VLAN_CONTROL;
+        if (field32 & (1 << 20))
+                dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_FSM;
+
         if (dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {
                 for (i = 1; i <= dev_cap->num_ports; ++i) {
                         MLX4_GET(field, outbox, QUERY_DEV_CAP_VL_PORT_OFFSET);
@@ -777,6 +791,11 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave,
         flags &= ~MLX4_DEV_CAP_FLAG_MEM_WINDOW;
         MLX4_PUT(outbox->buf, flags, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
 
+        /* For guests, disable timestamp */
+        MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);
+        field &= 0x7f;
+        MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);
+
         /* For guests, report Blueflame disabled */
         MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_BF_OFFSET);
         field &= 0x7f;
@@ -804,6 +823,7 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
                             struct mlx4_cmd_mailbox *outbox,
                             struct mlx4_cmd_info *cmd)
 {
+        struct mlx4_priv *priv = mlx4_priv(dev);
         u64 def_mac;
         u8 port_type;
         u16 short_field;
@@ -821,6 +841,9 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
                 /* set slave default_mac address */
                 MLX4_GET(def_mac, outbox->buf, QUERY_PORT_MAC_OFFSET);
                 def_mac += slave << 8;
+                /* if config MAC in DB use it */
+                if (priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac)
+                        def_mac = priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac;
                 MLX4_PUT(outbox->buf, def_mac, QUERY_PORT_MAC_OFFSET);
 
                 /* get port type - currently only eth is enabled */
@@ -1006,6 +1029,9 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)
 #define QUERY_FW_COMM_BASE_OFFSET      0x40
 #define QUERY_FW_COMM_BAR_OFFSET       0x48
 
+#define QUERY_FW_CLOCK_OFFSET          0x50
+#define QUERY_FW_CLOCK_BAR             0x58
+
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
                 return PTR_ERR(mailbox);
@@ -1080,6 +1106,12 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)
                  fw->comm_bar, fw->comm_base);
         mlx4_dbg(dev, "FW size %d KB\n", fw->fw_pages >> 2);
 
+        MLX4_GET(fw->clock_offset, outbox, QUERY_FW_CLOCK_OFFSET);
+        MLX4_GET(fw->clock_bar,    outbox, QUERY_FW_CLOCK_BAR);
+        fw->clock_bar = (fw->clock_bar >> 6) * 2;
+        mlx4_dbg(dev, "Internal clock bar:%d offset:0x%llx\n",
+                 fw->clock_bar, fw->clock_offset);
+
         /*
          * Round up number of system pages needed in case
          * MLX4_ICM_PAGE_SIZE < PAGE_SIZE.
@@ -1367,6 +1399,7 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev,
         u8 byte_field;
 
 #define QUERY_HCA_GLOBAL_CAPS_OFFSET    0x04
+#define QUERY_HCA_CORE_CLOCK_OFFSET     0x0c
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -1381,6 +1414,7 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev,
                 goto out;
 
         MLX4_GET(param->global_caps, outbox, QUERY_HCA_GLOBAL_CAPS_OFFSET);
+        MLX4_GET(param->hca_core_clock, outbox, QUERY_HCA_CORE_CLOCK_OFFSET);
 
         /* QPC/EEC/CQC/EQC/RDMARC attributes */
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
index 151c2bb380a6..fdf41665a059 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.h
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.h
@@ -162,6 +162,7 @@ struct mlx4_init_hca_param {
         u64 global_caps;
         u16 log_mc_entry_sz;
         u16 log_mc_hash_sz;
+        u16 hca_core_clock; /* Internal Clock Frequency (in MHz) */
         u8  log_num_qps;
         u8  log_num_srqs;
         u8  log_num_cqs;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 16abde20e1fc..0d32a82458bf 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -513,6 +513,8 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
 
         mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;
 
+        dev->caps.hca_core_clock = hca_param.hca_core_clock;
+
         memset(&dev_cap, 0, sizeof(dev_cap));
         dev->caps.max_qp_dest_rdma = 1 << hca_param.log_rd_per_qp;
         err = mlx4_dev_cap(dev, &dev_cap);
@@ -1226,8 +1228,53 @@ static void unmap_bf_area(struct mlx4_dev *dev)
                 io_mapping_free(mlx4_priv(dev)->bf_mapping);
 }
 
+cycle_t mlx4_read_clock(struct mlx4_dev *dev)
+{
+        u32 clockhi, clocklo, clockhi1;
+        cycle_t cycles;
+        int i;
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        for (i = 0; i < 10; i++) {
+                clockhi = swab32(readl(priv->clock_mapping));
+                clocklo = swab32(readl(priv->clock_mapping + 4));
+                clockhi1 = swab32(readl(priv->clock_mapping));
+                if (clockhi == clockhi1)
+                        break;
+        }
+
+        cycles = (u64) clockhi << 32 | (u64) clocklo;
+
+        return cycles;
+}
+EXPORT_SYMBOL_GPL(mlx4_read_clock);
+
+
+static int map_internal_clock(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        priv->clock_mapping =
+                ioremap(pci_resource_start(dev->pdev, priv->fw.clock_bar) +
+                        priv->fw.clock_offset, MLX4_CLOCK_SIZE);
+
+        if (!priv->clock_mapping)
+                return -ENOMEM;
+
+        return 0;
+}
+
+static void unmap_internal_clock(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        if (priv->clock_mapping)
+                iounmap(priv->clock_mapping);
+}
+
 static void mlx4_close_hca(struct mlx4_dev *dev)
 {
+        unmap_internal_clock(dev);
         unmap_bf_area(dev);
         if (mlx4_is_slave(dev))
                 mlx4_slave_exit(dev);
@@ -1445,6 +1492,37 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
                         mlx4_err(dev, "INIT_HCA command failed, aborting.\n");
                         goto err_free_icm;
                 }
+                /*
+                 * If TS is supported by FW
+                 * read HCA frequency by QUERY_HCA command
+                 */
+                if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) {
+                        memset(&init_hca, 0, sizeof(init_hca));
+                        err = mlx4_QUERY_HCA(dev, &init_hca);
+                        if (err) {
+                                mlx4_err(dev, "QUERY_HCA command failed, disable timestamp.\n");
+                                dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+                        } else {
+                                dev->caps.hca_core_clock =
+                                        init_hca.hca_core_clock;
+                        }
+
+                        /* In case we got HCA frequency 0 - disable timestamping
+                         * to avoid dividing by zero
+                         */
+                        if (!dev->caps.hca_core_clock) {
+                                dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+                                mlx4_err(dev,
+                                         "HCA frequency is 0. Timestamping is not supported.");
+                        } else if (map_internal_clock(dev)) {
+                                /*
+                                 * Map internal clock,
+                                 * in case of failure disable timestamping
+                                 */
+                                dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+                                mlx4_err(dev, "Failed to map internal clock. Timestamping is not supported.\n");
+                        }
+                }
         } else {
                 err = mlx4_init_slave(dev);
                 if (err) {
@@ -1478,6 +1556,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
         return 0;
 
 unmap_bf:
+        unmap_internal_clock(dev);
         unmap_bf_area(dev);
 
 err_close:
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 52685524708d..ffc78d2cb0cf 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -1125,28 +1125,11 @@ static int mlx4_QP_ATTACH(struct mlx4_dev *dev, struct mlx4_qp *qp,
         return err;
 }
 
-int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          u8 port, int block_mcast_loopback,
-                          enum mlx4_protocol prot, u64 *reg_id)
+int mlx4_trans_to_dmfs_attach(struct mlx4_dev *dev, struct mlx4_qp *qp,
+                              u8 gid[16], u8 port,
+                              int block_mcast_loopback,
+                              enum mlx4_protocol prot, u64 *reg_id)
 {
-
-        switch (dev->caps.steering_mode) {
-        case MLX4_STEERING_MODE_A0:
-                if (prot == MLX4_PROT_ETH)
-                        return 0;
-
-        case MLX4_STEERING_MODE_B0:
-                if (prot == MLX4_PROT_ETH)
-                        gid[7] |= (MLX4_MC_STEER << 1);
-
-                if (mlx4_is_mfunc(dev))
-                        return mlx4_QP_ATTACH(dev, qp, gid, 1,
-                                              block_mcast_loopback, prot);
-                return mlx4_qp_attach_common(dev, qp, gid,
-                                             block_mcast_loopback, prot,
-                                             MLX4_MC_STEER);
-
-        case MLX4_STEERING_MODE_DEVICE_MANAGED: {
                 struct mlx4_spec_list spec = { {NULL} };
                 __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
 
@@ -1180,8 +1163,32 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                 list_add_tail(&spec.list, &rule.list);
 
                 return mlx4_flow_attach(dev, &rule, reg_id);
-        }
+}
 
+int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          u8 port, int block_mcast_loopback,
+                          enum mlx4_protocol prot, u64 *reg_id)
+{
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_A0:
+                if (prot == MLX4_PROT_ETH)
+                        return 0;
+
+        case MLX4_STEERING_MODE_B0:
+                if (prot == MLX4_PROT_ETH)
+                        gid[7] |= (MLX4_MC_STEER << 1);
+
+                if (mlx4_is_mfunc(dev))
+                        return mlx4_QP_ATTACH(dev, qp, gid, 1,
+                                              block_mcast_loopback, prot);
+                return mlx4_qp_attach_common(dev, qp, gid,
+                                             block_mcast_loopback, prot,
+                                             MLX4_MC_STEER);
+
+        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                return mlx4_trans_to_dmfs_attach(dev, qp, gid, port,
+                                                 block_mcast_loopback,
+                                                 prot, reg_id);
         default:
                 return -EINVAL;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index d738454116a0..eac3dae10efe 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -87,7 +87,8 @@ enum {
         MLX4_HCR_SIZE           = 0x0001c,
         MLX4_CLR_INT_SIZE       = 0x00008,
         MLX4_SLAVE_COMM_BASE    = 0x0,
-        MLX4_COMM_PAGESIZE      = 0x1000
+        MLX4_COMM_PAGESIZE      = 0x1000,
+        MLX4_CLOCK_SIZE         = 0x00008
 };
 
 enum {
@@ -403,6 +404,7 @@ struct mlx4_fw {
         u64                     clr_int_base;
         u64                     catas_offset;
         u64                     comm_base;
+        u64                     clock_offset;
         struct mlx4_icm        *fw_icm;
         struct mlx4_icm        *aux_icm;
         u32                     catas_size;
@@ -410,6 +412,7 @@ struct mlx4_fw {
         u8                      clr_int_bar;
         u8                      catas_bar;
         u8                      comm_bar;
+        u8                      clock_bar;
 };
 
 struct mlx4_comm {
@@ -470,6 +473,30 @@ struct mlx4_slave_state {
         enum slave_port_state port_state[MLX4_MAX_PORTS + 1];
 };
 
+#define MLX4_VGT 4095
+#define NO_INDX  (-1)
+
+struct mlx4_vport_state {
+        u64 mac;
+        u16 default_vlan;
+        u8  default_qos;
+        u32 tx_rate;
+        bool spoofchk;
+};
+
+struct mlx4_vf_admin_state {
+        struct mlx4_vport_state vport[MLX4_MAX_PORTS + 1];
+};
+
+struct mlx4_vport_oper_state {
+        struct mlx4_vport_state state;
+        int mac_idx;
+        int vlan_idx;
+};
+struct mlx4_vf_oper_state {
+        struct mlx4_vport_oper_state vport[MLX4_MAX_PORTS + 1];
+};
+
 struct slave_list {
         struct mutex mutex;
         struct list_head res_list[MLX4_NUM_OF_RESOURCE_TYPE];
@@ -500,6 +527,8 @@ struct mlx4_master_qp0_state {
 
 struct mlx4_mfunc_master_ctx {
         struct mlx4_slave_state *slave_state;
+        struct mlx4_vf_admin_state *vf_admin;
+        struct mlx4_vf_oper_state *vf_oper;
         struct mlx4_master_qp0_state qp0_state[MLX4_MAX_PORTS + 1];
         int                     init_port_ref[MLX4_MAX_PORTS + 1];
         u16                     max_mtu[MLX4_MAX_PORTS + 1];
@@ -826,6 +855,7 @@ struct mlx4_priv {
         struct list_head        bf_list;
         struct mutex            bf_mutex;
         struct io_mapping       *bf_mapping;
+        void __iomem            *clock_mapping;
         int                     reserved_mtts;
         int                     fs_hash_mode;
         u8 virt2phys_pkey[MLX4_MFUNC_MAX][MLX4_MAX_PORTS][MLX4_MAX_PORT_PKEYS];
@@ -1127,6 +1157,8 @@ int mlx4_change_port_types(struct mlx4_dev *dev,
 
 void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table);
 void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);
+void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index);
+int __mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
 
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port, int pkey_tbl_sz);
 /* resource tracker functions*/
@@ -1190,6 +1222,10 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                           int block_mcast_loopback, enum mlx4_protocol prot,
                           enum mlx4_steer_type steer);
+int mlx4_trans_to_dmfs_attach(struct mlx4_dev *dev, struct mlx4_qp *qp,
+                              u8 gid[16], u8 port,
+                              int block_mcast_loopback,
+                              enum mlx4_protocol prot, u64 *reg_id);
 int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave,
                                 struct mlx4_vhcr *vhcr,
                                 struct mlx4_cmd_mailbox *inbox,
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index f710b7ce0dcb..b1d7657b2bf5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -40,6 +40,7 @@
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
+#include <linux/net_tstamp.h>
 #ifdef CONFIG_MLX4_EN_DCB
 #include <linux/dcbnl.h>
 #endif
@@ -77,6 +78,7 @@
 #define STAMP_SHIFT             31
 #define STAMP_VAL               0x7fffffff
 #define STATS_DELAY             (HZ / 4)
+#define SERVICE_TASK_DELAY      (HZ / 4)
 #define MAX_NUM_OF_FS_RULES     256
 
 #define MLX4_EN_FILTER_HASH_SHIFT 4
@@ -207,6 +209,7 @@ struct mlx4_en_tx_info {
         u8 linear;
         u8 data_offset;
         u8 inl;
+        u8 ts_requested;
 };
 
 
@@ -262,6 +265,7 @@ struct mlx4_en_tx_ring {
         struct mlx4_bf bf;
         bool bf_enabled;
         struct netdev_queue *tx_queue;
+        int hwtstamp_tx_type;
 };
 
 struct mlx4_en_rx_desc {
@@ -288,6 +292,7 @@ struct mlx4_en_rx_ring {
         unsigned long packets;
         unsigned long csum_ok;
         unsigned long csum_none;
+        int hwtstamp_rx_filter;
 };
 
 struct mlx4_en_cq {
@@ -348,6 +353,10 @@ struct mlx4_en_dev {
         u32                     priv_pdn;
         spinlock_t              uar_lock;
         u8                      mac_removed[MLX4_MAX_PORTS + 1];
+        struct cyclecounter     cycles;
+        struct timecounter      clock;
+        unsigned long           last_overflow_check;
+        unsigned long           overflow_period;
 };
 
 
@@ -512,6 +521,7 @@ struct mlx4_en_priv {
         struct work_struct watchdog_task;
         struct work_struct linkstate_task;
         struct delayed_work stats_task;
+        struct delayed_work service_task;
         struct mlx4_en_perf_stats pstats;
         struct mlx4_en_pkt_stats pkstats;
         struct mlx4_en_port_stats port_stats;
@@ -525,6 +535,7 @@ struct mlx4_en_priv {
         struct device *ddev;
         int base_tx_qpn;
         struct hlist_head mac_hash[MLX4_EN_MAC_HASH_SIZE];
+        struct hwtstamp_config hwtstamp_config;
 
 #ifdef CONFIG_MLX4_EN_DCB
         struct ieee_ets ets;
@@ -624,6 +635,7 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port);
 
 #ifdef CONFIG_MLX4_EN_DCB
 extern const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops;
+extern const struct dcbnl_rtnl_ops mlx4_en_dcbnl_pfc_ops;
 #endif
 
 int mlx4_en_setup_tc(struct net_device *dev, u8 up);
@@ -636,9 +648,21 @@ void mlx4_en_cleanup_filters(struct mlx4_en_priv *priv,
 #define MLX4_EN_NUM_SELF_TEST   5
 void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf);
 u64 mlx4_en_mac_to_u64(u8 *addr);
+void mlx4_en_ptp_overflow_check(struct mlx4_en_dev *mdev);
 
 /*
- * Globals
+ * Functions for time stamping
+ */
+u64 mlx4_en_get_cqe_ts(struct mlx4_cqe *cqe);
+void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev,
+                            struct skb_shared_hwtstamps *hwts,
+                            u64 timestamp);
+void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev);
+int mlx4_en_timestamp_config(struct net_device *dev,
+                             int tx_type,
+                             int rx_filter);
+
+/* Globals
  */
 extern const struct ethtool_ops mlx4_en_ethtool_ops;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 10c57c86388b..946e0af5faef 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -32,6 +32,7 @@
 
 #include <linux/errno.h>
 #include <linux/if_ether.h>
+#include <linux/if_vlan.h>
 #include <linux/export.h>
 
 #include <linux/mlx4/cmd.h>
@@ -140,8 +141,9 @@ int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac)
                 }
 
                 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
-                        /* MAC already registered, Must not have duplicates */
-                        err = -EEXIST;
+                        /* MAC already registered, increment ref count */
+                        err = i;
+                        ++table->refs[i];
                         goto out;
                 }
         }
@@ -164,7 +166,7 @@ int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac)
                 table->entries[free] = 0;
                 goto out;
         }
-
+        table->refs[free] = 1;
         err = free;
         ++table->total;
 out:
@@ -205,12 +207,16 @@ void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)
         struct mlx4_mac_table *table = &info->mac_table;
         int index;
 
-        index = find_index(dev, table, mac);
-
         mutex_lock(&table->mutex);
+        index = find_index(dev, table, mac);
 
         if (validate_index(dev, table, index))
                 goto out;
+        if (--table->refs[index]) {
+                mlx4_dbg(dev, "Have more references for index %d,"
+                         "no need to modify mac table\n", index);
+                goto out;
+        }
 
         table->entries[index] = 0;
         mlx4_set_port_mac_table(dev, port, table->entries);
@@ -304,7 +310,7 @@ int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx)
 }
 EXPORT_SYMBOL_GPL(mlx4_find_cached_vlan);
 
-static int __mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan,
+int __mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan,
                                 int *index)
 {
         struct mlx4_vlan_table *table = &mlx4_priv(dev)->port[port].vlan_table;
@@ -378,7 +384,7 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
 }
 EXPORT_SYMBOL_GPL(mlx4_register_vlan);
 
-static void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)
+void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)
 {
         struct mlx4_vlan_table *table = &mlx4_priv(dev)->port[port].vlan_table;
 
@@ -517,7 +523,8 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
                         /* Mtu is configured as the max MTU among all the
                          * the functions on the port. */
                         mtu = be16_to_cpu(gen_context->mtu);
-                        mtu = min_t(int, mtu, dev->caps.eth_mtu_cap[port]);
+                        mtu = min_t(int, mtu, dev->caps.eth_mtu_cap[port] +
+                                    ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
                         prev_mtu = slave_st->mtu[port];
                         slave_st->mtu[port] = mtu;
                         if (mtu > master->max_mtu[port])
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 1391b52f443a..e12e0d2e0ee0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -75,6 +75,7 @@ struct res_gid {
         u8                      gid[16];
         enum mlx4_protocol      prot;
         enum mlx4_steer_type    steer;
+        u64                     reg_id;
 };
 
 enum res_qp_states {
@@ -352,6 +353,47 @@ static void update_gid(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *inbox,
         }
 }
 
+static int update_vport_qp_param(struct mlx4_dev *dev,
+                                 struct mlx4_cmd_mailbox *inbox,
+                                 u8 slave)
+{
+        struct mlx4_qp_context  *qpc = inbox->buf + 8;
+        struct mlx4_vport_oper_state *vp_oper;
+        struct mlx4_priv *priv;
+        u32 qp_type;
+        int port;
+
+        port = (qpc->pri_path.sched_queue & 0x40) ? 2 : 1;
+        priv = mlx4_priv(dev);
+        vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+
+        if (MLX4_VGT != vp_oper->state.default_vlan) {
+                qp_type = (be32_to_cpu(qpc->flags) >> 16) & 0xff;
+                if (MLX4_QP_ST_RC == qp_type)
+                        return -EINVAL;
+
+                qpc->pri_path.vlan_index = vp_oper->vlan_idx;
+                qpc->pri_path.fl = (1 << 6) | (1 << 2); /* set cv bit and hide_cqe_vlan bit*/
+                qpc->pri_path.feup |= 1 << 3; /* set fvl bit */
+                qpc->pri_path.sched_queue &= 0xC7;
+                qpc->pri_path.sched_queue |= (vp_oper->state.default_qos) << 3;
+                mlx4_dbg(dev, "qp %d  port %d Q 0x%x set vlan to %d vidx %d feup %x fl %x\n",
+                         be32_to_cpu(qpc->local_qpn) & 0xffffff, port,
+                         (int)(qpc->pri_path.sched_queue), vp_oper->state.default_vlan,
+                         vp_oper->vlan_idx, (int)(qpc->pri_path.feup),
+                         (int)(qpc->pri_path.fl));
+        }
+        if (vp_oper->state.spoofchk) {
+                qpc->pri_path.feup |= 1 << 5; /* set fsm bit */;
+                qpc->pri_path.grh_mylmc = (0x80 & qpc->pri_path.grh_mylmc) + vp_oper->mac_idx;
+                mlx4_dbg(dev, "spoof qp %d  port %d feup  0x%x, myLmc 0x%x mindx %d\n",
+                         be32_to_cpu(qpc->local_qpn) & 0xffffff, port,
+                         (int)qpc->pri_path.feup, (int)qpc->pri_path.grh_mylmc,
+                         vp_oper->mac_idx);
+        }
+        return 0;
+}
+
 static int mpt_mask(struct mlx4_dev *dev)
 {
         return dev->caps.num_mpts - 1;
@@ -2797,6 +2839,9 @@ int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,
         update_pkey_index(dev, slave, inbox);
         update_gid(dev, inbox, (u8)slave);
         adjust_proxy_tun_qkey(dev, vhcr, qpc);
+        err = update_vport_qp_param(dev, inbox, slave);
+        if (err)
+                return err;
 
         return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
 }
@@ -2934,7 +2979,7 @@ static struct res_gid *find_gid(struct mlx4_dev *dev, int slave,
 
 static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
                        u8 *gid, enum mlx4_protocol prot,
-                       enum mlx4_steer_type steer)
+                       enum mlx4_steer_type steer, u64 reg_id)
 {
         struct res_gid *res;
         int err;
@@ -2951,6 +2996,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
                 memcpy(res->gid, gid, 16);
                 res->prot = prot;
                 res->steer = steer;
+                res->reg_id = reg_id;
                 list_add_tail(&res->list, &rqp->mcg_list);
                 err = 0;
         }
@@ -2961,7 +3007,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 
 static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
                        u8 *gid, enum mlx4_protocol prot,
-                       enum mlx4_steer_type steer)
+                       enum mlx4_steer_type steer, u64 *reg_id)
 {
         struct res_gid *res;
         int err;
@@ -2971,6 +3017,7 @@ static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
         if (!res || res->prot != prot || res->steer != steer)
                 err = -EINVAL;
         else {
+                *reg_id = res->reg_id;
                 list_del(&res->list);
                 kfree(res);
                 err = 0;
@@ -2980,6 +3027,37 @@ static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
         return err;
 }
 
+static int qp_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                     int block_loopback, enum mlx4_protocol prot,
+                     enum mlx4_steer_type type, u64 *reg_id)
+{
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                return mlx4_trans_to_dmfs_attach(dev, qp, gid, gid[5],
+                                                block_loopback, prot,
+                                                reg_id);
+        case MLX4_STEERING_MODE_B0:
+                return mlx4_qp_attach_common(dev, qp, gid,
+                                            block_loopback, prot, type);
+        default:
+                return -EINVAL;
+        }
+}
+
+static int qp_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                     enum mlx4_protocol prot, enum mlx4_steer_type type,
+                     u64 reg_id)
+{
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                return mlx4_flow_detach(dev, reg_id);
+        case MLX4_STEERING_MODE_B0:
+                return mlx4_qp_detach_common(dev, qp, gid, prot, type);
+        default:
+                return -EINVAL;
+        }
+}
+
 int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
                                struct mlx4_vhcr *vhcr,
                                struct mlx4_cmd_mailbox *inbox,
@@ -2992,14 +3070,12 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
         int err;
         int qpn;
         struct res_qp *rqp;
+        u64 reg_id = 0;
         int attach = vhcr->op_modifier;
         int block_loopback = vhcr->in_modifier >> 31;
         u8 steer_type_mask = 2;
         enum mlx4_steer_type type = (gid[7] & steer_type_mask) >> 1;
 
-        if (dev->caps.steering_mode != MLX4_STEERING_MODE_B0)
-                return -EINVAL;
-
         qpn = vhcr->in_modifier & 0xffffff;
         err = get_res(dev, slave, qpn, RES_QP, &rqp);
         if (err)
@@ -3007,30 +3083,32 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 
         qp.qpn = qpn;
         if (attach) {
-                err = add_mcg_res(dev, slave, rqp, gid, prot, type);
-                if (err)
+                err = qp_attach(dev, &qp, gid, block_loopback, prot,
+                                type, &reg_id);
+                if (err) {
+                        pr_err("Fail to attach rule to qp 0x%x\n", qpn);
                         goto ex_put;
-
-                err = mlx4_qp_attach_common(dev, &qp, gid,
-                                            block_loopback, prot, type);
+                }
+                err = add_mcg_res(dev, slave, rqp, gid, prot, type, reg_id);
                 if (err)
-                        goto ex_rem;
+                        goto ex_detach;
         } else {
-                err = rem_mcg_res(dev, slave, rqp, gid, prot, type);
+                err = rem_mcg_res(dev, slave, rqp, gid, prot, type, &reg_id);
                 if (err)
                         goto ex_put;
-                err = mlx4_qp_detach_common(dev, &qp, gid, prot, type);
-        }
 
+                err = qp_detach(dev, &qp, gid, prot, type, reg_id);
+                if (err)
+                        pr_err("Fail to detach rule from qp 0x%x reg_id = 0x%llx\n",
+                               qpn, reg_id);
+        }
         put_res(dev, slave, qpn, RES_QP);
-        return 0;
+        return err;
 
-ex_rem:
-        /* ignore error return below, already in error */
-        (void) rem_mcg_res(dev, slave, rqp, gid, prot, type);
+ex_detach:
+        qp_detach(dev, &qp, gid, prot, type, reg_id);
 ex_put:
         put_res(dev, slave, qpn, RES_QP);
-
         return err;
 }
 
@@ -3266,9 +3344,16 @@ static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp)
         struct mlx4_qp qp; /* dummy for calling attach/detach */
 
         list_for_each_entry_safe(rgid, tmp, &rqp->mcg_list, list) {
-                qp.qpn = rqp->local_qpn;
-                (void) mlx4_qp_detach_common(dev, &qp, rgid->gid, rgid->prot,
-                                             rgid->steer);
+                switch (dev->caps.steering_mode) {
+                case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                        mlx4_flow_detach(dev, rgid->reg_id);
+                        break;
+                case MLX4_STEERING_MODE_B0:
+                        qp.qpn = rqp->local_qpn;
+                        (void) mlx4_qp_detach_common(dev, &qp, rgid->gid,
+                                                     rgid->prot, rgid->steer);
+                        break;
+                }
                 list_del(&rgid->list);
                 kfree(rgid);
         }
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c
index 07a6ebc47c92..b6c60fdef4ff 100644
--- a/drivers/net/ethernet/micrel/ks8695net.c
+++ b/drivers/net/ethernet/micrel/ks8695net.c
@@ -1622,25 +1622,7 @@ static struct platform_driver ks8695_driver = {
         .resume         = ks8695_drv_resume,
 };
 
-/* Module interface */
-
-static int __init
-ks8695_init(void)
-{
-        printk(KERN_INFO "%s Ethernet driver, V%s\n",
-               MODULENAME, MODULEVERSION);
-
-        return platform_driver_register(&ks8695_driver);
-}
-
-static void __exit
-ks8695_cleanup(void)
-{
-        platform_driver_unregister(&ks8695_driver);
-}
-
-module_init(ks8695_init);
-module_exit(ks8695_cleanup);
+module_platform_driver(ks8695_driver);
 
 MODULE_AUTHOR("Simtec Electronics");
 MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver");
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 8fb481252e2c..727b546a9eb8 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1364,37 +1364,37 @@ static int ks8851_read_selftest(struct ks8851_net *ks)
 
 /* driver bus management functions */
 
-#ifdef CONFIG_PM
-static int ks8851_suspend(struct spi_device *spi, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+
+static int ks8851_suspend(struct device *dev)
 {
-        struct ks8851_net *ks = dev_get_drvdata(&spi->dev);
-        struct net_device *dev = ks->netdev;
+        struct ks8851_net *ks = dev_get_drvdata(dev);
+        struct net_device *netdev = ks->netdev;
 
-        if (netif_running(dev)) {
-                netif_device_detach(dev);
-                ks8851_net_stop(dev);
+        if (netif_running(netdev)) {
+                netif_device_detach(netdev);
+                ks8851_net_stop(netdev);
         }
 
         return 0;
 }
 
-static int ks8851_resume(struct spi_device *spi)
+static int ks8851_resume(struct device *dev)
 {
-        struct ks8851_net *ks = dev_get_drvdata(&spi->dev);
-        struct net_device *dev = ks->netdev;
+        struct ks8851_net *ks = dev_get_drvdata(dev);
+        struct net_device *netdev = ks->netdev;
 
-        if (netif_running(dev)) {
-                ks8851_net_open(dev);
-                netif_device_attach(dev);
+        if (netif_running(netdev)) {
+                ks8851_net_open(netdev);
+                netif_device_attach(netdev);
         }
 
         return 0;
 }
-#else
-#define ks8851_suspend NULL
-#define ks8851_resume NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume);
+
 static int ks8851_probe(struct spi_device *spi)
 {
         struct net_device *ndev;
@@ -1456,7 +1456,7 @@ static int ks8851_probe(struct spi_device *spi)
         SET_ETHTOOL_OPS(ndev, &ks8851_ethtool_ops);
         SET_NETDEV_DEV(ndev, &spi->dev);
 
-        dev_set_drvdata(&spi->dev, ks);
+        spi_set_drvdata(spi, ks);
 
         ndev->if_port = IF_PORT_100BASET;
         ndev->netdev_ops = &ks8851_netdev_ops;
@@ -1516,7 +1516,7 @@ err_irq:
 
 static int ks8851_remove(struct spi_device *spi)
 {
-        struct ks8851_net *priv = dev_get_drvdata(&spi->dev);
+        struct ks8851_net *priv = spi_get_drvdata(spi);
 
         if (netif_msg_drv(priv))
                 dev_info(&spi->dev, "remove\n");
@@ -1532,25 +1532,12 @@ static struct spi_driver ks8851_driver = {
         .driver = {
                 .name = "ks8851",
                 .owner = THIS_MODULE,
+                .pm = &ks8851_pm_ops,
         },
         .probe = ks8851_probe,
         .remove = ks8851_remove,
-        .suspend = ks8851_suspend,
-        .resume = ks8851_resume,
 };
-
-static int __init ks8851_init(void)
-{
-        return spi_register_driver(&ks8851_driver);
-}
-
-static void __exit ks8851_exit(void)
-{
-        spi_unregister_driver(&ks8851_driver);
-}
-
-module_init(ks8851_init);
-module_exit(ks8851_exit);
+module_spi_driver(ks8851_driver);
 
 MODULE_DESCRIPTION("KS8851 Network driver");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index a343066f7b43..ddaf138ce0d4 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -792,20 +792,35 @@ static void ks_rcv(struct ks_net *ks, struct net_device *netdev)
 
         frame_hdr = ks->frame_head_info;
         while (ks->frame_cnt--) {
+                if (unlikely(!(frame_hdr->sts & RXFSHR_RXFV) ||
+                             frame_hdr->len >= RX_BUF_SIZE ||
+                             frame_hdr->len <= 0)) {
+
+                        /* discard an invalid packet */
+                        ks_wrreg16(ks, KS_RXQCR, (ks->rc_rxqcr | RXQCR_RRXEF));
+                        netdev->stats.rx_dropped++;
+                        if (!(frame_hdr->sts & RXFSHR_RXFV))
+                                netdev->stats.rx_frame_errors++;
+                        else
+                                netdev->stats.rx_length_errors++;
+                        frame_hdr++;
+                        continue;
+                }
+
                 skb = netdev_alloc_skb(netdev, frame_hdr->len + 16);
-                if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) &&
-                        (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) {
+                if (likely(skb)) {
                         skb_reserve(skb, 2);
                         /* read data block including CRC 4 bytes */
                         ks_read_qmu(ks, (u16 *)skb->data, frame_hdr->len);
-                        skb_put(skb, frame_hdr->len);
+                        skb_put(skb, frame_hdr->len - 4);
                         skb->protocol = eth_type_trans(skb, netdev);
                         netif_rx(skb);
+                        /* exclude CRC size */
+                        netdev->stats.rx_bytes += frame_hdr->len - 4;
+                        netdev->stats.rx_packets++;
                 } else {
-                        pr_err("%s: err:skb alloc\n", __func__);
                         ks_wrreg16(ks, KS_RXQCR, (ks->rc_rxqcr | RXQCR_RRXEF));
-                        if (skb)
-                                dev_kfree_skb_irq(skb);
+                        netdev->stats.rx_dropped++;
                 }
                 frame_hdr++;
         }
@@ -877,6 +892,8 @@ static irqreturn_t ks_irq(int irq, void *pw)
                 ks_wrreg16(ks, KS_PMECR, pmecr | PMECR_WKEVT_LINK);
         }
 
+        if (unlikely(status & IRQ_RXOI))
+                ks->netdev->stats.rx_over_errors++;
         /* this should be the last in IRQ handler*/
         ks_restore_cmd_reg(ks);
         return IRQ_HANDLED;
@@ -1015,6 +1032,9 @@ static int ks_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
         if (likely(ks_tx_fifo_space(ks) >= skb->len + 12)) {
                 ks_write_qmu(ks, skb->data, skb->len);
+                /* add tx statistics */
+                netdev->stats.tx_bytes += skb->len;
+                netdev->stats.tx_packets++;
                 dev_kfree_skb(skb);
         } else
                 retv = NETDEV_TX_BUSY;
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 5d98a9f7bfc7..c7b40aa21f22 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -1566,7 +1566,7 @@ static int enc28j60_probe(struct spi_device *spi)
         INIT_WORK(&priv->setrx_work, enc28j60_setrx_work_handler);
         INIT_WORK(&priv->irq_work, enc28j60_irq_work_handler);
         INIT_WORK(&priv->restart_work, enc28j60_restart_work_handler);
-        dev_set_drvdata(&spi->dev, priv);       /* spi to priv reference */
+        spi_set_drvdata(spi, priv);     /* spi to priv reference */
         SET_NETDEV_DEV(dev, &spi->dev);
 
         if (!enc28j60_chipset_init(dev)) {
@@ -1618,7 +1618,7 @@ error_alloc:
 
 static int enc28j60_remove(struct spi_device *spi)
 {
-        struct enc28j60_net *priv = dev_get_drvdata(&spi->dev);
+        struct enc28j60_net *priv = spi_get_drvdata(spi);
 
         if (netif_msg_drv(priv))
                 printk(KERN_DEBUG DRV_NAME ": remove\n");
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 4f9937e026e5..7be9788ed0f6 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -1281,7 +1281,8 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb)
         va = addr;
         va += MXGEFW_PAD;
         veh = (struct vlan_ethhdr *)va;
-        if ((dev->features & NETIF_F_HW_VLAN_RX) == NETIF_F_HW_VLAN_RX &&
+        if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) ==
+            NETIF_F_HW_VLAN_CTAG_RX &&
             veh->h_vlan_proto == htons(ETH_P_8021Q)) {
                 /* fixup csum if needed */
                 if (skb->ip_summed == CHECKSUM_COMPLETE) {
@@ -1289,7 +1290,7 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb)
                         skb->csum = csum_sub(skb->csum, vsum);
                 }
                 /* pop tag */
-                __vlan_hwaccel_put_tag(skb, ntohs(veh->h_vlan_TCI));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(veh->h_vlan_TCI));
                 memmove(va + VLAN_HLEN, va, 2 * ETH_ALEN);
                 skb->len -= VLAN_HLEN;
                 skb->data_len -= VLAN_HLEN;
@@ -3592,10 +3593,9 @@ static int myri10ge_alloc_slices(struct myri10ge_priv *mgp)
                 bytes = mgp->max_intr_slots * sizeof(*ss->rx_done.entry);
                 ss->rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes,
                                                        &ss->rx_done.bus,
-                                                       GFP_KERNEL);
+                                                       GFP_KERNEL | __GFP_ZERO);
                 if (ss->rx_done.entry == NULL)
                         goto abort;
-                memset(ss->rx_done.entry, 0, bytes);
                 bytes = sizeof(*ss->fw_stats);
                 ss->fw_stats = dma_alloc_coherent(&pdev->dev, bytes,
                                                   &ss->fw_stats_bus,
@@ -3888,8 +3888,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->mtu = myri10ge_initial_mtu;
         netdev->hw_features = mgp->features | NETIF_F_RXCSUM;
 
-        /* fake NETIF_F_HW_VLAN_RX for good GRO performance */
-        netdev->hw_features |= NETIF_F_HW_VLAN_RX;
+        /* fake NETIF_F_HW_VLAN_CTAG_RX for good GRO performance */
+        netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
 
         netdev->features = netdev->hw_features;
 
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index b0b361546365..c20766c2f65b 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -175,13 +175,13 @@ static int sonic_probe1(struct net_device *dev)
 
         /* Allocate the entire chunk of memory for the descriptors.
            Note that this cannot cross a 64K boundary. */
-        if ((lp->descriptors = dma_alloc_coherent(lp->device,
-                                SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
-                                &lp->descriptors_laddr, GFP_KERNEL)) == NULL) {
-                printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n",
-                       dev_name(lp->device));
+        lp->descriptors = dma_alloc_coherent(lp->device,
+                                             SIZEOF_SONIC_DESC *
+                                             SONIC_BUS_SCALE(lp->dma_bitmode),
+                                             &lp->descriptors_laddr,
+                                             GFP_KERNEL);
+        if (lp->descriptors == NULL)
                 goto out;
-        }
 
         /* Now set up the pointers to point to the appropriate places */
         lp->cda = lp->descriptors;
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 0ffde69c8d01..346a4e025c34 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -202,13 +202,13 @@ static int macsonic_init(struct net_device *dev)
 
         /* Allocate the entire chunk of memory for the descriptors.
            Note that this cannot cross a 64K boundary. */
-        if ((lp->descriptors = dma_alloc_coherent(lp->device,
-                    SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
-                    &lp->descriptors_laddr, GFP_KERNEL)) == NULL) {
-                printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n",
-                       dev_name(lp->device));
+        lp->descriptors = dma_alloc_coherent(lp->device,
+                                             SIZEOF_SONIC_DESC *
+                                             SONIC_BUS_SCALE(lp->dma_bitmode),
+                                             &lp->descriptors_laddr,
+                                             GFP_KERNEL);
+        if (lp->descriptors == NULL)
                 return -ENOMEM;
-        }
 
         /* Now set up the pointers to point to the appropriate places */
         lp->cda = lp->descriptors;
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index 77c070de621e..d3b47003a575 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -911,7 +911,7 @@ static void rx_irq(struct net_device *ndev)
                                 unsigned short tag;
 
                                 tag = ntohs(extsts & EXTSTS_VTG_MASK);
-                                __vlan_hwaccel_put_tag(skb, tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_IPV6), tag);
                         }
 #endif
                         rx_rc = netif_rx(skb);
@@ -2193,7 +2193,7 @@ static int ns83820_init_one(struct pci_dev *pci_dev,
 
 #ifdef NS83820_VLAN_ACCEL_SUPPORT
         /* We also support hardware vlan acceleration */
-        ndev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
 #endif
 
         if (using_dac) {
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
index 46795e403467..1bd419dbda6d 100644
--- a/drivers/net/ethernet/natsemi/sonic.c
+++ b/drivers/net/ethernet/natsemi/sonic.c
@@ -424,7 +424,6 @@ static void sonic_rx(struct net_device *dev)
                         /* Malloc up new buffer. */
                         new_skb = netdev_alloc_skb(dev, SONIC_RBSIZE + 2);
                         if (new_skb == NULL) {
-                                printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n", dev->name);
                                 lp->stats.rx_dropped++;
                                 break;
                         }
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index 5e4748e855f6..c2e0256fe3df 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -197,14 +197,12 @@ static int __init sonic_probe1(struct net_device *dev)
          *  We also allocate extra space for a pointer to allow freeing
          *  this structure later on (in xtsonic_cleanup_module()).
          */
-        lp->descriptors =
-                dma_alloc_coherent(lp->device,
-                        SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
-                        &lp->descriptors_laddr, GFP_KERNEL);
-
+        lp->descriptors = dma_alloc_coherent(lp->device,
+                                             SIZEOF_SONIC_DESC *
+                                             SONIC_BUS_SCALE(lp->dma_bitmode),
+                                             &lp->descriptors_laddr,
+                                             GFP_KERNEL);
         if (lp->descriptors == NULL) {
-                printk(KERN_ERR "%s: couldn't alloc DMA memory for "
-                                " descriptors.\n", dev_name(lp->device));
                 err = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index bfd887382e19..51b00941302c 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -80,6 +80,7 @@
 #include <linux/slab.h>
 #include <linux/prefetch.h>
 #include <net/tcp.h>
+#include <net/checksum.h>
 
 #include <asm/div64.h>
 #include <asm/irq.h>
@@ -7919,7 +7920,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 NETIF_F_TSO | NETIF_F_TSO6 |
                 NETIF_F_RXCSUM | NETIF_F_LRO;
         dev->features |= dev->hw_features |
-                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
         if (sp->device_type & XFRAME_II_DEVICE) {
                 dev->hw_features |= NETIF_F_UFO;
                 if (ufo)
@@ -8337,16 +8338,13 @@ static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)
 {
         struct iphdr *ip = lro->iph;
         struct tcphdr *tcp = lro->tcph;
-        __sum16 nchk;
         struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
 
         DBG_PRINT(INFO_DBG, "%s: Been here...\n", __func__);
 
         /* Update L3 header */
+        csum_replace2(&ip->check, ip->tot_len, htons(lro->total_len));
         ip->tot_len = htons(lro->total_len);
-        ip->check = 0;
-        nchk = ip_fast_csum((u8 *)lro->iph, ip->ihl);
-        ip->check = nchk;
 
         /* Update L4 header */
         tcp->ack_seq = lro->tcp_ack;
@@ -8557,7 +8555,7 @@ static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag)
 
         skb->protocol = eth_type_trans(skb, dev);
         if (vlan_tag && sp->vlan_strip_flag)
-                __vlan_hwaccel_put_tag(skb, vlan_tag);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
         if (sp->config.napi)
                 netif_receive_skb(skb);
         else
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 794444e09492..cbfaed5f2f8d 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -312,7 +312,7 @@ vxge_rx_complete(struct vxge_ring *ring, struct sk_buff *skb, u16 vlan,
 
         if (ext_info->vlan &&
             ring->vlan_tag_strip == VXGE_HW_VPATH_RPA_STRIP_VLAN_TAG_ENABLE)
-                __vlan_hwaccel_put_tag(skb, ext_info->vlan);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ext_info->vlan);
         napi_gro_receive(ring->napi_p, skb);
 
         vxge_debug_entryexit(VXGE_TRACE,
@@ -3300,12 +3300,13 @@ static void vxge_tx_watchdog(struct net_device *dev)
 /**
  * vxge_vlan_rx_add_vid
  * @dev: net device pointer.
+ * @proto: vlan protocol
  * @vid: vid
  *
  * Add the vlan id to the devices vlan id table
  */
 static int
-vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+vxge_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct vxgedev *vdev = netdev_priv(dev);
         struct vxge_vpath *vpath;
@@ -3323,14 +3324,15 @@ vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 }
 
 /**
- * vxge_vlan_rx_add_vid
+ * vxge_vlan_rx_kill_vid
  * @dev: net device pointer.
+ * @proto: vlan protocol
  * @vid: vid
  *
  * Remove the vlan id from the device's vlan id table
  */
 static int
-vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+vxge_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct vxgedev *vdev = netdev_priv(dev);
         struct vxge_vpath *vpath;
@@ -3415,12 +3417,12 @@ static int vxge_device_register(struct __vxge_hw_device *hldev,
         ndev->hw_features = NETIF_F_RXCSUM | NETIF_F_SG |
                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                 NETIF_F_TSO | NETIF_F_TSO6 |
-                NETIF_F_HW_VLAN_TX;
+                NETIF_F_HW_VLAN_CTAG_TX;
         if (vdev->config.rth_steering != NO_STEERING)
                 ndev->hw_features |= NETIF_F_RXHASH;
 
         ndev->features |= ndev->hw_features |
-                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+                NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER;
 
 
         ndev->netdev_ops = &vxge_netdev_ops;
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 63e7af44366f..cb9e63831500 100644
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -152,8 +152,6 @@ static void netx_eth_receive(struct net_device *ndev)
 
         skb = netdev_alloc_skb(ndev, len);
         if (unlikely(skb == NULL)) {
-                printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
-                        ndev->name);
                 ndev->stats.rx_dropped++;
                 return;
         }
diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c
index 162da8975b05..3df8287b7452 100644
--- a/drivers/net/ethernet/nuvoton/w90p910_ether.c
+++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c
@@ -287,23 +287,16 @@ static int w90p910_init_desc(struct net_device *dev)
         ether = netdev_priv(dev);
         pdev = ether->pdev;
 
-        ether->tdesc = (struct tran_pdesc *)
-                dma_alloc_coherent(&pdev->dev, sizeof(struct tran_pdesc),
-                                        &ether->tdesc_phys, GFP_KERNEL);
-
-        if (!ether->tdesc) {
-                dev_err(&pdev->dev, "Failed to allocate memory for tx desc\n");
+        ether->tdesc = dma_alloc_coherent(&pdev->dev, sizeof(struct tran_pdesc),
+                                          &ether->tdesc_phys, GFP_KERNEL);
+        if (!ether->tdesc)
                 return -ENOMEM;
-        }
-
-        ether->rdesc = (struct recv_pdesc *)
-                dma_alloc_coherent(&pdev->dev, sizeof(struct recv_pdesc),
-                                        &ether->rdesc_phys, GFP_KERNEL);
 
+        ether->rdesc = dma_alloc_coherent(&pdev->dev, sizeof(struct recv_pdesc),
+                                          &ether->rdesc_phys, GFP_KERNEL);
         if (!ether->rdesc) {
-                dev_err(&pdev->dev, "Failed to allocate memory for rx desc\n");
                 dma_free_coherent(&pdev->dev, sizeof(struct tran_pdesc),
-                                        ether->tdesc, ether->tdesc_phys);
+                                  ether->tdesc, ether->tdesc_phys);
                 return -ENOMEM;
         }
 
@@ -737,7 +730,6 @@ static void netdev_rx(struct net_device *dev)
                         data = ether->rdesc->recv_buf[ether->cur_rx];
                         skb = netdev_alloc_skb(dev, length + 2);
                         if (!skb) {
-                                dev_err(&pdev->dev, "get skb buffer error\n");
                                 ether->stats.rx_dropped++;
                                 return;
                         }
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 0b8de12bcbca..b003fe53c8e2 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -2200,6 +2200,7 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct ring_desc *start_tx;
         struct ring_desc *prev_tx;
         struct nv_skb_map *prev_tx_ctx;
+        struct nv_skb_map *tmp_tx_ctx = NULL, *start_tx_ctx = NULL;
         unsigned long flags;
 
         /* add fragments to entries count */
@@ -2261,12 +2262,31 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 do {
                         prev_tx = put_tx;
                         prev_tx_ctx = np->put_tx_ctx;
+                        if (!start_tx_ctx)
+                                start_tx_ctx = tmp_tx_ctx = np->put_tx_ctx;
+
                         bcnt = (frag_size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : frag_size;
                         np->put_tx_ctx->dma = skb_frag_dma_map(
                                                         &np->pci_dev->dev,
                                                         frag, offset,
                                                         bcnt,
                                                         DMA_TO_DEVICE);
+                        if (dma_mapping_error(&np->pci_dev->dev, np->put_tx_ctx->dma)) {
+
+                                /* Unwind the mapped fragments */
+                                do {
+                                        nv_unmap_txskb(np, start_tx_ctx);
+                                        if (unlikely(tmp_tx_ctx++ == np->last_tx_ctx))
+                                                tmp_tx_ctx = np->first_tx_ctx;
+                                } while (tmp_tx_ctx != np->put_tx_ctx);
+                                kfree_skb(skb);
+                                np->put_tx_ctx = start_tx_ctx;
+                                u64_stats_update_begin(&np->swstats_tx_syncp);
+                                np->stat_tx_dropped++;
+                                u64_stats_update_end(&np->swstats_tx_syncp);
+                                return NETDEV_TX_OK;
+                        }
+
                         np->put_tx_ctx->dma_len = bcnt;
                         np->put_tx_ctx->dma_single = 0;
                         put_tx->buf = cpu_to_le32(np->put_tx_ctx->dma);
@@ -2327,7 +2347,8 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
         struct ring_desc_ex *start_tx;
         struct ring_desc_ex *prev_tx;
         struct nv_skb_map *prev_tx_ctx;
-        struct nv_skb_map *start_tx_ctx;
+        struct nv_skb_map *start_tx_ctx = NULL;
+        struct nv_skb_map *tmp_tx_ctx = NULL;
         unsigned long flags;
 
         /* add fragments to entries count */
@@ -2392,11 +2413,29 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
                         prev_tx = put_tx;
                         prev_tx_ctx = np->put_tx_ctx;
                         bcnt = (frag_size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : frag_size;
+                        if (!start_tx_ctx)
+                                start_tx_ctx = tmp_tx_ctx = np->put_tx_ctx;
                         np->put_tx_ctx->dma = skb_frag_dma_map(
                                                         &np->pci_dev->dev,
                                                         frag, offset,
                                                         bcnt,
                                                         DMA_TO_DEVICE);
+
+                        if (dma_mapping_error(&np->pci_dev->dev, np->put_tx_ctx->dma)) {
+
+                                /* Unwind the mapped fragments */
+                                do {
+                                        nv_unmap_txskb(np, start_tx_ctx);
+                                        if (unlikely(tmp_tx_ctx++ == np->last_tx_ctx))
+                                                tmp_tx_ctx = np->first_tx_ctx;
+                                } while (tmp_tx_ctx != np->put_tx_ctx);
+                                kfree_skb(skb);
+                                np->put_tx_ctx = start_tx_ctx;
+                                u64_stats_update_begin(&np->swstats_tx_syncp);
+                                np->stat_tx_dropped++;
+                                u64_stats_update_end(&np->swstats_tx_syncp);
+                                return NETDEV_TX_OK;
+                        }
                         np->put_tx_ctx->dma_len = bcnt;
                         np->put_tx_ctx->dma_single = 0;
                         put_tx->bufhigh = cpu_to_le32(dma_high(np->put_tx_ctx->dma));
@@ -2922,15 +2961,15 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
                         vlanflags = le32_to_cpu(np->get_rx.ex->buflow);
 
                         /*
-                         * There's need to check for NETIF_F_HW_VLAN_RX here.
-                         * Even if vlan rx accel is disabled,
+                         * There's need to check for NETIF_F_HW_VLAN_CTAG_RX
+                         * here. Even if vlan rx accel is disabled,
                          * NV_RX3_VLAN_TAG_PRESENT is pseudo randomly set.
                          */
-                        if (dev->features & NETIF_F_HW_VLAN_RX &&
+                        if (dev->features & NETIF_F_HW_VLAN_CTAG_RX &&
                             vlanflags & NV_RX3_VLAN_TAG_PRESENT) {
                                 u16 vid = vlanflags & NV_RX3_VLAN_TAG_MASK;
 
-                                __vlan_hwaccel_put_tag(skb, vid);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
                         }
                         napi_gro_receive(&np->napi, skb);
                         u64_stats_update_begin(&np->swstats_rx_syncp);
@@ -4777,7 +4816,7 @@ static netdev_features_t nv_fix_features(struct net_device *dev,
         netdev_features_t features)
 {
         /* vlan is dependent on rx checksum offload */
-        if (features & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))
+        if (features & (NETIF_F_HW_VLAN_CTAG_TX|NETIF_F_HW_VLAN_CTAG_RX))
                 features |= NETIF_F_RXCSUM;
 
         return features;
@@ -4789,12 +4828,12 @@ static void nv_vlan_mode(struct net_device *dev, netdev_features_t features)
 
         spin_lock_irq(&np->lock);
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 np->txrxctl_bits |= NVREG_TXRXCTL_VLANSTRIP;
         else
                 np->txrxctl_bits &= ~NVREG_TXRXCTL_VLANSTRIP;
 
-        if (features & NETIF_F_HW_VLAN_TX)
+        if (features & NETIF_F_HW_VLAN_CTAG_TX)
                 np->txrxctl_bits |= NVREG_TXRXCTL_VLANINS;
         else
                 np->txrxctl_bits &= ~NVREG_TXRXCTL_VLANINS;
@@ -4831,7 +4870,7 @@ static int nv_set_features(struct net_device *dev, netdev_features_t features)
                 spin_unlock_irq(&np->lock);
         }
 
-        if (changed & (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX))
+        if (changed & (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX))
                 nv_vlan_mode(dev, features);
 
         return 0;
@@ -5025,7 +5064,6 @@ static int nv_loopback_test(struct net_device *dev)
         pkt_len = ETH_DATA_LEN;
         tx_skb = netdev_alloc_skb(dev, pkt_len);
         if (!tx_skb) {
-                netdev_err(dev, "netdev_alloc_skb() failed during loopback test\n");
                 ret = 0;
                 goto out;
         }
@@ -5667,7 +5705,8 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
         np->vlanctl_bits = 0;
         if (id->driver_data & DEV_HAS_VLAN) {
                 np->vlanctl_bits = NVREG_VLANCONTROL_ENABLE;
-                dev->hw_features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
+                dev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX |
+                                    NETIF_F_HW_VLAN_CTAG_TX;
         }
 
         dev->features |= dev->hw_features;
@@ -5958,7 +5997,8 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
                  dev->features & NETIF_F_HIGHDMA ? "highdma " : "",
                  dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ?
                         "csum " : "",
-                 dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?
+                 dev->features & (NETIF_F_HW_VLAN_CTAG_RX |
+                                  NETIF_F_HW_VLAN_CTAG_TX) ?
                         "vlan " : "",
                  dev->features & (NETIF_F_LOOPBACK) ?
                         "loopback " : "",
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index efa29b712d5f..55a5548d6add 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1409,9 +1409,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
                         dma_alloc_coherent(&pldat->pdev->dev,
                                            pldat->dma_buff_size, &dma_handle,
                                            GFP_KERNEL);
-
                 if (pldat->dma_buff_base_v == NULL) {
-                        dev_err(&pdev->dev, "error getting DMA region.\n");
                         ret = -ENOMEM;
                         goto err_out_free_irq;
                 }
@@ -1434,13 +1432,11 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
         /* Get MAC address from current HW setting (POR state is all zeros) */
         __lpc_get_mac(pldat, ndev->dev_addr);
 
-#ifdef CONFIG_OF_NET
         if (!is_valid_ether_addr(ndev->dev_addr)) {
                 const char *macaddr = of_get_mac_address(pdev->dev.of_node);
                 if (macaddr)
                         memcpy(ndev->dev_addr, macaddr, ETH_ALEN);
         }
-#endif
         if (!is_valid_ether_addr(ndev->dev_addr))
                 eth_hw_addr_random(ndev);
 
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 73ce7dd6b954..0c1c65a9ce5e 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1469,13 +1469,11 @@ pch_gbe_alloc_rx_buffers_pool(struct pch_gbe_adapter *adapter,
 
         size = rx_ring->count * bufsz + PCH_GBE_RESERVE_MEMORY;
         rx_ring->rx_buff_pool = dma_alloc_coherent(&pdev->dev, size,
-                                                &rx_ring->rx_buff_pool_logic,
-                                                GFP_KERNEL);
-        if (!rx_ring->rx_buff_pool) {
-                pr_err("Unable to allocate memory for the receive pool buffer\n");
+                                                   &rx_ring->rx_buff_pool_logic,
+                                                   GFP_KERNEL | __GFP_ZERO);
+        if (!rx_ring->rx_buff_pool)
                 return -ENOMEM;
-        }
-        memset(rx_ring->rx_buff_pool, 0, size);
+
         rx_ring->rx_buff_pool_size = size;
         for (i = 0; i < rx_ring->count; i++) {
                 buffer_info = &rx_ring->buffer_info[i];
@@ -1774,13 +1772,12 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
         tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc);
 
         tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
-                                           &tx_ring->dma, GFP_KERNEL);
+                                           &tx_ring->dma,
+                                           GFP_KERNEL | __GFP_ZERO);
         if (!tx_ring->desc) {
                 vfree(tx_ring->buffer_info);
-                pr_err("Unable to allocate memory for the transmit descriptor ring\n");
                 return -ENOMEM;
         }
-        memset(tx_ring->desc, 0, tx_ring->size);
 
         tx_ring->next_to_use = 0;
         tx_ring->next_to_clean = 0;
@@ -1820,14 +1817,12 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
 
         rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
-                                           &rx_ring->dma, GFP_KERNEL);
-
+                                           &rx_ring->dma,
+                                           GFP_KERNEL | __GFP_ZERO);
         if (!rx_ring->desc) {
-                pr_err("Unable to allocate memory for the receive descriptor ring\n");
                 vfree(rx_ring->buffer_info);
                 return -ENOMEM;
         }
-        memset(rx_ring->desc, 0, rx_ring->size);
         rx_ring->next_to_clean = 0;
         rx_ring->next_to_use = 0;
         for (desNo = 0; desNo < rx_ring->count; desNo++) {
@@ -2268,7 +2263,7 @@ static int pch_gbe_change_mtu(struct net_device *netdev, int new_mtu)
                 if (err) {
                         adapter->rx_buffer_len = old_rx_buffer_len;
                         pch_gbe_up(adapter);
-                        return -ENOMEM;
+                        return err;
                 } else {
                         netdev->mtu = new_mtu;
                         adapter->hw.mac.max_frame_size = max_frame;
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index b1cfbb75ff1e..a5f0b5da6149 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -441,12 +441,11 @@ static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
 
         ring->buffers = dma_alloc_coherent(&mac->dma_pdev->dev,
                                            RX_RING_SIZE * sizeof(u64),
-                                           &ring->buf_dma, GFP_KERNEL);
+                                           &ring->buf_dma,
+                                           GFP_KERNEL | __GFP_ZERO);
         if (!ring->buffers)
                 goto out_ring_desc;
 
-        memset(ring->buffers, 0, RX_RING_SIZE * sizeof(u64));
-
         write_dma_reg(PAS_DMA_RXCHAN_BASEL(chno),
                       PAS_DMA_RXCHAN_BASEL_BRBL(ring->chan.ring_dma));
 
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index a8669adecc97..0e1797295a48 100644
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -35,6 +35,16 @@ config QLCNIC
           This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
           devices.
 
+config QLCNIC_SRIOV
+        bool "QLOGIC QLCNIC 83XX family SR-IOV Support"
+        depends on QLCNIC && PCI_IOV
+        default y
+        ---help---
+          This configuration parameter enables Single Root Input Output
+          Virtualization support for QLE83XX Converged Ethernet devices.
+          This allows for virtual function acceleration in virtualized
+          environments.
+
 config QLGE
         tristate "QLogic QLGE 10Gb Ethernet Driver Support"
         depends on PCI
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index eb3dfdbb642b..322a36b76727 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
@@ -955,9 +955,10 @@ typedef struct nx_mac_list_s {
         uint8_t mac_addr[ETH_ALEN+2];
 } nx_mac_list_t;
 
-struct nx_vlan_ip_list {
+struct nx_ip_list {
         struct list_head list;
         __be32 ip_addr;
+        bool master;
 };
 
 /*
@@ -1605,7 +1606,7 @@ struct netxen_adapter {
         struct net_device *netdev;
         struct pci_dev *pdev;
         struct list_head mac_list;
-        struct list_head vlan_ip_list;
+        struct list_head ip_list;
 
         spinlock_t tx_clean_lock;
 
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 4782dcfde736..7692dfd4f262 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/if_vlan.h>
+#include <net/checksum.h>
 #include "netxen_nic.h"
 #include "netxen_nic_hw.h"
 
@@ -1641,9 +1642,8 @@ netxen_process_lro(struct netxen_adapter *adapter,
         th = (struct tcphdr *)((skb->data + vhdr_len) + (iph->ihl << 2));
 
         length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
+        csum_replace2(&iph->check, iph->tot_len, htons(length));
         iph->tot_len = htons(length);
-        iph->check = 0;
-        iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
         th->psh = push;
         th->seq = htonl(seq_number);
 
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 501f49207da5..af951f343ff6 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -90,7 +90,7 @@ static irqreturn_t netxen_intr(int irq, void *data);
 static irqreturn_t netxen_msi_intr(int irq, void *data);
 static irqreturn_t netxen_msix_intr(int irq, void *data);
 
-static void netxen_free_vlan_ip_list(struct netxen_adapter *);
+static void netxen_free_ip_list(struct netxen_adapter *, bool);
 static void netxen_restore_indev_addr(struct net_device *dev, unsigned long);
 static struct rtnl_link_stats64 *netxen_nic_get_stats(struct net_device *dev,
                                                       struct rtnl_link_stats64 *stats);
@@ -1345,7 +1345,7 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
         }
 
         if (adapter->capabilities & NX_FW_CAPABILITY_FVLANTX)
-                netdev->hw_features |= NETIF_F_HW_VLAN_TX;
+                netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX;
 
         if (adapter->capabilities & NX_FW_CAPABILITY_HW_LRO)
                 netdev->hw_features |= NETIF_F_LRO;
@@ -1450,7 +1450,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         spin_lock_init(&adapter->tx_clean_lock);
         INIT_LIST_HEAD(&adapter->mac_list);
-        INIT_LIST_HEAD(&adapter->vlan_ip_list);
+        INIT_LIST_HEAD(&adapter->ip_list);
 
         err = netxen_setup_pci_map(adapter);
         if (err)
@@ -1585,7 +1585,7 @@ static void netxen_nic_remove(struct pci_dev *pdev)
 
         cancel_work_sync(&adapter->tx_timeout_task);
 
-        netxen_free_vlan_ip_list(adapter);
+        netxen_free_ip_list(adapter, false);
         netxen_nic_detach(adapter);
 
         nx_decr_dev_ref_cnt(adapter);
@@ -3137,62 +3137,77 @@ netxen_destip_supported(struct netxen_adapter *adapter)
 }
 
 static void
-netxen_free_vlan_ip_list(struct netxen_adapter *adapter)
+netxen_free_ip_list(struct netxen_adapter *adapter, bool master)
 {
-        struct nx_vlan_ip_list  *cur;
-        struct list_head *head = &adapter->vlan_ip_list;
+        struct nx_ip_list  *cur, *tmp_cur;
 
-        while (!list_empty(head)) {
-                cur = list_entry(head->next, struct nx_vlan_ip_list, list);
-                netxen_config_ipaddr(adapter, cur->ip_addr, NX_IP_DOWN);
-                list_del(&cur->list);
-                kfree(cur);
+        list_for_each_entry_safe(cur, tmp_cur, &adapter->ip_list, list) {
+                if (master) {
+                        if (cur->master) {
+                                netxen_config_ipaddr(adapter, cur->ip_addr,
+                                                     NX_IP_DOWN);
+                                list_del(&cur->list);
+                                kfree(cur);
+                        }
+                } else {
+                        netxen_config_ipaddr(adapter, cur->ip_addr, NX_IP_DOWN);
+                        list_del(&cur->list);
+                        kfree(cur);
+                }
         }
-
 }
-static void
-netxen_list_config_vlan_ip(struct netxen_adapter *adapter,
+
+static bool
+netxen_list_config_ip(struct netxen_adapter *adapter,
                 struct in_ifaddr *ifa, unsigned long event)
 {
         struct net_device *dev;
-        struct nx_vlan_ip_list *cur, *tmp_cur;
+        struct nx_ip_list *cur, *tmp_cur;
         struct list_head *head;
+        bool ret = false;
 
         dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL;
 
         if (dev == NULL)
-                return;
-
-        if (!is_vlan_dev(dev))
-                return;
+                goto out;
 
         switch (event) {
         case NX_IP_UP:
-                list_for_each(head, &adapter->vlan_ip_list) {
-                        cur = list_entry(head, struct nx_vlan_ip_list, list);
+                list_for_each(head, &adapter->ip_list) {
+                        cur = list_entry(head, struct nx_ip_list, list);
 
                         if (cur->ip_addr == ifa->ifa_address)
-                                return;
+                                goto out;
                 }
 
-                cur = kzalloc(sizeof(struct nx_vlan_ip_list), GFP_ATOMIC);
+                cur = kzalloc(sizeof(struct nx_ip_list), GFP_ATOMIC);
                 if (cur == NULL)
-                        return;
-
+                        goto out;
+                if (dev->priv_flags & IFF_802_1Q_VLAN)
+                        dev = vlan_dev_real_dev(dev);
+                cur->master = !!netif_is_bond_master(dev);
                 cur->ip_addr = ifa->ifa_address;
-                list_add_tail(&cur->list, &adapter->vlan_ip_list);
+                list_add_tail(&cur->list, &adapter->ip_list);
+                netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_UP);
+                ret = true;
                 break;
         case NX_IP_DOWN:
                 list_for_each_entry_safe(cur, tmp_cur,
-                                        &adapter->vlan_ip_list, list) {
+                                        &adapter->ip_list, list) {
                         if (cur->ip_addr == ifa->ifa_address) {
                                 list_del(&cur->list);
                                 kfree(cur);
+                                netxen_config_ipaddr(adapter, ifa->ifa_address,
+                                                     NX_IP_DOWN);
+                                ret = true;
                                 break;
                         }
                 }
         }
+out:
+        return ret;
 }
+
 static void
 netxen_config_indev_addr(struct netxen_adapter *adapter,
                 struct net_device *dev, unsigned long event)
@@ -3209,14 +3224,10 @@ netxen_config_indev_addr(struct netxen_adapter *adapter,
         for_ifa(indev) {
                 switch (event) {
                 case NETDEV_UP:
-                        netxen_config_ipaddr(adapter,
-                                        ifa->ifa_address, NX_IP_UP);
-                        netxen_list_config_vlan_ip(adapter, ifa, NX_IP_UP);
+                        netxen_list_config_ip(adapter, ifa, NX_IP_UP);
                         break;
                 case NETDEV_DOWN:
-                        netxen_config_ipaddr(adapter,
-                                        ifa->ifa_address, NX_IP_DOWN);
-                        netxen_list_config_vlan_ip(adapter, ifa, NX_IP_DOWN);
+                        netxen_list_config_ip(adapter, ifa, NX_IP_DOWN);
                         break;
                 default:
                         break;
@@ -3231,23 +3242,78 @@ netxen_restore_indev_addr(struct net_device *netdev, unsigned long event)
 
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
-        struct nx_vlan_ip_list *pos, *tmp_pos;
+        struct nx_ip_list *pos, *tmp_pos;
         unsigned long ip_event;
 
         ip_event = (event == NETDEV_UP) ? NX_IP_UP : NX_IP_DOWN;
         netxen_config_indev_addr(adapter, netdev, event);
 
-        list_for_each_entry_safe(pos, tmp_pos, &adapter->vlan_ip_list, list) {
+        list_for_each_entry_safe(pos, tmp_pos, &adapter->ip_list, list) {
                 netxen_config_ipaddr(adapter, pos->ip_addr, ip_event);
         }
 }
 
+static inline bool
+netxen_config_checkdev(struct net_device *dev)
+{
+        struct netxen_adapter *adapter;
+
+        if (!is_netxen_netdev(dev))
+                return false;
+        adapter = netdev_priv(dev);
+        if (!adapter)
+                return false;
+        if (!netxen_destip_supported(adapter))
+                return false;
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                return false;
+
+        return true;
+}
+
+/**
+ * netxen_config_master - configure addresses based on master
+ * @dev: netxen device
+ * @event: netdev event
+ */
+static void netxen_config_master(struct net_device *dev, unsigned long event)
+{
+        struct net_device *master, *slave;
+        struct netxen_adapter *adapter = netdev_priv(dev);
+
+        rcu_read_lock();
+        master = netdev_master_upper_dev_get_rcu(dev);
+        /*
+         * This is the case where the netxen nic is being
+         * enslaved and is dev_open()ed in bond_enslave()
+         * Now we should program the bond's (and its vlans')
+         * addresses in the netxen NIC.
+         */
+        if (master && netif_is_bond_master(master) &&
+            !netif_is_bond_slave(dev)) {
+                netxen_config_indev_addr(adapter, master, event);
+                for_each_netdev_rcu(&init_net, slave)
+                        if (slave->priv_flags & IFF_802_1Q_VLAN &&
+                            vlan_dev_real_dev(slave) == master)
+                                netxen_config_indev_addr(adapter, slave, event);
+        }
+        rcu_read_unlock();
+        /*
+         * This is the case where the netxen nic is being
+         * released and is dev_close()ed in bond_release()
+         * just before IFF_BONDING is stripped.
+         */
+        if (!master && dev->priv_flags & IFF_BONDING)
+                netxen_free_ip_list(adapter, true);
+}
+
 static int netxen_netdev_event(struct notifier_block *this,
                                  unsigned long event, void *ptr)
 {
         struct netxen_adapter *adapter;
         struct net_device *dev = (struct net_device *)ptr;
         struct net_device *orig_dev = dev;
+        struct net_device *slave;
 
 recheck:
         if (dev == NULL)
@@ -3257,19 +3323,28 @@ recheck:
                 dev = vlan_dev_real_dev(dev);
                 goto recheck;
         }
-
-        if (!is_netxen_netdev(dev))
-                goto done;
-
-        adapter = netdev_priv(dev);
-
-        if (!adapter)
-                goto done;
-
-        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
-                goto done;
-
-        netxen_config_indev_addr(adapter, orig_dev, event);
+        if (event == NETDEV_UP || event == NETDEV_DOWN) {
+                /* If this is a bonding device, look for netxen-based slaves*/
+                if (netif_is_bond_master(dev)) {
+                        rcu_read_lock();
+                        for_each_netdev_in_bond_rcu(dev, slave) {
+                                if (!netxen_config_checkdev(slave))
+                                        continue;
+                                adapter = netdev_priv(slave);
+                                netxen_config_indev_addr(adapter,
+                                                         orig_dev, event);
+                        }
+                        rcu_read_unlock();
+                } else {
+                        if (!netxen_config_checkdev(dev))
+                                goto done;
+                        adapter = netdev_priv(dev);
+                        /* Act only if the actual netxen is the target */
+                        if (orig_dev == dev)
+                                netxen_config_master(dev, event);
+                        netxen_config_indev_addr(adapter, orig_dev, event);
+                }
+        }
 done:
         return NOTIFY_DONE;
 }
@@ -3279,12 +3354,12 @@ netxen_inetaddr_event(struct notifier_block *this,
                 unsigned long event, void *ptr)
 {
         struct netxen_adapter *adapter;
-        struct net_device *dev;
-
+        struct net_device *dev, *slave;
         struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
+        unsigned long ip_event;
 
         dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL;
-
+        ip_event = (event == NETDEV_UP) ? NX_IP_UP : NX_IP_DOWN;
 recheck:
         if (dev == NULL)
                 goto done;
@@ -3293,31 +3368,24 @@ recheck:
                 dev = vlan_dev_real_dev(dev);
                 goto recheck;
         }
-
-        if (!is_netxen_netdev(dev))
-                goto done;
-
-        adapter = netdev_priv(dev);
-
-        if (!adapter || !netxen_destip_supported(adapter))
-                goto done;
-
-        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
-                goto done;
-
-        switch (event) {
-        case NETDEV_UP:
-                netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_UP);
-                netxen_list_config_vlan_ip(adapter, ifa, NX_IP_UP);
-                break;
-        case NETDEV_DOWN:
-                netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_DOWN);
-                netxen_list_config_vlan_ip(adapter, ifa, NX_IP_DOWN);
-                break;
-        default:
-                break;
+        if (event == NETDEV_UP || event == NETDEV_DOWN) {
+                /* If this is a bonding device, look for netxen-based slaves*/
+                if (netif_is_bond_master(dev)) {
+                        rcu_read_lock();
+                        for_each_netdev_in_bond_rcu(dev, slave) {
+                                if (!netxen_config_checkdev(slave))
+                                        continue;
+                                adapter = netdev_priv(slave);
+                                netxen_list_config_ip(adapter, ifa, ip_event);
+                        }
+                        rcu_read_unlock();
+                } else {
+                        if (!netxen_config_checkdev(dev))
+                                goto done;
+                        adapter = netdev_priv(dev);
+                        netxen_list_config_ip(adapter, ifa, ip_event);
+                }
         }
-
 done:
         return NOTIFY_DONE;
 }
@@ -3334,7 +3402,7 @@ static void
 netxen_restore_indev_addr(struct net_device *dev, unsigned long event)
 { }
 static void
-netxen_free_vlan_ip_list(struct netxen_adapter *adapter)
+netxen_free_ip_list(struct netxen_adapter *adapter, bool master)
 { }
 #endif
 
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 8fd38cb6d26a..91a8fcd6c246 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -312,7 +312,6 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
                 lrg_buf_cb->skb = netdev_alloc_skb(qdev->ndev,
                                                    qdev->lrg_buffer_len);
                 if (unlikely(!lrg_buf_cb->skb)) {
-                        netdev_err(qdev->ndev, "failed netdev_alloc_skb()\n");
                         qdev->lrg_buf_skb_check++;
                 } else {
                         /*
diff --git a/drivers/net/ethernet/qlogic/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile
index 7722a203e388..4b1fb3faa3b7 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/Makefile
+++ b/drivers/net/ethernet/qlogic/qlcnic/Makefile
@@ -8,4 +8,6 @@ qlcnic-y := qlcnic_hw.o qlcnic_main.o qlcnic_init.o \
         qlcnic_ethtool.o qlcnic_ctx.o qlcnic_io.o \
         qlcnic_sysfs.o qlcnic_minidump.o qlcnic_83xx_hw.o \
         qlcnic_83xx_init.o qlcnic_83xx_vnic.o \
-        qlcnic_minidump.o
+        qlcnic_minidump.o qlcnic_sriov_common.o
+
+qlcnic-$(CONFIG_QLCNIC_SRIOV) += qlcnic_sriov_pf.o
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index ba3c72fce1f2..90c253b145ef 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -37,9 +37,9 @@
 #include "qlcnic_83xx_hw.h"
 
 #define _QLCNIC_LINUX_MAJOR 5
-#define _QLCNIC_LINUX_MINOR 1
-#define _QLCNIC_LINUX_SUBVERSION 35
-#define QLCNIC_LINUX_VERSIONID  "5.1.35"
+#define _QLCNIC_LINUX_MINOR 2
+#define _QLCNIC_LINUX_SUBVERSION 42
+#define QLCNIC_LINUX_VERSIONID  "5.2.42"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -347,8 +347,14 @@ struct qlcnic_rx_buffer {
  * Interrupt coalescing defaults. The defaults are for 1500 MTU. It is
  * adjusted based on configured MTU.
  */
-#define QLCNIC_DEFAULT_INTR_COALESCE_RX_TIME_US 3
-#define QLCNIC_DEFAULT_INTR_COALESCE_RX_PACKETS 256
+#define QLCNIC_INTR_COAL_TYPE_RX                1
+#define QLCNIC_INTR_COAL_TYPE_TX                2
+
+#define QLCNIC_DEF_INTR_COALESCE_RX_TIME_US     3
+#define QLCNIC_DEF_INTR_COALESCE_RX_PACKETS     256
+
+#define QLCNIC_DEF_INTR_COALESCE_TX_TIME_US     64
+#define QLCNIC_DEF_INTR_COALESCE_TX_PACKETS     64
 
 #define QLCNIC_INTR_DEFAULT                     0x04
 #define QLCNIC_CONFIG_INTR_COALESCE             3
@@ -359,6 +365,8 @@ struct qlcnic_nic_intr_coalesce {
         u8      sts_ring_mask;
         u16     rx_packets;
         u16     rx_time_us;
+        u16     tx_packets;
+        u16     tx_time_us;
         u16     flag;
         u32     timer_out;
 };
@@ -449,6 +457,7 @@ struct qlcnic_hardware_context {
         struct qlc_83xx_idc idc;
         struct qlc_83xx_fw_info fw_info;
         struct qlcnic_intrpt_config *intr_tbl;
+        struct qlcnic_sriov *sriov;
         u32 *reg_tbl;
         u32 *ext_reg_tbl;
         u32 mbox_aen[QLC_83XX_MBX_AEN_CNT];
@@ -510,13 +519,13 @@ struct qlcnic_host_sds_ring {
         int irq;
 
         dma_addr_t phys_addr;
-        char name[IFNAMSIZ+4];
+        char name[IFNAMSIZ + 12];
 } ____cacheline_internodealigned_in_smp;
 
 struct qlcnic_host_tx_ring {
         int irq;
         void __iomem *crb_intr_mask;
-        char name[IFNAMSIZ+4];
+        char name[IFNAMSIZ + 12];
         u16 ctx_id;
         u32 producer;
         u32 sw_consumer;
@@ -896,6 +905,7 @@ struct qlcnic_ipaddr {
 #define QLCNIC_FW_RESET_OWNER           0x2000
 #define QLCNIC_FW_HANG                  0x4000
 #define QLCNIC_FW_LRO_MSS_CAP           0x8000
+#define QLCNIC_TX_INTR_SHARED           0x10000
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
@@ -914,7 +924,10 @@ struct qlcnic_ipaddr {
 #define __QLCNIC_AER                    5
 #define __QLCNIC_DIAG_RES_ALLOC         6
 #define __QLCNIC_LED_ENABLE             7
-#define __QLCNIC_ELB_INPROGRESS 8
+#define __QLCNIC_ELB_INPROGRESS         8
+#define __QLCNIC_SRIOV_ENABLE           10
+#define __QLCNIC_SRIOV_CAPABLE          11
+#define __QLCNIC_MBX_POLL_ENABLE        12
 
 #define QLCNIC_INTERRUPT_TEST           1
 #define QLCNIC_LOOPBACK_TEST            2
@@ -935,7 +948,7 @@ struct qlcnic_ipaddr {
 struct qlcnic_filter {
         struct hlist_node fnode;
         u8 faddr[ETH_ALEN];
-        __le16 vlan_id;
+        u16 vlan_id;
         unsigned long ftime;
 };
 
@@ -972,9 +985,11 @@ struct qlcnic_adapter {
         u8 fw_fail_cnt;
         u8 tx_timeo_cnt;
         u8 need_fw_reset;
+        u8 reset_ctx_cnt;
 
         u16 is_up;
-        u16 pvid;
+        u16 rx_pvid;
+        u16 tx_pvid;
 
         u32 irq;
         u32 heartbeat;
@@ -1006,9 +1021,11 @@ struct qlcnic_adapter {
         struct workqueue_struct *qlcnic_wq;
         struct delayed_work fw_work;
         struct delayed_work idc_aen_work;
+        struct delayed_work mbx_poll_work;
 
         struct qlcnic_filter_hash fhash;
         struct qlcnic_filter_hash rx_fhash;
+        struct list_head vf_mc_list;
 
         spinlock_t tx_clean_lock;
         spinlock_t mac_learn_lock;
@@ -1051,7 +1068,11 @@ struct qlcnic_info_le {
         u8      total_pf;
         u8      total_rss_engines;
         __le16  max_vports;
-        u8      reserved2[64];
+        __le16  linkstate_reg_offset;
+        __le16  bit_offsets;
+        __le16  max_local_ipv6_addrs;
+        __le16  max_remote_ipv6_addrs;
+        u8      reserved2[56];
 } __packed;
 
 struct qlcnic_info {
@@ -1083,6 +1104,10 @@ struct qlcnic_info {
         u8      total_pf;
         u8      total_rss_engines;
         u16     max_vports;
+        u16     linkstate_reg_offset;
+        u16     bit_offsets;
+        u16     max_local_ipv6_addrs;
+        u16     max_remote_ipv6_addrs;
 };
 
 struct qlcnic_pci_info_le {
@@ -1348,6 +1373,7 @@ struct _cdrp_cmd {
 struct qlcnic_cmd_args {
         struct _cdrp_cmd req;
         struct _cdrp_cmd rsp;
+        int op_type;
 };
 
 int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter);
@@ -1430,9 +1456,10 @@ void qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter,
                 struct qlcnic_host_rds_ring *rds_ring, u8 ring_id);
 int qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max);
 void qlcnic_set_multi(struct net_device *netdev);
-int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *);
+void __qlcnic_set_multi(struct net_device *, u16);
+int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *, u16);
 int qlcnic_nic_del_mac(struct qlcnic_adapter *, const u8 *);
-void qlcnic_free_mac_list(struct qlcnic_adapter *adapter);
+void qlcnic_82xx_free_mac_list(struct qlcnic_adapter *adapter);
 
 int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu);
 int qlcnic_fw_cmd_set_drv_version(struct qlcnic_adapter *);
@@ -1455,7 +1482,7 @@ void qlcnic_diag_free_res(struct net_device *netdev, int max_sds_rings);
 int qlcnic_diag_alloc_res(struct net_device *netdev, int test);
 netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
 int qlcnic_set_max_rss(struct qlcnic_adapter *, u8, size_t);
-int qlcnic_validate_max_rss(u8, u8);
+int qlcnic_validate_max_rss(struct qlcnic_adapter *, __u32);
 void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter);
 int qlcnic_enable_msix(struct qlcnic_adapter *, u32);
 
@@ -1509,8 +1536,13 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *);
 int qlcnic_set_default_offload_settings(struct qlcnic_adapter *);
 int qlcnic_reset_npar_config(struct qlcnic_adapter *);
 int qlcnic_set_eswitch_port_config(struct qlcnic_adapter *);
-void qlcnic_add_lb_filter(struct qlcnic_adapter *, struct sk_buff *, int,
-                          __le16);
+void qlcnic_add_lb_filter(struct qlcnic_adapter *, struct sk_buff *, int, u16);
+int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter);
+int qlcnic_read_mac_addr(struct qlcnic_adapter *);
+int qlcnic_setup_netdev(struct qlcnic_adapter *, struct net_device *, int);
+void qlcnic_sriov_vf_schedule_multi(struct net_device *);
+void qlcnic_vf_add_mc_list(struct net_device *, u16);
+
 /*
  * QLOGIC Board information
  */
@@ -1567,11 +1599,14 @@ struct qlcnic_hardware_ops {
         int (*create_rx_ctx) (struct qlcnic_adapter *);
         int (*create_tx_ctx) (struct qlcnic_adapter *,
         struct qlcnic_host_tx_ring *, int);
+        void (*del_rx_ctx) (struct qlcnic_adapter *);
+        void (*del_tx_ctx) (struct qlcnic_adapter *,
+                            struct qlcnic_host_tx_ring *);
         int (*setup_link_event) (struct qlcnic_adapter *, int);
         int (*get_nic_info) (struct qlcnic_adapter *, struct qlcnic_info *, u8);
         int (*get_pci_info) (struct qlcnic_adapter *, struct qlcnic_pci_info *);
         int (*set_nic_info) (struct qlcnic_adapter *, struct qlcnic_info *);
-        int (*change_macvlan) (struct qlcnic_adapter *, u8*, __le16, u8);
+        int (*change_macvlan) (struct qlcnic_adapter *, u8*, u16, u8);
         void (*napi_enable) (struct qlcnic_adapter *);
         void (*napi_disable) (struct qlcnic_adapter *);
         void (*config_intr_coal) (struct qlcnic_adapter *);
@@ -1580,8 +1615,9 @@ struct qlcnic_hardware_ops {
         int (*config_loopback) (struct qlcnic_adapter *, u8);
         int (*clear_loopback) (struct qlcnic_adapter *, u8);
         int (*config_promisc_mode) (struct qlcnic_adapter *, u32);
-        void (*change_l2_filter) (struct qlcnic_adapter *, u64 *, __le16);
+        void (*change_l2_filter) (struct qlcnic_adapter *, u64 *, u16);
         int (*get_board_info) (struct qlcnic_adapter *);
+        void (*free_mac_list) (struct qlcnic_adapter *);
 };
 
 extern struct qlcnic_nic_template qlcnic_vf_ops;
@@ -1635,7 +1671,10 @@ static inline int qlcnic_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
 static inline int qlcnic_issue_cmd(struct qlcnic_adapter *adapter,
                                    struct qlcnic_cmd_args *cmd)
 {
-        return adapter->ahw->hw_ops->mbx_cmd(adapter, cmd);
+        if (adapter->ahw->hw_ops->mbx_cmd)
+                return adapter->ahw->hw_ops->mbx_cmd(adapter, cmd);
+
+        return -EIO;
 }
 
 static inline void qlcnic_get_func_no(struct qlcnic_adapter *adapter)
@@ -1655,12 +1694,14 @@ static inline void qlcnic_api_unlock(struct qlcnic_adapter *adapter)
 
 static inline void qlcnic_add_sysfs(struct qlcnic_adapter *adapter)
 {
-        adapter->ahw->hw_ops->add_sysfs(adapter);
+        if (adapter->ahw->hw_ops->add_sysfs)
+                adapter->ahw->hw_ops->add_sysfs(adapter);
 }
 
 static inline void qlcnic_remove_sysfs(struct qlcnic_adapter *adapter)
 {
-        adapter->ahw->hw_ops->remove_sysfs(adapter);
+        if (adapter->ahw->hw_ops->remove_sysfs)
+                adapter->ahw->hw_ops->remove_sysfs(adapter);
 }
 
 static inline void
@@ -1681,6 +1722,17 @@ static inline int qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,
         return adapter->ahw->hw_ops->create_tx_ctx(adapter, ptr, ring);
 }
 
+static inline void qlcnic_fw_cmd_del_rx_ctx(struct qlcnic_adapter *adapter)
+{
+        return adapter->ahw->hw_ops->del_rx_ctx(adapter);
+}
+
+static inline void qlcnic_fw_cmd_del_tx_ctx(struct qlcnic_adapter *adapter,
+                                            struct qlcnic_host_tx_ring *ptr)
+{
+        return adapter->ahw->hw_ops->del_tx_ctx(adapter, ptr);
+}
+
 static inline int qlcnic_linkevent_request(struct qlcnic_adapter *adapter,
                                            int enable)
 {
@@ -1706,7 +1758,7 @@ static inline int qlcnic_set_nic_info(struct qlcnic_adapter *adapter,
 }
 
 static inline int qlcnic_sre_macaddr_change(struct qlcnic_adapter *adapter,
-                                            u8 *addr, __le16 id, u8 cmd)
+                                            u8 *addr, u16 id, u8 cmd)
 {
         return adapter->ahw->hw_ops->change_macvlan(adapter, addr, id, cmd);
 }
@@ -1765,7 +1817,7 @@ static inline int qlcnic_nic_set_promisc(struct qlcnic_adapter *adapter,
 }
 
 static inline void qlcnic_change_filter(struct qlcnic_adapter *adapter,
-                                        u64 *addr, __le16 id)
+                                        u64 *addr, u16 id)
 {
         adapter->ahw->hw_ops->change_l2_filter(adapter, addr, id);
 }
@@ -1775,15 +1827,22 @@ static inline int qlcnic_get_board_info(struct qlcnic_adapter *adapter)
         return adapter->ahw->hw_ops->get_board_info(adapter);
 }
 
+static inline void qlcnic_free_mac_list(struct qlcnic_adapter *adapter)
+{
+        return adapter->ahw->hw_ops->free_mac_list(adapter);
+}
+
 static inline void qlcnic_dev_request_reset(struct qlcnic_adapter *adapter,
                                             u32 key)
 {
-        adapter->nic_ops->request_reset(adapter, key);
+        if (adapter->nic_ops->request_reset)
+                adapter->nic_ops->request_reset(adapter, key);
 }
 
 static inline void qlcnic_cancel_idc_work(struct qlcnic_adapter *adapter)
 {
-        adapter->nic_ops->cancel_idc_work(adapter);
+        if (adapter->nic_ops->cancel_idc_work)
+                adapter->nic_ops->cancel_idc_work(adapter);
 }
 
 static inline irqreturn_t
@@ -1819,6 +1878,7 @@ static inline void qlcnic_enable_int(struct qlcnic_host_sds_ring *sds_ring)
                 writel(0xfbff, adapter->tgt_mask_reg);
 }
 
+extern const struct ethtool_ops qlcnic_sriov_vf_ethtool_ops;
 extern const struct ethtool_ops qlcnic_ethtool_ops;
 extern const struct ethtool_ops qlcnic_ethtool_failed_ops;
 
@@ -1830,7 +1890,9 @@ extern const struct ethtool_ops qlcnic_ethtool_failed_ops;
         } while (0)
 
 #define PCI_DEVICE_ID_QLOGIC_QLE834X    0x8030
+#define PCI_DEVICE_ID_QLOGIC_VF_QLE834X 0x8430
 #define PCI_DEVICE_ID_QLOGIC_QLE824X    0x8020
+
 static inline bool qlcnic_82xx_check(struct qlcnic_adapter *adapter)
 {
         unsigned short device = adapter->pdev->device;
@@ -1840,8 +1902,23 @@ static inline bool qlcnic_82xx_check(struct qlcnic_adapter *adapter)
 static inline bool qlcnic_83xx_check(struct qlcnic_adapter *adapter)
 {
         unsigned short device = adapter->pdev->device;
-        return (device == PCI_DEVICE_ID_QLOGIC_QLE834X) ? true : false;
+        bool status;
+
+        status = ((device == PCI_DEVICE_ID_QLOGIC_QLE834X) ||
+                  (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X)) ? true : false;
+
+        return status;
 }
 
+static inline bool qlcnic_sriov_pf_check(struct qlcnic_adapter *adapter)
+{
+        return (adapter->ahw->op_mode == QLCNIC_SRIOV_PF_FUNC) ? true : false;
+}
 
+static inline bool qlcnic_sriov_vf_check(struct qlcnic_adapter *adapter)
+{
+        unsigned short device = adapter->pdev->device;
+
+        return (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ? true : false;
+}
 #endif                          /* __QLCNIC_H_ */
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index edd63f1230f3..ea790a93ee7c 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -6,6 +6,7 @@
  */
 
 #include "qlcnic.h"
+#include "qlcnic_sriov.h"
 #include <linux/if_vlan.h>
 #include <linux/ipv6.h>
 #include <linux/ethtool.h>
@@ -13,100 +14,7 @@
 
 #define QLCNIC_MAX_TX_QUEUES            1
 #define RSS_HASHTYPE_IP_TCP             0x3
-
-/* status descriptor mailbox data
- * @phy_addr: physical address of buffer
- * @sds_ring_size: buffer size
- * @intrpt_id: interrupt id
- * @intrpt_val: source of interrupt
- */
-struct qlcnic_sds_mbx {
-        u64     phy_addr;
-        u8      rsvd1[16];
-        u16     sds_ring_size;
-        u16     rsvd2[3];
-        u16     intrpt_id;
-        u8      intrpt_val;
-        u8      rsvd3[5];
-} __packed;
-
-/* receive descriptor buffer data
- * phy_addr_reg: physical address of regular buffer
- * phy_addr_jmb: physical address of jumbo buffer
- * reg_ring_sz: size of regular buffer
- * reg_ring_len: no. of entries in regular buffer
- * jmb_ring_len: no. of entries in jumbo buffer
- * jmb_ring_sz: size of jumbo buffer
- */
-struct qlcnic_rds_mbx {
-        u64     phy_addr_reg;
-        u64     phy_addr_jmb;
-        u16     reg_ring_sz;
-        u16     reg_ring_len;
-        u16     jmb_ring_sz;
-        u16     jmb_ring_len;
-} __packed;
-
-/* host producers for regular and jumbo rings */
-struct __host_producer_mbx {
-        u32     reg_buf;
-        u32     jmb_buf;
-} __packed;
-
-/* Receive context mailbox data outbox registers
- * @state: state of the context
- * @vport_id: virtual port id
- * @context_id: receive context id
- * @num_pci_func: number of pci functions of the port
- * @phy_port: physical port id
- */
-struct qlcnic_rcv_mbx_out {
-        u8      rcv_num;
-        u8      sts_num;
-        u16     ctx_id;
-        u8      state;
-        u8      num_pci_func;
-        u8      phy_port;
-        u8      vport_id;
-        u32     host_csmr[QLCNIC_MAX_RING_SETS];
-        struct __host_producer_mbx host_prod[QLCNIC_MAX_RING_SETS];
-} __packed;
-
-struct qlcnic_add_rings_mbx_out {
-        u8      rcv_num;
-        u8      sts_num;
-        u16  ctx_id;
-        u32  host_csmr[QLCNIC_MAX_RING_SETS];
-        struct __host_producer_mbx host_prod[QLCNIC_MAX_RING_SETS];
-} __packed;
-
-/* Transmit context mailbox inbox registers
- * @phys_addr: DMA address of the transmit buffer
- * @cnsmr_index: host consumer index
- * @size: legth of transmit buffer ring
- * @intr_id: interrput id
- * @src: src of interrupt
- */
-struct qlcnic_tx_mbx {
-        u64     phys_addr;
-        u64     cnsmr_index;
-        u16     size;
-        u16     intr_id;
-        u8      src;
-        u8      rsvd[3];
-} __packed;
-
-/* Transmit context mailbox outbox registers
- * @host_prod: host producer index
- * @ctx_id: transmit context id
- * @state: state of the transmit context
- */
-struct qlcnic_tx_mbx_out {
-        u32     host_prod;
-        u16     ctx_id;
-        u8      state;
-        u8      rsvd;
-} __packed;
+#define QLC_83XX_FW_MBX_CMD             0
 
 static const struct qlcnic_mailbox_metadata qlcnic_83xx_mbx_tbl[] = {
         {QLCNIC_CMD_CONFIGURE_IP_ADDR, 6, 1},
@@ -156,9 +64,11 @@ static const struct qlcnic_mailbox_metadata qlcnic_83xx_mbx_tbl[] = {
         {QLCNIC_CMD_SET_LED_CONFIG, 5, 1},
         {QLCNIC_CMD_GET_LED_CONFIG, 1, 5},
         {QLCNIC_CMD_ADD_RCV_RINGS, 130, 26},
+        {QLCNIC_CMD_CONFIG_VPORT, 4, 4},
+        {QLCNIC_CMD_BC_EVENT_SETUP, 2, 1},
 };
 
-static const u32 qlcnic_83xx_ext_reg_tbl[] = {
+const u32 qlcnic_83xx_ext_reg_tbl[] = {
         0x38CC,         /* Global Reset */
         0x38F0,         /* Wildcard */
         0x38FC,         /* Informant */
@@ -204,7 +114,7 @@ static const u32 qlcnic_83xx_ext_reg_tbl[] = {
         0x34A4,         /* QLC_83XX_ASIC_TEMP */
 };
 
-static const u32 qlcnic_83xx_reg_tbl[] = {
+const u32 qlcnic_83xx_reg_tbl[] = {
         0x34A8,         /* PEG_HALT_STAT1 */
         0x34AC,         /* PEG_HALT_STAT2 */
         0x34B0,         /* FW_HEARTBEAT */
@@ -247,6 +157,8 @@ static struct qlcnic_hardware_ops qlcnic_83xx_hw_ops = {
         .process_lb_rcv_ring_diag       = qlcnic_83xx_process_rcv_ring_diag,
         .create_rx_ctx                  = qlcnic_83xx_create_rx_ctx,
         .create_tx_ctx                  = qlcnic_83xx_create_tx_ctx,
+        .del_rx_ctx                     = qlcnic_83xx_del_rx_ctx,
+        .del_tx_ctx                     = qlcnic_83xx_del_tx_ctx,
         .setup_link_event               = qlcnic_83xx_setup_link_event,
         .get_nic_info                   = qlcnic_83xx_get_nic_info,
         .get_pci_info                   = qlcnic_83xx_get_pci_info,
@@ -260,6 +172,7 @@ static struct qlcnic_hardware_ops qlcnic_83xx_hw_ops = {
         .config_promisc_mode            = qlcnic_83xx_nic_set_promisc,
         .change_l2_filter               = qlcnic_83xx_change_l2_filter,
         .get_board_info                 = qlcnic_83xx_get_port_info,
+        .free_mac_list                  = qlcnic_82xx_free_mac_list,
 };
 
 static struct qlcnic_nic_template qlcnic_83xx_ops = {
@@ -355,14 +268,20 @@ int qlcnic_83xx_setup_intr(struct qlcnic_adapter *adapter, u8 num_intr)
                                               num_intr));
         /* account for AEN interrupt MSI-X based interrupts */
         num_msix += 1;
-        num_msix += adapter->max_drv_tx_rings;
+
+        if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
+                num_msix += adapter->max_drv_tx_rings;
+
         err = qlcnic_enable_msix(adapter, num_msix);
         if (err == -ENOMEM)
                 return err;
         if (adapter->flags & QLCNIC_MSIX_ENABLED)
                 num_msix = adapter->ahw->num_msix;
-        else
+        else {
+                if (qlcnic_sriov_vf_check(adapter))
+                        return -EINVAL;
                 num_msix = 1;
+        }
         /* setup interrupt mapping table for fw */
         ahw->intr_tbl = vzalloc(num_msix *
                                 sizeof(struct qlcnic_intrpt_config));
@@ -421,12 +340,13 @@ inline void qlcnic_83xx_enable_legacy_msix_mbx_intr(struct qlcnic_adapter
         writel(0, adapter->ahw->pci_base0 + mask);
 }
 
-inline void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *adapter)
+void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *adapter)
 {
         u32 mask;
 
         mask = QLCRDX(adapter->ahw, QLCNIC_DEF_INT_MASK);
         writel(1, adapter->ahw->pci_base0 + mask);
+        QLCWRX(adapter->ahw, QLCNIC_MBX_INTR_ENBL, 0);
 }
 
 static inline void qlcnic_83xx_get_mbx_data(struct qlcnic_adapter *adapter,
@@ -482,7 +402,8 @@ static void qlcnic_83xx_poll_process_aen(struct qlcnic_adapter *adapter)
 
         event = readl(QLCNIC_MBX_FW(adapter->ahw, 0));
         if (event &  QLCNIC_MBX_ASYNC_EVENT)
-                qlcnic_83xx_process_aen(adapter);
+                __qlcnic_83xx_process_aen(adapter);
+
 out:
         qlcnic_83xx_enable_legacy_msix_mbx_intr(adapter);
         spin_unlock_irqrestore(&adapter->ahw->mbx_lock, flags);
@@ -535,17 +456,15 @@ done:
 
 void qlcnic_83xx_free_mbx_intr(struct qlcnic_adapter *adapter)
 {
-        u32 val = 0, num_msix = adapter->ahw->num_msix - 1;
+        u32 num_msix;
+
+        qlcnic_83xx_disable_mbx_intr(adapter);
 
         if (adapter->flags & QLCNIC_MSIX_ENABLED)
                 num_msix = adapter->ahw->num_msix - 1;
         else
                 num_msix = 0;
 
-        QLCWRX(adapter->ahw, QLCNIC_MBX_INTR_ENBL, val);
-
-        qlcnic_83xx_disable_mbx_intr(adapter);
-
         msleep(20);
         synchronize_irq(adapter->msix_entries[num_msix].vector);
         free_irq(adapter->msix_entries[num_msix].vector, adapter);
@@ -595,7 +514,7 @@ int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *adapter)
 void qlcnic_83xx_get_func_no(struct qlcnic_adapter *adapter)
 {
         u32 val = QLCRDX(adapter->ahw, QLCNIC_INFORMANT);
-        adapter->ahw->pci_func = val & 0xf;
+        adapter->ahw->pci_func = (val >> 24) & 0xff;
 }
 
 int qlcnic_83xx_cam_lock(struct qlcnic_adapter *adapter)
@@ -707,6 +626,11 @@ void qlcnic_83xx_check_vf(struct qlcnic_adapter *adapter,
         ahw->fw_hal_version = 2;
         qlcnic_get_func_no(adapter);
 
+        if (qlcnic_sriov_vf_check(adapter)) {
+                qlcnic_sriov_vf_set_ops(adapter);
+                return;
+        }
+
         /* Determine function privilege level */
         op_mode = QLCRDX(adapter->ahw, QLC_83XX_DRV_OP_MODE);
         if (op_mode == QLC_83XX_DEFAULT_OPMODE)
@@ -722,6 +646,9 @@ void qlcnic_83xx_check_vf(struct qlcnic_adapter *adapter,
                          ahw->fw_hal_version);
                 adapter->nic_ops = &qlcnic_vf_ops;
         } else {
+                if (pci_find_ext_capability(adapter->pdev,
+                                            PCI_EXT_CAP_ID_SRIOV))
+                        set_bit(__QLCNIC_SRIOV_CAPABLE, &adapter->state);
                 adapter->nic_ops = &qlcnic_83xx_ops;
         }
 }
@@ -755,7 +682,7 @@ static void qlcnic_dump_mbx(struct qlcnic_adapter *adapter,
 }
 
 /* Mailbox response for mac rcode */
-static u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *adapter)
+u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *adapter)
 {
         u32 fw_data;
         u8 mac_cmd_rcode;
@@ -769,7 +696,7 @@ static u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *adapter)
         return 1;
 }
 
-static u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *adapter)
+u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *adapter)
 {
         u32 data;
         unsigned long wait_time = 0;
@@ -832,7 +759,7 @@ poll:
                 /* Get the FW response data */
                 fw_data = readl(QLCNIC_MBX_FW(ahw, 0));
                 if (fw_data &  QLCNIC_MBX_ASYNC_EVENT) {
-                        qlcnic_83xx_process_aen(adapter);
+                        __qlcnic_83xx_process_aen(adapter);
                         mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);
                         if (mbx_val)
                                 goto poll;
@@ -884,6 +811,7 @@ int qlcnic_83xx_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
         size = ARRAY_SIZE(qlcnic_83xx_mbx_tbl);
         for (i = 0; i < size; i++) {
                 if (type == mbx_tbl[i].cmd) {
+                        mbx->op_type = QLC_83XX_FW_MBX_CMD;
                         mbx->req.num = mbx_tbl[i].in_args;
                         mbx->rsp.num = mbx_tbl[i].out_args;
                         mbx->req.arg = kcalloc(mbx->req.num, sizeof(u32),
@@ -901,10 +829,10 @@ int qlcnic_83xx_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
                         memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);
                         temp = adapter->ahw->fw_hal_version << 29;
                         mbx->req.arg[0] = (type | (mbx->req.num << 16) | temp);
-                        break;
+                        return 0;
                 }
         }
-        return 0;
+        return -EINVAL;
 }
 
 void qlcnic_83xx_idc_aen_work(struct work_struct *work)
@@ -935,7 +863,7 @@ static void qlcnic_83xx_handle_idc_comp_aen(struct qlcnic_adapter *adapter,
         return;
 }
 
-void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)
+void __qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)
 {
         u32 event[QLC_83XX_MBX_AEN_CNT];
         int i;
@@ -960,6 +888,9 @@ void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)
                 break;
         case QLCNIC_MBX_TIME_EXTEND_EVENT:
                 break;
+        case QLCNIC_MBX_BC_EVENT:
+                qlcnic_sriov_handle_bc_event(adapter, event[1]);
+                break;
         case QLCNIC_MBX_SFP_INSERT_EVENT:
                 dev_info(&adapter->pdev->dev, "SFP+ Insert AEN:0x%x.\n",
                          QLCNIC_MBX_RSP(event[0]));
@@ -977,6 +908,53 @@ void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)
         QLCWRX(ahw, QLCNIC_FW_MBX_CTRL, QLCNIC_CLR_OWNER);
 }
 
+static void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        u32 resp, event;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ahw->mbx_lock, flags);
+
+        resp = QLCRDX(ahw, QLCNIC_FW_MBX_CTRL);
+        if (resp & QLCNIC_SET_OWNER) {
+                event = readl(QLCNIC_MBX_FW(ahw, 0));
+                if (event &  QLCNIC_MBX_ASYNC_EVENT)
+                        __qlcnic_83xx_process_aen(adapter);
+        }
+
+        spin_unlock_irqrestore(&ahw->mbx_lock, flags);
+}
+
+static void qlcnic_83xx_mbx_poll_work(struct work_struct *work)
+{
+        struct qlcnic_adapter *adapter;
+
+        adapter = container_of(work, struct qlcnic_adapter, mbx_poll_work.work);
+
+        if (!test_bit(__QLCNIC_MBX_POLL_ENABLE, &adapter->state))
+                return;
+
+        qlcnic_83xx_process_aen(adapter);
+        queue_delayed_work(adapter->qlcnic_wq, &adapter->mbx_poll_work,
+                           (HZ / 10));
+}
+
+void qlcnic_83xx_enable_mbx_poll(struct qlcnic_adapter *adapter)
+{
+        if (test_and_set_bit(__QLCNIC_MBX_POLL_ENABLE, &adapter->state))
+                return;
+
+        INIT_DELAYED_WORK(&adapter->mbx_poll_work, qlcnic_83xx_mbx_poll_work);
+}
+
+void qlcnic_83xx_disable_mbx_poll(struct qlcnic_adapter *adapter)
+{
+        if (!test_and_clear_bit(__QLCNIC_MBX_POLL_ENABLE, &adapter->state))
+                return;
+        cancel_delayed_work_sync(&adapter->mbx_poll_work);
+}
+
 static int qlcnic_83xx_add_rings(struct qlcnic_adapter *adapter)
 {
         int index, i, err, sds_mbx_size;
@@ -1004,7 +982,8 @@ static int qlcnic_83xx_add_rings(struct qlcnic_adapter *adapter)
                 sds = &recv_ctx->sds_rings[i];
                 sds->consumer = 0;
                 memset(sds->desc_head, 0, STATUS_DESC_RINGSIZE(sds));
-                sds_mbx.phy_addr = sds->phys_addr;
+                sds_mbx.phy_addr_low = LSD(sds->phys_addr);
+                sds_mbx.phy_addr_high = MSD(sds->phys_addr);
                 sds_mbx.sds_ring_size = sds->num_desc;
 
                 if (adapter->flags & QLCNIC_MSIX_ENABLED)
@@ -1050,6 +1029,32 @@ out:
         return err;
 }
 
+void qlcnic_83xx_del_rx_ctx(struct qlcnic_adapter *adapter)
+{
+        int err;
+        u32 temp = 0;
+        struct qlcnic_cmd_args cmd;
+        struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_RX_CTX))
+                return;
+
+        if (qlcnic_sriov_pf_check(adapter) || qlcnic_sriov_vf_check(adapter))
+                cmd.req.arg[0] |= (0x3 << 29);
+
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_pf_set_interface_id_del_rx_ctx(adapter, &temp);
+
+        cmd.req.arg[1] = recv_ctx->context_id | temp;
+        err = qlcnic_issue_cmd(adapter, &cmd);
+        if (err)
+                dev_err(&adapter->pdev->dev,
+                        "Failed to destroy rx ctx in firmware\n");
+
+        recv_ctx->state = QLCNIC_HOST_CTX_STATE_FREED;
+        qlcnic_free_mbx_args(&cmd);
+}
+
 int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *adapter)
 {
         int i, err, index, sds_mbx_size, rds_mbx_size;
@@ -1080,9 +1085,17 @@ int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *adapter)
         /* set mailbox hdr and capabilities */
         qlcnic_alloc_mbx_args(&cmd, adapter,
                               QLCNIC_CMD_CREATE_RX_CTX);
+
+        if (qlcnic_sriov_pf_check(adapter) || qlcnic_sriov_vf_check(adapter))
+                cmd.req.arg[0] |= (0x3 << 29);
+
         cmd.req.arg[1] = cap;
         cmd.req.arg[5] = 1 | (num_rds << 5) | (num_sds << 8) |
                          (QLC_83XX_HOST_RDS_MODE_UNIQUE << 16);
+
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_pf_set_interface_id_create_rx_ctx(adapter,
+                                                         &cmd.req.arg[6]);
         /* set up status rings, mbx 8-57/87 */
         index = QLC_83XX_HOST_SDS_MBX_IDX;
         for (i = 0; i < num_sds; i++) {
@@ -1090,7 +1103,8 @@ int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *adapter)
                 sds = &recv_ctx->sds_rings[i];
                 sds->consumer = 0;
                 memset(sds->desc_head, 0, STATUS_DESC_RINGSIZE(sds));
-                sds_mbx.phy_addr = sds->phys_addr;
+                sds_mbx.phy_addr_low = LSD(sds->phys_addr);
+                sds_mbx.phy_addr_high = MSD(sds->phys_addr);
                 sds_mbx.sds_ring_size = sds->num_desc;
                 if (adapter->flags & QLCNIC_MSIX_ENABLED)
                         intrpt_id = ahw->intr_tbl[i].id;
@@ -1110,13 +1124,15 @@ int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *adapter)
         rds = &recv_ctx->rds_rings[0];
         rds->producer = 0;
         memset(&rds_mbx, 0, rds_mbx_size);
-        rds_mbx.phy_addr_reg = rds->phys_addr;
+        rds_mbx.phy_addr_reg_low = LSD(rds->phys_addr);
+        rds_mbx.phy_addr_reg_high = MSD(rds->phys_addr);
         rds_mbx.reg_ring_sz = rds->dma_size;
         rds_mbx.reg_ring_len = rds->num_desc;
         /* Jumbo ring */
         rds = &recv_ctx->rds_rings[1];
         rds->producer = 0;
-        rds_mbx.phy_addr_jmb = rds->phys_addr;
+        rds_mbx.phy_addr_jmb_low = LSD(rds->phys_addr);
+        rds_mbx.phy_addr_jmb_high = MSD(rds->phys_addr);
         rds_mbx.jmb_ring_sz = rds->dma_size;
         rds_mbx.jmb_ring_len = rds->num_desc;
         buf = &cmd.req.arg[index];
@@ -1163,16 +1179,39 @@ out:
         return err;
 }
 
+void qlcnic_83xx_del_tx_ctx(struct qlcnic_adapter *adapter,
+                            struct qlcnic_host_tx_ring *tx_ring)
+{
+        struct qlcnic_cmd_args cmd;
+        u32 temp = 0;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_TX_CTX))
+                return;
+
+        if (qlcnic_sriov_pf_check(adapter) || qlcnic_sriov_vf_check(adapter))
+                cmd.req.arg[0] |= (0x3 << 29);
+
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_pf_set_interface_id_del_tx_ctx(adapter, &temp);
+
+        cmd.req.arg[1] = tx_ring->ctx_id | temp;
+        if (qlcnic_issue_cmd(adapter, &cmd))
+                dev_err(&adapter->pdev->dev,
+                        "Failed to destroy tx ctx in firmware\n");
+        qlcnic_free_mbx_args(&cmd);
+}
+
 int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
                               struct qlcnic_host_tx_ring *tx, int ring)
 {
         int err;
         u16 msix_id;
-        u32 *buf, intr_mask;
+        u32 *buf, intr_mask, temp = 0;
         struct qlcnic_cmd_args cmd;
         struct qlcnic_tx_mbx mbx;
         struct qlcnic_tx_mbx_out *mbx_out;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
+        u32 msix_vector;
 
         /* Reset host resources */
         tx->producer = 0;
@@ -1182,13 +1221,21 @@ int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
         memset(&mbx, 0, sizeof(struct qlcnic_tx_mbx));
 
         /* setup mailbox inbox registerss */
-        mbx.phys_addr = tx->phys_addr;
-        mbx.cnsmr_index = tx->hw_cons_phys_addr;
+        mbx.phys_addr_low = LSD(tx->phys_addr);
+        mbx.phys_addr_high = MSD(tx->phys_addr);
+        mbx.cnsmr_index_low = LSD(tx->hw_cons_phys_addr);
+        mbx.cnsmr_index_high = MSD(tx->hw_cons_phys_addr);
         mbx.size = tx->num_desc;
-        if (adapter->flags & QLCNIC_MSIX_ENABLED)
-                msix_id = ahw->intr_tbl[adapter->max_sds_rings + ring].id;
-        else
+        if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+                if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
+                        msix_vector = adapter->max_sds_rings + ring;
+                else
+                        msix_vector = adapter->max_sds_rings - 1;
+                msix_id = ahw->intr_tbl[msix_vector].id;
+        } else {
                 msix_id = QLCRDX(ahw, QLCNIC_DEF_INT_ID);
+        }
+
         if (adapter->ahw->diag_test != QLCNIC_LOOPBACK_TEST)
                 mbx.intr_id = msix_id;
         else
@@ -1196,8 +1243,15 @@ int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
         mbx.src = 0;
 
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CREATE_TX_CTX);
+
+        if (qlcnic_sriov_pf_check(adapter) || qlcnic_sriov_vf_check(adapter))
+                cmd.req.arg[0] |= (0x3 << 29);
+
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_pf_set_interface_id_create_tx_ctx(adapter, &temp);
+
         cmd.req.arg[1] = QLCNIC_CAP0_LEGACY_CONTEXT;
-        cmd.req.arg[5] = QLCNIC_MAX_TX_QUEUES;
+        cmd.req.arg[5] = QLCNIC_MAX_TX_QUEUES | temp;
         buf = &cmd.req.arg[6];
         memcpy(buf, &mbx, sizeof(struct qlcnic_tx_mbx));
         /* send the mailbox command*/
@@ -1210,7 +1264,8 @@ int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
         mbx_out = (struct qlcnic_tx_mbx_out *)&cmd.rsp.arg[2];
         tx->crb_cmd_producer = ahw->pci_base0 + mbx_out->host_prod;
         tx->ctx_id = mbx_out->ctx_id;
-        if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+        if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
+            !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                 intr_mask = ahw->intr_tbl[adapter->max_sds_rings + ring].src;
                 tx->crb_intr_mask = ahw->pci_base0 + intr_mask;
         }
@@ -1267,7 +1322,8 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test)
 
         if (adapter->ahw->diag_test == QLCNIC_LOOPBACK_TEST) {
                 /* disable and free mailbox interrupt */
-                qlcnic_83xx_free_mbx_intr(adapter);
+                if (!(adapter->flags & QLCNIC_MSIX_ENABLED))
+                        qlcnic_83xx_free_mbx_intr(adapter);
                 adapter->ahw->loopback_state = 0;
                 adapter->ahw->hw_ops->setup_link_event(adapter, 1);
         }
@@ -1295,12 +1351,14 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev,
         qlcnic_detach(adapter);
 
         if (adapter->ahw->diag_test == QLCNIC_LOOPBACK_TEST) {
-                err = qlcnic_83xx_setup_mbx_intr(adapter);
-                if (err) {
-                        dev_err(&adapter->pdev->dev,
-                                "%s: failed to setup mbx interrupt\n",
-                                __func__);
-                        goto out;
+                if (!(adapter->flags & QLCNIC_MSIX_ENABLED)) {
+                        err = qlcnic_83xx_setup_mbx_intr(adapter);
+                        if (err) {
+                                dev_err(&adapter->pdev->dev,
+                                        "%s: failed to setup mbx interrupt\n",
+                                        __func__);
+                                goto out;
+                        }
                 }
         }
         adapter->ahw->diag_test = 0;
@@ -1373,12 +1431,60 @@ mbx_err:
         }
 }
 
+int  qlcnic_83xx_set_led(struct net_device *netdev,
+                         enum ethtool_phys_id_state state)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        int err = -EIO, active = 1;
+
+        if (adapter->ahw->op_mode == QLCNIC_NON_PRIV_FUNC) {
+                netdev_warn(netdev,
+                            "LED test is not supported in non-privileged mode\n");
+                return -EOPNOTSUPP;
+        }
+
+        switch (state) {
+        case ETHTOOL_ID_ACTIVE:
+                if (test_and_set_bit(__QLCNIC_LED_ENABLE, &adapter->state))
+                        return -EBUSY;
+
+                if (test_bit(__QLCNIC_RESETTING, &adapter->state))
+                        break;
+
+                err = qlcnic_83xx_config_led(adapter, active, 0);
+                if (err)
+                        netdev_err(netdev, "Failed to set LED blink state\n");
+                break;
+        case ETHTOOL_ID_INACTIVE:
+                active = 0;
+
+                if (test_bit(__QLCNIC_RESETTING, &adapter->state))
+                        break;
+
+                err = qlcnic_83xx_config_led(adapter, active, 0);
+                if (err)
+                        netdev_err(netdev, "Failed to reset LED blink state\n");
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        if (!active || err)
+                clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);
+
+        return err;
+}
+
 void qlcnic_83xx_register_nic_idc_func(struct qlcnic_adapter *adapter,
                                        int enable)
 {
         struct qlcnic_cmd_args cmd;
         int status;
 
+        if (qlcnic_sriov_vf_check(adapter))
+                return;
+
         if (enable) {
                 qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_INIT_NIC_FUNC);
                 cmd.req.arg[1] = BIT_0 | BIT_31;
@@ -1441,24 +1547,35 @@ int qlcnic_83xx_setup_link_event(struct qlcnic_adapter *adapter, int enable)
         return err;
 }
 
+static void qlcnic_83xx_set_interface_id_promisc(struct qlcnic_adapter *adapter,
+                                                 u32 *interface_id)
+{
+        if (qlcnic_sriov_pf_check(adapter)) {
+                qlcnic_pf_set_interface_id_promisc(adapter, interface_id);
+        } else {
+                if (!qlcnic_sriov_vf_check(adapter))
+                        *interface_id = adapter->recv_ctx->context_id << 16;
+        }
+}
+
 int qlcnic_83xx_nic_set_promisc(struct qlcnic_adapter *adapter, u32 mode)
 {
         int err;
-        u32 temp;
+        u32 temp = 0;
         struct qlcnic_cmd_args cmd;
 
         if (adapter->recv_ctx->state == QLCNIC_HOST_CTX_STATE_FREED)
                 return -EIO;
 
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIGURE_MAC_RX_MODE);
-        temp = adapter->recv_ctx->context_id << 16;
+        qlcnic_83xx_set_interface_id_promisc(adapter, &temp);
         cmd.req.arg[1] = (mode ? 1 : 0) | temp;
         err = qlcnic_issue_cmd(adapter, &cmd);
         if (err)
                 dev_info(&adapter->pdev->dev,
                          "Promiscous mode config failed\n");
-        qlcnic_free_mbx_args(&cmd);
 
+        qlcnic_free_mbx_args(&cmd);
         return err;
 }
 
@@ -1490,7 +1607,9 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode)
         /* Poll for link up event before running traffic */
         do {
                 msleep(500);
-                qlcnic_83xx_process_aen(adapter);
+                if (!(adapter->flags & QLCNIC_MSIX_ENABLED))
+                        qlcnic_83xx_process_aen(adapter);
+
                 if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {
                         dev_info(&adapter->pdev->dev,
                                  "Firmware didn't sent link up event to loopback request\n");
@@ -1550,7 +1669,9 @@ int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
         /* Wait for Link and IDC Completion AEN */
         do {
                 msleep(300);
-                qlcnic_83xx_process_aen(adapter);
+                if (!(adapter->flags & QLCNIC_MSIX_ENABLED))
+                        qlcnic_83xx_process_aen(adapter);
+
                 if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {
                         dev_err(&adapter->pdev->dev,
                                 "FW did not generate IDC completion AEN\n");
@@ -1590,7 +1711,9 @@ int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
         /* Wait for Link and IDC Completion AEN */
         do {
                 msleep(300);
-                qlcnic_83xx_process_aen(adapter);
+                if (!(adapter->flags & QLCNIC_MSIX_ENABLED))
+                        qlcnic_83xx_process_aen(adapter);
+
                 if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {
                         dev_err(&adapter->pdev->dev,
                                 "Firmware didn't sent IDC completion AEN\n");
@@ -1604,21 +1727,31 @@ int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
         return status;
 }
 
+static void qlcnic_83xx_set_interface_id_ipaddr(struct qlcnic_adapter *adapter,
+                                                u32 *interface_id)
+{
+        if (qlcnic_sriov_pf_check(adapter)) {
+                qlcnic_pf_set_interface_id_ipaddr(adapter, interface_id);
+        } else {
+                if (!qlcnic_sriov_vf_check(adapter))
+                        *interface_id = adapter->recv_ctx->context_id << 16;
+        }
+}
+
 void qlcnic_83xx_config_ipaddr(struct qlcnic_adapter *adapter, __be32 ip,
                                int mode)
 {
         int err;
-        u32 temp, temp_ip;
+        u32 temp = 0, temp_ip;
         struct qlcnic_cmd_args cmd;
 
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIGURE_IP_ADDR);
-        if (mode == QLCNIC_IP_UP) {
-                temp = adapter->recv_ctx->context_id << 16;
+        qlcnic_83xx_set_interface_id_ipaddr(adapter, &temp);
+
+        if (mode == QLCNIC_IP_UP)
                 cmd.req.arg[1] = 1 | temp;
-        } else {
-                temp = adapter->recv_ctx->context_id << 16;
+        else
                 cmd.req.arg[1] = 2 | temp;
-        }
 
         /*
          * Adapter needs IP address in network byte order.
@@ -1635,6 +1768,7 @@ void qlcnic_83xx_config_ipaddr(struct qlcnic_adapter *adapter, __be32 ip,
                 dev_err(&adapter->netdev->dev,
                         "could not notify %s IP 0x%x request\n",
                         (mode == QLCNIC_IP_UP) ? "Add" : "Remove", ip);
+
         qlcnic_free_mbx_args(&cmd);
 }
 
@@ -1701,11 +1835,22 @@ int qlcnic_83xx_config_rss(struct qlcnic_adapter *adapter, int enable)
 
 }
 
+static void qlcnic_83xx_set_interface_id_macaddr(struct qlcnic_adapter *adapter,
+                                                 u32 *interface_id)
+{
+        if (qlcnic_sriov_pf_check(adapter)) {
+                qlcnic_pf_set_interface_id_macaddr(adapter, interface_id);
+        } else {
+                if (!qlcnic_sriov_vf_check(adapter))
+                        *interface_id = adapter->recv_ctx->context_id << 16;
+        }
+}
+
 int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
-                                   __le16 vlan_id, u8 op)
+                                   u16 vlan_id, u8 op)
 {
         int err;
-        u32 *buf;
+        u32 *buf, temp = 0;
         struct qlcnic_cmd_args cmd;
         struct qlcnic_macvlan_mbx mv;
 
@@ -1715,11 +1860,21 @@ int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
         err = qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIG_MAC_VLAN);
         if (err)
                 return err;
-        cmd.req.arg[1] = op | (1 << 8) |
-                        (adapter->recv_ctx->context_id << 16);
 
-        mv.vlan = le16_to_cpu(vlan_id);
-        memcpy(&mv.mac, addr, ETH_ALEN);
+        if (vlan_id)
+                op = (op == QLCNIC_MAC_ADD || op == QLCNIC_MAC_VLAN_ADD) ?
+                     QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_VLAN_DEL;
+
+        cmd.req.arg[1] = op | (1 << 8);
+        qlcnic_83xx_set_interface_id_macaddr(adapter, &temp);
+        cmd.req.arg[1] |= temp;
+        mv.vlan = vlan_id;
+        mv.mac_addr0 = addr[0];
+        mv.mac_addr1 = addr[1];
+        mv.mac_addr2 = addr[2];
+        mv.mac_addr3 = addr[3];
+        mv.mac_addr4 = addr[4];
+        mv.mac_addr5 = addr[5];
         buf = &cmd.req.arg[2];
         memcpy(buf, &mv, sizeof(struct qlcnic_macvlan_mbx));
         err = qlcnic_issue_cmd(adapter, &cmd);
@@ -1732,7 +1887,7 @@ int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
 }
 
 void qlcnic_83xx_change_l2_filter(struct qlcnic_adapter *adapter, u64 *addr,
-                                  __le16 vlan_id)
+                                  u16 vlan_id)
 {
         u8 mac[ETH_ALEN];
         memcpy(&mac, addr, ETH_ALEN);
@@ -1782,7 +1937,7 @@ int qlcnic_83xx_get_mac_address(struct qlcnic_adapter *adapter, u8 *mac)
 void qlcnic_83xx_config_intr_coal(struct qlcnic_adapter *adapter)
 {
         int err;
-        u32 temp;
+        u16 temp;
         struct qlcnic_cmd_args cmd;
         struct qlcnic_nic_intr_coalesce *coal = &adapter->ahw->coal;
 
@@ -1790,10 +1945,18 @@ void qlcnic_83xx_config_intr_coal(struct qlcnic_adapter *adapter)
                 return;
 
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIG_INTR_COAL);
-        cmd.req.arg[1] = 1 | (adapter->recv_ctx->context_id << 16);
+        if (coal->type == QLCNIC_INTR_COAL_TYPE_RX) {
+                temp = adapter->recv_ctx->context_id;
+                cmd.req.arg[1] = QLCNIC_INTR_COAL_TYPE_RX | temp << 16;
+                temp = coal->rx_time_us;
+                cmd.req.arg[2] = coal->rx_packets | temp << 16;
+        } else if (coal->type == QLCNIC_INTR_COAL_TYPE_TX) {
+                temp = adapter->tx_ring->ctx_id;
+                cmd.req.arg[1] = QLCNIC_INTR_COAL_TYPE_TX | temp << 16;
+                temp = coal->tx_time_us;
+                cmd.req.arg[2] = coal->tx_packets | temp << 16;
+        }
         cmd.req.arg[3] = coal->flag;
-        temp = coal->rx_time_us << 16;
-        cmd.req.arg[2] = coal->rx_packets | temp;
         err = qlcnic_issue_cmd(adapter, &cmd);
         if (err != QLCNIC_RCODE_SUCCESS)
                 dev_info(&adapter->pdev->dev,
@@ -1832,7 +1995,7 @@ irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data)
 
         event = readl(QLCNIC_MBX_FW(adapter->ahw, 0));
         if (event &  QLCNIC_MBX_ASYNC_EVENT)
-                qlcnic_83xx_process_aen(adapter);
+                __qlcnic_83xx_process_aen(adapter);
 out:
         mask = QLCRDX(adapter->ahw, QLCNIC_DEF_INT_MASK);
         writel(0, adapter->ahw->pci_base0 + mask);
@@ -2008,14 +2171,17 @@ int qlcnic_83xx_get_pci_info(struct qlcnic_adapter *adapter,
 int qlcnic_83xx_config_intrpt(struct qlcnic_adapter *adapter, bool op_type)
 {
         int i, index, err;
-        bool type;
         u8 max_ints;
-        u32 val, temp;
+        u32 val, temp, type;
         struct qlcnic_cmd_args cmd;
 
         max_ints = adapter->ahw->num_msix - 1;
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIG_INTRPT);
         cmd.req.arg[1] = max_ints;
+
+        if (qlcnic_sriov_vf_check(adapter))
+                cmd.req.arg[1] |= (adapter->ahw->pci_func << 8) | BIT_16;
+
         for (i = 0, index = 2; i < max_ints; i++) {
                 type = op_type ? QLCNIC_INTRPT_ADD : QLCNIC_INTRPT_DEL;
                 val = type | (adapter->ahw->intr_tbl[i].type << 4);
@@ -2169,7 +2335,7 @@ static int qlcnic_83xx_poll_flash_status_reg(struct qlcnic_adapter *adapter)
         return 0;
 }
 
-static int qlcnic_83xx_enable_flash_write_op(struct qlcnic_adapter *adapter)
+int qlcnic_83xx_enable_flash_write(struct qlcnic_adapter *adapter)
 {
         int ret;
         u32 cmd;
@@ -2187,7 +2353,7 @@ static int qlcnic_83xx_enable_flash_write_op(struct qlcnic_adapter *adapter)
         return 0;
 }
 
-static int qlcnic_83xx_disable_flash_write_op(struct qlcnic_adapter *adapter)
+int qlcnic_83xx_disable_flash_write(struct qlcnic_adapter *adapter)
 {
         int ret;
 
@@ -2261,7 +2427,7 @@ int qlcnic_83xx_erase_flash_sector(struct qlcnic_adapter *adapter,
                 return -EIO;
 
         if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
-                ret = qlcnic_83xx_enable_flash_write_op(adapter);
+                ret = qlcnic_83xx_enable_flash_write(adapter);
                 if (ret) {
                         qlcnic_83xx_unlock_flash(adapter);
                         dev_err(&adapter->pdev->dev,
@@ -2303,7 +2469,7 @@ int qlcnic_83xx_erase_flash_sector(struct qlcnic_adapter *adapter,
         }
 
         if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
-                ret = qlcnic_83xx_disable_flash_write_op(adapter);
+                ret = qlcnic_83xx_disable_flash_write(adapter);
                 if (ret) {
                         qlcnic_83xx_unlock_flash(adapter);
                         dev_err(&adapter->pdev->dev,
@@ -2343,8 +2509,8 @@ int qlcnic_83xx_flash_bulk_write(struct qlcnic_adapter *adapter, u32 addr,
         u32 temp;
         int ret = -EIO;
 
-        if ((count < QLC_83XX_FLASH_BULK_WRITE_MIN) ||
-            (count > QLC_83XX_FLASH_BULK_WRITE_MAX)) {
+        if ((count < QLC_83XX_FLASH_WRITE_MIN) ||
+            (count > QLC_83XX_FLASH_WRITE_MAX)) {
                 dev_err(&adapter->pdev->dev,
                         "%s: Invalid word count\n", __func__);
                 return -EIO;
@@ -2622,13 +2788,19 @@ int qlcnic_83xx_flash_read32(struct qlcnic_adapter *adapter, u32 flash_addr,
 
 int qlcnic_83xx_test_link(struct qlcnic_adapter *adapter)
 {
+        u8 pci_func;
         int err;
         u32 config = 0, state;
         struct qlcnic_cmd_args cmd;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
-        state = readl(ahw->pci_base0 + QLC_83XX_LINK_STATE(ahw->pci_func));
-        if (!QLC_83xx_FUNC_VAL(state, ahw->pci_func)) {
+        if (qlcnic_sriov_vf_check(adapter))
+                pci_func = adapter->portnum;
+        else
+                pci_func = ahw->pci_func;
+
+        state = readl(ahw->pci_base0 + QLC_83XX_LINK_STATE(pci_func));
+        if (!QLC_83xx_FUNC_VAL(state, pci_func)) {
                 dev_info(&adapter->pdev->dev, "link state down\n");
                 return config;
         }
@@ -2758,6 +2930,9 @@ static u64 *qlcnic_83xx_fill_stats(struct qlcnic_adapter *adapter,
                 /* fill in MAC rx frame stats */
                 for (k += 6; k < 80; k += 2)
                         data = qlcnic_83xx_copy_stats(cmd, data, k);
+                /* fill in eSwitch stats */
+                for (; k < total_regs; k += 2)
+                        data = qlcnic_83xx_copy_stats(cmd, data, k);
                 break;
         case QLC_83XX_STAT_RX:
                 for (k = 2; k < 8; k += 2)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
index 61f81f6c84a9..1f1d85e6f2af 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
@@ -12,6 +12,8 @@
 #include <linux/etherdevice.h>
 #include "qlcnic_hw.h"
 
+#define QLCNIC_83XX_BAR0_LENGTH 0x4000
+
 /* Directly mapped registers */
 #define QLC_83XX_CRB_WIN_BASE           0x3800
 #define QLC_83XX_CRB_WIN_FUNC(f)        (QLC_83XX_CRB_WIN_BASE+((f)*4))
@@ -86,6 +88,153 @@
 
 #define QLC_83XX_MAX_RESET_SEQ_ENTRIES  16
 
+/* status descriptor mailbox data
+ * @phy_addr_{low|high}: physical address of buffer
+ * @sds_ring_size: buffer size
+ * @intrpt_id: interrupt id
+ * @intrpt_val: source of interrupt
+ */
+struct qlcnic_sds_mbx {
+        u32     phy_addr_low;
+        u32     phy_addr_high;
+        u32     rsvd1[4];
+#if defined(__LITTLE_ENDIAN)
+        u16     sds_ring_size;
+        u16     rsvd2;
+        u16     rsvd3[2];
+        u16     intrpt_id;
+        u8      intrpt_val;
+        u8      rsvd4;
+#elif defined(__BIG_ENDIAN)
+        u16     rsvd2;
+        u16     sds_ring_size;
+        u16     rsvd3[2];
+        u8      rsvd4;
+        u8      intrpt_val;
+        u16     intrpt_id;
+#endif
+        u32     rsvd5;
+} __packed;
+
+/* receive descriptor buffer data
+ * phy_addr_reg_{low|high}: physical address of regular buffer
+ * phy_addr_jmb_{low|high}: physical address of jumbo buffer
+ * reg_ring_sz: size of regular buffer
+ * reg_ring_len: no. of entries in regular buffer
+ * jmb_ring_len: no. of entries in jumbo buffer
+ * jmb_ring_sz: size of jumbo buffer
+ */
+struct qlcnic_rds_mbx {
+        u32     phy_addr_reg_low;
+        u32     phy_addr_reg_high;
+        u32     phy_addr_jmb_low;
+        u32     phy_addr_jmb_high;
+#if defined(__LITTLE_ENDIAN)
+        u16     reg_ring_sz;
+        u16     reg_ring_len;
+        u16     jmb_ring_sz;
+        u16     jmb_ring_len;
+#elif defined(__BIG_ENDIAN)
+        u16     reg_ring_len;
+        u16     reg_ring_sz;
+        u16     jmb_ring_len;
+        u16     jmb_ring_sz;
+#endif
+} __packed;
+
+/* host producers for regular and jumbo rings */
+struct __host_producer_mbx {
+        u32     reg_buf;
+        u32     jmb_buf;
+} __packed;
+
+/* Receive context mailbox data outbox registers
+ * @state: state of the context
+ * @vport_id: virtual port id
+ * @context_id: receive context id
+ * @num_pci_func: number of pci functions of the port
+ * @phy_port: physical port id
+ */
+struct qlcnic_rcv_mbx_out {
+#if defined(__LITTLE_ENDIAN)
+        u8      rcv_num;
+        u8      sts_num;
+        u16     ctx_id;
+        u8      state;
+        u8      num_pci_func;
+        u8      phy_port;
+        u8      vport_id;
+#elif defined(__BIG_ENDIAN)
+        u16     ctx_id;
+        u8      sts_num;
+        u8      rcv_num;
+        u8      vport_id;
+        u8      phy_port;
+        u8      num_pci_func;
+        u8      state;
+#endif
+        u32     host_csmr[QLCNIC_MAX_RING_SETS];
+        struct __host_producer_mbx host_prod[QLCNIC_MAX_RING_SETS];
+} __packed;
+
+struct qlcnic_add_rings_mbx_out {
+#if defined(__LITTLE_ENDIAN)
+        u8      rcv_num;
+        u8      sts_num;
+        u16     ctx_id;
+#elif defined(__BIG_ENDIAN)
+        u16     ctx_id;
+        u8      sts_num;
+        u8      rcv_num;
+#endif
+        u32  host_csmr[QLCNIC_MAX_RING_SETS];
+        struct __host_producer_mbx host_prod[QLCNIC_MAX_RING_SETS];
+} __packed;
+
+/* Transmit context mailbox inbox registers
+ * @phys_addr_{low|high}: DMA address of the transmit buffer
+ * @cnsmr_index_{low|high}: host consumer index
+ * @size: legth of transmit buffer ring
+ * @intr_id: interrput id
+ * @src: src of interrupt
+ */
+struct qlcnic_tx_mbx {
+        u32     phys_addr_low;
+        u32     phys_addr_high;
+        u32     cnsmr_index_low;
+        u32     cnsmr_index_high;
+#if defined(__LITTLE_ENDIAN)
+        u16     size;
+        u16     intr_id;
+        u8      src;
+        u8      rsvd[3];
+#elif defined(__BIG_ENDIAN)
+        u16     intr_id;
+        u16     size;
+        u8      rsvd[3];
+        u8      src;
+#endif
+} __packed;
+
+/* Transmit context mailbox outbox registers
+ * @host_prod: host producer index
+ * @ctx_id: transmit context id
+ * @state: state of the transmit context
+ */
+
+struct qlcnic_tx_mbx_out {
+        u32     host_prod;
+#if defined(__LITTLE_ENDIAN)
+        u16     ctx_id;
+        u8      state;
+        u8      rsvd;
+#elif defined(__BIG_ENDIAN)
+        u8      rsvd;
+        u8      state;
+        u16     ctx_id;
+#endif
+} __packed;
+
 struct qlcnic_intrpt_config {
         u8      type;
         u8      enabled;
@@ -94,8 +243,23 @@ struct qlcnic_intrpt_config {
 };
 
 struct qlcnic_macvlan_mbx {
-        u8      mac[ETH_ALEN];
+#if defined(__LITTLE_ENDIAN)
+        u8      mac_addr0;
+        u8      mac_addr1;
+        u8      mac_addr2;
+        u8      mac_addr3;
+        u8      mac_addr4;
+        u8      mac_addr5;
         u16     vlan;
+#elif defined(__BIG_ENDIAN)
+        u8      mac_addr3;
+        u8      mac_addr2;
+        u8      mac_addr1;
+        u8      mac_addr0;
+        u16     vlan;
+        u8      mac_addr5;
+        u8      mac_addr4;
+#endif
 };
 
 struct qlc_83xx_fw_info {
@@ -153,6 +317,18 @@ struct qlc_83xx_idc {
         char            **name;
 };
 
+/* Device States */
+enum qlcnic_83xx_states {
+        QLC_83XX_IDC_DEV_UNKNOWN,
+        QLC_83XX_IDC_DEV_COLD,
+        QLC_83XX_IDC_DEV_INIT,
+        QLC_83XX_IDC_DEV_READY,
+        QLC_83XX_IDC_DEV_NEED_RESET,
+        QLC_83XX_IDC_DEV_NEED_QUISCENT,
+        QLC_83XX_IDC_DEV_FAILED,
+        QLC_83XX_IDC_DEV_QUISCENT
+};
+
 #define QLCNIC_MBX_RSP(reg)             LSW(reg)
 #define QLCNIC_MBX_NUM_REGS(reg)        (MSW(reg) & 0x1FF)
 #define QLCNIC_MBX_STATUS(reg)          (((reg) >> 25) & 0x7F)
@@ -205,7 +381,7 @@ struct qlc_83xx_idc {
 #define QLC_83XX_STAT_MAC       1
 #define QLC_83XX_TX_STAT_REGS   14
 #define QLC_83XX_RX_STAT_REGS   40
-#define QLC_83XX_MAC_STAT_REGS  80
+#define QLC_83XX_MAC_STAT_REGS  94
 
 #define QLC_83XX_GET_FUNC_PRIVILEGE(VAL, FN)    (0x3 & ((VAL) >> (FN * 2)))
 #define QLC_83XX_SET_FUNC_OPMODE(VAL, FN)       ((VAL) << (FN * 2))
@@ -226,6 +402,7 @@ struct qlc_83xx_idc {
 #define QLC_83XX_GET_FW_LRO_MSS_CAPABILITY(val) (val & 0x20000)
 #define QLC_83XX_VIRTUAL_NIC_MODE                       0xFF
 #define QLC_83XX_DEFAULT_MODE                           0x0
+#define QLC_83XX_SRIOV_MODE                             0x1
 #define QLCNIC_BRDTYPE_83XX_10G                 0x0083
 
 #define QLC_83XX_FLASH_SPI_STATUS               0x2808E010
@@ -242,8 +419,8 @@ struct qlc_83xx_idc {
 #define QLC_83XX_FLASH_BULK_WRITE_CMD           0xcadcadca
 #define QLC_83XX_FLASH_READ_RETRY_COUNT 5000
 #define QLC_83XX_FLASH_STATUS_READY             0x6
-#define QLC_83XX_FLASH_BULK_WRITE_MIN           2
-#define QLC_83XX_FLASH_BULK_WRITE_MAX           64
+#define QLC_83XX_FLASH_WRITE_MIN                2
+#define QLC_83XX_FLASH_WRITE_MAX                64
 #define QLC_83XX_FLASH_STATUS_REG_POLL_DELAY    1
 #define QLC_83XX_ERASE_MODE                     1
 #define QLC_83XX_WRITE_MODE                     2
@@ -336,7 +513,7 @@ int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *, u8);
 int qlcnic_83xx_config_hw_lro(struct qlcnic_adapter *, int);
 int qlcnic_83xx_config_rss(struct qlcnic_adapter *, int);
 int qlcnic_83xx_config_intr_coalesce(struct qlcnic_adapter *);
-void qlcnic_83xx_change_l2_filter(struct qlcnic_adapter *, u64 *, __le16);
+void qlcnic_83xx_change_l2_filter(struct qlcnic_adapter *, u64 *, u16);
 int qlcnic_83xx_get_pci_info(struct qlcnic_adapter *, struct qlcnic_pci_info *);
 int qlcnic_83xx_set_nic_info(struct qlcnic_adapter *, struct qlcnic_info *);
 void qlcnic_83xx_register_nic_idc_func(struct qlcnic_adapter *, int);
@@ -351,11 +528,14 @@ int qlcnic_ind_rd(struct qlcnic_adapter *, u32);
 int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *);
 int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *,
                               struct qlcnic_host_tx_ring *, int);
+void qlcnic_83xx_del_rx_ctx(struct qlcnic_adapter *);
+void qlcnic_83xx_del_tx_ctx(struct qlcnic_adapter *,
+                            struct qlcnic_host_tx_ring *);
 int qlcnic_83xx_get_nic_info(struct qlcnic_adapter *, struct qlcnic_info *, u8);
 int qlcnic_83xx_setup_link_event(struct qlcnic_adapter *, int);
 void qlcnic_83xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *);
 int qlcnic_83xx_config_intrpt(struct qlcnic_adapter *, bool);
-int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, __le16, u8);
+int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, u16, u8);
 int qlcnic_83xx_get_mac_address(struct qlcnic_adapter *, u8 *);
 void qlcnic_83xx_configure_mac(struct qlcnic_adapter *, u8 *, u8,
                                struct qlcnic_cmd_args *);
@@ -368,6 +548,7 @@ void qlcnic_83xx_config_intr_coal(struct qlcnic_adapter *);
 irqreturn_t qlcnic_83xx_handle_aen(int, void *);
 int qlcnic_83xx_get_port_info(struct qlcnic_adapter *);
 void qlcnic_83xx_enable_mbx_intrpt(struct qlcnic_adapter *);
+void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *);
 irqreturn_t qlcnic_83xx_clear_legacy_intr(struct qlcnic_adapter *);
 irqreturn_t qlcnic_83xx_intr(int, void *);
 irqreturn_t qlcnic_83xx_tmp_intr(int, void *);
@@ -377,7 +558,7 @@ void qlcnic_83xx_disable_intr(struct qlcnic_adapter *,
                              struct qlcnic_host_sds_ring *);
 void qlcnic_83xx_check_vf(struct qlcnic_adapter *,
                           const struct pci_device_id *);
-void qlcnic_83xx_process_aen(struct qlcnic_adapter *);
+void __qlcnic_83xx_process_aen(struct qlcnic_adapter *);
 int qlcnic_83xx_get_port_config(struct qlcnic_adapter *);
 int qlcnic_83xx_set_port_config(struct qlcnic_adapter *);
 int qlcnic_enable_eswitch(struct qlcnic_adapter *, u8, u8);
@@ -401,7 +582,7 @@ int qlcnic_83xx_read_flash_descriptor_table(struct qlcnic_adapter *);
 int qlcnic_83xx_flash_read32(struct qlcnic_adapter *, u32, u8 *, int);
 int qlcnic_83xx_lockless_flash_read32(struct qlcnic_adapter *,
                                       u32, u8 *, int);
-int qlcnic_83xx_init(struct qlcnic_adapter *);
+int qlcnic_83xx_init(struct qlcnic_adapter *, int);
 int qlcnic_83xx_idc_ready_state_entry(struct qlcnic_adapter *);
 int qlcnic_83xx_check_hw_status(struct qlcnic_adapter *p_dev);
 void qlcnic_83xx_idc_poll_dev_state(struct work_struct *);
@@ -434,5 +615,12 @@ int qlcnic_83xx_get_regs_len(struct qlcnic_adapter *);
 int qlcnic_83xx_get_registers(struct qlcnic_adapter *, u32 *);
 int qlcnic_83xx_loopback_test(struct net_device *, u8);
 int qlcnic_83xx_interrupt_test(struct net_device *);
+int qlcnic_83xx_set_led(struct net_device *, enum ethtool_phys_id_state);
 int qlcnic_83xx_flash_test(struct qlcnic_adapter *);
+int qlcnic_83xx_enable_flash_write(struct qlcnic_adapter *);
+int qlcnic_83xx_disable_flash_write(struct qlcnic_adapter *);
+u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *);
+u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *);
+void qlcnic_83xx_enable_mbx_poll(struct qlcnic_adapter *);
+void qlcnic_83xx_disable_mbx_poll(struct qlcnic_adapter *);
 #endif
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index 5c033f268ca5..ab1d8d99cbd5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -5,6 +5,7 @@
  * See LICENSE.qlcnic for copyright and licensing details.
  */
 
+#include "qlcnic_sriov.h"
 #include "qlcnic.h"
 #include "qlcnic_hw.h"
 
@@ -24,13 +25,24 @@
 #define QLC_83XX_OPCODE_TMPL_END                0x0080
 #define QLC_83XX_OPCODE_POLL_READ_LIST          0x0100
 
+/* EPORT control registers */
+#define QLC_83XX_RESET_CONTROL                  0x28084E50
+#define QLC_83XX_RESET_REG                      0x28084E60
+#define QLC_83XX_RESET_PORT0                    0x28084E70
+#define QLC_83XX_RESET_PORT1                    0x28084E80
+#define QLC_83XX_RESET_PORT2                    0x28084E90
+#define QLC_83XX_RESET_PORT3                    0x28084EA0
+#define QLC_83XX_RESET_SRESHIM                  0x28084EB0
+#define QLC_83XX_RESET_EPGSHIM                  0x28084EC0
+#define QLC_83XX_RESET_ETHERPCS                 0x28084ED0
+
 static int qlcnic_83xx_init_default_driver(struct qlcnic_adapter *adapter);
-static int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter);
 static int qlcnic_83xx_check_heartbeat(struct qlcnic_adapter *p_dev);
 static int qlcnic_83xx_restart_hw(struct qlcnic_adapter *adapter);
 
 /* Template header */
 struct qlc_83xx_reset_hdr {
+#if defined(__LITTLE_ENDIAN)
         u16     version;
         u16     signature;
         u16     size;
@@ -39,14 +51,31 @@ struct qlc_83xx_reset_hdr {
         u16     checksum;
         u16     init_offset;
         u16     start_offset;
+#elif defined(__BIG_ENDIAN)
+        u16     signature;
+        u16     version;
+        u16     entries;
+        u16     size;
+        u16     checksum;
+        u16     hdr_size;
+        u16     start_offset;
+        u16     init_offset;
+#endif
 } __packed;
 
 /* Command entry header. */
 struct qlc_83xx_entry_hdr {
-        u16 cmd;
-        u16 size;
-        u16 count;
-        u16 delay;
+#if defined(__LITTLE_ENDIAN)
+        u16     cmd;
+        u16     size;
+        u16     count;
+        u16     delay;
+#elif defined(__BIG_ENDIAN)
+        u16     size;
+        u16     cmd;
+        u16     delay;
+        u16     count;
+#endif
 } __packed;
 
 /* Generic poll command */
@@ -60,10 +89,17 @@ struct qlc_83xx_rmw {
         u32     mask;
         u32     xor_value;
         u32     or_value;
+#if defined(__LITTLE_ENDIAN)
         u8      shl;
         u8      shr;
         u8      index_a;
         u8      rsvd;
+#elif defined(__BIG_ENDIAN)
+        u8      rsvd;
+        u8      index_a;
+        u8      shr;
+        u8      shl;
+#endif
 } __packed;
 
 /* Generic command with 2 DWORD */
@@ -90,18 +126,6 @@ static const char *const qlc_83xx_idc_states[] = {
         "Quiesce"
 };
 
-/* Device States */
-enum qlcnic_83xx_states {
-        QLC_83XX_IDC_DEV_UNKNOWN,
-        QLC_83XX_IDC_DEV_COLD,
-        QLC_83XX_IDC_DEV_INIT,
-        QLC_83XX_IDC_DEV_READY,
-        QLC_83XX_IDC_DEV_NEED_RESET,
-        QLC_83XX_IDC_DEV_NEED_QUISCENT,
-        QLC_83XX_IDC_DEV_FAILED,
-        QLC_83XX_IDC_DEV_QUISCENT
-};
-
 static int
 qlcnic_83xx_idc_check_driver_presence_reg(struct qlcnic_adapter *adapter)
 {
@@ -137,7 +161,8 @@ static int qlcnic_83xx_idc_update_audit_reg(struct qlcnic_adapter *adapter,
                         return -EBUSY;
         }
 
-        val = adapter->portnum & 0xf;
+        val = QLCRDX(adapter->ahw, QLC_83XX_IDC_DRV_AUDIT);
+        val |= (adapter->portnum & 0xf);
         val |= mode << 7;
         if (mode)
                 seconds = jiffies / HZ - adapter->ahw->idc.sec_counter;
@@ -376,14 +401,18 @@ static void qlcnic_83xx_idc_detach_driver(struct qlcnic_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
 
         netif_device_detach(netdev);
+
         /* Disable mailbox interrupt */
-        QLCWRX(adapter->ahw, QLCNIC_MBX_INTR_ENBL, 0);
+        qlcnic_83xx_disable_mbx_intr(adapter);
         qlcnic_down(adapter, netdev);
         for (i = 0; i < adapter->ahw->num_msix; i++) {
                 adapter->ahw->intr_tbl[i].id = i;
                 adapter->ahw->intr_tbl[i].enabled = 0;
                 adapter->ahw->intr_tbl[i].src = 0;
         }
+
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_sriov_pf_reset(adapter);
 }
 
 /**
@@ -585,9 +614,15 @@ static int qlcnic_83xx_idc_check_fan_failure(struct qlcnic_adapter *adapter)
 
 static int qlcnic_83xx_idc_reattach_driver(struct qlcnic_adapter *adapter)
 {
+        int err;
+
         /* register for NIC IDC AEN Events */
         qlcnic_83xx_register_nic_idc_func(adapter, 1);
 
+        err = qlcnic_sriov_pf_reinit(adapter);
+        if (err)
+                return err;
+
         qlcnic_83xx_enable_mbx_intrpt(adapter);
 
         if (qlcnic_83xx_configure_opmode(adapter)) {
@@ -1350,6 +1385,19 @@ static void qlcnic_83xx_disable_pause_frames(struct qlcnic_adapter *adapter)
         qlcnic_83xx_unlock_driver(adapter);
 }
 
+static void qlcnic_83xx_take_eport_out_of_reset(struct qlcnic_adapter *adapter)
+{
+        QLCWR32(adapter, QLC_83XX_RESET_REG, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_PORT0, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_PORT1, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_PORT2, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_PORT3, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_SRESHIM, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_EPGSHIM, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_ETHERPCS, 0);
+        QLCWR32(adapter, QLC_83XX_RESET_CONTROL, 1);
+}
+
 static int qlcnic_83xx_check_heartbeat(struct qlcnic_adapter *p_dev)
 {
         u32 heartbeat, peg_status;
@@ -1371,6 +1419,7 @@ static int qlcnic_83xx_check_heartbeat(struct qlcnic_adapter *p_dev)
 
         if (ret) {
                 dev_err(&p_dev->pdev->dev, "firmware hang detected\n");
+                qlcnic_83xx_take_eport_out_of_reset(p_dev);
                 qlcnic_83xx_disable_pause_frames(p_dev);
                 peg_status = QLC_SHARED_REG_RD32(p_dev,
                                                  QLCNIC_PEG_HALT_STATUS1);
@@ -1893,6 +1942,9 @@ int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *adapter)
         qlcnic_get_func_no(adapter);
         op_mode = QLCRDX(ahw, QLC_83XX_DRV_OP_MODE);
 
+        if (test_bit(__QLCNIC_SRIOV_CAPABLE, &adapter->state))
+                op_mode = QLC_83XX_DEFAULT_OPMODE;
+
         if (op_mode == QLC_83XX_DEFAULT_OPMODE) {
                 adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
                 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
@@ -1922,6 +1974,16 @@ int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)
         ahw->max_mac_filters = nic_info.max_mac_filters;
         ahw->max_mtu = nic_info.max_mtu;
 
+        /* VNIC mode is detected by BIT_23 in capabilities. This bit is also
+         * set in case device is SRIOV capable. VNIC and SRIOV are mutually
+         * exclusive. So in case of sriov capable device load driver in
+         * default mode
+         */
+        if (test_bit(__QLCNIC_SRIOV_CAPABLE, &adapter->state)) {
+                ahw->nic_mode = QLC_83XX_DEFAULT_MODE;
+                return ahw->nic_mode;
+        }
+
         if (ahw->capabilities & BIT_23)
                 ahw->nic_mode = QLC_83XX_VIRTUAL_NIC_MODE;
         else
@@ -1930,7 +1992,7 @@ int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)
         return ahw->nic_mode;
 }
 
-static int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
+int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
 {
         int ret;
 
@@ -2008,10 +2070,13 @@ static void qlcnic_83xx_clear_function_resources(struct qlcnic_adapter *adapter)
         }
 }
 
-int qlcnic_83xx_init(struct qlcnic_adapter *adapter)
+int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
 {
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
+        if (qlcnic_sriov_vf_check(adapter))
+                return qlcnic_sriov_vf_init(adapter, pci_using_dac);
+
         if (qlcnic_83xx_check_hw_status(adapter))
                 return -EIO;
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index a69097c6b84d..43562c256379 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -382,8 +382,7 @@ out_free_rq:
         return err;
 }
 
-static void
-qlcnic_fw_cmd_destroy_rx_ctx(struct qlcnic_adapter *adapter)
+void qlcnic_82xx_fw_cmd_del_rx_ctx(struct qlcnic_adapter *adapter)
 {
         int err;
         struct qlcnic_cmd_args cmd;
@@ -422,22 +421,20 @@ int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,
 
         rq_size = SIZEOF_HOSTRQ_TX(struct qlcnic_hostrq_tx_ctx);
         rq_addr = dma_alloc_coherent(&adapter->pdev->dev, rq_size,
-                        &rq_phys_addr, GFP_KERNEL);
+                                     &rq_phys_addr, GFP_KERNEL | __GFP_ZERO);
         if (!rq_addr)
                 return -ENOMEM;
 
         rsp_size = SIZEOF_CARDRSP_TX(struct qlcnic_cardrsp_tx_ctx);
         rsp_addr = dma_alloc_coherent(&adapter->pdev->dev, rsp_size,
-                        &rsp_phys_addr, GFP_KERNEL);
+                                      &rsp_phys_addr, GFP_KERNEL | __GFP_ZERO);
         if (!rsp_addr) {
                 err = -ENOMEM;
                 goto out_free_rq;
         }
 
-        memset(rq_addr, 0, rq_size);
         prq = rq_addr;
 
-        memset(rsp_addr, 0, rsp_size);
         prsp = rsp_addr;
 
         prq->host_rsp_dma_addr = cpu_to_le64(rsp_phys_addr);
@@ -486,13 +483,13 @@ out_free_rq:
         return err;
 }
 
-static void
-qlcnic_fw_cmd_destroy_tx_ctx(struct qlcnic_adapter *adapter,
-                             struct qlcnic_host_tx_ring *tx_ring)
+void qlcnic_82xx_fw_cmd_del_tx_ctx(struct qlcnic_adapter *adapter,
+                                   struct qlcnic_host_tx_ring *tx_ring)
 {
         struct qlcnic_cmd_args cmd;
 
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_TX_CTX);
+
         cmd.req.arg[1] = tx_ring->ctx_id;
         if (qlcnic_issue_cmd(adapter, &cmd))
                 dev_err(&adapter->pdev->dev,
@@ -532,20 +529,15 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
                 ptr = (__le32 *)dma_alloc_coherent(&pdev->dev, sizeof(u32),
                                                    &tx_ring->hw_cons_phys_addr,
                                                    GFP_KERNEL);
-
-                if (ptr == NULL) {
-                        dev_err(&pdev->dev, "failed to allocate tx consumer\n");
+                if (ptr == NULL)
                         return -ENOMEM;
-                }
+
                 tx_ring->hw_consumer = ptr;
                 /* cmd desc ring */
                 addr = dma_alloc_coherent(&pdev->dev, TX_DESC_RINGSIZE(tx_ring),
                                           &tx_ring->phys_addr,
                                           GFP_KERNEL);
-
                 if (addr == NULL) {
-                        dev_err(&pdev->dev,
-                                "failed to allocate tx desc ring\n");
                         err = -ENOMEM;
                         goto err_out_free;
                 }
@@ -556,11 +548,9 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
         for (ring = 0; ring < adapter->max_rds_rings; ring++) {
                 rds_ring = &recv_ctx->rds_rings[ring];
                 addr = dma_alloc_coherent(&adapter->pdev->dev,
-                                RCV_DESC_RINGSIZE(rds_ring),
-                                &rds_ring->phys_addr, GFP_KERNEL);
+                                          RCV_DESC_RINGSIZE(rds_ring),
+                                          &rds_ring->phys_addr, GFP_KERNEL);
                 if (addr == NULL) {
-                        dev_err(&pdev->dev,
-                                "failed to allocate rds ring [%d]\n", ring);
                         err = -ENOMEM;
                         goto err_out_free;
                 }
@@ -572,11 +562,9 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
                 sds_ring = &recv_ctx->sds_rings[ring];
 
                 addr = dma_alloc_coherent(&adapter->pdev->dev,
-                                STATUS_DESC_RINGSIZE(sds_ring),
-                                &sds_ring->phys_addr, GFP_KERNEL);
+                                          STATUS_DESC_RINGSIZE(sds_ring),
+                                          &sds_ring->phys_addr, GFP_KERNEL);
                 if (addr == NULL) {
-                        dev_err(&pdev->dev,
-                                "failed to allocate sds ring [%d]\n", ring);
                         err = -ENOMEM;
                         goto err_out_free;
                 }
@@ -616,13 +604,12 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev)
                                                   &dev->tx_ring[ring],
                                                   ring);
                 if (err) {
-                        qlcnic_fw_cmd_destroy_rx_ctx(dev);
+                        qlcnic_fw_cmd_del_rx_ctx(dev);
                         if (ring == 0)
                                 goto err_out;
 
                         for (i = 0; i < ring; i++)
-                                qlcnic_fw_cmd_destroy_tx_ctx(dev,
-                                                             &dev->tx_ring[i]);
+                                qlcnic_fw_cmd_del_tx_ctx(dev, &dev->tx_ring[i]);
 
                         goto err_out;
                 }
@@ -644,10 +631,10 @@ void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
         int ring;
 
         if (test_and_clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state)) {
-                qlcnic_fw_cmd_destroy_rx_ctx(adapter);
+                qlcnic_fw_cmd_del_rx_ctx(adapter);
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++)
-                        qlcnic_fw_cmd_destroy_tx_ctx(adapter,
-                                                     &adapter->tx_ring[ring]);
+                        qlcnic_fw_cmd_del_tx_ctx(adapter,
+                                                 &adapter->tx_ring[ring]);
 
                 if (qlcnic_83xx_check(adapter) &&
                     (adapter->flags & QLCNIC_MSIX_ENABLED)) {
@@ -655,7 +642,7 @@ void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
                                 qlcnic_83xx_config_intrpt(adapter, 0);
                 }
                 /* Allow dma queues to drain after context reset */
-                mdelay(20);
+                msleep(20);
         }
 }
 
@@ -753,10 +740,9 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter,
         size_t  nic_size = sizeof(struct qlcnic_info_le);
 
         nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
-                                &nic_dma_t, GFP_KERNEL);
+                                           &nic_dma_t, GFP_KERNEL | __GFP_ZERO);
         if (!nic_info_addr)
                 return -ENOMEM;
-        memset(nic_info_addr, 0, nic_size);
 
         nic_info = nic_info_addr;
 
@@ -804,11 +790,10 @@ int qlcnic_82xx_set_nic_info(struct qlcnic_adapter *adapter,
                 return err;
 
         nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
-                        &nic_dma_t, GFP_KERNEL);
+                                           &nic_dma_t, GFP_KERNEL | __GFP_ZERO);
         if (!nic_info_addr)
                 return -ENOMEM;
 
-        memset(nic_info_addr, 0, nic_size);
         nic_info = nic_info_addr;
 
         nic_info->pci_func = cpu_to_le16(nic->pci_func);
@@ -854,10 +839,10 @@ int qlcnic_82xx_get_pci_info(struct qlcnic_adapter *adapter,
         size_t pci_size = npar_size * QLCNIC_MAX_PCI_FUNC;
 
         pci_info_addr = dma_alloc_coherent(&adapter->pdev->dev, pci_size,
-                        &pci_info_dma_t, GFP_KERNEL);
+                                           &pci_info_dma_t,
+                                           GFP_KERNEL | __GFP_ZERO);
         if (!pci_info_addr)
                 return -ENOMEM;
-        memset(pci_info_addr, 0, pci_size);
 
         npar = pci_info_addr;
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_PCI_INFO);
@@ -949,12 +934,9 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
         }
 
         stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
-                        &stats_dma_t, GFP_KERNEL);
-        if (!stats_addr) {
-                dev_err(&adapter->pdev->dev, "Unable to allocate memory\n");
+                                        &stats_dma_t, GFP_KERNEL | __GFP_ZERO);
+        if (!stats_addr)
                 return -ENOMEM;
-        }
-        memset(stats_addr, 0, stats_size);
 
         arg1 = func | QLCNIC_STATS_VERSION << 8 | QLCNIC_STATS_PORT << 12;
         arg1 |= rx_tx << 15 | stats_size << 16;
@@ -1003,13 +985,10 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
                 return -ENOMEM;
 
         stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
-                        &stats_dma_t, GFP_KERNEL);
-        if (!stats_addr) {
-                dev_err(&adapter->pdev->dev,
-                        "%s: Unable to allocate memory.\n", __func__);
+                                        &stats_dma_t, GFP_KERNEL | __GFP_ZERO);
+        if (!stats_addr)
                 return -ENOMEM;
-        }
-        memset(stats_addr, 0, stats_size);
+
         qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_MAC_STATS);
         cmd.req.arg[1] = stats_size << 16;
         cmd.req.arg[2] = MSD(stats_dma_t);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 5641f8ec49ab..08efb4635007 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -115,6 +115,13 @@ static const char qlcnic_83xx_mac_stats_strings[][ETH_GSTRING_LEN] = {
         "mac_rx_dropped",
         "mac_crc_error",
         "mac_align_error",
+        "eswitch_frames",
+        "eswitch_bytes",
+        "eswitch_multicast_frames",
+        "eswitch_broadcast_frames",
+        "eswitch_unicast_frames",
+        "eswitch_error_free_frames",
+        "eswitch_error_free_bytes",
 };
 
 #define QLCNIC_STATS_LEN        ARRAY_SIZE(qlcnic_gstrings_stats)
@@ -149,7 +156,8 @@ static const char qlcnic_gstrings_test[][ETH_GSTRING_LEN] = {
 
 static inline int qlcnic_82xx_statistics(void)
 {
-        return QLCNIC_STATS_LEN + ARRAY_SIZE(qlcnic_83xx_mac_stats_strings);
+        return ARRAY_SIZE(qlcnic_device_gstrings_stats) +
+               ARRAY_SIZE(qlcnic_83xx_mac_stats_strings);
 }
 
 static inline int qlcnic_83xx_statistics(void)
@@ -634,7 +642,7 @@ static int qlcnic_set_channels(struct net_device *dev,
             channel->tx_count != channel->max_tx)
                 return -EINVAL;
 
-        err = qlcnic_validate_max_rss(channel->max_rx, channel->rx_count);
+        err = qlcnic_validate_max_rss(adapter, channel->rx_count);
         if (err)
                 return err;
 
@@ -858,9 +866,11 @@ clear_diag_irq:
         return ret;
 }
 
-#define QLCNIC_ILB_PKT_SIZE 64
-#define QLCNIC_NUM_ILB_PKT      16
-#define QLCNIC_ILB_MAX_RCV_LOOP 10
+#define QLCNIC_ILB_PKT_SIZE             64
+#define QLCNIC_NUM_ILB_PKT              16
+#define QLCNIC_ILB_MAX_RCV_LOOP         10
+#define QLCNIC_LB_PKT_POLL_DELAY_MSEC   1
+#define QLCNIC_LB_PKT_POLL_COUNT        20
 
 static void qlcnic_create_loopback_buff(unsigned char *data, u8 mac[])
 {
@@ -897,9 +907,9 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)
                 loop = 0;
 
                 do {
-                        msleep(1);
+                        msleep(QLCNIC_LB_PKT_POLL_DELAY_MSEC);
                         qlcnic_process_rcv_ring_diag(sds_ring);
-                        if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP)
+                        if (loop++ > QLCNIC_LB_PKT_POLL_COUNT)
                                 break;
                 } while (!adapter->ahw->diag_cnt);
 
@@ -1070,8 +1080,7 @@ qlcnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)
         }
 }
 
-static void
-qlcnic_fill_stats(u64 *data, void *stats, int type)
+static u64 *qlcnic_fill_stats(u64 *data, void *stats, int type)
 {
         if (type == QLCNIC_MAC_STATS) {
                 struct qlcnic_mac_statistics *mac_stats =
@@ -1120,6 +1129,7 @@ qlcnic_fill_stats(u64 *data, void *stats, int type)
                 *data++ = QLCNIC_FILL_STATS(esw_stats->local_frames);
                 *data++ = QLCNIC_FILL_STATS(esw_stats->numbytes);
         }
+        return data;
 }
 
 static void qlcnic_get_ethtool_stats(struct net_device *dev,
@@ -1147,7 +1157,7 @@ static void qlcnic_get_ethtool_stats(struct net_device *dev,
                 /* Retrieve MAC statistics from firmware */
                 memset(&mac_stats, 0, sizeof(struct qlcnic_mac_statistics));
                 qlcnic_get_mac_stats(adapter, &mac_stats);
-                qlcnic_fill_stats(data, &mac_stats, QLCNIC_MAC_STATS);
+                data = qlcnic_fill_stats(data, &mac_stats, QLCNIC_MAC_STATS);
         }
 
         if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
@@ -1159,7 +1169,7 @@ static void qlcnic_get_ethtool_stats(struct net_device *dev,
         if (ret)
                 return;
 
-        qlcnic_fill_stats(data, &port_stats.rx, QLCNIC_ESW_STATS);
+        data = qlcnic_fill_stats(data, &port_stats.rx, QLCNIC_ESW_STATS);
         ret = qlcnic_get_port_stats(adapter, adapter->ahw->pci_func,
                         QLCNIC_QUERY_TX_COUNTER, &port_stats.tx);
         if (ret)
@@ -1176,7 +1186,8 @@ static int qlcnic_set_led(struct net_device *dev,
         int err = -EIO, active = 1;
 
         if (qlcnic_83xx_check(adapter))
-                return -EOPNOTSUPP;
+                return qlcnic_83xx_set_led(dev, state);
+
         if (adapter->ahw->op_mode == QLCNIC_NON_PRIV_FUNC) {
                 netdev_warn(dev, "LED test not supported for non "
                                 "privilege function\n");
@@ -1292,6 +1303,9 @@ static int qlcnic_set_intr_coalesce(struct net_device *netdev,
                         struct ethtool_coalesce *ethcoal)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_nic_intr_coalesce *coal;
+        u32 rx_coalesce_usecs, rx_max_frames;
+        u32 tx_coalesce_usecs, tx_max_frames;
 
         if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
                 return -EINVAL;
@@ -1302,8 +1316,8 @@ static int qlcnic_set_intr_coalesce(struct net_device *netdev,
         */
         if (ethcoal->rx_coalesce_usecs > 0xffff ||
                 ethcoal->rx_max_coalesced_frames > 0xffff ||
-                ethcoal->tx_coalesce_usecs ||
-                ethcoal->tx_max_coalesced_frames ||
+                ethcoal->tx_coalesce_usecs > 0xffff ||
+                ethcoal->tx_max_coalesced_frames > 0xffff ||
                 ethcoal->rx_coalesce_usecs_irq ||
                 ethcoal->rx_max_coalesced_frames_irq ||
                 ethcoal->tx_coalesce_usecs_irq ||
@@ -1323,18 +1337,55 @@ static int qlcnic_set_intr_coalesce(struct net_device *netdev,
                 ethcoal->tx_max_coalesced_frames_high)
                 return -EINVAL;
 
-        if (!ethcoal->rx_coalesce_usecs ||
-                !ethcoal->rx_max_coalesced_frames) {
-                adapter->ahw->coal.flag = QLCNIC_INTR_DEFAULT;
-                adapter->ahw->coal.rx_time_us =
-                        QLCNIC_DEFAULT_INTR_COALESCE_RX_TIME_US;
-                adapter->ahw->coal.rx_packets =
-                        QLCNIC_DEFAULT_INTR_COALESCE_RX_PACKETS;
+        coal = &adapter->ahw->coal;
+
+        if (qlcnic_83xx_check(adapter)) {
+                if (!ethcoal->tx_coalesce_usecs ||
+                    !ethcoal->tx_max_coalesced_frames ||
+                    !ethcoal->rx_coalesce_usecs ||
+                    !ethcoal->rx_max_coalesced_frames) {
+                        coal->flag = QLCNIC_INTR_DEFAULT;
+                        coal->type = QLCNIC_INTR_COAL_TYPE_RX;
+                        coal->rx_time_us = QLCNIC_DEF_INTR_COALESCE_RX_TIME_US;
+                        coal->rx_packets = QLCNIC_DEF_INTR_COALESCE_RX_PACKETS;
+                        coal->tx_time_us = QLCNIC_DEF_INTR_COALESCE_TX_TIME_US;
+                        coal->tx_packets = QLCNIC_DEF_INTR_COALESCE_TX_PACKETS;
+                } else {
+                        tx_coalesce_usecs = ethcoal->tx_coalesce_usecs;
+                        tx_max_frames = ethcoal->tx_max_coalesced_frames;
+                        rx_coalesce_usecs = ethcoal->rx_coalesce_usecs;
+                        rx_max_frames = ethcoal->rx_max_coalesced_frames;
+                        coal->flag = 0;
+
+                        if ((coal->rx_time_us == rx_coalesce_usecs) &&
+                            (coal->rx_packets == rx_max_frames)) {
+                                coal->type = QLCNIC_INTR_COAL_TYPE_TX;
+                                coal->tx_time_us = tx_coalesce_usecs;
+                                coal->tx_packets = tx_max_frames;
+                        } else if ((coal->tx_time_us == tx_coalesce_usecs) &&
+                                   (coal->tx_packets == tx_max_frames)) {
+                                coal->type = QLCNIC_INTR_COAL_TYPE_RX;
+                                coal->rx_time_us = rx_coalesce_usecs;
+                                coal->rx_packets = rx_max_frames;
+                        } else {
+                                coal->type = QLCNIC_INTR_COAL_TYPE_RX;
+                                coal->rx_time_us = rx_coalesce_usecs;
+                                coal->rx_packets = rx_max_frames;
+                                coal->tx_time_us = tx_coalesce_usecs;
+                                coal->tx_packets = tx_max_frames;
+                        }
+                }
         } else {
-                adapter->ahw->coal.flag = 0;
-                adapter->ahw->coal.rx_time_us = ethcoal->rx_coalesce_usecs;
-                adapter->ahw->coal.rx_packets =
-                        ethcoal->rx_max_coalesced_frames;
+                if (!ethcoal->rx_coalesce_usecs ||
+                    !ethcoal->rx_max_coalesced_frames) {
+                        coal->flag = QLCNIC_INTR_DEFAULT;
+                        coal->rx_time_us = QLCNIC_DEF_INTR_COALESCE_RX_TIME_US;
+                        coal->rx_packets = QLCNIC_DEF_INTR_COALESCE_RX_PACKETS;
+                } else {
+                        coal->flag = 0;
+                        coal->rx_time_us = ethcoal->rx_coalesce_usecs;
+                        coal->rx_packets = ethcoal->rx_max_coalesced_frames;
+                }
         }
 
         qlcnic_config_intr_coalesce(adapter);
@@ -1352,6 +1403,8 @@ static int qlcnic_get_intr_coalesce(struct net_device *netdev,
 
         ethcoal->rx_coalesce_usecs = adapter->ahw->coal.rx_time_us;
         ethcoal->rx_max_coalesced_frames = adapter->ahw->coal.rx_packets;
+        ethcoal->tx_coalesce_usecs = adapter->ahw->coal.tx_time_us;
+        ethcoal->tx_max_coalesced_frames = adapter->ahw->coal.tx_packets;
 
         return 0;
 }
@@ -1537,3 +1590,25 @@ const struct ethtool_ops qlcnic_ethtool_ops = {
         .get_dump_data = qlcnic_get_dump_data,
         .set_dump = qlcnic_set_dump,
 };
+
+const struct ethtool_ops qlcnic_sriov_vf_ethtool_ops = {
+        .get_settings           = qlcnic_get_settings,
+        .get_drvinfo            = qlcnic_get_drvinfo,
+        .get_regs_len           = qlcnic_get_regs_len,
+        .get_regs               = qlcnic_get_regs,
+        .get_link               = ethtool_op_get_link,
+        .get_eeprom_len         = qlcnic_get_eeprom_len,
+        .get_eeprom             = qlcnic_get_eeprom,
+        .get_ringparam          = qlcnic_get_ringparam,
+        .set_ringparam          = qlcnic_set_ringparam,
+        .get_channels           = qlcnic_get_channels,
+        .get_pauseparam         = qlcnic_get_pauseparam,
+        .get_wol                = qlcnic_get_wol,
+        .get_strings            = qlcnic_get_strings,
+        .get_ethtool_stats      = qlcnic_get_ethtool_stats,
+        .get_sset_count         = qlcnic_get_sset_count,
+        .get_coalesce           = qlcnic_get_intr_coalesce,
+        .set_coalesce           = qlcnic_set_intr_coalesce,
+        .set_msglevel           = qlcnic_set_msglevel,
+        .get_msglevel           = qlcnic_get_msglevel,
+};
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index 44197ca1456c..c0f0c0d0a790 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
@@ -669,7 +669,7 @@ enum {
 #define QLCNIC_CMDPEG_CHECK_RETRY_COUNT 60
 #define QLCNIC_CMDPEG_CHECK_DELAY       500
 #define QLCNIC_HEARTBEAT_PERIOD_MSECS   200
-#define QLCNIC_HEARTBEAT_CHECK_RETRY_COUNT      45
+#define QLCNIC_HEARTBEAT_CHECK_RETRY_COUNT      10
 
 #define QLCNIC_MAX_MC_COUNT             38
 #define QLCNIC_WATCHDOG_TIMEOUTVALUE    5
@@ -714,7 +714,9 @@ enum {
         QLCNIC_MGMT_FUNC        = 0,
         QLCNIC_PRIV_FUNC        = 1,
         QLCNIC_NON_PRIV_FUNC    = 2,
-        QLCNIC_UNKNOWN_FUNC_MODE = 3
+        QLCNIC_SRIOV_PF_FUNC    = 3,
+        QLCNIC_SRIOV_VF_FUNC    = 4,
+        QLCNIC_UNKNOWN_FUNC_MODE = 5
 };
 
 enum {
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index f89cc7a3fe6c..6a6512ba9f38 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -423,7 +423,7 @@ qlcnic_send_cmd_descs(struct qlcnic_adapter *adapter,
 }
 
 int qlcnic_82xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
-                                   __le16 vlan_id, u8 op)
+                                   u16 vlan_id, u8 op)
 {
         struct qlcnic_nic_req req;
         struct qlcnic_mac_req *mac_req;
@@ -441,7 +441,7 @@ int qlcnic_82xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
         memcpy(mac_req->mac_addr, addr, 6);
 
         vlan_req = (struct qlcnic_vlan_req *)&req.words[1];
-        vlan_req->vlan_id = vlan_id;
+        vlan_req->vlan_id = cpu_to_le16(vlan_id);
 
         return qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
 }
@@ -468,7 +468,7 @@ int qlcnic_nic_del_mac(struct qlcnic_adapter *adapter, const u8 *addr)
         return err;
 }
 
-int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr)
+int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr, u16 vlan)
 {
         struct list_head *head;
         struct qlcnic_mac_list_s *cur;
@@ -487,7 +487,7 @@ int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr)
         memcpy(cur->mac_addr, addr, ETH_ALEN);
 
         if (qlcnic_sre_macaddr_change(adapter,
-                                cur->mac_addr, 0, QLCNIC_MAC_ADD)) {
+                                cur->mac_addr, vlan, QLCNIC_MAC_ADD)) {
                 kfree(cur);
                 return -EIO;
         }
@@ -496,7 +496,7 @@ int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr)
         return 0;
 }
 
-void qlcnic_set_multi(struct net_device *netdev)
+void __qlcnic_set_multi(struct net_device *netdev, u16 vlan)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct netdev_hw_addr *ha;
@@ -508,8 +508,9 @@ void qlcnic_set_multi(struct net_device *netdev)
         if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
                 return;
 
-        qlcnic_nic_add_mac(adapter, adapter->mac_addr);
-        qlcnic_nic_add_mac(adapter, bcast_addr);
+        if (!qlcnic_sriov_vf_check(adapter))
+                qlcnic_nic_add_mac(adapter, adapter->mac_addr, vlan);
+        qlcnic_nic_add_mac(adapter, bcast_addr, vlan);
 
         if (netdev->flags & IFF_PROMISC) {
                 if (!(adapter->flags & QLCNIC_PROMISC_DISABLED))
@@ -523,23 +524,55 @@ void qlcnic_set_multi(struct net_device *netdev)
                 goto send_fw_cmd;
         }
 
-        if (!netdev_mc_empty(netdev)) {
+        if (!netdev_mc_empty(netdev) && !qlcnic_sriov_vf_check(adapter)) {
                 netdev_for_each_mc_addr(ha, netdev) {
-                        qlcnic_nic_add_mac(adapter, ha->addr);
+                        qlcnic_nic_add_mac(adapter, ha->addr, vlan);
                 }
         }
 
+        if (qlcnic_sriov_vf_check(adapter))
+                qlcnic_vf_add_mc_list(netdev, vlan);
+
 send_fw_cmd:
-        if (mode == VPORT_MISS_MODE_ACCEPT_ALL && !adapter->fdb_mac_learn) {
-                qlcnic_alloc_lb_filters_mem(adapter);
-                adapter->drv_mac_learn = true;
-        } else {
-                adapter->drv_mac_learn = false;
+        if (!qlcnic_sriov_vf_check(adapter)) {
+                if (mode == VPORT_MISS_MODE_ACCEPT_ALL &&
+                    !adapter->fdb_mac_learn) {
+                        qlcnic_alloc_lb_filters_mem(adapter);
+                        adapter->drv_mac_learn = true;
+                } else {
+                        adapter->drv_mac_learn = false;
+                }
         }
 
         qlcnic_nic_set_promisc(adapter, mode);
 }
 
+void qlcnic_set_multi(struct net_device *netdev)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct netdev_hw_addr *ha;
+        struct qlcnic_mac_list_s *cur;
+
+        if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
+                return;
+        if (qlcnic_sriov_vf_check(adapter)) {
+                if (!netdev_mc_empty(netdev)) {
+                        netdev_for_each_mc_addr(ha, netdev) {
+                                cur = kzalloc(sizeof(struct qlcnic_mac_list_s),
+                                              GFP_ATOMIC);
+                                if (cur == NULL)
+                                        break;
+                                memcpy(cur->mac_addr,
+                                       ha->addr, ETH_ALEN);
+                                list_add_tail(&cur->list, &adapter->vf_mc_list);
+                        }
+                }
+                qlcnic_sriov_vf_schedule_multi(adapter->netdev);
+                return;
+        }
+        __qlcnic_set_multi(netdev, 0);
+}
+
 int qlcnic_82xx_nic_set_promisc(struct qlcnic_adapter *adapter, u32 mode)
 {
         struct qlcnic_nic_req req;
@@ -559,7 +592,7 @@ int qlcnic_82xx_nic_set_promisc(struct qlcnic_adapter *adapter, u32 mode)
                                 (struct cmd_desc_type0 *)&req, 1);
 }
 
-void qlcnic_free_mac_list(struct qlcnic_adapter *adapter)
+void qlcnic_82xx_free_mac_list(struct qlcnic_adapter *adapter)
 {
         struct qlcnic_mac_list_s *cur;
         struct list_head *head = &adapter->mac_list;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
index 5b8749eda11f..95b1b5732838 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
@@ -83,6 +83,8 @@ enum qlcnic_regs {
 #define QLCNIC_CMD_CONFIG_PORT                  0x2e
 #define QLCNIC_CMD_TEMP_SIZE                    0x2f
 #define QLCNIC_CMD_GET_TEMP_HDR                 0x30
+#define QLCNIC_CMD_BC_EVENT_SETUP               0x31
+#define QLCNIC_CMD_CONFIG_VPORT                 0x32
 #define QLCNIC_CMD_GET_MAC_STATS                0x37
 #define QLCNIC_CMD_SET_DRV_VER                  0x38
 #define QLCNIC_CMD_CONFIGURE_RSS                0x41
@@ -114,6 +116,7 @@ enum qlcnic_regs {
 #define QLCNIC_SET_FAC_DEF_MAC                  5
 
 #define QLCNIC_MBX_LINK_EVENT           0x8001
+#define QLCNIC_MBX_BC_EVENT             0x8002
 #define QLCNIC_MBX_COMP_EVENT           0x8100
 #define QLCNIC_MBX_REQUEST_EVENT        0x8101
 #define QLCNIC_MBX_TIME_EXTEND_EVENT    0x8102
@@ -156,7 +159,7 @@ int qlcnic_82xx_nic_set_promisc(struct qlcnic_adapter *adapter, u32);
 int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
                          struct net_device *netdev);
 void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter,
-                               u64 *uaddr, __le16 vlan_id);
+                               u64 *uaddr, u16 vlan_id);
 void qlcnic_82xx_config_intr_coalesce(struct qlcnic_adapter *adapter);
 int qlcnic_82xx_config_rss(struct qlcnic_adapter *adapter, int);
 void qlcnic_82xx_config_ipaddr(struct qlcnic_adapter *adapter,
@@ -175,7 +178,10 @@ int qlcnic_82xx_issue_cmd(struct qlcnic_adapter *adapter,
 int qlcnic_82xx_fw_cmd_create_rx_ctx(struct qlcnic_adapter *);
 int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *,
                                      struct qlcnic_host_tx_ring *tx_ring, int);
-int qlcnic_82xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, __le16, u8);
+void qlcnic_82xx_fw_cmd_del_rx_ctx(struct qlcnic_adapter *);
+void qlcnic_82xx_fw_cmd_del_tx_ctx(struct qlcnic_adapter *,
+                                   struct qlcnic_host_tx_ring *);
+int qlcnic_82xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, u16, u8);
 int qlcnic_82xx_get_mac_address(struct qlcnic_adapter *, u8*);
 int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *, struct qlcnic_info *, u8);
 int qlcnic_82xx_set_nic_info(struct qlcnic_adapter *, struct qlcnic_info *);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 5fa847fe388a..d3f8797efcc3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -9,6 +9,7 @@
 #include <linux/if_vlan.h>
 #include <net/ip.h>
 #include <linux/ipv6.h>
+#include <net/checksum.h>
 
 #include "qlcnic.h"
 
@@ -146,7 +147,10 @@ static inline u8 qlcnic_mac_hash(u64 mac)
 static inline u32 qlcnic_get_ref_handle(struct qlcnic_adapter *adapter,
                                         u16 handle, u8 ring_id)
 {
-        if (adapter->pdev->device == PCI_DEVICE_ID_QLOGIC_QLE834X)
+        unsigned short device = adapter->pdev->device;
+
+        if ((device == PCI_DEVICE_ID_QLOGIC_QLE834X) ||
+            (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X))
                 return handle | (ring_id << 15);
         else
                 return handle;
@@ -158,7 +162,7 @@ static inline int qlcnic_82xx_is_lb_pkt(u64 sts_data)
 }
 
 void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
-                          int loopback_pkt, __le16 vlan_id)
+                          int loopback_pkt, u16 vlan_id)
 {
         struct ethhdr *phdr = (struct ethhdr *)(skb->data);
         struct qlcnic_filter *fil, *tmp_fil;
@@ -236,7 +240,7 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
 }
 
 void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr,
-                               __le16 vlan_id)
+                               u16 vlan_id)
 {
         struct cmd_desc_type0 *hwdesc;
         struct qlcnic_nic_req *req;
@@ -261,7 +265,7 @@ void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr,
         memcpy(mac_req->mac_addr, &uaddr, ETH_ALEN);
 
         vlan_req = (struct qlcnic_vlan_req *)&req->words[1];
-        vlan_req->vlan_id = vlan_id;
+        vlan_req->vlan_id = cpu_to_le16(vlan_id);
 
         tx_ring->producer = get_next_index(producer, tx_ring->num_desc);
         smp_mb();
@@ -277,7 +281,7 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
         struct net_device *netdev = adapter->netdev;
         struct ethhdr *phdr = (struct ethhdr *)(skb->data);
         u64 src_addr = 0;
-        __le16 vlan_id = 0;
+        u16 vlan_id = 0;
         u8 hindex;
 
         if (ether_addr_equal(phdr->h_source, adapter->mac_addr))
@@ -340,14 +344,14 @@ static int qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
                 flags = FLAGS_VLAN_OOB;
                 vlan_tci = vlan_tx_tag_get(skb);
         }
-        if (unlikely(adapter->pvid)) {
+        if (unlikely(adapter->tx_pvid)) {
                 if (vlan_tci && !(adapter->flags & QLCNIC_TAGGING_ENABLED))
                         return -EIO;
                 if (vlan_tci && (adapter->flags & QLCNIC_TAGGING_ENABLED))
                         goto set_flags;
 
                 flags = FLAGS_VLAN_OOB;
-                vlan_tci = adapter->pvid;
+                vlan_tci = adapter->tx_pvid;
         }
 set_flags:
         qlcnic_set_tx_vlan_tci(first_desc, vlan_tci);
@@ -975,10 +979,10 @@ static inline int qlcnic_check_rx_tagging(struct qlcnic_adapter *adapter,
                 memmove(skb->data + VLAN_HLEN, eth_hdr, ETH_ALEN * 2);
                 skb_pull(skb, VLAN_HLEN);
         }
-        if (!adapter->pvid)
+        if (!adapter->rx_pvid)
                 return 0;
 
-        if (*vlan_tag == adapter->pvid) {
+        if (*vlan_tag == adapter->rx_pvid) {
                 /* Outer vlan tag. Packet should follow non-vlan path */
                 *vlan_tag = 0xffff;
                 return 0;
@@ -1024,8 +1028,7 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter,
             (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
                 t_vid = 0;
                 is_lb_pkt = qlcnic_82xx_is_lb_pkt(sts_data0);
-                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
-                                     cpu_to_le16(t_vid));
+                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt, t_vid);
         }
 
         if (length > rds_ring->skb_size)
@@ -1045,7 +1048,7 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter,
         skb->protocol = eth_type_trans(skb, netdev);
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
 
         napi_gro_receive(&sds_ring->napi, skb);
 
@@ -1102,8 +1105,7 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
             (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
                 t_vid = 0;
                 is_lb_pkt = qlcnic_82xx_is_lb_pkt(sts_data0);
-                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
-                                     cpu_to_le16(t_vid));
+                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt, t_vid);
         }
 
         if (timestamp)
@@ -1131,9 +1133,8 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
                 iph = (struct iphdr *)skb->data;
                 th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
                 length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
+                csum_replace2(&iph->check, iph->tot_len, htons(length));
                 iph->tot_len = htons(length);
-                iph->check = 0;
-                iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
         }
 
         th->psh = push;
@@ -1149,7 +1150,7 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
         }
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         netif_receive_skb(skb);
 
         adapter->stats.lro_pkts++;
@@ -1496,8 +1497,7 @@ qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter,
             (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
                 t_vid = 0;
                 is_lb_pkt = qlcnic_83xx_is_lb_pkt(sts_data[1], 0);
-                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
-                                     cpu_to_le16(t_vid));
+                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt, t_vid);
         }
 
         if (length > rds_ring->skb_size)
@@ -1514,7 +1514,7 @@ qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter,
         skb->protocol = eth_type_trans(skb, netdev);
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
 
         napi_gro_receive(&sds_ring->napi, skb);
 
@@ -1566,8 +1566,7 @@ qlcnic_83xx_process_lro(struct qlcnic_adapter *adapter,
             (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
                 t_vid = 0;
                 is_lb_pkt = qlcnic_83xx_is_lb_pkt(sts_data[1], 1);
-                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
-                                     cpu_to_le16(t_vid));
+                qlcnic_add_lb_filter(adapter, skb, is_lb_pkt, t_vid);
         }
         if (qlcnic_83xx_is_tstamp(sts_data[1]))
                 data_offset = l4_hdr_offset + QLCNIC_TCP_TS_HDR_SIZE;
@@ -1594,9 +1593,8 @@ qlcnic_83xx_process_lro(struct qlcnic_adapter *adapter,
                 iph = (struct iphdr *)skb->data;
                 th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
                 length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
+                csum_replace2(&iph->check, iph->tot_len, htons(length));
                 iph->tot_len = htons(length);
-                iph->check = 0;
-                iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
         }
 
         th->psh = push;
@@ -1612,7 +1610,7 @@ qlcnic_83xx_process_lro(struct qlcnic_adapter *adapter,
         }
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
 
         netif_receive_skb(skb);
 
@@ -1691,6 +1689,29 @@ skip:
         return count;
 }
 
+static int qlcnic_83xx_msix_sriov_vf_poll(struct napi_struct *napi, int budget)
+{
+        int tx_complete;
+        int work_done;
+        struct qlcnic_host_sds_ring *sds_ring;
+        struct qlcnic_adapter *adapter;
+        struct qlcnic_host_tx_ring *tx_ring;
+
+        sds_ring = container_of(napi, struct qlcnic_host_sds_ring, napi);
+        adapter = sds_ring->adapter;
+        /* tx ring count = 1 */
+        tx_ring = adapter->tx_ring;
+
+        tx_complete = qlcnic_process_cmd_ring(adapter, tx_ring, budget);
+        work_done = qlcnic_83xx_process_rcv_ring(sds_ring, budget);
+        if ((work_done < budget) && tx_complete) {
+                napi_complete(&sds_ring->napi);
+                qlcnic_83xx_enable_intr(adapter, sds_ring);
+        }
+
+        return work_done;
+}
+
 static int qlcnic_83xx_poll(struct napi_struct *napi, int budget)
 {
         int tx_complete;
@@ -1768,7 +1789,8 @@ void qlcnic_83xx_napi_enable(struct qlcnic_adapter *adapter)
                         qlcnic_83xx_enable_intr(adapter, sds_ring);
         }
 
-        if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+        if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
+            !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         napi_enable(&tx_ring->napi);
@@ -1795,7 +1817,8 @@ void qlcnic_83xx_napi_disable(struct qlcnic_adapter *adapter)
                 napi_disable(&sds_ring->napi);
         }
 
-        if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+        if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
+            !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         qlcnic_83xx_disable_tx_intr(adapter, tx_ring);
@@ -1808,7 +1831,7 @@ void qlcnic_83xx_napi_disable(struct qlcnic_adapter *adapter)
 int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
                          struct net_device *netdev)
 {
-        int ring, max_sds_rings;
+        int ring, max_sds_rings, temp;
         struct qlcnic_host_sds_ring *sds_ring;
         struct qlcnic_host_tx_ring *tx_ring;
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
@@ -1819,14 +1842,23 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
         max_sds_rings = adapter->max_sds_rings;
         for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
-                if (adapter->flags & QLCNIC_MSIX_ENABLED)
-                        netif_napi_add(netdev, &sds_ring->napi,
-                                       qlcnic_83xx_rx_poll,
-                                       QLCNIC_NETDEV_WEIGHT * 2);
-                else
+                if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+                        if (!(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
+                                netif_napi_add(netdev, &sds_ring->napi,
+                                               qlcnic_83xx_rx_poll,
+                                               QLCNIC_NETDEV_WEIGHT * 2);
+                        } else {
+                                temp = QLCNIC_NETDEV_WEIGHT / max_sds_rings;
+                                netif_napi_add(netdev, &sds_ring->napi,
+                                               qlcnic_83xx_msix_sriov_vf_poll,
+                                               temp);
+                        }
+
+                } else {
                         netif_napi_add(netdev, &sds_ring->napi,
                                        qlcnic_83xx_poll,
                                        QLCNIC_NETDEV_WEIGHT / max_sds_rings);
+                }
         }
 
         if (qlcnic_alloc_tx_rings(adapter, netdev)) {
@@ -1834,7 +1866,8 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
                 return -ENOMEM;
         }
 
-        if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+        if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
+            !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_add(netdev, &tx_ring->napi,
@@ -1860,7 +1893,8 @@ void qlcnic_83xx_napi_del(struct qlcnic_adapter *adapter)
 
         qlcnic_free_sds_rings(adapter->recv_ctx);
 
-        if ((adapter->flags & QLCNIC_MSIX_ENABLED)) {
+        if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
+            !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_del(&tx_ring->napi);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 28a6d4838364..264d5a4f8153 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 
 #include "qlcnic.h"
+#include "qlcnic_sriov.h"
 #include "qlcnic_hw.h"
 
 #include <linux/swab.h>
@@ -85,8 +86,8 @@ static void qlcnic_dev_set_npar_ready(struct qlcnic_adapter *);
 static int qlcnicvf_start_firmware(struct qlcnic_adapter *);
 static void qlcnic_set_netdev_features(struct qlcnic_adapter *,
                                 struct qlcnic_esw_func_cfg *);
-static int qlcnic_vlan_rx_add(struct net_device *, u16);
-static int qlcnic_vlan_rx_del(struct net_device *, u16);
+static int qlcnic_vlan_rx_add(struct net_device *, __be16, u16);
+static int qlcnic_vlan_rx_del(struct net_device *, __be16, u16);
 
 #define QLCNIC_IS_TSO_CAPABLE(adapter)  \
         ((adapter)->ahw->capabilities & QLCNIC_FW_CAPABILITY_TSO)
@@ -109,6 +110,7 @@ static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter)
 static DEFINE_PCI_DEVICE_TABLE(qlcnic_pci_tbl) = {
         ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X),
         ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X),
+        ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X),
         {0,}
 };
 
@@ -154,25 +156,112 @@ static const u32 qlcnic_reg_tbl[] = {
 };
 
 static const struct qlcnic_board_info qlcnic_boards[] = {
-        {0x1077, 0x8020, 0x1077, 0x203,
-         "8200 Series Single Port 10GbE Converged Network Adapter"
-         "(TCP/IP Networking)"},
-        {0x1077, 0x8020, 0x1077, 0x207,
-         "8200 Series Dual Port 10GbE Converged Network Adapter"
-         "(TCP/IP Networking)"},
-        {0x1077, 0x8020, 0x1077, 0x20b,
-         "3200 Series Dual Port 10Gb Intelligent Ethernet Adapter"},
-        {0x1077, 0x8020, 0x1077, 0x20c,
-         "3200 Series Quad Port 1Gb Intelligent Ethernet Adapter"},
-        {0x1077, 0x8020, 0x1077, 0x20f,
-         "3200 Series Single Port 10Gb Intelligent Ethernet Adapter"},
-        {0x1077, 0x8020, 0x103c, 0x3733,
-         "NC523SFP 10Gb 2-port Server Adapter"},
-        {0x1077, 0x8020, 0x103c, 0x3346,
-         "CN1000Q Dual Port Converged Network Adapter"},
-        {0x1077, 0x8020, 0x1077, 0x210,
-         "QME8242-k 10GbE Dual Port Mezzanine Card"},
-        {0x1077, 0x8020, 0x0, 0x0, "cLOM8214 1/10GbE Controller"},
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x24e,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x243,
+          "8300 Series Single Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x24a,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x246,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x252,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x26e,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x260,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x266,
+          "8300 Series Single Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x269,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x271,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          0x0, 0x0, "8300 Series 1/10GbE Controller" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x203,
+          "8200 Series Single Port 10GbE Converged Network Adapter"
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x207,
+          "8200 Series Dual Port 10GbE Converged Network Adapter"
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x20b,
+          "3200 Series Dual Port 10Gb Intelligent Ethernet Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x20c,
+          "3200 Series Quad Port 1Gb Intelligent Ethernet Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x20f,
+          "3200 Series Single Port 10Gb Intelligent Ethernet Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          0x103c, 0x3733,
+          "NC523SFP 10Gb 2-port Server Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          0x103c, 0x3346,
+          "CN1000Q Dual Port Converged Network Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x210,
+          "QME8242-k 10GbE Dual Port Mezzanine Card" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          0x0, 0x0, "cLOM8214 1/10GbE Controller" },
 };
 
 #define NUM_SUPPORTED_BOARDS ARRAY_SIZE(qlcnic_boards)
@@ -198,8 +287,7 @@ void qlcnic_free_sds_rings(struct qlcnic_recv_context *recv_ctx)
         recv_ctx->sds_rings = NULL;
 }
 
-static int
-qlcnic_read_mac_addr(struct qlcnic_adapter *adapter)
+int qlcnic_read_mac_addr(struct qlcnic_adapter *adapter)
 {
         u8 mac_addr[ETH_ALEN];
         struct net_device *netdev = adapter->netdev;
@@ -225,6 +313,9 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct sockaddr *addr = p;
 
+        if (qlcnic_sriov_vf_check(adapter))
+                return -EINVAL;
+
         if ((adapter->flags & QLCNIC_MAC_OVERRIDE_DISABLED))
                 return -EOPNOTSUPP;
 
@@ -253,11 +344,8 @@ static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         int err = -EOPNOTSUPP;
 
-        if (!adapter->fdb_mac_learn) {
-                pr_info("%s: Driver mac learn is enabled, FDB operation not allowed\n",
-                        __func__);
-                return err;
-        }
+        if (!adapter->fdb_mac_learn)
+                return ndo_dflt_fdb_del(ndm, tb, netdev, addr);
 
         if (adapter->flags & QLCNIC_ESWITCH_ENABLED) {
                 if (is_unicast_ether_addr(addr))
@@ -277,11 +365,8 @@ static int qlcnic_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         int err = 0;
 
-        if (!adapter->fdb_mac_learn) {
-                pr_info("%s: Driver mac learn is enabled, FDB operation not allowed\n",
-                        __func__);
-                return -EOPNOTSUPP;
-        }
+        if (!adapter->fdb_mac_learn)
+                return ndo_dflt_fdb_add(ndm, tb, netdev, addr, flags);
 
         if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
                 pr_info("%s: FDB e-switch is not enabled\n", __func__);
@@ -292,7 +377,7 @@ static int qlcnic_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                 return err;
 
         if (is_unicast_ether_addr(addr))
-                err = qlcnic_nic_add_mac(adapter, addr);
+                err = qlcnic_nic_add_mac(adapter, addr, 0);
         else if (is_multicast_ether_addr(addr))
                 err = dev_mc_add_excl(netdev, addr);
         else
@@ -306,11 +391,8 @@ static int qlcnic_fdb_dump(struct sk_buff *skb, struct netlink_callback *ncb,
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
 
-        if (!adapter->fdb_mac_learn) {
-                pr_info("%s: Driver mac learn is enabled, FDB operation not allowed\n",
-                        __func__);
-                return -EOPNOTSUPP;
-        }
+        if (!adapter->fdb_mac_learn)
+                return ndo_dflt_fdb_dump(skb, ncb, netdev, idx);
 
         if (adapter->flags & QLCNIC_ESWITCH_ENABLED)
                 idx = ndo_dflt_fdb_dump(skb, ncb, netdev, idx);
@@ -346,6 +428,12 @@ static const struct net_device_ops qlcnic_netdev_ops = {
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller = qlcnic_poll_controller,
 #endif
+#ifdef CONFIG_QLCNIC_SRIOV
+        .ndo_set_vf_mac         = qlcnic_sriov_set_vf_mac,
+        .ndo_set_vf_tx_rate     = qlcnic_sriov_set_vf_tx_rate,
+        .ndo_get_vf_config      = qlcnic_sriov_get_vf_config,
+        .ndo_set_vf_vlan        = qlcnic_sriov_set_vf_vlan,
+#endif
 };
 
 static const struct net_device_ops qlcnic_netdev_failed_ops = {
@@ -387,6 +475,8 @@ static struct qlcnic_hardware_ops qlcnic_hw_ops = {
         .process_lb_rcv_ring_diag       = qlcnic_82xx_process_rcv_ring_diag,
         .create_rx_ctx                  = qlcnic_82xx_fw_cmd_create_rx_ctx,
         .create_tx_ctx                  = qlcnic_82xx_fw_cmd_create_tx_ctx,
+        .del_rx_ctx                     = qlcnic_82xx_fw_cmd_del_rx_ctx,
+        .del_tx_ctx                     = qlcnic_82xx_fw_cmd_del_tx_ctx,
         .setup_link_event               = qlcnic_82xx_linkevent_request,
         .get_nic_info                   = qlcnic_82xx_get_nic_info,
         .get_pci_info                   = qlcnic_82xx_get_pci_info,
@@ -402,13 +492,22 @@ static struct qlcnic_hardware_ops qlcnic_hw_ops = {
         .config_promisc_mode            = qlcnic_82xx_nic_set_promisc,
         .change_l2_filter               = qlcnic_82xx_change_filter,
         .get_board_info                 = qlcnic_82xx_get_board_info,
+        .free_mac_list                  = qlcnic_82xx_free_mac_list,
 };
 
 int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
 {
         struct pci_dev *pdev = adapter->pdev;
         int err = -1, i;
-        int max_tx_rings;
+        int max_tx_rings, tx_vector;
+
+        if (adapter->flags & QLCNIC_TX_INTR_SHARED) {
+                max_tx_rings = 0;
+                tx_vector = 0;
+        } else {
+                max_tx_rings = adapter->max_drv_tx_rings;
+                tx_vector = 1;
+        }
 
         if (!adapter->msix_entries) {
                 adapter->msix_entries = kcalloc(num_msix,
@@ -431,7 +530,6 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
                         if (qlcnic_83xx_check(adapter)) {
                                 adapter->ahw->num_msix = num_msix;
                                 /* subtract mail box and tx ring vectors */
-                                max_tx_rings = adapter->max_drv_tx_rings;
                                 adapter->max_sds_rings = num_msix -
                                                          max_tx_rings - 1;
                         } else {
@@ -444,11 +542,11 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
                                  "Unable to allocate %d MSI-X interrupt vectors\n",
                                  num_msix);
                         if (qlcnic_83xx_check(adapter)) {
-                                if (err < QLC_83XX_MINIMUM_VECTOR)
+                                if (err < (QLC_83XX_MINIMUM_VECTOR - tx_vector))
                                         return err;
-                                err -= (adapter->max_drv_tx_rings + 1);
+                                err -= (max_tx_rings + 1);
                                 num_msix = rounddown_pow_of_two(err);
-                                num_msix += (adapter->max_drv_tx_rings + 1);
+                                num_msix += (max_tx_rings + 1);
                         } else {
                                 num_msix = rounddown_pow_of_two(err);
                         }
@@ -542,11 +640,10 @@ void qlcnic_teardown_intr(struct qlcnic_adapter *adapter)
         }
 }
 
-static void
-qlcnic_cleanup_pci_map(struct qlcnic_adapter *adapter)
+static void qlcnic_cleanup_pci_map(struct qlcnic_hardware_context *ahw)
 {
-        if (adapter->ahw->pci_base0 != NULL)
-                iounmap(adapter->ahw->pci_base0);
+        if (ahw->pci_base0 != NULL)
+                iounmap(ahw->pci_base0);
 }
 
 static int qlcnic_get_act_pci_func(struct qlcnic_adapter *adapter)
@@ -721,6 +818,7 @@ static void qlcnic_get_bar_length(u32 dev_id, ulong *bar)
                 *bar = QLCNIC_82XX_BAR0_LENGTH;
                 break;
         case PCI_DEVICE_ID_QLOGIC_QLE834X:
+        case PCI_DEVICE_ID_QLOGIC_VF_QLE834X:
                 *bar = QLCNIC_83XX_BAR0_LENGTH;
                 break;
         default:
@@ -751,7 +849,7 @@ static int qlcnic_setup_pci_map(struct pci_dev *pdev,
                 return -EIO;
         }
 
-        dev_info(&pdev->dev, "%dMB memory map\n", (int)(mem_len>>20));
+        dev_info(&pdev->dev, "%dKB memory map\n", (int)(mem_len >> 10));
 
         ahw->pci_base0 = mem_ptr0;
         ahw->pci_len0 = pci_len0;
@@ -891,24 +989,50 @@ void qlcnic_set_vlan_config(struct qlcnic_adapter *adapter,
         else
                 adapter->flags |= QLCNIC_TAGGING_ENABLED;
 
-        if (esw_cfg->vlan_id)
-                adapter->pvid = esw_cfg->vlan_id;
-        else
-                adapter->pvid = 0;
+        if (esw_cfg->vlan_id) {
+                adapter->rx_pvid = esw_cfg->vlan_id;
+                adapter->tx_pvid = esw_cfg->vlan_id;
+        } else {
+                adapter->rx_pvid = 0;
+                adapter->tx_pvid = 0;
+        }
 }
 
 static int
-qlcnic_vlan_rx_add(struct net_device *netdev, u16 vid)
+qlcnic_vlan_rx_add(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        int err;
+
+        if (qlcnic_sriov_vf_check(adapter)) {
+                err = qlcnic_sriov_cfg_vf_guest_vlan(adapter, vid, 1);
+                if (err) {
+                        netdev_err(netdev,
+                                   "Cannot add VLAN filter for VLAN id %d, err=%d",
+                                   vid, err);
+                        return err;
+                }
+        }
+
         set_bit(vid, adapter->vlans);
         return 0;
 }
 
 static int
-qlcnic_vlan_rx_del(struct net_device *netdev, u16 vid)
+qlcnic_vlan_rx_del(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        int err;
+
+        if (qlcnic_sriov_vf_check(adapter)) {
+                err = qlcnic_sriov_cfg_vf_guest_vlan(adapter, vid, 0);
+                if (err) {
+                        netdev_err(netdev,
+                                   "Cannot delete VLAN filter for VLAN id %d, err=%d",
+                                   vid, err);
+                        return err;
+                }
+        }
 
         qlcnic_restore_indev_addr(netdev, NETDEV_DOWN);
         clear_bit(vid, adapter->vlans);
@@ -1250,7 +1374,7 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
         irq_handler_t handler;
         struct qlcnic_host_sds_ring *sds_ring;
         struct qlcnic_host_tx_ring *tx_ring;
-        int err, ring;
+        int err, ring, num_sds_rings;
 
         unsigned long flags = 0;
         struct net_device *netdev = adapter->netdev;
@@ -1281,10 +1405,20 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
                 if (qlcnic_82xx_check(adapter) ||
                     (qlcnic_83xx_check(adapter) &&
                      (adapter->flags & QLCNIC_MSIX_ENABLED))) {
-                        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+                        num_sds_rings = adapter->max_sds_rings;
+                        for (ring = 0; ring < num_sds_rings; ring++) {
                                 sds_ring = &recv_ctx->sds_rings[ring];
-                                snprintf(sds_ring->name, sizeof(int) + IFNAMSIZ,
-                                         "%s[%d]", netdev->name, ring);
+                                if (qlcnic_82xx_check(adapter) &&
+                                    (ring == (num_sds_rings - 1)))
+                                        snprintf(sds_ring->name,
+                                                 sizeof(sds_ring->name),
+                                                 "qlcnic-%s[Tx0+Rx%d]",
+                                                 netdev->name, ring);
+                                else
+                                        snprintf(sds_ring->name,
+                                                 sizeof(sds_ring->name),
+                                                 "qlcnic-%s[Rx%d]",
+                                                 netdev->name, ring);
                                 err = request_irq(sds_ring->irq, handler, flags,
                                                   sds_ring->name, sds_ring);
                                 if (err)
@@ -1292,14 +1426,14 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
                         }
                 }
                 if (qlcnic_83xx_check(adapter) &&
-                    (adapter->flags & QLCNIC_MSIX_ENABLED)) {
+                    (adapter->flags & QLCNIC_MSIX_ENABLED) &&
+                    !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                         handler = qlcnic_msix_tx_intr;
                         for (ring = 0; ring < adapter->max_drv_tx_rings;
                              ring++) {
                                 tx_ring = &adapter->tx_ring[ring];
-                                snprintf(tx_ring->name, sizeof(int) + IFNAMSIZ,
-                                         "%s[%d]", netdev->name,
-                                         adapter->max_sds_rings + ring);
+                                snprintf(tx_ring->name, sizeof(tx_ring->name),
+                                         "qlcnic-%s[Tx%d]", netdev->name, ring);
                                 err = request_irq(tx_ring->irq, handler, flags,
                                                   tx_ring->name, tx_ring);
                                 if (err)
@@ -1328,7 +1462,8 @@ qlcnic_free_irq(struct qlcnic_adapter *adapter)
                                 free_irq(sds_ring->irq, sds_ring);
                         }
                 }
-                if (qlcnic_83xx_check(adapter)) {
+                if (qlcnic_83xx_check(adapter) &&
+                    !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                         for (ring = 0; ring < adapter->max_drv_tx_rings;
                              ring++) {
                                 tx_ring = &adapter->tx_ring[ring];
@@ -1418,9 +1553,12 @@ void __qlcnic_down(struct qlcnic_adapter *adapter, struct net_device *netdev)
         if (!test_and_clear_bit(__QLCNIC_DEV_UP, &adapter->state))
                 return;
 
+        if (qlcnic_sriov_vf_check(adapter))
+                qlcnic_sriov_cleanup_async_list(&adapter->ahw->sriov->bc);
         smp_mb();
         spin_lock(&adapter->tx_clean_lock);
         netif_carrier_off(netdev);
+        adapter->ahw->linkup = 0;
         netif_tx_disable(netdev);
 
         qlcnic_free_mac_list(adapter);
@@ -1545,7 +1683,9 @@ out:
 
 static int qlcnic_alloc_adapter_resources(struct qlcnic_adapter *adapter)
 {
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
         int err = 0;
+
         adapter->recv_ctx = kzalloc(sizeof(struct qlcnic_recv_context),
                                 GFP_KERNEL);
         if (!adapter->recv_ctx) {
@@ -1553,9 +1693,14 @@ static int qlcnic_alloc_adapter_resources(struct qlcnic_adapter *adapter)
                 goto err_out;
         }
         /* Initialize interrupt coalesce parameters */
-        adapter->ahw->coal.flag = QLCNIC_INTR_DEFAULT;
-        adapter->ahw->coal.rx_time_us = QLCNIC_DEFAULT_INTR_COALESCE_RX_TIME_US;
-        adapter->ahw->coal.rx_packets = QLCNIC_DEFAULT_INTR_COALESCE_RX_PACKETS;
+        ahw->coal.flag = QLCNIC_INTR_DEFAULT;
+        ahw->coal.type = QLCNIC_INTR_COAL_TYPE_RX;
+        ahw->coal.rx_time_us = QLCNIC_DEF_INTR_COALESCE_RX_TIME_US;
+        ahw->coal.rx_packets = QLCNIC_DEF_INTR_COALESCE_RX_PACKETS;
+        if (qlcnic_83xx_check(adapter)) {
+                ahw->coal.tx_time_us = QLCNIC_DEF_INTR_COALESCE_TX_TIME_US;
+                ahw->coal.tx_packets = QLCNIC_DEF_INTR_COALESCE_TX_PACKETS;
+        }
         /* clear stats */
         memset(&adapter->stats, 0, sizeof(adapter->stats));
 err_out:
@@ -1685,7 +1830,7 @@ qlcnic_reset_context(struct qlcnic_adapter *adapter)
         return err;
 }
 
-static int
+int
 qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
                     int pci_using_dac)
 {
@@ -1701,11 +1846,14 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
 
         qlcnic_change_mtu(netdev, netdev->mtu);
 
-        SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_ops);
+        if (qlcnic_sriov_vf_check(adapter))
+                SET_ETHTOOL_OPS(netdev, &qlcnic_sriov_vf_ethtool_ops);
+        else
+                SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_ops);
 
         netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
                              NETIF_F_IPV6_CSUM | NETIF_F_GRO |
-                             NETIF_F_HW_VLAN_RX);
+                             NETIF_F_HW_VLAN_CTAG_RX);
         netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
                                   NETIF_F_IPV6_CSUM);
 
@@ -1720,7 +1868,10 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
         }
 
         if (qlcnic_vlan_tx_check(adapter))
-                netdev->features |= (NETIF_F_HW_VLAN_TX);
+                netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX);
+
+        if (qlcnic_sriov_vf_check(adapter))
+                netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO)
                 netdev->features |= NETIF_F_LRO;
@@ -1820,6 +1971,9 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         u32 capab2;
         char board_name[QLCNIC_MAX_BOARD_NAME_LEN + 19]; /* MAC + ": " + name */
 
+        if (pdev->is_virtfn)
+                return -ENODEV;
+
         err = pci_enable_device(pdev);
         if (err)
                 return err;
@@ -1844,12 +1998,18 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!ahw)
                 goto err_out_free_res;
 
-        if (ent->device == PCI_DEVICE_ID_QLOGIC_QLE824X) {
+        switch (ent->device) {
+        case PCI_DEVICE_ID_QLOGIC_QLE824X:
                 ahw->hw_ops = &qlcnic_hw_ops;
-                ahw->reg_tbl = (u32 *)qlcnic_reg_tbl;
-        } else if (ent->device == PCI_DEVICE_ID_QLOGIC_QLE834X) {
+                ahw->reg_tbl = (u32 *) qlcnic_reg_tbl;
+                break;
+        case PCI_DEVICE_ID_QLOGIC_QLE834X:
                 qlcnic_83xx_register_map(ahw);
-        } else {
+                break;
+        case PCI_DEVICE_ID_QLOGIC_VF_QLE834X:
+                qlcnic_sriov_vf_register_map(ahw);
+                break;
+        default:
                 goto err_out_free_hw_res;
         }
 
@@ -1911,11 +2071,13 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         } else if (qlcnic_83xx_check(adapter)) {
                 qlcnic_83xx_check_vf(adapter, ent);
                 adapter->portnum = adapter->ahw->pci_func;
-                err = qlcnic_83xx_init(adapter);
+                err = qlcnic_83xx_init(adapter, pci_using_dac);
                 if (err) {
                         dev_err(&pdev->dev, "%s: failed\n", __func__);
                         goto err_out_free_hw;
                 }
+                if (qlcnic_sriov_vf_check(adapter))
+                        return 0;
         } else {
                 dev_err(&pdev->dev,
                         "%s: failed. Please Reboot\n", __func__);
@@ -1932,6 +2094,12 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         module_name(THIS_MODULE),
                         board_name, adapter->ahw->revision_id);
         }
+
+        if (qlcnic_83xx_check(adapter) && !qlcnic_use_msi_x &&
+            !!qlcnic_use_msi)
+                dev_warn(&pdev->dev,
+                         "83xx adapter do not support MSI interrupts\n");
+
         err = qlcnic_setup_intr(adapter, 0);
         if (err) {
                 dev_err(&pdev->dev, "Failed to setup interrupt\n");
@@ -1999,7 +2167,7 @@ err_out_free_netdev:
         free_netdev(netdev);
 
 err_out_iounmap:
-        qlcnic_cleanup_pci_map(adapter);
+        qlcnic_cleanup_pci_map(ahw);
 
 err_out_free_hw_res:
         kfree(ahw);
@@ -2024,11 +2192,13 @@ static void qlcnic_remove(struct pci_dev *pdev)
                 return;
 
         netdev = adapter->netdev;
+        qlcnic_sriov_pf_disable(adapter);
 
         qlcnic_cancel_idc_work(adapter);
         ahw = adapter->ahw;
 
         unregister_netdev(netdev);
+        qlcnic_sriov_cleanup(adapter);
 
         if (qlcnic_83xx_check(adapter)) {
                 qlcnic_83xx_free_mbx_intr(adapter);
@@ -2054,7 +2224,7 @@ static void qlcnic_remove(struct pci_dev *pdev)
 
         qlcnic_remove_sysfs(adapter);
 
-        qlcnic_cleanup_pci_map(adapter);
+        qlcnic_cleanup_pci_map(adapter->ahw);
 
         qlcnic_release_firmware(adapter);
 
@@ -2084,6 +2254,7 @@ static int __qlcnic_shutdown(struct pci_dev *pdev)
         if (netif_running(netdev))
                 qlcnic_down(adapter, netdev);
 
+        qlcnic_sriov_cleanup(adapter);
         if (qlcnic_82xx_check(adapter))
                 qlcnic_clr_all_drv_state(adapter, 0);
 
@@ -3205,20 +3376,40 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
         return err;
 }
 
-int qlcnic_validate_max_rss(u8 max_hw, u8 val)
+int qlcnic_validate_max_rss(struct qlcnic_adapter *adapter,
+                            __u32 val)
 {
+        struct net_device *netdev = adapter->netdev;
+        u8 max_hw = adapter->ahw->max_rx_ques;
         u32 max_allowed;
 
-        if (max_hw > QLC_MAX_SDS_RINGS) {
-                max_hw = QLC_MAX_SDS_RINGS;
-                pr_info("max rss reset to %d\n", QLC_MAX_SDS_RINGS);
+        if (val > QLC_MAX_SDS_RINGS) {
+                netdev_err(netdev, "RSS value should not be higher than %u\n",
+                           QLC_MAX_SDS_RINGS);
+                return -EINVAL;
         }
 
         max_allowed = rounddown_pow_of_two(min_t(int, max_hw,
                                                  num_online_cpus()));
         if ((val > max_allowed) || (val < 2) || !is_power_of_2(val)) {
-                pr_info("rss_ring valid range [2 - %x] in powers of 2\n",
-                        max_allowed);
+                if (!is_power_of_2(val))
+                        netdev_err(netdev, "RSS value should be a power of 2\n");
+
+                if (val < 2)
+                        netdev_err(netdev, "RSS value should not be lower than 2\n");
+
+                if (val > max_hw)
+                        netdev_err(netdev,
+                                   "RSS value should not be higher than[%u], the max RSS rings supported by the adapter\n",
+                                   max_hw);
+
+                if (val > num_online_cpus())
+                        netdev_err(netdev,
+                                   "RSS value should not be higher than[%u], number of online CPUs in the system\n",
+                                   num_online_cpus());
+
+                netdev_err(netdev, "Unable to configure %u RSS rings\n", val);
+
                 return -EINVAL;
         }
         return 0;
@@ -3238,8 +3429,10 @@ int qlcnic_set_max_rss(struct qlcnic_adapter *adapter, u8 data, size_t len)
 
         qlcnic_detach(adapter);
 
-        if (qlcnic_83xx_check(adapter))
+        if (qlcnic_83xx_check(adapter)) {
                 qlcnic_83xx_free_mbx_intr(adapter);
+                qlcnic_83xx_enable_mbx_poll(adapter);
+        }
 
         qlcnic_teardown_intr(adapter);
         err = qlcnic_setup_intr(adapter, data);
@@ -3253,6 +3446,7 @@ int qlcnic_set_max_rss(struct qlcnic_adapter *adapter, u8 data, size_t len)
                 /* register for NIC IDC AEN Events */
                 qlcnic_83xx_register_nic_idc_func(adapter, 1);
                 err = qlcnic_83xx_setup_mbx_intr(adapter);
+                qlcnic_83xx_disable_mbx_poll(adapter);
                 if (err) {
                         dev_err(&adapter->pdev->dev,
                                 "failed to setup mbx interrupt\n");
@@ -3318,7 +3512,7 @@ void qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event)
 
         rcu_read_lock();
         for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {
-                dev = __vlan_find_dev_deep(netdev, vid);
+                dev = __vlan_find_dev_deep(netdev, htons(ETH_P_8021Q), vid);
                 if (!dev)
                         continue;
                 qlcnic_config_indev_addr(adapter, dev, event);
@@ -3432,7 +3626,10 @@ static struct pci_driver qlcnic_driver = {
         .resume = qlcnic_resume,
 #endif
         .shutdown = qlcnic_shutdown,
-        .err_handler = &qlcnic_err_handler
+        .err_handler = &qlcnic_err_handler,
+#ifdef CONFIG_QLCNIC_SRIOV
+        .sriov_configure = qlcnic_pci_sriov_configure,
+#endif
 
 };
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
index abbd22c814a6..4b9bab18ebd9 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
@@ -810,11 +810,8 @@ static int __qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter,
 
         tmp_addr = dma_alloc_coherent(&adapter->pdev->dev, temp_size,
                                       &tmp_addr_t, GFP_KERNEL);
-        if (!tmp_addr) {
-                dev_err(&adapter->pdev->dev,
-                        "Can't get memory for FW dump template\n");
+        if (!tmp_addr)
                 return -ENOMEM;
-        }
 
         if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_TEMP_HDR)) {
                 err = -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
new file mode 100644
index 000000000000..d85fbb57c25b
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
@@ -0,0 +1,263 @@
+/*
+ * QLogic qlcnic NIC Driver
+ * Copyright (c) 2009-2013 QLogic Corporation
+ *
+ * See LICENSE.qlcnic for copyright and licensing details.
+ */
+
+#ifndef _QLCNIC_83XX_SRIOV_H_
+#define _QLCNIC_83XX_SRIOV_H_
+
+#include "qlcnic.h"
+#include <linux/types.h>
+#include <linux/pci.h>
+
+extern const u32 qlcnic_83xx_reg_tbl[];
+extern const u32 qlcnic_83xx_ext_reg_tbl[];
+
+struct qlcnic_bc_payload {
+        u64 payload[126];
+};
+
+struct qlcnic_bc_hdr {
+#if defined(__LITTLE_ENDIAN)
+        u8      version;
+        u8      msg_type:4;
+        u8      rsvd1:3;
+        u8      op_type:1;
+        u8      num_cmds;
+        u8      num_frags;
+        u8      frag_num;
+        u8      cmd_op;
+        u16     seq_id;
+        u64     rsvd3;
+#elif defined(__BIG_ENDIAN)
+        u8      num_frags;
+        u8      num_cmds;
+        u8      op_type:1;
+        u8      rsvd1:3;
+        u8      msg_type:4;
+        u8      version;
+        u16     seq_id;
+        u8      cmd_op;
+        u8      frag_num;
+        u64     rsvd3;
+#endif
+};
+
+enum qlcnic_bc_commands {
+        QLCNIC_BC_CMD_CHANNEL_INIT = 0x0,
+        QLCNIC_BC_CMD_CHANNEL_TERM = 0x1,
+        QLCNIC_BC_CMD_GET_ACL = 0x2,
+        QLCNIC_BC_CMD_CFG_GUEST_VLAN = 0x3,
+};
+
+#define QLC_BC_CMD 1
+
+struct qlcnic_trans_list {
+        /* Lock for manipulating list */
+        spinlock_t              lock;
+        struct list_head        wait_list;
+        int                     count;
+};
+
+enum qlcnic_trans_state {
+        QLC_INIT = 0,
+        QLC_WAIT_FOR_CHANNEL_FREE,
+        QLC_WAIT_FOR_RESP,
+        QLC_ABORT,
+        QLC_END,
+};
+
+struct qlcnic_bc_trans {
+        u8                              func_id;
+        u8                              active;
+        u8                              curr_rsp_frag;
+        u8                              curr_req_frag;
+        u16                             cmd_id;
+        u16                             req_pay_size;
+        u16                             rsp_pay_size;
+        u32                             trans_id;
+        enum qlcnic_trans_state         trans_state;
+        struct list_head                list;
+        struct qlcnic_bc_hdr            *req_hdr;
+        struct qlcnic_bc_hdr            *rsp_hdr;
+        struct qlcnic_bc_payload        *req_pay;
+        struct qlcnic_bc_payload        *rsp_pay;
+        struct completion               resp_cmpl;
+        struct qlcnic_vf_info           *vf;
+};
+
+enum qlcnic_vf_state {
+        QLC_BC_VF_SEND = 0,
+        QLC_BC_VF_RECV,
+        QLC_BC_VF_CHANNEL,
+        QLC_BC_VF_STATE,
+        QLC_BC_VF_FLR,
+        QLC_BC_VF_SOFT_FLR,
+};
+
+enum qlcnic_vlan_mode {
+        QLC_NO_VLAN_MODE = 0,
+        QLC_PVID_MODE,
+        QLC_GUEST_VLAN_MODE,
+};
+
+struct qlcnic_resources {
+        u16 num_tx_mac_filters;
+        u16 num_rx_ucast_mac_filters;
+        u16 num_rx_mcast_mac_filters;
+
+        u16 num_txvlan_keys;
+
+        u16 num_rx_queues;
+        u16 num_tx_queues;
+
+        u16 num_rx_buf_rings;
+        u16 num_rx_status_rings;
+
+        u16 num_destip;
+        u32 num_lro_flows_supported;
+        u16 max_local_ipv6_addrs;
+        u16 max_remote_ipv6_addrs;
+};
+
+struct qlcnic_vport {
+        u16                     handle;
+        u16                     max_tx_bw;
+        u16                     min_tx_bw;
+        u8                      vlan_mode;
+        u16                     vlan;
+        u8                      qos;
+        u8                      mac[6];
+};
+
+struct qlcnic_vf_info {
+        u8                              pci_func;
+        u16                             rx_ctx_id;
+        u16                             tx_ctx_id;
+        unsigned long                   state;
+        struct completion               ch_free_cmpl;
+        struct work_struct              trans_work;
+        struct work_struct              flr_work;
+        /* It synchronizes commands sent from VF */
+        struct mutex                    send_cmd_lock;
+        struct qlcnic_bc_trans          *send_cmd;
+        struct qlcnic_bc_trans          *flr_trans;
+        struct qlcnic_trans_list        rcv_act;
+        struct qlcnic_trans_list        rcv_pend;
+        struct qlcnic_adapter           *adapter;
+        struct qlcnic_vport             *vp;
+};
+
+struct qlcnic_async_work_list {
+        struct list_head        list;
+        struct work_struct      work;
+        void                    *ptr;
+};
+
+struct qlcnic_back_channel {
+        u16                     trans_counter;
+        struct workqueue_struct *bc_trans_wq;
+        struct workqueue_struct *bc_async_wq;
+        struct workqueue_struct *bc_flr_wq;
+        struct list_head        async_list;
+};
+
+struct qlcnic_sriov {
+        u16                             vp_handle;
+        u8                              num_vfs;
+        u8                              any_vlan;
+        u8                              vlan_mode;
+        u16                             num_allowed_vlans;
+        u16                             *allowed_vlans;
+        u16                             vlan;
+        struct qlcnic_resources         ff_max;
+        struct qlcnic_back_channel      bc;
+        struct qlcnic_vf_info           *vf_info;
+};
+
+int qlcnic_sriov_init(struct qlcnic_adapter *, int);
+void qlcnic_sriov_cleanup(struct qlcnic_adapter *);
+void __qlcnic_sriov_cleanup(struct qlcnic_adapter *);
+void qlcnic_sriov_vf_register_map(struct qlcnic_hardware_context *);
+int qlcnic_sriov_vf_init(struct qlcnic_adapter *, int);
+void qlcnic_sriov_vf_set_ops(struct qlcnic_adapter *);
+int qlcnic_sriov_func_to_index(struct qlcnic_adapter *, u8);
+int qlcnic_sriov_channel_cfg_cmd(struct qlcnic_adapter *, u8);
+void qlcnic_sriov_handle_bc_event(struct qlcnic_adapter *, u32);
+int qlcnic_sriov_cfg_bc_intr(struct qlcnic_adapter *, u8);
+void qlcnic_sriov_cleanup_async_list(struct qlcnic_back_channel *);
+void qlcnic_sriov_cleanup_list(struct qlcnic_trans_list *);
+int __qlcnic_sriov_add_act_list(struct qlcnic_sriov *, struct qlcnic_vf_info *,
+                                struct qlcnic_bc_trans *);
+int qlcnic_sriov_get_vf_vport_info(struct qlcnic_adapter *,
+                                   struct qlcnic_info *, u16);
+int qlcnic_sriov_cfg_vf_guest_vlan(struct qlcnic_adapter *, u16, u8);
+
+static inline bool qlcnic_sriov_enable_check(struct qlcnic_adapter *adapter)
+{
+        return test_bit(__QLCNIC_SRIOV_ENABLE, &adapter->state) ? true : false;
+}
+
+#ifdef CONFIG_QLCNIC_SRIOV
+void qlcnic_sriov_pf_process_bc_cmd(struct qlcnic_adapter *,
+                                    struct qlcnic_bc_trans *,
+                                    struct qlcnic_cmd_args *);
+void qlcnic_sriov_pf_disable(struct qlcnic_adapter *);
+void qlcnic_sriov_pf_cleanup(struct qlcnic_adapter *);
+int qlcnic_pci_sriov_configure(struct pci_dev *, int);
+void qlcnic_pf_set_interface_id_create_rx_ctx(struct qlcnic_adapter *, u32 *);
+void qlcnic_pf_set_interface_id_create_tx_ctx(struct qlcnic_adapter *, u32 *);
+void qlcnic_pf_set_interface_id_del_rx_ctx(struct qlcnic_adapter *, u32 *);
+void qlcnic_pf_set_interface_id_del_tx_ctx(struct qlcnic_adapter *, u32 *);
+void qlcnic_pf_set_interface_id_promisc(struct qlcnic_adapter *, u32 *);
+void qlcnic_pf_set_interface_id_ipaddr(struct qlcnic_adapter *, u32 *);
+void qlcnic_pf_set_interface_id_macaddr(struct qlcnic_adapter *, u32 *);
+void qlcnic_sriov_pf_handle_flr(struct qlcnic_sriov *, struct qlcnic_vf_info *);
+bool qlcnic_sriov_soft_flr_check(struct qlcnic_adapter *,
+                                 struct qlcnic_bc_trans *,
+                                 struct qlcnic_vf_info *);
+void qlcnic_sriov_pf_reset(struct qlcnic_adapter *);
+int qlcnic_sriov_pf_reinit(struct qlcnic_adapter *);
+int qlcnic_sriov_set_vf_mac(struct net_device *, int, u8 *);
+int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int);
+int qlcnic_sriov_get_vf_config(struct net_device *, int ,
+                               struct ifla_vf_info *);
+int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8);
+#else
+static inline void qlcnic_sriov_pf_disable(struct qlcnic_adapter *adapter) {}
+static inline void qlcnic_sriov_pf_cleanup(struct qlcnic_adapter *adapter) {}
+static inline void
+qlcnic_pf_set_interface_id_create_rx_ctx(struct qlcnic_adapter *adapter,
+                                         u32 *int_id) {}
+static inline void
+qlcnic_pf_set_interface_id_create_tx_ctx(struct qlcnic_adapter *adapter,
+                                         u32 *int_id) {}
+static inline void
+qlcnic_pf_set_interface_id_del_rx_ctx(struct qlcnic_adapter *adapter,
+                                      u32 *int_id) {}
+static inline void
+qlcnic_pf_set_interface_id_del_tx_ctx(struct qlcnic_adapter *adapter,
+                                      u32 *int_id) {}
+static inline void
+qlcnic_pf_set_interface_id_ipaddr(struct qlcnic_adapter *adapter, u32 *int_id)
+{}
+static inline void
+qlcnic_pf_set_interface_id_macaddr(struct qlcnic_adapter *adapter, u32 *int_id)
+{}
+static inline void
+qlcnic_pf_set_interface_id_promisc(struct qlcnic_adapter *adapter, u32 *int_id)
+{}
+static inline void qlcnic_sriov_pf_handle_flr(struct qlcnic_sriov *sriov,
+                                              struct qlcnic_vf_info *vf) {}
+static inline bool qlcnic_sriov_soft_flr_check(struct qlcnic_adapter *adapter,
+                                               struct qlcnic_bc_trans *trans,
+                                               struct qlcnic_vf_info *vf)
+{ return false; }
+static inline void qlcnic_sriov_pf_reset(struct qlcnic_adapter *adapter) {}
+static inline int qlcnic_sriov_pf_reinit(struct qlcnic_adapter *adapter)
+{ return 0; }
+#endif
+
+#endif
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
new file mode 100644
index 000000000000..44d547d78b84
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -0,0 +1,1954 @@
+/*
+ * QLogic qlcnic NIC Driver
+ * Copyright (c) 2009-2013 QLogic Corporation
+ *
+ * See LICENSE.qlcnic for copyright and licensing details.
+ */
+
+#include "qlcnic_sriov.h"
+#include "qlcnic.h"
+#include "qlcnic_83xx_hw.h"
+#include <linux/types.h>
+
+#define QLC_BC_COMMAND  0
+#define QLC_BC_RESPONSE 1
+
+#define QLC_MBOX_RESP_TIMEOUT           (10 * HZ)
+#define QLC_MBOX_CH_FREE_TIMEOUT        (10 * HZ)
+
+#define QLC_BC_MSG              0
+#define QLC_BC_CFREE            1
+#define QLC_BC_FLR              2
+#define QLC_BC_HDR_SZ           16
+#define QLC_BC_PAYLOAD_SZ       (1024 - QLC_BC_HDR_SZ)
+
+#define QLC_DEFAULT_RCV_DESCRIPTORS_SRIOV_VF            2048
+#define QLC_DEFAULT_JUMBO_RCV_DESCRIPTORS_SRIOV_VF      512
+
+#define QLC_83XX_VF_RESET_FAIL_THRESH   8
+#define QLC_BC_CMD_MAX_RETRY_CNT        5
+
+static void qlcnic_sriov_vf_free_mac_list(struct qlcnic_adapter *);
+static int qlcnic_sriov_alloc_bc_mbx_args(struct qlcnic_cmd_args *, u32);
+static void qlcnic_sriov_vf_poll_dev_state(struct work_struct *);
+static void qlcnic_sriov_vf_cancel_fw_work(struct qlcnic_adapter *);
+static void qlcnic_sriov_cleanup_transaction(struct qlcnic_bc_trans *);
+static int qlcnic_sriov_vf_mbx_op(struct qlcnic_adapter *,
+                                  struct qlcnic_cmd_args *);
+
+static struct qlcnic_hardware_ops qlcnic_sriov_vf_hw_ops = {
+        .read_crb                       = qlcnic_83xx_read_crb,
+        .write_crb                      = qlcnic_83xx_write_crb,
+        .read_reg                       = qlcnic_83xx_rd_reg_indirect,
+        .write_reg                      = qlcnic_83xx_wrt_reg_indirect,
+        .get_mac_address                = qlcnic_83xx_get_mac_address,
+        .setup_intr                     = qlcnic_83xx_setup_intr,
+        .alloc_mbx_args                 = qlcnic_83xx_alloc_mbx_args,
+        .mbx_cmd                        = qlcnic_sriov_vf_mbx_op,
+        .get_func_no                    = qlcnic_83xx_get_func_no,
+        .api_lock                       = qlcnic_83xx_cam_lock,
+        .api_unlock                     = qlcnic_83xx_cam_unlock,
+        .process_lb_rcv_ring_diag       = qlcnic_83xx_process_rcv_ring_diag,
+        .create_rx_ctx                  = qlcnic_83xx_create_rx_ctx,
+        .create_tx_ctx                  = qlcnic_83xx_create_tx_ctx,
+        .del_rx_ctx                     = qlcnic_83xx_del_rx_ctx,
+        .del_tx_ctx                     = qlcnic_83xx_del_tx_ctx,
+        .setup_link_event               = qlcnic_83xx_setup_link_event,
+        .get_nic_info                   = qlcnic_83xx_get_nic_info,
+        .get_pci_info                   = qlcnic_83xx_get_pci_info,
+        .set_nic_info                   = qlcnic_83xx_set_nic_info,
+        .change_macvlan                 = qlcnic_83xx_sre_macaddr_change,
+        .napi_enable                    = qlcnic_83xx_napi_enable,
+        .napi_disable                   = qlcnic_83xx_napi_disable,
+        .config_intr_coal               = qlcnic_83xx_config_intr_coal,
+        .config_rss                     = qlcnic_83xx_config_rss,
+        .config_hw_lro                  = qlcnic_83xx_config_hw_lro,
+        .config_promisc_mode            = qlcnic_83xx_nic_set_promisc,
+        .change_l2_filter               = qlcnic_83xx_change_l2_filter,
+        .get_board_info                 = qlcnic_83xx_get_port_info,
+        .free_mac_list                  = qlcnic_sriov_vf_free_mac_list,
+};
+
+static struct qlcnic_nic_template qlcnic_sriov_vf_ops = {
+        .config_bridged_mode    = qlcnic_config_bridged_mode,
+        .config_led             = qlcnic_config_led,
+        .cancel_idc_work        = qlcnic_sriov_vf_cancel_fw_work,
+        .napi_add               = qlcnic_83xx_napi_add,
+        .napi_del               = qlcnic_83xx_napi_del,
+        .config_ipaddr          = qlcnic_83xx_config_ipaddr,
+        .clear_legacy_intr      = qlcnic_83xx_clear_legacy_intr,
+};
+
+static const struct qlcnic_mailbox_metadata qlcnic_sriov_bc_mbx_tbl[] = {
+        {QLCNIC_BC_CMD_CHANNEL_INIT, 2, 2},
+        {QLCNIC_BC_CMD_CHANNEL_TERM, 2, 2},
+        {QLCNIC_BC_CMD_GET_ACL, 3, 14},
+        {QLCNIC_BC_CMD_CFG_GUEST_VLAN, 2, 2},
+};
+
+static inline bool qlcnic_sriov_bc_msg_check(u32 val)
+{
+        return (val & (1 << QLC_BC_MSG)) ? true : false;
+}
+
+static inline bool qlcnic_sriov_channel_free_check(u32 val)
+{
+        return (val & (1 << QLC_BC_CFREE)) ? true : false;
+}
+
+static inline bool qlcnic_sriov_flr_check(u32 val)
+{
+        return (val & (1 << QLC_BC_FLR)) ? true : false;
+}
+
+static inline u8 qlcnic_sriov_target_func_id(u32 val)
+{
+        return (val >> 4) & 0xff;
+}
+
+static int qlcnic_sriov_virtid_fn(struct qlcnic_adapter *adapter, int vf_id)
+{
+        struct pci_dev *dev = adapter->pdev;
+        int pos;
+        u16 stride, offset;
+
+        if (qlcnic_sriov_vf_check(adapter))
+                return 0;
+
+        pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV);
+        pci_read_config_word(dev, pos + PCI_SRIOV_VF_OFFSET, &offset);
+        pci_read_config_word(dev, pos + PCI_SRIOV_VF_STRIDE, &stride);
+
+        return (dev->devfn + offset + stride * vf_id) & 0xff;
+}
+
+int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)
+{
+        struct qlcnic_sriov *sriov;
+        struct qlcnic_back_channel *bc;
+        struct workqueue_struct *wq;
+        struct qlcnic_vport *vp;
+        struct qlcnic_vf_info *vf;
+        int err, i;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return -EIO;
+
+        sriov  = kzalloc(sizeof(struct qlcnic_sriov), GFP_KERNEL);
+        if (!sriov)
+                return -ENOMEM;
+
+        adapter->ahw->sriov = sriov;
+        sriov->num_vfs = num_vfs;
+        bc = &sriov->bc;
+        sriov->vf_info = kzalloc(sizeof(struct qlcnic_vf_info) *
+                                 num_vfs, GFP_KERNEL);
+        if (!sriov->vf_info) {
+                err = -ENOMEM;
+                goto qlcnic_free_sriov;
+        }
+
+        wq = create_singlethread_workqueue("bc-trans");
+        if (wq == NULL) {
+                err = -ENOMEM;
+                dev_err(&adapter->pdev->dev,
+                        "Cannot create bc-trans workqueue\n");
+                goto qlcnic_free_vf_info;
+        }
+
+        bc->bc_trans_wq = wq;
+
+        wq = create_singlethread_workqueue("async");
+        if (wq == NULL) {
+                err = -ENOMEM;
+                dev_err(&adapter->pdev->dev, "Cannot create async workqueue\n");
+                goto qlcnic_destroy_trans_wq;
+        }
+
+        bc->bc_async_wq =  wq;
+        INIT_LIST_HEAD(&bc->async_list);
+
+        for (i = 0; i < num_vfs; i++) {
+                vf = &sriov->vf_info[i];
+                vf->adapter = adapter;
+                vf->pci_func = qlcnic_sriov_virtid_fn(adapter, i);
+                mutex_init(&vf->send_cmd_lock);
+                INIT_LIST_HEAD(&vf->rcv_act.wait_list);
+                INIT_LIST_HEAD(&vf->rcv_pend.wait_list);
+                spin_lock_init(&vf->rcv_act.lock);
+                spin_lock_init(&vf->rcv_pend.lock);
+                init_completion(&vf->ch_free_cmpl);
+
+                if (qlcnic_sriov_pf_check(adapter)) {
+                        vp = kzalloc(sizeof(struct qlcnic_vport), GFP_KERNEL);
+                        if (!vp) {
+                                err = -ENOMEM;
+                                goto qlcnic_destroy_async_wq;
+                        }
+                        sriov->vf_info[i].vp = vp;
+                        vp->max_tx_bw = MAX_BW;
+                        random_ether_addr(vp->mac);
+                        dev_info(&adapter->pdev->dev,
+                                 "MAC Address %pM is configured for VF %d\n",
+                                 vp->mac, i);
+                }
+        }
+
+        return 0;
+
+qlcnic_destroy_async_wq:
+        destroy_workqueue(bc->bc_async_wq);
+
+qlcnic_destroy_trans_wq:
+        destroy_workqueue(bc->bc_trans_wq);
+
+qlcnic_free_vf_info:
+        kfree(sriov->vf_info);
+
+qlcnic_free_sriov:
+        kfree(adapter->ahw->sriov);
+        return err;
+}
+
+void qlcnic_sriov_cleanup_list(struct qlcnic_trans_list *t_list)
+{
+        struct qlcnic_bc_trans *trans;
+        struct qlcnic_cmd_args cmd;
+        unsigned long flags;
+
+        spin_lock_irqsave(&t_list->lock, flags);
+
+        while (!list_empty(&t_list->wait_list)) {
+                trans = list_first_entry(&t_list->wait_list,
+                                         struct qlcnic_bc_trans, list);
+                list_del(&trans->list);
+                t_list->count--;
+                cmd.req.arg = (u32 *)trans->req_pay;
+                cmd.rsp.arg = (u32 *)trans->rsp_pay;
+                qlcnic_free_mbx_args(&cmd);
+                qlcnic_sriov_cleanup_transaction(trans);
+        }
+
+        spin_unlock_irqrestore(&t_list->lock, flags);
+}
+
+void __qlcnic_sriov_cleanup(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_back_channel *bc = &sriov->bc;
+        struct qlcnic_vf_info *vf;
+        int i;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return;
+
+        qlcnic_sriov_cleanup_async_list(bc);
+        destroy_workqueue(bc->bc_async_wq);
+
+        for (i = 0; i < sriov->num_vfs; i++) {
+                vf = &sriov->vf_info[i];
+                qlcnic_sriov_cleanup_list(&vf->rcv_pend);
+                cancel_work_sync(&vf->trans_work);
+                qlcnic_sriov_cleanup_list(&vf->rcv_act);
+        }
+
+        destroy_workqueue(bc->bc_trans_wq);
+
+        for (i = 0; i < sriov->num_vfs; i++)
+                kfree(sriov->vf_info[i].vp);
+
+        kfree(sriov->vf_info);
+        kfree(adapter->ahw->sriov);
+}
+
+static void qlcnic_sriov_vf_cleanup(struct qlcnic_adapter *adapter)
+{
+        qlcnic_sriov_channel_cfg_cmd(adapter, QLCNIC_BC_CMD_CHANNEL_TERM);
+        qlcnic_sriov_cfg_bc_intr(adapter, 0);
+        __qlcnic_sriov_cleanup(adapter);
+}
+
+void qlcnic_sriov_cleanup(struct qlcnic_adapter *adapter)
+{
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_sriov_pf_cleanup(adapter);
+
+        if (qlcnic_sriov_vf_check(adapter))
+                qlcnic_sriov_vf_cleanup(adapter);
+}
+
+static int qlcnic_sriov_post_bc_msg(struct qlcnic_adapter *adapter, u32 *hdr,
+                                    u32 *pay, u8 pci_func, u8 size)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        unsigned long flags;
+        u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd, val;
+        u16 opcode;
+        u8 mbx_err_code;
+        int i, j;
+
+        opcode = ((struct qlcnic_bc_hdr *)hdr)->cmd_op;
+
+        if (!test_bit(QLC_83XX_MBX_READY, &adapter->ahw->idc.status)) {
+                dev_info(&adapter->pdev->dev,
+                         "Mailbox cmd attempted, 0x%x\n", opcode);
+                dev_info(&adapter->pdev->dev, "Mailbox detached\n");
+                return 0;
+        }
+
+        spin_lock_irqsave(&ahw->mbx_lock, flags);
+
+        mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);
+        if (mbx_val) {
+                QLCDB(adapter, DRV, "Mailbox cmd attempted, 0x%x\n", opcode);
+                spin_unlock_irqrestore(&ahw->mbx_lock, flags);
+                return QLCNIC_RCODE_TIMEOUT;
+        }
+        /* Fill in mailbox registers */
+        val = size + (sizeof(struct qlcnic_bc_hdr) / sizeof(u32));
+        mbx_cmd = 0x31 | (val << 16) | (adapter->ahw->fw_hal_version << 29);
+
+        writel(mbx_cmd, QLCNIC_MBX_HOST(ahw, 0));
+        mbx_cmd = 0x1 | (1 << 4);
+
+        if (qlcnic_sriov_pf_check(adapter))
+                mbx_cmd |= (pci_func << 5);
+
+        writel(mbx_cmd, QLCNIC_MBX_HOST(ahw, 1));
+        for (i = 2, j = 0; j < (sizeof(struct qlcnic_bc_hdr) / sizeof(u32));
+                        i++, j++) {
+                writel(*(hdr++), QLCNIC_MBX_HOST(ahw, i));
+        }
+        for (j = 0; j < size; j++, i++)
+                writel(*(pay++), QLCNIC_MBX_HOST(ahw, i));
+
+        /* Signal FW about the impending command */
+        QLCWRX(ahw, QLCNIC_HOST_MBX_CTRL, QLCNIC_SET_OWNER);
+
+        /* Waiting for the mailbox cmd to complete and while waiting here
+         * some AEN might arrive. If more than 5 seconds expire we can
+         * assume something is wrong.
+         */
+poll:
+        rsp = qlcnic_83xx_mbx_poll(adapter);
+        if (rsp != QLCNIC_RCODE_TIMEOUT) {
+                /* Get the FW response data */
+                fw_data = readl(QLCNIC_MBX_FW(ahw, 0));
+                if (fw_data &  QLCNIC_MBX_ASYNC_EVENT) {
+                        __qlcnic_83xx_process_aen(adapter);
+                        mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);
+                        if (mbx_val)
+                                goto poll;
+                }
+                mbx_err_code = QLCNIC_MBX_STATUS(fw_data);
+                rsp_num = QLCNIC_MBX_NUM_REGS(fw_data);
+                opcode = QLCNIC_MBX_RSP(fw_data);
+
+                switch (mbx_err_code) {
+                case QLCNIC_MBX_RSP_OK:
+                case QLCNIC_MBX_PORT_RSP_OK:
+                        rsp = QLCNIC_RCODE_SUCCESS;
+                        break;
+                default:
+                        if (opcode == QLCNIC_CMD_CONFIG_MAC_VLAN) {
+                                rsp = qlcnic_83xx_mac_rcode(adapter);
+                                if (!rsp)
+                                        goto out;
+                        }
+                        dev_err(&adapter->pdev->dev,
+                                "MBX command 0x%x failed with err:0x%x\n",
+                                opcode, mbx_err_code);
+                        rsp = mbx_err_code;
+                        break;
+                }
+                goto out;
+        }
+
+        dev_err(&adapter->pdev->dev, "MBX command 0x%x timed out\n",
+                QLCNIC_MBX_RSP(mbx_cmd));
+        rsp = QLCNIC_RCODE_TIMEOUT;
+out:
+        /* clear fw mbx control register */
+        QLCWRX(ahw, QLCNIC_FW_MBX_CTRL, QLCNIC_CLR_OWNER);
+        spin_unlock_irqrestore(&adapter->ahw->mbx_lock, flags);
+        return rsp;
+}
+
+static void qlcnic_sriov_vf_cfg_buff_desc(struct qlcnic_adapter *adapter)
+{
+        adapter->num_rxd = QLC_DEFAULT_RCV_DESCRIPTORS_SRIOV_VF;
+        adapter->max_rxd = MAX_RCV_DESCRIPTORS_10G;
+        adapter->num_jumbo_rxd = QLC_DEFAULT_JUMBO_RCV_DESCRIPTORS_SRIOV_VF;
+        adapter->max_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;
+        adapter->num_txd = MAX_CMD_DESCRIPTORS;
+        adapter->max_rds_rings = MAX_RDS_RINGS;
+}
+
+int qlcnic_sriov_get_vf_vport_info(struct qlcnic_adapter *adapter,
+                                   struct qlcnic_info *npar_info, u16 vport_id)
+{
+        struct device *dev = &adapter->pdev->dev;
+        struct qlcnic_cmd_args cmd;
+        int err;
+        u32 status;
+
+        err = qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_NIC_INFO);
+        if (err)
+                return err;
+
+        cmd.req.arg[1] = vport_id << 16 | 0x1;
+        err = qlcnic_issue_cmd(adapter, &cmd);
+        if (err) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get vport info, err=%d\n", err);
+                qlcnic_free_mbx_args(&cmd);
+                return err;
+        }
+
+        status = cmd.rsp.arg[2] & 0xffff;
+        if (status & BIT_0)
+                npar_info->min_tx_bw = MSW(cmd.rsp.arg[2]);
+        if (status & BIT_1)
+                npar_info->max_tx_bw = LSW(cmd.rsp.arg[3]);
+        if (status & BIT_2)
+                npar_info->max_tx_ques = MSW(cmd.rsp.arg[3]);
+        if (status & BIT_3)
+                npar_info->max_tx_mac_filters = LSW(cmd.rsp.arg[4]);
+        if (status & BIT_4)
+                npar_info->max_rx_mcast_mac_filters = MSW(cmd.rsp.arg[4]);
+        if (status & BIT_5)
+                npar_info->max_rx_ucast_mac_filters = LSW(cmd.rsp.arg[5]);
+        if (status & BIT_6)
+                npar_info->max_rx_ip_addr = MSW(cmd.rsp.arg[5]);
+        if (status & BIT_7)
+                npar_info->max_rx_lro_flow = LSW(cmd.rsp.arg[6]);
+        if (status & BIT_8)
+                npar_info->max_rx_status_rings = MSW(cmd.rsp.arg[6]);
+        if (status & BIT_9)
+                npar_info->max_rx_buf_rings = LSW(cmd.rsp.arg[7]);
+
+        npar_info->max_rx_ques = MSW(cmd.rsp.arg[7]);
+        npar_info->max_tx_vlan_keys = LSW(cmd.rsp.arg[8]);
+        npar_info->max_local_ipv6_addrs = MSW(cmd.rsp.arg[8]);
+        npar_info->max_remote_ipv6_addrs = LSW(cmd.rsp.arg[9]);
+
+        dev_info(dev, "\n\tmin_tx_bw: %d, max_tx_bw: %d max_tx_ques: %d,\n"
+                 "\tmax_tx_mac_filters: %d max_rx_mcast_mac_filters: %d,\n"
+                 "\tmax_rx_ucast_mac_filters: 0x%x, max_rx_ip_addr: %d,\n"
+                 "\tmax_rx_lro_flow: %d max_rx_status_rings: %d,\n"
+                 "\tmax_rx_buf_rings: %d, max_rx_ques: %d, max_tx_vlan_keys %d\n"
+                 "\tlocal_ipv6_addr: %d, remote_ipv6_addr: %d\n",
+                 npar_info->min_tx_bw, npar_info->max_tx_bw,
+                 npar_info->max_tx_ques, npar_info->max_tx_mac_filters,
+                 npar_info->max_rx_mcast_mac_filters,
+                 npar_info->max_rx_ucast_mac_filters, npar_info->max_rx_ip_addr,
+                 npar_info->max_rx_lro_flow, npar_info->max_rx_status_rings,
+                 npar_info->max_rx_buf_rings, npar_info->max_rx_ques,
+                 npar_info->max_tx_vlan_keys, npar_info->max_local_ipv6_addrs,
+                 npar_info->max_remote_ipv6_addrs);
+
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static int qlcnic_sriov_set_pvid_mode(struct qlcnic_adapter *adapter,
+                                      struct qlcnic_cmd_args *cmd)
+{
+        adapter->rx_pvid = (cmd->rsp.arg[1] >> 16) & 0xffff;
+        adapter->flags &= ~QLCNIC_TAGGING_ENABLED;
+        return 0;
+}
+
+static int qlcnic_sriov_set_guest_vlan_mode(struct qlcnic_adapter *adapter,
+                                            struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        int i, num_vlans;
+        u16 *vlans;
+
+        if (sriov->allowed_vlans)
+                return 0;
+
+        sriov->any_vlan = cmd->rsp.arg[2] & 0xf;
+        if (!sriov->any_vlan)
+                return 0;
+
+        sriov->num_allowed_vlans = cmd->rsp.arg[2] >> 16;
+        num_vlans = sriov->num_allowed_vlans;
+        sriov->allowed_vlans = kzalloc(sizeof(u16) * num_vlans, GFP_KERNEL);
+        if (!sriov->allowed_vlans)
+                return -ENOMEM;
+
+        vlans = (u16 *)&cmd->rsp.arg[3];
+        for (i = 0; i < num_vlans; i++)
+                sriov->allowed_vlans[i] = vlans[i];
+
+        return 0;
+}
+
+static int qlcnic_sriov_get_vf_acl(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_cmd_args cmd;
+        int ret;
+
+        ret = qlcnic_sriov_alloc_bc_mbx_args(&cmd, QLCNIC_BC_CMD_GET_ACL);
+        if (ret)
+                return ret;
+
+        ret = qlcnic_issue_cmd(adapter, &cmd);
+        if (ret) {
+                dev_err(&adapter->pdev->dev, "Failed to get ACL, err=%d\n",
+                        ret);
+        } else {
+                sriov->vlan_mode = cmd.rsp.arg[1] & 0x3;
+                switch (sriov->vlan_mode) {
+                case QLC_GUEST_VLAN_MODE:
+                        ret = qlcnic_sriov_set_guest_vlan_mode(adapter, &cmd);
+                        break;
+                case QLC_PVID_MODE:
+                        ret = qlcnic_sriov_set_pvid_mode(adapter, &cmd);
+                        break;
+                }
+        }
+
+        qlcnic_free_mbx_args(&cmd);
+        return ret;
+}
+
+static int qlcnic_sriov_vf_init_driver(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_info nic_info;
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        int err;
+
+        err = qlcnic_sriov_get_vf_vport_info(adapter, &nic_info, 0);
+        if (err)
+                return err;
+
+        err = qlcnic_get_nic_info(adapter, &nic_info, ahw->pci_func);
+        if (err)
+                return -EIO;
+
+        err = qlcnic_sriov_get_vf_acl(adapter);
+        if (err)
+                return err;
+
+        if (qlcnic_83xx_get_port_info(adapter))
+                return -EIO;
+
+        qlcnic_sriov_vf_cfg_buff_desc(adapter);
+        adapter->flags |= QLCNIC_ADAPTER_INITIALIZED;
+        dev_info(&adapter->pdev->dev, "HAL Version: %d\n",
+                 adapter->ahw->fw_hal_version);
+
+        ahw->physical_port = (u8) nic_info.phys_port;
+        ahw->switch_mode = nic_info.switch_mode;
+        ahw->max_mtu = nic_info.max_mtu;
+        ahw->op_mode = nic_info.op_mode;
+        ahw->capabilities = nic_info.capabilities;
+        return 0;
+}
+
+static int qlcnic_sriov_setup_vf(struct qlcnic_adapter *adapter,
+                                 int pci_using_dac)
+{
+        int err;
+
+        INIT_LIST_HEAD(&adapter->vf_mc_list);
+        if (!qlcnic_use_msi_x && !!qlcnic_use_msi)
+                dev_warn(&adapter->pdev->dev,
+                         "83xx adapter do not support MSI interrupts\n");
+
+        err = qlcnic_setup_intr(adapter, 1);
+        if (err) {
+                dev_err(&adapter->pdev->dev, "Failed to setup interrupt\n");
+                goto err_out_disable_msi;
+        }
+
+        err = qlcnic_83xx_setup_mbx_intr(adapter);
+        if (err)
+                goto err_out_disable_msi;
+
+        err = qlcnic_sriov_init(adapter, 1);
+        if (err)
+                goto err_out_disable_mbx_intr;
+
+        err = qlcnic_sriov_cfg_bc_intr(adapter, 1);
+        if (err)
+                goto err_out_cleanup_sriov;
+
+        err = qlcnic_sriov_channel_cfg_cmd(adapter, QLCNIC_BC_CMD_CHANNEL_INIT);
+        if (err)
+                goto err_out_disable_bc_intr;
+
+        err = qlcnic_sriov_vf_init_driver(adapter);
+        if (err)
+                goto err_out_send_channel_term;
+
+        err = qlcnic_setup_netdev(adapter, adapter->netdev, pci_using_dac);
+        if (err)
+                goto err_out_send_channel_term;
+
+        pci_set_drvdata(adapter->pdev, adapter);
+        dev_info(&adapter->pdev->dev, "%s: XGbE port initialized\n",
+                 adapter->netdev->name);
+        qlcnic_schedule_work(adapter, qlcnic_sriov_vf_poll_dev_state,
+                             adapter->ahw->idc.delay);
+        return 0;
+
+err_out_send_channel_term:
+        qlcnic_sriov_channel_cfg_cmd(adapter, QLCNIC_BC_CMD_CHANNEL_TERM);
+
+err_out_disable_bc_intr:
+        qlcnic_sriov_cfg_bc_intr(adapter, 0);
+
+err_out_cleanup_sriov:
+        __qlcnic_sriov_cleanup(adapter);
+
+err_out_disable_mbx_intr:
+        qlcnic_83xx_free_mbx_intr(adapter);
+
+err_out_disable_msi:
+        qlcnic_teardown_intr(adapter);
+        return err;
+}
+
+static int qlcnic_sriov_check_dev_ready(struct qlcnic_adapter *adapter)
+{
+        u32 state;
+
+        do {
+                msleep(20);
+                if (++adapter->fw_fail_cnt > QLC_BC_CMD_MAX_RETRY_CNT)
+                        return -EIO;
+                state = QLCRDX(adapter->ahw, QLC_83XX_IDC_DEV_STATE);
+        } while (state != QLC_83XX_IDC_DEV_READY);
+
+        return 0;
+}
+
+int qlcnic_sriov_vf_init(struct qlcnic_adapter *adapter, int pci_using_dac)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        int err;
+
+        spin_lock_init(&ahw->mbx_lock);
+        set_bit(QLC_83XX_MBX_READY, &ahw->idc.status);
+        set_bit(QLC_83XX_MODULE_LOADED, &ahw->idc.status);
+        ahw->idc.delay = QLC_83XX_IDC_FW_POLL_DELAY;
+        ahw->reset_context = 0;
+        adapter->fw_fail_cnt = 0;
+        ahw->msix_supported = 1;
+        adapter->need_fw_reset = 0;
+        adapter->flags |= QLCNIC_TX_INTR_SHARED;
+
+        err = qlcnic_sriov_check_dev_ready(adapter);
+        if (err)
+                return err;
+
+        err = qlcnic_sriov_setup_vf(adapter, pci_using_dac);
+        if (err)
+                return err;
+
+        if (qlcnic_read_mac_addr(adapter))
+                dev_warn(&adapter->pdev->dev, "failed to read mac addr\n");
+
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+        return 0;
+}
+
+void qlcnic_sriov_vf_set_ops(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+
+        ahw->op_mode = QLCNIC_SRIOV_VF_FUNC;
+        dev_info(&adapter->pdev->dev,
+                 "HAL Version: %d Non Privileged SRIOV function\n",
+                 ahw->fw_hal_version);
+        adapter->nic_ops = &qlcnic_sriov_vf_ops;
+        set_bit(__QLCNIC_SRIOV_ENABLE, &adapter->state);
+        return;
+}
+
+void qlcnic_sriov_vf_register_map(struct qlcnic_hardware_context *ahw)
+{
+        ahw->hw_ops             = &qlcnic_sriov_vf_hw_ops;
+        ahw->reg_tbl            = (u32 *)qlcnic_83xx_reg_tbl;
+        ahw->ext_reg_tbl        = (u32 *)qlcnic_83xx_ext_reg_tbl;
+}
+
+static u32 qlcnic_sriov_get_bc_paysize(u32 real_pay_size, u8 curr_frag)
+{
+        u32 pay_size;
+
+        pay_size = real_pay_size / ((curr_frag + 1) * QLC_BC_PAYLOAD_SZ);
+
+        if (pay_size)
+                pay_size = QLC_BC_PAYLOAD_SZ;
+        else
+                pay_size = real_pay_size % QLC_BC_PAYLOAD_SZ;
+
+        return pay_size;
+}
+
+int qlcnic_sriov_func_to_index(struct qlcnic_adapter *adapter, u8 pci_func)
+{
+        struct qlcnic_vf_info *vf_info = adapter->ahw->sriov->vf_info;
+        u8 i;
+
+        if (qlcnic_sriov_vf_check(adapter))
+                return 0;
+
+        for (i = 0; i < adapter->ahw->sriov->num_vfs; i++) {
+                if (vf_info[i].pci_func == pci_func)
+                        return i;
+        }
+
+        return -EINVAL;
+}
+
+static inline int qlcnic_sriov_alloc_bc_trans(struct qlcnic_bc_trans **trans)
+{
+        *trans = kzalloc(sizeof(struct qlcnic_bc_trans), GFP_ATOMIC);
+        if (!*trans)
+                return -ENOMEM;
+
+        init_completion(&(*trans)->resp_cmpl);
+        return 0;
+}
+
+static inline int qlcnic_sriov_alloc_bc_msg(struct qlcnic_bc_hdr **hdr,
+                                            u32 size)
+{
+        *hdr = kzalloc(sizeof(struct qlcnic_bc_hdr) * size, GFP_ATOMIC);
+        if (!*hdr)
+                return -ENOMEM;
+
+        return 0;
+}
+
+static int qlcnic_sriov_alloc_bc_mbx_args(struct qlcnic_cmd_args *mbx, u32 type)
+{
+        const struct qlcnic_mailbox_metadata *mbx_tbl;
+        int i, size;
+
+        mbx_tbl = qlcnic_sriov_bc_mbx_tbl;
+        size = ARRAY_SIZE(qlcnic_sriov_bc_mbx_tbl);
+
+        for (i = 0; i < size; i++) {
+                if (type == mbx_tbl[i].cmd) {
+                        mbx->op_type = QLC_BC_CMD;
+                        mbx->req.num = mbx_tbl[i].in_args;
+                        mbx->rsp.num = mbx_tbl[i].out_args;
+                        mbx->req.arg = kcalloc(mbx->req.num, sizeof(u32),
+                                               GFP_ATOMIC);
+                        if (!mbx->req.arg)
+                                return -ENOMEM;
+                        mbx->rsp.arg = kcalloc(mbx->rsp.num, sizeof(u32),
+                                               GFP_ATOMIC);
+                        if (!mbx->rsp.arg) {
+                                kfree(mbx->req.arg);
+                                mbx->req.arg = NULL;
+                                return -ENOMEM;
+                        }
+                        memset(mbx->req.arg, 0, sizeof(u32) * mbx->req.num);
+                        memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);
+                        mbx->req.arg[0] = (type | (mbx->req.num << 16) |
+                                           (3 << 29));
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+
+static int qlcnic_sriov_prepare_bc_hdr(struct qlcnic_bc_trans *trans,
+                                       struct qlcnic_cmd_args *cmd,
+                                       u16 seq, u8 msg_type)
+{
+        struct qlcnic_bc_hdr *hdr;
+        int i;
+        u32 num_regs, bc_pay_sz;
+        u16 remainder;
+        u8 cmd_op, num_frags, t_num_frags;
+
+        bc_pay_sz = QLC_BC_PAYLOAD_SZ;
+        if (msg_type == QLC_BC_COMMAND) {
+                trans->req_pay = (struct qlcnic_bc_payload *)cmd->req.arg;
+                trans->rsp_pay = (struct qlcnic_bc_payload *)cmd->rsp.arg;
+                num_regs = cmd->req.num;
+                trans->req_pay_size = (num_regs * 4);
+                num_regs = cmd->rsp.num;
+                trans->rsp_pay_size = (num_regs * 4);
+                cmd_op = cmd->req.arg[0] & 0xff;
+                remainder = (trans->req_pay_size) % (bc_pay_sz);
+                num_frags = (trans->req_pay_size) / (bc_pay_sz);
+                if (remainder)
+                        num_frags++;
+                t_num_frags = num_frags;
+                if (qlcnic_sriov_alloc_bc_msg(&trans->req_hdr, num_frags))
+                        return -ENOMEM;
+                remainder = (trans->rsp_pay_size) % (bc_pay_sz);
+                num_frags = (trans->rsp_pay_size) / (bc_pay_sz);
+                if (remainder)
+                        num_frags++;
+                if (qlcnic_sriov_alloc_bc_msg(&trans->rsp_hdr, num_frags))
+                        return -ENOMEM;
+                num_frags  = t_num_frags;
+                hdr = trans->req_hdr;
+        }  else {
+                cmd->req.arg = (u32 *)trans->req_pay;
+                cmd->rsp.arg = (u32 *)trans->rsp_pay;
+                cmd_op = cmd->req.arg[0] & 0xff;
+                remainder = (trans->rsp_pay_size) % (bc_pay_sz);
+                num_frags = (trans->rsp_pay_size) / (bc_pay_sz);
+                if (remainder)
+                        num_frags++;
+                cmd->req.num = trans->req_pay_size / 4;
+                cmd->rsp.num = trans->rsp_pay_size / 4;
+                hdr = trans->rsp_hdr;
+        }
+
+        trans->trans_id = seq;
+        trans->cmd_id = cmd_op;
+        for (i = 0; i < num_frags; i++) {
+                hdr[i].version = 2;
+                hdr[i].msg_type = msg_type;
+                hdr[i].op_type = cmd->op_type;
+                hdr[i].num_cmds = 1;
+                hdr[i].num_frags = num_frags;
+                hdr[i].frag_num = i + 1;
+                hdr[i].cmd_op = cmd_op;
+                hdr[i].seq_id = seq;
+        }
+        return 0;
+}
+
+static void qlcnic_sriov_cleanup_transaction(struct qlcnic_bc_trans *trans)
+{
+        if (!trans)
+                return;
+        kfree(trans->req_hdr);
+        kfree(trans->rsp_hdr);
+        kfree(trans);
+}
+
+static int qlcnic_sriov_clear_trans(struct qlcnic_vf_info *vf,
+                                    struct qlcnic_bc_trans *trans, u8 type)
+{
+        struct qlcnic_trans_list *t_list;
+        unsigned long flags;
+        int ret = 0;
+
+        if (type == QLC_BC_RESPONSE) {
+                t_list = &vf->rcv_act;
+                spin_lock_irqsave(&t_list->lock, flags);
+                t_list->count--;
+                list_del(&trans->list);
+                if (t_list->count > 0)
+                        ret = 1;
+                spin_unlock_irqrestore(&t_list->lock, flags);
+        }
+        if (type == QLC_BC_COMMAND) {
+                while (test_and_set_bit(QLC_BC_VF_SEND, &vf->state))
+                        msleep(100);
+                vf->send_cmd = NULL;
+                clear_bit(QLC_BC_VF_SEND, &vf->state);
+        }
+        return ret;
+}
+
+static void qlcnic_sriov_schedule_bc_cmd(struct qlcnic_sriov *sriov,
+                                         struct qlcnic_vf_info *vf,
+                                         work_func_t func)
+{
+        if (test_bit(QLC_BC_VF_FLR, &vf->state) ||
+            vf->adapter->need_fw_reset)
+                return;
+
+        INIT_WORK(&vf->trans_work, func);
+        queue_work(sriov->bc.bc_trans_wq, &vf->trans_work);
+}
+
+static inline void qlcnic_sriov_wait_for_resp(struct qlcnic_bc_trans *trans)
+{
+        struct completion *cmpl = &trans->resp_cmpl;
+
+        if (wait_for_completion_timeout(cmpl, QLC_MBOX_RESP_TIMEOUT))
+                trans->trans_state = QLC_END;
+        else
+                trans->trans_state = QLC_ABORT;
+
+        return;
+}
+
+static void qlcnic_sriov_handle_multi_frags(struct qlcnic_bc_trans *trans,
+                                            u8 type)
+{
+        if (type == QLC_BC_RESPONSE) {
+                trans->curr_rsp_frag++;
+                if (trans->curr_rsp_frag < trans->rsp_hdr->num_frags)
+                        trans->trans_state = QLC_INIT;
+                else
+                        trans->trans_state = QLC_END;
+        } else {
+                trans->curr_req_frag++;
+                if (trans->curr_req_frag < trans->req_hdr->num_frags)
+                        trans->trans_state = QLC_INIT;
+                else
+                        trans->trans_state = QLC_WAIT_FOR_RESP;
+        }
+}
+
+static void qlcnic_sriov_wait_for_channel_free(struct qlcnic_bc_trans *trans,
+                                               u8 type)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct completion *cmpl = &vf->ch_free_cmpl;
+
+        if (!wait_for_completion_timeout(cmpl, QLC_MBOX_CH_FREE_TIMEOUT)) {
+                trans->trans_state = QLC_ABORT;
+                return;
+        }
+
+        clear_bit(QLC_BC_VF_CHANNEL, &vf->state);
+        qlcnic_sriov_handle_multi_frags(trans, type);
+}
+
+static void qlcnic_sriov_pull_bc_msg(struct qlcnic_adapter *adapter,
+                                     u32 *hdr, u32 *pay, u32 size)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        u32 fw_mbx;
+        u8 i, max = 2, hdr_size, j;
+
+        hdr_size = (sizeof(struct qlcnic_bc_hdr) / sizeof(u32));
+        max = (size / sizeof(u32)) + hdr_size;
+
+        fw_mbx = readl(QLCNIC_MBX_FW(ahw, 0));
+        for (i = 2, j = 0; j < hdr_size; i++, j++)
+                *(hdr++) = readl(QLCNIC_MBX_FW(ahw, i));
+        for (; j < max; i++, j++)
+                *(pay++) = readl(QLCNIC_MBX_FW(ahw, i));
+}
+
+static int __qlcnic_sriov_issue_bc_post(struct qlcnic_vf_info *vf)
+{
+        int ret = -EBUSY;
+        u32 timeout = 10000;
+
+        do {
+                if (!test_and_set_bit(QLC_BC_VF_CHANNEL, &vf->state)) {
+                        ret = 0;
+                        break;
+                }
+                mdelay(1);
+        } while (--timeout);
+
+        return ret;
+}
+
+static int qlcnic_sriov_issue_bc_post(struct qlcnic_bc_trans *trans, u8 type)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        u32 pay_size, hdr_size;
+        u32 *hdr, *pay;
+        int ret;
+        u8 pci_func = trans->func_id;
+
+        if (__qlcnic_sriov_issue_bc_post(vf))
+                return -EBUSY;
+
+        if (type == QLC_BC_COMMAND) {
+                hdr = (u32 *)(trans->req_hdr + trans->curr_req_frag);
+                pay = (u32 *)(trans->req_pay + trans->curr_req_frag);
+                hdr_size = (sizeof(struct qlcnic_bc_hdr) / sizeof(u32));
+                pay_size = qlcnic_sriov_get_bc_paysize(trans->req_pay_size,
+                                                       trans->curr_req_frag);
+                pay_size = (pay_size / sizeof(u32));
+        } else {
+                hdr = (u32 *)(trans->rsp_hdr + trans->curr_rsp_frag);
+                pay = (u32 *)(trans->rsp_pay + trans->curr_rsp_frag);
+                hdr_size = (sizeof(struct qlcnic_bc_hdr) / sizeof(u32));
+                pay_size = qlcnic_sriov_get_bc_paysize(trans->rsp_pay_size,
+                                                       trans->curr_rsp_frag);
+                pay_size = (pay_size / sizeof(u32));
+        }
+
+        ret = qlcnic_sriov_post_bc_msg(vf->adapter, hdr, pay,
+                                       pci_func, pay_size);
+        return ret;
+}
+
+static int __qlcnic_sriov_send_bc_msg(struct qlcnic_bc_trans *trans,
+                                      struct qlcnic_vf_info *vf, u8 type)
+{
+        bool flag = true;
+        int err = -EIO;
+
+        while (flag) {
+                if (test_bit(QLC_BC_VF_FLR, &vf->state) ||
+                    vf->adapter->need_fw_reset)
+                        trans->trans_state = QLC_ABORT;
+
+                switch (trans->trans_state) {
+                case QLC_INIT:
+                        trans->trans_state = QLC_WAIT_FOR_CHANNEL_FREE;
+                        if (qlcnic_sriov_issue_bc_post(trans, type))
+                                trans->trans_state = QLC_ABORT;
+                        break;
+                case QLC_WAIT_FOR_CHANNEL_FREE:
+                        qlcnic_sriov_wait_for_channel_free(trans, type);
+                        break;
+                case QLC_WAIT_FOR_RESP:
+                        qlcnic_sriov_wait_for_resp(trans);
+                        break;
+                case QLC_END:
+                        err = 0;
+                        flag = false;
+                        break;
+                case QLC_ABORT:
+                        err = -EIO;
+                        flag = false;
+                        clear_bit(QLC_BC_VF_CHANNEL, &vf->state);
+                        break;
+                default:
+                        err = -EIO;
+                        flag = false;
+                }
+        }
+        return err;
+}
+
+static int qlcnic_sriov_send_bc_cmd(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_bc_trans *trans, int pci_func)
+{
+        struct qlcnic_vf_info *vf;
+        int err, index = qlcnic_sriov_func_to_index(adapter, pci_func);
+
+        if (index < 0)
+                return -EIO;
+
+        vf = &adapter->ahw->sriov->vf_info[index];
+        trans->vf = vf;
+        trans->func_id = pci_func;
+
+        if (!test_bit(QLC_BC_VF_STATE, &vf->state)) {
+                if (qlcnic_sriov_pf_check(adapter))
+                        return -EIO;
+                if (qlcnic_sriov_vf_check(adapter) &&
+                    trans->cmd_id != QLCNIC_BC_CMD_CHANNEL_INIT)
+                        return -EIO;
+        }
+
+        mutex_lock(&vf->send_cmd_lock);
+        vf->send_cmd = trans;
+        err = __qlcnic_sriov_send_bc_msg(trans, vf, QLC_BC_COMMAND);
+        qlcnic_sriov_clear_trans(vf, trans, QLC_BC_COMMAND);
+        mutex_unlock(&vf->send_cmd_lock);
+        return err;
+}
+
+static void __qlcnic_sriov_process_bc_cmd(struct qlcnic_adapter *adapter,
+                                          struct qlcnic_bc_trans *trans,
+                                          struct qlcnic_cmd_args *cmd)
+{
+#ifdef CONFIG_QLCNIC_SRIOV
+        if (qlcnic_sriov_pf_check(adapter)) {
+                qlcnic_sriov_pf_process_bc_cmd(adapter, trans, cmd);
+                return;
+        }
+#endif
+        cmd->rsp.arg[0] |= (0x9 << 25);
+        return;
+}
+
+static void qlcnic_sriov_process_bc_cmd(struct work_struct *work)
+{
+        struct qlcnic_vf_info *vf = container_of(work, struct qlcnic_vf_info,
+                                                 trans_work);
+        struct qlcnic_bc_trans *trans = NULL;
+        struct qlcnic_adapter *adapter  = vf->adapter;
+        struct qlcnic_cmd_args cmd;
+        u8 req;
+
+        if (adapter->need_fw_reset)
+                return;
+
+        if (test_bit(QLC_BC_VF_FLR, &vf->state))
+                return;
+
+        trans = list_first_entry(&vf->rcv_act.wait_list,
+                                 struct qlcnic_bc_trans, list);
+        adapter = vf->adapter;
+
+        if (qlcnic_sriov_prepare_bc_hdr(trans, &cmd, trans->req_hdr->seq_id,
+                                        QLC_BC_RESPONSE))
+                goto cleanup_trans;
+
+        __qlcnic_sriov_process_bc_cmd(adapter, trans, &cmd);
+        trans->trans_state = QLC_INIT;
+        __qlcnic_sriov_send_bc_msg(trans, vf, QLC_BC_RESPONSE);
+
+cleanup_trans:
+        qlcnic_free_mbx_args(&cmd);
+        req = qlcnic_sriov_clear_trans(vf, trans, QLC_BC_RESPONSE);
+        qlcnic_sriov_cleanup_transaction(trans);
+        if (req)
+                qlcnic_sriov_schedule_bc_cmd(adapter->ahw->sriov, vf,
+                                             qlcnic_sriov_process_bc_cmd);
+}
+
+static void qlcnic_sriov_handle_bc_resp(struct qlcnic_bc_hdr *hdr,
+                                        struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_bc_trans *trans;
+        u32 pay_size;
+
+        if (test_and_set_bit(QLC_BC_VF_SEND, &vf->state))
+                return;
+
+        trans = vf->send_cmd;
+
+        if (trans == NULL)
+                goto clear_send;
+
+        if (trans->trans_id != hdr->seq_id)
+                goto clear_send;
+
+        pay_size = qlcnic_sriov_get_bc_paysize(trans->rsp_pay_size,
+                                               trans->curr_rsp_frag);
+        qlcnic_sriov_pull_bc_msg(vf->adapter,
+                                 (u32 *)(trans->rsp_hdr + trans->curr_rsp_frag),
+                                 (u32 *)(trans->rsp_pay + trans->curr_rsp_frag),
+                                 pay_size);
+        if (++trans->curr_rsp_frag < trans->rsp_hdr->num_frags)
+                goto clear_send;
+
+        complete(&trans->resp_cmpl);
+
+clear_send:
+        clear_bit(QLC_BC_VF_SEND, &vf->state);
+}
+
+int __qlcnic_sriov_add_act_list(struct qlcnic_sriov *sriov,
+                                struct qlcnic_vf_info *vf,
+                                struct qlcnic_bc_trans *trans)
+{
+        struct qlcnic_trans_list *t_list = &vf->rcv_act;
+
+        t_list->count++;
+        list_add_tail(&trans->list, &t_list->wait_list);
+        if (t_list->count == 1)
+                qlcnic_sriov_schedule_bc_cmd(sriov, vf,
+                                             qlcnic_sriov_process_bc_cmd);
+        return 0;
+}
+
+static int qlcnic_sriov_add_act_list(struct qlcnic_sriov *sriov,
+                                     struct qlcnic_vf_info *vf,
+                                     struct qlcnic_bc_trans *trans)
+{
+        struct qlcnic_trans_list *t_list = &vf->rcv_act;
+
+        spin_lock(&t_list->lock);
+
+        __qlcnic_sriov_add_act_list(sriov, vf, trans);
+
+        spin_unlock(&t_list->lock);
+        return 0;
+}
+
+static void qlcnic_sriov_handle_pending_trans(struct qlcnic_sriov *sriov,
+                                              struct qlcnic_vf_info *vf,
+                                              struct qlcnic_bc_hdr *hdr)
+{
+        struct qlcnic_bc_trans *trans = NULL;
+        struct list_head *node;
+        u32 pay_size, curr_frag;
+        u8 found = 0, active = 0;
+
+        spin_lock(&vf->rcv_pend.lock);
+        if (vf->rcv_pend.count > 0) {
+                list_for_each(node, &vf->rcv_pend.wait_list) {
+                        trans = list_entry(node, struct qlcnic_bc_trans, list);
+                        if (trans->trans_id == hdr->seq_id) {
+                                found = 1;
+                                break;
+                        }
+                }
+        }
+
+        if (found) {
+                curr_frag = trans->curr_req_frag;
+                pay_size = qlcnic_sriov_get_bc_paysize(trans->req_pay_size,
+                                                       curr_frag);
+                qlcnic_sriov_pull_bc_msg(vf->adapter,
+                                         (u32 *)(trans->req_hdr + curr_frag),
+                                         (u32 *)(trans->req_pay + curr_frag),
+                                         pay_size);
+                trans->curr_req_frag++;
+                if (trans->curr_req_frag >= hdr->num_frags) {
+                        vf->rcv_pend.count--;
+                        list_del(&trans->list);
+                        active = 1;
+                }
+        }
+        spin_unlock(&vf->rcv_pend.lock);
+
+        if (active)
+                if (qlcnic_sriov_add_act_list(sriov, vf, trans))
+                        qlcnic_sriov_cleanup_transaction(trans);
+
+        return;
+}
+
+static void qlcnic_sriov_handle_bc_cmd(struct qlcnic_sriov *sriov,
+                                       struct qlcnic_bc_hdr *hdr,
+                                       struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_bc_trans *trans;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        struct qlcnic_cmd_args cmd;
+        u32 pay_size;
+        int err;
+        u8 cmd_op;
+
+        if (adapter->need_fw_reset)
+                return;
+
+        if (!test_bit(QLC_BC_VF_STATE, &vf->state) &&
+            hdr->op_type != QLC_BC_CMD &&
+            hdr->cmd_op != QLCNIC_BC_CMD_CHANNEL_INIT)
+                return;
+
+        if (hdr->frag_num > 1) {
+                qlcnic_sriov_handle_pending_trans(sriov, vf, hdr);
+                return;
+        }
+
+        cmd_op = hdr->cmd_op;
+        if (qlcnic_sriov_alloc_bc_trans(&trans))
+                return;
+
+        if (hdr->op_type == QLC_BC_CMD)
+                err = qlcnic_sriov_alloc_bc_mbx_args(&cmd, cmd_op);
+        else
+                err = qlcnic_alloc_mbx_args(&cmd, adapter, cmd_op);
+
+        if (err) {
+                qlcnic_sriov_cleanup_transaction(trans);
+                return;
+        }
+
+        cmd.op_type = hdr->op_type;
+        if (qlcnic_sriov_prepare_bc_hdr(trans, &cmd, hdr->seq_id,
+                                        QLC_BC_COMMAND)) {
+                qlcnic_free_mbx_args(&cmd);
+                qlcnic_sriov_cleanup_transaction(trans);
+                return;
+        }
+
+        pay_size = qlcnic_sriov_get_bc_paysize(trans->req_pay_size,
+                                         trans->curr_req_frag);
+        qlcnic_sriov_pull_bc_msg(vf->adapter,
+                                 (u32 *)(trans->req_hdr + trans->curr_req_frag),
+                                 (u32 *)(trans->req_pay + trans->curr_req_frag),
+                                 pay_size);
+        trans->func_id = vf->pci_func;
+        trans->vf = vf;
+        trans->trans_id = hdr->seq_id;
+        trans->curr_req_frag++;
+
+        if (qlcnic_sriov_soft_flr_check(adapter, trans, vf))
+                return;
+
+        if (trans->curr_req_frag == trans->req_hdr->num_frags) {
+                if (qlcnic_sriov_add_act_list(sriov, vf, trans)) {
+                        qlcnic_free_mbx_args(&cmd);
+                        qlcnic_sriov_cleanup_transaction(trans);
+                }
+        } else {
+                spin_lock(&vf->rcv_pend.lock);
+                list_add_tail(&trans->list, &vf->rcv_pend.wait_list);
+                vf->rcv_pend.count++;
+                spin_unlock(&vf->rcv_pend.lock);
+        }
+}
+
+static void qlcnic_sriov_handle_msg_event(struct qlcnic_sriov *sriov,
+                                          struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_bc_hdr hdr;
+        u32 *ptr = (u32 *)&hdr;
+        u8 msg_type, i;
+
+        for (i = 2; i < 6; i++)
+                ptr[i - 2] = readl(QLCNIC_MBX_FW(vf->adapter->ahw, i));
+        msg_type = hdr.msg_type;
+
+        switch (msg_type) {
+        case QLC_BC_COMMAND:
+                qlcnic_sriov_handle_bc_cmd(sriov, &hdr, vf);
+                break;
+        case QLC_BC_RESPONSE:
+                qlcnic_sriov_handle_bc_resp(&hdr, vf);
+                break;
+        }
+}
+
+static void qlcnic_sriov_handle_flr_event(struct qlcnic_sriov *sriov,
+                                          struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_adapter *adapter = vf->adapter;
+
+        if (qlcnic_sriov_pf_check(adapter))
+                qlcnic_sriov_pf_handle_flr(sriov, vf);
+        else
+                dev_err(&adapter->pdev->dev,
+                        "Invalid event to VF. VF should not get FLR event\n");
+}
+
+void qlcnic_sriov_handle_bc_event(struct qlcnic_adapter *adapter, u32 event)
+{
+        struct qlcnic_vf_info *vf;
+        struct qlcnic_sriov *sriov;
+        int index;
+        u8 pci_func;
+
+        sriov = adapter->ahw->sriov;
+        pci_func = qlcnic_sriov_target_func_id(event);
+        index = qlcnic_sriov_func_to_index(adapter, pci_func);
+
+        if (index < 0)
+                return;
+
+        vf = &sriov->vf_info[index];
+        vf->pci_func = pci_func;
+
+        if (qlcnic_sriov_channel_free_check(event))
+                complete(&vf->ch_free_cmpl);
+
+        if (qlcnic_sriov_flr_check(event)) {
+                qlcnic_sriov_handle_flr_event(sriov, vf);
+                return;
+        }
+
+        if (qlcnic_sriov_bc_msg_check(event))
+                qlcnic_sriov_handle_msg_event(sriov, vf);
+}
+
+int qlcnic_sriov_cfg_bc_intr(struct qlcnic_adapter *adapter, u8 enable)
+{
+        struct qlcnic_cmd_args cmd;
+        int err;
+
+        if (!test_bit(__QLCNIC_SRIOV_ENABLE, &adapter->state))
+                return 0;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_BC_EVENT_SETUP))
+                return -ENOMEM;
+
+        if (enable)
+                cmd.req.arg[1] = (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7);
+
+        err = qlcnic_83xx_mbx_op(adapter, &cmd);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to %s bc events, err=%d\n",
+                        (enable ? "enable" : "disable"), err);
+        }
+
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static int qlcnic_sriov_retry_bc_cmd(struct qlcnic_adapter *adapter,
+                                     struct qlcnic_bc_trans *trans)
+{
+        u8 max = QLC_BC_CMD_MAX_RETRY_CNT;
+        u32 state;
+
+        state = QLCRDX(adapter->ahw, QLC_83XX_IDC_DEV_STATE);
+        if (state == QLC_83XX_IDC_DEV_READY) {
+                msleep(20);
+                clear_bit(QLC_BC_VF_CHANNEL, &trans->vf->state);
+                trans->trans_state = QLC_INIT;
+                if (++adapter->fw_fail_cnt > max)
+                        return -EIO;
+                else
+                        return 0;
+        }
+
+        return -EIO;
+}
+
+static int qlcnic_sriov_vf_mbx_op(struct qlcnic_adapter *adapter,
+                                  struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        struct device *dev = &adapter->pdev->dev;
+        struct qlcnic_bc_trans *trans;
+        int err;
+        u32 rsp_data, opcode, mbx_err_code, rsp;
+        u16 seq = ++adapter->ahw->sriov->bc.trans_counter;
+        u8 func = ahw->pci_func;
+
+        rsp = qlcnic_sriov_alloc_bc_trans(&trans);
+        if (rsp)
+                return rsp;
+
+        rsp = qlcnic_sriov_prepare_bc_hdr(trans, cmd, seq, QLC_BC_COMMAND);
+        if (rsp)
+                goto cleanup_transaction;
+
+retry:
+        if (!test_bit(QLC_83XX_MBX_READY, &adapter->ahw->idc.status)) {
+                rsp = -EIO;
+                QLCDB(adapter, DRV, "MBX not Ready!(cmd 0x%x) for VF 0x%x\n",
+                      QLCNIC_MBX_RSP(cmd->req.arg[0]), func);
+                goto err_out;
+        }
+
+        err = qlcnic_sriov_send_bc_cmd(adapter, trans, func);
+        if (err) {
+                dev_err(dev, "MBX command 0x%x timed out for VF %d\n",
+                        (cmd->req.arg[0] & 0xffff), func);
+                rsp = QLCNIC_RCODE_TIMEOUT;
+
+                /* After adapter reset PF driver may take some time to
+                 * respond to VF's request. Retry request till maximum retries.
+                 */
+                if ((trans->req_hdr->cmd_op == QLCNIC_BC_CMD_CHANNEL_INIT) &&
+                    !qlcnic_sriov_retry_bc_cmd(adapter, trans))
+                        goto retry;
+
+                goto err_out;
+        }
+
+        rsp_data = cmd->rsp.arg[0];
+        mbx_err_code = QLCNIC_MBX_STATUS(rsp_data);
+        opcode = QLCNIC_MBX_RSP(cmd->req.arg[0]);
+
+        if ((mbx_err_code == QLCNIC_MBX_RSP_OK) ||
+            (mbx_err_code == QLCNIC_MBX_PORT_RSP_OK)) {
+                rsp = QLCNIC_RCODE_SUCCESS;
+        } else {
+                rsp = mbx_err_code;
+                if (!rsp)
+                        rsp = 1;
+                dev_err(dev,
+                        "MBX command 0x%x failed with err:0x%x for VF %d\n",
+                        opcode, mbx_err_code, func);
+        }
+
+err_out:
+        if (rsp == QLCNIC_RCODE_TIMEOUT) {
+                ahw->reset_context = 1;
+                adapter->need_fw_reset = 1;
+                clear_bit(QLC_83XX_MBX_READY, &ahw->idc.status);
+        }
+
+cleanup_transaction:
+        qlcnic_sriov_cleanup_transaction(trans);
+        return rsp;
+}
+
+int qlcnic_sriov_channel_cfg_cmd(struct qlcnic_adapter *adapter, u8 cmd_op)
+{
+        struct qlcnic_cmd_args cmd;
+        struct qlcnic_vf_info *vf = &adapter->ahw->sriov->vf_info[0];
+        int ret;
+
+        if (qlcnic_sriov_alloc_bc_mbx_args(&cmd, cmd_op))
+                return -ENOMEM;
+
+        ret = qlcnic_issue_cmd(adapter, &cmd);
+        if (ret) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed bc channel %s %d\n", cmd_op ? "term" : "init",
+                        ret);
+                goto out;
+        }
+
+        cmd_op = (cmd.rsp.arg[0] & 0xff);
+        if (cmd.rsp.arg[0] >> 25 == 2)
+                return 2;
+        if (cmd_op == QLCNIC_BC_CMD_CHANNEL_INIT)
+                set_bit(QLC_BC_VF_STATE, &vf->state);
+        else
+                clear_bit(QLC_BC_VF_STATE, &vf->state);
+
+out:
+        qlcnic_free_mbx_args(&cmd);
+        return ret;
+}
+
+void qlcnic_vf_add_mc_list(struct net_device *netdev, u16 vlan)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_mac_list_s *cur;
+        struct list_head *head, tmp_list;
+
+        INIT_LIST_HEAD(&tmp_list);
+        head = &adapter->vf_mc_list;
+        netif_addr_lock_bh(netdev);
+
+        while (!list_empty(head)) {
+                cur = list_entry(head->next, struct qlcnic_mac_list_s, list);
+                list_move(&cur->list, &tmp_list);
+        }
+
+        netif_addr_unlock_bh(netdev);
+
+        while (!list_empty(&tmp_list)) {
+                cur = list_entry((&tmp_list)->next,
+                                 struct qlcnic_mac_list_s, list);
+                qlcnic_nic_add_mac(adapter, cur->mac_addr, vlan);
+                list_del(&cur->list);
+                kfree(cur);
+        }
+}
+
+void qlcnic_sriov_cleanup_async_list(struct qlcnic_back_channel *bc)
+{
+        struct list_head *head = &bc->async_list;
+        struct qlcnic_async_work_list *entry;
+
+        while (!list_empty(head)) {
+                entry = list_entry(head->next, struct qlcnic_async_work_list,
+                                   list);
+                cancel_work_sync(&entry->work);
+                list_del(&entry->list);
+                kfree(entry);
+        }
+}
+
+static void qlcnic_sriov_vf_set_multi(struct net_device *netdev)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        u16 vlan;
+
+        if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
+                return;
+
+        vlan = adapter->ahw->sriov->vlan;
+        __qlcnic_set_multi(netdev, vlan);
+}
+
+static void qlcnic_sriov_handle_async_multi(struct work_struct *work)
+{
+        struct qlcnic_async_work_list *entry;
+        struct net_device *netdev;
+
+        entry = container_of(work, struct qlcnic_async_work_list, work);
+        netdev = (struct net_device *)entry->ptr;
+
+        qlcnic_sriov_vf_set_multi(netdev);
+        return;
+}
+
+static struct qlcnic_async_work_list *
+qlcnic_sriov_get_free_node_async_work(struct qlcnic_back_channel *bc)
+{
+        struct list_head *node;
+        struct qlcnic_async_work_list *entry = NULL;
+        u8 empty = 0;
+
+        list_for_each(node, &bc->async_list) {
+                entry = list_entry(node, struct qlcnic_async_work_list, list);
+                if (!work_pending(&entry->work)) {
+                        empty = 1;
+                        break;
+                }
+        }
+
+        if (!empty) {
+                entry = kzalloc(sizeof(struct qlcnic_async_work_list),
+                                GFP_ATOMIC);
+                if (entry == NULL)
+                        return NULL;
+                list_add_tail(&entry->list, &bc->async_list);
+        }
+
+        return entry;
+}
+
+static void qlcnic_sriov_schedule_bc_async_work(struct qlcnic_back_channel *bc,
+                                                work_func_t func, void *data)
+{
+        struct qlcnic_async_work_list *entry = NULL;
+
+        entry = qlcnic_sriov_get_free_node_async_work(bc);
+        if (!entry)
+                return;
+
+        entry->ptr = data;
+        INIT_WORK(&entry->work, func);
+        queue_work(bc->bc_async_wq, &entry->work);
+}
+
+void qlcnic_sriov_vf_schedule_multi(struct net_device *netdev)
+{
+
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_back_channel *bc = &adapter->ahw->sriov->bc;
+
+        if (adapter->need_fw_reset)
+                return;
+
+        qlcnic_sriov_schedule_bc_async_work(bc, qlcnic_sriov_handle_async_multi,
+                                            netdev);
+}
+
+static int qlcnic_sriov_vf_reinit_driver(struct qlcnic_adapter *adapter)
+{
+        int err;
+
+        set_bit(QLC_83XX_MBX_READY, &adapter->ahw->idc.status);
+        qlcnic_83xx_enable_mbx_intrpt(adapter);
+
+        err = qlcnic_sriov_cfg_bc_intr(adapter, 1);
+        if (err)
+                return err;
+
+        err = qlcnic_sriov_channel_cfg_cmd(adapter, QLCNIC_BC_CMD_CHANNEL_INIT);
+        if (err)
+                goto err_out_cleanup_bc_intr;
+
+        err = qlcnic_sriov_vf_init_driver(adapter);
+        if (err)
+                goto err_out_term_channel;
+
+        return 0;
+
+err_out_term_channel:
+        qlcnic_sriov_channel_cfg_cmd(adapter, QLCNIC_BC_CMD_CHANNEL_TERM);
+
+err_out_cleanup_bc_intr:
+        qlcnic_sriov_cfg_bc_intr(adapter, 0);
+        return err;
+}
+
+static void qlcnic_sriov_vf_attach(struct qlcnic_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+
+        if (netif_running(netdev)) {
+                if (!qlcnic_up(adapter, netdev))
+                        qlcnic_restore_indev_addr(netdev, NETDEV_UP);
+        }
+
+        netif_device_attach(netdev);
+}
+
+static void qlcnic_sriov_vf_detach(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        struct qlcnic_intrpt_config *intr_tbl = ahw->intr_tbl;
+        struct net_device *netdev = adapter->netdev;
+        u8 i, max_ints = ahw->num_msix - 1;
+
+        qlcnic_83xx_disable_mbx_intr(adapter);
+        netif_device_detach(netdev);
+        if (netif_running(netdev))
+                qlcnic_down(adapter, netdev);
+
+        for (i = 0; i < max_ints; i++) {
+                intr_tbl[i].id = i;
+                intr_tbl[i].enabled = 0;
+                intr_tbl[i].src = 0;
+        }
+        ahw->reset_context = 0;
+}
+
+static int qlcnic_sriov_vf_handle_dev_ready(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        struct device *dev = &adapter->pdev->dev;
+        struct qlc_83xx_idc *idc = &ahw->idc;
+        u8 func = ahw->pci_func;
+        u32 state;
+
+        if ((idc->prev_state == QLC_83XX_IDC_DEV_NEED_RESET) ||
+            (idc->prev_state == QLC_83XX_IDC_DEV_INIT)) {
+                if (!qlcnic_sriov_vf_reinit_driver(adapter)) {
+                        qlcnic_sriov_vf_attach(adapter);
+                        adapter->fw_fail_cnt = 0;
+                        dev_info(dev,
+                                 "%s: Reinitalization of VF 0x%x done after FW reset\n",
+                                 __func__, func);
+                } else {
+                        dev_err(dev,
+                                "%s: Reinitialization of VF 0x%x failed after FW reset\n",
+                                __func__, func);
+                        state = QLCRDX(ahw, QLC_83XX_IDC_DEV_STATE);
+                        dev_info(dev, "Current state 0x%x after FW reset\n",
+                                 state);
+                }
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_vf_handle_context_reset(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        struct device *dev = &adapter->pdev->dev;
+        struct qlc_83xx_idc *idc = &ahw->idc;
+        u8 func = ahw->pci_func;
+        u32 state;
+
+        adapter->reset_ctx_cnt++;
+
+        /* Skip the context reset and check if FW is hung */
+        if (adapter->reset_ctx_cnt < 3) {
+                adapter->need_fw_reset = 1;
+                clear_bit(QLC_83XX_MBX_READY, &idc->status);
+                dev_info(dev,
+                         "Resetting context, wait here to check if FW is in failed state\n");
+                return 0;
+        }
+
+        /* Check if number of resets exceed the threshold.
+         * If it exceeds the threshold just fail the VF.
+         */
+        if (adapter->reset_ctx_cnt > QLC_83XX_VF_RESET_FAIL_THRESH) {
+                clear_bit(QLC_83XX_MODULE_LOADED, &idc->status);
+                adapter->tx_timeo_cnt = 0;
+                adapter->fw_fail_cnt = 0;
+                adapter->reset_ctx_cnt = 0;
+                qlcnic_sriov_vf_detach(adapter);
+                dev_err(dev,
+                        "Device context resets have exceeded the threshold, device interface will be shutdown\n");
+                return -EIO;
+        }
+
+        dev_info(dev, "Resetting context of VF 0x%x\n", func);
+        dev_info(dev, "%s: Context reset count %d for VF 0x%x\n",
+                 __func__, adapter->reset_ctx_cnt, func);
+        set_bit(__QLCNIC_RESETTING, &adapter->state);
+        adapter->need_fw_reset = 1;
+        clear_bit(QLC_83XX_MBX_READY, &idc->status);
+        qlcnic_sriov_vf_detach(adapter);
+        adapter->need_fw_reset = 0;
+
+        if (!qlcnic_sriov_vf_reinit_driver(adapter)) {
+                qlcnic_sriov_vf_attach(adapter);
+                adapter->netdev->trans_start = jiffies;
+                adapter->tx_timeo_cnt = 0;
+                adapter->reset_ctx_cnt = 0;
+                adapter->fw_fail_cnt = 0;
+                dev_info(dev, "Done resetting context for VF 0x%x\n", func);
+        } else {
+                dev_err(dev, "%s: Reinitialization of VF 0x%x failed\n",
+                        __func__, func);
+                state = QLCRDX(ahw, QLC_83XX_IDC_DEV_STATE);
+                dev_info(dev, "%s: Current state 0x%x\n", __func__, state);
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_vf_idc_ready_state(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        int ret = 0;
+
+        if (ahw->idc.prev_state != QLC_83XX_IDC_DEV_READY)
+                ret = qlcnic_sriov_vf_handle_dev_ready(adapter);
+        else if (ahw->reset_context)
+                ret = qlcnic_sriov_vf_handle_context_reset(adapter);
+
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+        return ret;
+}
+
+static int qlcnic_sriov_vf_idc_failed_state(struct qlcnic_adapter *adapter)
+{
+        struct qlc_83xx_idc *idc = &adapter->ahw->idc;
+
+        dev_err(&adapter->pdev->dev, "Device is in failed state\n");
+        if (idc->prev_state == QLC_83XX_IDC_DEV_READY)
+                qlcnic_sriov_vf_detach(adapter);
+
+        clear_bit(QLC_83XX_MODULE_LOADED, &idc->status);
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+        return -EIO;
+}
+
+static int
+qlcnic_sriov_vf_idc_need_quiescent_state(struct qlcnic_adapter *adapter)
+{
+        struct qlc_83xx_idc *idc = &adapter->ahw->idc;
+
+        dev_info(&adapter->pdev->dev, "Device is in quiescent state\n");
+        if (idc->prev_state == QLC_83XX_IDC_DEV_READY) {
+                set_bit(__QLCNIC_RESETTING, &adapter->state);
+                adapter->tx_timeo_cnt = 0;
+                adapter->reset_ctx_cnt = 0;
+                clear_bit(QLC_83XX_MBX_READY, &idc->status);
+                qlcnic_sriov_vf_detach(adapter);
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_vf_idc_init_reset_state(struct qlcnic_adapter *adapter)
+{
+        struct qlc_83xx_idc *idc = &adapter->ahw->idc;
+        u8 func = adapter->ahw->pci_func;
+
+        if (idc->prev_state == QLC_83XX_IDC_DEV_READY) {
+                dev_err(&adapter->pdev->dev,
+                        "Firmware hang detected by VF 0x%x\n", func);
+                set_bit(__QLCNIC_RESETTING, &adapter->state);
+                adapter->tx_timeo_cnt = 0;
+                adapter->reset_ctx_cnt = 0;
+                clear_bit(QLC_83XX_MBX_READY, &idc->status);
+                qlcnic_sriov_vf_detach(adapter);
+        }
+        return 0;
+}
+
+static int qlcnic_sriov_vf_idc_unknown_state(struct qlcnic_adapter *adapter)
+{
+        dev_err(&adapter->pdev->dev, "%s: Device in unknown state\n", __func__);
+        return 0;
+}
+
+static void qlcnic_sriov_vf_poll_dev_state(struct work_struct *work)
+{
+        struct qlcnic_adapter *adapter;
+        struct qlc_83xx_idc *idc;
+        int ret = 0;
+
+        adapter = container_of(work, struct qlcnic_adapter, fw_work.work);
+        idc = &adapter->ahw->idc;
+        idc->curr_state = QLCRDX(adapter->ahw, QLC_83XX_IDC_DEV_STATE);
+
+        switch (idc->curr_state) {
+        case QLC_83XX_IDC_DEV_READY:
+                ret = qlcnic_sriov_vf_idc_ready_state(adapter);
+                break;
+        case QLC_83XX_IDC_DEV_NEED_RESET:
+        case QLC_83XX_IDC_DEV_INIT:
+                ret = qlcnic_sriov_vf_idc_init_reset_state(adapter);
+                break;
+        case QLC_83XX_IDC_DEV_NEED_QUISCENT:
+                ret = qlcnic_sriov_vf_idc_need_quiescent_state(adapter);
+                break;
+        case QLC_83XX_IDC_DEV_FAILED:
+                ret = qlcnic_sriov_vf_idc_failed_state(adapter);
+                break;
+        case QLC_83XX_IDC_DEV_QUISCENT:
+                break;
+        default:
+                ret = qlcnic_sriov_vf_idc_unknown_state(adapter);
+        }
+
+        idc->prev_state = idc->curr_state;
+        if (!ret && test_bit(QLC_83XX_MODULE_LOADED, &idc->status))
+                qlcnic_schedule_work(adapter, qlcnic_sriov_vf_poll_dev_state,
+                                     idc->delay);
+}
+
+static void qlcnic_sriov_vf_cancel_fw_work(struct qlcnic_adapter *adapter)
+{
+        while (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
+                msleep(20);
+
+        clear_bit(QLC_83XX_MODULE_LOADED, &adapter->ahw->idc.status);
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+        cancel_delayed_work_sync(&adapter->fw_work);
+}
+
+static int qlcnic_sriov_validate_vlan_cfg(struct qlcnic_sriov *sriov,
+                                          u16 vid, u8 enable)
+{
+        u16 vlan = sriov->vlan;
+        u8 allowed = 0;
+        int i;
+
+        if (sriov->vlan_mode != QLC_GUEST_VLAN_MODE)
+                return -EINVAL;
+
+        if (enable) {
+                if (vlan)
+                        return -EINVAL;
+
+                if (sriov->any_vlan) {
+                        for (i = 0; i < sriov->num_allowed_vlans; i++) {
+                                if (sriov->allowed_vlans[i] == vid)
+                                        allowed = 1;
+                        }
+
+                        if (!allowed)
+                                return -EINVAL;
+                }
+        } else {
+                if (!vlan || vlan != vid)
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+int qlcnic_sriov_cfg_vf_guest_vlan(struct qlcnic_adapter *adapter,
+                                   u16 vid, u8 enable)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_cmd_args cmd;
+        int ret;
+
+        if (vid == 0)
+                return 0;
+
+        ret = qlcnic_sriov_validate_vlan_cfg(sriov, vid, enable);
+        if (ret)
+                return ret;
+
+        ret = qlcnic_sriov_alloc_bc_mbx_args(&cmd,
+                                             QLCNIC_BC_CMD_CFG_GUEST_VLAN);
+        if (ret)
+                return ret;
+
+        cmd.req.arg[1] = (enable & 1) | vid << 16;
+
+        qlcnic_sriov_cleanup_async_list(&sriov->bc);
+        ret = qlcnic_issue_cmd(adapter, &cmd);
+        if (ret) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure guest VLAN, err=%d\n", ret);
+        } else {
+                qlcnic_free_mac_list(adapter);
+
+                if (enable)
+                        sriov->vlan = vid;
+                else
+                        sriov->vlan = 0;
+
+                qlcnic_sriov_vf_set_multi(adapter->netdev);
+        }
+
+        qlcnic_free_mbx_args(&cmd);
+        return ret;
+}
+
+static void qlcnic_sriov_vf_free_mac_list(struct qlcnic_adapter *adapter)
+{
+        struct list_head *head = &adapter->mac_list;
+        struct qlcnic_mac_list_s *cur;
+        u16 vlan;
+
+        vlan = adapter->ahw->sriov->vlan;
+
+        while (!list_empty(head)) {
+                cur = list_entry(head->next, struct qlcnic_mac_list_s, list);
+                qlcnic_sre_macaddr_change(adapter, cur->mac_addr,
+                                          vlan, QLCNIC_MAC_DEL);
+                list_del(&cur->list);
+                kfree(cur);
+        }
+}
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
new file mode 100644
index 000000000000..c81be2da119b
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
@@ -0,0 +1,1780 @@
+/*
+ * QLogic qlcnic NIC Driver
+ * Copyright (c) 2009-2013 QLogic Corporation
+ *
+ * See LICENSE.qlcnic for copyright and licensing details.
+ */
+
+#include "qlcnic_sriov.h"
+#include "qlcnic.h"
+#include <linux/types.h>
+
+#define QLCNIC_SRIOV_VF_MAX_MAC 1
+#define QLC_VF_MIN_TX_RATE      100
+#define QLC_VF_MAX_TX_RATE      9999
+
+static int qlcnic_sriov_pf_get_vport_handle(struct qlcnic_adapter *, u8);
+
+struct qlcnic_sriov_cmd_handler {
+        int (*fn) (struct qlcnic_bc_trans *, struct qlcnic_cmd_args *);
+};
+
+struct qlcnic_sriov_fw_cmd_handler {
+        u32 cmd;
+        int (*fn) (struct qlcnic_bc_trans *, struct qlcnic_cmd_args *);
+};
+
+static int qlcnic_sriov_pf_set_vport_info(struct qlcnic_adapter *adapter,
+                                          struct qlcnic_info *npar_info,
+                                          u16 vport_id)
+{
+        struct qlcnic_cmd_args cmd;
+        int err;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_SET_NIC_INFO))
+                return -ENOMEM;
+
+        cmd.req.arg[1] = (vport_id << 16) | 0x1;
+        cmd.req.arg[2] = npar_info->bit_offsets;
+        cmd.req.arg[2] |= npar_info->min_tx_bw << 16;
+        cmd.req.arg[3] = npar_info->max_tx_bw | (npar_info->max_tx_ques << 16);
+        cmd.req.arg[4] = npar_info->max_tx_mac_filters;
+        cmd.req.arg[4] |= npar_info->max_rx_mcast_mac_filters << 16;
+        cmd.req.arg[5] = npar_info->max_rx_ucast_mac_filters |
+                         (npar_info->max_rx_ip_addr << 16);
+        cmd.req.arg[6] = npar_info->max_rx_lro_flow |
+                         (npar_info->max_rx_status_rings << 16);
+        cmd.req.arg[7] = npar_info->max_rx_buf_rings |
+                         (npar_info->max_rx_ques << 16);
+        cmd.req.arg[8] = npar_info->max_tx_vlan_keys;
+        cmd.req.arg[8] |= npar_info->max_local_ipv6_addrs << 16;
+        cmd.req.arg[9] = npar_info->max_remote_ipv6_addrs;
+
+        err = qlcnic_issue_cmd(adapter, &cmd);
+        if (err)
+                dev_err(&adapter->pdev->dev,
+                        "Failed to set vport info, err=%d\n", err);
+
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static int qlcnic_sriov_pf_cal_res_limit(struct qlcnic_adapter *adapter,
+                                         struct qlcnic_info *info, u16 func)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_resources *res = &sriov->ff_max;
+        u32 temp, num_vf_macs, num_vfs, max;
+        int ret = -EIO, vpid, id;
+        struct qlcnic_vport *vp;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter, func);
+        if (vpid < 0)
+                return -EINVAL;
+
+        num_vfs = sriov->num_vfs;
+        max = num_vfs + 1;
+        info->bit_offsets = 0xffff;
+        info->max_tx_ques = res->num_tx_queues / max;
+        info->max_rx_mcast_mac_filters = res->num_rx_mcast_mac_filters;
+        num_vf_macs = QLCNIC_SRIOV_VF_MAX_MAC;
+
+        if (adapter->ahw->pci_func == func) {
+                temp = res->num_rx_mcast_mac_filters - (num_vfs * num_vf_macs);
+                info->max_rx_ucast_mac_filters = temp;
+                temp = res->num_tx_mac_filters - (num_vfs * num_vf_macs);
+                info->max_tx_mac_filters = temp;
+                info->min_tx_bw = 0;
+                info->max_tx_bw = MAX_BW;
+        } else {
+                id = qlcnic_sriov_func_to_index(adapter, func);
+                if (id < 0)
+                        return id;
+                vp = sriov->vf_info[id].vp;
+                info->min_tx_bw = vp->min_tx_bw;
+                info->max_tx_bw = vp->max_tx_bw;
+                info->max_rx_ucast_mac_filters = num_vf_macs;
+                info->max_tx_mac_filters = num_vf_macs;
+        }
+
+        info->max_rx_ip_addr = res->num_destip / max;
+        info->max_rx_status_rings = res->num_rx_status_rings / max;
+        info->max_rx_buf_rings = res->num_rx_buf_rings / max;
+        info->max_rx_ques = res->num_rx_queues / max;
+        info->max_rx_lro_flow = res->num_lro_flows_supported / max;
+        info->max_tx_vlan_keys = res->num_txvlan_keys;
+        info->max_local_ipv6_addrs = res->max_local_ipv6_addrs;
+        info->max_remote_ipv6_addrs = res->max_remote_ipv6_addrs;
+
+        ret = qlcnic_sriov_pf_set_vport_info(adapter, info, vpid);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+static void qlcnic_sriov_pf_set_ff_max_res(struct qlcnic_adapter *adapter,
+                                           struct qlcnic_info *info)
+{
+        struct qlcnic_resources *ff_max = &adapter->ahw->sriov->ff_max;
+
+        ff_max->num_tx_mac_filters = info->max_tx_mac_filters;
+        ff_max->num_rx_ucast_mac_filters = info->max_rx_ucast_mac_filters;
+        ff_max->num_rx_mcast_mac_filters = info->max_rx_mcast_mac_filters;
+        ff_max->num_txvlan_keys = info->max_tx_vlan_keys;
+        ff_max->num_rx_queues = info->max_rx_ques;
+        ff_max->num_tx_queues = info->max_tx_ques;
+        ff_max->num_lro_flows_supported = info->max_rx_lro_flow;
+        ff_max->num_destip = info->max_rx_ip_addr;
+        ff_max->num_rx_buf_rings = info->max_rx_buf_rings;
+        ff_max->num_rx_status_rings = info->max_rx_status_rings;
+        ff_max->max_remote_ipv6_addrs = info->max_remote_ipv6_addrs;
+        ff_max->max_local_ipv6_addrs = info->max_local_ipv6_addrs;
+}
+
+static int qlcnic_sriov_get_pf_info(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_info *npar_info)
+{
+        int err;
+        struct qlcnic_cmd_args cmd;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_NIC_INFO))
+                return -ENOMEM;
+
+        cmd.req.arg[1] = 0x2;
+        err = qlcnic_issue_cmd(adapter, &cmd);
+        if (err) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get PF info, err=%d\n", err);
+                goto out;
+        }
+
+        npar_info->total_pf = cmd.rsp.arg[2] & 0xff;
+        npar_info->total_rss_engines = (cmd.rsp.arg[2] >> 8) & 0xff;
+        npar_info->max_vports = MSW(cmd.rsp.arg[2]);
+        npar_info->max_tx_ques =  LSW(cmd.rsp.arg[3]);
+        npar_info->max_tx_mac_filters = MSW(cmd.rsp.arg[3]);
+        npar_info->max_rx_mcast_mac_filters = LSW(cmd.rsp.arg[4]);
+        npar_info->max_rx_ucast_mac_filters = MSW(cmd.rsp.arg[4]);
+        npar_info->max_rx_ip_addr = LSW(cmd.rsp.arg[5]);
+        npar_info->max_rx_lro_flow = MSW(cmd.rsp.arg[5]);
+        npar_info->max_rx_status_rings = LSW(cmd.rsp.arg[6]);
+        npar_info->max_rx_buf_rings = MSW(cmd.rsp.arg[6]);
+        npar_info->max_rx_ques = LSW(cmd.rsp.arg[7]);
+        npar_info->max_tx_vlan_keys = MSW(cmd.rsp.arg[7]);
+        npar_info->max_local_ipv6_addrs = LSW(cmd.rsp.arg[8]);
+        npar_info->max_remote_ipv6_addrs = MSW(cmd.rsp.arg[8]);
+
+        qlcnic_sriov_pf_set_ff_max_res(adapter, npar_info);
+        dev_info(&adapter->pdev->dev,
+                 "\n\ttotal_pf: %d,\n"
+                 "\n\ttotal_rss_engines: %d max_vports: %d max_tx_ques %d,\n"
+                 "\tmax_tx_mac_filters: %d max_rx_mcast_mac_filters: %d,\n"
+                 "\tmax_rx_ucast_mac_filters: 0x%x, max_rx_ip_addr: %d,\n"
+                 "\tmax_rx_lro_flow: %d max_rx_status_rings: %d,\n"
+                 "\tmax_rx_buf_rings: %d, max_rx_ques: %d, max_tx_vlan_keys %d\n"
+                 "\tmax_local_ipv6_addrs: %d, max_remote_ipv6_addrs: %d\n",
+                 npar_info->total_pf, npar_info->total_rss_engines,
+                 npar_info->max_vports, npar_info->max_tx_ques,
+                 npar_info->max_tx_mac_filters,
+                 npar_info->max_rx_mcast_mac_filters,
+                 npar_info->max_rx_ucast_mac_filters, npar_info->max_rx_ip_addr,
+                 npar_info->max_rx_lro_flow, npar_info->max_rx_status_rings,
+                 npar_info->max_rx_buf_rings, npar_info->max_rx_ques,
+                 npar_info->max_tx_vlan_keys, npar_info->max_local_ipv6_addrs,
+                 npar_info->max_remote_ipv6_addrs);
+
+out:
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static void qlcnic_sriov_pf_reset_vport_handle(struct qlcnic_adapter *adapter,
+                                               u8 func)
+{
+        struct qlcnic_sriov  *sriov = adapter->ahw->sriov;
+        struct qlcnic_vport *vp;
+        int index;
+
+        if (adapter->ahw->pci_func == func) {
+                sriov->vp_handle = 0;
+        } else {
+                index = qlcnic_sriov_func_to_index(adapter, func);
+                if (index < 0)
+                        return;
+                vp = sriov->vf_info[index].vp;
+                vp->handle = 0;
+        }
+}
+
+static void qlcnic_sriov_pf_set_vport_handle(struct qlcnic_adapter *adapter,
+                                             u16 vport_handle, u8 func)
+{
+        struct qlcnic_sriov  *sriov = adapter->ahw->sriov;
+        struct qlcnic_vport *vp;
+        int index;
+
+        if (adapter->ahw->pci_func == func) {
+                sriov->vp_handle = vport_handle;
+        } else {
+                index = qlcnic_sriov_func_to_index(adapter, func);
+                if (index < 0)
+                        return;
+                vp = sriov->vf_info[index].vp;
+                vp->handle = vport_handle;
+        }
+}
+
+static int qlcnic_sriov_pf_get_vport_handle(struct qlcnic_adapter *adapter,
+                                            u8 func)
+{
+        struct qlcnic_sriov  *sriov = adapter->ahw->sriov;
+        struct qlcnic_vf_info *vf_info;
+        int index;
+
+        if (adapter->ahw->pci_func == func) {
+                return sriov->vp_handle;
+        } else {
+                index = qlcnic_sriov_func_to_index(adapter, func);
+                if (index >= 0) {
+                        vf_info = &sriov->vf_info[index];
+                        return vf_info->vp->handle;
+                }
+        }
+
+        return -EINVAL;
+}
+
+static int qlcnic_sriov_pf_config_vport(struct qlcnic_adapter *adapter,
+                                        u8 flag, u16 func)
+{
+        struct qlcnic_cmd_args cmd;
+        int ret;
+        int vpid;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIG_VPORT))
+                return -ENOMEM;
+
+        if (flag) {
+                cmd.req.arg[3] = func << 8;
+        } else {
+                vpid = qlcnic_sriov_pf_get_vport_handle(adapter, func);
+                if (vpid < 0) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+                cmd.req.arg[3] = ((vpid & 0xffff) << 8) | 1;
+        }
+
+        ret = qlcnic_issue_cmd(adapter, &cmd);
+        if (ret) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed %s vport, err %d for func 0x%x\n",
+                        (flag ? "enable" : "disable"), ret, func);
+                goto out;
+        }
+
+        if (flag) {
+                vpid = cmd.rsp.arg[2] & 0xffff;
+                qlcnic_sriov_pf_set_vport_handle(adapter, vpid, func);
+        } else {
+                qlcnic_sriov_pf_reset_vport_handle(adapter, func);
+        }
+
+out:
+        qlcnic_free_mbx_args(&cmd);
+        return ret;
+}
+
+static int qlcnic_sriov_pf_cfg_vlan_filtering(struct qlcnic_adapter *adapter,
+                                              u8 enable)
+{
+        struct qlcnic_cmd_args cmd;
+        int err;
+
+        err = qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_SET_NIC_INFO);
+        if (err)
+                return err;
+
+        cmd.req.arg[1] = 0x4;
+        if (enable)
+                cmd.req.arg[1] |= BIT_16;
+
+        err = qlcnic_issue_cmd(adapter, &cmd);
+        if (err)
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure VLAN filtering, err=%d\n", err);
+
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static int qlcnic_sriov_pf_cfg_eswitch(struct qlcnic_adapter *adapter,
+                                       u8 func, u8 enable)
+{
+        struct qlcnic_cmd_args cmd;
+        int err = -EIO;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_TOGGLE_ESWITCH))
+                return -ENOMEM;
+
+        cmd.req.arg[0] |= (3 << 29);
+        cmd.req.arg[1] = ((func & 0xf) << 2) | BIT_6 | BIT_1;
+        if (enable)
+                cmd.req.arg[1] |= BIT_0;
+
+        err = qlcnic_issue_cmd(adapter, &cmd);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to enable sriov eswitch%d\n", err);
+                err = -EIO;
+        }
+
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static void qlcnic_sriov_pf_del_flr_queue(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_back_channel *bc = &sriov->bc;
+        int i;
+
+        for (i = 0; i < sriov->num_vfs; i++)
+                cancel_work_sync(&sriov->vf_info[i].flr_work);
+
+        destroy_workqueue(bc->bc_flr_wq);
+}
+
+static int qlcnic_sriov_pf_create_flr_queue(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_back_channel *bc = &adapter->ahw->sriov->bc;
+        struct workqueue_struct *wq;
+
+        wq = create_singlethread_workqueue("qlcnic-flr");
+        if (wq == NULL) {
+                dev_err(&adapter->pdev->dev, "Cannot create FLR workqueue\n");
+                return -ENOMEM;
+        }
+
+        bc->bc_flr_wq =  wq;
+        return 0;
+}
+
+void qlcnic_sriov_pf_cleanup(struct qlcnic_adapter *adapter)
+{
+        u8 func = adapter->ahw->pci_func;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return;
+
+        qlcnic_sriov_pf_del_flr_queue(adapter);
+        qlcnic_sriov_cfg_bc_intr(adapter, 0);
+        qlcnic_sriov_pf_config_vport(adapter, 0, func);
+        qlcnic_sriov_pf_cfg_eswitch(adapter, func, 0);
+        qlcnic_sriov_pf_cfg_vlan_filtering(adapter, 0);
+        __qlcnic_sriov_cleanup(adapter);
+        adapter->ahw->op_mode = QLCNIC_MGMT_FUNC;
+        clear_bit(__QLCNIC_SRIOV_ENABLE, &adapter->state);
+}
+
+void qlcnic_sriov_pf_disable(struct qlcnic_adapter *adapter)
+{
+        if (!qlcnic_sriov_pf_check(adapter))
+                return;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return;
+
+        pci_disable_sriov(adapter->pdev);
+        netdev_info(adapter->netdev,
+                    "SR-IOV is disabled successfully on port %d\n",
+                    adapter->portnum);
+}
+
+static int qlcnic_pci_sriov_disable(struct qlcnic_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+
+        if (netif_running(netdev))
+                __qlcnic_down(adapter, netdev);
+
+        qlcnic_sriov_pf_disable(adapter);
+
+        qlcnic_sriov_pf_cleanup(adapter);
+
+        /* After disabling SRIOV re-init the driver in default mode
+           configure opmode based on op_mode of function
+         */
+        if (qlcnic_83xx_configure_opmode(adapter))
+                return -EIO;
+
+        if (netif_running(netdev))
+                __qlcnic_up(adapter, netdev);
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_init(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        struct qlcnic_info nic_info, pf_info, vp_info;
+        int err;
+        u8 func = ahw->pci_func;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return 0;
+
+        err = qlcnic_sriov_pf_cfg_vlan_filtering(adapter, 1);
+        if (err)
+                return err;
+
+        err = qlcnic_sriov_pf_cfg_eswitch(adapter, func, 1);
+        if (err)
+                goto disable_vlan_filtering;
+
+        err = qlcnic_sriov_pf_config_vport(adapter, 1, func);
+        if (err)
+                goto disable_eswitch;
+
+        err = qlcnic_sriov_get_pf_info(adapter, &pf_info);
+        if (err)
+                goto delete_vport;
+
+        err = qlcnic_get_nic_info(adapter, &nic_info, func);
+        if (err)
+                goto delete_vport;
+
+        err = qlcnic_sriov_pf_cal_res_limit(adapter, &vp_info, func);
+        if (err)
+                goto delete_vport;
+
+        err = qlcnic_sriov_cfg_bc_intr(adapter, 1);
+        if (err)
+                goto delete_vport;
+
+        ahw->physical_port = (u8) nic_info.phys_port;
+        ahw->switch_mode = nic_info.switch_mode;
+        ahw->max_mtu = nic_info.max_mtu;
+        ahw->capabilities = nic_info.capabilities;
+        ahw->nic_mode = QLC_83XX_SRIOV_MODE;
+        return err;
+
+delete_vport:
+        qlcnic_sriov_pf_config_vport(adapter, 0, func);
+
+disable_eswitch:
+        qlcnic_sriov_pf_cfg_eswitch(adapter, func, 0);
+
+disable_vlan_filtering:
+        qlcnic_sriov_pf_cfg_vlan_filtering(adapter, 0);
+
+        return err;
+}
+
+static int qlcnic_sriov_pf_enable(struct qlcnic_adapter *adapter, int num_vfs)
+{
+        int err;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return 0;
+
+        err = pci_enable_sriov(adapter->pdev, num_vfs);
+        if (err)
+                qlcnic_sriov_pf_cleanup(adapter);
+
+        return err;
+}
+
+static int __qlcnic_pci_sriov_enable(struct qlcnic_adapter *adapter,
+                                     int num_vfs)
+{
+        int err = 0;
+
+        set_bit(__QLCNIC_SRIOV_ENABLE, &adapter->state);
+        adapter->ahw->op_mode = QLCNIC_SRIOV_PF_FUNC;
+
+        err = qlcnic_sriov_init(adapter, num_vfs);
+        if (err)
+                goto clear_op_mode;
+
+        err = qlcnic_sriov_pf_create_flr_queue(adapter);
+        if (err)
+                goto sriov_cleanup;
+
+        err = qlcnic_sriov_pf_init(adapter);
+        if (err)
+                goto del_flr_queue;
+
+        err = qlcnic_sriov_pf_enable(adapter, num_vfs);
+        return err;
+
+del_flr_queue:
+        qlcnic_sriov_pf_del_flr_queue(adapter);
+
+sriov_cleanup:
+        __qlcnic_sriov_cleanup(adapter);
+
+clear_op_mode:
+        clear_bit(__QLCNIC_SRIOV_ENABLE, &adapter->state);
+        adapter->ahw->op_mode = QLCNIC_MGMT_FUNC;
+        return err;
+}
+
+static int qlcnic_pci_sriov_enable(struct qlcnic_adapter *adapter, int num_vfs)
+{
+        struct net_device *netdev = adapter->netdev;
+        int err;
+
+        if (!(adapter->flags & QLCNIC_MSIX_ENABLED)) {
+                netdev_err(netdev,
+                           "SR-IOV cannot be enabled, when legacy interrupts are enabled\n");
+                return -EIO;
+        }
+
+        if (netif_running(netdev))
+                __qlcnic_down(adapter, netdev);
+
+        err = __qlcnic_pci_sriov_enable(adapter, num_vfs);
+        if (err) {
+                netdev_info(netdev, "Failed to enable SR-IOV on port %d\n",
+                            adapter->portnum);
+
+                err = -EIO;
+                if (qlcnic_83xx_configure_opmode(adapter))
+                        goto error;
+        } else {
+                netdev_info(netdev,
+                            "SR-IOV is enabled successfully on port %d\n",
+                            adapter->portnum);
+                /* Return number of vfs enabled */
+                err = num_vfs;
+        }
+        if (netif_running(netdev))
+                __qlcnic_up(adapter, netdev);
+
+error:
+        return err;
+}
+
+int qlcnic_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
+{
+        struct qlcnic_adapter *adapter = pci_get_drvdata(dev);
+        int err;
+
+        if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
+                return -EBUSY;
+
+        if (num_vfs == 0)
+                err = qlcnic_pci_sriov_disable(adapter);
+        else
+                err = qlcnic_pci_sriov_enable(adapter, num_vfs);
+
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+        return err;
+}
+
+static int qlcnic_sriov_set_vf_acl(struct qlcnic_adapter *adapter, u8 func)
+{
+        struct qlcnic_cmd_args cmd;
+        struct qlcnic_vport *vp;
+        int err, id;
+
+        id = qlcnic_sriov_func_to_index(adapter, func);
+        if (id < 0)
+                return id;
+
+        vp = adapter->ahw->sriov->vf_info[id].vp;
+        err = qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_SET_NIC_INFO);
+        if (err)
+                return err;
+
+        cmd.req.arg[1] = 0x3 | func << 16;
+        if (vp->vlan_mode == QLC_PVID_MODE) {
+                cmd.req.arg[2] |= BIT_6;
+                cmd.req.arg[3] |= vp->vlan << 8;
+        }
+
+        err = qlcnic_issue_cmd(adapter, &cmd);
+        if (err)
+                dev_err(&adapter->pdev->dev, "Failed to set ACL, err=%d\n",
+                        err);
+
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static int qlcnic_sriov_set_vf_vport_info(struct qlcnic_adapter *adapter,
+                                          u16 func)
+{
+        struct qlcnic_info defvp_info;
+        int err;
+
+        err = qlcnic_sriov_pf_cal_res_limit(adapter, &defvp_info, func);
+        if (err)
+                return -EIO;
+
+        err = qlcnic_sriov_set_vf_acl(adapter, func);
+        if (err)
+                return err;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_channel_cfg_cmd(struct qlcnic_bc_trans *trans,
+                                           struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+        u16 func = vf->pci_func;
+
+        cmd->rsp.arg[0] = trans->req_hdr->cmd_op;
+        cmd->rsp.arg[0] |= (1 << 16);
+
+        if (trans->req_hdr->cmd_op == QLCNIC_BC_CMD_CHANNEL_INIT) {
+                err = qlcnic_sriov_pf_config_vport(adapter, 1, func);
+                if (!err) {
+                        err = qlcnic_sriov_set_vf_vport_info(adapter, func);
+                        if (err)
+                                qlcnic_sriov_pf_config_vport(adapter, 0, func);
+                }
+        } else {
+                err = qlcnic_sriov_pf_config_vport(adapter, 0, func);
+        }
+
+        if (err)
+                goto err_out;
+
+        cmd->rsp.arg[0] |= (1 << 25);
+
+        if (trans->req_hdr->cmd_op == QLCNIC_BC_CMD_CHANNEL_INIT)
+                set_bit(QLC_BC_VF_STATE, &vf->state);
+        else
+                clear_bit(QLC_BC_VF_STATE, &vf->state);
+
+        return err;
+
+err_out:
+        cmd->rsp.arg[0] |= (2 << 25);
+        return err;
+}
+
+static int qlcnic_sriov_cfg_vf_def_mac(struct qlcnic_adapter *adapter,
+                                       struct qlcnic_vport *vp,
+                                       u16 func, u16 vlan, u8 op)
+{
+        struct qlcnic_cmd_args cmd;
+        struct qlcnic_macvlan_mbx mv;
+        u8 *addr;
+        int err;
+        u32 *buf;
+        int vpid;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIG_MAC_VLAN))
+                return -ENOMEM;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter, func);
+        if (vpid < 0) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        if (vlan)
+                op = ((op == QLCNIC_MAC_ADD || op == QLCNIC_MAC_VLAN_ADD) ?
+                      QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_VLAN_DEL);
+
+        cmd.req.arg[1] = op | (1 << 8) | (3 << 6);
+        cmd.req.arg[1] |= ((vpid & 0xffff) << 16) | BIT_31;
+
+        addr = vp->mac;
+        mv.vlan = vlan;
+        mv.mac_addr0 = addr[0];
+        mv.mac_addr1 = addr[1];
+        mv.mac_addr2 = addr[2];
+        mv.mac_addr3 = addr[3];
+        mv.mac_addr4 = addr[4];
+        mv.mac_addr5 = addr[5];
+        buf = &cmd.req.arg[2];
+        memcpy(buf, &mv, sizeof(struct qlcnic_macvlan_mbx));
+
+        err = qlcnic_issue_cmd(adapter, &cmd);
+
+        if (err)
+                dev_err(&adapter->pdev->dev,
+                        "MAC-VLAN %s to CAM failed, err=%d.\n",
+                        ((op == 1) ? "add " : "delete "), err);
+
+out:
+        qlcnic_free_mbx_args(&cmd);
+        return err;
+}
+
+static int qlcnic_sriov_validate_create_rx_ctx(struct qlcnic_cmd_args *cmd)
+{
+        if ((cmd->req.arg[0] >> 29) != 0x3)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_create_rx_ctx_cmd(struct qlcnic_bc_trans *tran,
+                                             struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = tran->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        struct qlcnic_rcv_mbx_out *mbx_out;
+        int err;
+        u16 vlan;
+
+        err = qlcnic_sriov_validate_create_rx_ctx(cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        cmd->req.arg[6] = vf->vp->handle;
+        err = qlcnic_issue_cmd(adapter, cmd);
+
+        vlan = vf->vp->vlan;
+        if (!err) {
+                mbx_out = (struct qlcnic_rcv_mbx_out *)&cmd->rsp.arg[1];
+                vf->rx_ctx_id = mbx_out->ctx_id;
+                qlcnic_sriov_cfg_vf_def_mac(adapter, vf->vp, vf->pci_func,
+                                            vlan, QLCNIC_MAC_ADD);
+        } else {
+                vf->rx_ctx_id = 0;
+        }
+
+        return err;
+}
+
+static int qlcnic_sriov_pf_mac_address_cmd(struct qlcnic_bc_trans *trans,
+                                           struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        u8 type, *mac;
+
+        type = cmd->req.arg[1];
+        switch (type) {
+        case QLCNIC_SET_STATION_MAC:
+        case QLCNIC_SET_FAC_DEF_MAC:
+                cmd->rsp.arg[0] = (2 << 25);
+                break;
+        case QLCNIC_GET_CURRENT_MAC:
+                cmd->rsp.arg[0] = (1 << 25);
+                mac = vf->vp->mac;
+                cmd->rsp.arg[2] = mac[1] | ((mac[0] << 8) & 0xff00);
+                cmd->rsp.arg[1] = mac[5] | ((mac[4] << 8) & 0xff00) |
+                                  ((mac[3]) << 16 & 0xff0000) |
+                                  ((mac[2]) << 24 & 0xff000000);
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_validate_create_tx_ctx(struct qlcnic_cmd_args *cmd)
+{
+        if ((cmd->req.arg[0] >> 29) != 0x3)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_create_tx_ctx_cmd(struct qlcnic_bc_trans *trans,
+                                             struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        struct qlcnic_tx_mbx_out *mbx_out;
+        int err;
+
+        err = qlcnic_sriov_validate_create_tx_ctx(cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        cmd->req.arg[5] |= vf->vp->handle << 16;
+        err = qlcnic_issue_cmd(adapter, cmd);
+        if (!err) {
+                mbx_out = (struct qlcnic_tx_mbx_out *)&cmd->rsp.arg[2];
+                vf->tx_ctx_id = mbx_out->ctx_id;
+        } else {
+                vf->tx_ctx_id = 0;
+        }
+
+        return err;
+}
+
+static int qlcnic_sriov_validate_del_rx_ctx(struct qlcnic_vf_info *vf,
+                                            struct qlcnic_cmd_args *cmd)
+{
+        if ((cmd->req.arg[0] >> 29) != 0x3)
+                return -EINVAL;
+
+        if ((cmd->req.arg[1] & 0xffff) != vf->rx_ctx_id)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_del_rx_ctx_cmd(struct qlcnic_bc_trans *trans,
+                                          struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+        u16 vlan;
+
+        err = qlcnic_sriov_validate_del_rx_ctx(vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        vlan = vf->vp->vlan;
+        qlcnic_sriov_cfg_vf_def_mac(adapter, vf->vp, vf->pci_func,
+                                    vlan, QLCNIC_MAC_DEL);
+        cmd->req.arg[1] |= vf->vp->handle << 16;
+        err = qlcnic_issue_cmd(adapter, cmd);
+
+        if (!err)
+                vf->rx_ctx_id = 0;
+
+        return err;
+}
+
+static int qlcnic_sriov_validate_del_tx_ctx(struct qlcnic_vf_info *vf,
+                                            struct qlcnic_cmd_args *cmd)
+{
+        if ((cmd->req.arg[0] >> 29) != 0x3)
+                return -EINVAL;
+
+        if ((cmd->req.arg[1] & 0xffff) != vf->tx_ctx_id)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_del_tx_ctx_cmd(struct qlcnic_bc_trans *trans,
+                                          struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_del_tx_ctx(vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        cmd->req.arg[1] |= vf->vp->handle << 16;
+        err = qlcnic_issue_cmd(adapter, cmd);
+
+        if (!err)
+                vf->tx_ctx_id = 0;
+
+        return err;
+}
+
+static int qlcnic_sriov_validate_cfg_lro(struct qlcnic_vf_info *vf,
+                                         struct qlcnic_cmd_args *cmd)
+{
+        if ((cmd->req.arg[1] >> 16) != vf->rx_ctx_id)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_cfg_lro_cmd(struct qlcnic_bc_trans *trans,
+                                       struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_cfg_lro(vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_pf_cfg_ip_cmd(struct qlcnic_bc_trans *trans,
+                                      struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err = -EIO;
+        u8 op;
+
+        op =  cmd->req.arg[1] & 0xff;
+
+        cmd->req.arg[1] |= vf->vp->handle << 16;
+        cmd->req.arg[1] |= BIT_31;
+
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_validate_cfg_intrpt(struct qlcnic_vf_info *vf,
+                                            struct qlcnic_cmd_args *cmd)
+{
+        if (((cmd->req.arg[1] >> 8) & 0xff) != vf->pci_func)
+                return -EINVAL;
+
+        if (!(cmd->req.arg[1] & BIT_16))
+                return -EINVAL;
+
+        if ((cmd->req.arg[1] & 0xff) != 0x1)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_cfg_intrpt_cmd(struct qlcnic_bc_trans *trans,
+                                          struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_cfg_intrpt(vf, cmd);
+        if (err)
+                cmd->rsp.arg[0] |= (0x6 << 25);
+        else
+                err = qlcnic_issue_cmd(adapter, cmd);
+
+        return err;
+}
+
+static int qlcnic_sriov_validate_mtu(struct qlcnic_adapter *adapter,
+                                     struct qlcnic_vf_info *vf,
+                                     struct qlcnic_cmd_args *cmd)
+{
+        if (cmd->req.arg[1] != vf->rx_ctx_id)
+                return -EINVAL;
+
+        if (cmd->req.arg[2] > adapter->ahw->max_mtu)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_set_mtu_cmd(struct qlcnic_bc_trans *trans,
+                                       struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_mtu(adapter, vf, cmd);
+        if (err)
+                cmd->rsp.arg[0] |= (0x6 << 25);
+        else
+                err = qlcnic_issue_cmd(adapter, cmd);
+
+        return err;
+}
+
+static int qlcnic_sriov_validate_get_nic_info(struct qlcnic_vf_info *vf,
+                                              struct qlcnic_cmd_args *cmd)
+{
+        if (cmd->req.arg[1] & BIT_31) {
+                if (((cmd->req.arg[1] >> 16) & 0x7fff) != vf->pci_func)
+                        return -EINVAL;
+        } else {
+                cmd->req.arg[1] |= vf->vp->handle << 16;
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_get_nic_info_cmd(struct qlcnic_bc_trans *trans,
+                                            struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_get_nic_info(vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_validate_cfg_rss(struct qlcnic_vf_info *vf,
+                                         struct qlcnic_cmd_args *cmd)
+{
+        if (cmd->req.arg[1] != vf->rx_ctx_id)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_cfg_rss_cmd(struct qlcnic_bc_trans *trans,
+                                       struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_cfg_rss(vf, cmd);
+        if (err)
+                cmd->rsp.arg[0] |= (0x6 << 25);
+        else
+                err = qlcnic_issue_cmd(adapter, cmd);
+
+        return err;
+}
+
+static int qlcnic_sriov_validate_cfg_intrcoal(struct qlcnic_adapter *adapter,
+                                              struct qlcnic_vf_info *vf,
+                                              struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_nic_intr_coalesce *coal = &adapter->ahw->coal;
+        u16 ctx_id, pkts, time;
+
+        ctx_id = cmd->req.arg[1] >> 16;
+        pkts = cmd->req.arg[2] & 0xffff;
+        time = cmd->req.arg[2] >> 16;
+
+        if (ctx_id != vf->rx_ctx_id)
+                return -EINVAL;
+        if (pkts > coal->rx_packets)
+                return -EINVAL;
+        if (time < coal->rx_time_us)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_cfg_intrcoal_cmd(struct qlcnic_bc_trans *tran,
+                                            struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = tran->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_cfg_intrcoal(adapter, vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_validate_cfg_macvlan(struct qlcnic_adapter *adapter,
+                                             struct qlcnic_vf_info *vf,
+                                             struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_macvlan_mbx *macvlan;
+        struct qlcnic_vport *vp = vf->vp;
+        u8 op, new_op;
+
+        if (!(cmd->req.arg[1] & BIT_8))
+                return -EINVAL;
+
+        cmd->req.arg[1] |= (vf->vp->handle << 16);
+        cmd->req.arg[1] |= BIT_31;
+
+        macvlan = (struct qlcnic_macvlan_mbx *)&cmd->req.arg[2];
+        if (!(macvlan->mac_addr0 & BIT_0)) {
+                dev_err(&adapter->pdev->dev,
+                        "MAC address change is not allowed from VF %d",
+                        vf->pci_func);
+                return -EINVAL;
+        }
+
+        if (vp->vlan_mode == QLC_PVID_MODE) {
+                op = cmd->req.arg[1] & 0x7;
+                cmd->req.arg[1] &= ~0x7;
+                new_op = (op == QLCNIC_MAC_ADD || op == QLCNIC_MAC_VLAN_ADD) ?
+                         QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_VLAN_DEL;
+                cmd->req.arg[3] |= vp->vlan << 16;
+                cmd->req.arg[1] |= new_op;
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_cfg_macvlan_cmd(struct qlcnic_bc_trans *trans,
+                                           struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_cfg_macvlan(adapter, vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_validate_linkevent(struct qlcnic_vf_info *vf,
+                                           struct qlcnic_cmd_args *cmd)
+{
+        if ((cmd->req.arg[1] >> 16) != vf->rx_ctx_id)
+                return -EINVAL;
+
+        if (!(cmd->req.arg[1] & BIT_8))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_linkevent_cmd(struct qlcnic_bc_trans *trans,
+                                         struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        err = qlcnic_sriov_validate_linkevent(vf, cmd);
+        if (err) {
+                cmd->rsp.arg[0] |= (0x6 << 25);
+                return err;
+        }
+
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_pf_cfg_promisc_cmd(struct qlcnic_bc_trans *trans,
+                                           struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_adapter *adapter = vf->adapter;
+        int err;
+
+        cmd->req.arg[1] |= vf->vp->handle << 16;
+        cmd->req.arg[1] |= BIT_31;
+        err = qlcnic_issue_cmd(adapter, cmd);
+        return err;
+}
+
+static int qlcnic_sriov_pf_get_acl_cmd(struct qlcnic_bc_trans *trans,
+                                       struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info *vf = trans->vf;
+        struct qlcnic_vport *vp = vf->vp;
+        u8 cmd_op, mode = vp->vlan_mode;
+
+        cmd_op = trans->req_hdr->cmd_op;
+        cmd->rsp.arg[0] = (cmd_op & 0xffff) | 14 << 16 | 1 << 25;
+
+        switch (mode) {
+        case QLC_GUEST_VLAN_MODE:
+                cmd->rsp.arg[1] = mode | 1 << 8;
+                cmd->rsp.arg[2] = 1 << 16;
+                break;
+        case QLC_PVID_MODE:
+                cmd->rsp.arg[1] = mode | 1 << 8 | vp->vlan << 16;
+                break;
+        }
+
+        return 0;
+}
+
+static int qlcnic_sriov_pf_del_guest_vlan(struct qlcnic_adapter *adapter,
+                                          struct qlcnic_vf_info *vf)
+
+{
+        struct qlcnic_vport *vp = vf->vp;
+
+        if (!vp->vlan)
+                return -EINVAL;
+
+        if (!vf->rx_ctx_id) {
+                vp->vlan = 0;
+                return 0;
+        }
+
+        qlcnic_sriov_cfg_vf_def_mac(adapter, vp, vf->pci_func,
+                                    vp->vlan, QLCNIC_MAC_DEL);
+        vp->vlan = 0;
+        qlcnic_sriov_cfg_vf_def_mac(adapter, vp, vf->pci_func,
+                                    0, QLCNIC_MAC_ADD);
+        return 0;
+}
+
+static int qlcnic_sriov_pf_add_guest_vlan(struct qlcnic_adapter *adapter,
+                                          struct qlcnic_vf_info *vf,
+                                          struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vport *vp = vf->vp;
+        int err = -EIO;
+
+        if (vp->vlan)
+                return err;
+
+        if (!vf->rx_ctx_id) {
+                vp->vlan = cmd->req.arg[1] >> 16;
+                return 0;
+        }
+
+        err = qlcnic_sriov_cfg_vf_def_mac(adapter, vp, vf->pci_func,
+                                          0, QLCNIC_MAC_DEL);
+        if (err)
+                return err;
+
+        vp->vlan = cmd->req.arg[1] >> 16;
+        err = qlcnic_sriov_cfg_vf_def_mac(adapter, vp, vf->pci_func,
+                                          vp->vlan, QLCNIC_MAC_ADD);
+
+        if (err) {
+                qlcnic_sriov_cfg_vf_def_mac(adapter, vp, vf->pci_func,
+                                            0, QLCNIC_MAC_ADD);
+                vp->vlan = 0;
+        }
+
+        return err;
+}
+
+static int qlcnic_sriov_pf_cfg_guest_vlan_cmd(struct qlcnic_bc_trans *tran,
+                                              struct qlcnic_cmd_args *cmd)
+{
+        struct qlcnic_vf_info  *vf = tran->vf;
+        struct qlcnic_adapter *adapter =  vf->adapter;
+        struct qlcnic_vport *vp = vf->vp;
+        int err = -EIO;
+        u8 op;
+
+        if (vp->vlan_mode != QLC_GUEST_VLAN_MODE) {
+                cmd->rsp.arg[0] |= 2 << 25;
+                return err;
+        }
+
+        op = cmd->req.arg[1] & 0xf;
+
+        if (op)
+                err = qlcnic_sriov_pf_add_guest_vlan(adapter, vf, cmd);
+        else
+                err = qlcnic_sriov_pf_del_guest_vlan(adapter, vf);
+
+        cmd->rsp.arg[0] |= err ? 2 << 25 : 1 << 25;
+        return err;
+}
+
+static const int qlcnic_pf_passthru_supp_cmds[] = {
+        QLCNIC_CMD_GET_STATISTICS,
+        QLCNIC_CMD_GET_PORT_CONFIG,
+        QLCNIC_CMD_GET_LINK_STATUS,
+};
+
+static const struct qlcnic_sriov_cmd_handler qlcnic_pf_bc_cmd_hdlr[] = {
+        [QLCNIC_BC_CMD_CHANNEL_INIT] = {&qlcnic_sriov_pf_channel_cfg_cmd},
+        [QLCNIC_BC_CMD_CHANNEL_TERM] = {&qlcnic_sriov_pf_channel_cfg_cmd},
+        [QLCNIC_BC_CMD_GET_ACL] = {&qlcnic_sriov_pf_get_acl_cmd},
+        [QLCNIC_BC_CMD_CFG_GUEST_VLAN]  = {&qlcnic_sriov_pf_cfg_guest_vlan_cmd},
+};
+
+static const struct qlcnic_sriov_fw_cmd_handler qlcnic_pf_fw_cmd_hdlr[] = {
+        {QLCNIC_CMD_CREATE_RX_CTX, qlcnic_sriov_pf_create_rx_ctx_cmd},
+        {QLCNIC_CMD_CREATE_TX_CTX, qlcnic_sriov_pf_create_tx_ctx_cmd},
+        {QLCNIC_CMD_MAC_ADDRESS, qlcnic_sriov_pf_mac_address_cmd},
+        {QLCNIC_CMD_DESTROY_RX_CTX, qlcnic_sriov_pf_del_rx_ctx_cmd},
+        {QLCNIC_CMD_DESTROY_TX_CTX, qlcnic_sriov_pf_del_tx_ctx_cmd},
+        {QLCNIC_CMD_CONFIGURE_HW_LRO, qlcnic_sriov_pf_cfg_lro_cmd},
+        {QLCNIC_CMD_CONFIGURE_IP_ADDR, qlcnic_sriov_pf_cfg_ip_cmd},
+        {QLCNIC_CMD_CONFIG_INTRPT, qlcnic_sriov_pf_cfg_intrpt_cmd},
+        {QLCNIC_CMD_SET_MTU, qlcnic_sriov_pf_set_mtu_cmd},
+        {QLCNIC_CMD_GET_NIC_INFO, qlcnic_sriov_pf_get_nic_info_cmd},
+        {QLCNIC_CMD_CONFIGURE_RSS, qlcnic_sriov_pf_cfg_rss_cmd},
+        {QLCNIC_CMD_CONFIG_INTR_COAL, qlcnic_sriov_pf_cfg_intrcoal_cmd},
+        {QLCNIC_CMD_CONFIG_MAC_VLAN, qlcnic_sriov_pf_cfg_macvlan_cmd},
+        {QLCNIC_CMD_GET_LINK_EVENT, qlcnic_sriov_pf_linkevent_cmd},
+        {QLCNIC_CMD_CONFIGURE_MAC_RX_MODE, qlcnic_sriov_pf_cfg_promisc_cmd},
+};
+
+void qlcnic_sriov_pf_process_bc_cmd(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_bc_trans *trans,
+                                    struct qlcnic_cmd_args *cmd)
+{
+        u8 size, cmd_op;
+
+        cmd_op = trans->req_hdr->cmd_op;
+
+        if (trans->req_hdr->op_type == QLC_BC_CMD) {
+                size = ARRAY_SIZE(qlcnic_pf_bc_cmd_hdlr);
+                if (cmd_op < size) {
+                        qlcnic_pf_bc_cmd_hdlr[cmd_op].fn(trans, cmd);
+                        return;
+                }
+        } else {
+                int i;
+                size = ARRAY_SIZE(qlcnic_pf_fw_cmd_hdlr);
+                for (i = 0; i < size; i++) {
+                        if (cmd_op == qlcnic_pf_fw_cmd_hdlr[i].cmd) {
+                                qlcnic_pf_fw_cmd_hdlr[i].fn(trans, cmd);
+                                return;
+                        }
+                }
+
+                size = ARRAY_SIZE(qlcnic_pf_passthru_supp_cmds);
+                for (i = 0; i < size; i++) {
+                        if (cmd_op == qlcnic_pf_passthru_supp_cmds[i]) {
+                                qlcnic_issue_cmd(adapter, cmd);
+                                return;
+                        }
+                }
+        }
+
+        cmd->rsp.arg[0] |= (0x9 << 25);
+}
+
+void qlcnic_pf_set_interface_id_create_rx_ctx(struct qlcnic_adapter *adapter,
+                                             u32 *int_id)
+{
+        u16 vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= vpid;
+}
+
+void qlcnic_pf_set_interface_id_del_rx_ctx(struct qlcnic_adapter *adapter,
+                                           u32 *int_id)
+{
+        u16 vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= vpid << 16;
+}
+
+void qlcnic_pf_set_interface_id_create_tx_ctx(struct qlcnic_adapter *adapter,
+                                              u32 *int_id)
+{
+        int vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= vpid << 16;
+}
+
+void qlcnic_pf_set_interface_id_del_tx_ctx(struct qlcnic_adapter *adapter,
+                                           u32 *int_id)
+{
+        u16 vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= vpid << 16;
+}
+
+void qlcnic_pf_set_interface_id_promisc(struct qlcnic_adapter *adapter,
+                                        u32 *int_id)
+{
+        u16 vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= (vpid << 16) | BIT_31;
+}
+
+void qlcnic_pf_set_interface_id_ipaddr(struct qlcnic_adapter *adapter,
+                                       u32 *int_id)
+{
+        u16 vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= (vpid << 16) | BIT_31;
+}
+
+void qlcnic_pf_set_interface_id_macaddr(struct qlcnic_adapter *adapter,
+                                        u32 *int_id)
+{
+        u16 vpid;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter,
+                                                adapter->ahw->pci_func);
+        *int_id |= (vpid << 16) | BIT_31;
+}
+
+static void qlcnic_sriov_del_rx_ctx(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_cmd_args cmd;
+        int vpid;
+
+        if (!vf->rx_ctx_id)
+                return;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_RX_CTX))
+                return;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter, vf->pci_func);
+        if (vpid >= 0) {
+                cmd.req.arg[1] = vf->rx_ctx_id | (vpid & 0xffff) << 16;
+                if (qlcnic_issue_cmd(adapter, &cmd))
+                        dev_err(&adapter->pdev->dev,
+                                "Failed to delete Tx ctx in firmware for func 0x%x\n",
+                                vf->pci_func);
+                else
+                        vf->rx_ctx_id = 0;
+        }
+
+        qlcnic_free_mbx_args(&cmd);
+}
+
+static void qlcnic_sriov_del_tx_ctx(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_cmd_args cmd;
+        int vpid;
+
+        if (!vf->tx_ctx_id)
+                return;
+
+        if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_TX_CTX))
+                return;
+
+        vpid = qlcnic_sriov_pf_get_vport_handle(adapter, vf->pci_func);
+        if (vpid >= 0) {
+                cmd.req.arg[1] |= vf->tx_ctx_id | (vpid & 0xffff) << 16;
+                if (qlcnic_issue_cmd(adapter, &cmd))
+                        dev_err(&adapter->pdev->dev,
+                                "Failed to delete Tx ctx in firmware for func 0x%x\n",
+                                vf->pci_func);
+                else
+                        vf->tx_ctx_id = 0;
+        }
+
+        qlcnic_free_mbx_args(&cmd);
+}
+
+static int qlcnic_sriov_add_act_list_irqsave(struct qlcnic_sriov *sriov,
+                                             struct qlcnic_vf_info *vf,
+                                             struct qlcnic_bc_trans *trans)
+{
+        struct qlcnic_trans_list *t_list = &vf->rcv_act;
+        unsigned long flag;
+
+        spin_lock_irqsave(&t_list->lock, flag);
+
+        __qlcnic_sriov_add_act_list(sriov, vf, trans);
+
+        spin_unlock_irqrestore(&t_list->lock, flag);
+        return 0;
+}
+
+static void __qlcnic_sriov_process_flr(struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_adapter *adapter = vf->adapter;
+
+        qlcnic_sriov_cleanup_list(&vf->rcv_pend);
+        cancel_work_sync(&vf->trans_work);
+        qlcnic_sriov_cleanup_list(&vf->rcv_act);
+
+        if (test_bit(QLC_BC_VF_SOFT_FLR, &vf->state)) {
+                qlcnic_sriov_del_tx_ctx(adapter, vf);
+                qlcnic_sriov_del_rx_ctx(adapter, vf);
+        }
+
+        qlcnic_sriov_pf_config_vport(adapter, 0, vf->pci_func);
+
+        clear_bit(QLC_BC_VF_FLR, &vf->state);
+        if (test_bit(QLC_BC_VF_SOFT_FLR, &vf->state)) {
+                qlcnic_sriov_add_act_list_irqsave(adapter->ahw->sriov, vf,
+                                                  vf->flr_trans);
+                clear_bit(QLC_BC_VF_SOFT_FLR, &vf->state);
+                vf->flr_trans = NULL;
+        }
+}
+
+static void qlcnic_sriov_pf_process_flr(struct work_struct *work)
+{
+        struct qlcnic_vf_info *vf;
+
+        vf = container_of(work, struct qlcnic_vf_info, flr_work);
+        __qlcnic_sriov_process_flr(vf);
+        return;
+}
+
+static void qlcnic_sriov_schedule_flr(struct qlcnic_sriov *sriov,
+                                      struct qlcnic_vf_info *vf,
+                                      work_func_t func)
+{
+        if (test_bit(__QLCNIC_RESETTING, &vf->adapter->state))
+                return;
+
+        INIT_WORK(&vf->flr_work, func);
+        queue_work(sriov->bc.bc_flr_wq, &vf->flr_work);
+}
+
+static void qlcnic_sriov_handle_soft_flr(struct qlcnic_adapter *adapter,
+                                         struct qlcnic_bc_trans *trans,
+                                         struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+
+        set_bit(QLC_BC_VF_FLR, &vf->state);
+        clear_bit(QLC_BC_VF_STATE, &vf->state);
+        set_bit(QLC_BC_VF_SOFT_FLR, &vf->state);
+        vf->flr_trans = trans;
+        qlcnic_sriov_schedule_flr(sriov, vf, qlcnic_sriov_pf_process_flr);
+        netdev_info(adapter->netdev, "Software FLR for PCI func %d\n",
+                    vf->pci_func);
+}
+
+bool qlcnic_sriov_soft_flr_check(struct qlcnic_adapter *adapter,
+                                 struct qlcnic_bc_trans *trans,
+                                 struct qlcnic_vf_info *vf)
+{
+        struct qlcnic_bc_hdr *hdr = trans->req_hdr;
+
+        if ((hdr->cmd_op == QLCNIC_BC_CMD_CHANNEL_INIT) &&
+            (hdr->op_type == QLC_BC_CMD) &&
+             test_bit(QLC_BC_VF_STATE, &vf->state)) {
+                qlcnic_sriov_handle_soft_flr(adapter, trans, vf);
+                return true;
+        }
+
+        return false;
+}
+
+void qlcnic_sriov_pf_handle_flr(struct qlcnic_sriov *sriov,
+                                struct qlcnic_vf_info *vf)
+{
+        struct net_device *dev = vf->adapter->netdev;
+
+        if (!test_and_clear_bit(QLC_BC_VF_STATE, &vf->state)) {
+                clear_bit(QLC_BC_VF_FLR, &vf->state);
+                return;
+        }
+
+        if (test_and_set_bit(QLC_BC_VF_FLR, &vf->state)) {
+                netdev_info(dev, "FLR for PCI func %d in progress\n",
+                            vf->pci_func);
+                return;
+        }
+
+        qlcnic_sriov_schedule_flr(sriov, vf, qlcnic_sriov_pf_process_flr);
+        netdev_info(dev, "FLR received for PCI func %d\n", vf->pci_func);
+}
+
+void qlcnic_sriov_pf_reset(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        struct qlcnic_sriov *sriov = ahw->sriov;
+        struct qlcnic_vf_info *vf;
+        u16 num_vfs = sriov->num_vfs;
+        int i;
+
+        for (i = 0; i < num_vfs; i++) {
+                vf = &sriov->vf_info[i];
+                vf->rx_ctx_id = 0;
+                vf->tx_ctx_id = 0;
+                cancel_work_sync(&vf->flr_work);
+                __qlcnic_sriov_process_flr(vf);
+                clear_bit(QLC_BC_VF_STATE, &vf->state);
+        }
+
+        qlcnic_sriov_pf_reset_vport_handle(adapter, ahw->pci_func);
+        QLCWRX(ahw, QLCNIC_MBX_INTR_ENBL, (ahw->num_msix - 1) << 8);
+}
+
+int qlcnic_sriov_pf_reinit(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        int err;
+
+        if (!qlcnic_sriov_enable_check(adapter))
+                return 0;
+
+        ahw->op_mode = QLCNIC_SRIOV_PF_FUNC;
+
+        err = qlcnic_sriov_pf_init(adapter);
+        if (err)
+                return err;
+
+        dev_info(&adapter->pdev->dev, "%s: op_mode %d\n",
+                 __func__, ahw->op_mode);
+        return err;
+}
+
+int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        int i, num_vfs = sriov->num_vfs;
+        struct qlcnic_vf_info *vf_info;
+        u8 *curr_mac;
+
+        if (!qlcnic_sriov_pf_check(adapter))
+                return -EOPNOTSUPP;
+
+        if (!is_valid_ether_addr(mac) || vf >= num_vfs)
+                return -EINVAL;
+
+        if (!compare_ether_addr(adapter->mac_addr, mac)) {
+                netdev_err(netdev, "MAC address is already in use by the PF\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < num_vfs; i++) {
+                vf_info = &sriov->vf_info[i];
+                if (!compare_ether_addr(vf_info->vp->mac, mac)) {
+                        netdev_err(netdev,
+                                   "MAC address is already in use by VF %d\n",
+                                   i);
+                        return -EINVAL;
+                }
+        }
+
+        vf_info = &sriov->vf_info[vf];
+        curr_mac = vf_info->vp->mac;
+
+        if (test_bit(QLC_BC_VF_STATE, &vf_info->state)) {
+                netdev_err(netdev,
+                           "MAC address change failed for VF %d, as VF driver is loaded. Please unload VF driver and retry the operation\n",
+                           vf);
+                return -EOPNOTSUPP;
+        }
+
+        memcpy(curr_mac, mac, netdev->addr_len);
+        netdev_info(netdev, "MAC Address %pM  is configured for VF %d\n",
+                    mac, vf);
+        return 0;
+}
+
+int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf, int tx_rate)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_vf_info *vf_info;
+        struct qlcnic_info nic_info;
+        struct qlcnic_vport *vp;
+        u16 vpid;
+
+        if (!qlcnic_sriov_pf_check(adapter))
+                return -EOPNOTSUPP;
+
+        if (vf >= sriov->num_vfs)
+                return -EINVAL;
+
+        if (tx_rate >= 10000 || tx_rate < 100) {
+                netdev_err(netdev,
+                           "Invalid Tx rate, allowed range is [%d - %d]",
+                           QLC_VF_MIN_TX_RATE, QLC_VF_MAX_TX_RATE);
+                return -EINVAL;
+        }
+
+        if (tx_rate == 0)
+                tx_rate = 10000;
+
+        vf_info = &sriov->vf_info[vf];
+        vp = vf_info->vp;
+        vpid = vp->handle;
+
+        if (test_bit(QLC_BC_VF_STATE, &vf_info->state)) {
+                if (qlcnic_sriov_get_vf_vport_info(adapter, &nic_info, vpid))
+                        return -EIO;
+
+                nic_info.max_tx_bw = tx_rate / 100;
+                nic_info.bit_offsets = BIT_0;
+
+                if (qlcnic_sriov_pf_set_vport_info(adapter, &nic_info, vpid))
+                        return -EIO;
+        }
+
+        vp->max_tx_bw = tx_rate / 100;
+        netdev_info(netdev,
+                    "Setting Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n",
+                    tx_rate, vp->max_tx_bw, vf);
+        return 0;
+}
+
+int qlcnic_sriov_set_vf_vlan(struct net_device *netdev, int vf,
+                             u16 vlan, u8 qos)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_vf_info *vf_info;
+        struct qlcnic_vport *vp;
+
+        if (!qlcnic_sriov_pf_check(adapter))
+                return -EOPNOTSUPP;
+
+        if (vf >= sriov->num_vfs || qos > 7)
+                return -EINVAL;
+
+        if (vlan > MAX_VLAN_ID) {
+                netdev_err(netdev,
+                           "Invalid VLAN ID, allowed range is [0 - %d]\n",
+                           MAX_VLAN_ID);
+                return -EINVAL;
+        }
+
+        vf_info = &sriov->vf_info[vf];
+        vp = vf_info->vp;
+        if (test_bit(QLC_BC_VF_STATE, &vf_info->state)) {
+                netdev_err(netdev,
+                           "VLAN change failed for VF %d, as VF driver is loaded. Please unload VF driver and retry the operation\n",
+                           vf);
+                return -EOPNOTSUPP;
+        }
+
+        switch (vlan) {
+        case 4095:
+                vp->vlan_mode = QLC_GUEST_VLAN_MODE;
+                break;
+        case 0:
+                vp->vlan_mode = QLC_NO_VLAN_MODE;
+                vp->vlan = 0;
+                vp->qos = 0;
+                break;
+        default:
+                vp->vlan_mode = QLC_PVID_MODE;
+                vp->vlan = vlan;
+                vp->qos = qos;
+        }
+
+        netdev_info(netdev, "Setting VLAN %d, QoS %d, for VF %d\n",
+                    vlan, qos, vf);
+        return 0;
+}
+
+int qlcnic_sriov_get_vf_config(struct net_device *netdev,
+                               int vf, struct ifla_vf_info *ivi)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_sriov *sriov = adapter->ahw->sriov;
+        struct qlcnic_vport *vp;
+
+        if (!qlcnic_sriov_pf_check(adapter))
+                return -EOPNOTSUPP;
+
+        if (vf >= sriov->num_vfs)
+                return -EINVAL;
+
+        vp = sriov->vf_info[vf].vp;
+        memcpy(&ivi->mac, vp->mac, ETH_ALEN);
+        ivi->vlan = vp->vlan;
+        ivi->qos = vp->qos;
+        if (vp->max_tx_bw == MAX_BW)
+                ivi->tx_rate = 0;
+        else
+                ivi->tx_rate = vp->max_tx_bw * 100;
+
+        ivi->vf = vf;
+        return 0;
+}
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
index 5ef328af61d0..4e22e794a186 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
@@ -21,8 +21,6 @@
 #include <linux/aer.h>
 #include <linux/log2.h>
 
-#include <linux/sysfs.h>
-
 #define QLC_STATUS_UNSUPPORTED_CMD      -2
 
 int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
@@ -886,6 +884,244 @@ static ssize_t qlcnic_sysfs_read_pci_config(struct file *file,
         return size;
 }
 
+static ssize_t qlcnic_83xx_sysfs_flash_read_handler(struct file *filp,
+                                                    struct kobject *kobj,
+                                                    struct bin_attribute *attr,
+                                                    char *buf, loff_t offset,
+                                                    size_t size)
+{
+        unsigned char *p_read_buf;
+        int  ret, count;
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+
+        if (!size)
+                return QL_STATUS_INVALID_PARAM;
+        if (!buf)
+                return QL_STATUS_INVALID_PARAM;
+
+        count = size / sizeof(u32);
+
+        if (size % sizeof(u32))
+                count++;
+
+        p_read_buf = kcalloc(size, sizeof(unsigned char), GFP_KERNEL);
+        if (!p_read_buf)
+                return -ENOMEM;
+        if (qlcnic_83xx_lock_flash(adapter) != 0) {
+                kfree(p_read_buf);
+                return -EIO;
+        }
+
+        ret = qlcnic_83xx_lockless_flash_read32(adapter, offset, p_read_buf,
+                                                count);
+
+        if (ret) {
+                qlcnic_83xx_unlock_flash(adapter);
+                kfree(p_read_buf);
+                return ret;
+        }
+
+        qlcnic_83xx_unlock_flash(adapter);
+        memcpy(buf, p_read_buf, size);
+        kfree(p_read_buf);
+
+        return size;
+}
+
+static int qlcnic_83xx_sysfs_flash_bulk_write(struct qlcnic_adapter *adapter,
+                                              char *buf, loff_t offset,
+                                              size_t size)
+{
+        int  i, ret, count;
+        unsigned char *p_cache, *p_src;
+
+        p_cache = kcalloc(size, sizeof(unsigned char), GFP_KERNEL);
+        if (!p_cache)
+                return -ENOMEM;
+
+        memcpy(p_cache, buf, size);
+        p_src = p_cache;
+        count = size / sizeof(u32);
+
+        if (qlcnic_83xx_lock_flash(adapter) != 0) {
+                kfree(p_cache);
+                return -EIO;
+        }
+
+        if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
+                ret = qlcnic_83xx_enable_flash_write(adapter);
+                if (ret) {
+                        kfree(p_cache);
+                        qlcnic_83xx_unlock_flash(adapter);
+                        return -EIO;
+                }
+        }
+
+        for (i = 0; i < count / QLC_83XX_FLASH_WRITE_MAX; i++) {
+                ret = qlcnic_83xx_flash_bulk_write(adapter, offset,
+                                                   (u32 *)p_src,
+                                                   QLC_83XX_FLASH_WRITE_MAX);
+
+                if (ret) {
+                        if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
+                                ret = qlcnic_83xx_disable_flash_write(adapter);
+                                if (ret) {
+                                        kfree(p_cache);
+                                        qlcnic_83xx_unlock_flash(adapter);
+                                        return -EIO;
+                                }
+                        }
+
+                        kfree(p_cache);
+                        qlcnic_83xx_unlock_flash(adapter);
+                        return -EIO;
+                }
+
+                p_src = p_src + sizeof(u32)*QLC_83XX_FLASH_WRITE_MAX;
+                offset = offset + sizeof(u32)*QLC_83XX_FLASH_WRITE_MAX;
+        }
+
+        if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
+                ret = qlcnic_83xx_disable_flash_write(adapter);
+                if (ret) {
+                        kfree(p_cache);
+                        qlcnic_83xx_unlock_flash(adapter);
+                        return -EIO;
+                }
+        }
+
+        kfree(p_cache);
+        qlcnic_83xx_unlock_flash(adapter);
+
+        return 0;
+}
+
+static int qlcnic_83xx_sysfs_flash_write(struct qlcnic_adapter *adapter,
+                                         char *buf, loff_t offset, size_t size)
+{
+        int  i, ret, count;
+        unsigned char *p_cache, *p_src;
+
+        p_cache = kcalloc(size, sizeof(unsigned char), GFP_KERNEL);
+        if (!p_cache)
+                return -ENOMEM;
+
+        memcpy(p_cache, buf, size);
+        p_src = p_cache;
+        count = size / sizeof(u32);
+
+        if (qlcnic_83xx_lock_flash(adapter) != 0) {
+                kfree(p_cache);
+                return -EIO;
+        }
+
+        if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
+                ret = qlcnic_83xx_enable_flash_write(adapter);
+                if (ret) {
+                        kfree(p_cache);
+                        qlcnic_83xx_unlock_flash(adapter);
+                        return -EIO;
+                }
+        }
+
+        for (i = 0; i < count; i++) {
+                ret = qlcnic_83xx_flash_write32(adapter, offset, (u32 *)p_src);
+                if (ret) {
+                        if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
+                                ret = qlcnic_83xx_disable_flash_write(adapter);
+                                if (ret) {
+                                        kfree(p_cache);
+                                        qlcnic_83xx_unlock_flash(adapter);
+                                        return -EIO;
+                                }
+                        }
+                        kfree(p_cache);
+                        qlcnic_83xx_unlock_flash(adapter);
+                        return -EIO;
+                }
+
+                p_src = p_src + sizeof(u32);
+                offset = offset + sizeof(u32);
+        }
+
+        if (adapter->ahw->fdt.mfg_id == adapter->flash_mfg_id) {
+                ret = qlcnic_83xx_disable_flash_write(adapter);
+                if (ret) {
+                        kfree(p_cache);
+                        qlcnic_83xx_unlock_flash(adapter);
+                        return -EIO;
+                }
+        }
+
+        kfree(p_cache);
+        qlcnic_83xx_unlock_flash(adapter);
+
+        return 0;
+}
+
+static ssize_t qlcnic_83xx_sysfs_flash_write_handler(struct file *filp,
+                                                     struct kobject *kobj,
+                                                     struct bin_attribute *attr,
+                                                     char *buf, loff_t offset,
+                                                     size_t size)
+{
+        int  ret;
+        static int flash_mode;
+        unsigned long data;
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+
+        if (!buf)
+                return QL_STATUS_INVALID_PARAM;
+
+        ret = kstrtoul(buf, 16, &data);
+
+        switch (data) {
+        case QLC_83XX_FLASH_SECTOR_ERASE_CMD:
+                flash_mode = QLC_83XX_ERASE_MODE;
+                ret = qlcnic_83xx_erase_flash_sector(adapter, offset);
+                if (ret) {
+                        dev_err(&adapter->pdev->dev,
+                                "%s failed at %d\n", __func__, __LINE__);
+                        return -EIO;
+                }
+                break;
+
+        case QLC_83XX_FLASH_BULK_WRITE_CMD:
+                flash_mode = QLC_83XX_BULK_WRITE_MODE;
+                break;
+
+        case QLC_83XX_FLASH_WRITE_CMD:
+                flash_mode = QLC_83XX_WRITE_MODE;
+                break;
+        default:
+                if (flash_mode == QLC_83XX_BULK_WRITE_MODE) {
+                        ret = qlcnic_83xx_sysfs_flash_bulk_write(adapter, buf,
+                                                                 offset, size);
+                        if (ret) {
+                                dev_err(&adapter->pdev->dev,
+                                        "%s failed at %d\n",
+                                        __func__, __LINE__);
+                                return -EIO;
+                        }
+                }
+
+                if (flash_mode == QLC_83XX_WRITE_MODE) {
+                        ret = qlcnic_83xx_sysfs_flash_write(adapter, buf,
+                                                            offset, size);
+                        if (ret) {
+                                dev_err(&adapter->pdev->dev,
+                                        "%s failed at %d\n", __func__,
+                                        __LINE__);
+                                return -EIO;
+                        }
+                }
+        }
+
+        return size;
+}
+
 static struct device_attribute dev_attr_bridged_mode = {
        .attr = {.name = "bridged_mode", .mode = (S_IRUGO | S_IWUSR)},
        .show = qlcnic_show_bridged_mode,
@@ -960,6 +1196,13 @@ static struct bin_attribute bin_attr_pm_config = {
         .write = qlcnic_sysfs_write_pm_config,
 };
 
+static struct bin_attribute bin_attr_flash = {
+        .attr = {.name = "flash", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_83xx_sysfs_flash_read_handler,
+        .write = qlcnic_83xx_sysfs_flash_write_handler,
+};
+
 void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter)
 {
         struct device *dev = &adapter->pdev->dev;
@@ -1048,10 +1291,18 @@ void qlcnic_82xx_remove_sysfs(struct qlcnic_adapter *adapter)
 
 void qlcnic_83xx_add_sysfs(struct qlcnic_adapter *adapter)
 {
+        struct device *dev = &adapter->pdev->dev;
+
         qlcnic_create_diag_entries(adapter);
+
+        if (sysfs_create_bin_file(&dev->kobj, &bin_attr_flash))
+                dev_info(dev, "failed to create flash sysfs entry\n");
 }
 
 void qlcnic_83xx_remove_sysfs(struct qlcnic_adapter *adapter)
 {
+        struct device *dev = &adapter->pdev->dev;
+
         qlcnic_remove_diag_entries(adapter);
+        sysfs_remove_bin_file(&dev->kobj, &bin_attr_flash);
 }
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 8033555e53c2..87463bc701a6 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -409,7 +409,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
                                       (qdev->
                                        func << CAM_OUT_FUNC_SHIFT) |
                                         (0 << CAM_OUT_CQ_ID_SHIFT));
-                        if (qdev->ndev->features & NETIF_F_HW_VLAN_RX)
+                        if (qdev->ndev->features & NETIF_F_HW_VLAN_CTAG_RX)
                                 cam_output |= CAM_OUT_RV;
                         /* route to NIC core */
                         ql_write32(qdev, MAC_ADDR_DATA, cam_output);
@@ -1211,8 +1211,6 @@ static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)
                                     netdev_alloc_skb(qdev->ndev,
                                                      SMALL_BUFFER_SIZE);
                                 if (sbq_desc->p.skb == NULL) {
-                                        netif_err(qdev, probe, qdev->ndev,
-                                                  "Couldn't get an skb.\n");
                                         rx_ring->sbq_clean_idx = clean_idx;
                                         return;
                                 }
@@ -1508,7 +1506,7 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev,
         skb->ip_summed = CHECKSUM_UNNECESSARY;
         skb_record_rx_queue(skb, rx_ring->cq_id);
         if (vlan_id != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vlan_id);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_id);
         napi_gro_frags(napi);
 }
 
@@ -1527,8 +1525,6 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
 
         skb = netdev_alloc_skb(ndev, length);
         if (!skb) {
-                netif_err(qdev, drv, qdev->ndev,
-                          "Couldn't get an skb, need to unwind!.\n");
                 rx_ring->rx_dropped++;
                 put_page(lbq_desc->p.pg_chunk.page);
                 return;
@@ -1592,7 +1588,7 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
 
         skb_record_rx_queue(skb, rx_ring->cq_id);
         if (vlan_id != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vlan_id);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_id);
         if (skb->ip_summed == CHECKSUM_UNNECESSARY)
                 napi_gro_receive(napi, skb);
         else
@@ -1619,8 +1615,6 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
         /* Allocate new_skb and copy */
         new_skb = netdev_alloc_skb(qdev->ndev, length + NET_IP_ALIGN);
         if (new_skb == NULL) {
-                netif_err(qdev, probe, qdev->ndev,
-                          "No skb available, drop the packet.\n");
                 rx_ring->rx_dropped++;
                 return;
         }
@@ -1697,7 +1691,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
 
         skb_record_rx_queue(skb, rx_ring->cq_id);
         if (vlan_id != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vlan_id);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_id);
         if (skb->ip_summed == CHECKSUM_UNNECESSARY)
                 napi_gro_receive(&rx_ring->napi, skb);
         else
@@ -2009,7 +2003,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
         rx_ring->rx_bytes += skb->len;
         skb_record_rx_queue(skb, rx_ring->cq_id);
         if ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V) && (vlan_id != 0))
-                __vlan_hwaccel_put_tag(skb, vlan_id);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_id);
         if (skb->ip_summed == CHECKSUM_UNNECESSARY)
                 napi_gro_receive(&rx_ring->napi, skb);
         else
@@ -2307,7 +2301,7 @@ static void qlge_vlan_mode(struct net_device *ndev, netdev_features_t features)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
 
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 ql_write32(qdev, NIC_RCV_CFG, NIC_RCV_CFG_VLAN_MASK |
                                  NIC_RCV_CFG_VLAN_MATCH_AND_NON);
         } else {
@@ -2322,10 +2316,10 @@ static netdev_features_t qlge_fix_features(struct net_device *ndev,
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -2335,7 +2329,7 @@ static int qlge_set_features(struct net_device *ndev,
 {
         netdev_features_t changed = ndev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 qlge_vlan_mode(ndev, features);
 
         return 0;
@@ -2354,7 +2348,7 @@ static int __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid)
         return err;
 }
 
-static int qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
+static int qlge_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
         int status;
@@ -2385,7 +2379,7 @@ static int __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid)
         return err;
 }
 
-static int qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)
+static int qlge_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
         int status;
@@ -4693,9 +4687,9 @@ static int qlge_probe(struct pci_dev *pdev,
         SET_NETDEV_DEV(ndev, &pdev->dev);
         ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
                 NETIF_F_TSO | NETIF_F_TSO_ECN |
-                NETIF_F_HW_VLAN_TX | NETIF_F_RXCSUM;
+                NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_RXCSUM;
         ndev->features = ndev->hw_features |
-                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+                NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER;
         ndev->vlan_features = ndev->hw_features;
 
         if (test_bit(QL_DMA64, &qdev->flags))
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 5b4103db70f5..e9dc84943cfc 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -224,11 +224,14 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
                         break;
         }
 
+        if (limit < 0)
+                return -ETIMEDOUT;
+
         return ioread16(ioaddr + MMRD);
 }
 
 /* Write a word data from PHY Chip */
-static void r6040_phy_write(void __iomem *ioaddr,
+static int r6040_phy_write(void __iomem *ioaddr,
                                         int phy_addr, int reg, u16 val)
 {
         int limit = MAC_DEF_TIMEOUT;
@@ -243,6 +246,8 @@ static void r6040_phy_write(void __iomem *ioaddr,
                 if (!(cmd & MDIO_WRITE))
                         break;
         }
+
+        return (limit < 0) ? -ETIMEDOUT : 0;
 }
 
 static int r6040_mdiobus_read(struct mii_bus *bus, int phy_addr, int reg)
@@ -261,9 +266,7 @@ static int r6040_mdiobus_write(struct mii_bus *bus, int phy_addr,
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
 
-        r6040_phy_write(ioaddr, phy_addr, reg, value);
-
-        return 0;
+        return r6040_phy_write(ioaddr, phy_addr, reg, value);
 }
 
 static int r6040_mdiobus_reset(struct mii_bus *bus)
@@ -347,7 +350,6 @@ static int r6040_alloc_rxbufs(struct net_device *dev)
         do {
                 skb = netdev_alloc_skb(dev, MAX_BUF_SIZE);
                 if (!skb) {
-                        netdev_err(dev, "failed to alloc skb for rx\n");
                         rc = -ENOMEM;
                         goto err_exit;
                 }
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index b62a32484f6a..7d1fb9ad1296 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -431,7 +431,7 @@ static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb,
         cp->dev->stats.rx_bytes += skb->len;
 
         if (opts2 & RxVlanTagged)
-                __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff));
 
         napi_gro_receive(&cp->napi, skb);
 }
@@ -1438,7 +1438,7 @@ static int cp_set_features(struct net_device *dev, netdev_features_t features)
         else
                 cp->cpcmd &= ~RxChkSum;
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 cp->cpcmd |= RxVlanOn;
         else
                 cp->cpcmd &= ~RxVlanOn;
@@ -1955,14 +1955,14 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->ethtool_ops = &cp_ethtool_ops;
         dev->watchdog_timeo = TX_TIMEOUT;
 
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
 
         if (pci_using_dac)
                 dev->features |= NETIF_F_HIGHDMA;
 
         /* disabled by default until verified */
         dev->hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                 NETIF_F_HIGHDMA;
 
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 1276ac71353a..3ccedeb8aba0 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -2041,8 +2041,6 @@ keep_pkt:
 
                         netif_receive_skb (skb);
                 } else {
-                        if (net_ratelimit())
-                                netdev_warn(dev, "Memory squeeze, dropping packet\n");
                         dev->stats.rx_dropped++;
                 }
                 received++;
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index 9f2d416de750..d77d60ea8202 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -782,8 +782,6 @@ static void net_rx(struct net_device *dev)
 
                 skb = netdev_alloc_skb(dev, pkt_len + 2);
                 if (skb == NULL) {
-                        printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n",
-                                   dev->name);
                         dev->stats.rx_dropped++;
                         goto done;
                 }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 4ecbe64a758d..79c520b64fdd 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -47,7 +47,9 @@
 #define FIRMWARE_8402_1         "rtl_nic/rtl8402-1.fw"
 #define FIRMWARE_8411_1         "rtl_nic/rtl8411-1.fw"
 #define FIRMWARE_8106E_1        "rtl_nic/rtl8106e-1.fw"
-#define FIRMWARE_8168G_1        "rtl_nic/rtl8168g-1.fw"
+#define FIRMWARE_8106E_2        "rtl_nic/rtl8106e-2.fw"
+#define FIRMWARE_8168G_2        "rtl_nic/rtl8168g-2.fw"
+#define FIRMWARE_8168G_3        "rtl_nic/rtl8168g-3.fw"
 
 #ifdef RTL8169_DEBUG
 #define assert(expr) \
@@ -140,6 +142,8 @@ enum mac_version {
         RTL_GIGA_MAC_VER_39,
         RTL_GIGA_MAC_VER_40,
         RTL_GIGA_MAC_VER_41,
+        RTL_GIGA_MAC_VER_42,
+        RTL_GIGA_MAC_VER_43,
         RTL_GIGA_MAC_NONE   = 0xff,
 };
 
@@ -262,10 +266,16 @@ static const struct {
                 _R("RTL8106e",          RTL_TD_1, FIRMWARE_8106E_1,
                                                         JUMBO_1K, true),
         [RTL_GIGA_MAC_VER_40] =
-                _R("RTL8168g/8111g",    RTL_TD_1, FIRMWARE_8168G_1,
+                _R("RTL8168g/8111g",    RTL_TD_1, FIRMWARE_8168G_2,
                                                         JUMBO_9K, false),
         [RTL_GIGA_MAC_VER_41] =
                 _R("RTL8168g/8111g",    RTL_TD_1, NULL, JUMBO_9K, false),
+        [RTL_GIGA_MAC_VER_42] =
+                _R("RTL8168g/8111g",    RTL_TD_1, FIRMWARE_8168G_3,
+                                                        JUMBO_9K, false),
+        [RTL_GIGA_MAC_VER_43] =
+                _R("RTL8106e",          RTL_TD_1, FIRMWARE_8106E_2,
+                                                        JUMBO_1K, true),
 };
 #undef _R
 
@@ -329,6 +339,7 @@ enum rtl_registers {
 #define RXCFG_FIFO_SHIFT                13
                                         /* No threshold before first PCI xfer */
 #define RX_FIFO_THRESH                  (7 << RXCFG_FIFO_SHIFT)
+#define RX_EARLY_OFF                    (1 << 11)
 #define RXCFG_DMA_SHIFT                 8
                                         /* Unlimited maximum PCI burst. */
 #define RX_DMA_BURST                    (7 << RXCFG_DMA_SHIFT)
@@ -513,6 +524,7 @@ enum rtl_register_content {
         PMEnable        = (1 << 0),     /* Power Management Enable */
 
         /* Config2 register p. 25 */
+        ClkReqEn        = (1 << 7),     /* Clock Request Enable */
         MSIEnable       = (1 << 5),     /* 8169 only. Reserved in the 8168. */
         PCI_Clock_66MHz = 0x01,
         PCI_Clock_33MHz = 0x00,
@@ -533,6 +545,7 @@ enum rtl_register_content {
         Spi_en          = (1 << 3),
         LanWake         = (1 << 1),     /* LanWake enable/disable */
         PMEStatus       = (1 << 0),     /* PME status can be reset by PCI RST# */
+        ASPM_en         = (1 << 0),     /* ASPM enable */
 
         /* TBICSR p.28 */
         TBIReset        = 0x80000000,
@@ -814,7 +827,9 @@ MODULE_FIRMWARE(FIRMWARE_8168F_2);
 MODULE_FIRMWARE(FIRMWARE_8402_1);
 MODULE_FIRMWARE(FIRMWARE_8411_1);
 MODULE_FIRMWARE(FIRMWARE_8106E_1);
-MODULE_FIRMWARE(FIRMWARE_8168G_1);
+MODULE_FIRMWARE(FIRMWARE_8106E_2);
+MODULE_FIRMWARE(FIRMWARE_8168G_2);
+MODULE_FIRMWARE(FIRMWARE_8168G_3);
 
 static void rtl_lock_work(struct rtl8169_private *tp)
 {
@@ -1024,14 +1039,6 @@ static u16 r8168_phy_ocp_read(struct rtl8169_private *tp, u32 reg)
                 (RTL_R32(GPHY_OCP) & 0xffff) : ~0;
 }
 
-static void rtl_w1w0_phy_ocp(struct rtl8169_private *tp, int reg, int p, int m)
-{
-        int val;
-
-        val = r8168_phy_ocp_read(tp, reg);
-        r8168_phy_ocp_write(tp, reg, (val | p) & ~m);
-}
-
 static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)
 {
         void __iomem *ioaddr = tp->mmio_addr;
@@ -1077,6 +1084,21 @@ static int r8168g_mdio_read(struct rtl8169_private *tp, int reg)
         return r8168_phy_ocp_read(tp, tp->ocp_base + reg * 2);
 }
 
+static void mac_mcu_write(struct rtl8169_private *tp, int reg, int value)
+{
+        if (reg == 0x1f) {
+                tp->ocp_base = value << 4;
+                return;
+        }
+
+        r8168_mac_ocp_write(tp, tp->ocp_base + reg, value);
+}
+
+static int mac_mcu_read(struct rtl8169_private *tp, int reg)
+{
+        return r8168_mac_ocp_read(tp, tp->ocp_base + reg);
+}
+
 DECLARE_RTL_COND(rtl_phyar_cond)
 {
         void __iomem *ioaddr = tp->mmio_addr;
@@ -1771,16 +1793,17 @@ static void __rtl8169_set_features(struct net_device *dev,
         netdev_features_t changed = features ^ dev->features;
         void __iomem *ioaddr = tp->mmio_addr;
 
-        if (!(changed & (NETIF_F_RXALL | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX)))
+        if (!(changed & (NETIF_F_RXALL | NETIF_F_RXCSUM |
+                         NETIF_F_HW_VLAN_CTAG_RX)))
                 return;
 
-        if (changed & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX)) {
+        if (changed & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX)) {
                 if (features & NETIF_F_RXCSUM)
                         tp->cp_cmd |= RxChkSum;
                 else
                         tp->cp_cmd &= ~RxChkSum;
 
-                if (dev->features & NETIF_F_HW_VLAN_RX)
+                if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
                         tp->cp_cmd |= RxVlan;
                 else
                         tp->cp_cmd &= ~RxVlan;
@@ -1820,7 +1843,7 @@ static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb)
         u32 opts2 = le32_to_cpu(desc->opts2);
 
         if (opts2 & RxVlanTag)
-                __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff));
 }
 
 static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -2028,6 +2051,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 int mac_version;
         } mac_info[] = {
                 /* 8168G family. */
+                { 0x7cf00000, 0x50900000,       RTL_GIGA_MAC_VER_42 },
                 { 0x7cf00000, 0x4c100000,       RTL_GIGA_MAC_VER_41 },
                 { 0x7cf00000, 0x4c000000,       RTL_GIGA_MAC_VER_40 },
 
@@ -2116,6 +2140,10 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 netif_notice(tp, probe, dev,
                              "unknown MAC, using family default\n");
                 tp->mac_version = default_version;
+        } else if (tp->mac_version == RTL_GIGA_MAC_VER_42) {
+                tp->mac_version = tp->mii.supports_gmii ?
+                                  RTL_GIGA_MAC_VER_42 :
+                                  RTL_GIGA_MAC_VER_43;
         }
 }
 
@@ -2142,9 +2170,7 @@ static void rtl_writephy_batch(struct rtl8169_private *tp,
 #define PHY_DATA_OR             0x10000000
 #define PHY_DATA_AND            0x20000000
 #define PHY_BJMPN               0x30000000
-#define PHY_READ_EFUSE          0x40000000
-#define PHY_READ_MAC_BYTE       0x50000000
-#define PHY_WRITE_MAC_BYTE      0x60000000
+#define PHY_MDIO_CHG            0x40000000
 #define PHY_CLEAR_READCOUNT     0x70000000
 #define PHY_WRITE               0x80000000
 #define PHY_READCOUNT_EQ_SKIP   0x90000000
@@ -2153,7 +2179,6 @@ static void rtl_writephy_batch(struct rtl8169_private *tp,
 #define PHY_WRITE_PREVIOUS      0xc0000000
 #define PHY_SKIPN               0xd0000000
 #define PHY_DELAY_MS            0xe0000000
-#define PHY_WRITE_ERI_WORD      0xf0000000
 
 struct fw_info {
         u32     magic;
@@ -2230,7 +2255,7 @@ static bool rtl_fw_data_ok(struct rtl8169_private *tp, struct net_device *dev,
                 case PHY_READ:
                 case PHY_DATA_OR:
                 case PHY_DATA_AND:
-                case PHY_READ_EFUSE:
+                case PHY_MDIO_CHG:
                 case PHY_CLEAR_READCOUNT:
                 case PHY_WRITE:
                 case PHY_WRITE_PREVIOUS:
@@ -2261,9 +2286,6 @@ static bool rtl_fw_data_ok(struct rtl8169_private *tp, struct net_device *dev,
                         }
                         break;
 
-                case PHY_READ_MAC_BYTE:
-                case PHY_WRITE_MAC_BYTE:
-                case PHY_WRITE_ERI_WORD:
                 default:
                         netif_err(tp, ifup, tp->dev,
                                   "Invalid action 0x%08x\n", action);
@@ -2294,10 +2316,13 @@ out:
 static void rtl_phy_write_fw(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)
 {
         struct rtl_fw_phy_action *pa = &rtl_fw->phy_action;
+        struct mdio_ops org, *ops = &tp->mdio_ops;
         u32 predata, count;
         size_t index;
 
         predata = count = 0;
+        org.write = ops->write;
+        org.read = ops->read;
 
         for (index = 0; index < pa->size; ) {
                 u32 action = le32_to_cpu(pa->code[index]);
@@ -2324,8 +2349,15 @@ static void rtl_phy_write_fw(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)
                 case PHY_BJMPN:
                         index -= regno;
                         break;
-                case PHY_READ_EFUSE:
-                        predata = rtl8168d_efuse_read(tp, regno);
+                case PHY_MDIO_CHG:
+                        if (data == 0) {
+                                ops->write = org.write;
+                                ops->read = org.read;
+                        } else if (data == 1) {
+                                ops->write = mac_mcu_write;
+                                ops->read = mac_mcu_read;
+                        }
+
                         index++;
                         break;
                 case PHY_CLEAR_READCOUNT:
@@ -2361,13 +2393,13 @@ static void rtl_phy_write_fw(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)
                         index++;
                         break;
 
-                case PHY_READ_MAC_BYTE:
-                case PHY_WRITE_MAC_BYTE:
-                case PHY_WRITE_ERI_WORD:
                 default:
                         BUG();
                 }
         }
+
+        ops->write = org.write;
+        ops->read = org.read;
 }
 
 static void rtl_release_firmware(struct rtl8169_private *tp)
@@ -3368,51 +3400,68 @@ static void rtl8411_hw_phy_config(struct rtl8169_private *tp)
 
 static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)
 {
-        static const u16 mac_ocp_patch[] = {
-                0xe008, 0xe01b, 0xe01d, 0xe01f,
-                0xe021, 0xe023, 0xe025, 0xe027,
-                0x49d2, 0xf10d, 0x766c, 0x49e2,
-                0xf00a, 0x1ec0, 0x8ee1, 0xc60a,
-
-                0x77c0, 0x4870, 0x9fc0, 0x1ea0,
-                0xc707, 0x8ee1, 0x9d6c, 0xc603,
-                0xbe00, 0xb416, 0x0076, 0xe86c,
-                0xc602, 0xbe00, 0x0000, 0xc602,
-
-                0xbe00, 0x0000, 0xc602, 0xbe00,
-                0x0000, 0xc602, 0xbe00, 0x0000,
-                0xc602, 0xbe00, 0x0000, 0xc602,
-                0xbe00, 0x0000, 0xc602, 0xbe00,
-
-                0x0000, 0x0000, 0x0000, 0x0000
-        };
-        u32 i;
+        rtl_apply_firmware(tp);
 
-        /* Patch code for GPHY reset */
-        for (i = 0; i < ARRAY_SIZE(mac_ocp_patch); i++)
-                r8168_mac_ocp_write(tp, 0xf800 + 2*i, mac_ocp_patch[i]);
-        r8168_mac_ocp_write(tp, 0xfc26, 0x8000);
-        r8168_mac_ocp_write(tp, 0xfc28, 0x0075);
+        rtl_writephy(tp, 0x1f, 0x0a46);
+        if (rtl_readphy(tp, 0x10) & 0x0100) {
+                rtl_writephy(tp, 0x1f, 0x0bcc);
+                rtl_w1w0_phy(tp, 0x12, 0x0000, 0x8000);
+        } else {
+                rtl_writephy(tp, 0x1f, 0x0bcc);
+                rtl_w1w0_phy(tp, 0x12, 0x8000, 0x0000);
+        }
 
-        rtl_apply_firmware(tp);
+        rtl_writephy(tp, 0x1f, 0x0a46);
+        if (rtl_readphy(tp, 0x13) & 0x0100) {
+                rtl_writephy(tp, 0x1f, 0x0c41);
+                rtl_w1w0_phy(tp, 0x15, 0x0002, 0x0000);
+        } else {
+                rtl_writephy(tp, 0x1f, 0x0c41);
+                rtl_w1w0_phy(tp, 0x15, 0x0000, 0x0002);
+        }
 
-        if (r8168_phy_ocp_read(tp, 0xa460) & 0x0100)
-                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x8000);
-        else
-                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x8000, 0x0000);
+        /* Enable PHY auto speed down */
+        rtl_writephy(tp, 0x1f, 0x0a44);
+        rtl_w1w0_phy(tp, 0x11, 0x000c, 0x0000);
+
+        rtl_writephy(tp, 0x1f, 0x0bcc);
+        rtl_w1w0_phy(tp, 0x14, 0x0100, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0a44);
+        rtl_w1w0_phy(tp, 0x11, 0x00c0, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0a43);
+        rtl_writephy(tp, 0x13, 0x8084);
+        rtl_w1w0_phy(tp, 0x14, 0x0000, 0x6000);
+        rtl_w1w0_phy(tp, 0x10, 0x1003, 0x0000);
+
+        /* EEE auto-fallback function */
+        rtl_writephy(tp, 0x1f, 0x0a4b);
+        rtl_w1w0_phy(tp, 0x11, 0x0004, 0x0000);
+
+        /* Enable UC LPF tune function */
+        rtl_writephy(tp, 0x1f, 0x0a43);
+        rtl_writephy(tp, 0x13, 0x8012);
+        rtl_w1w0_phy(tp, 0x14, 0x8000, 0x0000);
 
-        if (r8168_phy_ocp_read(tp, 0xa466) & 0x0100)
-                rtl_w1w0_phy_ocp(tp, 0xc41a, 0x0002, 0x0000);
-        else
-                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x0002);
+        rtl_writephy(tp, 0x1f, 0x0c42);
+        rtl_w1w0_phy(tp, 0x11, 0x4000, 0x2000);
 
-        rtl_w1w0_phy_ocp(tp, 0xa442, 0x000c, 0x0000);
-        rtl_w1w0_phy_ocp(tp, 0xa4b2, 0x0004, 0x0000);
+        /* Improve SWR Efficiency */
+        rtl_writephy(tp, 0x1f, 0x0bcd);
+        rtl_writephy(tp, 0x14, 0x5065);
+        rtl_writephy(tp, 0x14, 0xd065);
+        rtl_writephy(tp, 0x1f, 0x0bc8);
+        rtl_writephy(tp, 0x11, 0x5655);
+        rtl_writephy(tp, 0x1f, 0x0bcd);
+        rtl_writephy(tp, 0x14, 0x1065);
+        rtl_writephy(tp, 0x14, 0x9065);
+        rtl_writephy(tp, 0x14, 0x1065);
 
-        r8168_phy_ocp_write(tp, 0xa436, 0x8012);
-        rtl_w1w0_phy_ocp(tp, 0xa438, 0x8000, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0000);
+}
 
-        rtl_w1w0_phy_ocp(tp, 0xc422, 0x4000, 0x2000);
+static void rtl8168g_2_hw_phy_config(struct rtl8169_private *tp)
+{
+        rtl_apply_firmware(tp);
 }
 
 static void rtl8102e_hw_phy_config(struct rtl8169_private *tp)
@@ -3600,6 +3649,10 @@ static void rtl_hw_phy_config(struct net_device *dev)
         case RTL_GIGA_MAC_VER_40:
                 rtl8168g_1_hw_phy_config(tp);
                 break;
+        case RTL_GIGA_MAC_VER_42:
+        case RTL_GIGA_MAC_VER_43:
+                rtl8168g_2_hw_phy_config(tp);
+                break;
 
         case RTL_GIGA_MAC_VER_41:
         default:
@@ -3808,6 +3861,8 @@ static void rtl_init_mdio_ops(struct rtl8169_private *tp)
                 break;
         case RTL_GIGA_MAC_VER_40:
         case RTL_GIGA_MAC_VER_41:
+        case RTL_GIGA_MAC_VER_42:
+        case RTL_GIGA_MAC_VER_43:
                 ops->write      = r8168g_mdio_write;
                 ops->read       = r8168g_mdio_read;
                 break;
@@ -3859,6 +3914,8 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_39:
         case RTL_GIGA_MAC_VER_40:
         case RTL_GIGA_MAC_VER_41:
+        case RTL_GIGA_MAC_VER_42:
+        case RTL_GIGA_MAC_VER_43:
                 RTL_W32(RxConfig, RTL_R32(RxConfig) |
                         AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
                 break;
@@ -3966,6 +4023,8 @@ static void r8168_phy_power_down(struct rtl8169_private *tp)
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_32:
         case RTL_GIGA_MAC_VER_33:
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
                 rtl_writephy(tp, MII_BMCR, BMCR_ANENABLE | BMCR_PDOWN);
                 break;
 
@@ -4027,6 +4086,11 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_33:
                 RTL_W8(PMCH, RTL_R8(PMCH) & ~0x80);
                 break;
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
+                rtl_w1w0_eri(tp, 0x1a8, ERIAR_MASK_1111, 0x00000000,
+                             0xfc000000, ERIAR_EXGMAC);
+                break;
         }
 }
 
@@ -4044,6 +4108,11 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_33:
                 RTL_W8(PMCH, RTL_R8(PMCH) | 0x80);
                 break;
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
+                rtl_w1w0_eri(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000,
+                             0x00000000, ERIAR_EXGMAC);
+                break;
         }
 
         r8168_phy_power_up(tp);
@@ -4080,6 +4149,7 @@ static void rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_30:
         case RTL_GIGA_MAC_VER_37:
         case RTL_GIGA_MAC_VER_39:
+        case RTL_GIGA_MAC_VER_43:
                 ops->down       = r810x_pll_power_down;
                 ops->up         = r810x_pll_power_up;
                 break;
@@ -4107,6 +4177,7 @@ static void rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_38:
         case RTL_GIGA_MAC_VER_40:
         case RTL_GIGA_MAC_VER_41:
+        case RTL_GIGA_MAC_VER_42:
                 ops->down       = r8168_pll_power_down;
                 ops->up         = r8168_pll_power_up;
                 break;
@@ -4149,6 +4220,12 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_34:
                 RTL_W32(RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);
                 break;
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
+        case RTL_GIGA_MAC_VER_42:
+        case RTL_GIGA_MAC_VER_43:
+                RTL_W32(RxConfig, RX128_INT_EN | RX_DMA_BURST | RX_EARLY_OFF);
+                break;
         default:
                 RTL_W32(RxConfig, RX128_INT_EN | RX_DMA_BURST);
                 break;
@@ -4305,6 +4382,8 @@ static void rtl_init_jumbo_ops(struct rtl8169_private *tp)
          */
         case RTL_GIGA_MAC_VER_40:
         case RTL_GIGA_MAC_VER_41:
+        case RTL_GIGA_MAC_VER_42:
+        case RTL_GIGA_MAC_VER_43:
         default:
                 ops->disable    = NULL;
                 ops->enable     = NULL;
@@ -4412,6 +4491,8 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
                    tp->mac_version == RTL_GIGA_MAC_VER_37 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_40 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_41 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_42 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_43 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_38) {
                 RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);
                 rtl_udelay_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666);
@@ -5127,6 +5208,8 @@ static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)
         void __iomem *ioaddr = tp->mmio_addr;
         struct pci_dev *pdev = tp->pci_dev;
 
+        RTL_W32(TxConfig, RTL_R32(TxConfig) | TXCFG_AUTO_FIFO);
+
         rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x080002, ERIAR_EXGMAC);
         rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38, ERIAR_EXGMAC);
         rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48, ERIAR_EXGMAC);
@@ -5138,6 +5221,7 @@ static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)
 
         rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
         rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0x2f8, ERIAR_MASK_0011, 0x1d8f, ERIAR_EXGMAC);
 
         RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
         RTL_W32(MISC, RTL_R32(MISC) & ~RXDV_GATED_EN);
@@ -5149,7 +5233,26 @@ static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)
         /* Adjust EEE LED frequency */
         RTL_W8(EEE_LED, RTL_R8(EEE_LED) & ~0x07);
 
-        rtl_w1w0_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x02, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, 0x1000, ERIAR_EXGMAC);
+}
+
+static void rtl_hw_start_8168g_2(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        static const struct ephy_info e_info_8168g_2[] = {
+                { 0x00, 0x0000, 0x0008 },
+                { 0x0c, 0x3df0, 0x0200 },
+                { 0x19, 0xffff, 0xfc00 },
+                { 0x1e, 0xffff, 0x20eb }
+        };
+
+        rtl_hw_start_8168g_1(tp);
+
+        /* disable aspm and clock request before access ephy */
+        RTL_W8(Config2, RTL_R8(Config2) & ~ClkReqEn);
+        RTL_W8(Config5, RTL_R8(Config5) & ~ASPM_en);
+        rtl_ephy_init(tp, e_info_8168g_2, ARRAY_SIZE(e_info_8168g_2));
 }
 
 static void rtl_hw_start_8168(struct net_device *dev)
@@ -5177,10 +5280,7 @@ static void rtl_hw_start_8168(struct net_device *dev)
 
         rtl_set_rx_tx_desc_registers(tp, ioaddr);
 
-        rtl_set_rx_mode(dev);
-
-        RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) |
-                (InterFrameGap << TxInterFrameGapShift));
+        rtl_set_rx_tx_config_registers(tp);
 
         RTL_R8(IntrMask);
 
@@ -5257,6 +5357,9 @@ static void rtl_hw_start_8168(struct net_device *dev)
         case RTL_GIGA_MAC_VER_41:
                 rtl_hw_start_8168g_1(tp);
                 break;
+        case RTL_GIGA_MAC_VER_42:
+                rtl_hw_start_8168g_2(tp);
+                break;
 
         default:
                 printk(KERN_ERR PFX "%s: unknown chipset (mac_version = %d).\n",
@@ -5264,9 +5367,11 @@ static void rtl_hw_start_8168(struct net_device *dev)
                 break;
         }
 
+        RTL_W8(Cfg9346, Cfg9346_Lock);
+
         RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
 
-        RTL_W8(Cfg9346, Cfg9346_Lock);
+        rtl_set_rx_mode(dev);
 
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
 }
@@ -5424,6 +5529,17 @@ static void rtl_hw_start_8101(struct net_device *dev)
 
         RTL_W8(Cfg9346, Cfg9346_Unlock);
 
+        RTL_W8(MaxTxPacketSize, TxPacketMax);
+
+        rtl_set_rx_max_size(ioaddr, rx_buf_sz);
+
+        tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK;
+        RTL_W16(CPlusCmd, tp->cp_cmd);
+
+        rtl_set_rx_tx_desc_registers(tp, ioaddr);
+
+        rtl_set_rx_tx_config_registers(tp);
+
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_07:
                 rtl_hw_start_8102e_1(tp);
@@ -5451,28 +5567,21 @@ static void rtl_hw_start_8101(struct net_device *dev)
         case RTL_GIGA_MAC_VER_39:
                 rtl_hw_start_8106(tp);
                 break;
+        case RTL_GIGA_MAC_VER_43:
+                rtl_hw_start_8168g_2(tp);
+                break;
         }
 
         RTL_W8(Cfg9346, Cfg9346_Lock);
 
-        RTL_W8(MaxTxPacketSize, TxPacketMax);
-
-        rtl_set_rx_max_size(ioaddr, rx_buf_sz);
-
-        tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK;
-        RTL_W16(CPlusCmd, tp->cp_cmd);
-
         RTL_W16(IntrMitigate, 0x0000);
 
-        rtl_set_rx_tx_desc_registers(tp, ioaddr);
-
         RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
-        rtl_set_rx_tx_config_registers(tp);
-
-        RTL_R8(IntrMask);
 
         rtl_set_rx_mode(dev);
 
+        RTL_R8(IntrMask);
+
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xf000);
 }
 
@@ -5787,6 +5896,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
                 goto err_stop_0;
         }
 
+        /* 8168evl does not automatically pad to minimum length. */
+        if (unlikely(tp->mac_version == RTL_GIGA_MAC_VER_34 &&
+                     skb->len < ETH_ZLEN)) {
+                if (skb_padto(skb, ETH_ZLEN))
+                        goto err_update_stats;
+                skb_put(skb, ETH_ZLEN - skb->len);
+        }
+
         if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
                 goto err_stop_0;
 
@@ -5858,6 +5975,7 @@ err_dma_1:
         rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
 err_dma_0:
         dev_kfree_skb(skb);
+err_update_stats:
         dev->stats.tx_dropped++;
         return NETDEV_TX_OK;
 
@@ -6744,6 +6862,8 @@ static void rtl_hw_initialize(struct rtl8169_private *tp)
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_40:
         case RTL_GIGA_MAC_VER_41:
+        case RTL_GIGA_MAC_VER_42:
+        case RTL_GIGA_MAC_VER_43:
                 rtl_hw_init_8168g(tp);
                 break;
 
@@ -6926,16 +7046,17 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* don't enable SG, IP_CSUM and TSO by default - it might not work
          * properly for all devices */
         dev->features |= NETIF_F_RXCSUM |
-                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
 
         dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-                NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX |
+                NETIF_F_HW_VLAN_CTAG_RX;
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                 NETIF_F_HIGHDMA;
 
         if (tp->mac_version == RTL_GIGA_MAC_VER_05)
                 /* 8110SCd requires hardware Rx VLAN - disallow toggling */
-                dev->hw_features &= ~NETIF_F_HW_VLAN_RX;
+                dev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX;
 
         dev->hw_features |= NETIF_F_RXALL;
         dev->hw_features |= NETIF_F_RXFCS;
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
index 24c2305d7948..bed9841d728c 100644
--- a/drivers/net/ethernet/renesas/Kconfig
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -8,7 +8,8 @@ config SH_ETH
                 (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
                  CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
                  CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7734 || \
-                 CPU_SUBTYPE_SH7757 || ARCH_R8A7740 || ARCH_R8A7779)
+                 CPU_SUBTYPE_SH7757 || ARCH_R8A7740 || \
+                 ARCH_R8A7778 || ARCH_R8A7779)
         select CRC32
         select NET_CORE
         select MII
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6ed333fe5c04..33dc6f2418f2 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2,7 +2,8 @@
  *  SuperH Ethernet device driver
  *
  *  Copyright (C) 2006-2012 Nobuhiro Iwamatsu
- *  Copyright (C) 2008-2012 Renesas Solutions Corp.
+ *  Copyright (C) 2008-2013 Renesas Solutions Corp.
+ *  Copyright (C) 2013 Cogent Embedded, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms and conditions of the GNU General Public License,
@@ -49,6 +50,269 @@
                 NETIF_MSG_RX_ERR| \
                 NETIF_MSG_TX_ERR)
 
+static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [EDSR]          = 0x0000,
+        [EDMR]          = 0x0400,
+        [EDTRR]         = 0x0408,
+        [EDRRR]         = 0x0410,
+        [EESR]          = 0x0428,
+        [EESIPR]        = 0x0430,
+        [TDLAR]         = 0x0010,
+        [TDFAR]         = 0x0014,
+        [TDFXR]         = 0x0018,
+        [TDFFR]         = 0x001c,
+        [RDLAR]         = 0x0030,
+        [RDFAR]         = 0x0034,
+        [RDFXR]         = 0x0038,
+        [RDFFR]         = 0x003c,
+        [TRSCER]        = 0x0438,
+        [RMFCR]         = 0x0440,
+        [TFTR]          = 0x0448,
+        [FDR]           = 0x0450,
+        [RMCR]          = 0x0458,
+        [RPADIR]        = 0x0460,
+        [FCFTR]         = 0x0468,
+        [CSMR]          = 0x04E4,
+
+        [ECMR]          = 0x0500,
+        [ECSR]          = 0x0510,
+        [ECSIPR]        = 0x0518,
+        [PIR]           = 0x0520,
+        [PSR]           = 0x0528,
+        [PIPR]          = 0x052c,
+        [RFLR]          = 0x0508,
+        [APR]           = 0x0554,
+        [MPR]           = 0x0558,
+        [PFTCR]         = 0x055c,
+        [PFRCR]         = 0x0560,
+        [TPAUSER]       = 0x0564,
+        [GECMR]         = 0x05b0,
+        [BCULR]         = 0x05b4,
+        [MAHR]          = 0x05c0,
+        [MALR]          = 0x05c8,
+        [TROCR]         = 0x0700,
+        [CDCR]          = 0x0708,
+        [LCCR]          = 0x0710,
+        [CEFCR]         = 0x0740,
+        [FRECR]         = 0x0748,
+        [TSFRCR]        = 0x0750,
+        [TLFRCR]        = 0x0758,
+        [RFCR]          = 0x0760,
+        [CERCR]         = 0x0768,
+        [CEECR]         = 0x0770,
+        [MAFCR]         = 0x0778,
+        [RMII_MII]      = 0x0790,
+
+        [ARSTR]         = 0x0000,
+        [TSU_CTRST]     = 0x0004,
+        [TSU_FWEN0]     = 0x0010,
+        [TSU_FWEN1]     = 0x0014,
+        [TSU_FCM]       = 0x0018,
+        [TSU_BSYSL0]    = 0x0020,
+        [TSU_BSYSL1]    = 0x0024,
+        [TSU_PRISL0]    = 0x0028,
+        [TSU_PRISL1]    = 0x002c,
+        [TSU_FWSL0]     = 0x0030,
+        [TSU_FWSL1]     = 0x0034,
+        [TSU_FWSLC]     = 0x0038,
+        [TSU_QTAG0]     = 0x0040,
+        [TSU_QTAG1]     = 0x0044,
+        [TSU_FWSR]      = 0x0050,
+        [TSU_FWINMK]    = 0x0054,
+        [TSU_ADQT0]     = 0x0048,
+        [TSU_ADQT1]     = 0x004c,
+        [TSU_VTAG0]     = 0x0058,
+        [TSU_VTAG1]     = 0x005c,
+        [TSU_ADSBSY]    = 0x0060,
+        [TSU_TEN]       = 0x0064,
+        [TSU_POST1]     = 0x0070,
+        [TSU_POST2]     = 0x0074,
+        [TSU_POST3]     = 0x0078,
+        [TSU_POST4]     = 0x007c,
+        [TSU_ADRH0]     = 0x0100,
+        [TSU_ADRL0]     = 0x0104,
+        [TSU_ADRH31]    = 0x01f8,
+        [TSU_ADRL31]    = 0x01fc,
+
+        [TXNLCR0]       = 0x0080,
+        [TXALCR0]       = 0x0084,
+        [RXNLCR0]       = 0x0088,
+        [RXALCR0]       = 0x008c,
+        [FWNLCR0]       = 0x0090,
+        [FWALCR0]       = 0x0094,
+        [TXNLCR1]       = 0x00a0,
+        [TXALCR1]       = 0x00a0,
+        [RXNLCR1]       = 0x00a8,
+        [RXALCR1]       = 0x00ac,
+        [FWNLCR1]       = 0x00b0,
+        [FWALCR1]       = 0x00b4,
+};
+
+static const u16 sh_eth_offset_fast_rcar[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [ECMR]          = 0x0300,
+        [RFLR]          = 0x0308,
+        [ECSR]          = 0x0310,
+        [ECSIPR]        = 0x0318,
+        [PIR]           = 0x0320,
+        [PSR]           = 0x0328,
+        [RDMLR]         = 0x0340,
+        [IPGR]          = 0x0350,
+        [APR]           = 0x0354,
+        [MPR]           = 0x0358,
+        [RFCF]          = 0x0360,
+        [TPAUSER]       = 0x0364,
+        [TPAUSECR]      = 0x0368,
+        [MAHR]          = 0x03c0,
+        [MALR]          = 0x03c8,
+        [TROCR]         = 0x03d0,
+        [CDCR]          = 0x03d4,
+        [LCCR]          = 0x03d8,
+        [CNDCR]         = 0x03dc,
+        [CEFCR]         = 0x03e4,
+        [FRECR]         = 0x03e8,
+        [TSFRCR]        = 0x03ec,
+        [TLFRCR]        = 0x03f0,
+        [RFCR]          = 0x03f4,
+        [MAFCR]         = 0x03f8,
+
+        [EDMR]          = 0x0200,
+        [EDTRR]         = 0x0208,
+        [EDRRR]         = 0x0210,
+        [TDLAR]         = 0x0218,
+        [RDLAR]         = 0x0220,
+        [EESR]          = 0x0228,
+        [EESIPR]        = 0x0230,
+        [TRSCER]        = 0x0238,
+        [RMFCR]         = 0x0240,
+        [TFTR]          = 0x0248,
+        [FDR]           = 0x0250,
+        [RMCR]          = 0x0258,
+        [TFUCR]         = 0x0264,
+        [RFOCR]         = 0x0268,
+        [FCFTR]         = 0x0270,
+        [TRIMD]         = 0x027c,
+};
+
+static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [ECMR]          = 0x0100,
+        [RFLR]          = 0x0108,
+        [ECSR]          = 0x0110,
+        [ECSIPR]        = 0x0118,
+        [PIR]           = 0x0120,
+        [PSR]           = 0x0128,
+        [RDMLR]         = 0x0140,
+        [IPGR]          = 0x0150,
+        [APR]           = 0x0154,
+        [MPR]           = 0x0158,
+        [TPAUSER]       = 0x0164,
+        [RFCF]          = 0x0160,
+        [TPAUSECR]      = 0x0168,
+        [BCFRR]         = 0x016c,
+        [MAHR]          = 0x01c0,
+        [MALR]          = 0x01c8,
+        [TROCR]         = 0x01d0,
+        [CDCR]          = 0x01d4,
+        [LCCR]          = 0x01d8,
+        [CNDCR]         = 0x01dc,
+        [CEFCR]         = 0x01e4,
+        [FRECR]         = 0x01e8,
+        [TSFRCR]        = 0x01ec,
+        [TLFRCR]        = 0x01f0,
+        [RFCR]          = 0x01f4,
+        [MAFCR]         = 0x01f8,
+        [RTRATE]        = 0x01fc,
+
+        [EDMR]          = 0x0000,
+        [EDTRR]         = 0x0008,
+        [EDRRR]         = 0x0010,
+        [TDLAR]         = 0x0018,
+        [RDLAR]         = 0x0020,
+        [EESR]          = 0x0028,
+        [EESIPR]        = 0x0030,
+        [TRSCER]        = 0x0038,
+        [RMFCR]         = 0x0040,
+        [TFTR]          = 0x0048,
+        [FDR]           = 0x0050,
+        [RMCR]          = 0x0058,
+        [TFUCR]         = 0x0064,
+        [RFOCR]         = 0x0068,
+        [FCFTR]         = 0x0070,
+        [RPADIR]        = 0x0078,
+        [TRIMD]         = 0x007c,
+        [RBWAR]         = 0x00c8,
+        [RDFAR]         = 0x00cc,
+        [TBRAR]         = 0x00d4,
+        [TDFAR]         = 0x00d8,
+};
+
+static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [ECMR]          = 0x0160,
+        [ECSR]          = 0x0164,
+        [ECSIPR]        = 0x0168,
+        [PIR]           = 0x016c,
+        [MAHR]          = 0x0170,
+        [MALR]          = 0x0174,
+        [RFLR]          = 0x0178,
+        [PSR]           = 0x017c,
+        [TROCR]         = 0x0180,
+        [CDCR]          = 0x0184,
+        [LCCR]          = 0x0188,
+        [CNDCR]         = 0x018c,
+        [CEFCR]         = 0x0194,
+        [FRECR]         = 0x0198,
+        [TSFRCR]        = 0x019c,
+        [TLFRCR]        = 0x01a0,
+        [RFCR]          = 0x01a4,
+        [MAFCR]         = 0x01a8,
+        [IPGR]          = 0x01b4,
+        [APR]           = 0x01b8,
+        [MPR]           = 0x01bc,
+        [TPAUSER]       = 0x01c4,
+        [BCFR]          = 0x01cc,
+
+        [ARSTR]         = 0x0000,
+        [TSU_CTRST]     = 0x0004,
+        [TSU_FWEN0]     = 0x0010,
+        [TSU_FWEN1]     = 0x0014,
+        [TSU_FCM]       = 0x0018,
+        [TSU_BSYSL0]    = 0x0020,
+        [TSU_BSYSL1]    = 0x0024,
+        [TSU_PRISL0]    = 0x0028,
+        [TSU_PRISL1]    = 0x002c,
+        [TSU_FWSL0]     = 0x0030,
+        [TSU_FWSL1]     = 0x0034,
+        [TSU_FWSLC]     = 0x0038,
+        [TSU_QTAGM0]    = 0x0040,
+        [TSU_QTAGM1]    = 0x0044,
+        [TSU_ADQT0]     = 0x0048,
+        [TSU_ADQT1]     = 0x004c,
+        [TSU_FWSR]      = 0x0050,
+        [TSU_FWINMK]    = 0x0054,
+        [TSU_ADSBSY]    = 0x0060,
+        [TSU_TEN]       = 0x0064,
+        [TSU_POST1]     = 0x0070,
+        [TSU_POST2]     = 0x0074,
+        [TSU_POST3]     = 0x0078,
+        [TSU_POST4]     = 0x007c,
+
+        [TXNLCR0]       = 0x0080,
+        [TXALCR0]       = 0x0084,
+        [RXNLCR0]       = 0x0088,
+        [RXALCR0]       = 0x008c,
+        [FWNLCR0]       = 0x0090,
+        [FWALCR0]       = 0x0094,
+        [TXNLCR1]       = 0x00a0,
+        [TXALCR1]       = 0x00a0,
+        [RXNLCR1]       = 0x00a8,
+        [RXALCR1]       = 0x00ac,
+        [FWNLCR1]       = 0x00b0,
+        [FWALCR1]       = 0x00b4,
+
+        [TSU_ADRH0]     = 0x0100,
+        [TSU_ADRL0]     = 0x0104,
+        [TSU_ADRL31]    = 0x01fc,
+};
+
 #if defined(CONFIG_CPU_SUBTYPE_SH7734) || \
         defined(CONFIG_CPU_SUBTYPE_SH7763) || \
         defined(CONFIG_ARCH_R8A7740)
@@ -78,7 +342,7 @@ static void sh_eth_select_mii(struct net_device *ndev)
 #endif
 
 /* There is CPU dependent code */
-#if defined(CONFIG_CPU_SUBTYPE_SH7724) || defined(CONFIG_ARCH_R8A7779)
+#if defined(CONFIG_ARCH_R8A7778) || defined(CONFIG_ARCH_R8A7779)
 #define SH_ETH_RESET_DEFAULT    1
 static void sh_eth_set_duplex(struct net_device *ndev)
 {
@@ -93,18 +357,60 @@ static void sh_eth_set_duplex(struct net_device *ndev)
 static void sh_eth_set_rate(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned int bits = ECMR_RTM;
 
-#if defined(CONFIG_ARCH_R8A7779)
-        bits |= ECMR_ELB;
-#endif
+        switch (mdp->speed) {
+        case 10: /* 10BASE */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_ELB, ECMR);
+                break;
+        case 100:/* 100BASE */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_ELB, ECMR);
+                break;
+        default:
+                break;
+        }
+}
+
+/* R8A7778/9 */
+static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
+        .set_duplex     = sh_eth_set_duplex,
+        .set_rate       = sh_eth_set_rate,
+
+        .ecsr_value     = ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD,
+        .ecsipr_value   = ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | ECSIPR_ICDIP,
+        .eesipr_value   = 0x01ff009f,
+
+        .tx_check       = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO,
+        .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE |
+                          EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI,
+        .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE,
+
+        .apr            = 1,
+        .mpr            = 1,
+        .tpauser        = 1,
+        .hw_swap        = 1,
+};
+#elif defined(CONFIG_CPU_SUBTYPE_SH7724)
+#define SH_ETH_RESET_DEFAULT    1
+static void sh_eth_set_duplex(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        if (mdp->duplex) /* Full */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
+        else            /* Half */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
+}
+
+static void sh_eth_set_rate(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
 
         switch (mdp->speed) {
         case 10: /* 10BASE */
-                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~bits, ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_RTM, ECMR);
                 break;
         case 100:/* 100BASE */
-                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | bits, ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_RTM, ECMR);
                 break;
         default:
                 break;
@@ -592,7 +898,7 @@ static int sh_eth_check_reset(struct net_device *ndev)
                 cnt--;
         }
         if (cnt < 0) {
-                printk(KERN_ERR "Device reset fail\n");
+                pr_err("Device reset fail\n");
                 ret = -ETIMEDOUT;
         }
         return ret;
@@ -908,11 +1214,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
         /* Allocate all Rx descriptors. */
         rx_ringsize = sizeof(struct sh_eth_rxdesc) * mdp->num_rx_ring;
         mdp->rx_ring = dma_alloc_coherent(NULL, rx_ringsize, &mdp->rx_desc_dma,
-                        GFP_KERNEL);
-
+                                          GFP_KERNEL);
         if (!mdp->rx_ring) {
-                dev_err(&ndev->dev, "Cannot allocate Rx Ring (size %d bytes)\n",
-                        rx_ringsize);
                 ret = -ENOMEM;
                 goto desc_ring_free;
         }
@@ -922,10 +1225,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
         /* Allocate all Tx descriptors. */
         tx_ringsize = sizeof(struct sh_eth_txdesc) * mdp->num_tx_ring;
         mdp->tx_ring = dma_alloc_coherent(NULL, tx_ringsize, &mdp->tx_desc_dma,
-                        GFP_KERNEL);
+                                          GFP_KERNEL);
         if (!mdp->tx_ring) {
-                dev_err(&ndev->dev, "Cannot allocate Tx Ring (size %d bytes)\n",
-                        tx_ringsize);
                 ret = -ENOMEM;
                 goto desc_ring_free;
         }
@@ -2147,7 +2448,8 @@ static int sh_eth_get_vtag_index(struct sh_eth_private *mdp)
                 return TSU_VTAG1;
 }
 
-static int sh_eth_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
+static int sh_eth_vlan_rx_add_vid(struct net_device *ndev,
+                                  __be16 proto, u16 vid)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
         int vtag_reg_index = sh_eth_get_vtag_index(mdp);
@@ -2177,7 +2479,8 @@ static int sh_eth_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
         return 0;
 }
 
-static int sh_eth_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)
+static int sh_eth_vlan_rx_kill_vid(struct net_device *ndev,
+                                   __be16 proto, u16 vid)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
         int vtag_reg_index = sh_eth_get_vtag_index(mdp);
@@ -2228,7 +2531,6 @@ static void sh_eth_tsu_init(struct sh_eth_private *mdp)
 /* MDIO bus release function */
 static int sh_mdio_release(struct net_device *ndev)
 {
-        struct sh_eth_private *mdp = netdev_priv(ndev);
         struct mii_bus *bus = dev_get_drvdata(&ndev->dev);
 
         /* unregister mdio bus */
@@ -2237,15 +2539,9 @@ static int sh_mdio_release(struct net_device *ndev)
         /* remove mdio bus info from net_device */
         dev_set_drvdata(&ndev->dev, NULL);
 
-        /* free interrupts memory */
-        kfree(bus->irq);
-
         /* free bitbang info */
         free_mdio_bitbang(bus);
 
-        /* free bitbang memory */
-        kfree(mdp->bitbang);
-
         return 0;
 }
 
@@ -2258,7 +2554,8 @@ static int sh_mdio_init(struct net_device *ndev, int id,
         struct sh_eth_private *mdp = netdev_priv(ndev);
 
         /* create bit control struct for PHY */
-        bitbang = kzalloc(sizeof(struct bb_info), GFP_KERNEL);
+        bitbang = devm_kzalloc(&ndev->dev, sizeof(struct bb_info),
+                               GFP_KERNEL);
         if (!bitbang) {
                 ret = -ENOMEM;
                 goto out;
@@ -2267,18 +2564,17 @@ static int sh_mdio_init(struct net_device *ndev, int id,
         /* bitbang init */
         bitbang->addr = mdp->addr + mdp->reg_offset[PIR];
         bitbang->set_gate = pd->set_mdio_gate;
-        bitbang->mdi_msk = 0x08;
-        bitbang->mdo_msk = 0x04;
-        bitbang->mmd_msk = 0x02;/* MMD */
-        bitbang->mdc_msk = 0x01;
+        bitbang->mdi_msk = PIR_MDI;
+        bitbang->mdo_msk = PIR_MDO;
+        bitbang->mmd_msk = PIR_MMD;
+        bitbang->mdc_msk = PIR_MDC;
         bitbang->ctrl.ops = &bb_ops;
 
         /* MII controller setting */
-        mdp->bitbang = bitbang;
         mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl);
         if (!mdp->mii_bus) {
                 ret = -ENOMEM;
-                goto out_free_bitbang;
+                goto out;
         }
 
         /* Hook up MII support for ethtool */
@@ -2288,7 +2584,9 @@ static int sh_mdio_init(struct net_device *ndev, int id,
                 mdp->pdev->name, id);
 
         /* PHY IRQ */
-        mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
+        mdp->mii_bus->irq = devm_kzalloc(&ndev->dev,
+                                         sizeof(int) * PHY_MAX_ADDR,
+                                         GFP_KERNEL);
         if (!mdp->mii_bus->irq) {
                 ret = -ENOMEM;
                 goto out_free_bus;
@@ -2300,21 +2598,15 @@ static int sh_mdio_init(struct net_device *ndev, int id,
         /* register mdio bus */
         ret = mdiobus_register(mdp->mii_bus);
         if (ret)
-                goto out_free_irq;
+                goto out_free_bus;
 
         dev_set_drvdata(&ndev->dev, mdp->mii_bus);
 
         return 0;
 
-out_free_irq:
-        kfree(mdp->mii_bus->irq);
-
 out_free_bus:
         free_mdio_bitbang(mdp->mii_bus);
 
-out_free_bitbang:
-        kfree(bitbang);
-
 out:
         return ret;
 }
@@ -2327,6 +2619,9 @@ static const u16 *sh_eth_get_register_offset(int register_type)
         case SH_ETH_REG_GIGABIT:
                 reg_offset = sh_eth_offset_gigabit;
                 break;
+        case SH_ETH_REG_FAST_RCAR:
+                reg_offset = sh_eth_offset_fast_rcar;
+                break;
         case SH_ETH_REG_FAST_SH4:
                 reg_offset = sh_eth_offset_fast_sh4;
                 break;
@@ -2334,7 +2629,7 @@ static const u16 *sh_eth_get_register_offset(int register_type)
                 reg_offset = sh_eth_offset_fast_sh3_sh2;
                 break;
         default:
-                printk(KERN_ERR "Unknown register type (%d)\n", register_type);
+                pr_err("Unknown register type (%d)\n", register_type);
                 break;
         }
 
@@ -2364,7 +2659,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         struct resource *res;
         struct net_device *ndev = NULL;
         struct sh_eth_private *mdp = NULL;
-        struct sh_eth_plat_data *pd;
+        struct sh_eth_plat_data *pd = pdev->dev.platform_data;
 
         /* get base addr */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2402,10 +2697,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         mdp = netdev_priv(ndev);
         mdp->num_tx_ring = TX_RING_SIZE;
         mdp->num_rx_ring = RX_RING_SIZE;
-        mdp->addr = ioremap(res->start, resource_size(res));
-        if (mdp->addr == NULL) {
-                ret = -ENOMEM;
-                dev_err(&pdev->dev, "ioremap failed.\n");
+        mdp->addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(mdp->addr)) {
+                ret = PTR_ERR(mdp->addr);
                 goto out_release;
         }
 
@@ -2414,7 +2708,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_resume(&pdev->dev);
 
-        pd = (struct sh_eth_plat_data *)(pdev->dev.platform_data);
         /* get PHY ID */
         mdp->phy_id = pd->phy;
         mdp->phy_interface = pd->phy_interface;
@@ -2442,6 +2735,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
         /* read and set MAC address */
         read_mac_address(ndev, pd->mac_addr);
+        if (!is_valid_ether_addr(ndev->dev_addr)) {
+                dev_warn(&pdev->dev,
+                         "no valid MAC address supplied, using a random one.\n");
+                eth_hw_addr_random(ndev);
+        }
 
         /* ioremap the TSU registers */
         if (mdp->cd->tsu) {
@@ -2452,15 +2750,13 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
                         ret = -ENODEV;
                         goto out_release;
                 }
-                mdp->tsu_addr = ioremap(rtsu->start,
-                                        resource_size(rtsu));
-                if (mdp->tsu_addr == NULL) {
-                        ret = -ENOMEM;
-                        dev_err(&pdev->dev, "TSU ioremap failed.\n");
+                mdp->tsu_addr = devm_ioremap_resource(&pdev->dev, rtsu);
+                if (IS_ERR(mdp->tsu_addr)) {
+                        ret = PTR_ERR(mdp->tsu_addr);
                         goto out_release;
                 }
                 mdp->port = devno % 2;
-                ndev->features = NETIF_F_HW_VLAN_FILTER;
+                ndev->features = NETIF_F_HW_VLAN_CTAG_FILTER;
         }
 
         /* initialize first or needed device */
@@ -2497,10 +2793,6 @@ out_unregister:
 
 out_release:
         /* net_dev free */
-        if (mdp && mdp->addr)
-                iounmap(mdp->addr);
-        if (mdp && mdp->tsu_addr)
-                iounmap(mdp->tsu_addr);
         if (ndev)
                 free_netdev(ndev);
 
@@ -2511,14 +2803,10 @@ out:
 static int sh_eth_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
-        struct sh_eth_private *mdp = netdev_priv(ndev);
 
-        if (mdp->cd->tsu)
-                iounmap(mdp->tsu_addr);
         sh_mdio_release(ndev);
         unregister_netdev(ndev);
         pm_runtime_disable(&pdev->dev);
-        iounmap(mdp->addr);
         free_netdev(ndev);
         platform_set_drvdata(pdev, NULL);
 
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 828be4515008..1ddc9f235bcb 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -156,225 +156,6 @@ enum {
         SH_ETH_MAX_REGISTER_OFFSET,
 };
 
-static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
-        [EDSR]  = 0x0000,
-        [EDMR]  = 0x0400,
-        [EDTRR] = 0x0408,
-        [EDRRR] = 0x0410,
-        [EESR]  = 0x0428,
-        [EESIPR]        = 0x0430,
-        [TDLAR] = 0x0010,
-        [TDFAR] = 0x0014,
-        [TDFXR] = 0x0018,
-        [TDFFR] = 0x001c,
-        [RDLAR] = 0x0030,
-        [RDFAR] = 0x0034,
-        [RDFXR] = 0x0038,
-        [RDFFR] = 0x003c,
-        [TRSCER]        = 0x0438,
-        [RMFCR] = 0x0440,
-        [TFTR]  = 0x0448,
-        [FDR]   = 0x0450,
-        [RMCR]  = 0x0458,
-        [RPADIR]        = 0x0460,
-        [FCFTR] = 0x0468,
-        [CSMR] = 0x04E4,
-
-        [ECMR]  = 0x0500,
-        [ECSR]  = 0x0510,
-        [ECSIPR]        = 0x0518,
-        [PIR]   = 0x0520,
-        [PSR]   = 0x0528,
-        [PIPR]  = 0x052c,
-        [RFLR]  = 0x0508,
-        [APR]   = 0x0554,
-        [MPR]   = 0x0558,
-        [PFTCR] = 0x055c,
-        [PFRCR] = 0x0560,
-        [TPAUSER]       = 0x0564,
-        [GECMR] = 0x05b0,
-        [BCULR] = 0x05b4,
-        [MAHR]  = 0x05c0,
-        [MALR]  = 0x05c8,
-        [TROCR] = 0x0700,
-        [CDCR]  = 0x0708,
-        [LCCR]  = 0x0710,
-        [CEFCR] = 0x0740,
-        [FRECR] = 0x0748,
-        [TSFRCR]        = 0x0750,
-        [TLFRCR]        = 0x0758,
-        [RFCR]  = 0x0760,
-        [CERCR] = 0x0768,
-        [CEECR] = 0x0770,
-        [MAFCR] = 0x0778,
-        [RMII_MII] =  0x0790,
-
-        [ARSTR] = 0x0000,
-        [TSU_CTRST]     = 0x0004,
-        [TSU_FWEN0]     = 0x0010,
-        [TSU_FWEN1]     = 0x0014,
-        [TSU_FCM]       = 0x0018,
-        [TSU_BSYSL0]    = 0x0020,
-        [TSU_BSYSL1]    = 0x0024,
-        [TSU_PRISL0]    = 0x0028,
-        [TSU_PRISL1]    = 0x002c,
-        [TSU_FWSL0]     = 0x0030,
-        [TSU_FWSL1]     = 0x0034,
-        [TSU_FWSLC]     = 0x0038,
-        [TSU_QTAG0]     = 0x0040,
-        [TSU_QTAG1]     = 0x0044,
-        [TSU_FWSR]      = 0x0050,
-        [TSU_FWINMK]    = 0x0054,
-        [TSU_ADQT0]     = 0x0048,
-        [TSU_ADQT1]     = 0x004c,
-        [TSU_VTAG0]     = 0x0058,
-        [TSU_VTAG1]     = 0x005c,
-        [TSU_ADSBSY]    = 0x0060,
-        [TSU_TEN]       = 0x0064,
-        [TSU_POST1]     = 0x0070,
-        [TSU_POST2]     = 0x0074,
-        [TSU_POST3]     = 0x0078,
-        [TSU_POST4]     = 0x007c,
-        [TSU_ADRH0]     = 0x0100,
-        [TSU_ADRL0]     = 0x0104,
-        [TSU_ADRH31]    = 0x01f8,
-        [TSU_ADRL31]    = 0x01fc,
-
-        [TXNLCR0]       = 0x0080,
-        [TXALCR0]       = 0x0084,
-        [RXNLCR0]       = 0x0088,
-        [RXALCR0]       = 0x008c,
-        [FWNLCR0]       = 0x0090,
-        [FWALCR0]       = 0x0094,
-        [TXNLCR1]       = 0x00a0,
-        [TXALCR1]       = 0x00a0,
-        [RXNLCR1]       = 0x00a8,
-        [RXALCR1]       = 0x00ac,
-        [FWNLCR1]       = 0x00b0,
-        [FWALCR1]       = 0x00b4,
-};
-
-static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
-        [ECMR]  = 0x0100,
-        [RFLR]  = 0x0108,
-        [ECSR]  = 0x0110,
-        [ECSIPR]        = 0x0118,
-        [PIR]   = 0x0120,
-        [PSR]   = 0x0128,
-        [RDMLR] = 0x0140,
-        [IPGR]  = 0x0150,
-        [APR]   = 0x0154,
-        [MPR]   = 0x0158,
-        [TPAUSER]       = 0x0164,
-        [RFCF]  = 0x0160,
-        [TPAUSECR]      = 0x0168,
-        [BCFRR] = 0x016c,
-        [MAHR]  = 0x01c0,
-        [MALR]  = 0x01c8,
-        [TROCR] = 0x01d0,
-        [CDCR]  = 0x01d4,
-        [LCCR]  = 0x01d8,
-        [CNDCR] = 0x01dc,
-        [CEFCR] = 0x01e4,
-        [FRECR] = 0x01e8,
-        [TSFRCR]        = 0x01ec,
-        [TLFRCR]        = 0x01f0,
-        [RFCR]  = 0x01f4,
-        [MAFCR] = 0x01f8,
-        [RTRATE]        = 0x01fc,
-
-        [EDMR]  = 0x0000,
-        [EDTRR] = 0x0008,
-        [EDRRR] = 0x0010,
-        [TDLAR] = 0x0018,
-        [RDLAR] = 0x0020,
-        [EESR]  = 0x0028,
-        [EESIPR]        = 0x0030,
-        [TRSCER]        = 0x0038,
-        [RMFCR] = 0x0040,
-        [TFTR]  = 0x0048,
-        [FDR]   = 0x0050,
-        [RMCR]  = 0x0058,
-        [TFUCR] = 0x0064,
-        [RFOCR] = 0x0068,
-        [FCFTR] = 0x0070,
-        [RPADIR]        = 0x0078,
-        [TRIMD] = 0x007c,
-        [RBWAR] = 0x00c8,
-        [RDFAR] = 0x00cc,
-        [TBRAR] = 0x00d4,
-        [TDFAR] = 0x00d8,
-};
-
-static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
-        [ECMR]  = 0x0160,
-        [ECSR]  = 0x0164,
-        [ECSIPR]        = 0x0168,
-        [PIR]   = 0x016c,
-        [MAHR]  = 0x0170,
-        [MALR]  = 0x0174,
-        [RFLR]  = 0x0178,
-        [PSR]   = 0x017c,
-        [TROCR] = 0x0180,
-        [CDCR]  = 0x0184,
-        [LCCR]  = 0x0188,
-        [CNDCR] = 0x018c,
-        [CEFCR] = 0x0194,
-        [FRECR] = 0x0198,
-        [TSFRCR]        = 0x019c,
-        [TLFRCR]        = 0x01a0,
-        [RFCR]  = 0x01a4,
-        [MAFCR] = 0x01a8,
-        [IPGR]  = 0x01b4,
-        [APR]   = 0x01b8,
-        [MPR]   = 0x01bc,
-        [TPAUSER]       = 0x01c4,
-        [BCFR]  = 0x01cc,
-
-        [ARSTR] = 0x0000,
-        [TSU_CTRST]     = 0x0004,
-        [TSU_FWEN0]     = 0x0010,
-        [TSU_FWEN1]     = 0x0014,
-        [TSU_FCM]       = 0x0018,
-        [TSU_BSYSL0]    = 0x0020,
-        [TSU_BSYSL1]    = 0x0024,
-        [TSU_PRISL0]    = 0x0028,
-        [TSU_PRISL1]    = 0x002c,
-        [TSU_FWSL0]     = 0x0030,
-        [TSU_FWSL1]     = 0x0034,
-        [TSU_FWSLC]     = 0x0038,
-        [TSU_QTAGM0]    = 0x0040,
-        [TSU_QTAGM1]    = 0x0044,
-        [TSU_ADQT0]     = 0x0048,
-        [TSU_ADQT1]     = 0x004c,
-        [TSU_FWSR]      = 0x0050,
-        [TSU_FWINMK]    = 0x0054,
-        [TSU_ADSBSY]    = 0x0060,
-        [TSU_TEN]       = 0x0064,
-        [TSU_POST1]     = 0x0070,
-        [TSU_POST2]     = 0x0074,
-        [TSU_POST3]     = 0x0078,
-        [TSU_POST4]     = 0x007c,
-
-        [TXNLCR0]       = 0x0080,
-        [TXALCR0]       = 0x0084,
-        [RXNLCR0]       = 0x0088,
-        [RXALCR0]       = 0x008c,
-        [FWNLCR0]       = 0x0090,
-        [FWALCR0]       = 0x0094,
-        [TXNLCR1]       = 0x00a0,
-        [TXALCR1]       = 0x00a0,
-        [RXNLCR1]       = 0x00a8,
-        [RXALCR1]       = 0x00ac,
-        [FWNLCR1]       = 0x00b0,
-        [FWALCR1]       = 0x00b4,
-
-        [TSU_ADRH0]     = 0x0100,
-        [TSU_ADRL0]     = 0x0104,
-        [TSU_ADRL31]    = 0x01fc,
-
-};
-
 /* Driver's parameters */
 #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
 #define SH4_SKB_RX_ALIGN        32
@@ -705,7 +486,6 @@ struct sh_eth_private {
         const u16 *reg_offset;
         void __iomem *addr;
         void __iomem *tsu_addr;
-        struct bb_info *bitbang;
         u32 num_rx_ring;
         u32 num_tx_ring;
         dma_addr_t rx_desc_dma;
diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c
index 21683e2b1ff4..b6739afeaca1 100644
--- a/drivers/net/ethernet/s6gmac.c
+++ b/drivers/net/ethernet/s6gmac.c
@@ -998,6 +998,7 @@ static int s6gmac_probe(struct platform_device *pdev)
         mb = mdiobus_alloc();
         if (!mb) {
                 printk(KERN_ERR DRV_PRMT "error allocating mii bus\n");
+                res = -ENOMEM;
                 goto errmii;
         }
         mb->name = "s6gmac_mii";
@@ -1053,20 +1054,7 @@ static struct platform_driver s6gmac_driver = {
         },
 };
 
-static int __init s6gmac_init(void)
-{
-        printk(KERN_INFO DRV_PRMT "S6 GMAC ethernet driver\n");
-        return platform_driver_register(&s6gmac_driver);
-}
-
-
-static void __exit s6gmac_exit(void)
-{
-        platform_driver_unregister(&s6gmac_driver);
-}
-
-module_init(s6gmac_init);
-module_exit(s6gmac_exit);
+module_platform_driver(s6gmac_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("S6105 on chip Ethernet driver");
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c
index 3aca57853ed4..bdac936a68bc 100644
--- a/drivers/net/ethernet/seeq/ether3.c
+++ b/drivers/net/ethernet/seeq/ether3.c
@@ -651,8 +651,11 @@ if (next_ptr < RX_START || next_ptr >= RX_END) {
                                 skb->protocol = eth_type_trans(skb, dev);
                                 netif_rx(skb);
                                 received ++;
-                        } else
-                                goto dropping;
+                        } else {
+                                ether3_outw(next_ptr >> 8, REG_RECVEND);
+                                dev->stats.rx_dropped++;
+                                goto done;
+                        }
                 } else {
                         struct net_device_stats *stats = &dev->stats;
                         ether3_outw(next_ptr >> 8, REG_RECVEND);
@@ -679,21 +682,6 @@ done:
         }
 
         return maxcnt;
-
-dropping:{
-        static unsigned long last_warned;
-
-        ether3_outw(next_ptr >> 8, REG_RECVEND);
-        /*
-         * Don't print this message too many times...
-         */
-        if (time_after(jiffies, last_warned + 10 * HZ)) {
-                last_warned = jiffies;
-                printk("%s: memory squeeze, dropping packet.\n", dev->name);
-        }
-        dev->stats.rx_dropped++;
-        goto done;
-        }
 }
 
 /*
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 0fde9ca28269..0ad5694b41f8 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -381,8 +381,6 @@ memory_squeeze:
                                         dev->stats.rx_packets++;
                                         dev->stats.rx_bytes += len;
                                 } else {
-                                        printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n",
-                                                dev->name);
                                         dev->stats.rx_dropped++;
                                 }
                         } else {
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 0bc00991d310..01b99206139a 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -22,6 +22,7 @@
 #include <linux/topology.h>
 #include <linux/gfp.h>
 #include <linux/cpu_rmap.h>
+#include <linux/aer.h>
 #include "net_driver.h"
 #include "efx.h"
 #include "nic.h"
@@ -71,21 +72,21 @@ const char *const efx_loopback_mode_names[] = {
 
 const unsigned int efx_reset_type_max = RESET_TYPE_MAX;
 const char *const efx_reset_type_names[] = {
-        [RESET_TYPE_INVISIBLE]     = "INVISIBLE",
-        [RESET_TYPE_ALL]           = "ALL",
-        [RESET_TYPE_WORLD]         = "WORLD",
-        [RESET_TYPE_DISABLE]       = "DISABLE",
-        [RESET_TYPE_TX_WATCHDOG]   = "TX_WATCHDOG",
-        [RESET_TYPE_INT_ERROR]     = "INT_ERROR",
-        [RESET_TYPE_RX_RECOVERY]   = "RX_RECOVERY",
-        [RESET_TYPE_RX_DESC_FETCH] = "RX_DESC_FETCH",
-        [RESET_TYPE_TX_DESC_FETCH] = "TX_DESC_FETCH",
-        [RESET_TYPE_TX_SKIP]       = "TX_SKIP",
-        [RESET_TYPE_MC_FAILURE]    = "MC_FAILURE",
+        [RESET_TYPE_INVISIBLE]          = "INVISIBLE",
+        [RESET_TYPE_ALL]                = "ALL",
+        [RESET_TYPE_RECOVER_OR_ALL]     = "RECOVER_OR_ALL",
+        [RESET_TYPE_WORLD]              = "WORLD",
+        [RESET_TYPE_RECOVER_OR_DISABLE] = "RECOVER_OR_DISABLE",
+        [RESET_TYPE_DISABLE]            = "DISABLE",
+        [RESET_TYPE_TX_WATCHDOG]        = "TX_WATCHDOG",
+        [RESET_TYPE_INT_ERROR]          = "INT_ERROR",
+        [RESET_TYPE_RX_RECOVERY]        = "RX_RECOVERY",
+        [RESET_TYPE_RX_DESC_FETCH]      = "RX_DESC_FETCH",
+        [RESET_TYPE_TX_DESC_FETCH]      = "TX_DESC_FETCH",
+        [RESET_TYPE_TX_SKIP]            = "TX_SKIP",
+        [RESET_TYPE_MC_FAILURE]         = "MC_FAILURE",
 };
 
-#define EFX_MAX_MTU (9 * 1024)
-
 /* Reset workqueue. If any NIC has a hardware failure then a reset will be
  * queued onto this work queue. This is not a per-nic work queue, because
  * efx_reset_work() acquires the rtnl lock, so resets are naturally serialised.
@@ -117,9 +118,12 @@ MODULE_PARM_DESC(separate_tx_channels,
 static int napi_weight = 64;
 
 /* This is the time (in jiffies) between invocations of the hardware
- * monitor.  On Falcon-based NICs, this will:
+ * monitor.
+ * On Falcon-based NICs, this will:
  * - Check the on-board hardware monitor;
  * - Poll the link state and reconfigure the hardware as necessary.
+ * On Siena-based NICs for power systems with EEH support, this will give EEH a
+ * chance to start.
  */
 static unsigned int efx_monitor_interval = 1 * HZ;
 
@@ -203,13 +207,14 @@ static void efx_stop_all(struct efx_nic *efx);
 #define EFX_ASSERT_RESET_SERIALISED(efx)                \
         do {                                            \
                 if ((efx->state == STATE_READY) ||      \
+                    (efx->state == STATE_RECOVERY) ||   \
                     (efx->state == STATE_DISABLED))     \
                         ASSERT_RTNL();                  \
         } while (0)
 
 static int efx_check_disabled(struct efx_nic *efx)
 {
-        if (efx->state == STATE_DISABLED) {
+        if (efx->state == STATE_DISABLED || efx->state == STATE_RECOVERY) {
                 netif_err(efx, drv, efx->net_dev,
                           "device is disabled due to earlier errors\n");
                 return -EIO;
@@ -242,15 +247,9 @@ static int efx_process_channel(struct efx_channel *channel, int budget)
                 struct efx_rx_queue *rx_queue =
                         efx_channel_get_rx_queue(channel);
 
-                /* Deliver last RX packet. */
-                if (channel->rx_pkt) {
-                        __efx_rx_packet(channel, channel->rx_pkt);
-                        channel->rx_pkt = NULL;
-                }
-                if (rx_queue->enabled) {
-                        efx_rx_strategy(channel);
+                efx_rx_flush_packet(channel);
+                if (rx_queue->enabled)
                         efx_fast_push_rx_descriptors(rx_queue);
-                }
         }
 
         return spent;
@@ -625,20 +624,51 @@ fail:
  */
 static void efx_start_datapath(struct efx_nic *efx)
 {
+        bool old_rx_scatter = efx->rx_scatter;
         struct efx_tx_queue *tx_queue;
         struct efx_rx_queue *rx_queue;
         struct efx_channel *channel;
+        size_t rx_buf_len;
 
         /* Calculate the rx buffer allocation parameters required to
          * support the current MTU, including padding for header
          * alignment and overruns.
          */
-        efx->rx_buffer_len = (max(EFX_PAGE_IP_ALIGN, NET_IP_ALIGN) +
-                              EFX_MAX_FRAME_LEN(efx->net_dev->mtu) +
-                              efx->type->rx_buffer_hash_size +
-                              efx->type->rx_buffer_padding);
-        efx->rx_buffer_order = get_order(efx->rx_buffer_len +
-                                         sizeof(struct efx_rx_page_state));
+        efx->rx_dma_len = (efx->type->rx_buffer_hash_size +
+                           EFX_MAX_FRAME_LEN(efx->net_dev->mtu) +
+                           efx->type->rx_buffer_padding);
+        rx_buf_len = (sizeof(struct efx_rx_page_state) +
+                      EFX_PAGE_IP_ALIGN + efx->rx_dma_len);
+        if (rx_buf_len <= PAGE_SIZE) {
+                efx->rx_scatter = false;
+                efx->rx_buffer_order = 0;
+        } else if (efx->type->can_rx_scatter) {
+                BUILD_BUG_ON(sizeof(struct efx_rx_page_state) +
+                             EFX_PAGE_IP_ALIGN + EFX_RX_USR_BUF_SIZE >
+                             PAGE_SIZE / 2);
+                efx->rx_scatter = true;
+                efx->rx_dma_len = EFX_RX_USR_BUF_SIZE;
+                efx->rx_buffer_order = 0;
+        } else {
+                efx->rx_scatter = false;
+                efx->rx_buffer_order = get_order(rx_buf_len);
+        }
+
+        efx_rx_config_page_split(efx);
+        if (efx->rx_buffer_order)
+                netif_dbg(efx, drv, efx->net_dev,
+                          "RX buf len=%u; page order=%u batch=%u\n",
+                          efx->rx_dma_len, efx->rx_buffer_order,
+                          efx->rx_pages_per_batch);
+        else
+                netif_dbg(efx, drv, efx->net_dev,
+                          "RX buf len=%u step=%u bpp=%u; page batch=%u\n",
+                          efx->rx_dma_len, efx->rx_page_buf_step,
+                          efx->rx_bufs_per_page, efx->rx_pages_per_batch);
+
+        /* RX filters also have scatter-enabled flags */
+        if (efx->rx_scatter != old_rx_scatter)
+                efx_filter_update_rx_scatter(efx);
 
         /* We must keep at least one descriptor in a TX ring empty.
          * We could avoid this when the queue size does not exactly
@@ -655,16 +685,12 @@ static void efx_start_datapath(struct efx_nic *efx)
                 efx_for_each_channel_tx_queue(tx_queue, channel)
                         efx_init_tx_queue(tx_queue);
 
-                /* The rx buffer allocation strategy is MTU dependent */
-                efx_rx_strategy(channel);
-
                 efx_for_each_channel_rx_queue(rx_queue, channel) {
                         efx_init_rx_queue(rx_queue);
                         efx_nic_generate_fill_event(rx_queue);
                 }
 
-                WARN_ON(channel->rx_pkt != NULL);
-                efx_rx_strategy(channel);
+                WARN_ON(channel->rx_pkt_n_frags);
         }
 
         if (netif_device_present(efx->net_dev))
@@ -683,7 +709,7 @@ static void efx_stop_datapath(struct efx_nic *efx)
         BUG_ON(efx->port_enabled);
 
         /* Only perform flush if dma is enabled */
-        if (dev->is_busmaster) {
+        if (dev->is_busmaster && efx->state != STATE_RECOVERY) {
                 rc = efx_nic_flush_queues(efx);
 
                 if (rc && EFX_WORKAROUND_7803(efx)) {
@@ -1596,13 +1622,15 @@ static void efx_start_all(struct efx_nic *efx)
         efx_start_port(efx);
         efx_start_datapath(efx);
 
-        /* Start the hardware monitor if there is one. Otherwise (we're link
-         * event driven), we have to poll the PHY because after an event queue
-         * flush, we could have a missed a link state change */
-        if (efx->type->monitor != NULL) {
+        /* Start the hardware monitor if there is one */
+        if (efx->type->monitor != NULL)
                 queue_delayed_work(efx->workqueue, &efx->monitor_work,
                                    efx_monitor_interval);
-        } else {
+
+        /* If link state detection is normally event-driven, we have
+         * to poll now because we could have missed a change
+         */
+        if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0) {
                 mutex_lock(&efx->mac_lock);
                 if (efx->phy_op->poll(efx))
                         efx_link_status_changed(efx);
@@ -2309,7 +2337,9 @@ int efx_reset(struct efx_nic *efx, enum reset_type method)
 
 out:
         /* Leave device stopped if necessary */
-        disabled = rc || method == RESET_TYPE_DISABLE;
+        disabled = rc ||
+                method == RESET_TYPE_DISABLE ||
+                method == RESET_TYPE_RECOVER_OR_DISABLE;
         rc2 = efx_reset_up(efx, method, !disabled);
         if (rc2) {
                 disabled = true;
@@ -2328,13 +2358,48 @@ out:
         return rc;
 }
 
+/* Try recovery mechanisms.
+ * For now only EEH is supported.
+ * Returns 0 if the recovery mechanisms are unsuccessful.
+ * Returns a non-zero value otherwise.
+ */
+static int efx_try_recovery(struct efx_nic *efx)
+{
+#ifdef CONFIG_EEH
+        /* A PCI error can occur and not be seen by EEH because nothing
+         * happens on the PCI bus. In this case the driver may fail and
+         * schedule a 'recover or reset', leading to this recovery handler.
+         * Manually call the eeh failure check function.
+         */
+        struct eeh_dev *eehdev =
+                of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
+
+        if (eeh_dev_check_failure(eehdev)) {
+                /* The EEH mechanisms will handle the error and reset the
+                 * device if necessary.
+                 */
+                return 1;
+        }
+#endif
+        return 0;
+}
+
 /* The worker thread exists so that code that cannot sleep can
  * schedule a reset for later.
  */
 static void efx_reset_work(struct work_struct *data)
 {
         struct efx_nic *efx = container_of(data, struct efx_nic, reset_work);
-        unsigned long pending = ACCESS_ONCE(efx->reset_pending);
+        unsigned long pending;
+        enum reset_type method;
+
+        pending = ACCESS_ONCE(efx->reset_pending);
+        method = fls(pending) - 1;
+
+        if ((method == RESET_TYPE_RECOVER_OR_DISABLE ||
+             method == RESET_TYPE_RECOVER_OR_ALL) &&
+            efx_try_recovery(efx))
+                return;
 
         if (!pending)
                 return;
@@ -2346,7 +2411,7 @@ static void efx_reset_work(struct work_struct *data)
          * it cannot change again.
          */
         if (efx->state == STATE_READY)
-                (void)efx_reset(efx, fls(pending) - 1);
+                (void)efx_reset(efx, method);
 
         rtnl_unlock();
 }
@@ -2355,11 +2420,20 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
 {
         enum reset_type method;
 
+        if (efx->state == STATE_RECOVERY) {
+                netif_dbg(efx, drv, efx->net_dev,
+                          "recovering: skip scheduling %s reset\n",
+                          RESET_TYPE(type));
+                return;
+        }
+
         switch (type) {
         case RESET_TYPE_INVISIBLE:
         case RESET_TYPE_ALL:
+        case RESET_TYPE_RECOVER_OR_ALL:
         case RESET_TYPE_WORLD:
         case RESET_TYPE_DISABLE:
+        case RESET_TYPE_RECOVER_OR_DISABLE:
                 method = type;
                 netif_dbg(efx, drv, efx->net_dev, "scheduling %s reset\n",
                           RESET_TYPE(method));
@@ -2569,6 +2643,8 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
         efx_fini_struct(efx);
         pci_set_drvdata(pci_dev, NULL);
         free_netdev(efx->net_dev);
+
+        pci_disable_pcie_error_reporting(pci_dev);
 };
 
 /* NIC VPD information
@@ -2741,6 +2817,11 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
                 netif_warn(efx, probe, efx->net_dev,
                            "failed to create MTDs (%d)\n", rc);
 
+        rc = pci_enable_pcie_error_reporting(pci_dev);
+        if (rc && rc != -EINVAL)
+                netif_warn(efx, probe, efx->net_dev,
+                           "pci_enable_pcie_error_reporting failed (%d)\n", rc);
+
         return 0;
 
  fail4:
@@ -2865,12 +2946,112 @@ static const struct dev_pm_ops efx_pm_ops = {
         .restore        = efx_pm_resume,
 };
 
+/* A PCI error affecting this device was detected.
+ * At this point MMIO and DMA may be disabled.
+ * Stop the software path and request a slot reset.
+ */
+static pci_ers_result_t efx_io_error_detected(struct pci_dev *pdev,
+                                              enum pci_channel_state state)
+{
+        pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
+        struct efx_nic *efx = pci_get_drvdata(pdev);
+
+        if (state == pci_channel_io_perm_failure)
+                return PCI_ERS_RESULT_DISCONNECT;
+
+        rtnl_lock();
+
+        if (efx->state != STATE_DISABLED) {
+                efx->state = STATE_RECOVERY;
+                efx->reset_pending = 0;
+
+                efx_device_detach_sync(efx);
+
+                efx_stop_all(efx);
+                efx_stop_interrupts(efx, false);
+
+                status = PCI_ERS_RESULT_NEED_RESET;
+        } else {
+                /* If the interface is disabled we don't want to do anything
+                 * with it.
+                 */
+                status = PCI_ERS_RESULT_RECOVERED;
+        }
+
+        rtnl_unlock();
+
+        pci_disable_device(pdev);
+
+        return status;
+}
+
+/* Fake a successfull reset, which will be performed later in efx_io_resume. */
+static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev)
+{
+        struct efx_nic *efx = pci_get_drvdata(pdev);
+        pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
+        int rc;
+
+        if (pci_enable_device(pdev)) {
+                netif_err(efx, hw, efx->net_dev,
+                          "Cannot re-enable PCI device after reset.\n");
+                status =  PCI_ERS_RESULT_DISCONNECT;
+        }
+
+        rc = pci_cleanup_aer_uncorrect_error_status(pdev);
+        if (rc) {
+                netif_err(efx, hw, efx->net_dev,
+                "pci_cleanup_aer_uncorrect_error_status failed (%d)\n", rc);
+                /* Non-fatal error. Continue. */
+        }
+
+        return status;
+}
+
+/* Perform the actual reset and resume I/O operations. */
+static void efx_io_resume(struct pci_dev *pdev)
+{
+        struct efx_nic *efx = pci_get_drvdata(pdev);
+        int rc;
+
+        rtnl_lock();
+
+        if (efx->state == STATE_DISABLED)
+                goto out;
+
+        rc = efx_reset(efx, RESET_TYPE_ALL);
+        if (rc) {
+                netif_err(efx, hw, efx->net_dev,
+                          "efx_reset failed after PCI error (%d)\n", rc);
+        } else {
+                efx->state = STATE_READY;
+                netif_dbg(efx, hw, efx->net_dev,
+                          "Done resetting and resuming IO after PCI error.\n");
+        }
+
+out:
+        rtnl_unlock();
+}
+
+/* For simplicity and reliability, we always require a slot reset and try to
+ * reset the hardware when a pci error affecting the device is detected.
+ * We leave both the link_reset and mmio_enabled callback unimplemented:
+ * with our request for slot reset the mmio_enabled callback will never be
+ * called, and the link_reset callback is not used by AER or EEH mechanisms.
+ */
+static struct pci_error_handlers efx_err_handlers = {
+        .error_detected = efx_io_error_detected,
+        .slot_reset     = efx_io_slot_reset,
+        .resume         = efx_io_resume,
+};
+
 static struct pci_driver efx_pci_driver = {
         .name           = KBUILD_MODNAME,
         .id_table       = efx_pci_table,
         .probe          = efx_pci_probe,
         .remove         = efx_pci_remove,
         .driver.pm      = &efx_pm_ops,
+        .err_handler    = &efx_err_handlers,
 };
 
 /**************************************************************************
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index d2f790df6dcb..8372da239b43 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -33,17 +33,22 @@ extern int efx_setup_tc(struct net_device *net_dev, u8 num_tc);
 extern unsigned int efx_tx_max_skb_descs(struct efx_nic *efx);
 
 /* RX */
+extern void efx_rx_config_page_split(struct efx_nic *efx);
 extern int efx_probe_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_remove_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_init_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_fini_rx_queue(struct efx_rx_queue *rx_queue);
-extern void efx_rx_strategy(struct efx_channel *channel);
 extern void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue);
 extern void efx_rx_slow_fill(unsigned long context);
-extern void __efx_rx_packet(struct efx_channel *channel,
-                            struct efx_rx_buffer *rx_buf);
-extern void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
+extern void __efx_rx_packet(struct efx_channel *channel);
+extern void efx_rx_packet(struct efx_rx_queue *rx_queue,
+                          unsigned int index, unsigned int n_frags,
                           unsigned int len, u16 flags);
+static inline void efx_rx_flush_packet(struct efx_channel *channel)
+{
+        if (channel->rx_pkt_n_frags)
+                __efx_rx_packet(channel);
+}
 extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);
 
 #define EFX_MAX_DMAQ_SIZE 4096UL
@@ -67,6 +72,7 @@ extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);
 extern int efx_probe_filters(struct efx_nic *efx);
 extern void efx_restore_filters(struct efx_nic *efx);
 extern void efx_remove_filters(struct efx_nic *efx);
+extern void efx_filter_update_rx_scatter(struct efx_nic *efx);
 extern s32 efx_filter_insert_filter(struct efx_nic *efx,
                                     struct efx_filter_spec *spec,
                                     bool replace);
diff --git a/drivers/net/ethernet/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h
index 182dbe2cc6e4..ab8fb5889e55 100644
--- a/drivers/net/ethernet/sfc/enum.h
+++ b/drivers/net/ethernet/sfc/enum.h
@@ -137,8 +137,12 @@ enum efx_loopback_mode {
  * Reset methods are numbered in order of increasing scope.
  *
  * @RESET_TYPE_INVISIBLE: Reset datapath and MAC (Falcon only)
+ * @RESET_TYPE_RECOVER_OR_ALL: Try to recover. Apply RESET_TYPE_ALL
+ * if unsuccessful.
  * @RESET_TYPE_ALL: Reset datapath, MAC and PHY
  * @RESET_TYPE_WORLD: Reset as much as possible
+ * @RESET_TYPE_RECOVER_OR_DISABLE: Try to recover. Apply RESET_TYPE_DISABLE if
+ * unsuccessful.
  * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled
  * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog
  * @RESET_TYPE_INT_ERROR: reset due to internal error
@@ -150,9 +154,11 @@ enum efx_loopback_mode {
  */
 enum reset_type {
         RESET_TYPE_INVISIBLE = 0,
-        RESET_TYPE_ALL = 1,
-        RESET_TYPE_WORLD = 2,
-        RESET_TYPE_DISABLE = 3,
+        RESET_TYPE_RECOVER_OR_ALL = 1,
+        RESET_TYPE_ALL = 2,
+        RESET_TYPE_WORLD = 3,
+        RESET_TYPE_RECOVER_OR_DISABLE = 4,
+        RESET_TYPE_DISABLE = 5,
         RESET_TYPE_MAX_METHOD,
         RESET_TYPE_TX_WATCHDOG,
         RESET_TYPE_INT_ERROR,
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 8e61cd06f66a..6e768175e7e0 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -154,6 +154,7 @@ static const struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_tcp_udp_chksum_err),
         EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_mcast_mismatch),
         EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_frm_trunc),
+        EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_nodesc_trunc),
 };
 
 /* Number of ethtool statistics */
@@ -978,7 +979,8 @@ static int efx_ethtool_set_class_rule(struct efx_nic *efx,
              rule->m_ext.data[1]))
                 return -EINVAL;
 
-        efx_filter_init_rx(&spec, EFX_FILTER_PRI_MANUAL, 0,
+        efx_filter_init_rx(&spec, EFX_FILTER_PRI_MANUAL,
+                           efx->rx_scatter ? EFX_FILTER_FLAG_RX_SCATTER : 0,
                            (rule->ring_cookie == RX_CLS_FLOW_DISC) ?
                            0xfff : rule->ring_cookie);
 
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 49bcd196e10d..4486102fa9b3 100644
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -1546,10 +1546,6 @@ static int falcon_probe_nic(struct efx_nic *efx)
 
 static void falcon_init_rx_cfg(struct efx_nic *efx)
 {
-        /* Prior to Siena the RX DMA engine will split each frame at
-         * intervals of RX_USR_BUF_SIZE (32-byte units). We set it to
-         * be so large that that never happens. */
-        const unsigned huge_buf_size = (3 * 4096) >> 5;
         /* RX control FIFO thresholds (32 entries) */
         const unsigned ctrl_xon_thr = 20;
         const unsigned ctrl_xoff_thr = 25;
@@ -1557,10 +1553,15 @@ static void falcon_init_rx_cfg(struct efx_nic *efx)
 
         efx_reado(efx, &reg, FR_AZ_RX_CFG);
         if (efx_nic_rev(efx) <= EFX_REV_FALCON_A1) {
-                /* Data FIFO size is 5.5K */
+                /* Data FIFO size is 5.5K.  The RX DMA engine only
+                 * supports scattering for user-mode queues, but will
+                 * split DMA writes at intervals of RX_USR_BUF_SIZE
+                 * (32-byte units) even for kernel-mode queues.  We
+                 * set it to be so large that that never happens.
+                 */
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_DESC_PUSH_EN, 0);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_USR_BUF_SIZE,
-                                    huge_buf_size);
+                                    (3 * 4096) >> 5);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_MAC_TH, 512 >> 8);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_MAC_TH, 2048 >> 8);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_TX_TH, ctrl_xon_thr);
@@ -1569,7 +1570,7 @@ static void falcon_init_rx_cfg(struct efx_nic *efx)
                 /* Data FIFO size is 80K; register fields moved */
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_DESC_PUSH_EN, 0);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_USR_BUF_SIZE,
-                                    huge_buf_size);
+                                    EFX_RX_USR_BUF_SIZE >> 5);
                 /* Send XON and XOFF at ~3 * max MTU away from empty/full */
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_MAC_TH, 27648 >> 8);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_MAC_TH, 54272 >> 8);
@@ -1815,6 +1816,7 @@ const struct efx_nic_type falcon_a1_nic_type = {
         .evq_rptr_tbl_base = FR_AA_EVQ_RPTR_KER,
         .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
         .rx_buffer_padding = 0x24,
+        .can_rx_scatter = false,
         .max_interrupt_mode = EFX_INT_MODE_MSI,
         .phys_addr_channels = 4,
         .timer_period_max =  1 << FRF_AB_TC_TIMER_VAL_WIDTH,
@@ -1865,6 +1867,7 @@ const struct efx_nic_type falcon_b0_nic_type = {
         .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
         .rx_buffer_hash_size = 0x10,
         .rx_buffer_padding = 0,
+        .can_rx_scatter = true,
         .max_interrupt_mode = EFX_INT_MODE_MSIX,
         .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
                                    * interrupt handler only supports 32
diff --git a/drivers/net/ethernet/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c
index 8af42cd1feda..2397f0e8d3eb 100644
--- a/drivers/net/ethernet/sfc/filter.c
+++ b/drivers/net/ethernet/sfc/filter.c
@@ -66,6 +66,10 @@ struct efx_filter_state {
 #endif
 };
 
+static void efx_filter_table_clear_entry(struct efx_nic *efx,
+                                         struct efx_filter_table *table,
+                                         unsigned int filter_idx);
+
 /* The filter hash function is LFSR polynomial x^16 + x^3 + 1 of a 32-bit
  * key derived from the n-tuple.  The initial LFSR state is 0xffff. */
 static u16 efx_filter_hash(u32 key)
@@ -168,6 +172,25 @@ static void efx_filter_push_rx_config(struct efx_nic *efx)
                         filter_ctl, FRF_CZ_MULTICAST_NOMATCH_RSS_ENABLED,
                         !!(table->spec[EFX_FILTER_INDEX_MC_DEF].flags &
                            EFX_FILTER_FLAG_RX_RSS));
+
+                /* There is a single bit to enable RX scatter for all
+                 * unmatched packets.  Only set it if scatter is
+                 * enabled in both filter specs.
+                 */
+                EFX_SET_OWORD_FIELD(
+                        filter_ctl, FRF_BZ_SCATTER_ENBL_NO_MATCH_Q,
+                        !!(table->spec[EFX_FILTER_INDEX_UC_DEF].flags &
+                           table->spec[EFX_FILTER_INDEX_MC_DEF].flags &
+                           EFX_FILTER_FLAG_RX_SCATTER));
+        } else if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+                /* We don't expose 'default' filters because unmatched
+                 * packets always go to the queue number found in the
+                 * RSS table.  But we still need to set the RX scatter
+                 * bit here.
+                 */
+                EFX_SET_OWORD_FIELD(
+                        filter_ctl, FRF_BZ_SCATTER_ENBL_NO_MATCH_Q,
+                        efx->rx_scatter);
         }
 
         efx_writeo(efx, &filter_ctl, FR_BZ_RX_FILTER_CTL);
@@ -409,9 +432,18 @@ static void efx_filter_reset_rx_def(struct efx_nic *efx, unsigned filter_idx)
         struct efx_filter_state *state = efx->filter_state;
         struct efx_filter_table *table = &state->table[EFX_FILTER_TABLE_RX_DEF];
         struct efx_filter_spec *spec = &table->spec[filter_idx];
+        enum efx_filter_flags flags = 0;
+
+        /* If there's only one channel then disable RSS for non VF
+         * traffic, thereby allowing VFs to use RSS when the PF can't.
+         */
+        if (efx->n_rx_channels > 1)
+                flags |= EFX_FILTER_FLAG_RX_RSS;
 
-        efx_filter_init_rx(spec, EFX_FILTER_PRI_MANUAL,
-                           EFX_FILTER_FLAG_RX_RSS, 0);
+        if (efx->rx_scatter)
+                flags |= EFX_FILTER_FLAG_RX_SCATTER;
+
+        efx_filter_init_rx(spec, EFX_FILTER_PRI_MANUAL, flags, 0);
         spec->type = EFX_FILTER_UC_DEF + filter_idx;
         table->used_bitmap[0] |= 1 << filter_idx;
 }
@@ -463,13 +495,6 @@ static u32 efx_filter_build(efx_oword_t *filter, struct efx_filter_spec *spec)
                 break;
         }
 
-        case EFX_FILTER_TABLE_RX_DEF:
-                /* One filter spec per type */
-                BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0);
-                BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF !=
-                             EFX_FILTER_MC_DEF - EFX_FILTER_UC_DEF);
-                return spec->type - EFX_FILTER_UC_DEF;
-
         case EFX_FILTER_TABLE_RX_MAC: {
                 bool is_wild = spec->type == EFX_FILTER_MAC_WILD;
                 EFX_POPULATE_OWORD_7(
@@ -520,42 +545,6 @@ static bool efx_filter_equal(const struct efx_filter_spec *left,
         return true;
 }
 
-static int efx_filter_search(struct efx_filter_table *table,
-                             struct efx_filter_spec *spec, u32 key,
-                             bool for_insert, unsigned int *depth_required)
-{
-        unsigned hash, incr, filter_idx, depth, depth_max;
-
-        hash = efx_filter_hash(key);
-        incr = efx_filter_increment(key);
-
-        filter_idx = hash & (table->size - 1);
-        depth = 1;
-        depth_max = (for_insert ?
-                     (spec->priority <= EFX_FILTER_PRI_HINT ?
-                      FILTER_CTL_SRCH_HINT_MAX : FILTER_CTL_SRCH_MAX) :
-                     table->search_depth[spec->type]);
-
-        for (;;) {
-                /* Return success if entry is used and matches this spec
-                 * or entry is unused and we are trying to insert.
-                 */
-                if (test_bit(filter_idx, table->used_bitmap) ?
-                    efx_filter_equal(spec, &table->spec[filter_idx]) :
-                    for_insert) {
-                        *depth_required = depth;
-                        return filter_idx;
-                }
-
-                /* Return failure if we reached the maximum search depth */
-                if (depth == depth_max)
-                        return for_insert ? -EBUSY : -ENOENT;
-
-                filter_idx = (filter_idx + incr) & (table->size - 1);
-                ++depth;
-        }
-}
-
 /*
  * Construct/deconstruct external filter IDs.  At least the RX filter
  * IDs must be ordered by matching priority, for RX NFC semantics.
@@ -650,44 +639,111 @@ u32 efx_filter_get_rx_id_limit(struct efx_nic *efx)
  * efx_filter_insert_filter - add or replace a filter
  * @efx: NIC in which to insert the filter
  * @spec: Specification for the filter
- * @replace: Flag for whether the specified filter may replace a filter
- *      with an identical match expression and equal or lower priority
+ * @replace_equal: Flag for whether the specified filter may replace an
+ *      existing filter with equal priority
  *
  * On success, return the filter ID.
  * On failure, return a negative error code.
+ *
+ * If an existing filter has equal match values to the new filter
+ * spec, then the new filter might replace it, depending on the
+ * relative priorities.  If the existing filter has lower priority, or
+ * if @replace_equal is set and it has equal priority, then it is
+ * replaced.  Otherwise the function fails, returning -%EPERM if
+ * the existing filter has higher priority or -%EEXIST if it has
+ * equal priority.
  */
 s32 efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec,
-                             bool replace)
+                             bool replace_equal)
 {
         struct efx_filter_state *state = efx->filter_state;
         struct efx_filter_table *table = efx_filter_spec_table(state, spec);
-        struct efx_filter_spec *saved_spec;
         efx_oword_t filter;
-        unsigned int filter_idx, depth = 0;
-        u32 key;
+        int rep_index, ins_index;
+        unsigned int depth = 0;
         int rc;
 
         if (!table || table->size == 0)
                 return -EINVAL;
 
-        key = efx_filter_build(&filter, spec);
-
         netif_vdbg(efx, hw, efx->net_dev,
                    "%s: type %d search_depth=%d", __func__, spec->type,
                    table->search_depth[spec->type]);
 
-        spin_lock_bh(&state->lock);
+        if (table->id == EFX_FILTER_TABLE_RX_DEF) {
+                /* One filter spec per type */
+                BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0);
+                BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF !=
+                             EFX_FILTER_MC_DEF - EFX_FILTER_UC_DEF);
+                rep_index = spec->type - EFX_FILTER_INDEX_UC_DEF;
+                ins_index = rep_index;
 
-        rc = efx_filter_search(table, spec, key, true, &depth);
-        if (rc < 0)
-                goto out;
-        filter_idx = rc;
-        BUG_ON(filter_idx >= table->size);
-        saved_spec = &table->spec[filter_idx];
-
-        if (test_bit(filter_idx, table->used_bitmap)) {
-                /* Should we replace the existing filter? */
-                if (!replace) {
+                spin_lock_bh(&state->lock);
+        } else {
+                /* Search concurrently for
+                 * (1) a filter to be replaced (rep_index): any filter
+                 *     with the same match values, up to the current
+                 *     search depth for this type, and
+                 * (2) the insertion point (ins_index): (1) or any
+                 *     free slot before it or up to the maximum search
+                 *     depth for this priority
+                 * We fail if we cannot find (2).
+                 *
+                 * We can stop once either
+                 * (a) we find (1), in which case we have definitely
+                 *     found (2) as well; or
+                 * (b) we have searched exhaustively for (1), and have
+                 *     either found (2) or searched exhaustively for it
+                 */
+                u32 key = efx_filter_build(&filter, spec);
+                unsigned int hash = efx_filter_hash(key);
+                unsigned int incr = efx_filter_increment(key);
+                unsigned int max_rep_depth = table->search_depth[spec->type];
+                unsigned int max_ins_depth =
+                        spec->priority <= EFX_FILTER_PRI_HINT ?
+                        FILTER_CTL_SRCH_HINT_MAX : FILTER_CTL_SRCH_MAX;
+                unsigned int i = hash & (table->size - 1);
+
+                ins_index = -1;
+                depth = 1;
+
+                spin_lock_bh(&state->lock);
+
+                for (;;) {
+                        if (!test_bit(i, table->used_bitmap)) {
+                                if (ins_index < 0)
+                                        ins_index = i;
+                        } else if (efx_filter_equal(spec, &table->spec[i])) {
+                                /* Case (a) */
+                                if (ins_index < 0)
+                                        ins_index = i;
+                                rep_index = i;
+                                break;
+                        }
+
+                        if (depth >= max_rep_depth &&
+                            (ins_index >= 0 || depth >= max_ins_depth)) {
+                                /* Case (b) */
+                                if (ins_index < 0) {
+                                        rc = -EBUSY;
+                                        goto out;
+                                }
+                                rep_index = -1;
+                                break;
+                        }
+
+                        i = (i + incr) & (table->size - 1);
+                        ++depth;
+                }
+        }
+
+        /* If we found a filter to be replaced, check whether we
+         * should do so
+         */
+        if (rep_index >= 0) {
+                struct efx_filter_spec *saved_spec = &table->spec[rep_index];
+
+                if (spec->priority == saved_spec->priority && !replace_equal) {
                         rc = -EEXIST;
                         goto out;
                 }
@@ -695,11 +751,14 @@ s32 efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec,
                         rc = -EPERM;
                         goto out;
                 }
-        } else {
-                __set_bit(filter_idx, table->used_bitmap);
+        }
+
+        /* Insert the filter */
+        if (ins_index != rep_index) {
+                __set_bit(ins_index, table->used_bitmap);
                 ++table->used;
         }
-        *saved_spec = *spec;
+        table->spec[ins_index] = *spec;
 
         if (table->id == EFX_FILTER_TABLE_RX_DEF) {
                 efx_filter_push_rx_config(efx);
@@ -713,13 +772,19 @@ s32 efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec,
                 }
 
                 efx_writeo(efx, &filter,
-                           table->offset + table->step * filter_idx);
+                           table->offset + table->step * ins_index);
+
+                /* If we were able to replace a filter by inserting
+                 * at a lower depth, clear the replaced filter
+                 */
+                if (ins_index != rep_index && rep_index >= 0)
+                        efx_filter_table_clear_entry(efx, table, rep_index);
         }
 
         netif_vdbg(efx, hw, efx->net_dev,
                    "%s: filter type %d index %d rxq %u set",
-                   __func__, spec->type, filter_idx, spec->dmaq_id);
-        rc = efx_filter_make_id(spec, filter_idx);
+                   __func__, spec->type, ins_index, spec->dmaq_id);
+        rc = efx_filter_make_id(spec, ins_index);
 
 out:
         spin_unlock_bh(&state->lock);
@@ -1060,6 +1125,50 @@ void efx_remove_filters(struct efx_nic *efx)
         kfree(state);
 }
 
+/* Update scatter enable flags for filters pointing to our own RX queues */
+void efx_filter_update_rx_scatter(struct efx_nic *efx)
+{
+        struct efx_filter_state *state = efx->filter_state;
+        enum efx_filter_table_id table_id;
+        struct efx_filter_table *table;
+        efx_oword_t filter;
+        unsigned int filter_idx;
+
+        spin_lock_bh(&state->lock);
+
+        for (table_id = EFX_FILTER_TABLE_RX_IP;
+             table_id <= EFX_FILTER_TABLE_RX_DEF;
+             table_id++) {
+                table = &state->table[table_id];
+
+                for (filter_idx = 0; filter_idx < table->size; filter_idx++) {
+                        if (!test_bit(filter_idx, table->used_bitmap) ||
+                            table->spec[filter_idx].dmaq_id >=
+                            efx->n_rx_channels)
+                                continue;
+
+                        if (efx->rx_scatter)
+                                table->spec[filter_idx].flags |=
+                                        EFX_FILTER_FLAG_RX_SCATTER;
+                        else
+                                table->spec[filter_idx].flags &=
+                                        ~EFX_FILTER_FLAG_RX_SCATTER;
+
+                        if (table_id == EFX_FILTER_TABLE_RX_DEF)
+                                /* Pushed by efx_filter_push_rx_config() */
+                                continue;
+
+                        efx_filter_build(&filter, &table->spec[filter_idx]);
+                        efx_writeo(efx, &filter,
+                                   table->offset + table->step * filter_idx);
+                }
+        }
+
+        efx_filter_push_rx_config(efx);
+
+        spin_unlock_bh(&state->lock);
+}
+
 #ifdef CONFIG_RFS_ACCEL
 
 int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index 0095ce95150b..97dd8f18c001 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -667,7 +667,7 @@ fail:
 int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
                            u16 *fw_subtype_list, u32 *capabilities)
 {
-        uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LENMIN];
+        uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LENMAX];
         size_t outlen, offset, i;
         int port_num = efx_port_num(efx);
         int rc;
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
index 9d426d0457bd..c5c9747861ba 100644
--- a/drivers/net/ethernet/sfc/mcdi_pcol.h
+++ b/drivers/net/ethernet/sfc/mcdi_pcol.h
@@ -553,6 +553,7 @@
 #define          MC_CMD_PTP_MODE_V1_VLAN 0x1 /* enum */
 #define          MC_CMD_PTP_MODE_V2 0x2 /* enum */
 #define          MC_CMD_PTP_MODE_V2_VLAN 0x3 /* enum */
+#define          MC_CMD_PTP_MODE_V2_ENHANCED 0x4 /* enum */
 
 /* MC_CMD_PTP_IN_DISABLE msgrequest */
 #define    MC_CMD_PTP_IN_DISABLE_LEN 8
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 0a90abd2421b..9bd433a095c5 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -69,6 +69,12 @@
 #define EFX_TXQ_TYPES           4
 #define EFX_MAX_TX_QUEUES       (EFX_TXQ_TYPES * EFX_MAX_CHANNELS)
 
+/* Maximum possible MTU the driver supports */
+#define EFX_MAX_MTU (9 * 1024)
+
+/* Size of an RX scatter buffer.  Small enough to pack 2 into a 4K page. */
+#define EFX_RX_USR_BUF_SIZE 1824
+
 /* Forward declare Precision Time Protocol (PTP) support structure. */
 struct efx_ptp_data;
 
@@ -206,25 +212,23 @@ struct efx_tx_queue {
 /**
  * struct efx_rx_buffer - An Efx RX data buffer
  * @dma_addr: DMA base address of the buffer
- * @skb: The associated socket buffer. Valid iff !(@flags & %EFX_RX_BUF_PAGE).
- *      Will be %NULL if the buffer slot is currently free.
- * @page: The associated page buffer. Valif iff @flags & %EFX_RX_BUF_PAGE.
+ * @page: The associated page buffer.
  *      Will be %NULL if the buffer slot is currently free.
- * @page_offset: Offset within page. Valid iff @flags & %EFX_RX_BUF_PAGE.
- * @len: Buffer length, in bytes.
- * @flags: Flags for buffer and packet state.
+ * @page_offset: If pending: offset in @page of DMA base address.
+ *      If completed: offset in @page of Ethernet header.
+ * @len: If pending: length for DMA descriptor.
+ *      If completed: received length, excluding hash prefix.
+ * @flags: Flags for buffer and packet state.  These are only set on the
+ *      first buffer of a scattered packet.
  */
 struct efx_rx_buffer {
         dma_addr_t dma_addr;
-        union {
-                struct sk_buff *skb;
-                struct page *page;
-        } u;
+        struct page *page;
         u16 page_offset;
         u16 len;
         u16 flags;
 };
-#define EFX_RX_BUF_PAGE         0x0001
+#define EFX_RX_BUF_LAST_IN_PAGE 0x0001
 #define EFX_RX_PKT_CSUMMED      0x0002
 #define EFX_RX_PKT_DISCARD      0x0004
 
@@ -260,14 +264,23 @@ struct efx_rx_page_state {
  * @added_count: Number of buffers added to the receive queue.
  * @notified_count: Number of buffers given to NIC (<= @added_count).
  * @removed_count: Number of buffers removed from the receive queue.
+ * @scatter_n: Number of buffers used by current packet
+ * @page_ring: The ring to store DMA mapped pages for reuse.
+ * @page_add: Counter to calculate the write pointer for the recycle ring.
+ * @page_remove: Counter to calculate the read pointer for the recycle ring.
+ * @page_recycle_count: The number of pages that have been recycled.
+ * @page_recycle_failed: The number of pages that couldn't be recycled because
+ *      the kernel still held a reference to them.
+ * @page_recycle_full: The number of pages that were released because the
+ *      recycle ring was full.
+ * @page_ptr_mask: The number of pages in the RX recycle ring minus 1.
  * @max_fill: RX descriptor maximum fill level (<= ring size)
  * @fast_fill_trigger: RX descriptor fill level that will trigger a fast fill
  *      (<= @max_fill)
  * @min_fill: RX descriptor minimum non-zero fill level.
  *      This records the minimum fill level observed when a ring
  *      refill was triggered.
- * @alloc_page_count: RX allocation strategy counter.
- * @alloc_skb_count: RX allocation strategy counter.
+ * @recycle_count: RX buffer recycle counter.
  * @slow_fill: Timer used to defer efx_nic_generate_fill_event().
  */
 struct efx_rx_queue {
@@ -279,15 +292,22 @@ struct efx_rx_queue {
         bool enabled;
         bool flush_pending;
 
-        int added_count;
-        int notified_count;
-        int removed_count;
+        unsigned int added_count;
+        unsigned int notified_count;
+        unsigned int removed_count;
+        unsigned int scatter_n;
+        struct page **page_ring;
+        unsigned int page_add;
+        unsigned int page_remove;
+        unsigned int page_recycle_count;
+        unsigned int page_recycle_failed;
+        unsigned int page_recycle_full;
+        unsigned int page_ptr_mask;
         unsigned int max_fill;
         unsigned int fast_fill_trigger;
         unsigned int min_fill;
         unsigned int min_overfill;
-        unsigned int alloc_page_count;
-        unsigned int alloc_skb_count;
+        unsigned int recycle_count;
         struct timer_list slow_fill;
         unsigned int slow_fill_count;
 };
@@ -336,10 +356,6 @@ enum efx_rx_alloc_method {
  * @event_test_cpu: Last CPU to handle interrupt or test event for this channel
  * @irq_count: Number of IRQs since last adaptive moderation decision
  * @irq_mod_score: IRQ moderation score
- * @rx_alloc_level: Watermark based heuristic counter for pushing descriptors
- *      and diagnostic counters
- * @rx_alloc_push_pages: RX allocation method currently in use for pushing
- *      descriptors
  * @n_rx_tobe_disc: Count of RX_TOBE_DISC errors
  * @n_rx_ip_hdr_chksum_err: Count of RX IP header checksum errors
  * @n_rx_tcp_udp_chksum_err: Count of RX TCP and UDP checksum errors
@@ -347,6 +363,12 @@ enum efx_rx_alloc_method {
  * @n_rx_frm_trunc: Count of RX_FRM_TRUNC errors
  * @n_rx_overlength: Count of RX_OVERLENGTH errors
  * @n_skbuff_leaks: Count of skbuffs leaked due to RX overrun
+ * @n_rx_nodesc_trunc: Number of RX packets truncated and then dropped due to
+ *      lack of descriptors
+ * @rx_pkt_n_frags: Number of fragments in next packet to be delivered by
+ *      __efx_rx_packet(), or zero if there is none
+ * @rx_pkt_index: Ring index of first buffer for next packet to be delivered
+ *      by __efx_rx_packet(), if @rx_pkt_n_frags != 0
  * @rx_queue: RX queue for this channel
  * @tx_queue: TX queues for this channel
  */
@@ -371,9 +393,6 @@ struct efx_channel {
         unsigned int rfs_filters_added;
 #endif
 
-        int rx_alloc_level;
-        int rx_alloc_push_pages;
-
         unsigned n_rx_tobe_disc;
         unsigned n_rx_ip_hdr_chksum_err;
         unsigned n_rx_tcp_udp_chksum_err;
@@ -381,11 +400,10 @@ struct efx_channel {
         unsigned n_rx_frm_trunc;
         unsigned n_rx_overlength;
         unsigned n_skbuff_leaks;
+        unsigned int n_rx_nodesc_trunc;
 
-        /* Used to pipeline received packets in order to optimise memory
-         * access with prefetches.
-         */
-        struct efx_rx_buffer *rx_pkt;
+        unsigned int rx_pkt_n_frags;
+        unsigned int rx_pkt_index;
 
         struct efx_rx_queue rx_queue;
         struct efx_tx_queue tx_queue[EFX_TXQ_TYPES];
@@ -410,7 +428,7 @@ struct efx_channel_type {
         void (*post_remove)(struct efx_channel *);
         void (*get_name)(struct efx_channel *, char *buf, size_t len);
         struct efx_channel *(*copy)(const struct efx_channel *);
-        void (*receive_skb)(struct efx_channel *, struct sk_buff *);
+        bool (*receive_skb)(struct efx_channel *, struct sk_buff *);
         bool keep_eventq;
 };
 
@@ -446,6 +464,7 @@ enum nic_state {
         STATE_UNINIT = 0,       /* device being probed/removed or is frozen */
         STATE_READY = 1,        /* hardware ready and netdev registered */
         STATE_DISABLED = 2,     /* device disabled due to hardware errors */
+        STATE_RECOVERY = 3,     /* device recovering from PCI error */
 };
 
 /*
@@ -684,10 +703,13 @@ struct vfdi_status;
  * @n_channels: Number of channels in use
  * @n_rx_channels: Number of channels used for RX (= number of RX queues)
  * @n_tx_channels: Number of channels used for TX
- * @rx_buffer_len: RX buffer length
+ * @rx_dma_len: Current maximum RX DMA length
  * @rx_buffer_order: Order (log2) of number of pages for each RX buffer
+ * @rx_buffer_truesize: Amortised allocation size of an RX buffer,
+ *      for use in sk_buff::truesize
  * @rx_hash_key: Toeplitz hash key for RSS
  * @rx_indir_table: Indirection table for RSS
+ * @rx_scatter: Scatter mode enabled for receives
  * @int_error_count: Number of internal errors seen recently
  * @int_error_expire: Time at which error count will be expired
  * @irq_status: Interrupt status buffer
@@ -800,10 +822,15 @@ struct efx_nic {
         unsigned rss_spread;
         unsigned tx_channel_offset;
         unsigned n_tx_channels;
-        unsigned int rx_buffer_len;
+        unsigned int rx_dma_len;
         unsigned int rx_buffer_order;
+        unsigned int rx_buffer_truesize;
+        unsigned int rx_page_buf_step;
+        unsigned int rx_bufs_per_page;
+        unsigned int rx_pages_per_batch;
         u8 rx_hash_key[40];
         u32 rx_indir_table[128];
+        bool rx_scatter;
 
         unsigned int_error_count;
         unsigned long int_error_expire;
@@ -934,8 +961,9 @@ static inline unsigned int efx_port_num(struct efx_nic *efx)
  * @evq_ptr_tbl_base: Event queue pointer table base address
  * @evq_rptr_tbl_base: Event queue read-pointer table base address
  * @max_dma_mask: Maximum possible DMA mask
- * @rx_buffer_hash_size: Size of hash at start of RX buffer
- * @rx_buffer_padding: Size of padding at end of RX buffer
+ * @rx_buffer_hash_size: Size of hash at start of RX packet
+ * @rx_buffer_padding: Size of padding at end of RX packet
+ * @can_rx_scatter: NIC is able to scatter packet to multiple buffers
  * @max_interrupt_mode: Highest capability interrupt mode supported
  *      from &enum efx_init_mode.
  * @phys_addr_channels: Number of channels with physically addressed
@@ -983,6 +1011,7 @@ struct efx_nic_type {
         u64 max_dma_mask;
         unsigned int rx_buffer_hash_size;
         unsigned int rx_buffer_padding;
+        bool can_rx_scatter;
         unsigned int max_interrupt_mode;
         unsigned int phys_addr_channels;
         unsigned int timer_period_max;
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index eaa8e874a3cb..b0503cd8c2a0 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -305,11 +305,11 @@ int efx_nic_alloc_buffer(struct efx_nic *efx, struct efx_buffer *buffer,
                          unsigned int len)
 {
         buffer->addr = dma_alloc_coherent(&efx->pci_dev->dev, len,
-                                          &buffer->dma_addr, GFP_ATOMIC);
+                                          &buffer->dma_addr,
+                                          GFP_ATOMIC | __GFP_ZERO);
         if (!buffer->addr)
                 return -ENOMEM;
         buffer->len = len;
-        memset(buffer->addr, 0, len);
         return 0;
 }
 
@@ -592,12 +592,22 @@ void efx_nic_init_rx(struct efx_rx_queue *rx_queue)
         struct efx_nic *efx = rx_queue->efx;
         bool is_b0 = efx_nic_rev(efx) >= EFX_REV_FALCON_B0;
         bool iscsi_digest_en = is_b0;
+        bool jumbo_en;
+
+        /* For kernel-mode queues in Falcon A1, the JUMBO flag enables
+         * DMA to continue after a PCIe page boundary (and scattering
+         * is not possible).  In Falcon B0 and Siena, it enables
+         * scatter.
+         */
+        jumbo_en = !is_b0 || efx->rx_scatter;
 
         netif_dbg(efx, hw, efx->net_dev,
                   "RX queue %d ring in special buffers %d-%d\n",
                   efx_rx_queue_index(rx_queue), rx_queue->rxd.index,
                   rx_queue->rxd.index + rx_queue->rxd.entries - 1);
 
+        rx_queue->scatter_n = 0;
+
         /* Pin RX descriptor ring */
         efx_init_special_buffer(efx, &rx_queue->rxd);
 
@@ -614,8 +624,7 @@ void efx_nic_init_rx(struct efx_rx_queue *rx_queue)
                               FRF_AZ_RX_DESCQ_SIZE,
                               __ffs(rx_queue->rxd.entries),
                               FRF_AZ_RX_DESCQ_TYPE, 0 /* kernel queue */ ,
-                              /* For >=B0 this is scatter so disable */
-                              FRF_AZ_RX_DESCQ_JUMBO, !is_b0,
+                              FRF_AZ_RX_DESCQ_JUMBO, jumbo_en,
                               FRF_AZ_RX_DESCQ_EN, 1);
         efx_writeo_table(efx, &rx_desc_ptr, efx->type->rxd_ptr_tbl_base,
                          efx_rx_queue_index(rx_queue));
@@ -969,13 +978,24 @@ static u16 efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
                 EFX_RX_PKT_DISCARD : 0;
 }
 
-/* Handle receive events that are not in-order. */
-static void
+/* Handle receive events that are not in-order. Return true if this
+ * can be handled as a partial packet discard, false if it's more
+ * serious.
+ */
+static bool
 efx_handle_rx_bad_index(struct efx_rx_queue *rx_queue, unsigned index)
 {
+        struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
         struct efx_nic *efx = rx_queue->efx;
         unsigned expected, dropped;
 
+        if (rx_queue->scatter_n &&
+            index == ((rx_queue->removed_count + rx_queue->scatter_n - 1) &
+                      rx_queue->ptr_mask)) {
+                ++channel->n_rx_nodesc_trunc;
+                return true;
+        }
+
         expected = rx_queue->removed_count & rx_queue->ptr_mask;
         dropped = (index - expected) & rx_queue->ptr_mask;
         netif_info(efx, rx_err, efx->net_dev,
@@ -984,6 +1004,7 @@ efx_handle_rx_bad_index(struct efx_rx_queue *rx_queue, unsigned index)
 
         efx_schedule_reset(efx, EFX_WORKAROUND_5676(efx) ?
                            RESET_TYPE_RX_RECOVERY : RESET_TYPE_DISABLE);
+        return false;
 }
 
 /* Handle a packet received event
@@ -999,7 +1020,7 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
         unsigned int rx_ev_desc_ptr, rx_ev_byte_cnt;
         unsigned int rx_ev_hdr_type, rx_ev_mcast_pkt;
         unsigned expected_ptr;
-        bool rx_ev_pkt_ok;
+        bool rx_ev_pkt_ok, rx_ev_sop, rx_ev_cont;
         u16 flags;
         struct efx_rx_queue *rx_queue;
         struct efx_nic *efx = channel->efx;
@@ -1007,21 +1028,56 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
         if (unlikely(ACCESS_ONCE(efx->reset_pending)))
                 return;
 
-        /* Basic packet information */
-        rx_ev_byte_cnt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_BYTE_CNT);
-        rx_ev_pkt_ok = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PKT_OK);
-        rx_ev_hdr_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_HDR_TYPE);
-        WARN_ON(EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_JUMBO_CONT));
-        WARN_ON(EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_SOP) != 1);
+        rx_ev_cont = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_JUMBO_CONT);
+        rx_ev_sop = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_SOP);
         WARN_ON(EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_Q_LABEL) !=
                 channel->channel);
 
         rx_queue = efx_channel_get_rx_queue(channel);
 
         rx_ev_desc_ptr = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_DESC_PTR);
-        expected_ptr = rx_queue->removed_count & rx_queue->ptr_mask;
-        if (unlikely(rx_ev_desc_ptr != expected_ptr))
-                efx_handle_rx_bad_index(rx_queue, rx_ev_desc_ptr);
+        expected_ptr = ((rx_queue->removed_count + rx_queue->scatter_n) &
+                        rx_queue->ptr_mask);
+
+        /* Check for partial drops and other errors */
+        if (unlikely(rx_ev_desc_ptr != expected_ptr) ||
+            unlikely(rx_ev_sop != (rx_queue->scatter_n == 0))) {
+                if (rx_ev_desc_ptr != expected_ptr &&
+                    !efx_handle_rx_bad_index(rx_queue, rx_ev_desc_ptr))
+                        return;
+
+                /* Discard all pending fragments */
+                if (rx_queue->scatter_n) {
+                        efx_rx_packet(
+                                rx_queue,
+                                rx_queue->removed_count & rx_queue->ptr_mask,
+                                rx_queue->scatter_n, 0, EFX_RX_PKT_DISCARD);
+                        rx_queue->removed_count += rx_queue->scatter_n;
+                        rx_queue->scatter_n = 0;
+                }
+
+                /* Return if there is no new fragment */
+                if (rx_ev_desc_ptr != expected_ptr)
+                        return;
+
+                /* Discard new fragment if not SOP */
+                if (!rx_ev_sop) {
+                        efx_rx_packet(
+                                rx_queue,
+                                rx_queue->removed_count & rx_queue->ptr_mask,
+                                1, 0, EFX_RX_PKT_DISCARD);
+                        ++rx_queue->removed_count;
+                        return;
+                }
+        }
+
+        ++rx_queue->scatter_n;
+        if (rx_ev_cont)
+                return;
+
+        rx_ev_byte_cnt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_BYTE_CNT);
+        rx_ev_pkt_ok = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PKT_OK);
+        rx_ev_hdr_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_HDR_TYPE);
 
         if (likely(rx_ev_pkt_ok)) {
                 /* If packet is marked as OK and packet type is TCP/IP or
@@ -1049,7 +1105,11 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
         channel->irq_mod_score += 2;
 
         /* Handle received packet */
-        efx_rx_packet(rx_queue, rx_ev_desc_ptr, rx_ev_byte_cnt, flags);
+        efx_rx_packet(rx_queue,
+                      rx_queue->removed_count & rx_queue->ptr_mask,
+                      rx_queue->scatter_n, rx_ev_byte_cnt, flags);
+        rx_queue->removed_count += rx_queue->scatter_n;
+        rx_queue->scatter_n = 0;
 }
 
 /* If this flush done event corresponds to a &struct efx_tx_queue, then
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index 3f93624fc273..07f6baa15c0c 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -99,6 +99,9 @@
 #define PTP_V2_VERSION_LENGTH   1
 #define PTP_V2_VERSION_OFFSET   29
 
+#define PTP_V2_UUID_LENGTH      8
+#define PTP_V2_UUID_OFFSET      48
+
 /* Although PTP V2 UUIDs are comprised a ClockIdentity (8) and PortNumber (2),
  * the MC only captures the last six bytes of the clock identity. These values
  * reflect those, not the ones used in the standard.  The standard permits
@@ -429,13 +432,10 @@ static int efx_ptp_process_times(struct efx_nic *efx, u8 *synch_buf,
         unsigned number_readings = (response_length /
                                MC_CMD_PTP_OUT_SYNCHRONIZE_TIMESET_LEN);
         unsigned i;
-        unsigned min;
-        unsigned min_set = 0;
         unsigned total;
         unsigned ngood = 0;
         unsigned last_good = 0;
         struct efx_ptp_data *ptp = efx->ptp_data;
-        bool min_valid = false;
         u32 last_sec;
         u32 start_sec;
         struct timespec delta;
@@ -443,35 +443,17 @@ static int efx_ptp_process_times(struct efx_nic *efx, u8 *synch_buf,
         if (number_readings == 0)
                 return -EAGAIN;
 
-        /* Find minimum value in this set of results, discarding clearly
-         * erroneous results.
+        /* Read the set of results and increment stats for any results that
+         * appera to be erroneous.
          */
         for (i = 0; i < number_readings; i++) {
                 efx_ptp_read_timeset(synch_buf, &ptp->timeset[i]);
                 synch_buf += MC_CMD_PTP_OUT_SYNCHRONIZE_TIMESET_LEN;
-                if (ptp->timeset[i].window > SYNCHRONISATION_GRANULARITY_NS) {
-                        if (min_valid) {
-                                if (ptp->timeset[i].window < min_set)
-                                        min_set = ptp->timeset[i].window;
-                        } else {
-                                min_valid = true;
-                                min_set = ptp->timeset[i].window;
-                        }
-                }
-        }
-
-        if (min_valid) {
-                if (ptp->base_sync_valid && (min_set > ptp->base_sync_ns))
-                        min = ptp->base_sync_ns;
-                else
-                        min = min_set;
-        } else {
-                min = SYNCHRONISATION_GRANULARITY_NS;
         }
 
-        /* Discard excessively long synchronise durations.  The MC times
-         * when it finishes reading the host time so the corrected window
-         * time should be fairly constant for a given platform.
+        /* Find the last good host-MC synchronization result. The MC times
+         * when it finishes reading the host time so the corrected window time
+         * should be fairly constant for a given platform.
          */
         total = 0;
         for (i = 0; i < number_readings; i++)
@@ -489,8 +471,8 @@ static int efx_ptp_process_times(struct efx_nic *efx, u8 *synch_buf,
 
         if (ngood == 0) {
                 netif_warn(efx, drv, efx->net_dev,
-                           "PTP no suitable synchronisations %dns %dns\n",
-                           ptp->base_sync_ns, min_set);
+                           "PTP no suitable synchronisations %dns\n",
+                           ptp->base_sync_ns);
                 return -EAGAIN;
         }
 
@@ -1006,43 +988,53 @@ bool efx_ptp_is_ptp_tx(struct efx_nic *efx, struct sk_buff *skb)
  * the receive timestamp from the MC - this will probably occur after the
  * packet arrival because of the processing in the MC.
  */
-static void efx_ptp_rx(struct efx_channel *channel, struct sk_buff *skb)
+static bool efx_ptp_rx(struct efx_channel *channel, struct sk_buff *skb)
 {
         struct efx_nic *efx = channel->efx;
         struct efx_ptp_data *ptp = efx->ptp_data;
         struct efx_ptp_match *match = (struct efx_ptp_match *)skb->cb;
-        u8 *data;
+        u8 *match_data_012, *match_data_345;
         unsigned int version;
 
         match->expiry = jiffies + msecs_to_jiffies(PKT_EVENT_LIFETIME_MS);
 
         /* Correct version? */
         if (ptp->mode == MC_CMD_PTP_MODE_V1) {
-                if (skb->len < PTP_V1_MIN_LENGTH) {
-                        netif_receive_skb(skb);
-                        return;
+                if (!pskb_may_pull(skb, PTP_V1_MIN_LENGTH)) {
+                        return false;
                 }
                 version = ntohs(*(__be16 *)&skb->data[PTP_V1_VERSION_OFFSET]);
                 if (version != PTP_VERSION_V1) {
-                        netif_receive_skb(skb);
-                        return;
+                        return false;
                 }
+
+                /* PTP V1 uses all six bytes of the UUID to match the packet
+                 * to the timestamp
+                 */
+                match_data_012 = skb->data + PTP_V1_UUID_OFFSET;
+                match_data_345 = skb->data + PTP_V1_UUID_OFFSET + 3;
         } else {
-                if (skb->len < PTP_V2_MIN_LENGTH) {
-                        netif_receive_skb(skb);
-                        return;
+                if (!pskb_may_pull(skb, PTP_V2_MIN_LENGTH)) {
+                        return false;
                 }
                 version = skb->data[PTP_V2_VERSION_OFFSET];
-
-                BUG_ON(ptp->mode != MC_CMD_PTP_MODE_V2);
-                BUILD_BUG_ON(PTP_V1_UUID_OFFSET != PTP_V2_MC_UUID_OFFSET);
-                BUILD_BUG_ON(PTP_V1_UUID_LENGTH != PTP_V2_MC_UUID_LENGTH);
-                BUILD_BUG_ON(PTP_V1_SEQUENCE_OFFSET != PTP_V2_SEQUENCE_OFFSET);
-                BUILD_BUG_ON(PTP_V1_SEQUENCE_LENGTH != PTP_V2_SEQUENCE_LENGTH);
-
                 if ((version & PTP_VERSION_V2_MASK) != PTP_VERSION_V2) {
-                        netif_receive_skb(skb);
-                        return;
+                        return false;
+                }
+
+                /* The original V2 implementation uses bytes 2-7 of
+                 * the UUID to match the packet to the timestamp. This
+                 * discards two of the bytes of the MAC address used
+                 * to create the UUID (SF bug 33070).  The PTP V2
+                 * enhanced mode fixes this issue and uses bytes 0-2
+                 * and byte 5-7 of the UUID.
+                 */
+                match_data_345 = skb->data + PTP_V2_UUID_OFFSET + 5;
+                if (ptp->mode == MC_CMD_PTP_MODE_V2) {
+                        match_data_012 = skb->data + PTP_V2_UUID_OFFSET + 2;
+                } else {
+                        match_data_012 = skb->data + PTP_V2_UUID_OFFSET + 0;
+                        BUG_ON(ptp->mode != MC_CMD_PTP_MODE_V2_ENHANCED);
                 }
         }
 
@@ -1056,14 +1048,19 @@ static void efx_ptp_rx(struct efx_channel *channel, struct sk_buff *skb)
                 timestamps = skb_hwtstamps(skb);
                 memset(timestamps, 0, sizeof(*timestamps));
 
+                /* We expect the sequence number to be in the same position in
+                 * the packet for PTP V1 and V2
+                 */
+                BUILD_BUG_ON(PTP_V1_SEQUENCE_OFFSET != PTP_V2_SEQUENCE_OFFSET);
+                BUILD_BUG_ON(PTP_V1_SEQUENCE_LENGTH != PTP_V2_SEQUENCE_LENGTH);
+
                 /* Extract UUID/Sequence information */
-                data = skb->data + PTP_V1_UUID_OFFSET;
-                match->words[0] = (data[0]         |
-                                   (data[1] << 8)  |
-                                   (data[2] << 16) |
-                                   (data[3] << 24));
-                match->words[1] = (data[4]         |
-                                   (data[5] << 8)  |
+                match->words[0] = (match_data_012[0]         |
+                                   (match_data_012[1] << 8)  |
+                                   (match_data_012[2] << 16) |
+                                   (match_data_345[0] << 24));
+                match->words[1] = (match_data_345[1]         |
+                                   (match_data_345[2] << 8)  |
                                    (skb->data[PTP_V1_SEQUENCE_OFFSET +
                                               PTP_V1_SEQUENCE_LENGTH - 1] <<
                                     16));
@@ -1073,6 +1070,8 @@ static void efx_ptp_rx(struct efx_channel *channel, struct sk_buff *skb)
 
         skb_queue_tail(&ptp->rxq, skb);
         queue_work(ptp->workwq, &ptp->work);
+
+        return true;
 }
 
 /* Transmit a PTP packet.  This has to be transmitted by the MC
@@ -1167,7 +1166,7 @@ static int efx_ptp_ts_init(struct efx_nic *efx, struct hwtstamp_config *init)
          * timestamped
          */
                 init->rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
-                new_mode = MC_CMD_PTP_MODE_V2;
+                new_mode = MC_CMD_PTP_MODE_V2_ENHANCED;
                 enable_wanted = true;
                 break;
         case HWTSTAMP_FILTER_PTP_V2_EVENT:
@@ -1186,7 +1185,14 @@ static int efx_ptp_ts_init(struct efx_nic *efx, struct hwtstamp_config *init)
         if (init->tx_type != HWTSTAMP_TX_OFF)
                 enable_wanted = true;
 
+        /* Old versions of the firmware do not support the improved
+         * UUID filtering option (SF bug 33070).  If the firmware does
+         * not accept the enhanced mode, fall back to the standard PTP
+         * v2 UUID filtering.
+         */
         rc = efx_ptp_change_mode(efx, enable_wanted, new_mode);
+        if ((rc != 0) && (new_mode == MC_CMD_PTP_MODE_V2_ENHANCED))
+                rc = efx_ptp_change_mode(efx, enable_wanted, MC_CMD_PTP_MODE_V2);
         if (rc != 0)
                 return rc;
 
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index bb579a6128c8..e73e30bac10e 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -16,6 +16,7 @@
 #include <linux/udp.h>
 #include <linux/prefetch.h>
 #include <linux/moduleparam.h>
+#include <linux/iommu.h>
 #include <net/ip.h>
 #include <net/checksum.h>
 #include "net_driver.h"
@@ -24,85 +25,39 @@
 #include "selftest.h"
 #include "workarounds.h"
 
-/* Number of RX descriptors pushed at once. */
-#define EFX_RX_BATCH  8
+/* Preferred number of descriptors to fill at once */
+#define EFX_RX_PREFERRED_BATCH 8U
 
-/* Maximum size of a buffer sharing a page */
-#define EFX_RX_HALF_PAGE ((PAGE_SIZE >> 1) - sizeof(struct efx_rx_page_state))
+/* Number of RX buffers to recycle pages for.  When creating the RX page recycle
+ * ring, this number is divided by the number of buffers per page to calculate
+ * the number of pages to store in the RX page recycle ring.
+ */
+#define EFX_RECYCLE_RING_SIZE_IOMMU 4096
+#define EFX_RECYCLE_RING_SIZE_NOIOMMU (2 * EFX_RX_PREFERRED_BATCH)
 
 /* Size of buffer allocated for skb header area. */
 #define EFX_SKB_HEADERS  64u
 
-/*
- * rx_alloc_method - RX buffer allocation method
- *
- * This driver supports two methods for allocating and using RX buffers:
- * each RX buffer may be backed by an skb or by an order-n page.
- *
- * When GRO is in use then the second method has a lower overhead,
- * since we don't have to allocate then free skbs on reassembled frames.
- *
- * Values:
- *   - RX_ALLOC_METHOD_AUTO = 0
- *   - RX_ALLOC_METHOD_SKB  = 1
- *   - RX_ALLOC_METHOD_PAGE = 2
- *
- * The heuristic for %RX_ALLOC_METHOD_AUTO is a simple hysteresis count
- * controlled by the parameters below.
- *
- *   - Since pushing and popping descriptors are separated by the rx_queue
- *     size, so the watermarks should be ~rxd_size.
- *   - The performance win by using page-based allocation for GRO is less
- *     than the performance hit of using page-based allocation of non-GRO,
- *     so the watermarks should reflect this.
- *
- * Per channel we maintain a single variable, updated by each channel:
- *
- *   rx_alloc_level += (gro_performed ? RX_ALLOC_FACTOR_GRO :
- *                      RX_ALLOC_FACTOR_SKB)
- * Per NAPI poll interval, we constrain rx_alloc_level to 0..MAX (which
- * limits the hysteresis), and update the allocation strategy:
- *
- *   rx_alloc_method = (rx_alloc_level > RX_ALLOC_LEVEL_GRO ?
- *                      RX_ALLOC_METHOD_PAGE : RX_ALLOC_METHOD_SKB)
- */
-static int rx_alloc_method = RX_ALLOC_METHOD_AUTO;
-
-#define RX_ALLOC_LEVEL_GRO 0x2000
-#define RX_ALLOC_LEVEL_MAX 0x3000
-#define RX_ALLOC_FACTOR_GRO 1
-#define RX_ALLOC_FACTOR_SKB (-2)
-
 /* This is the percentage fill level below which new RX descriptors
  * will be added to the RX descriptor ring.
  */
 static unsigned int rx_refill_threshold;
 
+/* Each packet can consume up to ceil(max_frame_len / buffer_size) buffers */
+#define EFX_RX_MAX_FRAGS DIV_ROUND_UP(EFX_MAX_FRAME_LEN(EFX_MAX_MTU), \
+                                      EFX_RX_USR_BUF_SIZE)
+
 /*
  * RX maximum head room required.
  *
- * This must be at least 1 to prevent overflow and at least 2 to allow
- * pipelined receives.
+ * This must be at least 1 to prevent overflow, plus one packet-worth
+ * to allow pipelined receives.
  */
-#define EFX_RXD_HEAD_ROOM 2
+#define EFX_RXD_HEAD_ROOM (1 + EFX_RX_MAX_FRAGS)
 
-/* Offset of ethernet header within page */
-static inline unsigned int efx_rx_buf_offset(struct efx_nic *efx,
-                                             struct efx_rx_buffer *buf)
+static inline u8 *efx_rx_buf_va(struct efx_rx_buffer *buf)
 {
-        return buf->page_offset + efx->type->rx_buffer_hash_size;
-}
-static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
-{
-        return PAGE_SIZE << efx->rx_buffer_order;
-}
-
-static u8 *efx_rx_buf_eh(struct efx_nic *efx, struct efx_rx_buffer *buf)
-{
-        if (buf->flags & EFX_RX_BUF_PAGE)
-                return page_address(buf->u.page) + efx_rx_buf_offset(efx, buf);
-        else
-                return (u8 *)buf->u.skb->data + efx->type->rx_buffer_hash_size;
+        return page_address(buf->page) + buf->page_offset;
 }
 
 static inline u32 efx_rx_buf_hash(const u8 *eh)
@@ -119,66 +74,81 @@ static inline u32 efx_rx_buf_hash(const u8 *eh)
 #endif
 }
 
-/**
- * efx_init_rx_buffers_skb - create EFX_RX_BATCH skb-based RX buffers
- *
- * @rx_queue:           Efx RX queue
- *
- * This allocates EFX_RX_BATCH skbs, maps them for DMA, and populates a
- * struct efx_rx_buffer for each one. Return a negative error code or 0
- * on success. May fail having only inserted fewer than EFX_RX_BATCH
- * buffers.
- */
-static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
+static inline struct efx_rx_buffer *
+efx_rx_buf_next(struct efx_rx_queue *rx_queue, struct efx_rx_buffer *rx_buf)
+{
+        if (unlikely(rx_buf == efx_rx_buffer(rx_queue, rx_queue->ptr_mask)))
+                return efx_rx_buffer(rx_queue, 0);
+        else
+                return rx_buf + 1;
+}
+
+static inline void efx_sync_rx_buffer(struct efx_nic *efx,
+                                      struct efx_rx_buffer *rx_buf,
+                                      unsigned int len)
+{
+        dma_sync_single_for_cpu(&efx->pci_dev->dev, rx_buf->dma_addr, len,
+                                DMA_FROM_DEVICE);
+}
+
+void efx_rx_config_page_split(struct efx_nic *efx)
+{
+        efx->rx_page_buf_step = ALIGN(efx->rx_dma_len + EFX_PAGE_IP_ALIGN,
+                                      L1_CACHE_BYTES);
+        efx->rx_bufs_per_page = efx->rx_buffer_order ? 1 :
+                ((PAGE_SIZE - sizeof(struct efx_rx_page_state)) /
+                 efx->rx_page_buf_step);
+        efx->rx_buffer_truesize = (PAGE_SIZE << efx->rx_buffer_order) /
+                efx->rx_bufs_per_page;
+        efx->rx_pages_per_batch = DIV_ROUND_UP(EFX_RX_PREFERRED_BATCH,
+                                               efx->rx_bufs_per_page);
+}
+
+/* Check the RX page recycle ring for a page that can be reused. */
+static struct page *efx_reuse_page(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
-        struct net_device *net_dev = efx->net_dev;
-        struct efx_rx_buffer *rx_buf;
-        struct sk_buff *skb;
-        int skb_len = efx->rx_buffer_len;
-        unsigned index, count;
+        struct page *page;
+        struct efx_rx_page_state *state;
+        unsigned index;
 
-        for (count = 0; count < EFX_RX_BATCH; ++count) {
-                index = rx_queue->added_count & rx_queue->ptr_mask;
-                rx_buf = efx_rx_buffer(rx_queue, index);
-
-                rx_buf->u.skb = skb = netdev_alloc_skb(net_dev, skb_len);
-                if (unlikely(!skb))
-                        return -ENOMEM;
-
-                /* Adjust the SKB for padding */
-                skb_reserve(skb, NET_IP_ALIGN);
-                rx_buf->len = skb_len - NET_IP_ALIGN;
-                rx_buf->flags = 0;
-
-                rx_buf->dma_addr = dma_map_single(&efx->pci_dev->dev,
-                                                  skb->data, rx_buf->len,
-                                                  DMA_FROM_DEVICE);
-                if (unlikely(dma_mapping_error(&efx->pci_dev->dev,
-                                               rx_buf->dma_addr))) {
-                        dev_kfree_skb_any(skb);
-                        rx_buf->u.skb = NULL;
-                        return -EIO;
-                }
+        index = rx_queue->page_remove & rx_queue->page_ptr_mask;
+        page = rx_queue->page_ring[index];
+        if (page == NULL)
+                return NULL;
+
+        rx_queue->page_ring[index] = NULL;
+        /* page_remove cannot exceed page_add. */
+        if (rx_queue->page_remove != rx_queue->page_add)
+                ++rx_queue->page_remove;
 
-                ++rx_queue->added_count;
-                ++rx_queue->alloc_skb_count;
+        /* If page_count is 1 then we hold the only reference to this page. */
+        if (page_count(page) == 1) {
+                ++rx_queue->page_recycle_count;
+                return page;
+        } else {
+                state = page_address(page);
+                dma_unmap_page(&efx->pci_dev->dev, state->dma_addr,
+                               PAGE_SIZE << efx->rx_buffer_order,
+                               DMA_FROM_DEVICE);
+                put_page(page);
+                ++rx_queue->page_recycle_failed;
         }
 
-        return 0;
+        return NULL;
 }
 
 /**
- * efx_init_rx_buffers_page - create EFX_RX_BATCH page-based RX buffers
+ * efx_init_rx_buffers - create EFX_RX_BATCH page-based RX buffers
  *
  * @rx_queue:           Efx RX queue
  *
- * This allocates memory for EFX_RX_BATCH receive buffers, maps them for DMA,
- * and populates struct efx_rx_buffers for each one. Return a negative error
- * code or 0 on success. If a single page can be split between two buffers,
- * then the page will either be inserted fully, or not at at all.
+ * This allocates a batch of pages, maps them for DMA, and populates
+ * struct efx_rx_buffers for each one. Return a negative error code or
+ * 0 on success. If a single page can be used for multiple buffers,
+ * then the page will either be inserted fully, or not at all.
  */
-static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
+static int efx_init_rx_buffers(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
         struct efx_rx_buffer *rx_buf;
@@ -188,150 +158,140 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
         dma_addr_t dma_addr;
         unsigned index, count;
 
-        /* We can split a page between two buffers */
-        BUILD_BUG_ON(EFX_RX_BATCH & 1);
-
-        for (count = 0; count < EFX_RX_BATCH; ++count) {
-                page = alloc_pages(__GFP_COLD | __GFP_COMP | GFP_ATOMIC,
-                                   efx->rx_buffer_order);
-                if (unlikely(page == NULL))
-                        return -ENOMEM;
-                dma_addr = dma_map_page(&efx->pci_dev->dev, page, 0,
-                                        efx_rx_buf_size(efx),
-                                        DMA_FROM_DEVICE);
-                if (unlikely(dma_mapping_error(&efx->pci_dev->dev, dma_addr))) {
-                        __free_pages(page, efx->rx_buffer_order);
-                        return -EIO;
+        count = 0;
+        do {
+                page = efx_reuse_page(rx_queue);
+                if (page == NULL) {
+                        page = alloc_pages(__GFP_COLD | __GFP_COMP | GFP_ATOMIC,
+                                           efx->rx_buffer_order);
+                        if (unlikely(page == NULL))
+                                return -ENOMEM;
+                        dma_addr =
+                                dma_map_page(&efx->pci_dev->dev, page, 0,
+                                             PAGE_SIZE << efx->rx_buffer_order,
+                                             DMA_FROM_DEVICE);
+                        if (unlikely(dma_mapping_error(&efx->pci_dev->dev,
+                                                       dma_addr))) {
+                                __free_pages(page, efx->rx_buffer_order);
+                                return -EIO;
+                        }
+                        state = page_address(page);
+                        state->dma_addr = dma_addr;
+                } else {
+                        state = page_address(page);
+                        dma_addr = state->dma_addr;
                 }
-                state = page_address(page);
-                state->refcnt = 0;
-                state->dma_addr = dma_addr;
 
                 dma_addr += sizeof(struct efx_rx_page_state);
                 page_offset = sizeof(struct efx_rx_page_state);
 
-        split:
-                index = rx_queue->added_count & rx_queue->ptr_mask;
-                rx_buf = efx_rx_buffer(rx_queue, index);
-                rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
-                rx_buf->u.page = page;
-                rx_buf->page_offset = page_offset + EFX_PAGE_IP_ALIGN;
-                rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
-                rx_buf->flags = EFX_RX_BUF_PAGE;
-                ++rx_queue->added_count;
-                ++rx_queue->alloc_page_count;
-                ++state->refcnt;
-
-                if ((~count & 1) && (efx->rx_buffer_len <= EFX_RX_HALF_PAGE)) {
-                        /* Use the second half of the page */
+                do {
+                        index = rx_queue->added_count & rx_queue->ptr_mask;
+                        rx_buf = efx_rx_buffer(rx_queue, index);
+                        rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
+                        rx_buf->page = page;
+                        rx_buf->page_offset = page_offset + EFX_PAGE_IP_ALIGN;
+                        rx_buf->len = efx->rx_dma_len;
+                        rx_buf->flags = 0;
+                        ++rx_queue->added_count;
                         get_page(page);
-                        dma_addr += (PAGE_SIZE >> 1);
-                        page_offset += (PAGE_SIZE >> 1);
-                        ++count;
-                        goto split;
-                }
-        }
+                        dma_addr += efx->rx_page_buf_step;
+                        page_offset += efx->rx_page_buf_step;
+                } while (page_offset + efx->rx_page_buf_step <= PAGE_SIZE);
+
+                rx_buf->flags = EFX_RX_BUF_LAST_IN_PAGE;
+        } while (++count < efx->rx_pages_per_batch);
 
         return 0;
 }
 
+/* Unmap a DMA-mapped page.  This function is only called for the final RX
+ * buffer in a page.
+ */
 static void efx_unmap_rx_buffer(struct efx_nic *efx,
-                                struct efx_rx_buffer *rx_buf,
-                                unsigned int used_len)
+                                struct efx_rx_buffer *rx_buf)
 {
-        if ((rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.page) {
-                struct efx_rx_page_state *state;
-
-                state = page_address(rx_buf->u.page);
-                if (--state->refcnt == 0) {
-                        dma_unmap_page(&efx->pci_dev->dev,
-                                       state->dma_addr,
-                                       efx_rx_buf_size(efx),
-                                       DMA_FROM_DEVICE);
-                } else if (used_len) {
-                        dma_sync_single_for_cpu(&efx->pci_dev->dev,
-                                                rx_buf->dma_addr, used_len,
-                                                DMA_FROM_DEVICE);
-                }
-        } else if (!(rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.skb) {
-                dma_unmap_single(&efx->pci_dev->dev, rx_buf->dma_addr,
-                                 rx_buf->len, DMA_FROM_DEVICE);
+        struct page *page = rx_buf->page;
+
+        if (page) {
+                struct efx_rx_page_state *state = page_address(page);
+                dma_unmap_page(&efx->pci_dev->dev,
+                               state->dma_addr,
+                               PAGE_SIZE << efx->rx_buffer_order,
+                               DMA_FROM_DEVICE);
         }
 }
 
-static void efx_free_rx_buffer(struct efx_nic *efx,
-                               struct efx_rx_buffer *rx_buf)
+static void efx_free_rx_buffer(struct efx_rx_buffer *rx_buf)
 {
-        if ((rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.page) {
-                __free_pages(rx_buf->u.page, efx->rx_buffer_order);
-                rx_buf->u.page = NULL;
-        } else if (!(rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.skb) {
-                dev_kfree_skb_any(rx_buf->u.skb);
-                rx_buf->u.skb = NULL;
+        if (rx_buf->page) {
+                put_page(rx_buf->page);
+                rx_buf->page = NULL;
         }
 }
 
-static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,
-                               struct efx_rx_buffer *rx_buf)
+/* Attempt to recycle the page if there is an RX recycle ring; the page can
+ * only be added if this is the final RX buffer, to prevent pages being used in
+ * the descriptor ring and appearing in the recycle ring simultaneously.
+ */
+static void efx_recycle_rx_page(struct efx_channel *channel,
+                                struct efx_rx_buffer *rx_buf)
 {
-        efx_unmap_rx_buffer(rx_queue->efx, rx_buf, 0);
-        efx_free_rx_buffer(rx_queue->efx, rx_buf);
-}
+        struct page *page = rx_buf->page;
+        struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
+        struct efx_nic *efx = rx_queue->efx;
+        unsigned index;
 
-/* Attempt to resurrect the other receive buffer that used to share this page,
- * which had previously been passed up to the kernel and freed. */
-static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue,
-                                    struct efx_rx_buffer *rx_buf)
-{
-        struct efx_rx_page_state *state = page_address(rx_buf->u.page);
-        struct efx_rx_buffer *new_buf;
-        unsigned fill_level, index;
-
-        /* +1 because efx_rx_packet() incremented removed_count. +1 because
-         * we'd like to insert an additional descriptor whilst leaving
-         * EFX_RXD_HEAD_ROOM for the non-recycle path */
-        fill_level = (rx_queue->added_count - rx_queue->removed_count + 2);
-        if (unlikely(fill_level > rx_queue->max_fill)) {
-                /* We could place "state" on a list, and drain the list in
-                 * efx_fast_push_rx_descriptors(). For now, this will do. */
+        /* Only recycle the page after processing the final buffer. */
+        if (!(rx_buf->flags & EFX_RX_BUF_LAST_IN_PAGE))
                 return;
-        }
 
-        ++state->refcnt;
-        get_page(rx_buf->u.page);
+        index = rx_queue->page_add & rx_queue->page_ptr_mask;
+        if (rx_queue->page_ring[index] == NULL) {
+                unsigned read_index = rx_queue->page_remove &
+                        rx_queue->page_ptr_mask;
 
-        index = rx_queue->added_count & rx_queue->ptr_mask;
-        new_buf = efx_rx_buffer(rx_queue, index);
-        new_buf->dma_addr = rx_buf->dma_addr ^ (PAGE_SIZE >> 1);
-        new_buf->u.page = rx_buf->u.page;
-        new_buf->len = rx_buf->len;
-        new_buf->flags = EFX_RX_BUF_PAGE;
-        ++rx_queue->added_count;
+                /* The next slot in the recycle ring is available, but
+                 * increment page_remove if the read pointer currently
+                 * points here.
+                 */
+                if (read_index == index)
+                        ++rx_queue->page_remove;
+                rx_queue->page_ring[index] = page;
+                ++rx_queue->page_add;
+                return;
+        }
+        ++rx_queue->page_recycle_full;
+        efx_unmap_rx_buffer(efx, rx_buf);
+        put_page(rx_buf->page);
 }
 
-/* Recycle the given rx buffer directly back into the rx_queue. There is
- * always room to add this buffer, because we've just popped a buffer. */
-static void efx_recycle_rx_buffer(struct efx_channel *channel,
-                                  struct efx_rx_buffer *rx_buf)
+static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,
+                               struct efx_rx_buffer *rx_buf)
 {
-        struct efx_nic *efx = channel->efx;
-        struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
-        struct efx_rx_buffer *new_buf;
-        unsigned index;
-
-        rx_buf->flags &= EFX_RX_BUF_PAGE;
-
-        if ((rx_buf->flags & EFX_RX_BUF_PAGE) &&
-            efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
-            page_count(rx_buf->u.page) == 1)
-                efx_resurrect_rx_buffer(rx_queue, rx_buf);
+        /* Release the page reference we hold for the buffer. */
+        if (rx_buf->page)
+                put_page(rx_buf->page);
+
+        /* If this is the last buffer in a page, unmap and free it. */
+        if (rx_buf->flags & EFX_RX_BUF_LAST_IN_PAGE) {
+                efx_unmap_rx_buffer(rx_queue->efx, rx_buf);
+                efx_free_rx_buffer(rx_buf);
+        }
+        rx_buf->page = NULL;
+}
 
-        index = rx_queue->added_count & rx_queue->ptr_mask;
-        new_buf = efx_rx_buffer(rx_queue, index);
+/* Recycle the pages that are used by buffers that have just been received. */
+static void efx_recycle_rx_buffers(struct efx_channel *channel,
+                                   struct efx_rx_buffer *rx_buf,
+                                   unsigned int n_frags)
+{
+        struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
 
-        memcpy(new_buf, rx_buf, sizeof(*new_buf));
-        rx_buf->u.page = NULL;
-        ++rx_queue->added_count;
+        do {
+                efx_recycle_rx_page(channel, rx_buf);
+                rx_buf = efx_rx_buf_next(rx_queue, rx_buf);
+        } while (--n_frags);
 }
 
 /**
@@ -348,8 +308,8 @@ static void efx_recycle_rx_buffer(struct efx_channel *channel,
  */
 void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
 {
-        struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
-        unsigned fill_level;
+        struct efx_nic *efx = rx_queue->efx;
+        unsigned int fill_level, batch_size;
         int space, rc = 0;
 
         /* Calculate current fill level, and exit if we don't need to fill */
@@ -364,28 +324,26 @@ void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
                         rx_queue->min_fill = fill_level;
         }
 
+        batch_size = efx->rx_pages_per_batch * efx->rx_bufs_per_page;
         space = rx_queue->max_fill - fill_level;
-        EFX_BUG_ON_PARANOID(space < EFX_RX_BATCH);
+        EFX_BUG_ON_PARANOID(space < batch_size);
 
         netif_vdbg(rx_queue->efx, rx_status, rx_queue->efx->net_dev,
                    "RX queue %d fast-filling descriptor ring from"
-                   " level %d to level %d using %s allocation\n",
+                   " level %d to level %d\n",
                    efx_rx_queue_index(rx_queue), fill_level,
-                   rx_queue->max_fill,
-                   channel->rx_alloc_push_pages ? "page" : "skb");
+                   rx_queue->max_fill);
+
 
         do {
-                if (channel->rx_alloc_push_pages)
-                        rc = efx_init_rx_buffers_page(rx_queue);
-                else
-                        rc = efx_init_rx_buffers_skb(rx_queue);
+                rc = efx_init_rx_buffers(rx_queue);
                 if (unlikely(rc)) {
                         /* Ensure that we don't leave the rx queue empty */
                         if (rx_queue->added_count == rx_queue->removed_count)
                                 efx_schedule_slow_fill(rx_queue);
                         goto out;
                 }
-        } while ((space -= EFX_RX_BATCH) >= EFX_RX_BATCH);
+        } while ((space -= batch_size) >= batch_size);
 
         netif_vdbg(rx_queue->efx, rx_status, rx_queue->efx->net_dev,
                    "RX queue %d fast-filled descriptor ring "
@@ -408,7 +366,7 @@ void efx_rx_slow_fill(unsigned long context)
 
 static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
                                      struct efx_rx_buffer *rx_buf,
-                                     int len, bool *leak_packet)
+                                     int len)
 {
         struct efx_nic *efx = rx_queue->efx;
         unsigned max_len = rx_buf->len - efx->type->rx_buffer_padding;
@@ -428,11 +386,6 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
                                   "RX event (0x%x > 0x%x+0x%x). Leaking\n",
                                   efx_rx_queue_index(rx_queue), len, max_len,
                                   efx->type->rx_buffer_padding);
-                /* If this buffer was skb-allocated, then the meta
-                 * data at the end of the skb will be trashed. So
-                 * we have no choice but to leak the fragment.
-                 */
-                *leak_packet = !(rx_buf->flags & EFX_RX_BUF_PAGE);
                 efx_schedule_reset(efx, RESET_TYPE_RX_RECOVERY);
         } else {
                 if (net_ratelimit())
@@ -448,212 +401,238 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
 /* Pass a received packet up through GRO.  GRO can handle pages
  * regardless of checksum state and skbs with a good checksum.
  */
-static void efx_rx_packet_gro(struct efx_channel *channel,
-                              struct efx_rx_buffer *rx_buf,
-                              const u8 *eh)
+static void
+efx_rx_packet_gro(struct efx_channel *channel, struct efx_rx_buffer *rx_buf,
+                  unsigned int n_frags, u8 *eh)
 {
         struct napi_struct *napi = &channel->napi_str;
         gro_result_t gro_result;
+        struct efx_nic *efx = channel->efx;
+        struct sk_buff *skb;
 
-        if (rx_buf->flags & EFX_RX_BUF_PAGE) {
-                struct efx_nic *efx = channel->efx;
-                struct page *page = rx_buf->u.page;
-                struct sk_buff *skb;
+        skb = napi_get_frags(napi);
+        if (unlikely(!skb)) {
+                while (n_frags--) {
+                        put_page(rx_buf->page);
+                        rx_buf->page = NULL;
+                        rx_buf = efx_rx_buf_next(&channel->rx_queue, rx_buf);
+                }
+                return;
+        }
 
-                rx_buf->u.page = NULL;
+        if (efx->net_dev->features & NETIF_F_RXHASH)
+                skb->rxhash = efx_rx_buf_hash(eh);
+        skb->ip_summed = ((rx_buf->flags & EFX_RX_PKT_CSUMMED) ?
+                          CHECKSUM_UNNECESSARY : CHECKSUM_NONE);
+
+        for (;;) {
+                skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
+                                   rx_buf->page, rx_buf->page_offset,
+                                   rx_buf->len);
+                rx_buf->page = NULL;
+                skb->len += rx_buf->len;
+                if (skb_shinfo(skb)->nr_frags == n_frags)
+                        break;
+
+                rx_buf = efx_rx_buf_next(&channel->rx_queue, rx_buf);
+        }
 
-                skb = napi_get_frags(napi);
-                if (!skb) {
-                        put_page(page);
-                        return;
-                }
+        skb->data_len = skb->len;
+        skb->truesize += n_frags * efx->rx_buffer_truesize;
+
+        skb_record_rx_queue(skb, channel->rx_queue.core_index);
+
+        gro_result = napi_gro_frags(napi);
+        if (gro_result != GRO_DROP)
+                channel->irq_mod_score += 2;
+}
 
-                if (efx->net_dev->features & NETIF_F_RXHASH)
-                        skb->rxhash = efx_rx_buf_hash(eh);
+/* Allocate and construct an SKB around page fragments */
+static struct sk_buff *efx_rx_mk_skb(struct efx_channel *channel,
+                                     struct efx_rx_buffer *rx_buf,
+                                     unsigned int n_frags,
+                                     u8 *eh, int hdr_len)
+{
+        struct efx_nic *efx = channel->efx;
+        struct sk_buff *skb;
 
-                skb_fill_page_desc(skb, 0, page,
-                                   efx_rx_buf_offset(efx, rx_buf), rx_buf->len);
+        /* Allocate an SKB to store the headers */
+        skb = netdev_alloc_skb(efx->net_dev, hdr_len + EFX_PAGE_SKB_ALIGN);
+        if (unlikely(skb == NULL))
+                return NULL;
 
-                skb->len = rx_buf->len;
-                skb->data_len = rx_buf->len;
-                skb->truesize += rx_buf->len;
-                skb->ip_summed = ((rx_buf->flags & EFX_RX_PKT_CSUMMED) ?
-                                  CHECKSUM_UNNECESSARY : CHECKSUM_NONE);
+        EFX_BUG_ON_PARANOID(rx_buf->len < hdr_len);
 
-                skb_record_rx_queue(skb, channel->rx_queue.core_index);
+        skb_reserve(skb, EFX_PAGE_SKB_ALIGN);
+        memcpy(__skb_put(skb, hdr_len), eh, hdr_len);
 
-                gro_result = napi_gro_frags(napi);
-        } else {
-                struct sk_buff *skb = rx_buf->u.skb;
+        /* Append the remaining page(s) onto the frag list */
+        if (rx_buf->len > hdr_len) {
+                rx_buf->page_offset += hdr_len;
+                rx_buf->len -= hdr_len;
 
-                EFX_BUG_ON_PARANOID(!(rx_buf->flags & EFX_RX_PKT_CSUMMED));
-                rx_buf->u.skb = NULL;
-                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                for (;;) {
+                        skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
+                                           rx_buf->page, rx_buf->page_offset,
+                                           rx_buf->len);
+                        rx_buf->page = NULL;
+                        skb->len += rx_buf->len;
+                        skb->data_len += rx_buf->len;
+                        if (skb_shinfo(skb)->nr_frags == n_frags)
+                                break;
 
-                gro_result = napi_gro_receive(napi, skb);
+                        rx_buf = efx_rx_buf_next(&channel->rx_queue, rx_buf);
+                }
+        } else {
+                __free_pages(rx_buf->page, efx->rx_buffer_order);
+                rx_buf->page = NULL;
+                n_frags = 0;
         }
 
-        if (gro_result == GRO_NORMAL) {
-                channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
-        } else if (gro_result != GRO_DROP) {
-                channel->rx_alloc_level += RX_ALLOC_FACTOR_GRO;
-                channel->irq_mod_score += 2;
-        }
+        skb->truesize += n_frags * efx->rx_buffer_truesize;
+
+        /* Move past the ethernet header */
+        skb->protocol = eth_type_trans(skb, efx->net_dev);
+
+        return skb;
 }
 
 void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
-                   unsigned int len, u16 flags)
+                   unsigned int n_frags, unsigned int len, u16 flags)
 {
         struct efx_nic *efx = rx_queue->efx;
         struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
         struct efx_rx_buffer *rx_buf;
-        bool leak_packet = false;
 
         rx_buf = efx_rx_buffer(rx_queue, index);
         rx_buf->flags |= flags;
 
-        /* This allows the refill path to post another buffer.
-         * EFX_RXD_HEAD_ROOM ensures that the slot we are using
-         * isn't overwritten yet.
-         */
-        rx_queue->removed_count++;
-
-        /* Validate the length encoded in the event vs the descriptor pushed */
-        efx_rx_packet__check_len(rx_queue, rx_buf, len, &leak_packet);
+        /* Validate the number of fragments and completed length */
+        if (n_frags == 1) {
+                efx_rx_packet__check_len(rx_queue, rx_buf, len);
+        } else if (unlikely(n_frags > EFX_RX_MAX_FRAGS) ||
+                   unlikely(len <= (n_frags - 1) * EFX_RX_USR_BUF_SIZE) ||
+                   unlikely(len > n_frags * EFX_RX_USR_BUF_SIZE) ||
+                   unlikely(!efx->rx_scatter)) {
+                /* If this isn't an explicit discard request, either
+                 * the hardware or the driver is broken.
+                 */
+                WARN_ON(!(len == 0 && rx_buf->flags & EFX_RX_PKT_DISCARD));
+                rx_buf->flags |= EFX_RX_PKT_DISCARD;
+        }
 
         netif_vdbg(efx, rx_status, efx->net_dev,
-                   "RX queue %d received id %x at %llx+%x %s%s\n",
+                   "RX queue %d received ids %x-%x len %d %s%s\n",
                    efx_rx_queue_index(rx_queue), index,
-                   (unsigned long long)rx_buf->dma_addr, len,
+                   (index + n_frags - 1) & rx_queue->ptr_mask, len,
                    (rx_buf->flags & EFX_RX_PKT_CSUMMED) ? " [SUMMED]" : "",
                    (rx_buf->flags & EFX_RX_PKT_DISCARD) ? " [DISCARD]" : "");
 
-        /* Discard packet, if instructed to do so */
+        /* Discard packet, if instructed to do so.  Process the
+         * previous receive first.
+         */
         if (unlikely(rx_buf->flags & EFX_RX_PKT_DISCARD)) {
-                if (unlikely(leak_packet))
-                        channel->n_skbuff_leaks++;
-                else
-                        efx_recycle_rx_buffer(channel, rx_buf);
-
-                /* Don't hold off the previous receive */
-                rx_buf = NULL;
-                goto out;
+                efx_rx_flush_packet(channel);
+                put_page(rx_buf->page);
+                efx_recycle_rx_buffers(channel, rx_buf, n_frags);
+                return;
         }
 
-        /* Release and/or sync DMA mapping - assumes all RX buffers
-         * consumed in-order per RX queue
+        if (n_frags == 1)
+                rx_buf->len = len;
+
+        /* Release and/or sync the DMA mapping - assumes all RX buffers
+         * consumed in-order per RX queue.
          */
-        efx_unmap_rx_buffer(efx, rx_buf, len);
+        efx_sync_rx_buffer(efx, rx_buf, rx_buf->len);
 
         /* Prefetch nice and early so data will (hopefully) be in cache by
          * the time we look at it.
          */
-        prefetch(efx_rx_buf_eh(efx, rx_buf));
+        prefetch(efx_rx_buf_va(rx_buf));
+
+        rx_buf->page_offset += efx->type->rx_buffer_hash_size;
+        rx_buf->len -= efx->type->rx_buffer_hash_size;
+
+        if (n_frags > 1) {
+                /* Release/sync DMA mapping for additional fragments.
+                 * Fix length for last fragment.
+                 */
+                unsigned int tail_frags = n_frags - 1;
+
+                for (;;) {
+                        rx_buf = efx_rx_buf_next(rx_queue, rx_buf);
+                        if (--tail_frags == 0)
+                                break;
+                        efx_sync_rx_buffer(efx, rx_buf, EFX_RX_USR_BUF_SIZE);
+                }
+                rx_buf->len = len - (n_frags - 1) * EFX_RX_USR_BUF_SIZE;
+                efx_sync_rx_buffer(efx, rx_buf, rx_buf->len);
+        }
+
+        /* All fragments have been DMA-synced, so recycle buffers and pages. */
+        rx_buf = efx_rx_buffer(rx_queue, index);
+        efx_recycle_rx_buffers(channel, rx_buf, n_frags);
 
         /* Pipeline receives so that we give time for packet headers to be
          * prefetched into cache.
          */
-        rx_buf->len = len - efx->type->rx_buffer_hash_size;
-out:
-        if (channel->rx_pkt)
-                __efx_rx_packet(channel, channel->rx_pkt);
-        channel->rx_pkt = rx_buf;
+        efx_rx_flush_packet(channel);
+        channel->rx_pkt_n_frags = n_frags;
+        channel->rx_pkt_index = index;
 }
 
-static void efx_rx_deliver(struct efx_channel *channel,
-                           struct efx_rx_buffer *rx_buf)
+static void efx_rx_deliver(struct efx_channel *channel, u8 *eh,
+                           struct efx_rx_buffer *rx_buf,
+                           unsigned int n_frags)
 {
         struct sk_buff *skb;
+        u16 hdr_len = min_t(u16, rx_buf->len, EFX_SKB_HEADERS);
 
-        /* We now own the SKB */
-        skb = rx_buf->u.skb;
-        rx_buf->u.skb = NULL;
+        skb = efx_rx_mk_skb(channel, rx_buf, n_frags, eh, hdr_len);
+        if (unlikely(skb == NULL)) {
+                efx_free_rx_buffer(rx_buf);
+                return;
+        }
+        skb_record_rx_queue(skb, channel->rx_queue.core_index);
 
         /* Set the SKB flags */
         skb_checksum_none_assert(skb);
 
-        /* Record the rx_queue */
-        skb_record_rx_queue(skb, channel->rx_queue.core_index);
-
-        /* Pass the packet up */
         if (channel->type->receive_skb)
-                channel->type->receive_skb(channel, skb);
-        else
-                netif_receive_skb(skb);
+                if (channel->type->receive_skb(channel, skb))
+                        return;
 
-        /* Update allocation strategy method */
-        channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
+        /* Pass the packet up */
+        netif_receive_skb(skb);
 }
 
 /* Handle a received packet.  Second half: Touches packet payload. */
-void __efx_rx_packet(struct efx_channel *channel, struct efx_rx_buffer *rx_buf)
+void __efx_rx_packet(struct efx_channel *channel)
 {
         struct efx_nic *efx = channel->efx;
-        u8 *eh = efx_rx_buf_eh(efx, rx_buf);
+        struct efx_rx_buffer *rx_buf =
+                efx_rx_buffer(&channel->rx_queue, channel->rx_pkt_index);
+        u8 *eh = efx_rx_buf_va(rx_buf);
 
         /* If we're in loopback test, then pass the packet directly to the
          * loopback layer, and free the rx_buf here
          */
         if (unlikely(efx->loopback_selftest)) {
                 efx_loopback_rx_packet(efx, eh, rx_buf->len);
-                efx_free_rx_buffer(efx, rx_buf);
-                return;
-        }
-
-        if (!(rx_buf->flags & EFX_RX_BUF_PAGE)) {
-                struct sk_buff *skb = rx_buf->u.skb;
-
-                prefetch(skb_shinfo(skb));
-
-                skb_reserve(skb, efx->type->rx_buffer_hash_size);
-                skb_put(skb, rx_buf->len);
-
-                if (efx->net_dev->features & NETIF_F_RXHASH)
-                        skb->rxhash = efx_rx_buf_hash(eh);
-
-                /* Move past the ethernet header. rx_buf->data still points
-                 * at the ethernet header */
-                skb->protocol = eth_type_trans(skb, efx->net_dev);
-
-                skb_record_rx_queue(skb, channel->rx_queue.core_index);
+                efx_free_rx_buffer(rx_buf);
+                goto out;
         }
 
         if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM)))
                 rx_buf->flags &= ~EFX_RX_PKT_CSUMMED;
 
-        if (likely(rx_buf->flags & (EFX_RX_BUF_PAGE | EFX_RX_PKT_CSUMMED)) &&
-            !channel->type->receive_skb)
-                efx_rx_packet_gro(channel, rx_buf, eh);
+        if (!channel->type->receive_skb)
+                efx_rx_packet_gro(channel, rx_buf, channel->rx_pkt_n_frags, eh);
         else
-                efx_rx_deliver(channel, rx_buf);
-}
-
-void efx_rx_strategy(struct efx_channel *channel)
-{
-        enum efx_rx_alloc_method method = rx_alloc_method;
-
-        if (channel->type->receive_skb) {
-                channel->rx_alloc_push_pages = false;
-                return;
-        }
-
-        /* Only makes sense to use page based allocation if GRO is enabled */
-        if (!(channel->efx->net_dev->features & NETIF_F_GRO)) {
-                method = RX_ALLOC_METHOD_SKB;
-        } else if (method == RX_ALLOC_METHOD_AUTO) {
-                /* Constrain the rx_alloc_level */
-                if (channel->rx_alloc_level < 0)
-                        channel->rx_alloc_level = 0;
-                else if (channel->rx_alloc_level > RX_ALLOC_LEVEL_MAX)
-                        channel->rx_alloc_level = RX_ALLOC_LEVEL_MAX;
-
-                /* Decide on the allocation method */
-                method = ((channel->rx_alloc_level > RX_ALLOC_LEVEL_GRO) ?
-                          RX_ALLOC_METHOD_PAGE : RX_ALLOC_METHOD_SKB);
-        }
-
-        /* Push the option */
-        channel->rx_alloc_push_pages = (method == RX_ALLOC_METHOD_PAGE);
+                efx_rx_deliver(channel, eh, rx_buf, channel->rx_pkt_n_frags);
+out:
+        channel->rx_pkt_n_frags = 0;
 }
 
 int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
@@ -683,9 +662,32 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
                 kfree(rx_queue->buffer);
                 rx_queue->buffer = NULL;
         }
+
         return rc;
 }
 
+static void efx_init_rx_recycle_ring(struct efx_nic *efx,
+                                     struct efx_rx_queue *rx_queue)
+{
+        unsigned int bufs_in_recycle_ring, page_ring_size;
+
+        /* Set the RX recycle ring size */
+#ifdef CONFIG_PPC64
+        bufs_in_recycle_ring = EFX_RECYCLE_RING_SIZE_IOMMU;
+#else
+        if (efx->pci_dev->dev.iommu_group)
+                bufs_in_recycle_ring = EFX_RECYCLE_RING_SIZE_IOMMU;
+        else
+                bufs_in_recycle_ring = EFX_RECYCLE_RING_SIZE_NOIOMMU;
+#endif /* CONFIG_PPC64 */
+
+        page_ring_size = roundup_pow_of_two(bufs_in_recycle_ring /
+                                            efx->rx_bufs_per_page);
+        rx_queue->page_ring = kcalloc(page_ring_size,
+                                      sizeof(*rx_queue->page_ring), GFP_KERNEL);
+        rx_queue->page_ptr_mask = page_ring_size - 1;
+}
+
 void efx_init_rx_queue(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
@@ -699,10 +701,18 @@ void efx_init_rx_queue(struct efx_rx_queue *rx_queue)
         rx_queue->notified_count = 0;
         rx_queue->removed_count = 0;
         rx_queue->min_fill = -1U;
+        efx_init_rx_recycle_ring(efx, rx_queue);
+
+        rx_queue->page_remove = 0;
+        rx_queue->page_add = rx_queue->page_ptr_mask + 1;
+        rx_queue->page_recycle_count = 0;
+        rx_queue->page_recycle_failed = 0;
+        rx_queue->page_recycle_full = 0;
 
         /* Initialise limit fields */
         max_fill = efx->rxq_entries - EFX_RXD_HEAD_ROOM;
-        max_trigger = max_fill - EFX_RX_BATCH;
+        max_trigger =
+                max_fill - efx->rx_pages_per_batch * efx->rx_bufs_per_page;
         if (rx_refill_threshold != 0) {
                 trigger = max_fill * min(rx_refill_threshold, 100U) / 100U;
                 if (trigger > max_trigger)
@@ -722,6 +732,7 @@ void efx_init_rx_queue(struct efx_rx_queue *rx_queue)
 void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
 {
         int i;
+        struct efx_nic *efx = rx_queue->efx;
         struct efx_rx_buffer *rx_buf;
 
         netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
@@ -733,13 +744,32 @@ void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
         del_timer_sync(&rx_queue->slow_fill);
         efx_nic_fini_rx(rx_queue);
 
-        /* Release RX buffers NB start at index 0 not current HW ptr */
+        /* Release RX buffers from the current read ptr to the write ptr */
         if (rx_queue->buffer) {
-                for (i = 0; i <= rx_queue->ptr_mask; i++) {
-                        rx_buf = efx_rx_buffer(rx_queue, i);
+                for (i = rx_queue->removed_count; i < rx_queue->added_count;
+                     i++) {
+                        unsigned index = i & rx_queue->ptr_mask;
+                        rx_buf = efx_rx_buffer(rx_queue, index);
                         efx_fini_rx_buffer(rx_queue, rx_buf);
                 }
         }
+
+        /* Unmap and release the pages in the recycle ring. Remove the ring. */
+        for (i = 0; i <= rx_queue->page_ptr_mask; i++) {
+                struct page *page = rx_queue->page_ring[i];
+                struct efx_rx_page_state *state;
+
+                if (page == NULL)
+                        continue;
+
+                state = page_address(page);
+                dma_unmap_page(&efx->pci_dev->dev, state->dma_addr,
+                               PAGE_SIZE << efx->rx_buffer_order,
+                               DMA_FROM_DEVICE);
+                put_page(page);
+        }
+        kfree(rx_queue->page_ring);
+        rx_queue->page_ring = NULL;
 }
 
 void efx_remove_rx_queue(struct efx_rx_queue *rx_queue)
@@ -754,9 +784,6 @@ void efx_remove_rx_queue(struct efx_rx_queue *rx_queue)
 }
 
 
-module_param(rx_alloc_method, int, 0644);
-MODULE_PARM_DESC(rx_alloc_method, "Allocation method used for RX buffers");
-
 module_param(rx_refill_threshold, uint, 0444);
 MODULE_PARM_DESC(rx_refill_threshold,
                  "RX descriptor ring refill threshold (%)");
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index ba40f67e4f05..51669244d154 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -202,7 +202,7 @@ out:
 
 static enum reset_type siena_map_reset_reason(enum reset_type reason)
 {
-        return RESET_TYPE_ALL;
+        return RESET_TYPE_RECOVER_OR_ALL;
 }
 
 static int siena_map_reset_flags(u32 *flags)
@@ -245,6 +245,22 @@ static int siena_reset_hw(struct efx_nic *efx, enum reset_type method)
                 return efx_mcdi_reset_port(efx);
 }
 
+#ifdef CONFIG_EEH
+/* When a PCI device is isolated from the bus, a subsequent MMIO read is
+ * required for the kernel EEH mechanisms to notice. As the Solarflare driver
+ * was written to minimise MMIO read (for latency) then a periodic call to check
+ * the EEH status of the device is required so that device recovery can happen
+ * in a timely fashion.
+ */
+static void siena_monitor(struct efx_nic *efx)
+{
+        struct eeh_dev *eehdev =
+                of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
+
+        eeh_dev_check_failure(eehdev);
+}
+#endif
+
 static int siena_probe_nvconfig(struct efx_nic *efx)
 {
         u32 caps = 0;
@@ -398,6 +414,8 @@ static int siena_init_nic(struct efx_nic *efx)
         EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_HASH_INSRT_HDR, 1);
         EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_HASH_ALG, 1);
         EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_IP_HASH, 1);
+        EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_USR_BUF_SIZE,
+                            EFX_RX_USR_BUF_SIZE >> 5);
         efx_writeo(efx, &temp, FR_AZ_RX_CFG);
 
         /* Set hash key for IPv4 */
@@ -665,7 +683,11 @@ const struct efx_nic_type siena_a0_nic_type = {
         .init = siena_init_nic,
         .dimension_resources = siena_dimension_resources,
         .fini = efx_port_dummy_op_void,
+#ifdef CONFIG_EEH
+        .monitor = siena_monitor,
+#else
         .monitor = NULL,
+#endif
         .map_reset_reason = siena_map_reset_reason,
         .map_reset_flags = siena_map_reset_flags,
         .reset = siena_reset_hw,
@@ -698,6 +720,7 @@ const struct efx_nic_type siena_a0_nic_type = {
         .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
         .rx_buffer_hash_size = 0x10,
         .rx_buffer_padding = 0,
+        .can_rx_scatter = true,
         .max_interrupt_mode = EFX_INT_MODE_MSIX,
         .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
                                    * interrupt handler only supports 32
diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c
index 79ad9c94a21b..4bdbaad9932d 100644
--- a/drivers/net/ethernet/sgi/meth.c
+++ b/drivers/net/ethernet/sgi/meth.c
@@ -213,10 +213,11 @@ static int meth_init_tx_ring(struct meth_private *priv)
 {
         /* Init TX ring */
         priv->tx_ring = dma_alloc_coherent(NULL, TX_RING_BUFFER_SIZE,
-                                           &priv->tx_ring_dma, GFP_ATOMIC);
+                                           &priv->tx_ring_dma,
+                                           GFP_ATOMIC | __GFP_ZERO);
         if (!priv->tx_ring)
                 return -ENOMEM;
-        memset(priv->tx_ring, 0, TX_RING_BUFFER_SIZE);
+
         priv->tx_count = priv->tx_read = priv->tx_write = 0;
         mace->eth.tx_ring_base = priv->tx_ring_dma;
         /* Now init skb save area */
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index efca14eaefa9..eb4aea3fe793 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1187,8 +1187,14 @@ sis900_init_rx_ring(struct net_device *net_dev)
                 }
                 sis_priv->rx_skbuff[i] = skb;
                 sis_priv->rx_ring[i].cmdsts = RX_BUF_SIZE;
-                sis_priv->rx_ring[i].bufptr = pci_map_single(sis_priv->pci_dev,
-                        skb->data, RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                sis_priv->rx_ring[i].bufptr = pci_map_single(sis_priv->pci_dev,
+                                skb->data, RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                if (unlikely(pci_dma_mapping_error(sis_priv->pci_dev,
+                                sis_priv->rx_ring[i].bufptr))) {
+                        dev_kfree_skb(skb);
+                        sis_priv->rx_skbuff[i] = NULL;
+                        break;
+                }
         }
         sis_priv->dirty_rx = (unsigned int) (i - NUM_RX_DESC);
 
@@ -1621,6 +1627,14 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
         /* set the transmit buffer descriptor and enable Transmit State Machine */
         sis_priv->tx_ring[entry].bufptr = pci_map_single(sis_priv->pci_dev,
                 skb->data, skb->len, PCI_DMA_TODEVICE);
+        if (unlikely(pci_dma_mapping_error(sis_priv->pci_dev,
+                sis_priv->tx_ring[entry].bufptr))) {
+                        dev_kfree_skb(skb);
+                        sis_priv->tx_skbuff[entry] = NULL;
+                        net_dev->stats.tx_dropped++;
+                        spin_unlock_irqrestore(&sis_priv->lock, flags);
+                        return NETDEV_TX_OK;
+        }
         sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len);
         sw32(cr, TxENA | sr32(cr));
 
@@ -1824,9 +1838,15 @@ static int sis900_rx(struct net_device *net_dev)
 refill_rx_ring:
                         sis_priv->rx_skbuff[entry] = skb;
                         sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
-                        sis_priv->rx_ring[entry].bufptr =
+                        sis_priv->rx_ring[entry].bufptr =
                                 pci_map_single(sis_priv->pci_dev, skb->data,
                                         RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                        if (unlikely(pci_dma_mapping_error(sis_priv->pci_dev,
+                                sis_priv->rx_ring[entry].bufptr))) {
+                                dev_kfree_skb_irq(skb);
+                                sis_priv->rx_skbuff[entry] = NULL;
+                                break;
+                        }
                 }
                 sis_priv->cur_rx++;
                 entry = sis_priv->cur_rx % NUM_RX_DESC;
@@ -1841,23 +1861,26 @@ refill_rx_ring:
                 entry = sis_priv->dirty_rx % NUM_RX_DESC;
 
                 if (sis_priv->rx_skbuff[entry] == NULL) {
-                        if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) {
+                        skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE);
+                        if (skb == NULL) {
                                 /* not enough memory for skbuff, this makes a
                                  * "hole" on the buffer ring, it is not clear
                                  * how the hardware will react to this kind
                                  * of degenerated buffer */
-                                if (netif_msg_rx_err(sis_priv))
-                                        printk(KERN_INFO "%s: Memory squeeze, "
-                                                "deferring packet.\n",
-                                                net_dev->name);
                                 net_dev->stats.rx_dropped++;
                                 break;
                         }
                         sis_priv->rx_skbuff[entry] = skb;
                         sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
-                        sis_priv->rx_ring[entry].bufptr =
+                        sis_priv->rx_ring[entry].bufptr =
                                 pci_map_single(sis_priv->pci_dev, skb->data,
                                         RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                        if (unlikely(pci_dma_mapping_error(sis_priv->pci_dev,
+                                        sis_priv->rx_ring[entry].bufptr))) {
+                                dev_kfree_skb_irq(skb);
+                                sis_priv->rx_skbuff[entry] = NULL;
+                                break;
+                        }
                 }
         }
         /* re-enable the potentially idle receive state matchine */
diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c
index 50823da9dc1e..e85c2e7e8246 100644
--- a/drivers/net/ethernet/smsc/smc9194.c
+++ b/drivers/net/ethernet/smsc/smc9194.c
@@ -1223,9 +1223,7 @@ static void smc_rcv(struct net_device *dev)
                         dev->stats.multicast++;
 
                 skb = netdev_alloc_skb(dev, packet_length + 5);
-
                 if ( skb == NULL ) {
-                        printk(KERN_NOTICE CARDNAME ": Low memory, packet dropped.\n");
                         dev->stats.rx_dropped++;
                         goto done;
                 }
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 591650a8de38..dfbf978315df 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -465,8 +465,6 @@ static inline void  smc_rcv(struct net_device *dev)
                  */
                 skb = netdev_alloc_skb(dev, packet_len);
                 if (unlikely(skb == NULL)) {
-                        printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
-                                dev->name);
                         SMC_WAIT_MMU_BUSY(lp);
                         SMC_SET_MMU_CMD(lp, MC_RELEASE);
                         dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index da5cc9a3b34c..48e2b99bec51 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2115,7 +2115,7 @@ static int smsc911x_init(struct net_device *dev)
         spin_lock_init(&pdata->dev_lock);
         spin_lock_init(&pdata->mac_lock);
 
-        if (pdata->ioaddr == 0) {
+        if (pdata->ioaddr == NULL) {
                 SMSC_WARN(pdata, probe, "pdata->ioaddr: 0x00000000");
                 return -ENODEV;
         }
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index d457fa2d7509..ffa5c4ad1210 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -848,10 +848,8 @@ static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)
         BUG_ON(pd->rx_buffers[index].skb);
         BUG_ON(pd->rx_buffers[index].mapping);
 
-        if (unlikely(!skb)) {
-                smsc_warn(RX_ERR, "Failed to allocate new skb!");
+        if (unlikely(!skb))
                 return -ENOMEM;
-        }
 
         mapping = pci_map_single(pd->pdev, skb_tail_pointer(skb),
                                  PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index c0ea838c78d1..f695a50bac47 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -5,6 +5,7 @@ config STMMAC_ETH
         select MII
         select PHYLIB
         select CRC32
+        select PTP_1588_CLOCK
         ---help---
           This is the driver for the Ethernet IPs are built around a
           Synopsys IP Core and only tested on the STMicroelectronics
@@ -54,22 +55,4 @@ config STMMAC_DA
           By default, the DMA arbitration scheme is based on Round-robin
           (rx:tx priority is 1:1).
 
-choice
-        prompt "Select the DMA TX/RX descriptor operating modes"
-        depends on STMMAC_ETH
-        ---help---
-          This driver supports DMA descriptor to operate both in dual buffer
-          (RING) and linked-list(CHAINED) mode. In RING mode each descriptor
-          points to two data buffer pointers whereas in CHAINED mode they
-          points to only one data buffer pointer.
-
-config STMMAC_RING
-        bool "Enable Descriptor Ring Mode"
-
-config STMMAC_CHAINED
-        bool "Enable Descriptor Chained Mode"
-
-endchoice
-
-
 endif
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index c8e8ea60ac19..356a9dd32be7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -1,9 +1,7 @@
 obj-$(CONFIG_STMMAC_ETH) += stmmac.o
-stmmac-$(CONFIG_STMMAC_RING) += ring_mode.o
-stmmac-$(CONFIG_STMMAC_CHAINED) += chain_mode.o
 stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o
 stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o
-stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o      \
-              dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o     \
+stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o  \
+              chain_mode.o dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o \
               dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o \
-              mmc_core.o $(stmmac-y)
+              mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o $(stmmac-y)
diff --git a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
index 0668659803ed..d234ab540b29 100644
--- a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
@@ -28,9 +28,9 @@
 
 #include "stmmac.h"
 
-unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
+static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 {
-        struct stmmac_priv *priv = (struct stmmac_priv *) p;
+        struct stmmac_priv *priv = (struct stmmac_priv *)p;
         unsigned int txsize = priv->dma_tx_size;
         unsigned int entry = priv->cur_tx % txsize;
         struct dma_desc *desc = priv->dma_tx + entry;
@@ -47,7 +47,8 @@ unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 
         desc->des2 = dma_map_single(priv->device, skb->data,
                                     bmax, DMA_TO_DEVICE);
-        priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum);
+        priv->tx_skbuff_dma[entry] = desc->des2;
+        priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_CHAIN_MODE);
 
         while (len != 0) {
                 entry = (++priv->cur_tx) % txsize;
@@ -57,8 +58,9 @@ unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
                         desc->des2 = dma_map_single(priv->device,
                                                     (skb->data + bmax * i),
                                                     bmax, DMA_TO_DEVICE);
-                        priv->hw->desc->prepare_tx_desc(desc, 0, bmax,
-                                                        csum);
+                        priv->tx_skbuff_dma[entry] = desc->des2;
+                        priv->hw->desc->prepare_tx_desc(desc, 0, bmax, csum,
+                                                        STMMAC_CHAIN_MODE);
                         priv->hw->desc->set_tx_owner(desc);
                         priv->tx_skbuff[entry] = NULL;
                         len -= bmax;
@@ -67,8 +69,9 @@ unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
                         desc->des2 = dma_map_single(priv->device,
                                                     (skb->data + bmax * i), len,
                                                     DMA_TO_DEVICE);
-                        priv->hw->desc->prepare_tx_desc(desc, 0, len,
-                                                        csum);
+                        priv->tx_skbuff_dma[entry] = desc->des2;
+                        priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,
+                                                        STMMAC_CHAIN_MODE);
                         priv->hw->desc->set_tx_owner(desc);
                         priv->tx_skbuff[entry] = NULL;
                         len = 0;
@@ -89,49 +92,70 @@ static unsigned int stmmac_is_jumbo_frm(int len, int enh_desc)
         return ret;
 }
 
-static void stmmac_refill_desc3(int bfsize, struct dma_desc *p)
-{
-}
-
-static void stmmac_init_desc3(int des3_as_data_buf, struct dma_desc *p)
-{
-}
-
-static void stmmac_clean_desc3(struct dma_desc *p)
-{
-}
-
-static void stmmac_init_dma_chain(struct dma_desc *des, dma_addr_t phy_addr,
-                                  unsigned int size)
+static void stmmac_init_dma_chain(void *des, dma_addr_t phy_addr,
+                                  unsigned int size, unsigned int extend_desc)
 {
         /*
          * In chained mode the des3 points to the next element in the ring.
          * The latest element has to point to the head.
          */
         int i;
-        struct dma_desc *p = des;
         dma_addr_t dma_phy = phy_addr;
 
-        for (i = 0; i < (size - 1); i++) {
-                dma_phy += sizeof(struct dma_desc);
-                p->des3 = (unsigned int)dma_phy;
-                p++;
+        if (extend_desc) {
+                struct dma_extended_desc *p = (struct dma_extended_desc *)des;
+                for (i = 0; i < (size - 1); i++) {
+                        dma_phy += sizeof(struct dma_extended_desc);
+                        p->basic.des3 = (unsigned int)dma_phy;
+                        p++;
+                }
+                p->basic.des3 = (unsigned int)phy_addr;
+
+        } else {
+                struct dma_desc *p = (struct dma_desc *)des;
+                for (i = 0; i < (size - 1); i++) {
+                        dma_phy += sizeof(struct dma_desc);
+                        p->des3 = (unsigned int)dma_phy;
+                        p++;
+                }
+                p->des3 = (unsigned int)phy_addr;
         }
-        p->des3 = (unsigned int)phy_addr;
 }
 
-static int stmmac_set_16kib_bfsize(int mtu)
+static void stmmac_refill_desc3(void *priv_ptr, struct dma_desc *p)
+{
+        struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr;
+
+        if (priv->hwts_rx_en && !priv->extend_desc)
+                /* NOTE: Device will overwrite des3 with timestamp value if
+                 * 1588-2002 time stamping is enabled, hence reinitialize it
+                 * to keep explicit chaining in the descriptor.
+                 */
+                p->des3 = (unsigned int)(priv->dma_rx_phy +
+                                         (((priv->dirty_rx) + 1) %
+                                          priv->dma_rx_size) *
+                                         sizeof(struct dma_desc));
+}
+
+static void stmmac_clean_desc3(void *priv_ptr, struct dma_desc *p)
 {
-        /* Not supported */
-        return 0;
+        struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr;
+
+        if (priv->hw->desc->get_tx_ls(p) && !priv->extend_desc)
+                /* NOTE: Device will overwrite des3 with timestamp value if
+                 * 1588-2002 time stamping is enabled, hence reinitialize it
+                 * to keep explicit chaining in the descriptor.
+                 */
+                p->des3 = (unsigned int)(priv->dma_tx_phy +
+                                         (((priv->dirty_tx + 1) %
+                                           priv->dma_tx_size) *
+                                          sizeof(struct dma_desc)));
 }
 
-const struct stmmac_ring_mode_ops ring_mode_ops = {
+const struct stmmac_chain_mode_ops chain_mode_ops = {
+        .init = stmmac_init_dma_chain,
         .is_jumbo_frm = stmmac_is_jumbo_frm,
         .jumbo_frm = stmmac_jumbo_frm,
         .refill_desc3 = stmmac_refill_desc3,
-        .init_desc3 = stmmac_init_desc3,
-        .init_dma_chain = stmmac_init_dma_chain,
         .clean_desc3 = stmmac_clean_desc3,
-        .set_16kib_bfsize = stmmac_set_16kib_bfsize,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 186d14806122..7788fbe44f0a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -117,6 +117,36 @@ struct stmmac_extra_stats {
         unsigned long irq_rx_path_in_lpi_mode_n;
         unsigned long irq_rx_path_exit_lpi_mode_n;
         unsigned long phy_eee_wakeup_error_n;
+        /* Extended RDES status */
+        unsigned long ip_hdr_err;
+        unsigned long ip_payload_err;
+        unsigned long ip_csum_bypassed;
+        unsigned long ipv4_pkt_rcvd;
+        unsigned long ipv6_pkt_rcvd;
+        unsigned long rx_msg_type_ext_no_ptp;
+        unsigned long rx_msg_type_sync;
+        unsigned long rx_msg_type_follow_up;
+        unsigned long rx_msg_type_delay_req;
+        unsigned long rx_msg_type_delay_resp;
+        unsigned long rx_msg_type_pdelay_req;
+        unsigned long rx_msg_type_pdelay_resp;
+        unsigned long rx_msg_type_pdelay_follow_up;
+        unsigned long ptp_frame_type;
+        unsigned long ptp_ver;
+        unsigned long timestamp_dropped;
+        unsigned long av_pkt_rcvd;
+        unsigned long av_tagged_pkt_rcvd;
+        unsigned long vlan_tag_priority_val;
+        unsigned long l3_filter_match;
+        unsigned long l4_filter_match;
+        unsigned long l3_l4_filter_no_match;
+        /* PCS */
+        unsigned long irq_pcs_ane_n;
+        unsigned long irq_pcs_link_n;
+        unsigned long irq_rgmii_n;
+        unsigned long pcs_link;
+        unsigned long pcs_duplex;
+        unsigned long pcs_speed;
 };
 
 /* CSR Frequency Access Defines*/
@@ -138,37 +168,43 @@ struct stmmac_extra_stats {
 #define FLOW_TX         2
 #define FLOW_AUTO       (FLOW_TX | FLOW_RX)
 
-#define SF_DMA_MODE 1 /* DMA STORE-AND-FORWARD Operation Mode */
+/* PCS defines */
+#define STMMAC_PCS_RGMII        (1 << 0)
+#define STMMAC_PCS_SGMII        (1 << 1)
+#define STMMAC_PCS_TBI          (1 << 2)
+#define STMMAC_PCS_RTBI         (1 << 3)
+
+#define SF_DMA_MODE 1           /* DMA STORE-AND-FORWARD Operation Mode */
 
 /* DAM HW feature register fields */
-#define DMA_HW_FEAT_MIISEL      0x00000001 /* 10/100 Mbps Support */
-#define DMA_HW_FEAT_GMIISEL     0x00000002 /* 1000 Mbps Support */
-#define DMA_HW_FEAT_HDSEL       0x00000004 /* Half-Duplex Support */
-#define DMA_HW_FEAT_EXTHASHEN   0x00000008 /* Expanded DA Hash Filter */
-#define DMA_HW_FEAT_HASHSEL     0x00000010 /* HASH Filter */
-#define DMA_HW_FEAT_ADDMACADRSEL        0x00000020 /* Multiple MAC Addr Reg */
-#define DMA_HW_FEAT_PCSSEL      0x00000040 /* PCS registers */
-#define DMA_HW_FEAT_L3L4FLTREN  0x00000080 /* Layer 3 & Layer 4 Feature */
-#define DMA_HW_FEAT_SMASEL      0x00000100 /* SMA(MDIO) Interface */
-#define DMA_HW_FEAT_RWKSEL      0x00000200 /* PMT Remote Wakeup */
-#define DMA_HW_FEAT_MGKSEL      0x00000400 /* PMT Magic Packet */
-#define DMA_HW_FEAT_MMCSEL      0x00000800 /* RMON Module */
-#define DMA_HW_FEAT_TSVER1SEL   0x00001000 /* Only IEEE 1588-2002 Timestamp */
-#define DMA_HW_FEAT_TSVER2SEL   0x00002000 /* IEEE 1588-2008 Adv Timestamp */
-#define DMA_HW_FEAT_EEESEL      0x00004000 /* Energy Efficient Ethernet */
-#define DMA_HW_FEAT_AVSEL       0x00008000 /* AV Feature */
-#define DMA_HW_FEAT_TXCOESEL    0x00010000 /* Checksum Offload in Tx */
-#define DMA_HW_FEAT_RXTYP1COE   0x00020000 /* IP csum Offload(Type 1) in Rx */
-#define DMA_HW_FEAT_RXTYP2COE   0x00040000 /* IP csum Offload(Type 2) in Rx */
-#define DMA_HW_FEAT_RXFIFOSIZE  0x00080000 /* Rx FIFO > 2048 Bytes */
-#define DMA_HW_FEAT_RXCHCNT     0x00300000 /* No. of additional Rx Channels */
-#define DMA_HW_FEAT_TXCHCNT     0x00c00000 /* No. of additional Tx Channels */
-#define DMA_HW_FEAT_ENHDESSEL   0x01000000 /* Alternate (Enhanced Descriptor) */
-#define DMA_HW_FEAT_INTTSEN     0x02000000 /* Timestamping with Internal
-                                              System Time */
-#define DMA_HW_FEAT_FLEXIPPSEN  0x04000000 /* Flexible PPS Output */
-#define DMA_HW_FEAT_SAVLANINS   0x08000000 /* Source Addr or VLAN Insertion */
-#define DMA_HW_FEAT_ACTPHYIF    0x70000000 /* Active/selected PHY interface */
+#define DMA_HW_FEAT_MIISEL      0x00000001      /* 10/100 Mbps Support */
+#define DMA_HW_FEAT_GMIISEL     0x00000002      /* 1000 Mbps Support */
+#define DMA_HW_FEAT_HDSEL       0x00000004      /* Half-Duplex Support */
+#define DMA_HW_FEAT_EXTHASHEN   0x00000008      /* Expanded DA Hash Filter */
+#define DMA_HW_FEAT_HASHSEL     0x00000010      /* HASH Filter */
+#define DMA_HW_FEAT_ADDMAC      0x00000020      /* Multiple MAC Addr Reg */
+#define DMA_HW_FEAT_PCSSEL      0x00000040      /* PCS registers */
+#define DMA_HW_FEAT_L3L4FLTREN  0x00000080      /* Layer 3 & Layer 4 Feature */
+#define DMA_HW_FEAT_SMASEL      0x00000100      /* SMA(MDIO) Interface */
+#define DMA_HW_FEAT_RWKSEL      0x00000200      /* PMT Remote Wakeup */
+#define DMA_HW_FEAT_MGKSEL      0x00000400      /* PMT Magic Packet */
+#define DMA_HW_FEAT_MMCSEL      0x00000800      /* RMON Module */
+#define DMA_HW_FEAT_TSVER1SEL   0x00001000      /* Only IEEE 1588-2002 */
+#define DMA_HW_FEAT_TSVER2SEL   0x00002000      /* IEEE 1588-2008 PTPv2 */
+#define DMA_HW_FEAT_EEESEL      0x00004000      /* Energy Efficient Ethernet */
+#define DMA_HW_FEAT_AVSEL       0x00008000      /* AV Feature */
+#define DMA_HW_FEAT_TXCOESEL    0x00010000      /* Checksum Offload in Tx */
+#define DMA_HW_FEAT_RXTYP1COE   0x00020000      /* IP COE (Type 1) in Rx */
+#define DMA_HW_FEAT_RXTYP2COE   0x00040000      /* IP COE (Type 2) in Rx */
+#define DMA_HW_FEAT_RXFIFOSIZE  0x00080000      /* Rx FIFO > 2048 Bytes */
+#define DMA_HW_FEAT_RXCHCNT     0x00300000      /* No. additional Rx Channels */
+#define DMA_HW_FEAT_TXCHCNT     0x00c00000      /* No. additional Tx Channels */
+#define DMA_HW_FEAT_ENHDESSEL   0x01000000      /* Alternate Descriptor */
+/* Timestamping with Internal System Time */
+#define DMA_HW_FEAT_INTTSEN     0x02000000
+#define DMA_HW_FEAT_FLEXIPPSEN  0x04000000      /* Flexible PPS Output */
+#define DMA_HW_FEAT_SAVLANINS   0x08000000      /* Source Addr or VLAN */
+#define DMA_HW_FEAT_ACTPHYIF    0x70000000      /* Active/selected PHY iface */
 #define DEFAULT_DMA_PBL         8
 
 /* Max/Min RI Watchdog Timer count value */
@@ -180,7 +216,8 @@ struct stmmac_extra_stats {
 #define STMMAC_TX_MAX_FRAMES    256
 #define STMMAC_TX_FRAMES        64
 
-enum rx_frame_status { /* IPC status */
+/* Rx IPC status */
+enum rx_frame_status {
         good_frame = 0,
         discard_frame = 1,
         csum_none = 2,
@@ -194,17 +231,25 @@ enum dma_irq_status {
         handle_tx = 0x8,
 };
 
-enum core_specific_irq_mask {
-        core_mmc_tx_irq = 1,
-        core_mmc_rx_irq = 2,
-        core_mmc_rx_csum_offload_irq = 4,
-        core_irq_receive_pmt_irq = 8,
-        core_irq_tx_path_in_lpi_mode = 16,
-        core_irq_tx_path_exit_lpi_mode = 32,
-        core_irq_rx_path_in_lpi_mode = 64,
-        core_irq_rx_path_exit_lpi_mode = 128,
+#define CORE_IRQ_TX_PATH_IN_LPI_MODE    (1 << 1)
+#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE  (1 << 2)
+#define CORE_IRQ_RX_PATH_IN_LPI_MODE    (1 << 3)
+#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE  (1 << 4)
+
+#define CORE_PCS_ANE_COMPLETE           (1 << 5)
+#define CORE_PCS_LINK_STATUS            (1 << 6)
+#define CORE_RGMII_IRQ                  (1 << 7)
+
+struct rgmii_adv {
+        unsigned int pause;
+        unsigned int duplex;
+        unsigned int lp_pause;
+        unsigned int lp_duplex;
 };
 
+#define STMMAC_PCS_PAUSE        1
+#define STMMAC_PCS_ASYM_PAUSE   2
+
 /* DMA HW capabilities */
 struct dma_features {
         unsigned int mbps_10_100;
@@ -217,9 +262,9 @@ struct dma_features {
         unsigned int pmt_remote_wake_up;
         unsigned int pmt_magic_frame;
         unsigned int rmon;
-        /* IEEE 1588-2002*/
+        /* IEEE 1588-2002 */
         unsigned int time_stamp;
-        /* IEEE 1588-2008*/
+        /* IEEE 1588-2008 */
         unsigned int atime_stamp;
         /* 802.3az - Energy-Efficient Ethernet (EEE) */
         unsigned int eee;
@@ -232,7 +277,7 @@ struct dma_features {
         /* TX and RX number of channels */
         unsigned int number_rx_channel;
         unsigned int number_tx_channel;
-        /* Alternate (enhanced) DESC mode*/
+        /* Alternate (enhanced) DESC mode */
         unsigned int enh_desc;
 };
 
@@ -255,23 +300,26 @@ struct dma_features {
 #define STMMAC_DEFAULT_LIT_LS_TIMER     0x3E8
 #define STMMAC_DEFAULT_TWT_LS_TIMER     0x0
 
+#define STMMAC_CHAIN_MODE       0x1
+#define STMMAC_RING_MODE        0x2
+
 struct stmmac_desc_ops {
         /* DMA RX descriptor ring initialization */
-        void (*init_rx_desc) (struct dma_desc *p, unsigned int ring_size,
-                              int disable_rx_ic);
+        void (*init_rx_desc) (struct dma_desc *p, int disable_rx_ic, int mode,
+                              int end);
         /* DMA TX descriptor ring initialization */
-        void (*init_tx_desc) (struct dma_desc *p, unsigned int ring_size);
+        void (*init_tx_desc) (struct dma_desc *p, int mode, int end);
 
         /* Invoked by the xmit function to prepare the tx descriptor */
         void (*prepare_tx_desc) (struct dma_desc *p, int is_fs, int len,
-                                 int csum_flag);
+                                 int csum_flag, int mode);
         /* Set/get the owner of the descriptor */
         void (*set_tx_owner) (struct dma_desc *p);
         int (*get_tx_owner) (struct dma_desc *p);
         /* Invoked by the xmit function to close the tx descriptor */
         void (*close_tx_desc) (struct dma_desc *p);
         /* Clean the tx descriptor as soon as the tx irq is received */
-        void (*release_tx_desc) (struct dma_desc *p);
+        void (*release_tx_desc) (struct dma_desc *p, int mode);
         /* Clear interrupt on tx frame completion. When this bit is
          * set an interrupt happens as soon as the frame is transmitted */
         void (*clear_tx_ic) (struct dma_desc *p);
@@ -290,12 +338,22 @@ struct stmmac_desc_ops {
         /* Return the reception status looking at the RDES1 */
         int (*rx_status) (void *data, struct stmmac_extra_stats *x,
                           struct dma_desc *p);
+        void (*rx_extended_status) (void *data, struct stmmac_extra_stats *x,
+                                    struct dma_extended_desc *p);
+        /* Set tx timestamp enable bit */
+        void (*enable_tx_timestamp) (struct dma_desc *p);
+        /* get tx timestamp status */
+        int (*get_tx_timestamp_status) (struct dma_desc *p);
+        /* get timestamp value */
+         u64(*get_timestamp) (void *desc, u32 ats);
+        /* get rx timestamp status */
+        int (*get_rx_timestamp_status) (void *desc, u32 ats);
 };
 
 struct stmmac_dma_ops {
         /* DMA core initialization */
         int (*init) (void __iomem *ioaddr, int pbl, int fb, int mb,
-                     int burst_len, u32 dma_tx, u32 dma_rx);
+                     int burst_len, u32 dma_tx, u32 dma_rx, int atds);
         /* Dump DMA registers */
         void (*dump_regs) (void __iomem *ioaddr);
         /* Set tx/rx threshold in the csr6 register
@@ -321,13 +379,14 @@ struct stmmac_dma_ops {
 
 struct stmmac_ops {
         /* MAC core initialization */
-        void (*core_init) (void __iomem *ioaddr) ____cacheline_aligned;
+        void (*core_init) (void __iomem *ioaddr);
         /* Enable and verify that the IPC module is supported */
         int (*rx_ipc) (void __iomem *ioaddr);
         /* Dump MAC registers */
         void (*dump_regs) (void __iomem *ioaddr);
         /* Handle extra events on specific interrupts hw dependent */
-        int (*host_irq_status) (void __iomem *ioaddr);
+        int (*host_irq_status) (void __iomem *ioaddr,
+                                struct stmmac_extra_stats *x);
         /* Multicast filter setting */
         void (*set_filter) (struct net_device *dev, int id);
         /* Flow control setting */
@@ -344,6 +403,18 @@ struct stmmac_ops {
         void (*reset_eee_mode) (void __iomem *ioaddr);
         void (*set_eee_timer) (void __iomem *ioaddr, int ls, int tw);
         void (*set_eee_pls) (void __iomem *ioaddr, int link);
+        void (*ctrl_ane) (void __iomem *ioaddr, bool restart);
+        void (*get_adv) (void __iomem *ioaddr, struct rgmii_adv *adv);
+};
+
+struct stmmac_hwtimestamp {
+        void (*config_hw_tstamping) (void __iomem *ioaddr, u32 data);
+        void (*config_sub_second_increment) (void __iomem *ioaddr);
+        int (*init_systime) (void __iomem *ioaddr, u32 sec, u32 nsec);
+        int (*config_addend) (void __iomem *ioaddr, u32 addend);
+        int (*adjust_systime) (void __iomem *ioaddr, u32 sec, u32 nsec,
+                               int add_sub);
+         u64(*get_systime) (void __iomem *ioaddr);
 };
 
 struct mac_link {
@@ -360,19 +431,28 @@ struct mii_regs {
 struct stmmac_ring_mode_ops {
         unsigned int (*is_jumbo_frm) (int len, int ehn_desc);
         unsigned int (*jumbo_frm) (void *priv, struct sk_buff *skb, int csum);
-        void (*refill_desc3) (int bfsize, struct dma_desc *p);
-        void (*init_desc3) (int des3_as_data_buf, struct dma_desc *p);
-        void (*init_dma_chain) (struct dma_desc *des, dma_addr_t phy_addr,
-                                unsigned int size);
-        void (*clean_desc3) (struct dma_desc *p);
+        void (*refill_desc3) (void *priv, struct dma_desc *p);
+        void (*init_desc3) (struct dma_desc *p);
+        void (*clean_desc3) (void *priv, struct dma_desc *p);
         int (*set_16kib_bfsize) (int mtu);
 };
 
+struct stmmac_chain_mode_ops {
+        void (*init) (void *des, dma_addr_t phy_addr, unsigned int size,
+                      unsigned int extend_desc);
+        unsigned int (*is_jumbo_frm) (int len, int ehn_desc);
+        unsigned int (*jumbo_frm) (void *priv, struct sk_buff *skb, int csum);
+        void (*refill_desc3) (void *priv, struct dma_desc *p);
+        void (*clean_desc3) (void *priv, struct dma_desc *p);
+};
+
 struct mac_device_info {
-        const struct stmmac_ops         *mac;
-        const struct stmmac_desc_ops    *desc;
-        const struct stmmac_dma_ops     *dma;
-        const struct stmmac_ring_mode_ops       *ring;
+        const struct stmmac_ops *mac;
+        const struct stmmac_desc_ops *desc;
+        const struct stmmac_dma_ops *dma;
+        const struct stmmac_ring_mode_ops *ring;
+        const struct stmmac_chain_mode_ops *chain;
+        const struct stmmac_hwtimestamp *ptp;
         struct mii_regs mii;    /* MII register Addresses */
         struct mac_link link;
         unsigned int synopsys_uid;
@@ -390,5 +470,6 @@ extern void stmmac_set_mac(void __iomem *ioaddr, bool enable);
 
 extern void dwmac_dma_flush_tx_fifo(void __iomem *ioaddr);
 extern const struct stmmac_ring_mode_ops ring_mode_ops;
+extern const struct stmmac_chain_mode_ops chain_mode_ops;
 
 #endif /* __COMMON_H__ */
diff --git a/drivers/net/ethernet/stmicro/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
index 223adf95fd03..ad3996038018 100644
--- a/drivers/net/ethernet/stmicro/stmmac/descs.h
+++ b/drivers/net/ethernet/stmicro/stmmac/descs.h
@@ -24,6 +24,7 @@
 #ifndef __DESCS_H__
 #define __DESCS_H__
 
+/* Basic descriptor structure for normal and alternate descriptors */
 struct dma_desc {
         /* Receive descriptor */
         union {
@@ -60,7 +61,7 @@ struct dma_desc {
                 } rx;
                 struct {
                         /* RDES0 */
-                        u32 payload_csum_error:1;
+                        u32 rx_mac_addr:1;
                         u32 crc_error:1;
                         u32 dribbling:1;
                         u32 error_gmii:1;
@@ -162,13 +163,57 @@ struct dma_desc {
         unsigned int des3;
 };
 
+/* Extended descriptor structure (supported by new SYNP GMAC generations) */
+struct dma_extended_desc {
+        struct dma_desc basic;
+        union {
+                struct {
+                        u32 ip_payload_type:3;
+                        u32 ip_hdr_err:1;
+                        u32 ip_payload_err:1;
+                        u32 ip_csum_bypassed:1;
+                        u32 ipv4_pkt_rcvd:1;
+                        u32 ipv6_pkt_rcvd:1;
+                        u32 msg_type:4;
+                        u32 ptp_frame_type:1;
+                        u32 ptp_ver:1;
+                        u32 timestamp_dropped:1;
+                        u32 reserved:1;
+                        u32 av_pkt_rcvd:1;
+                        u32 av_tagged_pkt_rcvd:1;
+                        u32 vlan_tag_priority_val:3;
+                        u32 reserved3:3;
+                        u32 l3_filter_match:1;
+                        u32 l4_filter_match:1;
+                        u32 l3_l4_filter_no_match:2;
+                        u32 reserved4:4;
+                } erx;
+                struct {
+                        u32 reserved;
+                } etx;
+        } des4;
+        unsigned int des5;      /* Reserved */
+        unsigned int des6;      /* Tx/Rx Timestamp Low */
+        unsigned int des7;      /* Tx/Rx Timestamp High */
+};
+
 /* Transmit checksum insertion control */
 enum tdes_csum_insertion {
         cic_disabled = 0,       /* Checksum Insertion Control */
         cic_only_ip = 1,        /* Only IP header */
-        cic_no_pseudoheader = 2,        /* IP header but pseudoheader
-                                         * is not calculated */
+        /* IP header but pseudoheader is not calculated */
+        cic_no_pseudoheader = 2,
         cic_full = 3,           /* IP header and pseudoheader */
 };
 
+/* Extended RDES4 definitions */
+#define RDES_EXT_NO_PTP                 0
+#define RDES_EXT_SYNC                   0x1
+#define RDES_EXT_FOLLOW_UP              0x2
+#define RDES_EXT_DELAY_REQ              0x3
+#define RDES_EXT_DELAY_RESP             0x4
+#define RDES_EXT_PDELAY_REQ             0x5
+#define RDES_EXT_PDELAY_RESP            0x6
+#define RDES_EXT_PDELAY_FOLLOW_UP       0x7
+
 #endif /* __DESCS_H__ */
diff --git a/drivers/net/ethernet/stmicro/stmmac/descs_com.h b/drivers/net/ethernet/stmicro/stmmac/descs_com.h
index 7ee9499a6e38..6f2cc78c5cf5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/descs_com.h
+++ b/drivers/net/ethernet/stmicro/stmmac/descs_com.h
@@ -30,26 +30,28 @@
 #ifndef __DESC_COM_H__
 #define __DESC_COM_H__
 
-#if defined(CONFIG_STMMAC_RING)
-static inline void ehn_desc_rx_set_on_ring_chain(struct dma_desc *p, int end)
+/* Specific functions used for Ring mode */
+
+/* Enhanced descriptors */
+static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end)
 {
         p->des01.erx.buffer2_size = BUF_SIZE_8KiB - 1;
         if (end)
                 p->des01.erx.end_ring = 1;
 }
 
-static inline void ehn_desc_tx_set_on_ring_chain(struct dma_desc *p, int end)
+static inline void ehn_desc_tx_set_on_ring(struct dma_desc *p, int end)
 {
         if (end)
                 p->des01.etx.end_ring = 1;
 }
 
-static inline void enh_desc_end_tx_desc(struct dma_desc *p, int ter)
+static inline void enh_desc_end_tx_desc_on_ring(struct dma_desc *p, int ter)
 {
         p->des01.etx.end_ring = ter;
 }
 
-static inline void enh_set_tx_desc_len(struct dma_desc *p, int len)
+static inline void enh_set_tx_desc_len_on_ring(struct dma_desc *p, int len)
 {
         if (unlikely(len > BUF_SIZE_4KiB)) {
                 p->des01.etx.buffer1_size = BUF_SIZE_4KiB;
@@ -58,25 +60,26 @@ static inline void enh_set_tx_desc_len(struct dma_desc *p, int len)
                 p->des01.etx.buffer1_size = len;
 }
 
-static inline void ndesc_rx_set_on_ring_chain(struct dma_desc *p, int end)
+/* Normal descriptors */
+static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end)
 {
         p->des01.rx.buffer2_size = BUF_SIZE_2KiB - 1;
         if (end)
                 p->des01.rx.end_ring = 1;
 }
 
-static inline void ndesc_tx_set_on_ring_chain(struct dma_desc *p, int end)
+static inline void ndesc_tx_set_on_ring(struct dma_desc *p, int end)
 {
         if (end)
                 p->des01.tx.end_ring = 1;
 }
 
-static inline void ndesc_end_tx_desc(struct dma_desc *p, int ter)
+static inline void ndesc_end_tx_desc_on_ring(struct dma_desc *p, int ter)
 {
         p->des01.tx.end_ring = ter;
 }
 
-static inline void norm_set_tx_desc_len(struct dma_desc *p, int len)
+static inline void norm_set_tx_desc_len_on_ring(struct dma_desc *p, int len)
 {
         if (unlikely(len > BUF_SIZE_2KiB)) {
                 p->des01.etx.buffer1_size = BUF_SIZE_2KiB - 1;
@@ -85,47 +88,47 @@ static inline void norm_set_tx_desc_len(struct dma_desc *p, int len)
                 p->des01.tx.buffer1_size = len;
 }
 
-#else
+/* Specific functions used for Chain mode */
 
-static inline void ehn_desc_rx_set_on_ring_chain(struct dma_desc *p, int end)
+/* Enhanced descriptors */
+static inline void ehn_desc_rx_set_on_chain(struct dma_desc *p, int end)
 {
         p->des01.erx.second_address_chained = 1;
 }
 
-static inline void ehn_desc_tx_set_on_ring_chain(struct dma_desc *p, int end)
+static inline void ehn_desc_tx_set_on_chain(struct dma_desc *p, int end)
 {
         p->des01.etx.second_address_chained = 1;
 }
 
-static inline void enh_desc_end_tx_desc(struct dma_desc *p, int ter)
+static inline void enh_desc_end_tx_desc_on_chain(struct dma_desc *p, int ter)
 {
         p->des01.etx.second_address_chained = 1;
 }
 
-static inline void enh_set_tx_desc_len(struct dma_desc *p, int len)
+static inline void enh_set_tx_desc_len_on_chain(struct dma_desc *p, int len)
 {
         p->des01.etx.buffer1_size = len;
 }
 
-static inline void ndesc_rx_set_on_ring_chain(struct dma_desc *p, int end)
+/* Normal descriptors */
+static inline void ndesc_rx_set_on_chain(struct dma_desc *p, int end)
 {
         p->des01.rx.second_address_chained = 1;
 }
 
-static inline void ndesc_tx_set_on_ring_chain(struct dma_desc *p, int ring_size)
+static inline void ndesc_tx_set_on_chain(struct dma_desc *p, int ring_size)
 {
         p->des01.tx.second_address_chained = 1;
 }
 
-static inline void ndesc_end_tx_desc(struct dma_desc *p, int ter)
+static inline void ndesc_end_tx_desc_on_chain(struct dma_desc *p, int ter)
 {
         p->des01.tx.second_address_chained = 1;
 }
 
-static inline void norm_set_tx_desc_len(struct dma_desc *p, int len)
+static inline void norm_set_tx_desc_len_on_chain(struct dma_desc *p, int len)
 {
         p->des01.tx.buffer1_size = len;
 }
-#endif
-
 #endif /* __DESC_COM_H__ */
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
index 7ad56afd6324..c12aabb8cf93 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
@@ -89,13 +89,46 @@ enum power_event {
                                 (reg * 8))
 #define GMAC_MAX_PERFECT_ADDRESSES      32
 
+/* PCS registers (AN/TBI/SGMII/RGMII) offset */
 #define GMAC_AN_CTRL    0x000000c0      /* AN control */
 #define GMAC_AN_STATUS  0x000000c4      /* AN status */
 #define GMAC_ANE_ADV    0x000000c8      /* Auto-Neg. Advertisement */
-#define GMAC_ANE_LINK   0x000000cc      /* Auto-Neg. link partener ability */
+#define GMAC_ANE_LPA    0x000000cc      /* Auto-Neg. link partener ability */
 #define GMAC_ANE_EXP    0x000000d0      /* ANE expansion */
 #define GMAC_TBI        0x000000d4      /* TBI extend status */
-#define GMAC_GMII_STATUS 0x000000d8     /* S/R-GMII status */
+#define GMAC_S_R_GMII   0x000000d8      /* SGMII RGMII status */
+
+/* AN Configuration defines */
+#define GMAC_AN_CTRL_RAN        0x00000200      /* Restart Auto-Negotiation */
+#define GMAC_AN_CTRL_ANE        0x00001000      /* Auto-Negotiation Enable */
+#define GMAC_AN_CTRL_ELE        0x00004000      /* External Loopback Enable */
+#define GMAC_AN_CTRL_ECD        0x00010000      /* Enable Comma Detect */
+#define GMAC_AN_CTRL_LR         0x00020000      /* Lock to Reference */
+#define GMAC_AN_CTRL_SGMRAL     0x00040000      /* SGMII RAL Control */
+
+/* AN Status defines */
+#define GMAC_AN_STATUS_LS       0x00000004      /* Link Status 0:down 1:up */
+#define GMAC_AN_STATUS_ANA      0x00000008      /* Auto-Negotiation Ability */
+#define GMAC_AN_STATUS_ANC      0x00000020      /* Auto-Negotiation Complete */
+#define GMAC_AN_STATUS_ES       0x00000100      /* Extended Status */
+
+/* Register 54 (SGMII/RGMII status register) */
+#define GMAC_S_R_GMII_LINK              0x8
+#define GMAC_S_R_GMII_SPEED             0x5
+#define GMAC_S_R_GMII_SPEED_SHIFT       0x1
+#define GMAC_S_R_GMII_MODE              0x1
+#define GMAC_S_R_GMII_SPEED_125         2
+#define GMAC_S_R_GMII_SPEED_25          1
+
+/* Common ADV and LPA defines */
+#define GMAC_ANE_FD             (1 << 5)
+#define GMAC_ANE_HD             (1 << 6)
+#define GMAC_ANE_PSE            (3 << 7)
+#define GMAC_ANE_PSE_SHIFT      7
+
+ /* GMAC Configuration defines */
+#define GMAC_CONTROL_TC 0x01000000      /* Transmit Conf. in RGMII/SGMII */
+#define GMAC_CONTROL_WD 0x00800000      /* Disable Watchdog on receive */
 
 /* GMAC Configuration defines */
 #define GMAC_CONTROL_TC 0x01000000      /* Transmit Conf. in RGMII/SGMII */
@@ -108,19 +141,19 @@ enum inter_frame_gap {
         GMAC_CONTROL_IFG_80 = 0x00020000,
         GMAC_CONTROL_IFG_40 = 0x000e0000,
 };
-#define GMAC_CONTROL_DCRS       0x00010000 /* Disable carrier sense during tx */
-#define GMAC_CONTROL_PS         0x00008000 /* Port Select 0:GMI 1:MII */
-#define GMAC_CONTROL_FES        0x00004000 /* Speed 0:10 1:100 */
-#define GMAC_CONTROL_DO         0x00002000 /* Disable Rx Own */
-#define GMAC_CONTROL_LM         0x00001000 /* Loop-back mode */
-#define GMAC_CONTROL_DM         0x00000800 /* Duplex Mode */
-#define GMAC_CONTROL_IPC        0x00000400 /* Checksum Offload */
-#define GMAC_CONTROL_DR         0x00000200 /* Disable Retry */
-#define GMAC_CONTROL_LUD        0x00000100 /* Link up/down */
-#define GMAC_CONTROL_ACS        0x00000080 /* Automatic Pad/FCS Stripping */
-#define GMAC_CONTROL_DC         0x00000010 /* Deferral Check */
-#define GMAC_CONTROL_TE         0x00000008 /* Transmitter Enable */
-#define GMAC_CONTROL_RE         0x00000004 /* Receiver Enable */
+#define GMAC_CONTROL_DCRS       0x00010000      /* Disable carrier sense */
+#define GMAC_CONTROL_PS         0x00008000      /* Port Select 0:GMI 1:MII */
+#define GMAC_CONTROL_FES        0x00004000      /* Speed 0:10 1:100 */
+#define GMAC_CONTROL_DO         0x00002000      /* Disable Rx Own */
+#define GMAC_CONTROL_LM         0x00001000      /* Loop-back mode */
+#define GMAC_CONTROL_DM         0x00000800      /* Duplex Mode */
+#define GMAC_CONTROL_IPC        0x00000400      /* Checksum Offload */
+#define GMAC_CONTROL_DR         0x00000200      /* Disable Retry */
+#define GMAC_CONTROL_LUD        0x00000100      /* Link up/down */
+#define GMAC_CONTROL_ACS        0x00000080      /* Auto Pad/FCS Stripping */
+#define GMAC_CONTROL_DC         0x00000010      /* Deferral Check */
+#define GMAC_CONTROL_TE         0x00000008      /* Transmitter Enable */
+#define GMAC_CONTROL_RE         0x00000004      /* Receiver Enable */
 
 #define GMAC_CORE_INIT (GMAC_CONTROL_JD | GMAC_CONTROL_PS | GMAC_CONTROL_ACS | \
                         GMAC_CONTROL_JE | GMAC_CONTROL_BE)
@@ -151,15 +184,16 @@ enum inter_frame_gap {
 #define DMA_BUS_MODE_SFT_RESET  0x00000001      /* Software Reset */
 #define DMA_BUS_MODE_DA         0x00000002      /* Arbitration scheme */
 #define DMA_BUS_MODE_DSL_MASK   0x0000007c      /* Descriptor Skip Length */
-#define DMA_BUS_MODE_DSL_SHIFT  2       /*   (in DWORDS)      */
+#define DMA_BUS_MODE_DSL_SHIFT  2               /*   (in DWORDS)      */
 /* Programmable burst length (passed thorugh platform)*/
 #define DMA_BUS_MODE_PBL_MASK   0x00003f00      /* Programmable Burst Len */
 #define DMA_BUS_MODE_PBL_SHIFT  8
+#define DMA_BUS_MODE_ATDS       0x00000080      /* Alternate Descriptor Size */
 
 enum rx_tx_priority_ratio {
-        double_ratio = 0x00004000,      /*2:1 */
-        triple_ratio = 0x00008000,      /*3:1 */
-        quadruple_ratio = 0x0000c000,   /*4:1 */
+        double_ratio = 0x00004000,      /* 2:1 */
+        triple_ratio = 0x00008000,      /* 3:1 */
+        quadruple_ratio = 0x0000c000,   /* 4:1 */
 };
 
 #define DMA_BUS_MODE_FB         0x00010000      /* Fixed burst */
@@ -179,9 +213,10 @@ enum rx_tx_priority_ratio {
 #define DMA_BUS_FB                0x00010000    /* Fixed Burst */
 
 /* DMA operation mode defines (start/stop tx/rx are placed in common header)*/
-#define DMA_CONTROL_DT          0x04000000 /* Disable Drop TCP/IP csum error */
-#define DMA_CONTROL_RSF         0x02000000 /* Receive Store and Forward */
-#define DMA_CONTROL_DFF         0x01000000 /* Disaable flushing */
+/* Disable Drop TCP/IP csum error */
+#define DMA_CONTROL_DT          0x04000000
+#define DMA_CONTROL_RSF         0x02000000      /* Receive Store and Forward */
+#define DMA_CONTROL_DFF         0x01000000      /* Disaable flushing */
 /* Threshold for Activating the FC */
 enum rfa {
         act_full_minus_1 = 0x00800000,
@@ -196,7 +231,7 @@ enum rfd {
         deac_full_minus_3 = 0x00401000,
         deac_full_minus_4 = 0x00401800,
 };
-#define DMA_CONTROL_TSF         0x00200000 /* Transmit  Store and Forward */
+#define DMA_CONTROL_TSF 0x00200000      /* Transmit  Store and Forward */
 
 enum ttc_control {
         DMA_CONTROL_TTC_64 = 0x00000000,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index bfe022605498..7e05e8d0f1c2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -28,6 +28,7 @@
 
 #include <linux/crc32.h>
 #include <linux/slab.h>
+#include <linux/ethtool.h>
 #include <asm/io.h>
 #include "dwmac1000.h"
 
@@ -71,22 +72,22 @@ static void dwmac1000_dump_regs(void __iomem *ioaddr)
 }
 
 static void dwmac1000_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,
-                                unsigned int reg_n)
+                                    unsigned int reg_n)
 {
         stmmac_set_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n),
-                                GMAC_ADDR_LOW(reg_n));
+                            GMAC_ADDR_LOW(reg_n));
 }
 
 static void dwmac1000_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,
-                                unsigned int reg_n)
+                                    unsigned int reg_n)
 {
         stmmac_get_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n),
-                                GMAC_ADDR_LOW(reg_n));
+                            GMAC_ADDR_LOW(reg_n));
 }
 
 static void dwmac1000_set_filter(struct net_device *dev, int id)
 {
-        void __iomem *ioaddr = (void __iomem *) dev->base_addr;
+        void __iomem *ioaddr = (void __iomem *)dev->base_addr;
         unsigned int value = 0;
         unsigned int perfect_addr_number;
 
@@ -96,7 +97,7 @@ static void dwmac1000_set_filter(struct net_device *dev, int id)
         if (dev->flags & IFF_PROMISC)
                 value = GMAC_FRAME_FILTER_PR;
         else if ((netdev_mc_count(dev) > HASH_TABLE_SIZE)
-                   || (dev->flags & IFF_ALLMULTI)) {
+                 || (dev->flags & IFF_ALLMULTI)) {
                 value = GMAC_FRAME_FILTER_PM;   /* pass all multi */
                 writel(0xffffffff, ioaddr + GMAC_HASH_HIGH);
                 writel(0xffffffff, ioaddr + GMAC_HASH_LOW);
@@ -110,12 +111,13 @@ static void dwmac1000_set_filter(struct net_device *dev, int id)
                 memset(mc_filter, 0, sizeof(mc_filter));
                 netdev_for_each_mc_addr(ha, dev) {
                         /* The upper 6 bits of the calculated CRC are used to
-                           index the contens of the hash table */
-                        int bit_nr =
-                            bitrev32(~crc32_le(~0, ha->addr, 6)) >> 26;
+                         * index the contens of the hash table
+                         */
+                        int bit_nr = bitrev32(~crc32_le(~0, ha->addr, 6)) >> 26;
                         /* The most significant bit determines the register to
                          * use (H/L) while the other 5 bits determine the bit
-                         * within the register. */
+                         * within the register.
+                         */
                         mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
                 }
                 writel(mc_filter[0], ioaddr + GMAC_HASH_LOW);
@@ -128,10 +130,11 @@ static void dwmac1000_set_filter(struct net_device *dev, int id)
         else
                 perfect_addr_number = GMAC_MAX_PERFECT_ADDRESSES / 2;
 
-        /* Handle multiple unicast addresses (perfect filtering)*/
+        /* Handle multiple unicast addresses (perfect filtering) */
         if (netdev_uc_count(dev) > perfect_addr_number)
-                /* Switch to promiscuous mode is more than 16 addrs
-                   are required */
+                /* Switch to promiscuous mode if more than 16 addrs
+                 * are required
+                 */
                 value |= GMAC_FRAME_FILTER_PR;
         else {
                 int reg = 1;
@@ -149,13 +152,13 @@ static void dwmac1000_set_filter(struct net_device *dev, int id)
 #endif
         writel(value, ioaddr + GMAC_FRAME_FILTER);
 
-        CHIP_DBG(KERN_INFO "\tFrame Filter reg: 0x%08x\n\tHash regs: "
-            "HI 0x%08x, LO 0x%08x\n", readl(ioaddr + GMAC_FRAME_FILTER),
-            readl(ioaddr + GMAC_HASH_HIGH), readl(ioaddr + GMAC_HASH_LOW));
+        CHIP_DBG(KERN_INFO "\tFilter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
+                 readl(ioaddr + GMAC_FRAME_FILTER),
+                 readl(ioaddr + GMAC_HASH_HIGH), readl(ioaddr + GMAC_HASH_LOW));
 }
 
 static void dwmac1000_flow_ctrl(void __iomem *ioaddr, unsigned int duplex,
-                           unsigned int fc, unsigned int pause_time)
+                                unsigned int fc, unsigned int pause_time)
 {
         unsigned int flow = 0;
 
@@ -193,74 +196,106 @@ static void dwmac1000_pmt(void __iomem *ioaddr, unsigned long mode)
         writel(pmt, ioaddr + GMAC_PMT);
 }
 
-
-static int dwmac1000_irq_status(void __iomem *ioaddr)
+static int dwmac1000_irq_status(void __iomem *ioaddr,
+                                struct stmmac_extra_stats *x)
 {
         u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
-        int status = 0;
+        int ret = 0;
 
         /* Not used events (e.g. MMC interrupts) are not handled. */
         if ((intr_status & mmc_tx_irq)) {
                 CHIP_DBG(KERN_INFO "GMAC: MMC tx interrupt: 0x%08x\n",
-                    readl(ioaddr + GMAC_MMC_TX_INTR));
-                status |= core_mmc_tx_irq;
+                         readl(ioaddr + GMAC_MMC_TX_INTR));
+                x->mmc_tx_irq_n++;
         }
         if (unlikely(intr_status & mmc_rx_irq)) {
                 CHIP_DBG(KERN_INFO "GMAC: MMC rx interrupt: 0x%08x\n",
-                    readl(ioaddr + GMAC_MMC_RX_INTR));
-                status |= core_mmc_rx_irq;
+                         readl(ioaddr + GMAC_MMC_RX_INTR));
+                x->mmc_rx_irq_n++;
         }
         if (unlikely(intr_status & mmc_rx_csum_offload_irq)) {
                 CHIP_DBG(KERN_INFO "GMAC: MMC rx csum offload: 0x%08x\n",
-                    readl(ioaddr + GMAC_MMC_RX_CSUM_OFFLOAD));
-                status |= core_mmc_rx_csum_offload_irq;
+                         readl(ioaddr + GMAC_MMC_RX_CSUM_OFFLOAD));
+                x->mmc_rx_csum_offload_irq_n++;
         }
         if (unlikely(intr_status & pmt_irq)) {
                 CHIP_DBG(KERN_INFO "GMAC: received Magic frame\n");
-                /* clear the PMT bits 5 and 6 by reading the PMT
-                 * status register. */
+                /* clear the PMT bits 5 and 6 by reading the PMT status reg */
                 readl(ioaddr + GMAC_PMT);
-                status |= core_irq_receive_pmt_irq;
+                x->irq_receive_pmt_irq_n++;
         }
         /* MAC trx/rx EEE LPI entry/exit interrupts */
         if (intr_status & lpiis_irq) {
                 /* Clean LPI interrupt by reading the Reg 12 */
-                u32 lpi_status = readl(ioaddr + LPI_CTRL_STATUS);
+                ret = readl(ioaddr + LPI_CTRL_STATUS);
 
-                if (lpi_status & LPI_CTRL_STATUS_TLPIEN) {
+                if (ret & LPI_CTRL_STATUS_TLPIEN) {
                         CHIP_DBG(KERN_INFO "GMAC TX entered in LPI\n");
-                        status |= core_irq_tx_path_in_lpi_mode;
+                        x->irq_tx_path_in_lpi_mode_n++;
                 }
-                if (lpi_status & LPI_CTRL_STATUS_TLPIEX) {
+                if (ret & LPI_CTRL_STATUS_TLPIEX) {
                         CHIP_DBG(KERN_INFO "GMAC TX exit from LPI\n");
-                        status |= core_irq_tx_path_exit_lpi_mode;
+                        x->irq_tx_path_exit_lpi_mode_n++;
                 }
-                if (lpi_status & LPI_CTRL_STATUS_RLPIEN) {
+                if (ret & LPI_CTRL_STATUS_RLPIEN) {
                         CHIP_DBG(KERN_INFO "GMAC RX entered in LPI\n");
-                        status |= core_irq_rx_path_in_lpi_mode;
+                        x->irq_rx_path_in_lpi_mode_n++;
                 }
-                if (lpi_status & LPI_CTRL_STATUS_RLPIEX) {
+                if (ret & LPI_CTRL_STATUS_RLPIEX) {
                         CHIP_DBG(KERN_INFO "GMAC RX exit from LPI\n");
-                        status |= core_irq_rx_path_exit_lpi_mode;
+                        x->irq_rx_path_exit_lpi_mode_n++;
+                }
+        }
+
+        if ((intr_status & pcs_ane_irq) || (intr_status & pcs_link_irq)) {
+                CHIP_DBG(KERN_INFO "GMAC PCS ANE IRQ\n");
+                readl(ioaddr + GMAC_AN_STATUS);
+                x->irq_pcs_ane_n++;
+        }
+        if (intr_status & rgmii_irq) {
+                u32 status = readl(ioaddr + GMAC_S_R_GMII);
+                CHIP_DBG(KERN_INFO "GMAC RGMII/SGMII interrupt\n");
+                x->irq_rgmii_n++;
+
+                /* Save and dump the link status. */
+                if (status & GMAC_S_R_GMII_LINK) {
+                        int speed_value = (status & GMAC_S_R_GMII_SPEED) >>
+                            GMAC_S_R_GMII_SPEED_SHIFT;
+                        x->pcs_duplex = (status & GMAC_S_R_GMII_MODE);
+
+                        if (speed_value == GMAC_S_R_GMII_SPEED_125)
+                                x->pcs_speed = SPEED_1000;
+                        else if (speed_value == GMAC_S_R_GMII_SPEED_25)
+                                x->pcs_speed = SPEED_100;
+                        else
+                                x->pcs_speed = SPEED_10;
+
+                        x->pcs_link = 1;
+                        pr_debug("Link is Up - %d/%s\n", (int)x->pcs_speed,
+                                 x->pcs_duplex ? "Full" : "Half");
+                } else {
+                        x->pcs_link = 0;
+                        pr_debug("Link is Down\n");
                 }
         }
 
-        return status;
+        return ret;
 }
 
-static void  dwmac1000_set_eee_mode(void __iomem *ioaddr)
+static void dwmac1000_set_eee_mode(void __iomem *ioaddr)
 {
         u32 value;
 
         /* Enable the link status receive on RGMII, SGMII ore SMII
          * receive path and instruct the transmit to enter in LPI
-         * state. */
+         * state.
+         */
         value = readl(ioaddr + LPI_CTRL_STATUS);
         value |= LPI_CTRL_STATUS_LPIEN | LPI_CTRL_STATUS_LPITXA;
         writel(value, ioaddr + LPI_CTRL_STATUS);
 }
 
-static void  dwmac1000_reset_eee_mode(void __iomem *ioaddr)
+static void dwmac1000_reset_eee_mode(void __iomem *ioaddr)
 {
         u32 value;
 
@@ -269,7 +304,7 @@ static void  dwmac1000_reset_eee_mode(void __iomem *ioaddr)
         writel(value, ioaddr + LPI_CTRL_STATUS);
 }
 
-static void  dwmac1000_set_eee_pls(void __iomem *ioaddr, int link)
+static void dwmac1000_set_eee_pls(void __iomem *ioaddr, int link)
 {
         u32 value;
 
@@ -283,7 +318,7 @@ static void  dwmac1000_set_eee_pls(void __iomem *ioaddr, int link)
         writel(value, ioaddr + LPI_CTRL_STATUS);
 }
 
-static void  dwmac1000_set_eee_timer(void __iomem *ioaddr, int ls, int tw)
+static void dwmac1000_set_eee_timer(void __iomem *ioaddr, int ls, int tw)
 {
         int value = ((tw & 0xffff)) | ((ls & 0x7ff) << 16);
 
@@ -297,6 +332,41 @@ static void  dwmac1000_set_eee_timer(void __iomem *ioaddr, int ls, int tw)
         writel(value, ioaddr + LPI_TIMER_CTRL);
 }
 
+static void dwmac1000_ctrl_ane(void __iomem *ioaddr, bool restart)
+{
+        u32 value;
+
+        value = readl(ioaddr + GMAC_AN_CTRL);
+        /* auto negotiation enable and External Loopback enable */
+        value = GMAC_AN_CTRL_ANE | GMAC_AN_CTRL_ELE;
+
+        if (restart)
+                value |= GMAC_AN_CTRL_RAN;
+
+        writel(value, ioaddr + GMAC_AN_CTRL);
+}
+
+static void dwmac1000_get_adv(void __iomem *ioaddr, struct rgmii_adv *adv)
+{
+        u32 value = readl(ioaddr + GMAC_ANE_ADV);
+
+        if (value & GMAC_ANE_FD)
+                adv->duplex = DUPLEX_FULL;
+        if (value & GMAC_ANE_HD)
+                adv->duplex |= DUPLEX_HALF;
+
+        adv->pause = (value & GMAC_ANE_PSE) >> GMAC_ANE_PSE_SHIFT;
+
+        value = readl(ioaddr + GMAC_ANE_LPA);
+
+        if (value & GMAC_ANE_FD)
+                adv->lp_duplex = DUPLEX_FULL;
+        if (value & GMAC_ANE_HD)
+                adv->lp_duplex = DUPLEX_HALF;
+
+        adv->lp_pause = (value & GMAC_ANE_PSE) >> GMAC_ANE_PSE_SHIFT;
+}
+
 static const struct stmmac_ops dwmac1000_ops = {
         .core_init = dwmac1000_core_init,
         .rx_ipc = dwmac1000_rx_ipc_enable,
@@ -307,10 +377,12 @@ static const struct stmmac_ops dwmac1000_ops = {
         .pmt = dwmac1000_pmt,
         .set_umac_addr = dwmac1000_set_umac_addr,
         .get_umac_addr = dwmac1000_get_umac_addr,
-        .set_eee_mode =  dwmac1000_set_eee_mode,
-        .reset_eee_mode =  dwmac1000_reset_eee_mode,
-        .set_eee_timer =  dwmac1000_set_eee_timer,
-        .set_eee_pls =  dwmac1000_set_eee_pls,
+        .set_eee_mode = dwmac1000_set_eee_mode,
+        .reset_eee_mode = dwmac1000_reset_eee_mode,
+        .set_eee_timer = dwmac1000_set_eee_timer,
+        .set_eee_pls = dwmac1000_set_eee_pls,
+        .ctrl_ane = dwmac1000_ctrl_ane,
+        .get_adv = dwmac1000_get_adv,
 };
 
 struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
index bf83c03bfd06..2c431b616058 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
@@ -30,8 +30,8 @@
 #include "dwmac1000.h"
 #include "dwmac_dma.h"
 
-static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,
-                              int mb, int burst_len, u32 dma_tx, u32 dma_rx)
+static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb, int mb,
+                              int burst_len, u32 dma_tx, u32 dma_rx, int atds)
 {
         u32 value = readl(ioaddr + DMA_BUS_MODE);
         int limit;
@@ -60,7 +60,7 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,
          * depending on pbl value.
          */
         value = DMA_BUS_MODE_PBL | ((pbl << DMA_BUS_MODE_PBL_SHIFT) |
-                (pbl << DMA_BUS_MODE_RPBL_SHIFT));
+                                    (pbl << DMA_BUS_MODE_RPBL_SHIFT));
 
         /* Set the Fixed burst mode */
         if (fb)
@@ -73,6 +73,10 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,
 #ifdef CONFIG_STMMAC_DA
         value |= DMA_BUS_MODE_DA;       /* Rx has priority over tx */
 #endif
+
+        if (atds)
+                value |= DMA_BUS_MODE_ATDS;
+
         writel(value, ioaddr + DMA_BUS_MODE);
 
         /* In case of GMAC AXI configuration, program the DMA_AXI_BUS_MODE
@@ -90,14 +94,16 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,
          *
          *  For Non Fixed Burst Mode: provide the maximum value of the
          *  burst length. Any burst equal or below the provided burst
-         *  length would be allowed to perform. */
+         *  length would be allowed to perform.
+         */
         writel(burst_len, ioaddr + DMA_AXI_BUS_MODE);
 
         /* Mask interrupts by writing to CSR7 */
         writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);
 
-        /* The base address of the RX/TX descriptor lists must be written into
-         * DMA CSR3 and CSR4, respectively. */
+        /* RX/TX descriptor base address lists must be written into
+         * DMA CSR3 and CSR4, respectively
+         */
         writel(dma_tx, ioaddr + DMA_TX_BASE_ADDR);
         writel(dma_rx, ioaddr + DMA_RCV_BASE_ADDR);
 
@@ -105,7 +111,7 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,
 }
 
 static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode,
-                                    int rxmode)
+                                         int rxmode)
 {
         u32 csr6 = readl(ioaddr + DMA_CONTROL);
 
@@ -114,11 +120,12 @@ static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode,
                 /* Transmit COE type 2 cannot be done in cut-through mode. */
                 csr6 |= DMA_CONTROL_TSF;
                 /* Operating on second frame increase the performance
-                 * especially when transmit store-and-forward is used.*/
+                 * especially when transmit store-and-forward is used.
+                 */
                 csr6 |= DMA_CONTROL_OSF;
         } else {
-                CHIP_DBG(KERN_DEBUG "GMAC: disabling TX store and forward mode"
-                              " (threshold = %d)\n", txmode);
+                CHIP_DBG(KERN_DEBUG "GMAC: disabling TX SF (threshold %d)\n",
+                         txmode);
                 csr6 &= ~DMA_CONTROL_TSF;
                 csr6 &= DMA_CONTROL_TC_TX_MASK;
                 /* Set the transmit threshold */
@@ -138,8 +145,8 @@ static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode,
                 CHIP_DBG(KERN_DEBUG "GMAC: enable RX store and forward mode\n");
                 csr6 |= DMA_CONTROL_RSF;
         } else {
-                CHIP_DBG(KERN_DEBUG "GMAC: disabling RX store and forward mode"
-                              " (threshold = %d)\n", rxmode);
+                CHIP_DBG(KERN_DEBUG "GMAC: disable RX SF mode (threshold %d)\n",
+                         rxmode);
                 csr6 &= ~DMA_CONTROL_RSF;
                 csr6 &= DMA_CONTROL_TC_RX_MASK;
                 if (rxmode <= 32)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index f83210e7c221..007bb2be3f10 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -47,8 +47,7 @@ static void dwmac100_dump_mac_regs(void __iomem *ioaddr)
 {
         pr_info("\t----------------------------------------------\n"
                 "\t  DWMAC 100 CSR (base addr = 0x%p)\n"
-                "\t----------------------------------------------\n",
-                ioaddr);
+                "\t----------------------------------------------\n", ioaddr);
         pr_info("\tcontrol reg (offset 0x%x): 0x%08x\n", MAC_CONTROL,
                 readl(ioaddr + MAC_CONTROL));
         pr_info("\taddr HI (offset 0x%x): 0x%08x\n ", MAC_ADDR_HIGH,
@@ -72,7 +71,8 @@ static int dwmac100_rx_ipc_enable(void __iomem *ioaddr)
         return 0;
 }
 
-static int dwmac100_irq_status(void __iomem *ioaddr)
+static int dwmac100_irq_status(void __iomem *ioaddr,
+                               struct stmmac_extra_stats *x)
 {
         return 0;
 }
@@ -91,7 +91,7 @@ static void dwmac100_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,
 
 static void dwmac100_set_filter(struct net_device *dev, int id)
 {
-        void __iomem *ioaddr = (void __iomem *) dev->base_addr;
+        void __iomem *ioaddr = (void __iomem *)dev->base_addr;
         u32 value = readl(ioaddr + MAC_CONTROL);
 
         if (dev->flags & IFF_PROMISC) {
@@ -112,7 +112,8 @@ static void dwmac100_set_filter(struct net_device *dev, int id)
                 struct netdev_hw_addr *ha;
 
                 /* Perfect filter mode for physical address and Hash
-                   filter for multicast */
+                 * filter for multicast
+                 */
                 value |= MAC_CONTROL_HP;
                 value &= ~(MAC_CONTROL_PM | MAC_CONTROL_PR |
                            MAC_CONTROL_IF | MAC_CONTROL_HO);
@@ -120,12 +121,13 @@ static void dwmac100_set_filter(struct net_device *dev, int id)
                 memset(mc_filter, 0, sizeof(mc_filter));
                 netdev_for_each_mc_addr(ha, dev) {
                         /* The upper 6 bits of the calculated CRC are used to
-                         * index the contens of the hash table */
-                        int bit_nr =
-                            ether_crc(ETH_ALEN, ha->addr) >> 26;
+                         * index the contens of the hash table
+                         */
+                        int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
                         /* The most significant bit determines the register to
                          * use (H/L) while the other 5 bits determine the bit
-                         * within the register. */
+                         * within the register.
+                         */
                         mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
                 }
                 writel(mc_filter[0], ioaddr + MAC_HASH_LOW);
@@ -134,10 +136,9 @@ static void dwmac100_set_filter(struct net_device *dev, int id)
 
         writel(value, ioaddr + MAC_CONTROL);
 
-        CHIP_DBG(KERN_INFO "%s: CTRL reg: 0x%08x Hash regs: "
-            "HI 0x%08x, LO 0x%08x\n",
-            __func__, readl(ioaddr + MAC_CONTROL),
-            readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW));
+        CHIP_DBG(KERN_INFO "%s: Filter: 0x%08x Hash: HI 0x%08x, LO 0x%08x\n",
+                 __func__, readl(ioaddr + MAC_CONTROL),
+                 readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW));
 }
 
 static void dwmac100_flow_ctrl(void __iomem *ioaddr, unsigned int duplex,
@@ -150,9 +151,7 @@ static void dwmac100_flow_ctrl(void __iomem *ioaddr, unsigned int duplex,
         writel(flow, ioaddr + MAC_FLOW_CTRL);
 }
 
-/* No PMT module supported for this Ethernet Controller.
- * Tested on ST platforms only.
- */
+/* No PMT module supported on ST boards with this Eth chip. */
 static void dwmac100_pmt(void __iomem *ioaddr, unsigned long mode)
 {
         return;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
index c2b4d55a79b6..67551c154138 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
@@ -32,8 +32,8 @@
 #include "dwmac100.h"
 #include "dwmac_dma.h"
 
-static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, int fb,
-                             int mb, int burst_len, u32 dma_tx, u32 dma_rx)
+static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, int fb, int mb,
+                             int burst_len, u32 dma_tx, u32 dma_rx, int atds)
 {
         u32 value = readl(ioaddr + DMA_BUS_MODE);
         int limit;
@@ -52,22 +52,25 @@ static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, int fb,
 
         /* Enable Application Access by writing to DMA CSR0 */
         writel(DMA_BUS_MODE_DEFAULT | (pbl << DMA_BUS_MODE_PBL_SHIFT),
-                        ioaddr + DMA_BUS_MODE);
+               ioaddr + DMA_BUS_MODE);
 
         /* Mask interrupts by writing to CSR7 */
         writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);
 
-        /* The base address of the RX/TX descriptor lists must be written into
-         * DMA CSR3 and CSR4, respectively. */
+        /* RX/TX descriptor base addr lists must be written into
+         * DMA CSR3 and CSR4, respectively
+         */
         writel(dma_tx, ioaddr + DMA_TX_BASE_ADDR);
         writel(dma_rx, ioaddr + DMA_RCV_BASE_ADDR);
 
         return 0;
 }
 
-/* Store and Forward capability is not used at all..
- * The transmit threshold can be programmed by
- * setting the TTC bits in the DMA control register.*/
+/* Store and Forward capability is not used at all.
+ *
+ * The transmit threshold can be programmed by setting the TTC bits in the DMA
+ * control register.
+ */
 static void dwmac100_dma_operation_mode(void __iomem *ioaddr, int txmode,
                                         int rxmode)
 {
@@ -90,16 +93,15 @@ static void dwmac100_dump_dma_regs(void __iomem *ioaddr)
         CHIP_DBG(KERN_DEBUG "DWMAC 100 DMA CSR\n");
         for (i = 0; i < 9; i++)
                 pr_debug("\t CSR%d (offset 0x%x): 0x%08x\n", i,
-                       (DMA_BUS_MODE + i * 4),
-                       readl(ioaddr + DMA_BUS_MODE + i * 4));
+                         (DMA_BUS_MODE + i * 4),
+                         readl(ioaddr + DMA_BUS_MODE + i * 4));
         CHIP_DBG(KERN_DEBUG "\t CSR20 (offset 0x%x): 0x%08x\n",
-            DMA_CUR_TX_BUF_ADDR, readl(ioaddr + DMA_CUR_TX_BUF_ADDR));
+                 DMA_CUR_TX_BUF_ADDR, readl(ioaddr + DMA_CUR_TX_BUF_ADDR));
         CHIP_DBG(KERN_DEBUG "\t CSR21 (offset 0x%x): 0x%08x\n",
-            DMA_CUR_RX_BUF_ADDR, readl(ioaddr + DMA_CUR_RX_BUF_ADDR));
+                 DMA_CUR_RX_BUF_ADDR, readl(ioaddr + DMA_CUR_RX_BUF_ADDR));
 }
 
-/* DMA controller has two counters to track the number of
- * the receive missed frames. */
+/* DMA controller has two counters to track the number of the missed frames. */
 static void dwmac100_dma_diagnostic_fr(void *data, struct stmmac_extra_stats *x,
                                        void __iomem *ioaddr)
 {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
index ab4896ecac1c..8e5662ce488b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
@@ -102,7 +102,7 @@
 #define DMA_STATUS_TU   0x00000004      /* Transmit Buffer Unavailable */
 #define DMA_STATUS_TPS  0x00000002      /* Transmit Process Stopped */
 #define DMA_STATUS_TI   0x00000001      /* Transmit Interrupt */
-#define DMA_CONTROL_FTF         0x00100000 /* Flush transmit FIFO */
+#define DMA_CONTROL_FTF         0x00100000      /* Flush transmit FIFO */
 
 extern void dwmac_enable_dma_transmission(void __iomem *ioaddr);
 extern void dwmac_enable_dma_irq(void __iomem *ioaddr);
@@ -112,6 +112,6 @@ extern void dwmac_dma_stop_tx(void __iomem *ioaddr);
 extern void dwmac_dma_start_rx(void __iomem *ioaddr);
 extern void dwmac_dma_stop_rx(void __iomem *ioaddr);
 extern int dwmac_dma_interrupt(void __iomem *ioaddr,
-                                struct stmmac_extra_stats *x);
+                               struct stmmac_extra_stats *x);
 
 #endif /* __DWMAC_DMA_H__ */
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index 2fc8ef95f97a..0fbc8fafa706 100644
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -150,6 +150,57 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
         return ret;
 }
 
+static void enh_desc_get_ext_status(void *data, struct stmmac_extra_stats *x,
+                                    struct dma_extended_desc *p)
+{
+        if (unlikely(p->basic.des01.erx.rx_mac_addr)) {
+                if (p->des4.erx.ip_hdr_err)
+                        x->ip_hdr_err++;
+                if (p->des4.erx.ip_payload_err)
+                        x->ip_payload_err++;
+                if (p->des4.erx.ip_csum_bypassed)
+                        x->ip_csum_bypassed++;
+                if (p->des4.erx.ipv4_pkt_rcvd)
+                        x->ipv4_pkt_rcvd++;
+                if (p->des4.erx.ipv6_pkt_rcvd)
+                        x->ipv6_pkt_rcvd++;
+                if (p->des4.erx.msg_type == RDES_EXT_SYNC)
+                        x->rx_msg_type_sync++;
+                else if (p->des4.erx.msg_type == RDES_EXT_FOLLOW_UP)
+                        x->rx_msg_type_follow_up++;
+                else if (p->des4.erx.msg_type == RDES_EXT_DELAY_REQ)
+                        x->rx_msg_type_delay_req++;
+                else if (p->des4.erx.msg_type == RDES_EXT_DELAY_RESP)
+                        x->rx_msg_type_delay_resp++;
+                else if (p->des4.erx.msg_type == RDES_EXT_DELAY_REQ)
+                        x->rx_msg_type_pdelay_req++;
+                else if (p->des4.erx.msg_type == RDES_EXT_PDELAY_RESP)
+                        x->rx_msg_type_pdelay_resp++;
+                else if (p->des4.erx.msg_type == RDES_EXT_PDELAY_FOLLOW_UP)
+                        x->rx_msg_type_pdelay_follow_up++;
+                else
+                        x->rx_msg_type_ext_no_ptp++;
+                if (p->des4.erx.ptp_frame_type)
+                        x->ptp_frame_type++;
+                if (p->des4.erx.ptp_ver)
+                        x->ptp_ver++;
+                if (p->des4.erx.timestamp_dropped)
+                        x->timestamp_dropped++;
+                if (p->des4.erx.av_pkt_rcvd)
+                        x->av_pkt_rcvd++;
+                if (p->des4.erx.av_tagged_pkt_rcvd)
+                        x->av_tagged_pkt_rcvd++;
+                if (p->des4.erx.vlan_tag_priority_val)
+                        x->vlan_tag_priority_val++;
+                if (p->des4.erx.l3_filter_match)
+                        x->l3_filter_match++;
+                if (p->des4.erx.l4_filter_match)
+                        x->l4_filter_match++;
+                if (p->des4.erx.l3_l4_filter_no_match)
+                        x->l3_l4_filter_no_match++;
+        }
+}
+
 static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                                   struct dma_desc *p)
 {
@@ -198,7 +249,7 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,
          * At any rate, we need to understand if the CSUM hw computation is ok
          * and report this info to the upper layers. */
         ret = enh_desc_coe_rdes0(p->des01.erx.ipc_csum_error,
-                p->des01.erx.frame_type, p->des01.erx.payload_csum_error);
+                p->des01.erx.frame_type, p->des01.erx.rx_mac_addr);
 
         if (unlikely(p->des01.erx.dribbling)) {
                 CHIP_DBG(KERN_ERR "GMAC RX: dribbling error\n");
@@ -225,34 +276,32 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                 x->rx_vlan++;
         }
 #endif
+
         return ret;
 }
 
-static void enh_desc_init_rx_desc(struct dma_desc *p, unsigned int ring_size,
-                                  int disable_rx_ic)
+static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
+                                  int mode, int end)
 {
-        int i;
-        for (i = 0; i < ring_size; i++) {
-                p->des01.erx.own = 1;
-                p->des01.erx.buffer1_size = BUF_SIZE_8KiB - 1;
+        p->des01.erx.own = 1;
+        p->des01.erx.buffer1_size = BUF_SIZE_8KiB - 1;
 
-                ehn_desc_rx_set_on_ring_chain(p, (i == ring_size - 1));
+        if (mode == STMMAC_CHAIN_MODE)
+                ehn_desc_rx_set_on_chain(p, end);
+        else
+                ehn_desc_rx_set_on_ring(p, end);
 
-                if (disable_rx_ic)
-                        p->des01.erx.disable_ic = 1;
-                p++;
-        }
+        if (disable_rx_ic)
+                p->des01.erx.disable_ic = 1;
 }
 
-static void enh_desc_init_tx_desc(struct dma_desc *p, unsigned int ring_size)
+static void enh_desc_init_tx_desc(struct dma_desc *p, int mode, int end)
 {
-        int i;
-
-        for (i = 0; i < ring_size; i++) {
-                p->des01.etx.own = 0;
-                ehn_desc_tx_set_on_ring_chain(p, (i == ring_size - 1));
-                p++;
-        }
+        p->des01.etx.own = 0;
+        if (mode == STMMAC_CHAIN_MODE)
+                ehn_desc_tx_set_on_chain(p, end);
+        else
+                ehn_desc_tx_set_on_ring(p, end);
 }
 
 static int enh_desc_get_tx_owner(struct dma_desc *p)
@@ -280,20 +329,26 @@ static int enh_desc_get_tx_ls(struct dma_desc *p)
         return p->des01.etx.last_segment;
 }
 
-static void enh_desc_release_tx_desc(struct dma_desc *p)
+static void enh_desc_release_tx_desc(struct dma_desc *p, int mode)
 {
         int ter = p->des01.etx.end_ring;
 
         memset(p, 0, offsetof(struct dma_desc, des2));
-        enh_desc_end_tx_desc(p, ter);
+        if (mode == STMMAC_CHAIN_MODE)
+                enh_desc_end_tx_desc_on_chain(p, ter);
+        else
+                enh_desc_end_tx_desc_on_ring(p, ter);
 }
 
 static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-                                     int csum_flag)
+                                     int csum_flag, int mode)
 {
         p->des01.etx.first_segment = is_fs;
 
-        enh_set_tx_desc_len(p, len);
+        if (mode == STMMAC_CHAIN_MODE)
+                enh_set_tx_desc_len_on_chain(p, len);
+        else
+                enh_set_tx_desc_len_on_ring(p, len);
 
         if (likely(csum_flag))
                 p->des01.etx.checksum_insertion = cic_full;
@@ -323,6 +378,49 @@ static int enh_desc_get_rx_frame_len(struct dma_desc *p, int rx_coe_type)
                 return p->des01.erx.frame_length;
 }
 
+static void enh_desc_enable_tx_timestamp(struct dma_desc *p)
+{
+        p->des01.etx.time_stamp_enable = 1;
+}
+
+static int enh_desc_get_tx_timestamp_status(struct dma_desc *p)
+{
+        return p->des01.etx.time_stamp_status;
+}
+
+static u64 enh_desc_get_timestamp(void *desc, u32 ats)
+{
+        u64 ns;
+
+        if (ats) {
+                struct dma_extended_desc *p = (struct dma_extended_desc *)desc;
+                ns = p->des6;
+                /* convert high/sec time stamp value to nanosecond */
+                ns += p->des7 * 1000000000ULL;
+        } else {
+                struct dma_desc *p = (struct dma_desc *)desc;
+                ns = p->des2;
+                ns += p->des3 * 1000000000ULL;
+        }
+
+        return ns;
+}
+
+static int enh_desc_get_rx_timestamp_status(void *desc, u32 ats)
+{
+        if (ats) {
+                struct dma_extended_desc *p = (struct dma_extended_desc *)desc;
+                return p->basic.des01.erx.ipc_csum_error;
+        } else {
+                struct dma_desc *p = (struct dma_desc *)desc;
+                if ((p->des2 == 0xffffffff) && (p->des3 == 0xffffffff))
+                        /* timestamp is corrupted, hence don't store it */
+                        return 0;
+                else
+                        return 1;
+        }
+}
+
 const struct stmmac_desc_ops enh_desc_ops = {
         .tx_status = enh_desc_get_tx_status,
         .rx_status = enh_desc_get_rx_status,
@@ -339,4 +437,9 @@ const struct stmmac_desc_ops enh_desc_ops = {
         .set_tx_owner = enh_desc_set_tx_owner,
         .set_rx_owner = enh_desc_set_rx_owner,
         .get_rx_frame_len = enh_desc_get_rx_frame_len,
+        .rx_extended_status = enh_desc_get_ext_status,
+        .enable_tx_timestamp = enh_desc_enable_tx_timestamp,
+        .get_tx_timestamp_status = enh_desc_get_tx_timestamp_status,
+        .get_timestamp = enh_desc_get_timestamp,
+        .get_rx_timestamp_status = enh_desc_get_rx_timestamp_status,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc.h b/drivers/net/ethernet/stmicro/stmmac/mmc.h
index 67995ef25251..48ec001566b5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc.h
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc.h
@@ -28,8 +28,7 @@
 /* MMC control register */
 /* When set, all counter are reset */
 #define MMC_CNTRL_COUNTER_RESET         0x1
-/* When set, do not roll over zero
- * after reaching the max value*/
+/* When set, do not roll over zero after reaching the max value*/
 #define MMC_CNTRL_COUNTER_STOP_ROLLOVER 0x2
 #define MMC_CNTRL_RESET_ON_READ         0x4     /* Reset after reading */
 #define MMC_CNTRL_COUNTER_FREEZER       0x8     /* Freeze counter values to the
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index 68962c549a2d..11775b99afc5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -79,8 +79,8 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
         struct net_device_stats *stats = (struct net_device_stats *)data;
 
         if (unlikely(p->des01.rx.last_descriptor == 0)) {
-                pr_warning("ndesc Error: Oversized Ethernet "
-                           "frame spanned multiple buffers\n");
+                pr_warn("%s: Oversized frame spanned multiple buffers\n",
+                        __func__);
                 stats->rx_length_errors++;
                 return discard_frame;
         }
@@ -122,30 +122,28 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
         return ret;
 }
 
-static void ndesc_init_rx_desc(struct dma_desc *p, unsigned int ring_size,
-                               int disable_rx_ic)
+static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
+                               int end)
 {
-        int i;
-        for (i = 0; i < ring_size; i++) {
-                p->des01.rx.own = 1;
-                p->des01.rx.buffer1_size = BUF_SIZE_2KiB - 1;
+        p->des01.rx.own = 1;
+        p->des01.rx.buffer1_size = BUF_SIZE_2KiB - 1;
 
-                ndesc_rx_set_on_ring_chain(p, (i == ring_size - 1));
+        if (mode == STMMAC_CHAIN_MODE)
+                ndesc_rx_set_on_chain(p, end);
+        else
+                ndesc_rx_set_on_ring(p, end);
 
-                if (disable_rx_ic)
-                        p->des01.rx.disable_ic = 1;
-                p++;
-        }
+        if (disable_rx_ic)
+                p->des01.rx.disable_ic = 1;
 }
 
-static void ndesc_init_tx_desc(struct dma_desc *p, unsigned int ring_size)
+static void ndesc_init_tx_desc(struct dma_desc *p, int mode, int end)
 {
-        int i;
-        for (i = 0; i < ring_size; i++) {
-                p->des01.tx.own = 0;
-                ndesc_tx_set_on_ring_chain(p, (i == (ring_size - 1)));
-                p++;
-        }
+        p->des01.tx.own = 0;
+        if (mode == STMMAC_CHAIN_MODE)
+                ndesc_tx_set_on_chain(p, end);
+        else
+                ndesc_tx_set_on_ring(p, end);
 }
 
 static int ndesc_get_tx_owner(struct dma_desc *p)
@@ -173,19 +171,25 @@ static int ndesc_get_tx_ls(struct dma_desc *p)
         return p->des01.tx.last_segment;
 }
 
-static void ndesc_release_tx_desc(struct dma_desc *p)
+static void ndesc_release_tx_desc(struct dma_desc *p, int mode)
 {
         int ter = p->des01.tx.end_ring;
 
         memset(p, 0, offsetof(struct dma_desc, des2));
-        ndesc_end_tx_desc(p, ter);
+        if (mode == STMMAC_CHAIN_MODE)
+                ndesc_end_tx_desc_on_chain(p, ter);
+        else
+                ndesc_end_tx_desc_on_ring(p, ter);
 }
 
 static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-                                  int csum_flag)
+                                  int csum_flag, int mode)
 {
         p->des01.tx.first_segment = is_fs;
-        norm_set_tx_desc_len(p, len);
+        if (mode == STMMAC_CHAIN_MODE)
+                norm_set_tx_desc_len_on_chain(p, len);
+        else
+                norm_set_tx_desc_len_on_ring(p, len);
 
         if (likely(csum_flag))
                 p->des01.tx.checksum_insertion = cic_full;
@@ -215,6 +219,39 @@ static int ndesc_get_rx_frame_len(struct dma_desc *p, int rx_coe_type)
                 return p->des01.rx.frame_length;
 }
 
+static void ndesc_enable_tx_timestamp(struct dma_desc *p)
+{
+        p->des01.tx.time_stamp_enable = 1;
+}
+
+static int ndesc_get_tx_timestamp_status(struct dma_desc *p)
+{
+        return p->des01.tx.time_stamp_status;
+}
+
+static u64 ndesc_get_timestamp(void *desc, u32 ats)
+{
+        struct dma_desc *p = (struct dma_desc *)desc;
+        u64 ns;
+
+        ns = p->des2;
+        /* convert high/sec time stamp value to nanosecond */
+        ns += p->des3 * 1000000000ULL;
+
+        return ns;
+}
+
+static int ndesc_get_rx_timestamp_status(void *desc, u32 ats)
+{
+        struct dma_desc *p = (struct dma_desc *)desc;
+
+        if ((p->des2 == 0xffffffff) && (p->des3 == 0xffffffff))
+                /* timestamp is corrupted, hence don't store it */
+                return 0;
+        else
+                return 1;
+}
+
 const struct stmmac_desc_ops ndesc_ops = {
         .tx_status = ndesc_get_tx_status,
         .rx_status = ndesc_get_rx_status,
@@ -231,4 +268,8 @@ const struct stmmac_desc_ops ndesc_ops = {
         .set_tx_owner = ndesc_set_tx_owner,
         .set_rx_owner = ndesc_set_rx_owner,
         .get_rx_frame_len = ndesc_get_rx_frame_len,
+        .enable_tx_timestamp = ndesc_enable_tx_timestamp,
+        .get_tx_timestamp_status = ndesc_get_tx_timestamp_status,
+        .get_timestamp = ndesc_get_timestamp,
+        .get_rx_timestamp_status = ndesc_get_rx_timestamp_status,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
index 4b785e10f2ed..c9d942a5c335 100644
--- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
@@ -30,7 +30,7 @@
 
 static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 {
-        struct stmmac_priv *priv = (struct stmmac_priv *) p;
+        struct stmmac_priv *priv = (struct stmmac_priv *)p;
         unsigned int txsize = priv->dma_tx_size;
         unsigned int entry = priv->cur_tx % txsize;
         struct dma_desc *desc = priv->dma_tx + entry;
@@ -48,25 +48,30 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 
                 desc->des2 = dma_map_single(priv->device, skb->data,
                                             bmax, DMA_TO_DEVICE);
+                priv->tx_skbuff_dma[entry] = desc->des2;
                 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
-                priv->hw->desc->prepare_tx_desc(desc, 1, bmax,
-                                                csum);
+                priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum,
+                                                STMMAC_RING_MODE);
                 wmb();
                 entry = (++priv->cur_tx) % txsize;
                 desc = priv->dma_tx + entry;
 
                 desc->des2 = dma_map_single(priv->device, skb->data + bmax,
                                             len, DMA_TO_DEVICE);
+                priv->tx_skbuff_dma[entry] = desc->des2;
                 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
-                priv->hw->desc->prepare_tx_desc(desc, 0, len, csum);
+                priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,
+                                                STMMAC_RING_MODE);
                 wmb();
                 priv->hw->desc->set_tx_owner(desc);
                 priv->tx_skbuff[entry] = NULL;
         } else {
                 desc->des2 = dma_map_single(priv->device, skb->data,
                                             nopaged_len, DMA_TO_DEVICE);
+                priv->tx_skbuff_dma[entry] = desc->des2;
                 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
-                priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len, csum);
+                priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len, csum,
+                                                STMMAC_RING_MODE);
         }
 
         return entry;
@@ -82,27 +87,23 @@ static unsigned int stmmac_is_jumbo_frm(int len, int enh_desc)
         return ret;
 }
 
-static void stmmac_refill_desc3(int bfsize, struct dma_desc *p)
+static void stmmac_refill_desc3(void *priv_ptr, struct dma_desc *p)
 {
-        /* Fill DES3 in case of RING mode */
-        if (bfsize >= BUF_SIZE_8KiB)
-                p->des3 = p->des2 + BUF_SIZE_8KiB;
-}
+        struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr;
 
-/* In ring mode we need to fill the desc3 because it is used
- * as buffer */
-static void stmmac_init_desc3(int des3_as_data_buf, struct dma_desc *p)
-{
-        if (unlikely(des3_as_data_buf))
-                p->des3 = p->des2 + BUF_SIZE_8KiB;
+        if (unlikely(priv->plat->has_gmac))
+                /* Fill DES3 in case of RING mode */
+                if (priv->dma_buf_sz >= BUF_SIZE_8KiB)
+                        p->des3 = p->des2 + BUF_SIZE_8KiB;
 }
 
-static void stmmac_init_dma_chain(struct dma_desc *des, dma_addr_t phy_addr,
-                                  unsigned int size)
+/* In ring mode we need to fill the desc3 because it is used as buffer */
+static void stmmac_init_desc3(struct dma_desc *p)
 {
+        p->des3 = p->des2 + BUF_SIZE_8KiB;
 }
 
-static void stmmac_clean_desc3(struct dma_desc *p)
+static void stmmac_clean_desc3(void *priv_ptr, struct dma_desc *p)
 {
         if (unlikely(p->des3))
                 p->des3 = 0;
@@ -121,7 +122,6 @@ const struct stmmac_ring_mode_ops ring_mode_ops = {
         .jumbo_frm = stmmac_jumbo_frm,
         .refill_desc3 = stmmac_refill_desc3,
         .init_desc3 = stmmac_init_desc3,
-        .init_dma_chain = stmmac_init_dma_chain,
         .clean_desc3 = stmmac_clean_desc3,
         .set_16kib_bfsize = stmmac_set_16kib_bfsize,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index b05df8983be5..c922fde929a1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -24,43 +24,56 @@
 #define __STMMAC_H__
 
 #define STMMAC_RESOURCE_NAME   "stmmaceth"
-#define DRV_MODULE_VERSION      "Nov_2012"
+#define DRV_MODULE_VERSION      "March_2013"
 
 #include <linux/clk.h>
 #include <linux/stmmac.h>
 #include <linux/phy.h>
 #include <linux/pci.h>
 #include "common.h"
+#include <linux/ptp_clock_kernel.h>
 
 struct stmmac_priv {
         /* Frequently used values are kept adjacent for cache effect */
-        struct dma_desc *dma_tx ____cacheline_aligned;
-        dma_addr_t dma_tx_phy;
+        struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp;
+        struct dma_desc *dma_tx;
         struct sk_buff **tx_skbuff;
         unsigned int cur_tx;
         unsigned int dirty_tx;
         unsigned int dma_tx_size;
+        u32 tx_count_frames;
+        u32 tx_coal_frames;
+        u32 tx_coal_timer;
+        dma_addr_t *tx_skbuff_dma;
+        dma_addr_t dma_tx_phy;
         int tx_coalesce;
+        int hwts_tx_en;
+        spinlock_t tx_lock;
+        bool tx_path_in_lpi_mode;
+        struct timer_list txtimer;
 
-        struct dma_desc *dma_rx ;
+        struct dma_desc *dma_rx ____cacheline_aligned_in_smp;
+        struct dma_extended_desc *dma_erx;
+        struct sk_buff **rx_skbuff;
         unsigned int cur_rx;
         unsigned int dirty_rx;
-        struct sk_buff **rx_skbuff;
+        unsigned int dma_rx_size;
+        unsigned int dma_buf_sz;
+        u32 rx_riwt;
+        int hwts_rx_en;
         dma_addr_t *rx_skbuff_dma;
+        dma_addr_t dma_rx_phy;
 
+        struct napi_struct napi ____cacheline_aligned_in_smp;
+
+        void __iomem *ioaddr;
         struct net_device *dev;
-        dma_addr_t dma_rx_phy;
-        unsigned int dma_rx_size;
-        unsigned int dma_buf_sz;
         struct device *device;
         struct mac_device_info *hw;
-        void __iomem *ioaddr;
-
-        struct stmmac_extra_stats xstats;
-        struct napi_struct napi;
         int no_csum_insertion;
+        spinlock_t lock;
 
-        struct phy_device *phydev;
+        struct phy_device *phydev ____cacheline_aligned_in_smp;
         int oldlink;
         int speed;
         int oldduplex;
@@ -69,30 +82,31 @@ struct stmmac_priv {
         struct mii_bus *mii;
         int mii_irq[PHY_MAX_ADDR];
 
-        u32 msg_enable;
-        spinlock_t lock;
-        spinlock_t tx_lock;
-        int wolopts;
-        int wol_irq;
+        struct stmmac_extra_stats xstats ____cacheline_aligned_in_smp;
         struct plat_stmmacenet_data *plat;
-        struct stmmac_counters mmc;
         struct dma_features dma_cap;
+        struct stmmac_counters mmc;
         int hw_cap_support;
+        int synopsys_id;
+        u32 msg_enable;
+        int wolopts;
+        int wol_irq;
         struct clk *stmmac_clk;
         int clk_csr;
-        int synopsys_id;
         struct timer_list eee_ctrl_timer;
-        bool tx_path_in_lpi_mode;
         int lpi_irq;
         int eee_enabled;
         int eee_active;
         int tx_lpi_timer;
-        struct timer_list txtimer;
-        u32 tx_count_frames;
-        u32 tx_coal_frames;
-        u32 tx_coal_timer;
+        int pcs;
+        unsigned int mode;
+        int extend_desc;
+        struct ptp_clock *ptp_clock;
+        struct ptp_clock_info ptp_clock_ops;
+        unsigned int default_addend;
+        u32 adv_ts;
         int use_riwt;
-        u32 rx_riwt;
+        spinlock_t ptp_lock;
 };
 
 extern int phyaddr;
@@ -102,6 +116,9 @@ extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);
 extern const struct stmmac_desc_ops enh_desc_ops;
 extern const struct stmmac_desc_ops ndesc_ops;
+extern const struct stmmac_hwtimestamp stmmac_ptp;
+extern int stmmac_ptp_register(struct stmmac_priv *priv);
+extern void stmmac_ptp_unregister(struct stmmac_priv *priv);
 int stmmac_freeze(struct net_device *ndev);
 int stmmac_restore(struct net_device *ndev);
 int stmmac_resume(struct net_device *ndev);
@@ -125,6 +142,7 @@ static inline int stmmac_register_platform(void)
 
         return err;
 }
+
 static inline void stmmac_unregister_platform(void)
 {
         platform_driver_unregister(&stmmac_pltfr_driver);
@@ -136,6 +154,7 @@ static inline int stmmac_register_platform(void)
 
         return 0;
 }
+
 static inline void stmmac_unregister_platform(void)
 {
 }
@@ -153,6 +172,7 @@ static inline int stmmac_register_pci(void)
 
         return err;
 }
+
 static inline void stmmac_unregister_pci(void)
 {
         pci_unregister_driver(&stmmac_pci_driver);
@@ -164,6 +184,7 @@ static inline int stmmac_register_pci(void)
 
         return 0;
 }
+
 static inline void stmmac_unregister_pci(void)
 {
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index d1ac39c1b05d..c5f9cb85c8ef 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
+#include <linux/net_tstamp.h>
 #include <asm/io.h>
 
 #include "stmmac.h"
@@ -108,6 +109,33 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(irq_rx_path_in_lpi_mode_n),
         STMMAC_STAT(irq_rx_path_exit_lpi_mode_n),
         STMMAC_STAT(phy_eee_wakeup_error_n),
+        /* Extended RDES status */
+        STMMAC_STAT(ip_hdr_err),
+        STMMAC_STAT(ip_payload_err),
+        STMMAC_STAT(ip_csum_bypassed),
+        STMMAC_STAT(ipv4_pkt_rcvd),
+        STMMAC_STAT(ipv6_pkt_rcvd),
+        STMMAC_STAT(rx_msg_type_ext_no_ptp),
+        STMMAC_STAT(rx_msg_type_sync),
+        STMMAC_STAT(rx_msg_type_follow_up),
+        STMMAC_STAT(rx_msg_type_delay_req),
+        STMMAC_STAT(rx_msg_type_delay_resp),
+        STMMAC_STAT(rx_msg_type_pdelay_req),
+        STMMAC_STAT(rx_msg_type_pdelay_resp),
+        STMMAC_STAT(rx_msg_type_pdelay_follow_up),
+        STMMAC_STAT(ptp_frame_type),
+        STMMAC_STAT(ptp_ver),
+        STMMAC_STAT(timestamp_dropped),
+        STMMAC_STAT(av_pkt_rcvd),
+        STMMAC_STAT(av_tagged_pkt_rcvd),
+        STMMAC_STAT(vlan_tag_priority_val),
+        STMMAC_STAT(l3_filter_match),
+        STMMAC_STAT(l4_filter_match),
+        STMMAC_STAT(l3_l4_filter_no_match),
+        /* PCS */
+        STMMAC_STAT(irq_pcs_ane_n),
+        STMMAC_STAT(irq_pcs_link_n),
+        STMMAC_STAT(irq_rgmii_n),
 };
 #define STMMAC_STATS_LEN ARRAY_SIZE(stmmac_gstrings_stats)
 
@@ -219,6 +247,70 @@ static int stmmac_ethtool_getsettings(struct net_device *dev,
         struct stmmac_priv *priv = netdev_priv(dev);
         struct phy_device *phy = priv->phydev;
         int rc;
+
+        if ((priv->pcs & STMMAC_PCS_RGMII) || (priv->pcs & STMMAC_PCS_SGMII)) {
+                struct rgmii_adv adv;
+
+                if (!priv->xstats.pcs_link) {
+                        ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
+                        cmd->duplex = DUPLEX_UNKNOWN;
+                        return 0;
+                }
+                cmd->duplex = priv->xstats.pcs_duplex;
+
+                ethtool_cmd_speed_set(cmd, priv->xstats.pcs_speed);
+
+                /* Get and convert ADV/LP_ADV from the HW AN registers */
+                if (priv->hw->mac->get_adv)
+                        priv->hw->mac->get_adv(priv->ioaddr, &adv);
+                else
+                        return -EOPNOTSUPP;     /* should never happen indeed */
+
+                /* Encoding of PSE bits is defined in 802.3z, 37.2.1.4 */
+
+                if (adv.pause & STMMAC_PCS_PAUSE)
+                        cmd->advertising |= ADVERTISED_Pause;
+                if (adv.pause & STMMAC_PCS_ASYM_PAUSE)
+                        cmd->advertising |= ADVERTISED_Asym_Pause;
+                if (adv.lp_pause & STMMAC_PCS_PAUSE)
+                        cmd->lp_advertising |= ADVERTISED_Pause;
+                if (adv.lp_pause & STMMAC_PCS_ASYM_PAUSE)
+                        cmd->lp_advertising |= ADVERTISED_Asym_Pause;
+
+                /* Reg49[3] always set because ANE is always supported */
+                cmd->autoneg = ADVERTISED_Autoneg;
+                cmd->supported |= SUPPORTED_Autoneg;
+                cmd->advertising |= ADVERTISED_Autoneg;
+                cmd->lp_advertising |= ADVERTISED_Autoneg;
+
+                if (adv.duplex) {
+                        cmd->supported |= (SUPPORTED_1000baseT_Full |
+                                           SUPPORTED_100baseT_Full |
+                                           SUPPORTED_10baseT_Full);
+                        cmd->advertising |= (ADVERTISED_1000baseT_Full |
+                                             ADVERTISED_100baseT_Full |
+                                             ADVERTISED_10baseT_Full);
+                } else {
+                        cmd->supported |= (SUPPORTED_1000baseT_Half |
+                                           SUPPORTED_100baseT_Half |
+                                           SUPPORTED_10baseT_Half);
+                        cmd->advertising |= (ADVERTISED_1000baseT_Half |
+                                             ADVERTISED_100baseT_Half |
+                                             ADVERTISED_10baseT_Half);
+                }
+                if (adv.lp_duplex)
+                        cmd->lp_advertising |= (ADVERTISED_1000baseT_Full |
+                                                ADVERTISED_100baseT_Full |
+                                                ADVERTISED_10baseT_Full);
+                else
+                        cmd->lp_advertising |= (ADVERTISED_1000baseT_Half |
+                                                ADVERTISED_100baseT_Half |
+                                                ADVERTISED_10baseT_Half);
+                cmd->port = PORT_OTHER;
+
+                return 0;
+        }
+
         if (phy == NULL) {
                 pr_err("%s: %s: PHY is not registered\n",
                        __func__, dev->name);
@@ -243,6 +335,30 @@ static int stmmac_ethtool_setsettings(struct net_device *dev,
         struct phy_device *phy = priv->phydev;
         int rc;
 
+        if ((priv->pcs & STMMAC_PCS_RGMII) || (priv->pcs & STMMAC_PCS_SGMII)) {
+                u32 mask = ADVERTISED_Autoneg | ADVERTISED_Pause;
+
+                /* Only support ANE */
+                if (cmd->autoneg != AUTONEG_ENABLE)
+                        return -EINVAL;
+
+                if (cmd->autoneg == AUTONEG_ENABLE) {
+                        mask &= (ADVERTISED_1000baseT_Half |
+                        ADVERTISED_1000baseT_Full |
+                        ADVERTISED_100baseT_Half |
+                        ADVERTISED_100baseT_Full |
+                        ADVERTISED_10baseT_Half |
+                        ADVERTISED_10baseT_Full);
+
+                        spin_lock(&priv->lock);
+                        if (priv->hw->mac->ctrl_ane)
+                                priv->hw->mac->ctrl_ane(priv->ioaddr, 1);
+                        spin_unlock(&priv->lock);
+                }
+
+                return 0;
+        }
+
         spin_lock(&priv->lock);
         rc = phy_ethtool_sset(phy, cmd);
         spin_unlock(&priv->lock);
@@ -312,6 +428,9 @@ stmmac_get_pauseparam(struct net_device *netdev,
 {
         struct stmmac_priv *priv = netdev_priv(netdev);
 
+        if (priv->pcs)  /* FIXME */
+                return;
+
         spin_lock(&priv->lock);
 
         pause->rx_pause = 0;
@@ -335,6 +454,9 @@ stmmac_set_pauseparam(struct net_device *netdev,
         int new_pause = FLOW_OFF;
         int ret = 0;
 
+        if (priv->pcs)  /* FIXME */
+                return -EOPNOTSUPP;
+
         spin_lock(&priv->lock);
 
         if (pause->rx_pause)
@@ -604,6 +726,38 @@ static int stmmac_set_coalesce(struct net_device *dev,
         return 0;
 }
 
+static int stmmac_get_ts_info(struct net_device *dev,
+                              struct ethtool_ts_info *info)
+{
+        struct stmmac_priv *priv = netdev_priv(dev);
+
+        if ((priv->hwts_tx_en) && (priv->hwts_rx_en)) {
+
+                info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+                                        SOF_TIMESTAMPING_RX_HARDWARE |
+                                        SOF_TIMESTAMPING_RAW_HARDWARE;
+
+                if (priv->ptp_clock)
+                        info->phc_index = ptp_clock_index(priv->ptp_clock);
+
+                info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
+
+                info->rx_filters = ((1 << HWTSTAMP_FILTER_NONE) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+                                    (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |
+                                    (1 << HWTSTAMP_FILTER_ALL));
+                return 0;
+        } else
+                return ethtool_op_get_ts_info(dev, info);
+}
+
 static const struct ethtool_ops stmmac_ethtool_ops = {
         .begin = stmmac_check_if_running,
         .get_drvinfo = stmmac_ethtool_getdrvinfo,
@@ -623,7 +777,7 @@ static const struct ethtool_ops stmmac_ethtool_ops = {
         .get_eee = stmmac_ethtool_op_get_eee,
         .set_eee = stmmac_ethtool_op_set_eee,
         .get_sset_count = stmmac_get_sset_count,
-        .get_ts_info = ethtool_op_get_ts_info,
+        .get_ts_info = stmmac_get_ts_info,
         .get_coalesce = stmmac_get_coalesce,
         .set_coalesce = stmmac_set_coalesce,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
new file mode 100644
index 000000000000..def7e75e1d57
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
@@ -0,0 +1,148 @@
+/*******************************************************************************
+  Copyright (C) 2013  Vayavya Labs Pvt Ltd
+
+  This implements all the API for managing HW timestamp & PTP.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Author: Rayagond Kokatanur <rayagond@vayavyalabs.com>
+  Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
+*******************************************************************************/
+
+#include <linux/io.h>
+#include <linux/delay.h>
+#include "common.h"
+#include "stmmac_ptp.h"
+
+static void stmmac_config_hw_tstamping(void __iomem *ioaddr, u32 data)
+{
+        writel(data, ioaddr + PTP_TCR);
+}
+
+static void stmmac_config_sub_second_increment(void __iomem *ioaddr)
+{
+        u32 value = readl(ioaddr + PTP_TCR);
+        unsigned long data;
+
+        /* Convert the ptp_clock to nano second
+         * formula = (1/ptp_clock) * 1000000000
+         * where, ptp_clock = 50MHz.
+         */
+        data = (1000000000ULL / 50000000);
+
+        /* 0.465ns accuracy */
+        if (value & PTP_TCR_TSCTRLSSR)
+                data = (data * 100) / 465;
+
+        writel(data, ioaddr + PTP_SSIR);
+}
+
+static int stmmac_init_systime(void __iomem *ioaddr, u32 sec, u32 nsec)
+{
+        int limit;
+        u32 value;
+
+        writel(sec, ioaddr + PTP_STSUR);
+        writel(nsec, ioaddr + PTP_STNSUR);
+        /* issue command to initialize the system time value */
+        value = readl(ioaddr + PTP_TCR);
+        value |= PTP_TCR_TSINIT;
+        writel(value, ioaddr + PTP_TCR);
+
+        /* wait for present system time initialize to complete */
+        limit = 10;
+        while (limit--) {
+                if (!(readl(ioaddr + PTP_TCR) & PTP_TCR_TSINIT))
+                        break;
+                mdelay(10);
+        }
+        if (limit < 0)
+                return -EBUSY;
+
+        return 0;
+}
+
+static int stmmac_config_addend(void __iomem *ioaddr, u32 addend)
+{
+        u32 value;
+        int limit;
+
+        writel(addend, ioaddr + PTP_TAR);
+        /* issue command to update the addend value */
+        value = readl(ioaddr + PTP_TCR);
+        value |= PTP_TCR_TSADDREG;
+        writel(value, ioaddr + PTP_TCR);
+
+        /* wait for present addend update to complete */
+        limit = 10;
+        while (limit--) {
+                if (!(readl(ioaddr + PTP_TCR) & PTP_TCR_TSADDREG))
+                        break;
+                mdelay(10);
+        }
+        if (limit < 0)
+                return -EBUSY;
+
+        return 0;
+}
+
+static int stmmac_adjust_systime(void __iomem *ioaddr, u32 sec, u32 nsec,
+                                 int add_sub)
+{
+        u32 value;
+        int limit;
+
+        writel(sec, ioaddr + PTP_STSUR);
+        writel(((add_sub << PTP_STNSUR_ADDSUB_SHIFT) | nsec),
+                ioaddr + PTP_STNSUR);
+        /* issue command to initialize the system time value */
+        value = readl(ioaddr + PTP_TCR);
+        value |= PTP_TCR_TSUPDT;
+        writel(value, ioaddr + PTP_TCR);
+
+        /* wait for present system time adjust/update to complete */
+        limit = 10;
+        while (limit--) {
+                if (!(readl(ioaddr + PTP_TCR) & PTP_TCR_TSUPDT))
+                        break;
+                mdelay(10);
+        }
+        if (limit < 0)
+                return -EBUSY;
+
+        return 0;
+}
+
+static u64 stmmac_get_systime(void __iomem *ioaddr)
+{
+        u64 ns;
+
+        ns = readl(ioaddr + PTP_STNSR);
+        /* convert sec time value to nanosecond */
+        ns += readl(ioaddr + PTP_STSR) * 1000000000ULL;
+
+        return ns;
+}
+
+const struct stmmac_hwtimestamp stmmac_ptp = {
+        .config_hw_tstamping = stmmac_config_hw_tstamping,
+        .init_systime = stmmac_init_systime,
+        .config_sub_second_increment = stmmac_config_sub_second_increment,
+        .config_addend = stmmac_config_addend,
+        .adjust_systime = stmmac_adjust_systime,
+        .get_systime = stmmac_get_systime,
+};
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 39c6c5524633..618446ae1ec1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -46,7 +46,9 @@
 #ifdef CONFIG_STMMAC_DEBUG_FS
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-#endif
+#endif /* CONFIG_STMMAC_DEBUG_FS */
+#include <linux/net_tstamp.h>
+#include "stmmac_ptp.h"
 #include "stmmac.h"
 
 #undef STMMAC_DEBUG
@@ -79,14 +81,14 @@
 #define JUMBO_LEN       9000
 
 /* Module parameters */
-#define TX_TIMEO 5000 /* default 5 seconds */
+#define TX_TIMEO        5000
 static int watchdog = TX_TIMEO;
 module_param(watchdog, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(watchdog, "Transmit timeout in milliseconds");
+MODULE_PARM_DESC(watchdog, "Transmit timeout in milliseconds (default 5s)");
 
-static int debug = -1;          /* -1: default, 0: no output, 16:  all */
+static int debug = -1;
 module_param(debug, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Message Level (0: no output, 16: all)");
+MODULE_PARM_DESC(debug, "Message Level (-1: default, 0: no output, 16: all)");
 
 int phyaddr = -1;
 module_param(phyaddr, int, S_IRUGO);
@@ -130,6 +132,13 @@ module_param(eee_timer, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(eee_timer, "LPI tx expiration time in msec");
 #define STMMAC_LPI_TIMER(x) (jiffies + msecs_to_jiffies(x))
 
+/* By default the driver will use the ring mode to manage tx and rx descriptors
+ * but passing this value so user can force to use the chain instead of the ring
+ */
+static unsigned int chain_mode;
+module_param(chain_mode, int, S_IRUGO);
+MODULE_PARM_DESC(chain_mode, "To use chain instead of ring mode");
+
 static irqreturn_t stmmac_interrupt(int irq, void *dev_id);
 
 #ifdef CONFIG_STMMAC_DEBUG_FS
@@ -164,6 +173,18 @@ static void stmmac_verify_args(void)
                 eee_timer = STMMAC_DEFAULT_LPI_TIMER;
 }
 
+/**
+ * stmmac_clk_csr_set - dynamically set the MDC clock
+ * @priv: driver private structure
+ * Description: this is to dynamically set the MDC clock according to the csr
+ * clock input.
+ * Note:
+ *      If a specific clk_csr value is passed from the platform
+ *      this means that the CSR Clock Range selection cannot be
+ *      changed at run-time and it is fixed (as reported in the driver
+ *      documentation). Viceversa the driver will try to set the MDC
+ *      clock dynamically according to the actual clock input.
+ */
 static void stmmac_clk_csr_set(struct stmmac_priv *priv)
 {
         u32 clk_rate;
@@ -171,7 +192,12 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv)
         clk_rate = clk_get_rate(priv->stmmac_clk);
 
         /* Platform provided default clk_csr would be assumed valid
-         * for all other cases except for the below mentioned ones. */
+         * for all other cases except for the below mentioned ones.
+         * For values higher than the IEEE 802.3 specified frequency
+         * we can not estimate the proper divider as it is not known
+         * the frequency of clk_csr_i. So we do not change the default
+         * divider.
+         */
         if (!(priv->clk_csr & MAC_CSR_H_FRQ_MASK)) {
                 if (clk_rate < CSR_F_35M)
                         priv->clk_csr = STMMAC_CSR_20_35M;
@@ -185,10 +211,7 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv)
                         priv->clk_csr = STMMAC_CSR_150_250M;
                 else if ((clk_rate >= CSR_F_250M) && (clk_rate < CSR_F_300M))
                         priv->clk_csr = STMMAC_CSR_250_300M;
-        } /* For values higher than the IEEE 802.3 specified frequency
-           * we can not estimate the proper divider as it is not known
-           * the frequency of clk_csr_i. So we do not change the default
-           * divider. */
+        }
 }
 
 #if defined(STMMAC_XMIT_DEBUG) || defined(STMMAC_RX_DEBUG)
@@ -213,18 +236,25 @@ static inline u32 stmmac_tx_avail(struct stmmac_priv *priv)
         return priv->dirty_tx + priv->dma_tx_size - priv->cur_tx - 1;
 }
 
-/* On some ST platforms, some HW system configuraton registers have to be
- * set according to the link speed negotiated.
+/**
+ * stmmac_hw_fix_mac_speed: callback for speed selection
+ * @priv: driver private structure
+ * Description: on some platforms (e.g. ST), some HW system configuraton
+ * registers have to be set according to the link speed negotiated.
  */
 static inline void stmmac_hw_fix_mac_speed(struct stmmac_priv *priv)
 {
         struct phy_device *phydev = priv->phydev;
 
         if (likely(priv->plat->fix_mac_speed))
-                priv->plat->fix_mac_speed(priv->plat->bsp_priv,
-                                          phydev->speed);
+                priv->plat->fix_mac_speed(priv->plat->bsp_priv, phydev->speed);
 }
 
+/**
+ * stmmac_enable_eee_mode: Check and enter in LPI mode
+ * @priv: driver private structure
+ * Description: this function is to verify and enter in LPI mode for EEE.
+ */
 static void stmmac_enable_eee_mode(struct stmmac_priv *priv)
 {
         /* Check and enter in LPI mode */
@@ -233,19 +263,24 @@ static void stmmac_enable_eee_mode(struct stmmac_priv *priv)
                 priv->hw->mac->set_eee_mode(priv->ioaddr);
 }
 
+/**
+ * stmmac_disable_eee_mode: disable/exit from EEE
+ * @priv: driver private structure
+ * Description: this function is to exit and disable EEE in case of
+ * LPI state is true. This is called by the xmit.
+ */
 void stmmac_disable_eee_mode(struct stmmac_priv *priv)
 {
-        /* Exit and disable EEE in case of we are are in LPI state. */
         priv->hw->mac->reset_eee_mode(priv->ioaddr);
         del_timer_sync(&priv->eee_ctrl_timer);
         priv->tx_path_in_lpi_mode = false;
 }
 
 /**
- * stmmac_eee_ctrl_timer
+ * stmmac_eee_ctrl_timer: EEE TX SW timer.
  * @arg : data hook
  * Description:
- *  If there is no data transfer and if we are not in LPI state,
+ *  if there is no data transfer and if we are not in LPI state,
  *  then MAC Transmitter can be moved to LPI state.
  */
 static void stmmac_eee_ctrl_timer(unsigned long arg)
@@ -257,8 +292,8 @@ static void stmmac_eee_ctrl_timer(unsigned long arg)
 }
 
 /**
- * stmmac_eee_init
- * @priv: private device pointer
+ * stmmac_eee_init: init EEE
+ * @priv: driver private structure
  * Description:
  *  If the EEE support has been enabled while configuring the driver,
  *  if the GMAC actually supports the EEE (from the HW cap reg) and the
@@ -294,16 +329,359 @@ out:
         return ret;
 }
 
+/**
+ * stmmac_eee_adjust: adjust HW EEE according to the speed
+ * @priv: driver private structure
+ * Description:
+ *      When the EEE has been already initialised we have to
+ *      modify the PLS bit in the LPI ctrl & status reg according
+ *      to the PHY link status. For this reason.
+ */
 static void stmmac_eee_adjust(struct stmmac_priv *priv)
 {
-        /* When the EEE has been already initialised we have to
-         * modify the PLS bit in the LPI ctrl & status reg according
-         * to the PHY link status. For this reason.
-         */
         if (priv->eee_enabled)
                 priv->hw->mac->set_eee_pls(priv->ioaddr, priv->phydev->link);
 }
 
+/* stmmac_get_tx_hwtstamp: get HW TX timestamps
+ * @priv: driver private structure
+ * @entry : descriptor index to be used.
+ * @skb : the socket buffer
+ * Description :
+ * This function will read timestamp from the descriptor & pass it to stack.
+ * and also perform some sanity checks.
+ */
+static void stmmac_get_tx_hwtstamp(struct stmmac_priv *priv,
+                                   unsigned int entry, struct sk_buff *skb)
+{
+        struct skb_shared_hwtstamps shhwtstamp;
+        u64 ns;
+        void *desc = NULL;
+
+        if (!priv->hwts_tx_en)
+                return;
+
+        /* exit if skb doesn't support hw tstamp */
+        if (likely(!(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)))
+                return;
+
+        if (priv->adv_ts)
+                desc = (priv->dma_etx + entry);
+        else
+                desc = (priv->dma_tx + entry);
+
+        /* check tx tstamp status */
+        if (!priv->hw->desc->get_tx_timestamp_status((struct dma_desc *)desc))
+                return;
+
+        /* get the valid tstamp */
+        ns = priv->hw->desc->get_timestamp(desc, priv->adv_ts);
+
+        memset(&shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
+        shhwtstamp.hwtstamp = ns_to_ktime(ns);
+        /* pass tstamp to stack */
+        skb_tstamp_tx(skb, &shhwtstamp);
+
+        return;
+}
+
+/* stmmac_get_rx_hwtstamp: get HW RX timestamps
+ * @priv: driver private structure
+ * @entry : descriptor index to be used.
+ * @skb : the socket buffer
+ * Description :
+ * This function will read received packet's timestamp from the descriptor
+ * and pass it to stack. It also perform some sanity checks.
+ */
+static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv,
+                                   unsigned int entry, struct sk_buff *skb)
+{
+        struct skb_shared_hwtstamps *shhwtstamp = NULL;
+        u64 ns;
+        void *desc = NULL;
+
+        if (!priv->hwts_rx_en)
+                return;
+
+        if (priv->adv_ts)
+                desc = (priv->dma_erx + entry);
+        else
+                desc = (priv->dma_rx + entry);
+
+        /* exit if rx tstamp is not valid */
+        if (!priv->hw->desc->get_rx_timestamp_status(desc, priv->adv_ts))
+                return;
+
+        /* get valid tstamp */
+        ns = priv->hw->desc->get_timestamp(desc, priv->adv_ts);
+        shhwtstamp = skb_hwtstamps(skb);
+        memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
+        shhwtstamp->hwtstamp = ns_to_ktime(ns);
+}
+
+/**
+ *  stmmac_hwtstamp_ioctl - control hardware timestamping.
+ *  @dev: device pointer.
+ *  @ifr: An IOCTL specefic structure, that can contain a pointer to
+ *  a proprietary structure used to pass information to the driver.
+ *  Description:
+ *  This function configures the MAC to enable/disable both outgoing(TX)
+ *  and incoming(RX) packets time stamping based on user input.
+ *  Return Value:
+ *  0 on success and an appropriate -ve integer on failure.
+ */
+static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
+{
+        struct stmmac_priv *priv = netdev_priv(dev);
+        struct hwtstamp_config config;
+        struct timespec now;
+        u64 temp = 0;
+        u32 ptp_v2 = 0;
+        u32 tstamp_all = 0;
+        u32 ptp_over_ipv4_udp = 0;
+        u32 ptp_over_ipv6_udp = 0;
+        u32 ptp_over_ethernet = 0;
+        u32 snap_type_sel = 0;
+        u32 ts_master_en = 0;
+        u32 ts_event_en = 0;
+        u32 value = 0;
+
+        if (!(priv->dma_cap.time_stamp || priv->adv_ts)) {
+                netdev_alert(priv->dev, "No support for HW time stamping\n");
+                priv->hwts_tx_en = 0;
+                priv->hwts_rx_en = 0;
+
+                return -EOPNOTSUPP;
+        }
+
+        if (copy_from_user(&config, ifr->ifr_data,
+                           sizeof(struct hwtstamp_config)))
+                return -EFAULT;
+
+        pr_debug("%s config flags:0x%x, tx_type:0x%x, rx_filter:0x%x\n",
+                 __func__, config.flags, config.tx_type, config.rx_filter);
+
+        /* reserved for future extensions */
+        if (config.flags)
+                return -EINVAL;
+
+        switch (config.tx_type) {
+        case HWTSTAMP_TX_OFF:
+                priv->hwts_tx_en = 0;
+                break;
+        case HWTSTAMP_TX_ON:
+                priv->hwts_tx_en = 1;
+                break;
+        default:
+                return -ERANGE;
+        }
+
+        if (priv->adv_ts) {
+                switch (config.rx_filter) {
+                case HWTSTAMP_FILTER_NONE:
+                        /* time stamp no incoming packet at all */
+                        config.rx_filter = HWTSTAMP_FILTER_NONE;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
+                        /* PTP v1, UDP, any kind of event packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
+                        /* take time stamp for all event messages */
+                        snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+                        /* PTP v1, UDP, Sync packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_SYNC;
+                        /* take time stamp for SYNC messages only */
+                        ts_event_en = PTP_TCR_TSEVNTENA;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+                        /* PTP v1, UDP, Delay_req packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ;
+                        /* take time stamp for Delay_Req messages only */
+                        ts_master_en = PTP_TCR_TSMSTRENA;
+                        ts_event_en = PTP_TCR_TSEVNTENA;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+                        /* PTP v2, UDP, any kind of event packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
+                        ptp_v2 = PTP_TCR_TSVER2ENA;
+                        /* take time stamp for all event messages */
+                        snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
+                        /* PTP v2, UDP, Sync packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_SYNC;
+                        ptp_v2 = PTP_TCR_TSVER2ENA;
+                        /* take time stamp for SYNC messages only */
+                        ts_event_en = PTP_TCR_TSEVNTENA;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
+                        /* PTP v2, UDP, Delay_req packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ;
+                        ptp_v2 = PTP_TCR_TSVER2ENA;
+                        /* take time stamp for Delay_Req messages only */
+                        ts_master_en = PTP_TCR_TSMSTRENA;
+                        ts_event_en = PTP_TCR_TSEVNTENA;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V2_EVENT:
+                        /* PTP v2/802.AS1 any layer, any kind of event packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
+                        ptp_v2 = PTP_TCR_TSVER2ENA;
+                        /* take time stamp for all event messages */
+                        snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        ptp_over_ethernet = PTP_TCR_TSIPENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V2_SYNC:
+                        /* PTP v2/802.AS1, any layer, Sync packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V2_SYNC;
+                        ptp_v2 = PTP_TCR_TSVER2ENA;
+                        /* take time stamp for SYNC messages only */
+                        ts_event_en = PTP_TCR_TSEVNTENA;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        ptp_over_ethernet = PTP_TCR_TSIPENA;
+                        break;
+
+                case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
+                        /* PTP v2/802.AS1, any layer, Delay_req packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V2_DELAY_REQ;
+                        ptp_v2 = PTP_TCR_TSVER2ENA;
+                        /* take time stamp for Delay_Req messages only */
+                        ts_master_en = PTP_TCR_TSMSTRENA;
+                        ts_event_en = PTP_TCR_TSEVNTENA;
+
+                        ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
+                        ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
+                        ptp_over_ethernet = PTP_TCR_TSIPENA;
+                        break;
+
+                case HWTSTAMP_FILTER_ALL:
+                        /* time stamp any incoming packet */
+                        config.rx_filter = HWTSTAMP_FILTER_ALL;
+                        tstamp_all = PTP_TCR_TSENALL;
+                        break;
+
+                default:
+                        return -ERANGE;
+                }
+        } else {
+                switch (config.rx_filter) {
+                case HWTSTAMP_FILTER_NONE:
+                        config.rx_filter = HWTSTAMP_FILTER_NONE;
+                        break;
+                default:
+                        /* PTP v1, UDP, any kind of event packet */
+                        config.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
+                        break;
+                }
+        }
+        priv->hwts_rx_en = ((config.rx_filter == HWTSTAMP_FILTER_NONE) ? 0 : 1);
+
+        if (!priv->hwts_tx_en && !priv->hwts_rx_en)
+                priv->hw->ptp->config_hw_tstamping(priv->ioaddr, 0);
+        else {
+                value = (PTP_TCR_TSENA | PTP_TCR_TSCFUPDT | PTP_TCR_TSCTRLSSR |
+                         tstamp_all | ptp_v2 | ptp_over_ethernet |
+                         ptp_over_ipv6_udp | ptp_over_ipv4_udp | ts_event_en |
+                         ts_master_en | snap_type_sel);
+
+                priv->hw->ptp->config_hw_tstamping(priv->ioaddr, value);
+
+                /* program Sub Second Increment reg */
+                priv->hw->ptp->config_sub_second_increment(priv->ioaddr);
+
+                /* calculate default added value:
+                 * formula is :
+                 * addend = (2^32)/freq_div_ratio;
+                 * where, freq_div_ratio = STMMAC_SYSCLOCK/50MHz
+                 * hence, addend = ((2^32) * 50MHz)/STMMAC_SYSCLOCK;
+                 * NOTE: STMMAC_SYSCLOCK should be >= 50MHz to
+                 *       achive 20ns accuracy.
+                 *
+                 * 2^x * y == (y << x), hence
+                 * 2^32 * 50000000 ==> (50000000 << 32)
+                 */
+                temp = (u64) (50000000ULL << 32);
+                priv->default_addend = div_u64(temp, STMMAC_SYSCLOCK);
+                priv->hw->ptp->config_addend(priv->ioaddr,
+                                             priv->default_addend);
+
+                /* initialize system time */
+                getnstimeofday(&now);
+                priv->hw->ptp->init_systime(priv->ioaddr, now.tv_sec,
+                                            now.tv_nsec);
+        }
+
+        return copy_to_user(ifr->ifr_data, &config,
+                            sizeof(struct hwtstamp_config)) ? -EFAULT : 0;
+}
+
+/**
+ * stmmac_init_ptp: init PTP
+ * @priv: driver private structure
+ * Description: this is to verify if the HW supports the PTPv1 or v2.
+ * This is done by looking at the HW cap. register.
+ * Also it registers the ptp driver.
+ */
+static int stmmac_init_ptp(struct stmmac_priv *priv)
+{
+        if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
+                return -EOPNOTSUPP;
+
+        if (netif_msg_hw(priv)) {
+                if (priv->dma_cap.time_stamp) {
+                        pr_debug("IEEE 1588-2002 Time Stamp supported\n");
+                        priv->adv_ts = 0;
+                }
+                if (priv->dma_cap.atime_stamp && priv->extend_desc) {
+                        pr_debug
+                            ("IEEE 1588-2008 Advanced Time Stamp supported\n");
+                        priv->adv_ts = 1;
+                }
+        }
+
+        priv->hw->ptp = &stmmac_ptp;
+        priv->hwts_tx_en = 0;
+        priv->hwts_rx_en = 0;
+
+        return stmmac_ptp_register(priv);
+}
+
+static void stmmac_release_ptp(struct stmmac_priv *priv)
+{
+        stmmac_ptp_unregister(priv);
+}
+
 /**
  * stmmac_adjust_link
  * @dev: net device structure
@@ -349,7 +727,7 @@ static void stmmac_adjust_link(struct net_device *dev)
                         case 1000:
                                 if (likely(priv->plat->has_gmac))
                                         ctrl &= ~priv->hw->link.port;
-                                        stmmac_hw_fix_mac_speed(priv);
+                                stmmac_hw_fix_mac_speed(priv);
                                 break;
                         case 100:
                         case 10:
@@ -367,8 +745,8 @@ static void stmmac_adjust_link(struct net_device *dev)
                                 break;
                         default:
                                 if (netif_msg_link(priv))
-                                        pr_warning("%s: Speed (%d) is not 10"
-                                       " or 100!\n", dev->name, phydev->speed);
+                                        pr_warn("%s: Speed (%d) not 10/100\n",
+                                                dev->name, phydev->speed);
                                 break;
                         }
 
@@ -399,6 +777,31 @@ static void stmmac_adjust_link(struct net_device *dev)
 }
 
 /**
+ * stmmac_check_pcs_mode: verify if RGMII/SGMII is supported
+ * @priv: driver private structure
+ * Description: this is to verify if the HW supports the PCS.
+ * Physical Coding Sublayer (PCS) interface that can be used when the MAC is
+ * configured for the TBI, RTBI, or SGMII PHY interface.
+ */
+static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
+{
+        int interface = priv->plat->interface;
+
+        if (priv->dma_cap.pcs) {
+                if ((interface & PHY_INTERFACE_MODE_RGMII) ||
+                    (interface & PHY_INTERFACE_MODE_RGMII_ID) ||
+                    (interface & PHY_INTERFACE_MODE_RGMII_RXID) ||
+                    (interface & PHY_INTERFACE_MODE_RGMII_TXID)) {
+                        pr_debug("STMMAC: PCS RGMII support enable\n");
+                        priv->pcs = STMMAC_PCS_RGMII;
+                } else if (interface & PHY_INTERFACE_MODE_SGMII) {
+                        pr_debug("STMMAC: PCS SGMII support enable\n");
+                        priv->pcs = STMMAC_PCS_SGMII;
+                }
+        }
+}
+
+/**
  * stmmac_init_phy - PHY initialization
  * @dev: net device structure
  * Description: it initializes the driver's PHY state, and attaches the PHY
@@ -419,10 +822,10 @@ static int stmmac_init_phy(struct net_device *dev)
 
         if (priv->plat->phy_bus_name)
                 snprintf(bus_id, MII_BUS_ID_SIZE, "%s-%x",
-                                priv->plat->phy_bus_name, priv->plat->bus_id);
+                         priv->plat->phy_bus_name, priv->plat->bus_id);
         else
                 snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
-                                priv->plat->bus_id);
+                         priv->plat->bus_id);
 
         snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
                  priv->plat->phy_addr);
@@ -461,29 +864,57 @@ static int stmmac_init_phy(struct net_device *dev)
 }
 
 /**
- * display_ring
- * @p: pointer to the ring.
+ * stmmac_display_ring: display ring
+ * @head: pointer to the head of the ring passed.
  * @size: size of the ring.
- * Description: display all the descriptors within the ring.
+ * @extend_desc: to verify if extended descriptors are used.
+ * Description: display the control/status and buffer descriptors.
  */
-static void display_ring(struct dma_desc *p, int size)
+static void stmmac_display_ring(void *head, int size, int extend_desc)
 {
-        struct tmp_s {
-                u64 a;
-                unsigned int b;
-                unsigned int c;
-        };
         int i;
+        struct dma_extended_desc *ep = (struct dma_extended_desc *)head;
+        struct dma_desc *p = (struct dma_desc *)head;
+
         for (i = 0; i < size; i++) {
-                struct tmp_s *x = (struct tmp_s *)(p + i);
-                pr_info("\t%d [0x%x]: DES0=0x%x DES1=0x%x BUF1=0x%x BUF2=0x%x",
-                       i, (unsigned int)virt_to_phys(&p[i]),
-                       (unsigned int)(x->a), (unsigned int)((x->a) >> 32),
-                       x->b, x->c);
+                u64 x;
+                if (extend_desc) {
+                        x = *(u64 *) ep;
+                        pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
+                                i, (unsigned int)virt_to_phys(ep),
+                                (unsigned int)x, (unsigned int)(x >> 32),
+                                ep->basic.des2, ep->basic.des3);
+                        ep++;
+                } else {
+                        x = *(u64 *) p;
+                        pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x",
+                                i, (unsigned int)virt_to_phys(p),
+                                (unsigned int)x, (unsigned int)(x >> 32),
+                                p->des2, p->des3);
+                        p++;
+                }
                 pr_info("\n");
         }
 }
 
+static void stmmac_display_rings(struct stmmac_priv *priv)
+{
+        unsigned int txsize = priv->dma_tx_size;
+        unsigned int rxsize = priv->dma_rx_size;
+
+        if (priv->extend_desc) {
+                pr_info("Extended RX descriptor ring:\n");
+                stmmac_display_ring((void *)priv->dma_erx, rxsize, 1);
+                pr_info("Extended TX descriptor ring:\n");
+                stmmac_display_ring((void *)priv->dma_etx, txsize, 1);
+        } else {
+                pr_info("RX descriptor ring:\n");
+                stmmac_display_ring((void *)priv->dma_rx, rxsize, 0);
+                pr_info("TX descriptor ring:\n");
+                stmmac_display_ring((void *)priv->dma_tx, txsize, 0);
+        }
+}
+
 static int stmmac_set_bfsize(int mtu, int bufsize)
 {
         int ret = bufsize;
@@ -501,6 +932,65 @@ static int stmmac_set_bfsize(int mtu, int bufsize)
 }
 
 /**
+ * stmmac_clear_descriptors: clear descriptors
+ * @priv: driver private structure
+ * Description: this function is called to clear the tx and rx descriptors
+ * in case of both basic and extended descriptors are used.
+ */
+static void stmmac_clear_descriptors(struct stmmac_priv *priv)
+{
+        int i;
+        unsigned int txsize = priv->dma_tx_size;
+        unsigned int rxsize = priv->dma_rx_size;
+
+        /* Clear the Rx/Tx descriptors */
+        for (i = 0; i < rxsize; i++)
+                if (priv->extend_desc)
+                        priv->hw->desc->init_rx_desc(&priv->dma_erx[i].basic,
+                                                     priv->use_riwt, priv->mode,
+                                                     (i == rxsize - 1));
+                else
+                        priv->hw->desc->init_rx_desc(&priv->dma_rx[i],
+                                                     priv->use_riwt, priv->mode,
+                                                     (i == rxsize - 1));
+        for (i = 0; i < txsize; i++)
+                if (priv->extend_desc)
+                        priv->hw->desc->init_tx_desc(&priv->dma_etx[i].basic,
+                                                     priv->mode,
+                                                     (i == txsize - 1));
+                else
+                        priv->hw->desc->init_tx_desc(&priv->dma_tx[i],
+                                                     priv->mode,
+                                                     (i == txsize - 1));
+}
+
+static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p,
+                                  int i)
+{
+        struct sk_buff *skb;
+
+        skb = __netdev_alloc_skb(priv->dev, priv->dma_buf_sz + NET_IP_ALIGN,
+                                 GFP_KERNEL);
+        if (unlikely(skb == NULL)) {
+                pr_err("%s: Rx init fails; skb is NULL\n", __func__);
+                return 1;
+        }
+        skb_reserve(skb, NET_IP_ALIGN);
+        priv->rx_skbuff[i] = skb;
+        priv->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data,
+                                                priv->dma_buf_sz,
+                                                DMA_FROM_DEVICE);
+
+        p->des2 = priv->rx_skbuff_dma[i];
+
+        if ((priv->mode == STMMAC_RING_MODE) &&
+            (priv->dma_buf_sz == BUF_SIZE_16KiB))
+                priv->hw->ring->init_desc3(p);
+
+        return 0;
+}
+
+/**
  * init_dma_desc_rings - init the RX/TX descriptor rings
  * @dev: net device structure
  * Description:  this function initializes the DMA RX/TX descriptors
@@ -511,110 +1001,114 @@ static void init_dma_desc_rings(struct net_device *dev)
 {
         int i;
         struct stmmac_priv *priv = netdev_priv(dev);
-        struct sk_buff *skb;
         unsigned int txsize = priv->dma_tx_size;
         unsigned int rxsize = priv->dma_rx_size;
-        unsigned int bfsize;
-        int dis_ic = 0;
-        int des3_as_data_buf = 0;
+        unsigned int bfsize = 0;
 
         /* Set the max buffer size according to the DESC mode
-         * and the MTU. Note that RING mode allows 16KiB bsize. */
-        bfsize = priv->hw->ring->set_16kib_bfsize(dev->mtu);
+         * and the MTU. Note that RING mode allows 16KiB bsize.
+         */
+        if (priv->mode == STMMAC_RING_MODE)
+                bfsize = priv->hw->ring->set_16kib_bfsize(dev->mtu);
 
-        if (bfsize == BUF_SIZE_16KiB)
-                des3_as_data_buf = 1;
-        else
+        if (bfsize < BUF_SIZE_16KiB)
                 bfsize = stmmac_set_bfsize(dev->mtu, priv->dma_buf_sz);
 
         DBG(probe, INFO, "stmmac: txsize %d, rxsize %d, bfsize %d\n",
             txsize, rxsize, bfsize);
 
-        priv->rx_skbuff_dma = kmalloc_array(rxsize, sizeof(dma_addr_t),
-                                            GFP_KERNEL);
-        priv->rx_skbuff = kmalloc_array(rxsize, sizeof(struct sk_buff *),
-                                        GFP_KERNEL);
-        priv->dma_rx =
-            (struct dma_desc *)dma_alloc_coherent(priv->device,
-                                                  rxsize *
+        if (priv->extend_desc) {
+                priv->dma_erx = dma_alloc_coherent(priv->device, rxsize *
+                                                   sizeof(struct
+                                                          dma_extended_desc),
+                                                   &priv->dma_rx_phy,
+                                                   GFP_KERNEL);
+                priv->dma_etx = dma_alloc_coherent(priv->device, txsize *
+                                                   sizeof(struct
+                                                          dma_extended_desc),
+                                                   &priv->dma_tx_phy,
+                                                   GFP_KERNEL);
+                if ((!priv->dma_erx) || (!priv->dma_etx))
+                        return;
+        } else {
+                priv->dma_rx = dma_alloc_coherent(priv->device, rxsize *
                                                   sizeof(struct dma_desc),
                                                   &priv->dma_rx_phy,
                                                   GFP_KERNEL);
-        priv->tx_skbuff = kmalloc_array(txsize, sizeof(struct sk_buff *),
-                                        GFP_KERNEL);
-        priv->dma_tx =
-            (struct dma_desc *)dma_alloc_coherent(priv->device,
-                                                  txsize *
+                priv->dma_tx = dma_alloc_coherent(priv->device, txsize *
                                                   sizeof(struct dma_desc),
                                                   &priv->dma_tx_phy,
                                                   GFP_KERNEL);
-
-        if ((priv->dma_rx == NULL) || (priv->dma_tx == NULL)) {
-                pr_err("%s:ERROR allocating the DMA Tx/Rx desc\n", __func__);
-                return;
+                if ((!priv->dma_rx) || (!priv->dma_tx))
+                        return;
         }
 
-        DBG(probe, INFO, "stmmac (%s) DMA desc: virt addr (Rx %p, "
-            "Tx %p)\n\tDMA phy addr (Rx 0x%08x, Tx 0x%08x)\n",
-            dev->name, priv->dma_rx, priv->dma_tx,
-            (unsigned int)priv->dma_rx_phy, (unsigned int)priv->dma_tx_phy);
+        priv->rx_skbuff_dma = kmalloc_array(rxsize, sizeof(dma_addr_t),
+                                            GFP_KERNEL);
+        priv->rx_skbuff = kmalloc_array(rxsize, sizeof(struct sk_buff *),
+                                        GFP_KERNEL);
+        priv->tx_skbuff_dma = kmalloc_array(txsize, sizeof(dma_addr_t),
+                                            GFP_KERNEL);
+        priv->tx_skbuff = kmalloc_array(txsize, sizeof(struct sk_buff *),
+                                        GFP_KERNEL);
+        if (netif_msg_drv(priv))
+                pr_debug("(%s) dma_rx_phy=0x%08x dma_tx_phy=0x%08x\n", __func__,
+                         (u32) priv->dma_rx_phy, (u32) priv->dma_tx_phy);
 
         /* RX INITIALIZATION */
-        DBG(probe, INFO, "stmmac: SKB addresses:\n"
-                         "skb\t\tskb data\tdma data\n");
-
+        DBG(probe, INFO, "stmmac: SKB addresses:\nskb\t\tskb data\tdma data\n");
         for (i = 0; i < rxsize; i++) {
-                struct dma_desc *p = priv->dma_rx + i;
+                struct dma_desc *p;
+                if (priv->extend_desc)
+                        p = &((priv->dma_erx + i)->basic);
+                else
+                        p = priv->dma_rx + i;
 
-                skb = __netdev_alloc_skb(dev, bfsize + NET_IP_ALIGN,
-                                         GFP_KERNEL);
-                if (unlikely(skb == NULL)) {
-                        pr_err("%s: Rx init fails; skb is NULL\n", __func__);
+                if (stmmac_init_rx_buffers(priv, p, i))
                         break;
-                }
-                skb_reserve(skb, NET_IP_ALIGN);
-                priv->rx_skbuff[i] = skb;
-                priv->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data,
-                                                bfsize, DMA_FROM_DEVICE);
-
-                p->des2 = priv->rx_skbuff_dma[i];
-
-                priv->hw->ring->init_desc3(des3_as_data_buf, p);
 
                 DBG(probe, INFO, "[%p]\t[%p]\t[%x]\n", priv->rx_skbuff[i],
-                        priv->rx_skbuff[i]->data, priv->rx_skbuff_dma[i]);
+                    priv->rx_skbuff[i]->data, priv->rx_skbuff_dma[i]);
         }
         priv->cur_rx = 0;
         priv->dirty_rx = (unsigned int)(i - rxsize);
         priv->dma_buf_sz = bfsize;
         buf_sz = bfsize;
 
+        /* Setup the chained descriptor addresses */
+        if (priv->mode == STMMAC_CHAIN_MODE) {
+                if (priv->extend_desc) {
+                        priv->hw->chain->init(priv->dma_erx, priv->dma_rx_phy,
+                                              rxsize, 1);
+                        priv->hw->chain->init(priv->dma_etx, priv->dma_tx_phy,
+                                              txsize, 1);
+                } else {
+                        priv->hw->chain->init(priv->dma_rx, priv->dma_rx_phy,
+                                              rxsize, 0);
+                        priv->hw->chain->init(priv->dma_tx, priv->dma_tx_phy,
+                                              txsize, 0);
+                }
+        }
+
         /* TX INITIALIZATION */
         for (i = 0; i < txsize; i++) {
+                struct dma_desc *p;
+                if (priv->extend_desc)
+                        p = &((priv->dma_etx + i)->basic);
+                else
+                        p = priv->dma_tx + i;
+                p->des2 = 0;
+                priv->tx_skbuff_dma[i] = 0;
                 priv->tx_skbuff[i] = NULL;
-                priv->dma_tx[i].des2 = 0;
         }
 
-        /* In case of Chained mode this sets the des3 to the next
-         * element in the chain */
-        priv->hw->ring->init_dma_chain(priv->dma_rx, priv->dma_rx_phy, rxsize);
-        priv->hw->ring->init_dma_chain(priv->dma_tx, priv->dma_tx_phy, txsize);
-
         priv->dirty_tx = 0;
         priv->cur_tx = 0;
 
-        if (priv->use_riwt)
-                dis_ic = 1;
-        /* Clear the Rx/Tx descriptors */
-        priv->hw->desc->init_rx_desc(priv->dma_rx, rxsize, dis_ic);
-        priv->hw->desc->init_tx_desc(priv->dma_tx, txsize);
+        stmmac_clear_descriptors(priv);
 
-        if (netif_msg_hw(priv)) {
-                pr_info("RX descriptor ring:\n");
-                display_ring(priv->dma_rx, rxsize);
-                pr_info("TX descriptor ring:\n");
-                display_ring(priv->dma_tx, txsize);
-        }
+        if (netif_msg_hw(priv))
+                stmmac_display_rings(priv);
 }
 
 static void dma_free_rx_skbufs(struct stmmac_priv *priv)
@@ -637,13 +1131,20 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv)
 
         for (i = 0; i < priv->dma_tx_size; i++) {
                 if (priv->tx_skbuff[i] != NULL) {
-                        struct dma_desc *p = priv->dma_tx + i;
-                        if (p->des2)
-                                dma_unmap_single(priv->device, p->des2,
+                        struct dma_desc *p;
+                        if (priv->extend_desc)
+                                p = &((priv->dma_etx + i)->basic);
+                        else
+                                p = priv->dma_tx + i;
+
+                        if (priv->tx_skbuff_dma[i])
+                                dma_unmap_single(priv->device,
+                                                 priv->tx_skbuff_dma[i],
                                                  priv->hw->desc->get_tx_len(p),
                                                  DMA_TO_DEVICE);
                         dev_kfree_skb_any(priv->tx_skbuff[i]);
                         priv->tx_skbuff[i] = NULL;
+                        priv->tx_skbuff_dma[i] = 0;
                 }
         }
 }
@@ -654,29 +1155,38 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
         dma_free_rx_skbufs(priv);
         dma_free_tx_skbufs(priv);
 
-        /* Free the region of consistent memory previously allocated for
-         * the DMA */
-        dma_free_coherent(priv->device,
-                          priv->dma_tx_size * sizeof(struct dma_desc),
-                          priv->dma_tx, priv->dma_tx_phy);
-        dma_free_coherent(priv->device,
-                          priv->dma_rx_size * sizeof(struct dma_desc),
-                          priv->dma_rx, priv->dma_rx_phy);
+        /* Free DMA regions of consistent memory previously allocated */
+        if (!priv->extend_desc) {
+                dma_free_coherent(priv->device,
+                                  priv->dma_tx_size * sizeof(struct dma_desc),
+                                  priv->dma_tx, priv->dma_tx_phy);
+                dma_free_coherent(priv->device,
+                                  priv->dma_rx_size * sizeof(struct dma_desc),
+                                  priv->dma_rx, priv->dma_rx_phy);
+        } else {
+                dma_free_coherent(priv->device, priv->dma_tx_size *
+                                  sizeof(struct dma_extended_desc),
+                                  priv->dma_etx, priv->dma_tx_phy);
+                dma_free_coherent(priv->device, priv->dma_rx_size *
+                                  sizeof(struct dma_extended_desc),
+                                  priv->dma_erx, priv->dma_rx_phy);
+        }
         kfree(priv->rx_skbuff_dma);
         kfree(priv->rx_skbuff);
+        kfree(priv->tx_skbuff_dma);
         kfree(priv->tx_skbuff);
 }
 
 /**
  *  stmmac_dma_operation_mode - HW DMA operation mode
- *  @priv : pointer to the private device structure.
+ *  @priv: driver private structure
  *  Description: it sets the DMA operation mode: tx/rx DMA thresholds
  *  or Store-And-Forward capability.
  */
 static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 {
         if (likely(priv->plat->force_sf_dma_mode ||
-                ((priv->plat->tx_coe) && (!priv->no_csum_insertion)))) {
+                   ((priv->plat->tx_coe) && (!priv->no_csum_insertion)))) {
                 /*
                  * In case of GMAC, SF mode can be enabled
                  * to perform the TX COE in HW. This depends on:
@@ -684,8 +1194,7 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
                  * 2) There is no bugged Jumbo frame support
                  *    that needs to not insert csum in the TDES.
                  */
-                priv->hw->dma->dma_mode(priv->ioaddr,
-                                        SF_DMA_MODE, SF_DMA_MODE);
+                priv->hw->dma->dma_mode(priv->ioaddr, SF_DMA_MODE, SF_DMA_MODE);
                 tc = SF_DMA_MODE;
         } else
                 priv->hw->dma->dma_mode(priv->ioaddr, tc, SF_DMA_MODE);
@@ -693,7 +1202,7 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 
 /**
  * stmmac_tx_clean:
- * @priv: private data pointer
+ * @priv: driver private structure
  * Description: it reclaims resources after transmission completes.
  */
 static void stmmac_tx_clean(struct stmmac_priv *priv)
@@ -708,40 +1217,50 @@ static void stmmac_tx_clean(struct stmmac_priv *priv)
                 int last;
                 unsigned int entry = priv->dirty_tx % txsize;
                 struct sk_buff *skb = priv->tx_skbuff[entry];
-                struct dma_desc *p = priv->dma_tx + entry;
+                struct dma_desc *p;
+
+                if (priv->extend_desc)
+                        p = (struct dma_desc *)(priv->dma_etx + entry);
+                else
+                        p = priv->dma_tx + entry;
 
                 /* Check if the descriptor is owned by the DMA. */
                 if (priv->hw->desc->get_tx_owner(p))
                         break;
 
-                /* Verify tx error by looking at the last segment */
+                /* Verify tx error by looking at the last segment. */
                 last = priv->hw->desc->get_tx_ls(p);
                 if (likely(last)) {
                         int tx_error =
-                                priv->hw->desc->tx_status(&priv->dev->stats,
-                                                          &priv->xstats, p,
-                                                          priv->ioaddr);
+                            priv->hw->desc->tx_status(&priv->dev->stats,
+                                                      &priv->xstats, p,
+                                                      priv->ioaddr);
                         if (likely(tx_error == 0)) {
                                 priv->dev->stats.tx_packets++;
                                 priv->xstats.tx_pkt_n++;
                         } else
                                 priv->dev->stats.tx_errors++;
+
+                        stmmac_get_tx_hwtstamp(priv, entry, skb);
                 }
                 TX_DBG("%s: curr %d, dirty %d\n", __func__,
-                        priv->cur_tx, priv->dirty_tx);
+                       priv->cur_tx, priv->dirty_tx);
 
-                if (likely(p->des2))
-                        dma_unmap_single(priv->device, p->des2,
+                if (likely(priv->tx_skbuff_dma[entry])) {
+                        dma_unmap_single(priv->device,
+                                         priv->tx_skbuff_dma[entry],
                                          priv->hw->desc->get_tx_len(p),
                                          DMA_TO_DEVICE);
-                priv->hw->ring->clean_desc3(p);
+                        priv->tx_skbuff_dma[entry] = 0;
+                }
+                priv->hw->ring->clean_desc3(priv, p);
 
                 if (likely(skb != NULL)) {
                         dev_kfree_skb(skb);
                         priv->tx_skbuff[entry] = NULL;
                 }
 
-                priv->hw->desc->release_tx_desc(p);
+                priv->hw->desc->release_tx_desc(p, priv->mode);
 
                 priv->dirty_tx++;
         }
@@ -749,7 +1268,7 @@ static void stmmac_tx_clean(struct stmmac_priv *priv)
                      stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv))) {
                 netif_tx_lock(priv->dev);
                 if (netif_queue_stopped(priv->dev) &&
-                     stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv)) {
+                    stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv)) {
                         TX_DBG("%s: restart transmit\n", __func__);
                         netif_wake_queue(priv->dev);
                 }
@@ -773,20 +1292,29 @@ static inline void stmmac_disable_dma_irq(struct stmmac_priv *priv)
         priv->hw->dma->disable_dma_irq(priv->ioaddr);
 }
 
-
 /**
- * stmmac_tx_err:
- * @priv: pointer to the private device structure
+ * stmmac_tx_err: irq tx error mng function
+ * @priv: driver private structure
  * Description: it cleans the descriptors and restarts the transmission
  * in case of errors.
  */
 static void stmmac_tx_err(struct stmmac_priv *priv)
 {
+        int i;
+        int txsize = priv->dma_tx_size;
         netif_stop_queue(priv->dev);
 
         priv->hw->dma->stop_tx(priv->ioaddr);
         dma_free_tx_skbufs(priv);
-        priv->hw->desc->init_tx_desc(priv->dma_tx, priv->dma_tx_size);
+        for (i = 0; i < txsize; i++)
+                if (priv->extend_desc)
+                        priv->hw->desc->init_tx_desc(&priv->dma_etx[i].basic,
+                                                     priv->mode,
+                                                     (i == txsize - 1));
+                else
+                        priv->hw->desc->init_tx_desc(&priv->dma_tx[i],
+                                                     priv->mode,
+                                                     (i == txsize - 1));
         priv->dirty_tx = 0;
         priv->cur_tx = 0;
         priv->hw->dma->start_tx(priv->ioaddr);
@@ -795,6 +1323,14 @@ static void stmmac_tx_err(struct stmmac_priv *priv)
         netif_wake_queue(priv->dev);
 }
 
+/**
+ * stmmac_dma_interrupt: DMA ISR
+ * @priv: driver private structure
+ * Description: this is the DMA ISR. It is called by the main ISR.
+ * It calls the dwmac dma routine to understand which type of interrupt
+ * happened. In case of there is a Normal interrupt and either TX or RX
+ * interrupt happened so the NAPI is scheduled.
+ */
 static void stmmac_dma_interrupt(struct stmmac_priv *priv)
 {
         int status;
@@ -817,13 +1353,16 @@ static void stmmac_dma_interrupt(struct stmmac_priv *priv)
                 stmmac_tx_err(priv);
 }
 
+/**
+ * stmmac_mmc_setup: setup the Mac Management Counters (MMC)
+ * @priv: driver private structure
+ * Description: this masks the MMC irq, in fact, the counters are managed in SW.
+ */
 static void stmmac_mmc_setup(struct stmmac_priv *priv)
 {
         unsigned int mode = MMC_CNTRL_RESET_ON_READ | MMC_CNTRL_COUNTER_RESET |
-                            MMC_CNTRL_PRESET | MMC_CNTRL_FULL_HALF_PRESET;
+            MMC_CNTRL_PRESET | MMC_CNTRL_FULL_HALF_PRESET;
 
-        /* Mask MMC irq, counters are managed in SW and registers
-         * are cleared on each READ eventually. */
         dwmac_mmc_intr_all_mask(priv->ioaddr);
 
         if (priv->dma_cap.rmon) {
@@ -837,8 +1376,7 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
 {
         u32 hwid = priv->hw->synopsys_uid;
 
-        /* Only check valid Synopsys Id because old MAC chips
-         * have no HW registers where get the ID */
+        /* Check Synopsys Id (not available on old chips) */
         if (likely(hwid)) {
                 u32 uid = ((hwid & 0x0000ff00) >> 8);
                 u32 synid = (hwid & 0x000000ff);
@@ -852,14 +1390,24 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
 }
 
 /**
- * stmmac_selec_desc_mode
- * @priv : private structure
- * Description: select the Enhanced/Alternate or Normal descriptors
+ * stmmac_selec_desc_mode: to select among: normal/alternate/extend descriptors
+ * @priv: driver private structure
+ * Description: select the Enhanced/Alternate or Normal descriptors.
+ * In case of Enhanced/Alternate, it looks at the extended descriptors are
+ * supported by the HW cap. register.
  */
 static void stmmac_selec_desc_mode(struct stmmac_priv *priv)
 {
         if (priv->plat->enh_desc) {
                 pr_info(" Enhanced/Alternate descriptors\n");
+
+                /* GMAC older than 3.50 has no extended descriptors */
+                if (priv->synopsys_id >= DWMAC_CORE_3_50) {
+                        pr_info("\tEnabled extended descriptors\n");
+                        priv->extend_desc = 1;
+                } else
+                        pr_warn("Extended descriptors not supported\n");
+
                 priv->hw->desc = &enh_desc_ops;
         } else {
                 pr_info(" Normal descriptors\n");
@@ -868,8 +1416,8 @@ static void stmmac_selec_desc_mode(struct stmmac_priv *priv)
 }
 
 /**
- * stmmac_get_hw_features
- * @priv : private device pointer
+ * stmmac_get_hw_features: get MAC capabilities from the HW cap. register.
+ * @priv: driver private structure
  * Description:
  *  new GMAC chip generations have a new register to indicate the
  *  presence of the optional feature/functions.
@@ -887,69 +1435,78 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv)
                 priv->dma_cap.mbps_1000 = (hw_cap & DMA_HW_FEAT_GMIISEL) >> 1;
                 priv->dma_cap.half_duplex = (hw_cap & DMA_HW_FEAT_HDSEL) >> 2;
                 priv->dma_cap.hash_filter = (hw_cap & DMA_HW_FEAT_HASHSEL) >> 4;
-                priv->dma_cap.multi_addr =
-                        (hw_cap & DMA_HW_FEAT_ADDMACADRSEL) >> 5;
+                priv->dma_cap.multi_addr = (hw_cap & DMA_HW_FEAT_ADDMAC) >> 5;
                 priv->dma_cap.pcs = (hw_cap & DMA_HW_FEAT_PCSSEL) >> 6;
                 priv->dma_cap.sma_mdio = (hw_cap & DMA_HW_FEAT_SMASEL) >> 8;
                 priv->dma_cap.pmt_remote_wake_up =
-                        (hw_cap & DMA_HW_FEAT_RWKSEL) >> 9;
+                    (hw_cap & DMA_HW_FEAT_RWKSEL) >> 9;
                 priv->dma_cap.pmt_magic_frame =
-                        (hw_cap & DMA_HW_FEAT_MGKSEL) >> 10;
+                    (hw_cap & DMA_HW_FEAT_MGKSEL) >> 10;
                 /* MMC */
                 priv->dma_cap.rmon = (hw_cap & DMA_HW_FEAT_MMCSEL) >> 11;
-                /* IEEE 1588-2002*/
+                /* IEEE 1588-2002 */
                 priv->dma_cap.time_stamp =
-                        (hw_cap & DMA_HW_FEAT_TSVER1SEL) >> 12;
-                /* IEEE 1588-2008*/
+                    (hw_cap & DMA_HW_FEAT_TSVER1SEL) >> 12;
+                /* IEEE 1588-2008 */
                 priv->dma_cap.atime_stamp =
-                        (hw_cap & DMA_HW_FEAT_TSVER2SEL) >> 13;
+                    (hw_cap & DMA_HW_FEAT_TSVER2SEL) >> 13;
                 /* 802.3az - Energy-Efficient Ethernet (EEE) */
                 priv->dma_cap.eee = (hw_cap & DMA_HW_FEAT_EEESEL) >> 14;
                 priv->dma_cap.av = (hw_cap & DMA_HW_FEAT_AVSEL) >> 15;
                 /* TX and RX csum */
                 priv->dma_cap.tx_coe = (hw_cap & DMA_HW_FEAT_TXCOESEL) >> 16;
                 priv->dma_cap.rx_coe_type1 =
-                        (hw_cap & DMA_HW_FEAT_RXTYP1COE) >> 17;
+                    (hw_cap & DMA_HW_FEAT_RXTYP1COE) >> 17;
                 priv->dma_cap.rx_coe_type2 =
-                        (hw_cap & DMA_HW_FEAT_RXTYP2COE) >> 18;
+                    (hw_cap & DMA_HW_FEAT_RXTYP2COE) >> 18;
                 priv->dma_cap.rxfifo_over_2048 =
-                        (hw_cap & DMA_HW_FEAT_RXFIFOSIZE) >> 19;
+                    (hw_cap & DMA_HW_FEAT_RXFIFOSIZE) >> 19;
                 /* TX and RX number of channels */
                 priv->dma_cap.number_rx_channel =
-                        (hw_cap & DMA_HW_FEAT_RXCHCNT) >> 20;
+                    (hw_cap & DMA_HW_FEAT_RXCHCNT) >> 20;
                 priv->dma_cap.number_tx_channel =
-                        (hw_cap & DMA_HW_FEAT_TXCHCNT) >> 22;
-                /* Alternate (enhanced) DESC mode*/
-                priv->dma_cap.enh_desc =
-                        (hw_cap & DMA_HW_FEAT_ENHDESSEL) >> 24;
+                    (hw_cap & DMA_HW_FEAT_TXCHCNT) >> 22;
+                /* Alternate (enhanced) DESC mode */
+                priv->dma_cap.enh_desc = (hw_cap & DMA_HW_FEAT_ENHDESSEL) >> 24;
         }
 
         return hw_cap;
 }
 
+/**
+ * stmmac_check_ether_addr: check if the MAC addr is valid
+ * @priv: driver private structure
+ * Description:
+ * it is to verify if the MAC address is valid, in case of failures it
+ * generates a random MAC address
+ */
 static void stmmac_check_ether_addr(struct stmmac_priv *priv)
 {
-        /* verify if the MAC address is valid, in case of failures it
-         * generates a random MAC address */
         if (!is_valid_ether_addr(priv->dev->dev_addr)) {
                 priv->hw->mac->get_umac_addr((void __iomem *)
                                              priv->dev->base_addr,
                                              priv->dev->dev_addr, 0);
-                if  (!is_valid_ether_addr(priv->dev->dev_addr))
+                if (!is_valid_ether_addr(priv->dev->dev_addr))
                         eth_hw_addr_random(priv->dev);
         }
-        pr_warning("%s: device MAC address %pM\n", priv->dev->name,
-                                                   priv->dev->dev_addr);
+        pr_warn("%s: device MAC address %pM\n", priv->dev->name,
+                priv->dev->dev_addr);
 }
 
+/**
+ * stmmac_init_dma_engine: DMA init.
+ * @priv: driver private structure
+ * Description:
+ * It inits the DMA invoking the specific MAC/GMAC callback.
+ * Some DMA parameters can be passed from the platform;
+ * in case of these are not passed a default is kept for the MAC or GMAC.
+ */
 static int stmmac_init_dma_engine(struct stmmac_priv *priv)
 {
         int pbl = DEFAULT_DMA_PBL, fixed_burst = 0, burst_len = 0;
         int mixed_burst = 0;
+        int atds = 0;
 
-        /* Some DMA parameters can be passed from the platform;
-         * in case of these are not passed we keep a default
-         * (good for all the chips) and init the DMA! */
         if (priv->plat->dma_cfg) {
                 pbl = priv->plat->dma_cfg->pbl;
                 fixed_burst = priv->plat->dma_cfg->fixed_burst;
@@ -957,13 +1514,16 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
                 burst_len = priv->plat->dma_cfg->burst_len;
         }
 
+        if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
+                atds = 1;
+
         return priv->hw->dma->init(priv->ioaddr, pbl, fixed_burst, mixed_burst,
                                    burst_len, priv->dma_tx_phy,
-                                   priv->dma_rx_phy);
+                                   priv->dma_rx_phy, atds);
 }
 
 /**
- * stmmac_tx_timer:
+ * stmmac_tx_timer: mitigation sw timer for tx.
  * @data: data pointer
  * Description:
  * This is the timer handler to directly invoke the stmmac_tx_clean.
@@ -976,8 +1536,8 @@ static void stmmac_tx_timer(unsigned long data)
 }
 
 /**
- * stmmac_tx_timer:
- * @priv: private data structure
+ * stmmac_init_tx_coalesce: init tx mitigation options.
+ * @priv: driver private structure
  * Description:
  * This inits the transmit coalesce parameters: i.e. timer rate,
  * timer handler and default threshold used for enabling the
@@ -1012,10 +1572,14 @@ static int stmmac_open(struct net_device *dev)
 
         stmmac_check_ether_addr(priv);
 
-        ret = stmmac_init_phy(dev);
-        if (unlikely(ret)) {
-                pr_err("%s: Cannot attach to PHY (error: %d)\n", __func__, ret);
-                goto open_error;
+        if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&
+            priv->pcs != STMMAC_PCS_RTBI) {
+                ret = stmmac_init_phy(dev);
+                if (ret) {
+                        pr_err("%s: Cannot attach to PHY (error: %d)\n",
+                               __func__, ret);
+                        goto open_error;
+                }
         }
 
         /* Create and initialize the TX/RX descriptors chains. */
@@ -1043,7 +1607,7 @@ static int stmmac_open(struct net_device *dev)
 
         /* Request the IRQ lines */
         ret = request_irq(dev->irq, stmmac_interrupt,
-                         IRQF_SHARED, dev->name, dev);
+                          IRQF_SHARED, dev->name, dev);
         if (unlikely(ret < 0)) {
                 pr_err("%s: ERROR: allocating the IRQ %d (error: %d)\n",
                        __func__, dev->irq, ret);
@@ -1055,8 +1619,8 @@ static int stmmac_open(struct net_device *dev)
                 ret = request_irq(priv->wol_irq, stmmac_interrupt,
                                   IRQF_SHARED, dev->name, dev);
                 if (unlikely(ret < 0)) {
-                        pr_err("%s: ERROR: allocating the ext WoL IRQ %d "
-                               "(error: %d)\n", __func__, priv->wol_irq, ret);
+                        pr_err("%s: ERROR: allocating the WoL IRQ %d (%d)\n",
+                               __func__, priv->wol_irq, ret);
                         goto open_error_wolirq;
                 }
         }
@@ -1084,10 +1648,14 @@ static int stmmac_open(struct net_device *dev)
 
         stmmac_mmc_setup(priv);
 
+        ret = stmmac_init_ptp(priv);
+        if (ret)
+                pr_warn("%s: failed PTP initialisation\n", __func__);
+
 #ifdef CONFIG_STMMAC_DEBUG_FS
         ret = stmmac_init_fs(dev);
         if (ret < 0)
-                pr_warning("%s: failed debugFS registration\n", __func__);
+                pr_warn("%s: failed debugFS registration\n", __func__);
 #endif
         /* Start the ball rolling... */
         DBG(probe, DEBUG, "%s: DMA RX/TX processes started...\n", dev->name);
@@ -1104,7 +1672,13 @@ static int stmmac_open(struct net_device *dev)
                 phy_start(priv->phydev);
 
         priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS_TIMER;
-        priv->eee_enabled = stmmac_eee_init(priv);
+
+        /* Using PCS we cannot dial with the phy registers at this stage
+         * so we do not support extra feature like EEE.
+         */
+        if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&
+            priv->pcs != STMMAC_PCS_RTBI)
+                priv->eee_enabled = stmmac_eee_init(priv);
 
         stmmac_init_tx_coalesce(priv);
 
@@ -1113,6 +1687,9 @@ static int stmmac_open(struct net_device *dev)
                 priv->hw->dma->rx_watchdog(priv->ioaddr, MAX_DMA_RIWT);
         }
 
+        if (priv->pcs && priv->hw->mac->ctrl_ane)
+                priv->hw->mac->ctrl_ane(priv->ioaddr, 0);
+
         napi_enable(&priv->napi);
         netif_start_queue(dev);
 
@@ -1184,21 +1761,25 @@ static int stmmac_release(struct net_device *dev)
 #endif
         clk_disable_unprepare(priv->stmmac_clk);
 
+        stmmac_release_ptp(priv);
+
         return 0;
 }
 
 /**
- *  stmmac_xmit:
+ *  stmmac_xmit: Tx entry point of the driver
  *  @skb : the socket buffer
  *  @dev : device pointer
- *  Description : Tx entry point of the driver.
+ *  Description : this is the tx entry point of the driver.
+ *  It programs the chain or the ring and supports oversized frames
+ *  and SG feature.
  */
 static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
         unsigned int txsize = priv->dma_tx_size;
         unsigned int entry;
-        int i, csum_insertion = 0;
+        int i, csum_insertion = 0, is_jumbo = 0;
         int nfrags = skb_shinfo(skb)->nr_frags;
         struct dma_desc *desc, *first;
         unsigned int nopaged_len = skb_headlen(skb);
@@ -1207,8 +1788,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (!netif_queue_stopped(dev)) {
                         netif_stop_queue(dev);
                         /* This is a hard error, log it. */
-                        pr_err("%s: BUG! Tx Ring full when queue awake\n",
-                                __func__);
+                        pr_err("%s: Tx Ring full when queue awake\n", __func__);
                 }
                 return NETDEV_TX_BUSY;
         }
@@ -1222,10 +1802,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
 #ifdef STMMAC_XMIT_DEBUG
         if ((skb->len > ETH_FRAME_LEN) || nfrags)
-                pr_debug("stmmac xmit: [entry %d]\n"
-                         "\tskb addr %p - len: %d - nopaged_len: %d\n"
+                pr_debug("%s: [entry %d]: skb addr %p len: %d nopagedlen: %d\n"
                          "\tn_frags: %d - ip_summed: %d - %s gso\n"
-                         "\ttx_count_frames %d\n", entry,
+                         "\ttx_count_frames %d\n", __func__, entry,
                          skb, skb->len, nopaged_len, nfrags, skb->ip_summed,
                          !skb_is_gso(skb) ? "isn't" : "is",
                          priv->tx_count_frames);
@@ -1233,7 +1812,11 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
         csum_insertion = (skb->ip_summed == CHECKSUM_PARTIAL);
 
-        desc = priv->dma_tx + entry;
+        if (priv->extend_desc)
+                desc = (struct dma_desc *)(priv->dma_etx + entry);
+        else
+                desc = priv->dma_tx + entry;
+
         first = desc;
 
 #ifdef STMMAC_XMIT_DEBUG
@@ -1244,28 +1827,46 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
         priv->tx_skbuff[entry] = skb;
 
-        if (priv->hw->ring->is_jumbo_frm(skb->len, priv->plat->enh_desc)) {
-                entry = priv->hw->ring->jumbo_frm(priv, skb, csum_insertion);
-                desc = priv->dma_tx + entry;
+        /* To program the descriptors according to the size of the frame */
+        if (priv->mode == STMMAC_RING_MODE) {
+                is_jumbo = priv->hw->ring->is_jumbo_frm(skb->len,
+                                                        priv->plat->enh_desc);
+                if (unlikely(is_jumbo))
+                        entry = priv->hw->ring->jumbo_frm(priv, skb,
+                                                          csum_insertion);
         } else {
+                is_jumbo = priv->hw->chain->is_jumbo_frm(skb->len,
+                                                         priv->plat->enh_desc);
+                if (unlikely(is_jumbo))
+                        entry = priv->hw->chain->jumbo_frm(priv, skb,
+                                                           csum_insertion);
+        }
+        if (likely(!is_jumbo)) {
                 desc->des2 = dma_map_single(priv->device, skb->data,
-                                        nopaged_len, DMA_TO_DEVICE);
+                                            nopaged_len, DMA_TO_DEVICE);
+                priv->tx_skbuff_dma[entry] = desc->des2;
                 priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len,
-                                                csum_insertion);
-        }
+                                                csum_insertion, priv->mode);
+        } else
+                desc = first;
 
         for (i = 0; i < nfrags; i++) {
                 const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
                 int len = skb_frag_size(frag);
 
                 entry = (++priv->cur_tx) % txsize;
-                desc = priv->dma_tx + entry;
+                if (priv->extend_desc)
+                        desc = (struct dma_desc *)(priv->dma_etx + entry);
+                else
+                        desc = priv->dma_tx + entry;
 
                 TX_DBG("\t[entry %d] segment len: %d\n", entry, len);
                 desc->des2 = skb_frag_dma_map(priv->device, frag, 0, len,
                                               DMA_TO_DEVICE);
+                priv->tx_skbuff_dma[entry] = desc->des2;
                 priv->tx_skbuff[entry] = NULL;
-                priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion);
+                priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion,
+                                                priv->mode);
                 wmb();
                 priv->hw->desc->set_tx_owner(desc);
                 wmb();
@@ -1298,11 +1899,14 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
 #ifdef STMMAC_XMIT_DEBUG
         if (netif_msg_pktdata(priv)) {
-                pr_info("stmmac xmit: current=%d, dirty=%d, entry=%d, "
-                       "first=%p, nfrags=%d\n",
-                       (priv->cur_tx % txsize), (priv->dirty_tx % txsize),
-                       entry, first, nfrags);
-                display_ring(priv->dma_tx, txsize);
+                pr_info("%s: curr %d dirty=%d entry=%d, first=%p, nfrags=%d"
+                        __func__, (priv->cur_tx % txsize),
+                        (priv->dirty_tx % txsize), entry, first, nfrags);
+                if (priv->extend_desc)
+                        stmmac_display_ring((void *)priv->dma_etx, txsize, 1);
+                else
+                        stmmac_display_ring((void *)priv->dma_tx, txsize, 0);
+
                 pr_info(">>> frame to be transmitted: ");
                 print_pkt(skb->data, skb->len);
         }
@@ -1314,7 +1918,15 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
         dev->stats.tx_bytes += skb->len;
 
-        skb_tx_timestamp(skb);
+        if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
+                     priv->hwts_tx_en)) {
+                /* declare that device is doing timestamping */
+                skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
+                priv->hw->desc->enable_tx_timestamp(first);
+        }
+
+        if (!priv->hwts_tx_en)
+                skb_tx_timestamp(skb);
 
         priv->hw->dma->enable_dma_transmission(priv->ioaddr);
 
@@ -1323,14 +1935,26 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
+/**
+ * stmmac_rx_refill: refill used skb preallocated buffers
+ * @priv: driver private structure
+ * Description : this is to reallocate the skb for the reception process
+ * that is based on zero-copy.
+ */
 static inline void stmmac_rx_refill(struct stmmac_priv *priv)
 {
         unsigned int rxsize = priv->dma_rx_size;
         int bfsize = priv->dma_buf_sz;
-        struct dma_desc *p = priv->dma_rx;
 
         for (; priv->cur_rx - priv->dirty_rx > 0; priv->dirty_rx++) {
                 unsigned int entry = priv->dirty_rx % rxsize;
+                struct dma_desc *p;
+
+                if (priv->extend_desc)
+                        p = (struct dma_desc *)(priv->dma_erx + entry);
+                else
+                        p = priv->dma_rx + entry;
+
                 if (likely(priv->rx_skbuff[entry] == NULL)) {
                         struct sk_buff *skb;
 
@@ -1344,80 +1968,116 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)
                             dma_map_single(priv->device, skb->data, bfsize,
                                            DMA_FROM_DEVICE);
 
-                        (p + entry)->des2 = priv->rx_skbuff_dma[entry];
+                        p->des2 = priv->rx_skbuff_dma[entry];
 
-                        if (unlikely(priv->plat->has_gmac))
-                                priv->hw->ring->refill_desc3(bfsize, p + entry);
+                        priv->hw->ring->refill_desc3(priv, p);
 
                         RX_DBG(KERN_INFO "\trefill entry #%d\n", entry);
                 }
                 wmb();
-                priv->hw->desc->set_rx_owner(p + entry);
+                priv->hw->desc->set_rx_owner(p);
                 wmb();
         }
 }
 
+/**
+ * stmmac_rx_refill: refill used skb preallocated buffers
+ * @priv: driver private structure
+ * @limit: napi bugget.
+ * Description :  this the function called by the napi poll method.
+ * It gets all the frames inside the ring.
+ */
 static int stmmac_rx(struct stmmac_priv *priv, int limit)
 {
         unsigned int rxsize = priv->dma_rx_size;
         unsigned int entry = priv->cur_rx % rxsize;
         unsigned int next_entry;
         unsigned int count = 0;
-        struct dma_desc *p = priv->dma_rx + entry;
-        struct dma_desc *p_next;
+        int coe = priv->plat->rx_coe;
 
 #ifdef STMMAC_RX_DEBUG
         if (netif_msg_hw(priv)) {
                 pr_debug(">>> stmmac_rx: descriptor ring:\n");
-                display_ring(priv->dma_rx, rxsize);
+                if (priv->extend_desc)
+                        stmmac_display_ring((void *)priv->dma_erx, rxsize, 1);
+                else
+                        stmmac_display_ring((void *)priv->dma_rx, rxsize, 0);
         }
 #endif
-        while (!priv->hw->desc->get_rx_owner(p)) {
+        while (count < limit) {
                 int status;
+                struct dma_desc *p;
 
-                if (count >= limit)
+                if (priv->extend_desc)
+                        p = (struct dma_desc *)(priv->dma_erx + entry);
+                else
+                        p = priv->dma_rx + entry;
+
+                if (priv->hw->desc->get_rx_owner(p))
                         break;
 
                 count++;
 
                 next_entry = (++priv->cur_rx) % rxsize;
-                p_next = priv->dma_rx + next_entry;
-                prefetch(p_next);
+                if (priv->extend_desc)
+                        prefetch(priv->dma_erx + next_entry);
+                else
+                        prefetch(priv->dma_rx + next_entry);
 
                 /* read the status of the incoming frame */
-                status = (priv->hw->desc->rx_status(&priv->dev->stats,
-                                                    &priv->xstats, p));
-                if (unlikely(status == discard_frame))
+                status = priv->hw->desc->rx_status(&priv->dev->stats,
+                                                   &priv->xstats, p);
+                if ((priv->extend_desc) && (priv->hw->desc->rx_extended_status))
+                        priv->hw->desc->rx_extended_status(&priv->dev->stats,
+                                                           &priv->xstats,
+                                                           priv->dma_erx +
+                                                           entry);
+                if (unlikely(status == discard_frame)) {
                         priv->dev->stats.rx_errors++;
-                else {
+                        if (priv->hwts_rx_en && !priv->extend_desc) {
+                                /* DESC2 & DESC3 will be overwitten by device
+                                 * with timestamp value, hence reinitialize
+                                 * them in stmmac_rx_refill() function so that
+                                 * device can reuse it.
+                                 */
+                                priv->rx_skbuff[entry] = NULL;
+                                dma_unmap_single(priv->device,
+                                                 priv->rx_skbuff_dma[entry],
+                                                 priv->dma_buf_sz,
+                                                 DMA_FROM_DEVICE);
+                        }
+                } else {
                         struct sk_buff *skb;
                         int frame_len;
 
-                        frame_len = priv->hw->desc->get_rx_frame_len(p,
-                                        priv->plat->rx_coe);
+                        frame_len = priv->hw->desc->get_rx_frame_len(p, coe);
+
                         /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
-                         * Type frames (LLC/LLC-SNAP) */
+                         * Type frames (LLC/LLC-SNAP)
+                         */
                         if (unlikely(status != llc_snap))
                                 frame_len -= ETH_FCS_LEN;
 #ifdef STMMAC_RX_DEBUG
                         if (frame_len > ETH_FRAME_LEN)
                                 pr_debug("\tRX frame size %d, COE status: %d\n",
-                                        frame_len, status);
+                                         frame_len, status);
 
                         if (netif_msg_hw(priv))
                                 pr_debug("\tdesc: %p [entry %d] buff=0x%x\n",
-                                        p, entry, p->des2);
+                                         p, entry, p->des2);
 #endif
                         skb = priv->rx_skbuff[entry];
                         if (unlikely(!skb)) {
                                 pr_err("%s: Inconsistent Rx descriptor chain\n",
-                                        priv->dev->name);
+                                       priv->dev->name);
                                 priv->dev->stats.rx_dropped++;
                                 break;
                         }
                         prefetch(skb->data - NET_IP_ALIGN);
                         priv->rx_skbuff[entry] = NULL;
 
+                        stmmac_get_rx_hwtstamp(priv, entry, skb);
+
                         skb_put(skb, frame_len);
                         dma_unmap_single(priv->device,
                                          priv->rx_skbuff_dma[entry],
@@ -1430,7 +2090,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
 #endif
                         skb->protocol = eth_type_trans(skb, priv->dev);
 
-                        if (unlikely(!priv->plat->rx_coe))
+                        if (unlikely(!coe))
                                 skb_checksum_none_assert(skb);
                         else
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -1441,7 +2101,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                         priv->dev->stats.rx_bytes += frame_len;
                 }
                 entry = next_entry;
-                p = p_next;     /* use prefetched values */
         }
 
         stmmac_rx_refill(priv);
@@ -1499,18 +2158,16 @@ static int stmmac_config(struct net_device *dev, struct ifmap *map)
 
         /* Don't allow changing the I/O address */
         if (map->base_addr != dev->base_addr) {
-                pr_warning("%s: can't change I/O address\n", dev->name);
+                pr_warn("%s: can't change I/O address\n", dev->name);
                 return -EOPNOTSUPP;
         }
 
         /* Don't allow changing the IRQ */
         if (map->irq != dev->irq) {
-                pr_warning("%s: can't change IRQ number %d\n",
-                       dev->name, dev->irq);
+                pr_warn("%s: not change IRQ number %d\n", dev->name, dev->irq);
                 return -EOPNOTSUPP;
         }
 
-        /* ignore other fields */
         return 0;
 }
 
@@ -1570,7 +2227,7 @@ static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
 }
 
 static netdev_features_t stmmac_fix_features(struct net_device *dev,
-        netdev_features_t features)
+                                             netdev_features_t features)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
 
@@ -1584,13 +2241,22 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev,
         /* Some GMAC devices have a bugged Jumbo frame support that
          * needs to have the Tx COE disabled for oversized frames
          * (due to limited buffer sizes). In this case we disable
-         * the TX csum insertionin the TDES and not use SF. */
+         * the TX csum insertionin the TDES and not use SF.
+         */
         if (priv->plat->bugged_jumbo && (dev->mtu > ETH_DATA_LEN))
                 features &= ~NETIF_F_ALL_CSUM;
 
         return features;
 }
 
+/**
+ *  stmmac_interrupt - main ISR
+ *  @irq: interrupt number.
+ *  @dev_id: to pass the net device pointer.
+ *  Description: this is the main driver interrupt service routine.
+ *  It calls the DMA ISR and also the core ISR to manage PMT, MMC, LPI
+ *  interrupts.
+ */
 static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
@@ -1604,30 +2270,14 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
         /* To handle GMAC own interrupts */
         if (priv->plat->has_gmac) {
                 int status = priv->hw->mac->host_irq_status((void __iomem *)
-                                                            dev->base_addr);
+                                                            dev->base_addr,
+                                                            &priv->xstats);
                 if (unlikely(status)) {
-                        if (status & core_mmc_tx_irq)
-                                priv->xstats.mmc_tx_irq_n++;
-                        if (status & core_mmc_rx_irq)
-                                priv->xstats.mmc_rx_irq_n++;
-                        if (status & core_mmc_rx_csum_offload_irq)
-                                priv->xstats.mmc_rx_csum_offload_irq_n++;
-                        if (status & core_irq_receive_pmt_irq)
-                                priv->xstats.irq_receive_pmt_irq_n++;
-
                         /* For LPI we need to save the tx status */
-                        if (status & core_irq_tx_path_in_lpi_mode) {
-                                priv->xstats.irq_tx_path_in_lpi_mode_n++;
+                        if (status & CORE_IRQ_TX_PATH_IN_LPI_MODE)
                                 priv->tx_path_in_lpi_mode = true;
-                        }
-                        if (status & core_irq_tx_path_exit_lpi_mode) {
-                                priv->xstats.irq_tx_path_exit_lpi_mode_n++;
+                        if (status & CORE_IRQ_TX_PATH_EXIT_LPI_MODE)
                                 priv->tx_path_in_lpi_mode = false;
-                        }
-                        if (status & core_irq_rx_path_in_lpi_mode)
-                                priv->xstats.irq_rx_path_in_lpi_mode_n++;
-                        if (status & core_irq_rx_path_exit_lpi_mode)
-                                priv->xstats.irq_rx_path_exit_lpi_mode_n++;
                 }
         }
 
@@ -1639,7 +2289,8 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /* Polling receive - used by NETCONSOLE and other diagnostic tools
- * to allow network I/O with interrupts disabled. */
+ * to allow network I/O with interrupts disabled.
+ */
 static void stmmac_poll_controller(struct net_device *dev)
 {
         disable_irq(dev->irq);
@@ -1655,21 +2306,30 @@ static void stmmac_poll_controller(struct net_device *dev)
  *  a proprietary structure used to pass information to the driver.
  *  @cmd: IOCTL command
  *  Description:
- *  Currently there are no special functionality supported in IOCTL, just the
- *  phy_mii_ioctl(...) can be invoked.
+ *  Currently it supports the phy_mii_ioctl(...) and HW time stamping.
  */
 static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
-        int ret;
+        int ret = -EOPNOTSUPP;
 
         if (!netif_running(dev))
                 return -EINVAL;
 
-        if (!priv->phydev)
-                return -EINVAL;
-
-        ret = phy_mii_ioctl(priv->phydev, rq, cmd);
+        switch (cmd) {
+        case SIOCGMIIPHY:
+        case SIOCGMIIREG:
+        case SIOCSMIIREG:
+                if (!priv->phydev)
+                        return -EINVAL;
+                ret = phy_mii_ioctl(priv->phydev, rq, cmd);
+                break;
+        case SIOCSHWTSTAMP:
+                ret = stmmac_hwtstamp_ioctl(dev, rq);
+                break;
+        default:
+                break;
+        }
 
         return ret;
 }
@@ -1679,40 +2339,51 @@ static struct dentry *stmmac_fs_dir;
 static struct dentry *stmmac_rings_status;
 static struct dentry *stmmac_dma_cap;
 
-static int stmmac_sysfs_ring_read(struct seq_file *seq, void *v)
+static void sysfs_display_ring(void *head, int size, int extend_desc,
+                               struct seq_file *seq)
 {
-        struct tmp_s {
-                u64 a;
-                unsigned int b;
-                unsigned int c;
-        };
         int i;
-        struct net_device *dev = seq->private;
-        struct stmmac_priv *priv = netdev_priv(dev);
+        struct dma_extended_desc *ep = (struct dma_extended_desc *)head;
+        struct dma_desc *p = (struct dma_desc *)head;
 
-        seq_printf(seq, "=======================\n");
-        seq_printf(seq, " RX descriptor ring\n");
-        seq_printf(seq, "=======================\n");
-
-        for (i = 0; i < priv->dma_rx_size; i++) {
-                struct tmp_s *x = (struct tmp_s *)(priv->dma_rx + i);
-                seq_printf(seq, "[%d] DES0=0x%x DES1=0x%x BUF1=0x%x BUF2=0x%x",
-                           i, (unsigned int)(x->a),
-                           (unsigned int)((x->a) >> 32), x->b, x->c);
+        for (i = 0; i < size; i++) {
+                u64 x;
+                if (extend_desc) {
+                        x = *(u64 *) ep;
+                        seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
+                                   i, (unsigned int)virt_to_phys(ep),
+                                   (unsigned int)x, (unsigned int)(x >> 32),
+                                   ep->basic.des2, ep->basic.des3);
+                        ep++;
+                } else {
+                        x = *(u64 *) p;
+                        seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
+                                   i, (unsigned int)virt_to_phys(ep),
+                                   (unsigned int)x, (unsigned int)(x >> 32),
+                                   p->des2, p->des3);
+                        p++;
+                }
                 seq_printf(seq, "\n");
         }
+}
 
-        seq_printf(seq, "\n");
-        seq_printf(seq, "=======================\n");
-        seq_printf(seq, "  TX descriptor ring\n");
-        seq_printf(seq, "=======================\n");
+static int stmmac_sysfs_ring_read(struct seq_file *seq, void *v)
+{
+        struct net_device *dev = seq->private;
+        struct stmmac_priv *priv = netdev_priv(dev);
+        unsigned int txsize = priv->dma_tx_size;
+        unsigned int rxsize = priv->dma_rx_size;
 
-        for (i = 0; i < priv->dma_tx_size; i++) {
-                struct tmp_s *x = (struct tmp_s *)(priv->dma_tx + i);
-                seq_printf(seq, "[%d] DES0=0x%x DES1=0x%x BUF1=0x%x BUF2=0x%x",
-                           i, (unsigned int)(x->a),
-                           (unsigned int)((x->a) >> 32), x->b, x->c);
-                seq_printf(seq, "\n");
+        if (priv->extend_desc) {
+                seq_printf(seq, "Extended RX descriptor ring:\n");
+                sysfs_display_ring((void *)priv->dma_erx, rxsize, 1, seq);
+                seq_printf(seq, "Extended TX descriptor ring:\n");
+                sysfs_display_ring((void *)priv->dma_etx, txsize, 1, seq);
+        } else {
+                seq_printf(seq, "RX descriptor ring:\n");
+                sysfs_display_ring((void *)priv->dma_rx, rxsize, 0, seq);
+                seq_printf(seq, "TX descriptor ring:\n");
+                sysfs_display_ring((void *)priv->dma_tx, txsize, 0, seq);
         }
 
         return 0;
@@ -1817,8 +2488,8 @@ static int stmmac_init_fs(struct net_device *dev)
 
         /* Entry to report DMA RX/TX rings */
         stmmac_rings_status = debugfs_create_file("descriptors_status",
-                                           S_IRUGO, stmmac_fs_dir, dev,
-                                           &stmmac_rings_status_fops);
+                                                  S_IRUGO, stmmac_fs_dir, dev,
+                                                  &stmmac_rings_status_fops);
 
         if (!stmmac_rings_status || IS_ERR(stmmac_rings_status)) {
                 pr_info("ERROR creating stmmac ring debugfs file\n");
@@ -1868,7 +2539,7 @@ static const struct net_device_ops stmmac_netdev_ops = {
 
 /**
  *  stmmac_hw_init - Init the MAC device
- *  @priv : pointer to the private device structure.
+ *  @priv: driver private structure
  *  Description: this function detects which MAC device
  *  (GMAC/MAC10-100) has to attached, checks the HW capability
  *  (if supported) and sets the driver's features (for example
@@ -1877,7 +2548,7 @@ static const struct net_device_ops stmmac_netdev_ops = {
  */
 static int stmmac_hw_init(struct stmmac_priv *priv)
 {
-        int ret = 0;
+        int ret;
         struct mac_device_info *mac;
 
         /* Identify the MAC HW device */
@@ -1892,12 +2563,23 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
 
         priv->hw = mac;
 
-        /* To use the chained or ring mode */
-        priv->hw->ring = &ring_mode_ops;
-
         /* Get and dump the chip ID */
         priv->synopsys_id = stmmac_get_synopsys_id(priv);
 
+        /* To use alternate (extended) or normal descriptor structures */
+        stmmac_selec_desc_mode(priv);
+
+        /* To use the chained or ring mode */
+        if (chain_mode) {
+                priv->hw->chain = &chain_mode_ops;
+                pr_info(" Chain mode enabled\n");
+                priv->mode = STMMAC_CHAIN_MODE;
+        } else {
+                priv->hw->ring = &ring_mode_ops;
+                pr_info(" Ring mode enabled\n");
+                priv->mode = STMMAC_RING_MODE;
+        }
+
         /* Get the HW capability (new GMAC newer than 3.50a) */
         priv->hw_cap_support = stmmac_get_hw_features(priv);
         if (priv->hw_cap_support) {
@@ -1921,14 +2603,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
         } else
                 pr_info(" No HW DMA feature register supported");
 
-        /* Select the enhnaced/normal descriptor structures */
-        stmmac_selec_desc_mode(priv);
-
-        /* Enable the IPC (Checksum Offload) and check if the feature has been
-         * enabled during the core configuration. */
         ret = priv->hw->mac->rx_ipc(priv->ioaddr);
         if (!ret) {
-                pr_warning(" RX IPC Checksum Offload not configured.\n");
+                pr_warn(" RX IPC Checksum Offload not configured.\n");
                 priv->plat->rx_coe = STMMAC_RX_COE_NONE;
         }
 
@@ -1943,7 +2620,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
                 device_set_wakeup_capable(priv->device, 1);
         }
 
-        return ret;
+        return 0;
 }
 
 /**
@@ -1984,12 +2661,15 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
         stmmac_verify_args();
 
         /* Override with kernel parameters if supplied XXX CRS XXX
-         * this needs to have multiple instances */
+         * this needs to have multiple instances
+         */
         if ((phyaddr >= 0) && (phyaddr <= 31))
                 priv->plat->phy_addr = phyaddr;
 
         /* Init MAC and get the capabilities */
-        stmmac_hw_init(priv);
+        ret = stmmac_hw_init(priv);
+        if (ret)
+                goto error_free_netdev;
 
         ndev->netdev_ops = &stmmac_netdev_ops;
 
@@ -1999,7 +2679,7 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
         ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
 #ifdef STMMAC_VLAN_TAG_USED
         /* Both mac100 and gmac support receive VLAN tag detection */
-        ndev->features |= NETIF_F_HW_VLAN_RX;
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_RX;
 #endif
         priv->msg_enable = netif_msg_init(debug, default_msg_level);
 
@@ -2029,7 +2709,7 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
 
         priv->stmmac_clk = clk_get(priv->device, STMMAC_RESOURCE_NAME);
         if (IS_ERR(priv->stmmac_clk)) {
-                pr_warning("%s: warning: cannot get CSR clock\n", __func__);
+                pr_warn("%s: warning: cannot get CSR clock\n", __func__);
                 goto error_clk_get;
         }
 
@@ -2044,12 +2724,17 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
         else
                 priv->clk_csr = priv->plat->clk_csr;
 
-        /* MDIO bus Registration */
-        ret = stmmac_mdio_register(ndev);
-        if (ret < 0) {
-                pr_debug("%s: MDIO bus (id: %d) registration failed",
-                         __func__, priv->plat->bus_id);
-                goto error_mdio_register;
+        stmmac_check_pcs_mode(priv);
+
+        if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&
+            priv->pcs != STMMAC_PCS_RTBI) {
+                /* MDIO bus Registration */
+                ret = stmmac_mdio_register(ndev);
+                if (ret < 0) {
+                        pr_debug("%s: MDIO bus (id: %d) registration failed",
+                                 __func__, priv->plat->bus_id);
+                        goto error_mdio_register;
+                }
         }
 
         return priv;
@@ -2060,6 +2745,7 @@ error_clk_get:
         unregister_netdev(ndev);
 error_netdev_register:
         netif_napi_del(&priv->napi);
+error_free_netdev:
         free_netdev(ndev);
 
         return NULL;
@@ -2081,7 +2767,9 @@ int stmmac_dvr_remove(struct net_device *ndev)
         priv->hw->dma->stop_tx(priv->ioaddr);
 
         stmmac_set_mac(priv->ioaddr, false);
-        stmmac_mdio_unregister(ndev);
+        if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&
+            priv->pcs != STMMAC_PCS_RTBI)
+                stmmac_mdio_unregister(ndev);
         netif_carrier_off(ndev);
         unregister_netdev(ndev);
         free_netdev(ndev);
@@ -2093,7 +2781,6 @@ int stmmac_dvr_remove(struct net_device *ndev)
 int stmmac_suspend(struct net_device *ndev)
 {
         struct stmmac_priv *priv = netdev_priv(ndev);
-        int dis_ic = 0;
         unsigned long flags;
 
         if (!ndev || !netif_running(ndev))
@@ -2107,18 +2794,13 @@ int stmmac_suspend(struct net_device *ndev)
         netif_device_detach(ndev);
         netif_stop_queue(ndev);
 
-        if (priv->use_riwt)
-                dis_ic = 1;
-
         napi_disable(&priv->napi);
 
         /* Stop TX/RX DMA */
         priv->hw->dma->stop_tx(priv->ioaddr);
         priv->hw->dma->stop_rx(priv->ioaddr);
-        /* Clear the Rx/Tx descriptors */
-        priv->hw->desc->init_rx_desc(priv->dma_rx, priv->dma_rx_size,
-                                     dis_ic);
-        priv->hw->desc->init_tx_desc(priv->dma_tx, priv->dma_tx_size);
+
+        stmmac_clear_descriptors(priv);
 
         /* Enable Power down mode by programming the PMT regs */
         if (device_may_wakeup(priv->device))
@@ -2146,7 +2828,8 @@ int stmmac_resume(struct net_device *ndev)
          * automatically as soon as a magic packet or a Wake-up frame
          * is received. Anyway, it's better to manually clear
          * this bit because it can generate problems while resuming
-         * from another devices (e.g. serial console). */
+         * from another devices (e.g. serial console).
+         */
         if (device_may_wakeup(priv->device))
                 priv->hw->mac->pmt(priv->ioaddr, 0);
         else
@@ -2257,6 +2940,9 @@ static int __init stmmac_cmdline_opt(char *str)
                 } else if (!strncmp(opt, "eee_timer:", 10)) {
                         if (kstrtoint(opt + 10, 0, &eee_timer))
                                 goto err;
+                } else if (!strncmp(opt, "chain_mode:", 11)) {
+                        if (kstrtoint(opt + 11, 0, &chain_mode))
+                                goto err;
                 }
         }
         return 0;
@@ -2267,7 +2953,7 @@ err:
 }
 
 __setup("stmmaceth=", stmmac_cmdline_opt);
-#endif
+#endif /* MODULE */
 
 MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet device driver");
 MODULE_AUTHOR("Giuseppe Cavallaro <peppe.cavallaro@st.com>");
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 0b9829fe3eea..cc15039eaa47 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -177,7 +177,7 @@ int stmmac_mdio_register(struct net_device *ndev)
         new_bus->write = &stmmac_mdio_write;
         new_bus->reset = &stmmac_mdio_reset;
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x",
-                new_bus->name, priv->plat->bus_id);
+                 new_bus->name, priv->plat->bus_id);
         new_bus->priv = ndev;
         new_bus->irq = irqlist;
         new_bus->phy_mask = mdio_bus_data->phy_mask;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 19b3a2567a46..023b7c29cb2f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -88,7 +88,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
                         continue;
                 addr = pci_iomap(pdev, i, 0);
                 if (addr == NULL) {
-                        pr_err("%s: ERROR: cannot map register memory, aborting",
+                        pr_err("%s: ERROR: cannot map register memory aborting",
                                __func__);
                         ret = -EIO;
                         goto err_out_map_failed;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b43d68b40e50..1d3780f55ba2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -88,11 +88,9 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
         if (!res)
                 return -ENODEV;
 
-        addr = devm_request_and_ioremap(dev, res);
-        if (!addr) {
-                pr_err("%s: ERROR: memory mapping failed", __func__);
-                return -ENOMEM;
-        }
+        addr = devm_ioremap_resource(dev, res);
+        if (IS_ERR(addr))
+                return PTR_ERR(addr);
 
         if (pdev->dev.of_node) {
                 plat_dat = devm_kzalloc(&pdev->dev,
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
new file mode 100644
index 000000000000..b8b0eeed0f92
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -0,0 +1,211 @@
+/*******************************************************************************
+  PTP 1588 clock using the STMMAC.
+
+  Copyright (C) 2013  Vayavya Labs Pvt Ltd
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Author: Rayagond Kokatanur <rayagond@vayavyalabs.com>
+*******************************************************************************/
+#include "stmmac.h"
+#include "stmmac_ptp.h"
+
+/**
+ * stmmac_adjust_freq
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @ppb: desired period change in parts ber billion
+ *
+ * Description: this function will adjust the frequency of hardware clock.
+ */
+static int stmmac_adjust_freq(struct ptp_clock_info *ptp, s32 ppb)
+{
+        struct stmmac_priv *priv =
+            container_of(ptp, struct stmmac_priv, ptp_clock_ops);
+        unsigned long flags;
+        u32 diff, addend;
+        int neg_adj = 0;
+        u64 adj;
+
+        if (ppb < 0) {
+                neg_adj = 1;
+                ppb = -ppb;
+        }
+
+        addend = priv->default_addend;
+        adj = addend;
+        adj *= ppb;
+        diff = div_u64(adj, 1000000000ULL);
+        addend = neg_adj ? (addend - diff) : (addend + diff);
+
+        spin_lock_irqsave(&priv->ptp_lock, flags);
+
+        priv->hw->ptp->config_addend(priv->ioaddr, addend);
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        return 0;
+}
+
+/**
+ * stmmac_adjust_time
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @delta: desired change in nanoseconds
+ *
+ * Description: this function will shift/adjust the hardware clock time.
+ */
+static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
+{
+        struct stmmac_priv *priv =
+            container_of(ptp, struct stmmac_priv, ptp_clock_ops);
+        unsigned long flags;
+        u32 sec, nsec;
+        u32 quotient, reminder;
+        int neg_adj = 0;
+
+        if (delta < 0) {
+                neg_adj = 1;
+                delta = -delta;
+        }
+
+        quotient = div_u64_rem(delta, 1000000000ULL, &reminder);
+        sec = quotient;
+        nsec = reminder;
+
+        spin_lock_irqsave(&priv->ptp_lock, flags);
+
+        priv->hw->ptp->adjust_systime(priv->ioaddr, sec, nsec, neg_adj);
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        return 0;
+}
+
+/**
+ * stmmac_get_time
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @ts: pointer to hold time/result
+ *
+ * Description: this function will read the current time from the
+ * hardware clock and store it in @ts.
+ */
+static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec *ts)
+{
+        struct stmmac_priv *priv =
+            container_of(ptp, struct stmmac_priv, ptp_clock_ops);
+        unsigned long flags;
+        u64 ns;
+        u32 reminder;
+
+        spin_lock_irqsave(&priv->ptp_lock, flags);
+
+        ns = priv->hw->ptp->get_systime(priv->ioaddr);
+
+        spin_unlock_irqrestore(&priv->ptp_lock, flags);
+
+        ts->tv_sec = div_u64_rem(ns, 1000000000ULL, &reminder);
+        ts->tv_nsec = reminder;
+
+        return 0;
+}
+
+/**
+ * stmmac_set_time
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @ts: time value to set
+ *
+ * Description: this function will set the current time on the
+ * hardware clock.
+ */
+static int stmmac_set_time(struct ptp_clock_info *ptp,
+                           const struct timespec *ts)
+{
+        struct stmmac_priv *priv =
+            container_of(ptp, struct stmmac_priv, ptp_clock_ops);
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->ptp_lock, flags);
+
+        priv->hw->ptp->init_systime(priv->ioaddr, ts->tv_sec, ts->tv_nsec);
+
+        spin_unlock_irqrestore(&priv->ptp_lock, flags);
+
+        return 0;
+}
+
+static int stmmac_enable(struct ptp_clock_info *ptp,
+                         struct ptp_clock_request *rq, int on)
+{
+        return -EOPNOTSUPP;
+}
+
+/* structure describing a PTP hardware clock */
+static struct ptp_clock_info stmmac_ptp_clock_ops = {
+        .owner = THIS_MODULE,
+        .name = "stmmac_ptp_clock",
+        .max_adj = 62500000,
+        .n_alarm = 0,
+        .n_ext_ts = 0,
+        .n_per_out = 0,
+        .pps = 0,
+        .adjfreq = stmmac_adjust_freq,
+        .adjtime = stmmac_adjust_time,
+        .gettime = stmmac_get_time,
+        .settime = stmmac_set_time,
+        .enable = stmmac_enable,
+};
+
+/**
+ * stmmac_ptp_register
+ * @priv: driver private structure
+ * Description: this function will register the ptp clock driver
+ * to kernel. It also does some house keeping work.
+ */
+int stmmac_ptp_register(struct stmmac_priv *priv)
+{
+        spin_lock_init(&priv->ptp_lock);
+        priv->ptp_clock_ops = stmmac_ptp_clock_ops;
+
+        priv->ptp_clock = ptp_clock_register(&priv->ptp_clock_ops,
+                                             priv->device);
+        if (IS_ERR(priv->ptp_clock)) {
+                priv->ptp_clock = NULL;
+                pr_err("ptp_clock_register() failed on %s\n", priv->dev->name);
+        } else
+                pr_debug("Added PTP HW clock successfully on %s\n",
+                         priv->dev->name);
+
+        return 0;
+}
+
+/**
+ * stmmac_ptp_unregister
+ * @priv: driver private structure
+ * Description: this function will remove/unregister the ptp clock driver
+ * from the kernel.
+ */
+void stmmac_ptp_unregister(struct stmmac_priv *priv)
+{
+        if (priv->ptp_clock) {
+                ptp_clock_unregister(priv->ptp_clock);
+                pr_debug("Removed PTP HW clock successfully on %s\n",
+                         priv->dev->name);
+        }
+}
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
new file mode 100644
index 000000000000..3dbc047622fa
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -0,0 +1,74 @@
+/******************************************************************************
+  PTP Header file
+
+  Copyright (C) 2013  Vayavya Labs Pvt Ltd
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Author: Rayagond Kokatanur <rayagond@vayavyalabs.com>
+******************************************************************************/
+
+#ifndef __STMMAC_PTP_H__
+#define __STMMAC_PTP_H__
+
+#define STMMAC_SYSCLOCK 62500000
+
+/* IEEE 1588 PTP register offsets */
+#define PTP_TCR         0x0700  /* Timestamp Control Reg */
+#define PTP_SSIR        0x0704  /* Sub-Second Increment Reg */
+#define PTP_STSR        0x0708  /* System Time – Seconds Regr */
+#define PTP_STNSR       0x070C  /* System Time – Nanoseconds Reg */
+#define PTP_STSUR       0x0710  /* System Time – Seconds Update Reg */
+#define PTP_STNSUR      0x0714  /* System Time – Nanoseconds Update Reg */
+#define PTP_TAR         0x0718  /* Timestamp Addend Reg */
+#define PTP_TTSR        0x071C  /* Target Time Seconds Reg */
+#define PTP_TTNSR       0x0720  /* Target Time Nanoseconds Reg */
+#define PTP_STHWSR      0x0724  /* System Time - Higher Word Seconds Reg */
+#define PTP_TSR         0x0728  /* Timestamp Status */
+
+#define PTP_STNSUR_ADDSUB_SHIFT 31
+
+/* PTP TCR defines */
+#define PTP_TCR_TSENA           0x00000001 /* Timestamp Enable */
+#define PTP_TCR_TSCFUPDT        0x00000002 /* Timestamp Fine/Coarse Update */
+#define PTP_TCR_TSINIT          0x00000004 /* Timestamp Initialize */
+#define PTP_TCR_TSUPDT          0x00000008 /* Timestamp Update */
+/* Timestamp Interrupt Trigger Enable */
+#define PTP_TCR_TSTRIG          0x00000010
+#define PTP_TCR_TSADDREG        0x00000020 /* Addend Reg Update */
+#define PTP_TCR_TSENALL         0x00000100 /* Enable Timestamp for All Frames */
+/* Timestamp Digital or Binary Rollover Control */
+#define PTP_TCR_TSCTRLSSR       0x00000200
+
+/* Enable PTP packet Processing for Version 2 Format */
+#define PTP_TCR_TSVER2ENA       0x00000400
+/* Enable Processing of PTP over Ethernet Frames */
+#define PTP_TCR_TSIPENA         0x00000800
+/* Enable Processing of PTP Frames Sent over IPv6-UDP */
+#define PTP_TCR_TSIPV6ENA       0x00001000
+/* Enable Processing of PTP Frames Sent over IPv4-UDP */
+#define PTP_TCR_TSIPV4ENA       0x00002000
+/* Enable Timestamp Snapshot for Event Messages */
+#define PTP_TCR_TSEVNTENA       0x00004000
+/* Enable Snapshot for Messages Relevant to Master */
+#define PTP_TCR_TSMSTRENA       0x00008000
+/* Select PTP packets for Taking Snapshots */
+#define PTP_TCR_SNAPTYPSEL_1    0x00010000
+/* Enable MAC address for PTP Frame Filtering */
+#define PTP_TCR_TSENMACADDR     0x00040000
+
+#endif /* __STMMAC_PTP_H__ */
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index e4c1c88e4c2a..95cff98d8a34 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -6618,7 +6618,7 @@ static u64 niu_compute_tx_flags(struct sk_buff *skb, struct ethhdr *ehdr,
                (len << TXHDR_LEN_SHIFT) |
                ((l3off / 2) << TXHDR_L3START_SHIFT) |
                (ihl << TXHDR_IHL_SHIFT) |
-               ((eth_proto_inner < 1536) ? TXHDR_LLC : 0) |
+               ((eth_proto_inner < ETH_P_802_3_MIN) ? TXHDR_LLC : 0) |
                ((eth_proto == ETH_P_8021Q) ? TXHDR_VLAN : 0) |
                (ipv6 ? TXHDR_IP_VER : 0) |
                csum_bits);
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 5fafca065305..054975939a18 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -1169,10 +1169,8 @@ static int bigmac_ether_init(struct platform_device *op,
         bp->bmac_block = dma_alloc_coherent(&bp->bigmac_op->dev,
                                             PAGE_SIZE,
                                             &bp->bblock_dvma, GFP_ATOMIC);
-        if (bp->bmac_block == NULL || bp->bblock_dvma == 0) {
-                printk(KERN_ERR "BIGMAC: Cannot allocate consistent DMA.\n");
+        if (bp->bmac_block == NULL || bp->bblock_dvma == 0)
                 goto fail_and_cleanup;
-        }
 
         /* Get the board revision of this BigMAC. */
         bp->board_rev = of_getintprop_default(bp->bigmac_op->dev.of_node,
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index a1bff49a8155..436fa9d5a071 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2752,10 +2752,8 @@ static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe)
                                              &hp->hblock_dvma,
                                              GFP_ATOMIC);
         err = -ENOMEM;
-        if (!hp->happy_block) {
-                printk(KERN_ERR "happymeal: Cannot allocate descriptors.\n");
+        if (!hp->happy_block)
                 goto err_out_iounmap;
-        }
 
         /* Force check of the link first time we are brought up. */
         hp->linkcheck = 0;
@@ -3068,14 +3066,11 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
         hp->happy_bursts = DMA_BURSTBITS;
 #endif
 
-        hp->happy_block = (struct hmeal_init_block *)
-                dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &hp->hblock_dvma, GFP_KERNEL);
-
+        hp->happy_block = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
+                                             &hp->hblock_dvma, GFP_KERNEL);
         err = -ENODEV;
-        if (!hp->happy_block) {
-                printk(KERN_ERR "happymeal(PCI): Cannot get hme init block.\n");
+        if (!hp->happy_block)
                 goto err_out_iounmap;
-        }
 
         hp->linkcheck = 0;
         hp->timer_state = asleep;
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 49bf3e2eb652..8182591bc187 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -414,7 +414,7 @@ static void qe_rx(struct sunqe *qep)
         struct qe_rxd *this;
         struct sunqe_buffers *qbufs = qep->buffers;
         __u32 qbufs_dvma = qep->buffers_dvma;
-        int elem = qep->rx_new, drops = 0;
+        int elem = qep->rx_new;
         u32 flags;
 
         this = &rxbase[elem];
@@ -436,7 +436,6 @@ static void qe_rx(struct sunqe *qep)
                 } else {
                         skb = netdev_alloc_skb(dev, len + 2);
                         if (skb == NULL) {
-                                drops++;
                                 dev->stats.rx_dropped++;
                         } else {
                                 skb_reserve(skb, 2);
@@ -456,8 +455,6 @@ static void qe_rx(struct sunqe *qep)
                 this = &rxbase[elem];
         }
         qep->rx_new = elem;
-        if (drops)
-                printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", qep->dev->name);
 }
 
 static void qe_tx_reclaim(struct sunqe *qep);
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index e15cc71b826d..571452e786d5 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -733,7 +733,7 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)
  * @ndev: network device
  * @vid:  VLAN vid to add
  */
-static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
+static int bdx_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
 {
         __bdx_vlan_rx_vid(ndev, vid, 1);
         return 0;
@@ -744,7 +744,7 @@ static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
  * @ndev: network device
  * @vid:  VLAN vid to kill
  */
-static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)
+static int bdx_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
 {
         __bdx_vlan_rx_vid(ndev, vid, 0);
         return 0;
@@ -1102,10 +1102,9 @@ static void bdx_rx_alloc_skbs(struct bdx_priv *priv, struct rxf_fifo *f)
         dno = bdx_rxdb_available(db) - 1;
         while (dno > 0) {
                 skb = netdev_alloc_skb(priv->ndev, f->m.pktsz + NET_IP_ALIGN);
-                if (!skb) {
-                        pr_err("NO MEM: netdev_alloc_skb failed\n");
+                if (!skb)
                         break;
-                }
+
                 skb_reserve(skb, NET_IP_ALIGN);
 
                 idx = bdx_rxdb_alloc_elem(db);
@@ -1149,7 +1148,7 @@ NETIF_RX_MUX(struct bdx_priv *priv, u32 rxd_val1, u16 rxd_vlan,
                     priv->ndev->name,
                     GET_RXD_VLAN_ID(rxd_vlan),
                     GET_RXD_VTAG(rxd_val1));
-                __vlan_hwaccel_put_tag(skb, GET_RXD_VLAN_TCI(rxd_vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), GET_RXD_VLAN_TCI(rxd_vlan));
         }
         netif_receive_skb(skb);
 }
@@ -2018,12 +2017,12 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                  * so we can have them same for all ports of the board */
                 ndev->if_port = port;
                 ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO
-                    | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
-                    NETIF_F_HW_VLAN_FILTER | NETIF_F_RXCSUM
+                    | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
+                    NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM
                     /*| NETIF_F_FRAGLIST */
                     ;
                 ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
-                        NETIF_F_TSO | NETIF_F_HW_VLAN_TX;
+                        NETIF_F_TSO | NETIF_F_HW_VLAN_CTAG_TX;
 
                 if (pci_using_dac)
                         ndev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 4781d3d8e182..59c43918883e 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -126,6 +126,13 @@ do {								\
 #define CPSW_FIFO_DUAL_MAC_MODE         (1 << 15)
 #define CPSW_FIFO_RATE_LIMIT_MODE       (2 << 15)
 
+#define CPSW_INTPACEEN          (0x3f << 16)
+#define CPSW_INTPRESCALE_MASK   (0x7FF << 0)
+#define CPSW_CMINTMAX_CNT       63
+#define CPSW_CMINTMIN_CNT       2
+#define CPSW_CMINTMAX_INTVL     (1000 / CPSW_CMINTMIN_CNT)
+#define CPSW_CMINTMIN_INTVL     ((1000 / CPSW_CMINTMAX_CNT) + 1)
+
 #define cpsw_enable_irq(priv)   \
         do {                    \
                 u32 i;          \
@@ -139,6 +146,10 @@ do {								\
                         disable_irq_nosync(priv->irqs_table[i]); \
         } while (0);
 
+#define cpsw_slave_index(priv)                          \
+                ((priv->data.dual_emac) ? priv->emac_port :     \
+                priv->data.active_slave)
+
 static int debug_level;
 module_param(debug_level, int, 0);
 MODULE_PARM_DESC(debug_level, "cpsw debug level (NETIF_MSG bits)");
@@ -160,6 +171,15 @@ struct cpsw_wr_regs {
         u32     rx_en;
         u32     tx_en;
         u32     misc_en;
+        u32     mem_allign1[8];
+        u32     rx_thresh_stat;
+        u32     rx_stat;
+        u32     tx_stat;
+        u32     misc_stat;
+        u32     mem_allign2[8];
+        u32     rx_imax;
+        u32     tx_imax;
+
 };
 
 struct cpsw_ss_regs {
@@ -314,6 +334,8 @@ struct cpsw_priv {
         struct cpsw_host_regs __iomem   *host_port_regs;
         u32                             msg_enable;
         u32                             version;
+        u32                             coal_intvl;
+        u32                             bus_freq_mhz;
         struct net_device_stats         stats;
         int                             rx_packet_max;
         int                             host_port;
@@ -326,6 +348,7 @@ struct cpsw_priv {
         /* snapshot of IRQ numbers */
         u32 irqs_table[4];
         u32 num_irqs;
+        bool irq_enabled;
         struct cpts *cpts;
         u32 emac_port;
 };
@@ -333,12 +356,15 @@ struct cpsw_priv {
 #define napi_to_priv(napi)      container_of(napi, struct cpsw_priv, napi)
 #define for_each_slave(priv, func, arg...)                              \
         do {                                                            \
-                int idx;                                                \
+                struct cpsw_slave *slave;                               \
+                int n;                                                  \
                 if (priv->data.dual_emac)                               \
                         (func)((priv)->slaves + priv->emac_port, ##arg);\
                 else                                                    \
-                        for (idx = 0; idx < (priv)->data.slaves; idx++) \
-                                (func)((priv)->slaves + idx, ##arg);    \
+                        for (n = (priv)->data.slaves,                   \
+                                        slave = (priv)->slaves;         \
+                                        n; n--)                         \
+                                (func)(slave++, ##arg);                 \
         } while (0)
 #define cpsw_get_slave_ndev(priv, __slave_no__)                         \
         (priv->slaves[__slave_no__].ndev)
@@ -446,62 +472,69 @@ void cpsw_tx_handler(void *token, int len, int status)
 void cpsw_rx_handler(void *token, int len, int status)
 {
         struct sk_buff          *skb = token;
+        struct sk_buff          *new_skb;
         struct net_device       *ndev = skb->dev;
         struct cpsw_priv        *priv = netdev_priv(ndev);
         int                     ret = 0;
 
         cpsw_dual_emac_src_port_detect(status, priv, ndev, skb);
 
-        /* free and bail if we are shutting down */
-        if (unlikely(!netif_running(ndev)) ||
-                        unlikely(!netif_carrier_ok(ndev))) {
+        if (unlikely(status < 0)) {
+                /* the interface is going down, skbs are purged */
                 dev_kfree_skb_any(skb);
                 return;
         }
-        if (likely(status >= 0)) {
+
+        new_skb = netdev_alloc_skb_ip_align(ndev, priv->rx_packet_max);
+        if (new_skb) {
                 skb_put(skb, len);
                 cpts_rx_timestamp(priv->cpts, skb);
                 skb->protocol = eth_type_trans(skb, ndev);
                 netif_receive_skb(skb);
                 priv->stats.rx_bytes += len;
                 priv->stats.rx_packets++;
-                skb = NULL;
-        }
-
-        if (unlikely(!netif_running(ndev))) {
-                if (skb)
-                        dev_kfree_skb_any(skb);
-                return;
+        } else {
+                priv->stats.rx_dropped++;
+                new_skb = skb;
         }
 
-        if (likely(!skb)) {
-                skb = netdev_alloc_skb_ip_align(ndev, priv->rx_packet_max);
-                if (WARN_ON(!skb))
-                        return;
-
-                ret = cpdma_chan_submit(priv->rxch, skb, skb->data,
-                                        skb_tailroom(skb), 0, GFP_KERNEL);
-        }
-        WARN_ON(ret < 0);
+        ret = cpdma_chan_submit(priv->rxch, new_skb, new_skb->data,
+                        skb_tailroom(new_skb), 0);
+        if (WARN_ON(ret < 0))
+                dev_kfree_skb_any(new_skb);
 }
 
 static irqreturn_t cpsw_interrupt(int irq, void *dev_id)
 {
         struct cpsw_priv *priv = dev_id;
+        u32 rx, tx, rx_thresh;
 
-        if (likely(netif_running(priv->ndev))) {
-                cpsw_intr_disable(priv);
+        rx_thresh = __raw_readl(&priv->wr_regs->rx_thresh_stat);
+        rx = __raw_readl(&priv->wr_regs->rx_stat);
+        tx = __raw_readl(&priv->wr_regs->tx_stat);
+        if (!rx_thresh && !rx && !tx)
+                return IRQ_NONE;
+
+        cpsw_intr_disable(priv);
+        if (priv->irq_enabled == true) {
                 cpsw_disable_irq(priv);
+                priv->irq_enabled = false;
+        }
+
+        if (netif_running(priv->ndev)) {
                 napi_schedule(&priv->napi);
-        } else {
-                priv = cpsw_get_slave_priv(priv, 1);
-                if (likely(priv) && likely(netif_running(priv->ndev))) {
-                        cpsw_intr_disable(priv);
-                        cpsw_disable_irq(priv);
-                        napi_schedule(&priv->napi);
-                }
+                return IRQ_HANDLED;
+        }
+
+        priv = cpsw_get_slave_priv(priv, 1);
+        if (!priv)
+                return IRQ_NONE;
+
+        if (netif_running(priv->ndev)) {
+                napi_schedule(&priv->napi);
+                return IRQ_HANDLED;
         }
-        return IRQ_HANDLED;
+        return IRQ_NONE;
 }
 
 static int cpsw_poll(struct napi_struct *napi, int budget)
@@ -515,10 +548,16 @@ static int cpsw_poll(struct napi_struct *napi, int budget)
 
         num_rx = cpdma_chan_process(priv->rxch, budget);
         if (num_rx < budget) {
+                struct cpsw_priv *prim_cpsw;
+
                 napi_complete(napi);
                 cpsw_intr_enable(priv);
                 cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX);
-                cpsw_enable_irq(priv);
+                prim_cpsw = cpsw_get_slave_priv(priv, 0);
+                if (prim_cpsw->irq_enabled == false) {
+                        cpsw_enable_irq(priv);
+                        prim_cpsw->irq_enabled = true;
+                }
         }
 
         if (num_rx || num_tx)
@@ -612,6 +651,77 @@ static void cpsw_adjust_link(struct net_device *ndev)
         }
 }
 
+static int cpsw_get_coalesce(struct net_device *ndev,
+                                struct ethtool_coalesce *coal)
+{
+        struct cpsw_priv *priv = netdev_priv(ndev);
+
+        coal->rx_coalesce_usecs = priv->coal_intvl;
+        return 0;
+}
+
+static int cpsw_set_coalesce(struct net_device *ndev,
+                                struct ethtool_coalesce *coal)
+{
+        struct cpsw_priv *priv = netdev_priv(ndev);
+        u32 int_ctrl;
+        u32 num_interrupts = 0;
+        u32 prescale = 0;
+        u32 addnl_dvdr = 1;
+        u32 coal_intvl = 0;
+
+        if (!coal->rx_coalesce_usecs)
+                return -EINVAL;
+
+        coal_intvl = coal->rx_coalesce_usecs;
+
+        int_ctrl =  readl(&priv->wr_regs->int_control);
+        prescale = priv->bus_freq_mhz * 4;
+
+        if (coal_intvl < CPSW_CMINTMIN_INTVL)
+                coal_intvl = CPSW_CMINTMIN_INTVL;
+
+        if (coal_intvl > CPSW_CMINTMAX_INTVL) {
+                /* Interrupt pacer works with 4us Pulse, we can
+                 * throttle further by dilating the 4us pulse.
+                 */
+                addnl_dvdr = CPSW_INTPRESCALE_MASK / prescale;
+
+                if (addnl_dvdr > 1) {
+                        prescale *= addnl_dvdr;
+                        if (coal_intvl > (CPSW_CMINTMAX_INTVL * addnl_dvdr))
+                                coal_intvl = (CPSW_CMINTMAX_INTVL
+                                                * addnl_dvdr);
+                } else {
+                        addnl_dvdr = 1;
+                        coal_intvl = CPSW_CMINTMAX_INTVL;
+                }
+        }
+
+        num_interrupts = (1000 * addnl_dvdr) / coal_intvl;
+        writel(num_interrupts, &priv->wr_regs->rx_imax);
+        writel(num_interrupts, &priv->wr_regs->tx_imax);
+
+        int_ctrl |= CPSW_INTPACEEN;
+        int_ctrl &= (~CPSW_INTPRESCALE_MASK);
+        int_ctrl |= (prescale & CPSW_INTPRESCALE_MASK);
+        writel(int_ctrl, &priv->wr_regs->int_control);
+
+        cpsw_notice(priv, timer, "Set coalesce to %d usecs.\n", coal_intvl);
+        if (priv->data.dual_emac) {
+                int i;
+
+                for (i = 0; i < priv->data.slaves; i++) {
+                        priv = netdev_priv(priv->slaves[i].ndev);
+                        priv->coal_intvl = coal_intvl;
+                }
+        } else {
+                priv->coal_intvl = coal_intvl;
+        }
+
+        return 0;
+}
+
 static inline int __show_stat(char *buf, int maxlen, const char *name, u32 val)
 {
         static char *leader = "........................................";
@@ -643,14 +753,14 @@ static inline int cpsw_tx_packet_submit(struct net_device *ndev,
 {
         if (!priv->data.dual_emac)
                 return cpdma_chan_submit(priv->txch, skb, skb->data,
-                                  skb->len, 0, GFP_KERNEL);
+                                  skb->len, 0);
 
         if (ndev == cpsw_get_slave_ndev(priv, 0))
                 return cpdma_chan_submit(priv->txch, skb, skb->data,
-                                  skb->len, 1, GFP_KERNEL);
+                                  skb->len, 1);
         else
                 return cpdma_chan_submit(priv->txch, skb, skb->data,
-                                  skb->len, 2, GFP_KERNEL);
+                                  skb->len, 2);
 }
 
 static inline void cpsw_add_dual_emac_def_ale_entries(
@@ -774,9 +884,19 @@ static void cpsw_init_host_port(struct cpsw_priv *priv)
         }
 }
 
+static void cpsw_slave_stop(struct cpsw_slave *slave, struct cpsw_priv *priv)
+{
+        if (!slave->phy)
+                return;
+        phy_stop(slave->phy);
+        phy_disconnect(slave->phy);
+        slave->phy = NULL;
+}
+
 static int cpsw_ndo_open(struct net_device *ndev)
 {
         struct cpsw_priv *priv = netdev_priv(ndev);
+        struct cpsw_priv *prim_cpsw;
         int i, ret;
         u32 reg;
 
@@ -819,14 +939,16 @@ static int cpsw_ndo_open(struct net_device *ndev)
                         struct sk_buff *skb;
 
                         ret = -ENOMEM;
-                        skb = netdev_alloc_skb_ip_align(priv->ndev,
-                                                        priv->rx_packet_max);
+                        skb = __netdev_alloc_skb_ip_align(priv->ndev,
+                                        priv->rx_packet_max, GFP_KERNEL);
                         if (!skb)
-                                break;
+                                goto err_cleanup;
                         ret = cpdma_chan_submit(priv->rxch, skb, skb->data,
-                                        skb_tailroom(skb), 0, GFP_KERNEL);
-                        if (WARN_ON(ret < 0))
-                                break;
+                                        skb_tailroom(skb), 0);
+                        if (ret < 0) {
+                                kfree_skb(skb);
+                                goto err_cleanup;
+                        }
                 }
                 /* continue even if we didn't manage to submit all
                  * receive descs
@@ -834,6 +956,22 @@ static int cpsw_ndo_open(struct net_device *ndev)
                 cpsw_info(priv, ifup, "submitted %d rx descriptors\n", i);
         }
 
+        /* Enable Interrupt pacing if configured */
+        if (priv->coal_intvl != 0) {
+                struct ethtool_coalesce coal;
+
+                coal.rx_coalesce_usecs = (priv->coal_intvl << 4);
+                cpsw_set_coalesce(ndev, &coal);
+        }
+
+        prim_cpsw = cpsw_get_slave_priv(priv, 0);
+        if (prim_cpsw->irq_enabled == false) {
+                if ((priv == prim_cpsw) || !netif_running(prim_cpsw->ndev)) {
+                        prim_cpsw->irq_enabled = true;
+                        cpsw_enable_irq(prim_cpsw);
+                }
+        }
+
         cpdma_ctlr_start(priv->dma);
         cpsw_intr_enable(priv);
         napi_enable(&priv->napi);
@@ -843,15 +981,13 @@ static int cpsw_ndo_open(struct net_device *ndev)
         if (priv->data.dual_emac)
                 priv->slaves[priv->emac_port].open_stat = true;
         return 0;
-}
 
-static void cpsw_slave_stop(struct cpsw_slave *slave, struct cpsw_priv *priv)
-{
-        if (!slave->phy)
-                return;
-        phy_stop(slave->phy);
-        phy_disconnect(slave->phy);
-        slave->phy = NULL;
+err_cleanup:
+        cpdma_ctlr_stop(priv->dma);
+        for_each_slave(priv, cpsw_slave_stop, priv);
+        pm_runtime_put_sync(&priv->pdev->dev);
+        netif_carrier_off(priv->ndev);
+        return ret;
 }
 
 static int cpsw_ndo_stop(struct net_device *ndev)
@@ -942,7 +1078,7 @@ static void cpsw_ndo_change_rx_flags(struct net_device *ndev, int flags)
 
 static void cpsw_hwtstamp_v1(struct cpsw_priv *priv)
 {
-        struct cpsw_slave *slave = &priv->slaves[priv->data.cpts_active_slave];
+        struct cpsw_slave *slave = &priv->slaves[priv->data.active_slave];
         u32 ts_en, seq_id;
 
         if (!priv->cpts->tx_enable && !priv->cpts->rx_enable) {
@@ -971,7 +1107,7 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv)
         if (priv->data.dual_emac)
                 slave = &priv->slaves[priv->emac_port];
         else
-                slave = &priv->slaves[priv->data.cpts_active_slave];
+                slave = &priv->slaves[priv->data.active_slave];
 
         ctrl = slave_read(slave, CPSW2_CONTROL);
         ctrl &= ~CTRL_ALL_TS_MASK;
@@ -1056,14 +1192,26 @@ static int cpsw_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
 
 static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
+        struct cpsw_priv *priv = netdev_priv(dev);
+        struct mii_ioctl_data *data = if_mii(req);
+        int slave_no = cpsw_slave_index(priv);
+
         if (!netif_running(dev))
                 return -EINVAL;
 
+        switch (cmd) {
 #ifdef CONFIG_TI_CPTS
-        if (cmd == SIOCSHWTSTAMP)
+        case SIOCSHWTSTAMP:
                 return cpsw_hwtstamp_ioctl(dev, req);
 #endif
-        return -ENOTSUPP;
+        case SIOCGMIIPHY:
+                data->phy_id = priv->slaves[slave_no].phy->addr;
+                break;
+        default:
+                return -ENOTSUPP;
+        }
+
+        return 0;
 }
 
 static void cpsw_ndo_tx_timeout(struct net_device *ndev)
@@ -1138,7 +1286,7 @@ clean_vid:
 }
 
 static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
-                unsigned short vid)
+                                    __be16 proto, u16 vid)
 {
         struct cpsw_priv *priv = netdev_priv(ndev);
 
@@ -1150,7 +1298,7 @@ static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
 }
 
 static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,
-                unsigned short vid)
+                                     __be16 proto, u16 vid)
 {
         struct cpsw_priv *priv = netdev_priv(ndev);
         int ret;
@@ -1244,12 +1392,39 @@ static int cpsw_get_ts_info(struct net_device *ndev,
         return 0;
 }
 
+static int cpsw_get_settings(struct net_device *ndev,
+                             struct ethtool_cmd *ecmd)
+{
+        struct cpsw_priv *priv = netdev_priv(ndev);
+        int slave_no = cpsw_slave_index(priv);
+
+        if (priv->slaves[slave_no].phy)
+                return phy_ethtool_gset(priv->slaves[slave_no].phy, ecmd);
+        else
+                return -EOPNOTSUPP;
+}
+
+static int cpsw_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
+{
+        struct cpsw_priv *priv = netdev_priv(ndev);
+        int slave_no = cpsw_slave_index(priv);
+
+        if (priv->slaves[slave_no].phy)
+                return phy_ethtool_sset(priv->slaves[slave_no].phy, ecmd);
+        else
+                return -EOPNOTSUPP;
+}
+
 static const struct ethtool_ops cpsw_ethtool_ops = {
         .get_drvinfo    = cpsw_get_drvinfo,
         .get_msglevel   = cpsw_get_msglevel,
         .set_msglevel   = cpsw_set_msglevel,
         .get_link       = ethtool_op_get_link,
         .get_ts_info    = cpsw_get_ts_info,
+        .get_settings   = cpsw_get_settings,
+        .set_settings   = cpsw_set_settings,
+        .get_coalesce   = cpsw_get_coalesce,
+        .set_coalesce   = cpsw_set_coalesce,
 };
 
 static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv,
@@ -1282,12 +1457,12 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
         }
         data->slaves = prop;
 
-        if (of_property_read_u32(node, "cpts_active_slave", &prop)) {
-                pr_err("Missing cpts_active_slave property in the DT.\n");
+        if (of_property_read_u32(node, "active_slave", &prop)) {
+                pr_err("Missing active_slave property in the DT.\n");
                 ret = -EINVAL;
                 goto error_ret;
         }
-        data->cpts_active_slave = prop;
+        data->active_slave = prop;
 
         if (of_property_read_u32(node, "cpts_clock_mult", &prop)) {
                 pr_err("Missing cpts_clock_mult property in the DT.\n");
@@ -1437,6 +1612,9 @@ static int cpsw_probe_dual_emac(struct platform_device *pdev,
         priv_sl2->slaves = priv->slaves;
         priv_sl2->clk = priv->clk;
 
+        priv_sl2->coal_intvl = 0;
+        priv_sl2->bus_freq_mhz = priv->bus_freq_mhz;
+
         priv_sl2->cpsw_res = priv->cpsw_res;
         priv_sl2->regs = priv->regs;
         priv_sl2->host_port = priv->host_port;
@@ -1455,8 +1633,7 @@ static int cpsw_probe_dual_emac(struct platform_device *pdev,
                 priv_sl2->irqs_table[i] = priv->irqs_table[i];
                 priv_sl2->num_irqs = priv->num_irqs;
         }
-
-        ndev->features |= NETIF_F_HW_VLAN_FILTER;
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         ndev->netdev_ops = &cpsw_netdev_ops;
         SET_ETHTOOL_OPS(ndev, &cpsw_ethtool_ops);
@@ -1476,7 +1653,7 @@ static int cpsw_probe_dual_emac(struct platform_device *pdev,
 
 static int cpsw_probe(struct platform_device *pdev)
 {
-        struct cpsw_platform_data       *data = pdev->dev.platform_data;
+        struct cpsw_platform_data       *data;
         struct net_device               *ndev;
         struct cpsw_priv                *priv;
         struct cpdma_params             dma_params;
@@ -1501,6 +1678,7 @@ static int cpsw_probe(struct platform_device *pdev)
         priv->msg_enable = netif_msg_init(debug_level, CPSW_DEBUG);
         priv->rx_packet_max = max(rx_packet_max, 128);
         priv->cpts = devm_kzalloc(&pdev->dev, sizeof(struct cpts), GFP_KERNEL);
+        priv->irq_enabled = true;
         if (!ndev) {
                 pr_err("error allocating cpts\n");
                 goto clean_ndev_ret;
@@ -1546,6 +1724,8 @@ static int cpsw_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto clean_slave_ret;
         }
+        priv->coal_intvl = 0;
+        priv->bus_freq_mhz = clk_get_rate(priv->clk) / 1000000;
 
         priv->cpsw_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!priv->cpsw_res) {
@@ -1687,12 +1867,12 @@ static int cpsw_probe(struct platform_device *pdev)
                                 goto clean_ale_ret;
                         }
                         priv->irqs_table[k] = i;
-                        priv->num_irqs = k;
+                        priv->num_irqs = k + 1;
                 }
                 k++;
         }
 
-        ndev->features |= NETIF_F_HW_VLAN_FILTER;
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         ndev->netdev_ops = &cpsw_netdev_ops;
         SET_ETHTOOL_OPS(ndev, &cpsw_ethtool_ops);
@@ -1725,7 +1905,8 @@ static int cpsw_probe(struct platform_device *pdev)
         return 0;
 
 clean_irq_ret:
-        free_irq(ndev->irq, priv);
+        for (i = 0; i < priv->num_irqs; i++)
+                free_irq(priv->irqs_table[i], priv);
 clean_ale_ret:
         cpsw_ale_destroy(priv->ale);
 clean_dma_ret:
@@ -1748,7 +1929,8 @@ clean_slave_ret:
         pm_runtime_disable(&pdev->dev);
         kfree(priv->slaves);
 clean_ndev_ret:
-        free_netdev(ndev);
+        kfree(priv->data.slave_data);
+        free_netdev(priv->ndev);
         return ret;
 }
 
@@ -1756,12 +1938,17 @@ static int cpsw_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct cpsw_priv *priv = netdev_priv(ndev);
+        int i;
 
-        pr_info("removing device");
         platform_set_drvdata(pdev, NULL);
+        if (priv->data.dual_emac)
+                unregister_netdev(cpsw_get_slave_ndev(priv, 1));
+        unregister_netdev(ndev);
 
         cpts_unregister(priv->cpts);
-        free_irq(ndev->irq, priv);
+        for (i = 0; i < priv->num_irqs; i++)
+                free_irq(priv->irqs_table[i], priv);
+
         cpsw_ale_destroy(priv->ale);
         cpdma_chan_destroy(priv->txch);
         cpdma_chan_destroy(priv->rxch);
@@ -1775,8 +1962,10 @@ static int cpsw_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
         clk_put(priv->clk);
         kfree(priv->slaves);
+        kfree(priv->data.slave_data);
+        if (priv->data.dual_emac)
+                free_netdev(cpsw_get_slave_ndev(priv, 1));
         free_netdev(ndev);
-
         return 0;
 }
 
@@ -1812,6 +2001,7 @@ static const struct of_device_id cpsw_of_mtable[] = {
         { .compatible = "ti,cpsw", },
         { /* sentinel */ },
 };
+MODULE_DEVICE_TABLE(of, cpsw_of_mtable);
 
 static struct platform_driver cpsw_driver = {
         .driver = {
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index ee13dc78430c..49dfd592ac1e 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
+#include <linux/delay.h>
 
 #include "davinci_cpdma.h"
 
@@ -312,14 +313,16 @@ int cpdma_ctlr_start(struct cpdma_ctlr *ctlr)
         }
 
         if (ctlr->params.has_soft_reset) {
-                unsigned long timeout = jiffies + HZ/10;
+                unsigned timeout = 10 * 100;
 
                 dma_reg_write(ctlr, CPDMA_SOFTRESET, 1);
-                while (time_before(jiffies, timeout)) {
+                while (timeout) {
                         if (dma_reg_read(ctlr, CPDMA_SOFTRESET) == 0)
                                 break;
+                        udelay(10);
+                        timeout--;
                 }
-                WARN_ON(!time_before(jiffies, timeout));
+                WARN_ON(!timeout);
         }
 
         for (i = 0; i < ctlr->num_chan; i++) {
@@ -673,7 +676,7 @@ static void __cpdma_chan_submit(struct cpdma_chan *chan,
 }
 
 int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
-                      int len, int directed, gfp_t gfp_mask)
+                      int len, int directed)
 {
         struct cpdma_ctlr               *ctlr = chan->ctlr;
         struct cpdma_desc __iomem       *desc;
@@ -773,6 +776,7 @@ static int __cpdma_chan_process(struct cpdma_chan *chan)
         struct cpdma_ctlr               *ctlr = chan->ctlr;
         struct cpdma_desc __iomem       *desc;
         int                             status, outlen;
+        int                             cb_status = 0;
         struct cpdma_desc_pool          *pool = ctlr->pool;
         dma_addr_t                      desc_dma;
         unsigned long                   flags;
@@ -808,8 +812,12 @@ static int __cpdma_chan_process(struct cpdma_chan *chan)
         }
 
         spin_unlock_irqrestore(&chan->lock, flags);
+        if (unlikely(status & CPDMA_DESC_TD_COMPLETE))
+                cb_status = -ENOSYS;
+        else
+                cb_status = status;
 
-        __cpdma_chan_free(chan, desc, outlen, status);
+        __cpdma_chan_free(chan, desc, outlen, cb_status);
         return status;
 
 unlock_ret:
@@ -868,7 +876,7 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
         struct cpdma_desc_pool  *pool = ctlr->pool;
         unsigned long           flags;
         int                     ret;
-        unsigned long           timeout;
+        unsigned                timeout;
 
         spin_lock_irqsave(&chan->lock, flags);
         if (chan->state != CPDMA_STATE_ACTIVE) {
@@ -883,14 +891,15 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
         dma_reg_write(ctlr, chan->td, chan_linear(chan));
 
         /* wait for teardown complete */
-        timeout = jiffies + HZ/10;      /* 100 msec */
-        while (time_before(jiffies, timeout)) {
+        timeout = 100 * 100; /* 100 ms */
+        while (timeout) {
                 u32 cp = chan_read(chan, cp);
                 if ((cp & CPDMA_TEARDOWN_VALUE) == CPDMA_TEARDOWN_VALUE)
                         break;
-                cpu_relax();
+                udelay(10);
+                timeout--;
         }
-        WARN_ON(!time_before(jiffies, timeout));
+        WARN_ON(!timeout);
         chan_write(chan, cp, CPDMA_TEARDOWN_VALUE);
 
         /* handle completed packets */
@@ -1031,3 +1040,5 @@ unlock_ret:
         return ret;
 }
 EXPORT_SYMBOL_GPL(cpdma_control_set);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h
index d9bcc6032fdc..86dee487f2f0 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.h
+++ b/drivers/net/ethernet/ti/davinci_cpdma.h
@@ -89,7 +89,7 @@ int cpdma_chan_dump(struct cpdma_chan *chan);
 int cpdma_chan_get_stats(struct cpdma_chan *chan,
                          struct cpdma_chan_stats *stats);
 int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
-                      int len, int directed, gfp_t gfp_mask);
+                      int len, int directed);
 int cpdma_chan_process(struct cpdma_chan *chan, int quota);
 
 int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable);
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 72300bc9e378..860e15ddfbcb 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1037,7 +1037,7 @@ static void emac_rx_handler(void *token, int len, int status)
 
 recycle:
         ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
-                        skb_tailroom(skb), 0, GFP_KERNEL);
+                        skb_tailroom(skb), 0);
 
         WARN_ON(ret == -ENOMEM);
         if (unlikely(ret < 0))
@@ -1092,7 +1092,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
         skb_tx_timestamp(skb);
 
         ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
-                                     0, GFP_KERNEL);
+                                     0);
         if (unlikely(ret_code != 0)) {
                 if (netif_msg_tx_err(priv) && net_ratelimit())
                         dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
@@ -1438,7 +1438,7 @@ static int emac_poll(struct napi_struct *napi, int budget)
  * Polled functionality used by netconsole and others in non interrupt mode
  *
  */
-void emac_poll_controller(struct net_device *ndev)
+static void emac_poll_controller(struct net_device *ndev)
 {
         struct emac_priv *priv = netdev_priv(ndev);
 
@@ -1558,7 +1558,7 @@ static int emac_dev_open(struct net_device *ndev)
                         break;
 
                 ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
-                                        skb_tailroom(skb), 0, GFP_KERNEL);
+                                        skb_tailroom(skb), 0);
                 if (WARN_ON(ret < 0))
                         break;
         }
@@ -1865,21 +1865,18 @@ static int davinci_emac_probe(struct platform_device *pdev)
 
 
         /* obtain emac clock from kernel */
-        emac_clk = clk_get(&pdev->dev, NULL);
+        emac_clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(emac_clk)) {
                 dev_err(&pdev->dev, "failed to get EMAC clock\n");
                 return -EBUSY;
         }
         emac_bus_frequency = clk_get_rate(emac_clk);
-        clk_put(emac_clk);
 
         /* TODO: Probe PHY here if possible */
 
         ndev = alloc_etherdev(sizeof(struct emac_priv));
-        if (!ndev) {
-                rc = -ENOMEM;
-                goto no_ndev;
-        }
+        if (!ndev)
+                return -ENOMEM;
 
         platform_set_drvdata(pdev, ndev);
         priv = netdev_priv(ndev);
@@ -1893,7 +1890,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data\n");
                 rc = -ENODEV;
-                goto probe_quit;
+                goto no_pdata;
         }
 
         /* MAC addr and PHY mask , RMII enable info from platform_data */
@@ -1913,23 +1910,23 @@ static int davinci_emac_probe(struct platform_device *pdev)
         if (!res) {
                 dev_err(&pdev->dev,"error getting res\n");
                 rc = -ENOENT;
-                goto probe_quit;
+                goto no_pdata;
         }
 
         priv->emac_base_phys = res->start + pdata->ctrl_reg_offset;
         size = resource_size(res);
-        if (!request_mem_region(res->start, size, ndev->name)) {
+        if (!devm_request_mem_region(&pdev->dev, res->start,
+                                     size, ndev->name)) {
                 dev_err(&pdev->dev, "failed request_mem_region() for regs\n");
                 rc = -ENXIO;
-                goto probe_quit;
+                goto no_pdata;
         }
 
-        priv->remap_addr = ioremap(res->start, size);
+        priv->remap_addr = devm_ioremap(&pdev->dev, res->start, size);
         if (!priv->remap_addr) {
                 dev_err(&pdev->dev, "unable to map IO\n");
                 rc = -ENOMEM;
-                release_mem_region(res->start, size);
-                goto probe_quit;
+                goto no_pdata;
         }
         priv->emac_base = priv->remap_addr + pdata->ctrl_reg_offset;
         ndev->base_addr = (unsigned long)priv->remap_addr;
@@ -1962,7 +1959,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
         if (!priv->dma) {
                 dev_err(&pdev->dev, "error initializing DMA\n");
                 rc = -ENOMEM;
-                goto no_dma;
+                goto no_pdata;
         }
 
         priv->txchan = cpdma_chan_create(priv->dma, tx_chan_num(EMAC_DEF_TX_CH),
@@ -1971,14 +1968,14 @@ static int davinci_emac_probe(struct platform_device *pdev)
                                        emac_rx_handler);
         if (WARN_ON(!priv->txchan || !priv->rxchan)) {
                 rc = -ENOMEM;
-                goto no_irq_res;
+                goto no_cpdma_chan;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!res) {
                 dev_err(&pdev->dev, "error getting irq res\n");
                 rc = -ENOENT;
-                goto no_irq_res;
+                goto no_cpdma_chan;
         }
         ndev->irq = res->start;
 
@@ -2000,7 +1997,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
         if (rc) {
                 dev_err(&pdev->dev, "error in register_netdev\n");
                 rc = -ENODEV;
-                goto no_irq_res;
+                goto no_cpdma_chan;
         }
 
 
@@ -2015,20 +2012,14 @@ static int davinci_emac_probe(struct platform_device *pdev)
 
         return 0;
 
-no_irq_res:
+no_cpdma_chan:
         if (priv->txchan)
                 cpdma_chan_destroy(priv->txchan);
         if (priv->rxchan)
                 cpdma_chan_destroy(priv->rxchan);
         cpdma_ctlr_destroy(priv->dma);
-no_dma:
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
-        iounmap(priv->remap_addr);
-
-probe_quit:
+no_pdata:
         free_netdev(ndev);
-no_ndev:
         return rc;
 }
 
@@ -2041,14 +2032,12 @@ no_ndev:
  */
 static int davinci_emac_remove(struct platform_device *pdev)
 {
-        struct resource *res;
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct emac_priv *priv = netdev_priv(ndev);
 
         dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
 
         platform_set_drvdata(pdev, NULL);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         if (priv->txchan)
                 cpdma_chan_destroy(priv->txchan);
@@ -2056,10 +2045,7 @@ static int davinci_emac_remove(struct platform_device *pdev)
                 cpdma_chan_destroy(priv->rxchan);
         cpdma_ctlr_destroy(priv->dma);
 
-        release_mem_region(res->start, resource_size(res));
-
         unregister_netdev(ndev);
-        iounmap(priv->remap_addr);
         free_netdev(ndev);
 
         return 0;
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index d04a622b08d4..12aec173564c 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -485,6 +485,7 @@ static const struct of_device_id davinci_mdio_of_mtable[] = {
         { .compatible = "ti,davinci_mdio", },
         { /* sentinel */ },
 };
+MODULE_DEVICE_TABLE(of, davinci_mdio_of_mtable);
 
 static struct platform_driver davinci_mdio_driver = {
         .driver = {
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 22725386c5de..60c400f6d01f 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -320,6 +320,7 @@ static void tlan_remove_one(struct pci_dev *pdev)
         free_netdev(dev);
 
         pci_set_drvdata(pdev, NULL);
+        cancel_work_sync(&priv->tlan_tqueue);
 }
 
 static void tlan_start(struct net_device *dev)
@@ -1911,10 +1912,8 @@ static void tlan_reset_lists(struct net_device *dev)
                 list->frame_size = TLAN_MAX_FRAME_SIZE;
                 list->buffer[0].count = TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
                 skb = netdev_alloc_skb_ip_align(dev, TLAN_MAX_FRAME_SIZE + 5);
-                if (!skb) {
-                        netdev_err(dev, "Out of memory for received data\n");
+                if (!skb)
                         break;
-                }
 
                 list->buffer[0].address = pci_map_single(priv->pci_dev,
                                                          skb->data,
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index 445c0595c997..ad32af67e618 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -58,13 +58,6 @@ MODULE_DESCRIPTION("Gelic Network driver");
 MODULE_LICENSE("GPL");
 
 
-static inline void gelic_card_enable_rxdmac(struct gelic_card *card);
-static inline void gelic_card_disable_rxdmac(struct gelic_card *card);
-static inline void gelic_card_disable_txdmac(struct gelic_card *card);
-static inline void gelic_card_reset_chain(struct gelic_card *card,
-                                          struct gelic_descr_chain *chain,
-                                          struct gelic_descr *start_descr);
-
 /* set irq_mask */
 int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask)
 {
@@ -78,12 +71,12 @@ int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask)
         return status;
 }
 
-static inline void gelic_card_rx_irq_on(struct gelic_card *card)
+static void gelic_card_rx_irq_on(struct gelic_card *card)
 {
         card->irq_mask |= GELIC_CARD_RXINT;
         gelic_card_set_irq_mask(card, card->irq_mask);
 }
-static inline void gelic_card_rx_irq_off(struct gelic_card *card)
+static void gelic_card_rx_irq_off(struct gelic_card *card)
 {
         card->irq_mask &= ~GELIC_CARD_RXINT;
         gelic_card_set_irq_mask(card, card->irq_mask);
@@ -127,6 +120,120 @@ static int gelic_card_set_link_mode(struct gelic_card *card, int mode)
         return 0;
 }
 
+/**
+ * gelic_card_disable_txdmac - disables the transmit DMA controller
+ * @card: card structure
+ *
+ * gelic_card_disable_txdmac terminates processing on the DMA controller by
+ * turing off DMA and issuing a force end
+ */
+static void gelic_card_disable_txdmac(struct gelic_card *card)
+{
+        int status;
+
+        /* this hvc blocks until the DMA in progress really stopped */
+        status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card));
+        if (status)
+                dev_err(ctodev(card),
+                        "lv1_net_stop_tx_dma failed, status=%d\n", status);
+}
+
+/**
+ * gelic_card_enable_rxdmac - enables the receive DMA controller
+ * @card: card structure
+ *
+ * gelic_card_enable_rxdmac enables the DMA controller by setting RX_DMA_EN
+ * in the GDADMACCNTR register
+ */
+static void gelic_card_enable_rxdmac(struct gelic_card *card)
+{
+        int status;
+
+#ifdef DEBUG
+        if (gelic_descr_get_status(card->rx_chain.head) !=
+            GELIC_DESCR_DMA_CARDOWNED) {
+                printk(KERN_ERR "%s: status=%x\n", __func__,
+                       be32_to_cpu(card->rx_chain.head->dmac_cmd_status));
+                printk(KERN_ERR "%s: nextphy=%x\n", __func__,
+                       be32_to_cpu(card->rx_chain.head->next_descr_addr));
+                printk(KERN_ERR "%s: head=%p\n", __func__,
+                       card->rx_chain.head);
+        }
+#endif
+        status = lv1_net_start_rx_dma(bus_id(card), dev_id(card),
+                                card->rx_chain.head->bus_addr, 0);
+        if (status)
+                dev_info(ctodev(card),
+                         "lv1_net_start_rx_dma failed, status=%d\n", status);
+}
+
+/**
+ * gelic_card_disable_rxdmac - disables the receive DMA controller
+ * @card: card structure
+ *
+ * gelic_card_disable_rxdmac terminates processing on the DMA controller by
+ * turing off DMA and issuing a force end
+ */
+static void gelic_card_disable_rxdmac(struct gelic_card *card)
+{
+        int status;
+
+        /* this hvc blocks until the DMA in progress really stopped */
+        status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card));
+        if (status)
+                dev_err(ctodev(card),
+                        "lv1_net_stop_rx_dma failed, %d\n", status);
+}
+
+/**
+ * gelic_descr_set_status -- sets the status of a descriptor
+ * @descr: descriptor to change
+ * @status: status to set in the descriptor
+ *
+ * changes the status to the specified value. Doesn't change other bits
+ * in the status
+ */
+static void gelic_descr_set_status(struct gelic_descr *descr,
+                                   enum gelic_descr_dma_status status)
+{
+        descr->dmac_cmd_status = cpu_to_be32(status |
+                        (be32_to_cpu(descr->dmac_cmd_status) &
+                         ~GELIC_DESCR_DMA_STAT_MASK));
+        /*
+         * dma_cmd_status field is used to indicate whether the descriptor
+         * is valid or not.
+         * Usually caller of this function wants to inform that to the
+         * hardware, so we assure here the hardware sees the change.
+         */
+        wmb();
+}
+
+/**
+ * gelic_card_reset_chain - reset status of a descriptor chain
+ * @card: card structure
+ * @chain: address of chain
+ * @start_descr: address of descriptor array
+ *
+ * Reset the status of dma descriptors to ready state
+ * and re-initialize the hardware chain for later use
+ */
+static void gelic_card_reset_chain(struct gelic_card *card,
+                                   struct gelic_descr_chain *chain,
+                                   struct gelic_descr *start_descr)
+{
+        struct gelic_descr *descr;
+
+        for (descr = start_descr; start_descr != descr->next; descr++) {
+                gelic_descr_set_status(descr, GELIC_DESCR_DMA_CARDOWNED);
+                descr->next_descr_addr = cpu_to_be32(descr->next->bus_addr);
+        }
+
+        chain->head = start_descr;
+        chain->tail = (descr - 1);
+
+        (descr - 1)->next_descr_addr = 0;
+}
+
 void gelic_card_up(struct gelic_card *card)
 {
         pr_debug("%s: called\n", __func__);
@@ -183,29 +290,6 @@ gelic_descr_get_status(struct gelic_descr *descr)
 }
 
 /**
- * gelic_descr_set_status -- sets the status of a descriptor
- * @descr: descriptor to change
- * @status: status to set in the descriptor
- *
- * changes the status to the specified value. Doesn't change other bits
- * in the status
- */
-static void gelic_descr_set_status(struct gelic_descr *descr,
-                                   enum gelic_descr_dma_status status)
-{
-        descr->dmac_cmd_status = cpu_to_be32(status |
-                        (be32_to_cpu(descr->dmac_cmd_status) &
-                         ~GELIC_DESCR_DMA_STAT_MASK));
-        /*
-         * dma_cmd_status field is used to indicate whether the descriptor
-         * is valid or not.
-         * Usually caller of this function wants to inform that to the
-         * hardware, so we assure here the hardware sees the change.
-         */
-        wmb();
-}
-
-/**
  * gelic_card_free_chain - free descriptor chain
  * @card: card structure
  * @descr_in: address of desc
@@ -286,31 +370,6 @@ iommu_error:
 }
 
 /**
- * gelic_card_reset_chain - reset status of a descriptor chain
- * @card: card structure
- * @chain: address of chain
- * @start_descr: address of descriptor array
- *
- * Reset the status of dma descriptors to ready state
- * and re-initialize the hardware chain for later use
- */
-static void gelic_card_reset_chain(struct gelic_card *card,
-                                   struct gelic_descr_chain *chain,
-                                   struct gelic_descr *start_descr)
-{
-        struct gelic_descr *descr;
-
-        for (descr = start_descr; start_descr != descr->next; descr++) {
-                gelic_descr_set_status(descr, GELIC_DESCR_DMA_CARDOWNED);
-                descr->next_descr_addr = cpu_to_be32(descr->next->bus_addr);
-        }
-
-        chain->head = start_descr;
-        chain->tail = (descr - 1);
-
-        (descr - 1)->next_descr_addr = 0;
-}
-/**
  * gelic_descr_prepare_rx - reinitializes a rx descriptor
  * @card: card structure
  * @descr: descriptor to re-init
@@ -599,71 +658,6 @@ void gelic_net_set_multi(struct net_device *netdev)
 }
 
 /**
- * gelic_card_enable_rxdmac - enables the receive DMA controller
- * @card: card structure
- *
- * gelic_card_enable_rxdmac enables the DMA controller by setting RX_DMA_EN
- * in the GDADMACCNTR register
- */
-static inline void gelic_card_enable_rxdmac(struct gelic_card *card)
-{
-        int status;
-
-#ifdef DEBUG
-        if (gelic_descr_get_status(card->rx_chain.head) !=
-            GELIC_DESCR_DMA_CARDOWNED) {
-                printk(KERN_ERR "%s: status=%x\n", __func__,
-                       be32_to_cpu(card->rx_chain.head->dmac_cmd_status));
-                printk(KERN_ERR "%s: nextphy=%x\n", __func__,
-                       be32_to_cpu(card->rx_chain.head->next_descr_addr));
-                printk(KERN_ERR "%s: head=%p\n", __func__,
-                       card->rx_chain.head);
-        }
-#endif
-        status = lv1_net_start_rx_dma(bus_id(card), dev_id(card),
-                                card->rx_chain.head->bus_addr, 0);
-        if (status)
-                dev_info(ctodev(card),
-                         "lv1_net_start_rx_dma failed, status=%d\n", status);
-}
-
-/**
- * gelic_card_disable_rxdmac - disables the receive DMA controller
- * @card: card structure
- *
- * gelic_card_disable_rxdmac terminates processing on the DMA controller by
- * turing off DMA and issuing a force end
- */
-static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
-{
-        int status;
-
-        /* this hvc blocks until the DMA in progress really stopped */
-        status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card));
-        if (status)
-                dev_err(ctodev(card),
-                        "lv1_net_stop_rx_dma failed, %d\n", status);
-}
-
-/**
- * gelic_card_disable_txdmac - disables the transmit DMA controller
- * @card: card structure
- *
- * gelic_card_disable_txdmac terminates processing on the DMA controller by
- * turing off DMA and issuing a force end
- */
-static inline void gelic_card_disable_txdmac(struct gelic_card *card)
-{
-        int status;
-
-        /* this hvc blocks until the DMA in progress really stopped */
-        status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card));
-        if (status)
-                dev_err(ctodev(card),
-                        "lv1_net_stop_tx_dma failed, status=%d\n", status);
-}
-
-/**
  * gelic_net_stop - called upon ifconfig down
  * @netdev: interface device structure
  *
@@ -746,7 +740,7 @@ static void gelic_descr_set_tx_cmdstat(struct gelic_descr *descr,
         }
 }
 
-static inline struct sk_buff *gelic_put_vlan_tag(struct sk_buff *skb,
+static struct sk_buff *gelic_put_vlan_tag(struct sk_buff *skb,
                                                  unsigned short tag)
 {
         struct vlan_ethhdr *veth;
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index f1b91fd7e41c..c655fe60121e 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -352,8 +352,7 @@ spider_net_init_chain(struct spider_net_card *card,
         alloc_size = chain->num_desc * sizeof(struct spider_net_hw_descr);
 
         chain->hwring = dma_alloc_coherent(&card->pdev->dev, alloc_size,
-                &chain->dma_addr, GFP_KERNEL);
-
+                                           &chain->dma_addr, GFP_KERNEL);
         if (!chain->hwring)
                 return -ENOMEM;
 
@@ -2330,8 +2329,8 @@ spider_net_setup_netdev(struct spider_net_card *card)
         if (SPIDER_NET_RX_CSUM_DEFAULT)
                 netdev->features |= NETIF_F_RXCSUM;
         netdev->features |= NETIF_F_IP_CSUM | NETIF_F_LLTX;
-        /* some time: NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
-         *              NETIF_F_HW_VLAN_FILTER */
+        /* some time: NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
+         *              NETIF_F_HW_VLAN_CTAG_FILTER */
 
         netdev->irq = card->pdev->irq;
         card->num_rx_ints = 0;
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 8fa947a2d929..3c69a0460832 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1308,27 +1308,16 @@ static int tsi108_open(struct net_device *dev)
                        data->id, dev->irq, dev->name);
         }
 
-        data->rxring = dma_alloc_coherent(NULL, rxring_size,
-                        &data->rxdma, GFP_KERNEL);
-
-        if (!data->rxring) {
-                printk(KERN_DEBUG
-                       "TSI108_ETH: failed to allocate memory for rxring!\n");
+        data->rxring = dma_alloc_coherent(NULL, rxring_size, &data->rxdma,
+                                          GFP_KERNEL | __GFP_ZERO);
+        if (!data->rxring)
                 return -ENOMEM;
-        } else {
-                memset(data->rxring, 0, rxring_size);
-        }
-
-        data->txring = dma_alloc_coherent(NULL, txring_size,
-                        &data->txdma, GFP_KERNEL);
 
+        data->txring = dma_alloc_coherent(NULL, txring_size, &data->txdma,
+                                          GFP_KERNEL | __GFP_ZERO);
         if (!data->txring) {
-                printk(KERN_DEBUG
-                       "TSI108_ETH: failed to allocate memory for txring!\n");
                 pci_free_consistent(0, rxring_size, data->rxring, data->rxdma);
                 return -ENOMEM;
-        } else {
-                memset(data->txring, 0, txring_size);
         }
 
         for (i = 0; i < TSI108_RXRING_LEN; i++) {
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 185c721c52d7..ca98acabf1b4 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -508,8 +508,10 @@ static struct rtnl_link_stats64 *rhine_get_stats64(struct net_device *dev,
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static const struct ethtool_ops netdev_ethtool_ops;
 static int  rhine_close(struct net_device *dev);
-static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid);
-static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);
+static int rhine_vlan_rx_add_vid(struct net_device *dev,
+                                 __be16 proto, u16 vid);
+static int rhine_vlan_rx_kill_vid(struct net_device *dev,
+                                  __be16 proto, u16 vid);
 static void rhine_restart_tx(struct net_device *dev);
 
 static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool low)
@@ -1026,8 +1028,9 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
 
         if (pdev->revision >= VT6105M)
-                dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
-                NETIF_F_HW_VLAN_FILTER;
+                dev->features |= NETIF_F_HW_VLAN_CTAG_TX |
+                                 NETIF_F_HW_VLAN_CTAG_RX |
+                                 NETIF_F_HW_VLAN_CTAG_FILTER;
 
         /* dev->name not defined before register_netdev()! */
         rc = register_netdev(dev);
@@ -1414,7 +1417,7 @@ static void rhine_update_vcam(struct net_device *dev)
         rhine_set_vlan_cam_mask(ioaddr, vCAMmask);
 }
 
-static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int rhine_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct rhine_private *rp = netdev_priv(dev);
 
@@ -1425,7 +1428,7 @@ static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
         return 0;
 }
 
-static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int rhine_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct rhine_private *rp = netdev_priv(dev);
 
@@ -1933,7 +1936,7 @@ static int rhine_rx(struct net_device *dev, int limit)
                         skb->protocol = eth_type_trans(skb, dev);
 
                         if (unlikely(desc_length & DescTag))
-                                __vlan_hwaccel_put_tag(skb, vlan_tci);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tci);
                         netif_receive_skb(skb);
 
                         u64_stats_update_begin(&rp->rx_stats.syncp);
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 1bc7f9fd2583..fb6248956ee2 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -525,7 +525,8 @@ static void velocity_init_cam_filter(struct velocity_info *vptr)
         mac_set_vlan_cam_mask(regs, vptr->vCAMmask);
 }
 
-static int velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int velocity_vlan_rx_add_vid(struct net_device *dev,
+                                    __be16 proto, u16 vid)
 {
         struct velocity_info *vptr = netdev_priv(dev);
 
@@ -536,7 +537,8 @@ static int velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
         return 0;
 }
 
-static int velocity_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int velocity_vlan_rx_kill_vid(struct net_device *dev,
+                                     __be16 proto, u16 vid)
 {
         struct velocity_info *vptr = netdev_priv(dev);
 
@@ -2078,7 +2080,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
         if (rd->rdesc0.RSR & RSR_DETAG) {
                 u16 vid = swab16(le16_to_cpu(rd->rdesc1.PQTAG));
 
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         }
         netif_rx(skb);
 
@@ -2810,9 +2812,10 @@ static int velocity_found1(struct pci_dev *pdev,
         dev->ethtool_ops = &velocity_ethtool_ops;
         netif_napi_add(dev, &vptr->napi, velocity_poll, VELOCITY_NAPI_WEIGHT);
 
-        dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_HW_VLAN_TX;
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER |
-                NETIF_F_HW_VLAN_RX | NETIF_F_IP_CSUM;
+        dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
+                           NETIF_F_HW_VLAN_CTAG_TX;
+        dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_FILTER |
+                         NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_IP_CSUM;
 
         ret = register_netdev(dev);
         if (ret < 0)
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 545043cc4c0b..a518dcab396e 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -754,7 +754,7 @@ static int w5100_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int w5100_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -787,7 +787,7 @@ static int w5100_resume(struct device *dev)
         }
         return 0;
 }
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume);
 
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 7cbd0e6fc6f3..6e00e3f94ce4 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -666,7 +666,7 @@ static int w5300_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int w5300_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -699,7 +699,7 @@ static int w5300_resume(struct device *dev)
         }
         return 0;
 }
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume);
 
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 9fc2ada4c3c2..57c2e5ef2804 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -245,39 +245,30 @@ static int temac_dma_bd_init(struct net_device *ndev)
         /* returns a virtual address and a physical address. */
         lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->tx_bd_v) * TX_BD_NUM,
-                                         &lp->tx_bd_p, GFP_KERNEL);
-        if (!lp->tx_bd_v) {
-                dev_err(&ndev->dev,
-                                "unable to allocate DMA TX buffer descriptors");
+                                         &lp->tx_bd_p, GFP_KERNEL | __GFP_ZERO);
+        if (!lp->tx_bd_v)
                 goto out;
-        }
+
         lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->rx_bd_v) * RX_BD_NUM,
-                                         &lp->rx_bd_p, GFP_KERNEL);
-        if (!lp->rx_bd_v) {
-                dev_err(&ndev->dev,
-                                "unable to allocate DMA RX buffer descriptors");
+                                         &lp->rx_bd_p, GFP_KERNEL | __GFP_ZERO);
+        if (!lp->rx_bd_v)
                 goto out;
-        }
 
-        memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
         for (i = 0; i < TX_BD_NUM; i++) {
                 lp->tx_bd_v[i].next = lp->tx_bd_p +
                                 sizeof(*lp->tx_bd_v) * ((i + 1) % TX_BD_NUM);
         }
 
-        memset(lp->rx_bd_v, 0, sizeof(*lp->rx_bd_v) * RX_BD_NUM);
         for (i = 0; i < RX_BD_NUM; i++) {
                 lp->rx_bd_v[i].next = lp->rx_bd_p +
                                 sizeof(*lp->rx_bd_v) * ((i + 1) % RX_BD_NUM);
 
                 skb = netdev_alloc_skb_ip_align(ndev,
                                                 XTE_MAX_JUMBO_FRAME_SIZE);
-
-                if (skb == 0) {
-                        dev_err(&ndev->dev, "alloc_skb error %d\n", i);
+                if (!skb)
                         goto out;
-                }
+
                 lp->rx_skb[i] = skb;
                 /* returns physical address of skb->data */
                 lp->rx_bd_v[i].phys = dma_map_single(ndev->dev.parent,
@@ -789,9 +780,7 @@ static void ll_temac_recv(struct net_device *ndev)
 
                 new_skb = netdev_alloc_skb_ip_align(ndev,
                                                 XTE_MAX_JUMBO_FRAME_SIZE);
-
-                if (new_skb == 0) {
-                        dev_err(&ndev->dev, "no memory for new sk_buff\n");
+                if (!new_skb) {
                         spin_unlock_irqrestore(&lp->rx_lock, flags);
                         return;
                 }
@@ -1029,9 +1018,9 @@ static int temac_of_probe(struct platform_device *op)
         ndev->features |= NETIF_F_HW_CSUM; /* Can checksum all the packets. */
         ndev->features |= NETIF_F_IPV6_CSUM; /* Can checksum IPV6 TCP/UDP */
         ndev->features |= NETIF_F_HIGHDMA; /* Can DMA to high memory. */
-        ndev->features |= NETIF_F_HW_VLAN_TX; /* Transmit VLAN hw accel */
-        ndev->features |= NETIF_F_HW_VLAN_RX; /* Receive VLAN hw acceleration */
-        ndev->features |= NETIF_F_HW_VLAN_FILTER; /* Receive VLAN filtering */
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_TX; /* Transmit VLAN hw accel */
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_RX; /* Receive VLAN hw acceleration */
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; /* Receive VLAN filtering */
         ndev->features |= NETIF_F_VLAN_CHALLENGED; /* cannot handle VLAN pkts */
         ndev->features |= NETIF_F_GSO; /* Enable software GSO. */
         ndev->features |= NETIF_F_MULTI_QUEUE; /* Has multiple TX/RX queues */
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 278c9db3b5b8..24748e8367a1 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -204,41 +204,31 @@ static int axienet_dma_bd_init(struct net_device *ndev)
         lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->tx_bd_v) * TX_BD_NUM,
                                          &lp->tx_bd_p,
-                                         GFP_KERNEL);
-        if (!lp->tx_bd_v) {
-                dev_err(&ndev->dev, "unable to allocate DMA Tx buffer "
-                        "descriptors");
+                                         GFP_KERNEL | __GFP_ZERO);
+        if (!lp->tx_bd_v)
                 goto out;
-        }
 
         lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->rx_bd_v) * RX_BD_NUM,
                                          &lp->rx_bd_p,
-                                         GFP_KERNEL);
-        if (!lp->rx_bd_v) {
-                dev_err(&ndev->dev, "unable to allocate DMA Rx buffer "
-                        "descriptors");
+                                         GFP_KERNEL | __GFP_ZERO);
+        if (!lp->rx_bd_v)
                 goto out;
-        }
 
-        memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
         for (i = 0; i < TX_BD_NUM; i++) {
                 lp->tx_bd_v[i].next = lp->tx_bd_p +
                                       sizeof(*lp->tx_bd_v) *
                                       ((i + 1) % TX_BD_NUM);
         }
 
-        memset(lp->rx_bd_v, 0, sizeof(*lp->rx_bd_v) * RX_BD_NUM);
         for (i = 0; i < RX_BD_NUM; i++) {
                 lp->rx_bd_v[i].next = lp->rx_bd_p +
                                       sizeof(*lp->rx_bd_v) *
                                       ((i + 1) % RX_BD_NUM);
 
                 skb = netdev_alloc_skb_ip_align(ndev, lp->max_frm_size);
-                if (!skb) {
-                        dev_err(&ndev->dev, "alloc_skb error %d\n", i);
+                if (!skb)
                         goto out;
-                }
 
                 lp->rx_bd_v[i].sw_id_offset = (u32) skb;
                 lp->rx_bd_v[i].phys = dma_map_single(ndev->dev.parent,
@@ -777,10 +767,9 @@ static void axienet_recv(struct net_device *ndev)
                 packets++;
 
                 new_skb = netdev_alloc_skb_ip_align(ndev, lp->max_frm_size);
-                if (!new_skb) {
-                        dev_err(&ndev->dev, "no memory for new sk_buff\n");
+                if (!new_skb)
                         return;
-                }
+
                 cur_p->phys = dma_map_single(ndev->dev.parent, new_skb->data,
                                              lp->max_frm_size,
                                              DMA_FROM_DEVICE);
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index 1025b4e937d2..bdd20b888cf6 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -1041,7 +1041,6 @@ xirc2ps_interrupt(int irq, void *dev_id)
             /* 1 extra so we can use insw */
             skb = netdev_alloc_skb(dev, pktlen + 3);
             if (!skb) {
-                pr_notice("low memory, packet dropped (size=%u)\n", pktlen);
                 dev->stats.rx_dropped++;
             } else { /* okay get the packet */
                 skb_reserve(skb, 2);
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 502c8ff1d985..4c8ddc944d51 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -1070,13 +1070,10 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
                                         (PI_ALIGN_K_DESC_BLK - 1);
         bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size,
                                                    &bp->kmalloced_dma,
-                                                   GFP_ATOMIC);
-        if (top_v == NULL) {
-                printk("%s: Could not allocate memory for host buffers "
-                       "and structures!\n", print_name);
+                                                   GFP_ATOMIC | __GFP_ZERO);
+        if (top_v == NULL)
                 return DFX_K_FAILURE;
-        }
-        memset(top_v, 0, alloc_size);   /* zero out memory before continuing */
+
         top_p = bp->kmalloced_dma;      /* get physical address of buffer */
 
         /*
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 4cf8f1017aad..b2d863f2ea42 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -866,7 +866,7 @@ static int yam_open(struct net_device *dev)
 
         printk(KERN_INFO "Trying %s at iobase 0x%lx irq %u\n", dev->name, dev->base_addr, dev->irq);
 
-        if (!dev || !yp->bitrate)
+        if (!yp->bitrate)
                 return -ENXIO;
         if (!dev->base_addr || dev->base_addr > 0x1000 - YAM_EXTENT ||
                 dev->irq < 2 || dev->irq > 15) {
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index f5f0f09e4cc5..2b0480416b31 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -522,7 +522,7 @@ int netvsc_send(struct hv_device *device,
         sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
 
         if (packet->completion.send.send_completion)
-                req_id = (u64)packet;
+                req_id = (ulong)packet;
         else
                 req_id = 0;
 
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 8341b62e5521..088c55496191 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -429,7 +429,7 @@ static int netvsc_probe(struct hv_device *dev,
 
         /* TODO: Add GSO and Checksum offload */
         net->hw_features = NETIF_F_SG;
-        net->features = NETIF_F_SG | NETIF_F_HW_VLAN_TX;
+        net->features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_TX;
 
         SET_ETHTOOL_OPS(net, &ethtool_ops);
         SET_NETDEV_DEV(net, &dev->device);
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index fc1687ea4a42..6f10b4964726 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -51,7 +51,7 @@ struct at86rf230_local {
         struct ieee802154_dev *dev;
 
         spinlock_t lock;
-        bool irq_disabled;
+        bool irq_busy;
         bool is_tx;
 };
 
@@ -219,6 +219,9 @@ struct at86rf230_local {
 #define IRQ_PLL_UNL     (1 << 1)
 #define IRQ_PLL_LOCK    (1 << 0)
 
+#define IRQ_ACTIVE_HIGH 0
+#define IRQ_ACTIVE_LOW  1
+
 #define STATE_P_ON              0x00    /* BUSY */
 #define STATE_BUSY_RX           0x01
 #define STATE_BUSY_TX           0x02
@@ -233,8 +236,8 @@ struct at86rf230_local {
 #define STATE_SLEEP             0x0F
 #define STATE_BUSY_RX_AACK      0x11
 #define STATE_BUSY_TX_ARET      0x12
-#define STATE_BUSY_RX_AACK_ON   0x16
-#define STATE_BUSY_TX_ARET_ON   0x19
+#define STATE_RX_AACK_ON        0x16
+#define STATE_TX_ARET_ON        0x19
 #define STATE_RX_ON_NOCLK       0x1C
 #define STATE_RX_AACK_ON_NOCLK  0x1D
 #define STATE_BUSY_RX_AACK_NOCLK 0x1E
@@ -544,7 +547,7 @@ at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
         unsigned long flags;
 
         spin_lock(&lp->lock);
-        if  (lp->irq_disabled) {
+        if  (lp->irq_busy) {
                 spin_unlock(&lp->lock);
                 return -EBUSY;
         }
@@ -619,6 +622,52 @@ err:
         return -EINVAL;
 }
 
+static int
+at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
+                           struct ieee802154_hw_addr_filt *filt,
+                           unsigned long changed)
+{
+        struct at86rf230_local *lp = dev->priv;
+
+        if (changed & IEEE802515_AFILT_SADDR_CHANGED) {
+                dev_vdbg(&lp->spi->dev,
+                        "at86rf230_set_hw_addr_filt called for saddr\n");
+                __at86rf230_write(lp, RG_SHORT_ADDR_0, filt->short_addr);
+                __at86rf230_write(lp, RG_SHORT_ADDR_1, filt->short_addr >> 8);
+        }
+
+        if (changed & IEEE802515_AFILT_PANID_CHANGED) {
+                dev_vdbg(&lp->spi->dev,
+                        "at86rf230_set_hw_addr_filt called for pan id\n");
+                __at86rf230_write(lp, RG_PAN_ID_0, filt->pan_id);
+                __at86rf230_write(lp, RG_PAN_ID_1, filt->pan_id >> 8);
+        }
+
+        if (changed & IEEE802515_AFILT_IEEEADDR_CHANGED) {
+                dev_vdbg(&lp->spi->dev,
+                        "at86rf230_set_hw_addr_filt called for IEEE addr\n");
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_0, filt->ieee_addr[7]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_1, filt->ieee_addr[6]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_2, filt->ieee_addr[5]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_3, filt->ieee_addr[4]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_4, filt->ieee_addr[3]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_5, filt->ieee_addr[2]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_6, filt->ieee_addr[1]);
+                at86rf230_write_subreg(lp, SR_IEEE_ADDR_7, filt->ieee_addr[0]);
+        }
+
+        if (changed & IEEE802515_AFILT_PANC_CHANGED) {
+                dev_vdbg(&lp->spi->dev,
+                        "at86rf230_set_hw_addr_filt called for panc change\n");
+                if (filt->pan_coord)
+                        at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 1);
+                else
+                        at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 0);
+        }
+
+        return 0;
+}
+
 static struct ieee802154_ops at86rf230_ops = {
         .owner = THIS_MODULE,
         .xmit = at86rf230_xmit,
@@ -626,6 +675,7 @@ static struct ieee802154_ops at86rf230_ops = {
         .set_channel = at86rf230_channel,
         .start = at86rf230_start,
         .stop = at86rf230_stop,
+        .set_hw_addr_filt = at86rf230_set_hw_addr_filt,
 };
 
 static void at86rf230_irqwork(struct work_struct *work)
@@ -658,8 +708,16 @@ static void at86rf230_irqwork(struct work_struct *work)
         }
 
         spin_lock_irqsave(&lp->lock, flags);
-        lp->irq_disabled = 0;
+        lp->irq_busy = 0;
         spin_unlock_irqrestore(&lp->lock, flags);
+}
+
+static void at86rf230_irqwork_level(struct work_struct *work)
+{
+        struct at86rf230_local *lp =
+                container_of(work, struct at86rf230_local, irqwork);
+
+        at86rf230_irqwork(work);
 
         enable_irq(lp->spi->irq);
 }
@@ -668,10 +726,8 @@ static irqreturn_t at86rf230_isr(int irq, void *data)
 {
         struct at86rf230_local *lp = data;
 
-        disable_irq_nosync(irq);
-
         spin_lock(&lp->lock);
-        lp->irq_disabled = 1;
+        lp->irq_busy = 1;
         spin_unlock(&lp->lock);
 
         schedule_work(&lp->irqwork);
@@ -679,11 +735,23 @@ static irqreturn_t at86rf230_isr(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+static irqreturn_t at86rf230_isr_level(int irq, void *data)
+{
+        disable_irq_nosync(irq);
+
+        return at86rf230_isr(irq, data);
+}
+
+static int at86rf230_irq_polarity(struct at86rf230_local *lp, int pol)
+{
+        return at86rf230_write_subreg(lp, SR_IRQ_POLARITY, pol);
+}
 
 static int at86rf230_hw_init(struct at86rf230_local *lp)
 {
+        struct at86rf230_platform_data *pdata = lp->spi->dev.platform_data;
+        int rc, irq_pol;
         u8 status;
-        int rc;
 
         rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &status);
         if (rc)
@@ -701,12 +769,17 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
                 dev_info(&lp->spi->dev, "Status: %02x\n", status);
         }
 
-        rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, 0xff); /* IRQ_TRX_UR |
-                                                             * IRQ_CCA_ED |
-                                                             * IRQ_TRX_END |
-                                                             * IRQ_PLL_UNL |
-                                                             * IRQ_PLL_LOCK
-                                                             */
+        /* configure irq polarity, defaults to high active */
+        if (pdata->irq_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW))
+                irq_pol = IRQ_ACTIVE_LOW;
+        else
+                irq_pol = IRQ_ACTIVE_HIGH;
+
+        rc = at86rf230_irq_polarity(lp, irq_pol);
+        if (rc)
+                return rc;
+
+        rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END);
         if (rc)
                 return rc;
 
@@ -751,37 +824,38 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
         return 0;
 }
 
-static int at86rf230_fill_data(struct spi_device *spi)
+static void at86rf230_fill_data(struct spi_device *spi)
 {
         struct at86rf230_local *lp = spi_get_drvdata(spi);
         struct at86rf230_platform_data *pdata = spi->dev.platform_data;
 
-        if (!pdata) {
-                dev_err(&spi->dev, "no platform_data\n");
-                return -EINVAL;
-        }
-
         lp->rstn = pdata->rstn;
         lp->slp_tr = pdata->slp_tr;
         lp->dig2 = pdata->dig2;
-
-        return 0;
 }
 
 static int at86rf230_probe(struct spi_device *spi)
 {
+        struct at86rf230_platform_data *pdata;
         struct ieee802154_dev *dev;
         struct at86rf230_local *lp;
-        u8 man_id_0, man_id_1;
-        int rc;
+        u8 man_id_0, man_id_1, status;
+        irq_handler_t irq_handler;
+        work_func_t irq_worker;
+        int rc, supported = 0;
         const char *chip;
-        int supported = 0;
 
         if (!spi->irq) {
                 dev_err(&spi->dev, "no IRQ specified\n");
                 return -EINVAL;
         }
 
+        pdata = spi->dev.platform_data;
+        if (!pdata) {
+                dev_err(&spi->dev, "no platform_data\n");
+                return -EINVAL;
+        }
+
         dev = ieee802154_alloc_device(sizeof(*lp), &at86rf230_ops);
         if (!dev)
                 return -ENOMEM;
@@ -791,23 +865,28 @@ static int at86rf230_probe(struct spi_device *spi)
 
         lp->spi = spi;
 
-        dev->priv = lp;
         dev->parent = &spi->dev;
         dev->extra_tx_headroom = 0;
         /* We do support only 2.4 Ghz */
         dev->phy->channels_supported[0] = 0x7FFF800;
         dev->flags = IEEE802154_HW_OMIT_CKSUM;
 
+        if (pdata->irq_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
+                irq_worker = at86rf230_irqwork;
+                irq_handler = at86rf230_isr;
+        } else {
+                irq_worker = at86rf230_irqwork_level;
+                irq_handler = at86rf230_isr_level;
+        }
+
         mutex_init(&lp->bmux);
-        INIT_WORK(&lp->irqwork, at86rf230_irqwork);
+        INIT_WORK(&lp->irqwork, irq_worker);
         spin_lock_init(&lp->lock);
         init_completion(&lp->tx_complete);
 
         spi_set_drvdata(spi, lp);
 
-        rc = at86rf230_fill_data(spi);
-        if (rc)
-                goto err_fill;
+        at86rf230_fill_data(spi);
 
         rc = gpio_request(lp->rstn, "rstn");
         if (rc)
@@ -882,18 +961,23 @@ static int at86rf230_probe(struct spi_device *spi)
         if (rc)
                 goto err_gpio_dir;
 
-        rc = request_irq(spi->irq, at86rf230_isr, IRQF_SHARED,
+        rc = request_irq(spi->irq, irq_handler,
+                         IRQF_SHARED | pdata->irq_type,
                          dev_name(&spi->dev), lp);
         if (rc)
                 goto err_gpio_dir;
 
+        /* Read irq status register to reset irq line */
+        rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &status);
+        if (rc)
+                goto err_irq;
+
         rc = ieee802154_register_device(lp->dev);
         if (rc)
                 goto err_irq;
 
         return rc;
 
-        ieee802154_unregister_device(lp->dev);
 err_irq:
         free_irq(spi->irq, lp);
         flush_work(&lp->irqwork);
@@ -903,7 +987,6 @@ err_gpio_dir:
 err_slp_tr:
         gpio_free(lp->rstn);
 err_rstn:
-err_fill:
         spi_set_drvdata(spi, NULL);
         mutex_destroy(&lp->bmux);
         ieee802154_free_device(lp->dev);
diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
index 8f1c25676d44..bf0d55e2dd63 100644
--- a/drivers/net/ieee802154/fakehard.c
+++ b/drivers/net/ieee802154/fakehard.c
@@ -106,26 +106,6 @@ static u8 fake_get_dsn(const struct net_device *dev)
 }
 
 /**
- * fake_get_bsn - Retrieve the BSN of the device.
- * @dev: The network device to retrieve the BSN for.
- *
- * Returns the IEEE 802.15.4 BSN for the network device.
- * The BSN is the sequence number which will be added to each
- * beacon frame sent by the MAC.
- *
- * BSN means 'Beacon Sequence Number'.
- *
- * Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006
- *       document.
- */
-static u8 fake_get_bsn(const struct net_device *dev)
-{
-        BUG_ON(dev->type != ARPHRD_IEEE802154);
-
-        return 0x00; /* BSN are implemented in HW, so return just 0 */
-}
-
-/**
  * fake_assoc_req - Make an association request to the HW.
  * @dev: The network device which we are associating to a network.
  * @addr: The coordinator with which we wish to associate.
@@ -264,7 +244,6 @@ static struct ieee802154_mlme_ops fake_mlme = {
         .get_pan_id = fake_get_pan_id,
         .get_short_addr = fake_get_short_addr,
         .get_dsn = fake_get_dsn,
-        .get_bsn = fake_get_bsn,
 };
 
 static int ieee802154_fake_open(struct net_device *dev)
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 3f2c7aaf28c4..ede3ce4912f9 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -22,8 +22,10 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/pinctrl/consumer.h>
 #include <net/wpan-phy.h>
 #include <net/mac802154.h>
+#include <net/ieee802154.h>
 
 /* MRF24J40 Short Address Registers */
 #define REG_RXMCR    0x00  /* Receive MAC control */
@@ -91,9 +93,8 @@ struct mrf24j40 {
 #define MRF24J40_READLONG(reg) (1 << 15 | (reg) << 5)
 #define MRF24J40_WRITELONG(reg) (1 << 15 | (reg) << 5 | 1 << 4)
 
-/* Maximum speed to run the device at. TODO: Get the real max value from
- * someone at Microchip since it isn't in the datasheet. */
-#define MAX_SPI_SPEED_HZ 1000000
+/* The datasheet indicates the theoretical maximum for SCK to be 10MHz */
+#define MAX_SPI_SPEED_HZ 10000000
 
 #define printdev(X) (&X->spi->dev)
 
@@ -349,7 +350,9 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
         if (ret)
                 goto err;
         val |= 0x1;
-        val &= ~0x4;
+        /* Set TXNACKREQ if the ACK bit is set in the packet. */
+        if (skb->data[0] & IEEE802154_FC_ACK_REQ)
+                val |= 0x4;
         write_short_reg(devrec, REG_TXNCON, val);
 
         INIT_COMPLETION(devrec->tx_complete);
@@ -361,6 +364,7 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
         if (ret == -ERESTARTSYS)
                 goto err;
         if (ret == 0) {
+                dev_warn(printdev(devrec), "Timeout waiting for TX interrupt\n");
                 ret = -ETIMEDOUT;
                 goto err;
         }
@@ -370,7 +374,7 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
         if (ret)
                 goto err;
         if (val & 0x1) {
-                dev_err(printdev(devrec), "Error Sending. Retry count exceeded\n");
+                dev_dbg(printdev(devrec), "Error Sending. Retry count exceeded\n");
                 ret = -ECOMM; /* TODO: Better error code ? */
         } else
                 dev_dbg(printdev(devrec), "Packet Sent\n");
@@ -477,7 +481,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
                 int i;
                 for (i = 0; i < 8; i++)
                         write_short_reg(devrec, REG_EADR0+i,
-                                        filt->ieee_addr[i]);
+                                        filt->ieee_addr[7-i]);
 
 #ifdef DEBUG
                 printk(KERN_DEBUG "Set long addr to: ");
@@ -623,6 +627,7 @@ static int mrf24j40_probe(struct spi_device *spi)
         int ret = -ENOMEM;
         u8 val;
         struct mrf24j40 *devrec;
+        struct pinctrl *pinctrl;
 
         printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
 
@@ -633,6 +638,11 @@ static int mrf24j40_probe(struct spi_device *spi)
         if (!devrec->buf)
                 goto err_buf;
 
+        pinctrl = devm_pinctrl_get_select_default(&spi->dev);
+        if (IS_ERR(pinctrl))
+                dev_warn(&spi->dev,
+                        "pinctrl pins are not configured from the driver");
+
         spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
         if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
                 spi->max_speed_hz = MAX_SPI_SPEED_HZ;
@@ -641,7 +651,7 @@ static int mrf24j40_probe(struct spi_device *spi)
         init_completion(&devrec->tx_complete);
         INIT_WORK(&devrec->irqwork, mrf24j40_isrwork);
         devrec->spi = spi;
-        dev_set_drvdata(&spi->dev, devrec);
+        spi_set_drvdata(spi, devrec);
 
         /* Register with the 802154 subsystem */
 
@@ -713,7 +723,7 @@ err_devrec:
 
 static int mrf24j40_remove(struct spi_device *spi)
 {
-        struct mrf24j40 *devrec = dev_get_drvdata(&spi->dev);
+        struct mrf24j40 *devrec = spi_get_drvdata(spi);
 
         dev_dbg(printdev(devrec), "remove\n");
 
@@ -725,7 +735,7 @@ static int mrf24j40_remove(struct spi_device *spi)
          * complete? */
 
         /* Clean up the SPI stuff. */
-        dev_set_drvdata(&spi->dev, NULL);
+        spi_set_drvdata(spi, NULL);
         kfree(devrec->buf);
         kfree(devrec);
         return 0;
@@ -749,18 +759,7 @@ static struct spi_driver mrf24j40_driver = {
         .remove = mrf24j40_remove,
 };
 
-static int __init mrf24j40_init(void)
-{
-        return spi_register_driver(&mrf24j40_driver);
-}
-
-static void __exit mrf24j40_exit(void)
-{
-        spi_unregister_driver(&mrf24j40_driver);
-}
-
-module_init(mrf24j40_init);
-module_exit(mrf24j40_exit);
+module_spi_driver(mrf24j40_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alan Ott");
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 82164381f778..dc9f6a45515d 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -166,7 +166,8 @@ static const struct net_device_ops ifb_netdev_ops = {
 
 #define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG  | NETIF_F_FRAGLIST  | \
                       NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6      | \
-                      NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX)
+                      NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX         | \
+                      NETIF_F_HW_VLAN_STAG_TX)
 
 static void ifb_setup(struct net_device *dev)
 {
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 9cea451a6081..3adb43ce138f 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -352,21 +352,19 @@ static int ali_ircc_open(int i, chipio_t *info)
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out2;
         }
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
         
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out3;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index b5151e4ced61..7a1f684edcb5 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/types.h>
+#include <linux/ioport.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
@@ -882,12 +883,12 @@ static int au1k_irda_probe(struct platform_device *pdev)
                 goto out;
 
         err = -EBUSY;
-        aup->ioarea = request_mem_region(r->start, r->end - r->start + 1,
+        aup->ioarea = request_mem_region(r->start, resource_size(r),
                                          pdev->name);
         if (!aup->ioarea)
                 goto out;
 
-        aup->iobase = ioremap_nocache(r->start, r->end - r->start + 1);
+        aup->iobase = ioremap_nocache(r->start, resource_size(r));
         if (!aup->iobase)
                 goto out2;
 
@@ -952,18 +953,7 @@ static struct platform_driver au1k_irda_driver = {
         .remove         = au1k_irda_remove,
 };
 
-static int __init au1k_irda_load(void)
-{
-        return platform_driver_register(&au1k_irda_driver);
-}
-
-static void __exit au1k_irda_unload(void)
-{
-        return platform_driver_unregister(&au1k_irda_driver);
-}
+module_platform_driver(au1k_irda_driver);
 
 MODULE_AUTHOR("Pete Popov <ppopov@mvista.com>");
 MODULE_DESCRIPTION("Au1000 IrDA Device Driver");
-
-module_init(au1k_irda_load);
-module_exit(au1k_irda_unload);
diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index fed4a05d55c7..a06fca61c9a0 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
@@ -389,7 +389,8 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev)
         set_dma_callback(port->rx_dma_channel, bfin_sir_dma_rx_int, dev);
         set_dma_callback(port->tx_dma_channel, bfin_sir_dma_tx_int, dev);
 
-        port->rx_dma_buf.buf = (unsigned char *)dma_alloc_coherent(NULL, PAGE_SIZE, &dma_handle, GFP_DMA);
+        port->rx_dma_buf.buf = dma_alloc_coherent(NULL, PAGE_SIZE,
+                                                  &dma_handle, GFP_DMA);
         port->rx_dma_buf.head = 0;
         port->rx_dma_buf.tail = 0;
         port->rx_dma_nrows = 0;
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 2a4f2f153244..9cf836b57c49 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -431,22 +431,20 @@ static int __init nsc_ircc_open(chipio_t *info)
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto out2;
 
         }
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
         
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto out3;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 858de05bdb7d..964b116a0ab7 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -700,12 +700,12 @@ static int pxa_irda_start(struct net_device *dev)
 
         err = -ENOMEM;
         si->dma_rx_buff = dma_alloc_coherent(si->dev, IRDA_FRAME_SIZE_LIMIT,
-                                             &si->dma_rx_buff_phy, GFP_KERNEL );
+                                             &si->dma_rx_buff_phy, GFP_KERNEL);
         if (!si->dma_rx_buff)
                 goto err_dma_rx_buff;
 
         si->dma_tx_buff = dma_alloc_coherent(si->dev, IRDA_FRAME_SIZE_LIMIT,
-                                             &si->dma_tx_buff_phy, GFP_KERNEL );
+                                             &si->dma_tx_buff_phy, GFP_KERNEL);
         if (!si->dma_tx_buff)
                 goto err_dma_tx_buff;
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 5290952b60c2..aa05dad75335 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -563,24 +563,15 @@ static int smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma,
 
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
-        if (self->rx_buff.head == NULL) {
-                IRDA_ERROR("%s, Can't allocate memory for receive buffer!\n",
-                           driver_name);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
+        if (self->rx_buff.head == NULL)
                 goto err_out2;
-        }
 
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
-        if (self->tx_buff.head == NULL) {
-                IRDA_ERROR("%s, Can't allocate memory for transmit buffer!\n",
-                           driver_name);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
+        if (self->tx_buff.head == NULL)
                 goto err_out3;
-        }
-
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index f9033c6a888c..51f2bc376101 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -364,21 +364,19 @@ static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id)
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(&pdev->dev, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out2;
         }
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
 
         self->tx_buff.head =
                 dma_alloc_coherent(&pdev->dev, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out3;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index f5bb92f15880..bb8857a158a6 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -216,22 +216,19 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out1;
         }
 
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
-        
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out2;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 73abbc1655d5..d5a141c7c4e7 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -46,9 +46,16 @@ struct macvlan_port {
 
 static void macvlan_port_destroy(struct net_device *dev);
 
-#define macvlan_port_get_rcu(dev) \
-        ((struct macvlan_port *) rcu_dereference(dev->rx_handler_data))
-#define macvlan_port_get(dev) ((struct macvlan_port *) dev->rx_handler_data)
+static struct macvlan_port *macvlan_port_get_rcu(const struct net_device *dev)
+{
+        return rcu_dereference(dev->rx_handler_data);
+}
+
+static struct macvlan_port *macvlan_port_get_rtnl(const struct net_device *dev)
+{
+        return rtnl_dereference(dev->rx_handler_data);
+}
+
 #define macvlan_port_exists(dev) (dev->priv_flags & IFF_MACVLAN_PORT)
 
 static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
@@ -464,7 +471,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;
         (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \
          NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \
          NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \
-         NETIF_F_HW_VLAN_FILTER)
+         NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER)
 
 #define MACVLAN_STATE_MASK \
         ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -560,21 +567,21 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
 }
 
 static int macvlan_vlan_rx_add_vid(struct net_device *dev,
-                                    unsigned short vid)
+                                   __be16 proto, u16 vid)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
         struct net_device *lowerdev = vlan->lowerdev;
 
-        return vlan_vid_add(lowerdev, vid);
+        return vlan_vid_add(lowerdev, proto, vid);
 }
 
 static int macvlan_vlan_rx_kill_vid(struct net_device *dev,
-                                     unsigned short vid)
+                                    __be16 proto, u16 vid)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
         struct net_device *lowerdev = vlan->lowerdev;
 
-        vlan_vid_del(lowerdev, vid);
+        vlan_vid_del(lowerdev, proto, vid);
         return 0;
 }
 
@@ -703,7 +710,7 @@ static int macvlan_port_create(struct net_device *dev)
 
 static void macvlan_port_destroy(struct net_device *dev)
 {
-        struct macvlan_port *port = macvlan_port_get(dev);
+        struct macvlan_port *port = macvlan_port_get_rtnl(dev);
 
         dev->priv_flags &= ~IFF_MACVLAN_PORT;
         netdev_rx_handler_unregister(dev);
@@ -772,7 +779,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
                 if (err < 0)
                         return err;
         }
-        port = macvlan_port_get(lowerdev);
+        port = macvlan_port_get_rtnl(lowerdev);
 
         /* Only 1 macvlan device can be created in passthru mode */
         if (port->passthru)
@@ -921,7 +928,7 @@ static int macvlan_device_event(struct notifier_block *unused,
         if (!macvlan_port_exists(dev))
                 return NOTIFY_DONE;
 
-        port = macvlan_port_get(dev);
+        port = macvlan_port_get_rtnl(dev);
 
         switch (event) {
         case NETDEV_CHANGE:
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index a449439bd653..59e9605de316 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -725,6 +725,8 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
                         goto err_kfree;
         }
 
+        skb_probe_transport_header(skb, ETH_HLEN);
+
         rcu_read_lock_bh();
         vlan = rcu_dereference_bh(q->vlan);
         /* copy skb_ubuf_info for callback when skb has no error */
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index ec40ba882f61..ff2e45e9cb54 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -159,7 +159,7 @@ static int lxt973a2_update_link(struct phy_device *phydev)
         return 0;
 }
 
-int lxt973a2_read_status(struct phy_device *phydev)
+static int lxt973a2_read_status(struct phy_device *phydev)
 {
         int adv;
         int err;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 22dec9c7ef05..202fe1ff1987 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -7,6 +7,8 @@
  *
  * Copyright (c) 2004 Freescale Semiconductor, Inc.
  *
+ * Copyright (c) 2013 Michael Stapelberg <michael@stapelberg.de>
+ *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
  * Free Software Foundation;  either version 2 of the  License, or (at your
@@ -80,6 +82,28 @@
 #define MII_88E1318S_PHY_MSCR1_REG      16
 #define MII_88E1318S_PHY_MSCR1_PAD_ODD  BIT(6)
 
+/* Copper Specific Interrupt Enable Register */
+#define MII_88E1318S_PHY_CSIER                              0x12
+/* WOL Event Interrupt Enable */
+#define MII_88E1318S_PHY_CSIER_WOL_EIE                      BIT(7)
+
+/* LED Timer Control Register */
+#define MII_88E1318S_PHY_LED_PAGE                           0x03
+#define MII_88E1318S_PHY_LED_TCR                            0x12
+#define MII_88E1318S_PHY_LED_TCR_FORCE_INT                  BIT(15)
+#define MII_88E1318S_PHY_LED_TCR_INTn_ENABLE                BIT(7)
+#define MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW             BIT(11)
+
+/* Magic Packet MAC address registers */
+#define MII_88E1318S_PHY_MAGIC_PACKET_WORD2                 0x17
+#define MII_88E1318S_PHY_MAGIC_PACKET_WORD1                 0x18
+#define MII_88E1318S_PHY_MAGIC_PACKET_WORD0                 0x19
+
+#define MII_88E1318S_PHY_WOL_PAGE                           0x11
+#define MII_88E1318S_PHY_WOL_CTRL                           0x10
+#define MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS          BIT(12)
+#define MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE BIT(14)
+
 #define MII_88E1121_PHY_LED_CTRL        16
 #define MII_88E1121_PHY_LED_PAGE        3
 #define MII_88E1121_PHY_LED_DEF         0x0030
@@ -696,6 +720,107 @@ static int m88e1121_did_interrupt(struct phy_device *phydev)
         return 0;
 }
 
+static void m88e1318_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
+{
+        wol->supported = WAKE_MAGIC;
+        wol->wolopts = 0;
+
+        if (phy_write(phydev, MII_MARVELL_PHY_PAGE,
+                      MII_88E1318S_PHY_WOL_PAGE) < 0)
+                return;
+
+        if (phy_read(phydev, MII_88E1318S_PHY_WOL_CTRL) &
+            MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE)
+                wol->wolopts |= WAKE_MAGIC;
+
+        if (phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x00) < 0)
+                return;
+}
+
+static int m88e1318_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
+{
+        int err, oldpage, temp;
+
+        oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);
+
+        if (wol->wolopts & WAKE_MAGIC) {
+                /* Explicitly switch to page 0x00, just to be sure */
+                err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x00);
+                if (err < 0)
+                        return err;
+
+                /* Enable the WOL interrupt */
+                temp = phy_read(phydev, MII_88E1318S_PHY_CSIER);
+                temp |= MII_88E1318S_PHY_CSIER_WOL_EIE;
+                err = phy_write(phydev, MII_88E1318S_PHY_CSIER, temp);
+                if (err < 0)
+                        return err;
+
+                err = phy_write(phydev, MII_MARVELL_PHY_PAGE,
+                                MII_88E1318S_PHY_LED_PAGE);
+                if (err < 0)
+                        return err;
+
+                /* Setup LED[2] as interrupt pin (active low) */
+                temp = phy_read(phydev, MII_88E1318S_PHY_LED_TCR);
+                temp &= ~MII_88E1318S_PHY_LED_TCR_FORCE_INT;
+                temp |= MII_88E1318S_PHY_LED_TCR_INTn_ENABLE;
+                temp |= MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW;
+                err = phy_write(phydev, MII_88E1318S_PHY_LED_TCR, temp);
+                if (err < 0)
+                        return err;
+
+                err = phy_write(phydev, MII_MARVELL_PHY_PAGE,
+                                MII_88E1318S_PHY_WOL_PAGE);
+                if (err < 0)
+                        return err;
+
+                /* Store the device address for the magic packet */
+                err = phy_write(phydev, MII_88E1318S_PHY_MAGIC_PACKET_WORD2,
+                                ((phydev->attached_dev->dev_addr[5] << 8) |
+                                 phydev->attached_dev->dev_addr[4]));
+                if (err < 0)
+                        return err;
+                err = phy_write(phydev, MII_88E1318S_PHY_MAGIC_PACKET_WORD1,
+                                ((phydev->attached_dev->dev_addr[3] << 8) |
+                                 phydev->attached_dev->dev_addr[2]));
+                if (err < 0)
+                        return err;
+                err = phy_write(phydev, MII_88E1318S_PHY_MAGIC_PACKET_WORD0,
+                                ((phydev->attached_dev->dev_addr[1] << 8) |
+                                 phydev->attached_dev->dev_addr[0]));
+                if (err < 0)
+                        return err;
+
+                /* Clear WOL status and enable magic packet matching */
+                temp = phy_read(phydev, MII_88E1318S_PHY_WOL_CTRL);
+                temp |= MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS;
+                temp |= MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE;
+                err = phy_write(phydev, MII_88E1318S_PHY_WOL_CTRL, temp);
+                if (err < 0)
+                        return err;
+        } else {
+                err = phy_write(phydev, MII_MARVELL_PHY_PAGE,
+                                MII_88E1318S_PHY_WOL_PAGE);
+                if (err < 0)
+                        return err;
+
+                /* Clear WOL status and disable magic packet matching */
+                temp = phy_read(phydev, MII_88E1318S_PHY_WOL_CTRL);
+                temp |= MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS;
+                temp &= ~MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE;
+                err = phy_write(phydev, MII_88E1318S_PHY_WOL_CTRL, temp);
+                if (err < 0)
+                        return err;
+        }
+
+        err = phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
 static struct phy_driver marvell_drivers[] = {
         {
                 .phy_id = MARVELL_PHY_ID_88E1101,
@@ -772,6 +897,8 @@ static struct phy_driver marvell_drivers[] = {
                 .ack_interrupt = &marvell_ack_interrupt,
                 .config_intr = &marvell_config_intr,
                 .did_interrupt = &m88e1121_did_interrupt,
+                .get_wol = &m88e1318_get_wol,
+                .set_wol = &m88e1318_set_wol,
                 .driver = { .owner = THIS_MODULE },
         },
         {
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 27274986ab56..a47f9236d966 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -235,17 +235,7 @@ static struct platform_driver mdio_gpio_driver = {
         },
 };
 
-static int __init mdio_gpio_init(void)
-{
-        return platform_driver_register(&mdio_gpio_driver);
-}
-module_init(mdio_gpio_init);
-
-static void __exit mdio_gpio_exit(void)
-{
-        platform_driver_unregister(&mdio_gpio_driver);
-}
-module_exit(mdio_gpio_exit);
+module_platform_driver(mdio_gpio_driver);
 
 MODULE_ALIAS("platform:mdio-gpio");
 MODULE_AUTHOR("Laurent Pinchart, Paulius Zaleckas");
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index 09297fe05ae5..b51fa1f469b0 100644
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2009,2011 Cavium, Inc.
+ * Copyright (C) 2009-2012 Cavium, Inc.
  */
 
 #include <linux/platform_device.h>
@@ -27,30 +27,98 @@
 #define SMI_CLK         0x18
 #define SMI_EN          0x20
 
+enum octeon_mdiobus_mode {
+        UNINIT = 0,
+        C22,
+        C45
+};
+
 struct octeon_mdiobus {
         struct mii_bus *mii_bus;
         u64 register_base;
         resource_size_t mdio_phys;
         resource_size_t regsize;
+        enum octeon_mdiobus_mode mode;
         int phy_irq[PHY_MAX_ADDR];
 };
 
+static void octeon_mdiobus_set_mode(struct octeon_mdiobus *p,
+                                    enum octeon_mdiobus_mode m)
+{
+        union cvmx_smix_clk smi_clk;
+
+        if (m == p->mode)
+                return;
+
+        smi_clk.u64 = cvmx_read_csr(p->register_base + SMI_CLK);
+        smi_clk.s.mode = (m == C45) ? 1 : 0;
+        smi_clk.s.preamble = 1;
+        cvmx_write_csr(p->register_base + SMI_CLK, smi_clk.u64);
+        p->mode = m;
+}
+
+static int octeon_mdiobus_c45_addr(struct octeon_mdiobus *p,
+                                   int phy_id, int regnum)
+{
+        union cvmx_smix_cmd smi_cmd;
+        union cvmx_smix_wr_dat smi_wr;
+        int timeout = 1000;
+
+        octeon_mdiobus_set_mode(p, C45);
+
+        smi_wr.u64 = 0;
+        smi_wr.s.dat = regnum & 0xffff;
+        cvmx_write_csr(p->register_base + SMI_WR_DAT, smi_wr.u64);
+
+        regnum = (regnum >> 16) & 0x1f;
+
+        smi_cmd.u64 = 0;
+        smi_cmd.s.phy_op = 0; /* MDIO_CLAUSE_45_ADDRESS */
+        smi_cmd.s.phy_adr = phy_id;
+        smi_cmd.s.reg_adr = regnum;
+        cvmx_write_csr(p->register_base + SMI_CMD, smi_cmd.u64);
+
+        do {
+                /* Wait 1000 clocks so we don't saturate the RSL bus
+                 * doing reads.
+                 */
+                __delay(1000);
+                smi_wr.u64 = cvmx_read_csr(p->register_base + SMI_WR_DAT);
+        } while (smi_wr.s.pending && --timeout);
+
+        if (timeout <= 0)
+                return -EIO;
+        return 0;
+}
+
 static int octeon_mdiobus_read(struct mii_bus *bus, int phy_id, int regnum)
 {
         struct octeon_mdiobus *p = bus->priv;
         union cvmx_smix_cmd smi_cmd;
         union cvmx_smix_rd_dat smi_rd;
+        unsigned int op = 1; /* MDIO_CLAUSE_22_READ */
         int timeout = 1000;
 
+        if (regnum & MII_ADDR_C45) {
+                int r = octeon_mdiobus_c45_addr(p, phy_id, regnum);
+                if (r < 0)
+                        return r;
+
+                regnum = (regnum >> 16) & 0x1f;
+                op = 3; /* MDIO_CLAUSE_45_READ */
+        } else {
+                octeon_mdiobus_set_mode(p, C22);
+        }
+
+
         smi_cmd.u64 = 0;
-        smi_cmd.s.phy_op = 1; /* MDIO_CLAUSE_22_READ */
+        smi_cmd.s.phy_op = op;
         smi_cmd.s.phy_adr = phy_id;
         smi_cmd.s.reg_adr = regnum;
         cvmx_write_csr(p->register_base + SMI_CMD, smi_cmd.u64);
 
         do {
-                /*
-                 * Wait 1000 clocks so we don't saturate the RSL bus
+                /* Wait 1000 clocks so we don't saturate the RSL bus
                  * doing reads.
                  */
                 __delay(1000);
@@ -69,21 +137,33 @@ static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id,
         struct octeon_mdiobus *p = bus->priv;
         union cvmx_smix_cmd smi_cmd;
         union cvmx_smix_wr_dat smi_wr;
+        unsigned int op = 0; /* MDIO_CLAUSE_22_WRITE */
         int timeout = 1000;
 
+
+        if (regnum & MII_ADDR_C45) {
+                int r = octeon_mdiobus_c45_addr(p, phy_id, regnum);
+                if (r < 0)
+                        return r;
+
+                regnum = (regnum >> 16) & 0x1f;
+                op = 1; /* MDIO_CLAUSE_45_WRITE */
+        } else {
+                octeon_mdiobus_set_mode(p, C22);
+        }
+
         smi_wr.u64 = 0;
         smi_wr.s.dat = val;
         cvmx_write_csr(p->register_base + SMI_WR_DAT, smi_wr.u64);
 
         smi_cmd.u64 = 0;
-        smi_cmd.s.phy_op = 0; /* MDIO_CLAUSE_22_WRITE */
+        smi_cmd.s.phy_op = op;
         smi_cmd.s.phy_adr = phy_id;
         smi_cmd.s.reg_adr = regnum;
         cvmx_write_csr(p->register_base + SMI_CMD, smi_cmd.u64);
 
         do {
-                /*
-                 * Wait 1000 clocks so we don't saturate the RSL bus
+                /* Wait 1000 clocks so we don't saturate the RSL bus
                  * doing reads.
                  */
                 __delay(1000);
@@ -197,18 +277,7 @@ void octeon_mdiobus_force_mod_depencency(void)
 }
 EXPORT_SYMBOL(octeon_mdiobus_force_mod_depencency);
 
-static int __init octeon_mdiobus_mod_init(void)
-{
-        return platform_driver_register(&octeon_mdiobus_driver);
-}
-
-static void __exit octeon_mdiobus_mod_exit(void)
-{
-        platform_driver_unregister(&octeon_mdiobus_driver);
-}
-
-module_init(octeon_mdiobus_mod_init);
-module_exit(octeon_mdiobus_mod_exit);
+module_platform_driver(octeon_mdiobus_driver);
 
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index abf7b6153d00..2510435f34ed 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -53,6 +53,18 @@
 #define KS8737_CTRL_INT_ACTIVE_HIGH             (1 << 14)
 #define KSZ8051_RMII_50MHZ_CLK                  (1 << 7)
 
+static int ksz_config_flags(struct phy_device *phydev)
+{
+        int regval;
+
+        if (phydev->dev_flags & MICREL_PHY_50MHZ_CLK) {
+                regval = phy_read(phydev, MII_KSZPHY_CTRL);
+                regval |= KSZ8051_RMII_50MHZ_CLK;
+                return phy_write(phydev, MII_KSZPHY_CTRL, regval);
+        }
+        return 0;
+}
+
 static int kszphy_ack_interrupt(struct phy_device *phydev)
 {
         /* bit[7..0] int status, which is a read and clear register. */
@@ -114,22 +126,19 @@ static int kszphy_config_init(struct phy_device *phydev)
 
 static int ksz8021_config_init(struct phy_device *phydev)
 {
+        int rc;
         const u16 val = KSZPHY_OMSO_B_CAST_OFF | KSZPHY_OMSO_RMII_OVERRIDE;
         phy_write(phydev, MII_KSZPHY_OMSO, val);
-        return 0;
+        rc = ksz_config_flags(phydev);
+        return rc < 0 ? rc : 0;
 }
 
 static int ks8051_config_init(struct phy_device *phydev)
 {
-        int regval;
-
-        if (phydev->dev_flags & MICREL_PHY_50MHZ_CLK) {
-                regval = phy_read(phydev, MII_KSZPHY_CTRL);
-                regval |= KSZ8051_RMII_50MHZ_CLK;
-                phy_write(phydev, MII_KSZPHY_CTRL, regval);
-        }
+        int rc;
 
-        return 0;
+        rc = ksz_config_flags(phydev);
+        return rc < 0 ? rc : 0;
 }
 
 #define KSZ8873MLL_GLOBAL_CONTROL_4     0x06
@@ -192,6 +201,19 @@ static struct phy_driver ksphy_driver[] = {
         .config_intr    = kszphy_config_intr,
         .driver         = { .owner = THIS_MODULE,},
 }, {
+        .phy_id         = PHY_ID_KSZ8031,
+        .phy_id_mask    = 0x00ffffff,
+        .name           = "Micrel KSZ8031",
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause |
+                           SUPPORTED_Asym_Pause),
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = ksz8021_config_init,
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = kszphy_ack_interrupt,
+        .config_intr    = kszphy_config_intr,
+        .driver         = { .owner = THIS_MODULE,},
+}, {
         .phy_id         = PHY_ID_KSZ8041,
         .phy_id_mask    = 0x00fffff0,
         .name           = "Micrel KSZ8041",
@@ -325,6 +347,7 @@ static struct mdio_device_id __maybe_unused micrel_tbl[] = {
         { PHY_ID_KSZ8001, 0x00ffffff },
         { PHY_ID_KS8737, 0x00fffff0 },
         { PHY_ID_KSZ8021, 0x00ffffff },
+        { PHY_ID_KSZ8031, 0x00ffffff },
         { PHY_ID_KSZ8041, 0x00fffff0 },
         { PHY_ID_KSZ8051, 0x00fffff0 },
         { PHY_ID_KSZ8061, 0x00fffff0 },
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ef9ea9248223..c14f14741b3f 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -463,33 +463,6 @@ void phy_stop_machine(struct phy_device *phydev)
 }
 
 /**
- * phy_force_reduction - reduce PHY speed/duplex settings by one step
- * @phydev: target phy_device struct
- *
- * Description: Reduces the speed/duplex settings by one notch,
- *   in this order--
- *   1000/FULL, 1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF.
- *   The function bottoms out at 10/HALF.
- */
-static void phy_force_reduction(struct phy_device *phydev)
-{
-        int idx;
-
-        idx = phy_find_setting(phydev->speed, phydev->duplex);
-        
-        idx++;
-
-        idx = phy_find_valid(idx, phydev->supported);
-
-        phydev->speed = settings[idx].speed;
-        phydev->duplex = settings[idx].duplex;
-
-        pr_info("Trying %d/%s\n",
-                phydev->speed, DUPLEX_FULL == phydev->duplex ? "FULL" : "HALF");
-}
-
-
-/**
  * phy_error - enter HALTED state for this PHY device
  * @phydev: target phy_device struct
  *
@@ -818,30 +791,11 @@ void phy_state_machine(struct work_struct *work)
                                 phydev->adjust_link(phydev->attached_dev);
 
                         } else if (0 == phydev->link_timeout--) {
-                                int idx;
-
                                 needs_aneg = 1;
                                 /* If we have the magic_aneg bit,
                                  * we try again */
                                 if (phydev->drv->flags & PHY_HAS_MAGICANEG)
                                         break;
-
-                                /* The timer expired, and we still
-                                 * don't have a setting, so we try
-                                 * forcing it until we find one that
-                                 * works, starting from the fastest speed,
-                                 * and working our way down */
-                                idx = phy_find_valid(0, phydev->supported);
-
-                                phydev->speed = settings[idx].speed;
-                                phydev->duplex = settings[idx].duplex;
-
-                                phydev->autoneg = AUTONEG_DISABLE;
-
-                                pr_info("Trying %d/%s\n",
-                                        phydev->speed,
-                                        DUPLEX_FULL == phydev->duplex ?
-                                        "FULL" : "HALF");
                         }
                         break;
                 case PHY_NOLINK:
@@ -866,10 +820,8 @@ void phy_state_machine(struct work_struct *work)
                                 phydev->state = PHY_RUNNING;
                                 netif_carrier_on(phydev->attached_dev);
                         } else {
-                                if (0 == phydev->link_timeout--) {
-                                        phy_force_reduction(phydev);
+                                if (0 == phydev->link_timeout--)
                                         needs_aneg = 1;
-                                }
                         }
 
                         phydev->adjust_link(phydev->attached_dev);
@@ -1188,3 +1140,19 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)
         return 0;
 }
 EXPORT_SYMBOL(phy_ethtool_set_eee);
+
+int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
+{
+        if (phydev->drv->set_wol)
+                return phydev->drv->set_wol(phydev, wol);
+
+        return -EOPNOTSUPP;
+}
+EXPORT_SYMBOL(phy_ethtool_set_wol);
+
+void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
+{
+        if (phydev->drv->get_wol)
+                phydev->drv->get_wol(phydev, wol);
+}
+EXPORT_SYMBOL(phy_ethtool_get_wol);
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 5c87eef40bf9..d11c93e69e03 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -281,7 +281,7 @@ static int ks8995_probe(struct spi_device *spi)
         mutex_init(&ks->lock);
         ks->pdata = pdata;
         ks->spi = spi_dev_get(spi);
-        dev_set_drvdata(&spi->dev, ks);
+        spi_set_drvdata(spi, ks);
 
         spi->mode = SPI_MODE_0;
         spi->bits_per_word = 8;
@@ -325,7 +325,7 @@ static int ks8995_probe(struct spi_device *spi)
         return 0;
 
 err_drvdata:
-        dev_set_drvdata(&spi->dev, NULL);
+        spi_set_drvdata(spi, NULL);
         kfree(ks);
         return err;
 }
@@ -334,10 +334,10 @@ static int ks8995_remove(struct spi_device *spi)
 {
         struct ks8995_data      *ks8995;
 
-        ks8995 = dev_get_drvdata(&spi->dev);
+        ks8995 = spi_get_drvdata(spi);
         sysfs_remove_bin_file(&spi->dev.kobj, &ks8995_registers_attr);
 
-        dev_set_drvdata(&spi->dev, NULL);
+        spi_set_drvdata(spi, NULL);
         kfree(ks8995);
 
         return 0;
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 2585c383e623..3492b5391273 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -61,7 +61,7 @@ MODULE_DESCRIPTION("Vitesse PHY driver");
 MODULE_AUTHOR("Kriston Carson");
 MODULE_LICENSE("GPL");
 
-int vsc824x_add_skew(struct phy_device *phydev)
+static int vsc824x_add_skew(struct phy_device *phydev)
 {
         int err;
         int extcon;
@@ -81,7 +81,6 @@ int vsc824x_add_skew(struct phy_device *phydev)
 
         return err;
 }
-EXPORT_SYMBOL(vsc824x_add_skew);
 
 static int vsc824x_config_init(struct phy_device *phydev)
 {
diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
index bed62d9c53c8..1f7bef90b467 100644
--- a/drivers/net/plip/plip.c
+++ b/drivers/net/plip/plip.c
@@ -560,7 +560,7 @@ static __be16 plip_type_trans(struct sk_buff *skb, struct net_device *dev)
          *      so don't forget to remove it.
          */
 
-        if (ntohs(eth->h_proto) >= 1536)
+        if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
                 return eth->h_proto;
 
         rawp = skb->data;
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index bdf3b13a71a8..925d3e295bac 100644
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -105,64 +105,15 @@ static const struct ppp_channel_ops sync_ops = {
 };
 
 /*
- * Utility procedures to print a buffer in hex/ascii
+ * Utility procedure to print a buffer in hex/ascii
  */
 static void
-ppp_print_hex (register __u8 * out, const __u8 * in, int count)
-{
-        register __u8 next_ch;
-        static const char hex[] = "0123456789ABCDEF";
-
-        while (count-- > 0) {
-                next_ch = *in++;
-                *out++ = hex[(next_ch >> 4) & 0x0F];
-                *out++ = hex[next_ch & 0x0F];
-                ++out;
-        }
-}
-
-static void
-ppp_print_char (register __u8 * out, const __u8 * in, int count)
-{
-        register __u8 next_ch;
-
-        while (count-- > 0) {
-                next_ch = *in++;
-
-                if (next_ch < 0x20 || next_ch > 0x7e)
-                        *out++ = '.';
-                else {
-                        *out++ = next_ch;
-                        if (next_ch == '%')   /* printk/syslogd has a bug !! */
-                                *out++ = '%';
-                }
-        }
-        *out = '\0';
-}
-
-static void
 ppp_print_buffer (const char *name, const __u8 *buf, int count)
 {
-        __u8 line[44];
-
         if (name != NULL)
                 printk(KERN_DEBUG "ppp_synctty: %s, count = %d\n", name, count);
 
-        while (count > 8) {
-                memset (line, 32, 44);
-                ppp_print_hex (line, buf, 8);
-                ppp_print_char (&line[8 * 3], buf, 8);
-                printk(KERN_DEBUG "%s\n", line);
-                count -= 8;
-                buf += 8;
-        }
-
-        if (count > 0) {
-                memset (line, 32, 44);
-                ppp_print_hex (line, buf, count);
-                ppp_print_char (&line[8 * 3], buf, count);
-                printk(KERN_DEBUG "%s\n", line);
-        }
+        print_hex_dump_bytes("", DUMP_PREFIX_NONE, buf, count);
 }
 
 
diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig
index c3011af68e91..c853d84fd99f 100644
--- a/drivers/net/team/Kconfig
+++ b/drivers/net/team/Kconfig
@@ -37,6 +37,18 @@ config NET_TEAM_MODE_ROUNDROBIN
           To compile this team mode as a module, choose M here: the module
           will be called team_mode_roundrobin.
 
+config NET_TEAM_MODE_RANDOM
+        tristate "Random mode support"
+        depends on NET_TEAM
+        ---help---
+          Basic mode where port used for transmitting packets is selected
+          randomly.
+
+          All added ports are setup to have team's device address.
+
+          To compile this team mode as a module, choose M here: the module
+          will be called team_mode_random.
+
 config NET_TEAM_MODE_ACTIVEBACKUP
         tristate "Active-backup mode support"
         depends on NET_TEAM
diff --git a/drivers/net/team/Makefile b/drivers/net/team/Makefile
index 975763014e5a..c57e85889751 100644
--- a/drivers/net/team/Makefile
+++ b/drivers/net/team/Makefile
@@ -5,5 +5,6 @@
 obj-$(CONFIG_NET_TEAM) += team.o
 obj-$(CONFIG_NET_TEAM_MODE_BROADCAST) += team_mode_broadcast.o
 obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o
+obj-$(CONFIG_NET_TEAM_MODE_RANDOM) += team_mode_random.o
 obj-$(CONFIG_NET_TEAM_MODE_ACTIVEBACKUP) += team_mode_activebackup.o
 obj-$(CONFIG_NET_TEAM_MODE_LOADBALANCE) += team_mode_loadbalance.o
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index bf3419297875..7c43261975bd 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -73,11 +73,24 @@ static int team_port_set_orig_dev_addr(struct team_port *port)
         return __set_port_dev_addr(port->dev, port->orig.dev_addr);
 }
 
-int team_port_set_team_dev_addr(struct team_port *port)
+static int team_port_set_team_dev_addr(struct team *team,
+                                       struct team_port *port)
+{
+        return __set_port_dev_addr(port->dev, team->dev->dev_addr);
+}
+
+int team_modeop_port_enter(struct team *team, struct team_port *port)
+{
+        return team_port_set_team_dev_addr(team, port);
+}
+EXPORT_SYMBOL(team_modeop_port_enter);
+
+void team_modeop_port_change_dev_addr(struct team *team,
+                                      struct team_port *port)
 {
-        return __set_port_dev_addr(port->dev, port->team->dev->dev_addr);
+        team_port_set_team_dev_addr(team, port);
 }
-EXPORT_SYMBOL(team_port_set_team_dev_addr);
+EXPORT_SYMBOL(team_modeop_port_change_dev_addr);
 
 static void team_refresh_port_linkup(struct team_port *port)
 {
@@ -490,9 +503,9 @@ static bool team_dummy_transmit(struct team *team, struct sk_buff *skb)
         return false;
 }
 
-rx_handler_result_t team_dummy_receive(struct team *team,
-                                       struct team_port *port,
-                                       struct sk_buff *skb)
+static rx_handler_result_t team_dummy_receive(struct team *team,
+                                              struct team_port *port,
+                                              struct sk_buff *skb)
 {
         return RX_HANDLER_ANOTHER;
 }
@@ -1491,8 +1504,8 @@ static void team_set_rx_mode(struct net_device *dev)
 
         rcu_read_lock();
         list_for_each_entry_rcu(port, &team->port_list, list) {
-                dev_uc_sync(port->dev, dev);
-                dev_mc_sync(port->dev, dev);
+                dev_uc_sync_multiple(port->dev, dev);
+                dev_mc_sync_multiple(port->dev, dev);
         }
         rcu_read_unlock();
 }
@@ -1585,7 +1598,7 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
         return stats;
 }
 
-static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)
+static int team_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct team *team = netdev_priv(dev);
         struct team_port *port;
@@ -1597,7 +1610,7 @@ static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)
          */
         mutex_lock(&team->lock);
         list_for_each_entry(port, &team->port_list, list) {
-                err = vlan_vid_add(port->dev, vid);
+                err = vlan_vid_add(port->dev, proto, vid);
                 if (err)
                         goto unwind;
         }
@@ -1607,20 +1620,20 @@ static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)
 
 unwind:
         list_for_each_entry_continue_reverse(port, &team->port_list, list)
-                vlan_vid_del(port->dev, vid);
+                vlan_vid_del(port->dev, proto, vid);
         mutex_unlock(&team->lock);
 
         return err;
 }
 
-static int team_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
+static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
         struct team *team = netdev_priv(dev);
         struct team_port *port;
 
         rcu_read_lock();
         list_for_each_entry_rcu(port, &team->port_list, list)
-                vlan_vid_del(port->dev, vid);
+                vlan_vid_del(port->dev, proto, vid);
         rcu_read_unlock();
 
         return 0;
@@ -1828,9 +1841,9 @@ static void team_setup(struct net_device *dev)
         dev->features |= NETIF_F_LLTX;
         dev->features |= NETIF_F_GRO;
         dev->hw_features = TEAM_VLAN_FEATURES |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
 
         dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM);
         dev->features |= dev->hw_features;
diff --git a/drivers/net/team/team_mode_broadcast.c b/drivers/net/team/team_mode_broadcast.c
index c5db428e73fa..c366cd299c06 100644
--- a/drivers/net/team/team_mode_broadcast.c
+++ b/drivers/net/team/team_mode_broadcast.c
@@ -46,20 +46,10 @@ static bool bc_transmit(struct team *team, struct sk_buff *skb)
         return sum_ret;
 }
 
-static int bc_port_enter(struct team *team, struct team_port *port)
-{
-        return team_port_set_team_dev_addr(port);
-}
-
-static void bc_port_change_dev_addr(struct team *team, struct team_port *port)
-{
-        team_port_set_team_dev_addr(port);
-}
-
 static const struct team_mode_ops bc_mode_ops = {
         .transmit               = bc_transmit,
-        .port_enter             = bc_port_enter,
-        .port_change_dev_addr   = bc_port_change_dev_addr,
+        .port_enter             = team_modeop_port_enter,
+        .port_change_dev_addr   = team_modeop_port_change_dev_addr,
 };
 
 static const struct team_mode bc_mode = {
diff --git a/drivers/net/team/team_mode_random.c b/drivers/net/team/team_mode_random.c
new file mode 100644
index 000000000000..9eabfaa22f3e
--- /dev/null
+++ b/drivers/net/team/team_mode_random.c
@@ -0,0 +1,71 @@
+/*
+ * drivers/net/team/team_mode_random.c - Random mode for team
+ * Copyright (c) 2013 Jiri Pirko <jiri@resnulli.us>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+#include <linux/reciprocal_div.h>
+#include <linux/if_team.h>
+
+static u32 random_N(unsigned int N)
+{
+        return reciprocal_divide(random32(), N);
+}
+
+static bool rnd_transmit(struct team *team, struct sk_buff *skb)
+{
+        struct team_port *port;
+        int port_index;
+
+        port_index = random_N(team->en_port_count);
+        port = team_get_port_by_index_rcu(team, port_index);
+        port = team_get_first_port_txable_rcu(team, port);
+        if (unlikely(!port))
+                goto drop;
+        if (team_dev_queue_xmit(team, port, skb))
+                return false;
+        return true;
+
+drop:
+        dev_kfree_skb_any(skb);
+        return false;
+}
+
+static const struct team_mode_ops rnd_mode_ops = {
+        .transmit               = rnd_transmit,
+        .port_enter             = team_modeop_port_enter,
+        .port_change_dev_addr   = team_modeop_port_change_dev_addr,
+};
+
+static const struct team_mode rnd_mode = {
+        .kind           = "random",
+        .owner          = THIS_MODULE,
+        .ops            = &rnd_mode_ops,
+};
+
+static int __init rnd_init_module(void)
+{
+        return team_mode_register(&rnd_mode);
+}
+
+static void __exit rnd_cleanup_module(void)
+{
+        team_mode_unregister(&rnd_mode);
+}
+
+module_init(rnd_init_module);
+module_exit(rnd_cleanup_module);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jiri Pirko <jiri@resnulli.us>");
+MODULE_DESCRIPTION("Random mode for team");
+MODULE_ALIAS("team-mode-random");
diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index 105135aa8f05..d268e4de781b 100644
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -25,26 +25,6 @@ static struct rr_priv *rr_priv(struct team *team)
         return (struct rr_priv *) &team->mode_priv;
 }
 
-static struct team_port *__get_first_port_up(struct team *team,
-                                             struct team_port *port)
-{
-        struct team_port *cur;
-
-        if (team_port_txable(port))
-                return port;
-        cur = port;
-        list_for_each_entry_continue_rcu(cur, &team->port_list, list)
-                if (team_port_txable(port))
-                        return cur;
-        list_for_each_entry_rcu(cur, &team->port_list, list) {
-                if (cur == port)
-                        break;
-                if (team_port_txable(port))
-                        return cur;
-        }
-        return NULL;
-}
-
 static bool rr_transmit(struct team *team, struct sk_buff *skb)
 {
         struct team_port *port;
@@ -52,7 +32,7 @@ static bool rr_transmit(struct team *team, struct sk_buff *skb)
 
         port_index = rr_priv(team)->sent_packets++ % team->en_port_count;
         port = team_get_port_by_index_rcu(team, port_index);
-        port = __get_first_port_up(team, port);
+        port = team_get_first_port_txable_rcu(team, port);
         if (unlikely(!port))
                 goto drop;
         if (team_dev_queue_xmit(team, port, skb))
@@ -64,20 +44,10 @@ drop:
         return false;
 }
 
-static int rr_port_enter(struct team *team, struct team_port *port)
-{
-        return team_port_set_team_dev_addr(port);
-}
-
-static void rr_port_change_dev_addr(struct team *team, struct team_port *port)
-{
-        team_port_set_team_dev_addr(port);
-}
-
 static const struct team_mode_ops rr_mode_ops = {
         .transmit               = rr_transmit,
-        .port_enter             = rr_port_enter,
-        .port_change_dev_addr   = rr_port_change_dev_addr,
+        .port_enter             = team_modeop_port_enter,
+        .port_change_dev_addr   = team_modeop_port_change_dev_addr,
 };
 
 static const struct team_mode rr_mode = {
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 729ed533bb33..f042b0373e5d 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -409,14 +409,12 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
 {
         struct tun_file *ntfile;
         struct tun_struct *tun;
-        struct net_device *dev;
 
         tun = rtnl_dereference(tfile->tun);
 
         if (tun && !tfile->detached) {
                 u16 index = tfile->queue_index;
                 BUG_ON(index >= tun->numqueues);
-                dev = tun->dev;
 
                 rcu_assign_pointer(tun->tfiles[index],
                                    tun->tfiles[tun->numqueues - 1]);
@@ -1205,6 +1203,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
         }
 
         skb_reset_network_header(skb);
+        skb_probe_transport_header(skb, 0);
+
         rxhash = skb_get_rxhash(skb);
         netif_rx_ni(skb);
 
@@ -1471,14 +1471,17 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (!tun)
                 return -EBADFD;
 
-        if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))
-                return -EINVAL;
+        if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) {
+                ret = -EINVAL;
+                goto out;
+        }
         ret = tun_do_read(tun, tfile, iocb, m->msg_iov, total_len,
                           flags & MSG_DONTWAIT);
         if (ret > total_len) {
                 m->msg_flags |= MSG_TRUNC;
                 ret = flags & MSG_TRUNC ? ret : total_len;
         }
+out:
         tun_put(tun);
         return ret;
 }
@@ -1593,8 +1596,12 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                         return err;
 
                 if (tun->flags & TUN_TAP_MQ &&
-                    (tun->numqueues + tun->numdisabled > 1))
-                        return -EBUSY;
+                    (tun->numqueues + tun->numdisabled > 1)) {
+                        /* One or more queue has already been attached, no need
+                         * to initialize the device again.
+                         */
+                        return 0;
+                }
         }
         else {
                 char *name;
@@ -1656,6 +1663,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                 dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST |
                         TUN_USER_FEATURES;
                 dev->features = dev->hw_features;
+                dev->vlan_features = dev->features;
 
                 INIT_LIST_HEAD(&tun->disabled);
                 err = tun_attach(tun, file);
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 709753469099..ad5d1e4384db 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -55,11 +55,7 @@ static void asix_status(struct usbnet *dev, struct urb *urb)
         event = urb->transfer_buffer;
         link = event->link & 0x01;
         if (netif_carrier_ok(dev->net) != link) {
-                if (link) {
-                        netif_carrier_on(dev->net);
-                        usbnet_defer_kevent (dev, EVENT_LINK_RESET );
-                } else
-                        netif_carrier_off(dev->net);
+                usbnet_link_change(dev, link, 1);
                 netdev_dbg(dev->net, "Link Status is: %d\n", link);
         }
 }
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 71c27d8d214f..bd8758fa38c1 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -352,11 +352,7 @@ static void ax88179_status(struct usbnet *dev, struct urb *urb)
         link = (((__force u32)event->intdata1) & AX_INT_PPLS_LINK) >> 16;
 
         if (netif_carrier_ok(dev->net) != link) {
-                if (link)
-                        usbnet_defer_kevent(dev, EVENT_LINK_RESET);
-                else
-                        netif_carrier_off(dev->net);
-
+                usbnet_link_change(dev, link, 1);
                 netdev_info(dev->net, "ax88179 - Link status is: %d\n", link);
         }
 }
@@ -455,7 +451,7 @@ static int ax88179_resume(struct usb_interface *intf)
         u16 tmp16;
         u8 tmp8;
 
-        netif_carrier_off(dev->net);
+        usbnet_link_change(dev, 0, 0);
 
         /* Power up ethernet PHY */
         tmp16 = 0;
@@ -1068,7 +1064,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
         /* Restart autoneg */
         mii_nway_restart(&dev->mii);
 
-        netif_carrier_off(dev->net);
+        usbnet_link_change(dev, 0, 0);
 
         return 0;
 }
@@ -1356,7 +1352,7 @@ static int ax88179_reset(struct usbnet *dev)
         /* Restart autoneg */
         mii_nway_restart(&dev->mii);
 
-        netif_carrier_off(dev->net);
+        usbnet_link_change(dev, 0, 0);
 
         return 0;
 }
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 57136dc1b887..4ff71d619cd8 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -406,10 +406,7 @@ void usbnet_cdc_status(struct usbnet *dev, struct urb *urb)
         case USB_CDC_NOTIFY_NETWORK_CONNECTION:
                 netif_dbg(dev, timer, dev->net, "CDC: carrier %s\n",
                           event->wValue ? "on" : "off");
-                if (event->wValue)
-                        netif_carrier_on(dev->net);
-                else
-                        netif_carrier_off(dev->net);
+                usbnet_link_change(dev, !!event->wValue, 0);
                 break;
         case USB_CDC_NOTIFY_SPEED_CHANGE:       /* tx/rx rates */
                 netif_dbg(dev, timer, dev->net, "CDC: speed change (len %d)\n",
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index 32a76059e7da..872819851aef 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -101,7 +101,7 @@ static int cdc_mbim_bind(struct usbnet *dev, struct usb_interface *intf)
         dev->net->flags |= IFF_NOARP;
 
         /* no need to put the VLAN tci in the packet headers */
-        dev->net->features |= NETIF_F_HW_VLAN_TX;
+        dev->net->features |= NETIF_F_HW_VLAN_CTAG_TX;
 err:
         return ret;
 }
@@ -221,7 +221,7 @@ static struct sk_buff *cdc_mbim_process_dgram(struct usbnet *dev, u8 *buf, size_
 
         /* map MBIM session to VLAN */
         if (tci)
-                vlan_put_tag(skb, tci);
+                vlan_put_tag(skb, htons(ETH_P_8021Q), tci);
 err:
         return skb;
 }
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 4709fa3497cf..43afde8f48d2 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -362,8 +362,8 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
         u8 iface_no;
 
         ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-        if (ctx == NULL)
-                return -ENODEV;
+        if (!ctx)
+                return -ENOMEM;
 
         hrtimer_init(&ctx->tx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
         ctx->tx_timer.function = &cdc_ncm_tx_timer_cb;
@@ -610,7 +610,7 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
          * (carrier is OFF) during attach, so the IP network stack does not
          * start IPv6 negotiation and more.
          */
-        netif_carrier_off(dev->net);
+        usbnet_link_change(dev, 0, 0);
         return ret;
 }
 
@@ -1106,12 +1106,9 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
                         " %sconnected\n",
                         ctx->netdev->name, ctx->connected ? "" : "dis");
 
-                if (ctx->connected)
-                        netif_carrier_on(dev->net);
-                else {
-                        netif_carrier_off(dev->net);
+                usbnet_link_change(dev, ctx->connected, 0);
+                if (!ctx->connected)
                         ctx->tx_speed = ctx->rx_speed = 0;
-                }
                 break;
 
         case USB_CDC_NOTIFY_SPEED_CHANGE:
@@ -1124,8 +1121,9 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
                 break;
 
         default:
-                dev_err(&dev->udev->dev, "NCM: unexpected "
-                        "notification 0x%02x!\n", event->bNotificationType);
+                dev_dbg(&dev->udev->dev,
+                        "NCM: unexpected notification 0x%02x!\n",
+                        event->bNotificationType);
                 break;
         }
 }
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 174e5ecea4cc..2dbb9460349d 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -524,12 +524,7 @@ static void dm9601_status(struct usbnet *dev, struct urb *urb)
 
         link = !!(buf[0] & 0x40);
         if (netif_carrier_ok(dev->net) != link) {
-                if (link) {
-                        netif_carrier_on(dev->net);
-                        usbnet_defer_kevent (dev, EVENT_LINK_RESET);
-                }
-                else
-                        netif_carrier_off(dev->net);
+                usbnet_link_change(dev, link, 1);
                 netdev_dbg(dev->net, "Link Status is: %d\n", link);
         }
 }
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 3f3f566afa0b..03832d3780aa 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -576,11 +576,7 @@ static void mcs7830_status(struct usbnet *dev, struct urb *urb)
                  */
                 if (data->link_counter > 20) {
                         data->link_counter = 0;
-                        if (link) {
-                                netif_carrier_on(dev->net);
-                                usbnet_defer_kevent(dev, EVENT_LINK_RESET);
-                        } else
-                                netif_carrier_off(dev->net);
+                        usbnet_link_change(dev, link, 0);
                         netdev_dbg(dev->net, "Link Status is: %d\n", link);
                 }
         } else
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 73051d10ead2..09699054b54f 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 1999-2005 Petko Manolov (petkan@users.sourceforge.net)
+ *  Copyright (c) 1999-2013 Petko Manolov (petkan@nucleusys.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -26,6 +26,9 @@
  *              v0.5.1  ethtool support added
  *              v0.5.5  rx socket buffers are in a pool and the their allocation
  *                      is out of the interrupt routine.
+ *              ...
+ *              v0.9.3  simplified [get|set]_register(s), async update registers
+ *                      logic revisited, receive skb_pool removed.
  */
 
 #include <linux/sched.h>
@@ -45,8 +48,8 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v0.6.14 (2006/09/27)"
-#define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>"
+#define DRIVER_VERSION "v0.9.3 (2013/04/25)"
+#define DRIVER_AUTHOR "Petko Manolov <petkan@nucleusys.com>"
 #define DRIVER_DESC "Pegasus/Pegasus II USB Ethernet driver"
 
 static const char driver_name[] = "pegasus";
@@ -108,251 +111,137 @@ MODULE_PARM_DESC(msg_level, "Override default message level");
 MODULE_DEVICE_TABLE(usb, pegasus_ids);
 static const struct net_device_ops pegasus_netdev_ops;
 
-static int update_eth_regs_async(pegasus_t *);
-/* Aargh!!! I _really_ hate such tweaks */
-static void ctrl_callback(struct urb *urb)
+/*****/
+
+static void async_ctrl_callback(struct urb *urb)
 {
-        pegasus_t *pegasus = urb->context;
+        struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
         int status = urb->status;
 
-        if (!pegasus)
-                return;
-
-        switch (status) {
-        case 0:
-                if (pegasus->flags & ETH_REGS_CHANGE) {
-                        pegasus->flags &= ~ETH_REGS_CHANGE;
-                        pegasus->flags |= ETH_REGS_CHANGED;
-                        update_eth_regs_async(pegasus);
-                        return;
-                }
-                break;
-        case -EINPROGRESS:
-                return;
-        case -ENOENT:
-                break;
-        default:
-                if (net_ratelimit())
-                        netif_dbg(pegasus, drv, pegasus->net,
-                                  "%s, status %d\n", __func__, status);
-                break;
-        }
-        pegasus->flags &= ~ETH_REGS_CHANGED;
-        wake_up(&pegasus->ctrl_wait);
+        if (status < 0)
+                dev_dbg(&urb->dev->dev, "%s failed with %d", __func__, status);
+        kfree(req);
+        usb_free_urb(urb);
 }
 
-static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
-                         void *data)
+static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
 {
         int ret;
-        char *buffer;
-        DECLARE_WAITQUEUE(wait, current);
-
-        buffer = kmalloc(size, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
-        add_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-        while (pegasus->flags & ETH_REGS_CHANGED)
-                schedule();
-        remove_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_RUNNING);
-
-        pegasus->dr.bRequestType = PEGASUS_REQT_READ;
-        pegasus->dr.bRequest = PEGASUS_REQ_GET_REGS;
-        pegasus->dr.wValue = cpu_to_le16(0);
-        pegasus->dr.wIndex = cpu_to_le16(indx);
-        pegasus->dr.wLength = cpu_to_le16(size);
-        pegasus->ctrl_urb->transfer_buffer_length = size;
-
-        usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb,
-                             usb_rcvctrlpipe(pegasus->usb, 0),
-                             (char *) &pegasus->dr,
-                             buffer, size, ctrl_callback, pegasus);
-
-        add_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-
-        /* using ATOMIC, we'd never wake up if we slept */
-        if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
-                set_current_state(TASK_RUNNING);
-                if (ret == -ENODEV)
-                        netif_device_detach(pegasus->net);
-                if (net_ratelimit())
-                        netif_err(pegasus, drv, pegasus->net,
-                                  "%s, status %d\n", __func__, ret);
-                goto out;
-        }
-
-        schedule();
-out:
-        remove_wait_queue(&pegasus->ctrl_wait, &wait);
-        memcpy(data, buffer, size);
-        kfree(buffer);
 
+        ret = usb_control_msg(pegasus->usb, usb_rcvctrlpipe(pegasus->usb, 0),
+                              PEGASUS_REQ_GET_REGS, PEGASUS_REQT_READ, 0,
+                              indx, data, size, 1000);
+        if (ret < 0)
+                netif_dbg(pegasus, drv, pegasus->net,
+                          "%s returned %d\n", __func__, ret);
         return ret;
 }
 
-static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
-                         void *data)
+static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
 {
         int ret;
-        char *buffer;
-        DECLARE_WAITQUEUE(wait, current);
-
-        buffer = kmemdup(data, size, GFP_KERNEL);
-        if (!buffer) {
-                netif_warn(pegasus, drv, pegasus->net,
-                           "out of memory in %s\n", __func__);
-                return -ENOMEM;
-        }
-
-        add_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-        while (pegasus->flags & ETH_REGS_CHANGED)
-                schedule();
-        remove_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_RUNNING);
-
-        pegasus->dr.bRequestType = PEGASUS_REQT_WRITE;
-        pegasus->dr.bRequest = PEGASUS_REQ_SET_REGS;
-        pegasus->dr.wValue = cpu_to_le16(0);
-        pegasus->dr.wIndex = cpu_to_le16(indx);
-        pegasus->dr.wLength = cpu_to_le16(size);
-        pegasus->ctrl_urb->transfer_buffer_length = size;
-
-        usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb,
-                             usb_sndctrlpipe(pegasus->usb, 0),
-                             (char *) &pegasus->dr,
-                             buffer, size, ctrl_callback, pegasus);
-
-        add_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-
-        if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
-                if (ret == -ENODEV)
-                        netif_device_detach(pegasus->net);
-                netif_err(pegasus, drv, pegasus->net,
-                          "%s, status %d\n", __func__, ret);
-                goto out;
-        }
-
-        schedule();
-out:
-        remove_wait_queue(&pegasus->ctrl_wait, &wait);
-        kfree(buffer);
 
+        ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
+                              PEGASUS_REQ_SET_REGS, PEGASUS_REQT_WRITE, 0,
+                              indx, data, size, 100);
+        if (ret < 0)
+                netif_dbg(pegasus, drv, pegasus->net,
+                          "%s returned %d\n", __func__, ret);
         return ret;
 }
 
 static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data)
 {
         int ret;
-        char *tmp;
-        DECLARE_WAITQUEUE(wait, current);
-
-        tmp = kmemdup(&data, 1, GFP_KERNEL);
-        if (!tmp) {
-                netif_warn(pegasus, drv, pegasus->net,
-                           "out of memory in %s\n", __func__);
-                return -ENOMEM;
-        }
-        add_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-        while (pegasus->flags & ETH_REGS_CHANGED)
-                schedule();
-        remove_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_RUNNING);
-
-        pegasus->dr.bRequestType = PEGASUS_REQT_WRITE;
-        pegasus->dr.bRequest = PEGASUS_REQ_SET_REG;
-        pegasus->dr.wValue = cpu_to_le16(data);
-        pegasus->dr.wIndex = cpu_to_le16(indx);
-        pegasus->dr.wLength = cpu_to_le16(1);
-        pegasus->ctrl_urb->transfer_buffer_length = 1;
-
-        usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb,
-                             usb_sndctrlpipe(pegasus->usb, 0),
-                             (char *) &pegasus->dr,
-                             tmp, 1, ctrl_callback, pegasus);
-
-        add_wait_queue(&pegasus->ctrl_wait, &wait);
-        set_current_state(TASK_UNINTERRUPTIBLE);
-
-        if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
-                if (ret == -ENODEV)
-                        netif_device_detach(pegasus->net);
-                if (net_ratelimit())
-                        netif_err(pegasus, drv, pegasus->net,
-                                  "%s, status %d\n", __func__, ret);
-                goto out;
-        }
-
-        schedule();
-out:
-        remove_wait_queue(&pegasus->ctrl_wait, &wait);
-        kfree(tmp);
 
+        ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
+                              PEGASUS_REQ_SET_REG, PEGASUS_REQT_WRITE, data,
+                              indx, &data, 1, 1000);
+        if (ret < 0)
+                netif_dbg(pegasus, drv, pegasus->net,
+                          "%s returned %d\n", __func__, ret);
         return ret;
 }
 
 static int update_eth_regs_async(pegasus_t *pegasus)
 {
-        int ret;
-
-        pegasus->dr.bRequestType = PEGASUS_REQT_WRITE;
-        pegasus->dr.bRequest = PEGASUS_REQ_SET_REGS;
-        pegasus->dr.wValue = cpu_to_le16(0);
-        pegasus->dr.wIndex = cpu_to_le16(EthCtrl0);
-        pegasus->dr.wLength = cpu_to_le16(3);
-        pegasus->ctrl_urb->transfer_buffer_length = 3;
-
-        usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb,
-                             usb_sndctrlpipe(pegasus->usb, 0),
-                             (char *) &pegasus->dr,
-                             pegasus->eth_regs, 3, ctrl_callback, pegasus);
-
-        if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
+        int ret = -ENOMEM;
+        struct urb *async_urb;
+        struct usb_ctrlrequest *req;
+
+        req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
+        if (req == NULL)
+                return ret;
+
+        async_urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (async_urb == NULL) {
+                kfree(req);
+                return ret;
+        }
+        req->bRequestType = PEGASUS_REQT_WRITE;
+        req->bRequest = PEGASUS_REQ_SET_REGS;
+        req->wValue = cpu_to_le16(0);
+        req->wIndex = cpu_to_le16(EthCtrl0);
+        req->wLength = cpu_to_le16(3);
+
+        usb_fill_control_urb(async_urb, pegasus->usb,
+                             usb_sndctrlpipe(pegasus->usb, 0), (void *)req,
+                             pegasus->eth_regs, 3, async_ctrl_callback, req);
+
+        ret = usb_submit_urb(async_urb, GFP_ATOMIC);
+        if (ret) {
                 if (ret == -ENODEV)
                         netif_device_detach(pegasus->net);
                 netif_err(pegasus, drv, pegasus->net,
-                          "%s, status %d\n", __func__, ret);
+                          "%s returned %d\n", __func__, ret);
         }
-
         return ret;
 }
 
-/* Returns 0 on success, error on failure */
-static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
+static int __mii_op(pegasus_t *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd)
 {
         int i;
         __u8 data[4] = { phy, 0, 0, indx };
         __le16 regdi;
-        int ret;
+        int ret = -ETIMEDOUT;
 
-        set_register(pegasus, PhyCtrl, 0);
-        set_registers(pegasus, PhyAddr, sizeof(data), data);
-        set_register(pegasus, PhyCtrl, (indx | PHY_READ));
+        if (cmd & PHY_WRITE) {
+                __le16 *t = (__le16 *) & data[1];
+                *t = cpu_to_le16(*regd);
+        }
+        set_register(p, PhyCtrl, 0);
+        set_registers(p, PhyAddr, sizeof(data), data);
+        set_register(p, PhyCtrl, (indx | cmd));
         for (i = 0; i < REG_TIMEOUT; i++) {
-                ret = get_registers(pegasus, PhyCtrl, 1, data);
-                if (ret == -ESHUTDOWN)
+                ret = get_registers(p, PhyCtrl, 1, data);
+                if (ret < 0)
                         goto fail;
                 if (data[0] & PHY_DONE)
                         break;
         }
-
         if (i >= REG_TIMEOUT)
                 goto fail;
-
-        ret = get_registers(pegasus, PhyData, 2, &regdi);
-        *regd = le16_to_cpu(regdi);
+        if (cmd & PHY_READ) {
+                ret = get_registers(p, PhyData, 2, &regdi);
+                *regd = le16_to_cpu(regdi);
+                return ret;
+        }
+        return 0;
+fail:
+        netif_dbg(p, drv, p->net, "%s failed\n", __func__);
         return ret;
+}
 
-fail:
-        netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);
+/* Returns non-negative int on success, error on failure */
+static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
+{
+        return __mii_op(pegasus, phy, indx, regd, PHY_READ);
+}
 
-        return ret;
+/* Returns zero on success, error on failure */
+static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
+{
+        return __mii_op(pegasus, phy, indx, regd, PHY_WRITE);
 }
 
 static int mdio_read(struct net_device *dev, int phy_id, int loc)
@@ -364,40 +253,11 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc)
         return (int)res;
 }
 
-static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 regd)
-{
-        int i;
-        __u8 data[4] = { phy, 0, 0, indx };
-        int ret;
-
-        data[1] = (u8) regd;
-        data[2] = (u8) (regd >> 8);
-        set_register(pegasus, PhyCtrl, 0);
-        set_registers(pegasus, PhyAddr, sizeof(data), data);
-        set_register(pegasus, PhyCtrl, (indx | PHY_WRITE));
-        for (i = 0; i < REG_TIMEOUT; i++) {
-                ret = get_registers(pegasus, PhyCtrl, 1, data);
-                if (ret == -ESHUTDOWN)
-                        goto fail;
-                if (data[0] & PHY_DONE)
-                        break;
-        }
-
-        if (i >= REG_TIMEOUT)
-                goto fail;
-
-        return ret;
-
-fail:
-        netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);
-        return -ETIMEDOUT;
-}
-
 static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
 {
         pegasus_t *pegasus = netdev_priv(dev);
 
-        write_mii_word(pegasus, phy_id, loc, val);
+        write_mii_word(pegasus, phy_id, loc, (__u16 *)&val);
 }
 
 static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)
@@ -434,7 +294,6 @@ fail:
 static inline void enable_eprom_write(pegasus_t *pegasus)
 {
         __u8 tmp;
-        int ret;
 
         get_registers(pegasus, EthCtrl2, 1, &tmp);
         set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE);
@@ -443,7 +302,6 @@ static inline void enable_eprom_write(pegasus_t *pegasus)
 static inline void disable_eprom_write(pegasus_t *pegasus)
 {
         __u8 tmp;
-        int ret;
 
         get_registers(pegasus, EthCtrl2, 1, &tmp);
         set_register(pegasus, EpromCtrl, 0);
@@ -537,7 +395,8 @@ static inline int reset_mac(pegasus_t *pegasus)
         if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_ELCON) {
                 __u16 auxmode;
                 read_mii_word(pegasus, 3, 0x1b, &auxmode);
-                write_mii_word(pegasus, 3, 0x1b, auxmode | 4);
+                auxmode |= 4;
+                write_mii_word(pegasus, 3, 0x1b, &auxmode);
         }
 
         return 0;
@@ -569,57 +428,13 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
             usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) {
                 u16 auxmode;
                 read_mii_word(pegasus, 0, 0x1b, &auxmode);
-                write_mii_word(pegasus, 0, 0x1b, auxmode | 4);
+                auxmode |= 4;
+                write_mii_word(pegasus, 0, 0x1b, &auxmode);
         }
 
         return ret;
 }
 
-static void fill_skb_pool(pegasus_t *pegasus)
-{
-        int i;
-
-        for (i = 0; i < RX_SKBS; i++) {
-                if (pegasus->rx_pool[i])
-                        continue;
-                pegasus->rx_pool[i] = dev_alloc_skb(PEGASUS_MTU + 2);
-                /*
-                 ** we give up if the allocation fail. the tasklet will be
-                 ** rescheduled again anyway...
-                 */
-                if (pegasus->rx_pool[i] == NULL)
-                        return;
-                skb_reserve(pegasus->rx_pool[i], 2);
-        }
-}
-
-static void free_skb_pool(pegasus_t *pegasus)
-{
-        int i;
-
-        for (i = 0; i < RX_SKBS; i++) {
-                if (pegasus->rx_pool[i]) {
-                        dev_kfree_skb(pegasus->rx_pool[i]);
-                        pegasus->rx_pool[i] = NULL;
-                }
-        }
-}
-
-static inline struct sk_buff *pull_skb(pegasus_t * pegasus)
-{
-        int i;
-        struct sk_buff *skb;
-
-        for (i = 0; i < RX_SKBS; i++) {
-                if (likely(pegasus->rx_pool[i] != NULL)) {
-                        skb = pegasus->rx_pool[i];
-                        pegasus->rx_pool[i] = NULL;
-                        return skb;
-                }
-        }
-        return NULL;
-}
-
 static void read_bulk_callback(struct urb *urb)
 {
         pegasus_t *pegasus = urb->context;
@@ -704,9 +519,8 @@ static void read_bulk_callback(struct urb *urb)
         if (pegasus->flags & PEGASUS_UNPLUG)
                 return;
 
-        spin_lock(&pegasus->rx_pool_lock);
-        pegasus->rx_skb = pull_skb(pegasus);
-        spin_unlock(&pegasus->rx_pool_lock);
+        pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU,
+                                                      GFP_ATOMIC);
 
         if (pegasus->rx_skb == NULL)
                 goto tl_sched;
@@ -734,24 +548,23 @@ tl_sched:
 static void rx_fixup(unsigned long data)
 {
         pegasus_t *pegasus;
-        unsigned long flags;
         int status;
 
         pegasus = (pegasus_t *) data;
         if (pegasus->flags & PEGASUS_UNPLUG)
                 return;
 
-        spin_lock_irqsave(&pegasus->rx_pool_lock, flags);
-        fill_skb_pool(pegasus);
         if (pegasus->flags & PEGASUS_RX_URB_FAIL)
                 if (pegasus->rx_skb)
                         goto try_again;
         if (pegasus->rx_skb == NULL)
-                pegasus->rx_skb = pull_skb(pegasus);
+                pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net,
+                                                              PEGASUS_MTU,
+                                                              GFP_ATOMIC);
         if (pegasus->rx_skb == NULL) {
                 netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n");
                 tasklet_schedule(&pegasus->rx_tl);
-                goto done;
+                return;
         }
         usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
                           usb_rcvbulkpipe(pegasus->usb, 1),
@@ -767,8 +580,6 @@ try_again:
         } else {
                 pegasus->flags &= ~PEGASUS_RX_URB_FAIL;
         }
-done:
-        spin_unlock_irqrestore(&pegasus->rx_pool_lock, flags);
 }
 
 static void write_bulk_callback(struct urb *urb)
@@ -963,7 +774,6 @@ static void free_all_urbs(pegasus_t *pegasus)
         usb_free_urb(pegasus->intr_urb);
         usb_free_urb(pegasus->tx_urb);
         usb_free_urb(pegasus->rx_urb);
-        usb_free_urb(pegasus->ctrl_urb);
 }
 
 static void unlink_all_urbs(pegasus_t *pegasus)
@@ -971,48 +781,42 @@ static void unlink_all_urbs(pegasus_t *pegasus)
         usb_kill_urb(pegasus->intr_urb);
         usb_kill_urb(pegasus->tx_urb);
         usb_kill_urb(pegasus->rx_urb);
-        usb_kill_urb(pegasus->ctrl_urb);
 }
 
 static int alloc_urbs(pegasus_t *pegasus)
 {
-        pegasus->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!pegasus->ctrl_urb)
-                return 0;
+        int res = -ENOMEM;
+
         pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!pegasus->rx_urb) {
-                usb_free_urb(pegasus->ctrl_urb);
-                return 0;
+                return res;
         }
         pegasus->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!pegasus->tx_urb) {
                 usb_free_urb(pegasus->rx_urb);
-                usb_free_urb(pegasus->ctrl_urb);
-                return 0;
+                return res;
         }
         pegasus->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!pegasus->intr_urb) {
                 usb_free_urb(pegasus->tx_urb);
                 usb_free_urb(pegasus->rx_urb);
-                usb_free_urb(pegasus->ctrl_urb);
-                return 0;
+                return res;
         }
 
-        return 1;
+        return 0;
 }
 
 static int pegasus_open(struct net_device *net)
 {
         pegasus_t *pegasus = netdev_priv(net);
-        int res;
+        int res=-ENOMEM;
 
         if (pegasus->rx_skb == NULL)
-                pegasus->rx_skb = pull_skb(pegasus);
-        /*
-         ** Note: no point to free the pool.  it is empty :-)
-         */
+                pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net,
+                                                              PEGASUS_MTU,
+                                                              GFP_KERNEL);
         if (!pegasus->rx_skb)
-                return -ENOMEM;
+                goto exit;
 
         res = set_registers(pegasus, EthID, 6, net->dev_addr);
 
@@ -1038,13 +842,13 @@ static int pegasus_open(struct net_device *net)
                 usb_kill_urb(pegasus->rx_urb);
                 goto exit;
         }
-        if ((res = enable_net_traffic(net, pegasus->usb))) {
+        res = enable_net_traffic(net, pegasus->usb);
+        if (res < 0) {
                 netif_dbg(pegasus, ifup, net,
                           "can't enable_net_traffic() - %d\n", res);
                 res = -EIO;
                 usb_kill_urb(pegasus->rx_urb);
                 usb_kill_urb(pegasus->intr_urb);
-                free_skb_pool(pegasus);
                 goto exit;
         }
         set_carrier(net);
@@ -1195,7 +999,7 @@ static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
         case SIOCDEVPRIVATE + 2:
                 if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
-                write_mii_word(pegasus, pegasus->phy, data[1] & 0x1f, data[2]);
+                write_mii_word(pegasus, pegasus->phy, data[1] & 0x1f, &data[2]);
                 res = 0;
                 break;
         default:
@@ -1219,11 +1023,7 @@ static void pegasus_set_multicast(struct net_device *net)
                 pegasus->eth_regs[EthCtrl0] &= ~RX_MULTICAST;
                 pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
         }
-
-        pegasus->ctrl_urb->status = 0;
-
-        pegasus->flags |= ETH_REGS_CHANGE;
-        ctrl_callback(pegasus->ctrl_urb);
+        update_eth_regs_async(pegasus);
 }
 
 static __u8 mii_phy_probe(pegasus_t *pegasus)
@@ -1340,9 +1140,9 @@ static int pegasus_probe(struct usb_interface *intf,
 
         pegasus = netdev_priv(net);
         pegasus->dev_index = dev_index;
-        init_waitqueue_head(&pegasus->ctrl_wait);
 
-        if (!alloc_urbs(pegasus)) {
+        res = alloc_urbs(pegasus);
+        if (res < 0) {
                 dev_err(&intf->dev, "can't allocate %s\n", "urbs");
                 goto out1;
         }
@@ -1364,7 +1164,6 @@ static int pegasus_probe(struct usb_interface *intf,
         pegasus->mii.mdio_write = mdio_write;
         pegasus->mii.phy_id_mask = 0x1f;
         pegasus->mii.reg_num_mask = 0x1f;
-        spin_lock_init(&pegasus->rx_pool_lock);
         pegasus->msg_enable = netif_msg_init(msg_level, NETIF_MSG_DRV
                                 | NETIF_MSG_PROBE | NETIF_MSG_LINK);
 
@@ -1376,7 +1175,6 @@ static int pegasus_probe(struct usb_interface *intf,
                 goto out2;
         }
         set_ethernet_addr(pegasus);
-        fill_skb_pool(pegasus);
         if (pegasus->features & PEGASUS_II) {
                 dev_info(&intf->dev, "setup Pegasus II specific registers\n");
                 setup_pegasus_II(pegasus);
@@ -1394,17 +1192,13 @@ static int pegasus_probe(struct usb_interface *intf,
         if (res)
                 goto out3;
         queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
-                                CARRIER_CHECK_DELAY);
-
-        dev_info(&intf->dev, "%s, %s, %pM\n",
-                 net->name,
-                 usb_dev_id[dev_index].name,
-                 net->dev_addr);
+                           CARRIER_CHECK_DELAY);
+        dev_info(&intf->dev, "%s, %s, %pM\n", net->name,
+                 usb_dev_id[dev_index].name, net->dev_addr);
         return 0;
 
 out3:
         usb_set_intfdata(intf, NULL);
-        free_skb_pool(pegasus);
 out2:
         free_all_urbs(pegasus);
 out1:
@@ -1429,7 +1223,6 @@ static void pegasus_disconnect(struct usb_interface *intf)
         unregister_netdev(pegasus->net);
         unlink_all_urbs(pegasus);
         free_all_urbs(pegasus);
-        free_skb_pool(pegasus);
         if (pegasus->rx_skb != NULL) {
                 dev_kfree_skb(pegasus->rx_skb);
                 pegasus->rx_skb = NULL;
diff --git a/drivers/net/usb/pegasus.h b/drivers/net/usb/pegasus.h
index 65b78b35b73c..d15646244fdf 100644
--- a/drivers/net/usb/pegasus.h
+++ b/drivers/net/usb/pegasus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2003 Petko Manolov - Petkan (petkan@users.sourceforge.net)
+ * Copyright (c) 1999-2013 Petko Manolov (petkan@nucleusys.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
@@ -13,7 +13,6 @@
 #define HAS_HOME_PNA            0x40000000
 
 #define PEGASUS_MTU             1536
-#define RX_SKBS                 4
 
 #define EPROM_WRITE             0x01
 #define EPROM_READ              0x02
@@ -34,8 +33,6 @@
 #define CTRL_URB_SLEEP          0x00000020
 #define PEGASUS_UNPLUG          0x00000040
 #define PEGASUS_RX_URB_FAIL     0x00000080
-#define ETH_REGS_CHANGE         0x40000000
-#define ETH_REGS_CHANGED        0x80000000
 
 #define RX_MULTICAST            2
 #define RX_PROMISCUOUS          4
@@ -96,12 +93,8 @@ typedef struct pegasus {
         int                     intr_interval;
         struct tasklet_struct   rx_tl;
         struct delayed_work     carrier_check;
-        struct urb              *ctrl_urb, *rx_urb, *tx_urb, *intr_urb;
-        struct sk_buff          *rx_pool[RX_SKBS];
+        struct urb              *rx_urb, *tx_urb, *intr_urb;
         struct sk_buff          *rx_skb;
-        struct usb_ctrlrequest  dr;
-        wait_queue_head_t       ctrl_wait;
-        spinlock_t              rx_pool_lock;
         int                     chip;
         unsigned char           intr_buff[8];
         __u8                    tx_buff[PEGASUS_MTU];
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 79ab2435d9d3..a923d61c6fc5 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -413,11 +413,10 @@ static void sierra_net_handle_lsi(struct usbnet *dev, char *data,
         if (link_up) {
                 sierra_net_set_ctx_index(priv, hh->msgspecific.byte);
                 priv->link_up = 1;
-                netif_carrier_on(dev->net);
         } else {
                 priv->link_up = 0;
-                netif_carrier_off(dev->net);
         }
+        usbnet_link_change(dev, link_up, 0);
 }
 
 static void sierra_net_dosync(struct usbnet *dev)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 51f3192f3931..1e5a9b72650e 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -938,6 +938,27 @@ static const struct ethtool_ops usbnet_ethtool_ops = {
 
 /*-------------------------------------------------------------------------*/
 
+static void __handle_link_change(struct usbnet *dev)
+{
+        if (!test_bit(EVENT_DEV_OPEN, &dev->flags))
+                return;
+
+        if (!netif_carrier_ok(dev->net)) {
+                /* kill URBs for reading packets to save bus bandwidth */
+                unlink_urbs(dev, &dev->rxq);
+
+                /*
+                 * tx_timeout will unlink URBs for sending packets and
+                 * tx queue is stopped by netcore after link becomes off
+                 */
+        } else {
+                /* submitting URBs for reading packets */
+                tasklet_schedule(&dev->bh);
+        }
+
+        clear_bit(EVENT_LINK_CHANGE, &dev->flags);
+}
+
 /* work that cannot be done in interrupt context uses keventd.
  *
  * NOTE:  with 2.5 we could do more of this using completion callbacks,
@@ -1035,8 +1056,14 @@ skip_reset:
                 } else {
                         usb_autopm_put_interface(dev->intf);
                 }
+
+                /* handle link change from link resetting */
+                __handle_link_change(dev);
         }
 
+        if (test_bit (EVENT_LINK_CHANGE, &dev->flags))
+                __handle_link_change(dev);
+
         if (dev->flags)
                 netdev_dbg(dev->net, "kevent done, flags = 0x%lx\n", dev->flags);
 }
@@ -1286,6 +1313,7 @@ static void usbnet_bh (unsigned long param)
         // or are we maybe short a few urbs?
         } else if (netif_running (dev->net) &&
                    netif_device_present (dev->net) &&
+                   netif_carrier_ok(dev->net) &&
                    !timer_pending (&dev->delay) &&
                    !test_bit (EVENT_RX_HALT, &dev->flags)) {
                 int     temp = dev->rxq.qlen;
@@ -1521,7 +1549,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         netif_device_attach (net);
 
         if (dev->driver_info->flags & FLAG_LINK_INTR)
-                netif_carrier_off(net);
+                usbnet_link_change(dev, 0, 0);
 
         return 0;
 
@@ -1653,6 +1681,21 @@ int usbnet_manage_power(struct usbnet *dev, int on)
 }
 EXPORT_SYMBOL(usbnet_manage_power);
 
+void usbnet_link_change(struct usbnet *dev, bool link, bool need_reset)
+{
+        /* update link after link is reseted */
+        if (link && !need_reset)
+                netif_carrier_on(dev->net);
+        else
+                netif_carrier_off(dev->net);
+
+        if (need_reset && link)
+                usbnet_defer_kevent(dev, EVENT_LINK_RESET);
+        else
+                usbnet_defer_kevent(dev, EVENT_LINK_CHANGE);
+}
+EXPORT_SYMBOL(usbnet_link_change);
+
 /*-------------------------------------------------------------------------*/
 static int __usbnet_read_cmd(struct usbnet *dev, u8 cmd, u8 reqtype,
                              u16 value, u16 index, void *data, u16 size)
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 07a4af0aa3dc..177f911f5946 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -255,7 +255,8 @@ static const struct net_device_ops veth_netdev_ops = {
 
 #define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_ALL_TSO |    \
                        NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_HIGHDMA | \
-                       NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX)
+                       NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | \
+                       NETIF_F_HW_VLAN_STAG_TX | NETIF_F_HW_VLAN_STAG_RX )
 
 static void veth_setup(struct net_device *dev)
 {
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 57ac4b0294bc..50077753a0e5 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -154,7 +154,7 @@ struct padded_vnet_hdr {
  */
 static int vq2txq(struct virtqueue *vq)
 {
-        return (virtqueue_get_queue_index(vq) - 1) / 2;
+        return (vq->index - 1) / 2;
 }
 
 static int txq2vq(int txq)
@@ -164,7 +164,7 @@ static int txq2vq(int txq)
 
 static int vq2rxq(struct virtqueue *vq)
 {
-        return virtqueue_get_queue_index(vq) / 2;
+        return vq->index / 2;
 }
 
 static int rxq2vq(int rxq)
@@ -1006,7 +1006,8 @@ static void virtnet_set_rx_mode(struct net_device *dev)
         kfree(buf);
 }
 
-static int virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
+static int virtnet_vlan_rx_add_vid(struct net_device *dev,
+                                   __be16 proto, u16 vid)
 {
         struct virtnet_info *vi = netdev_priv(dev);
         struct scatterlist sg;
@@ -1019,7 +1020,8 @@ static int virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
         return 0;
 }
 
-static int virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
+static int virtnet_vlan_rx_kill_vid(struct net_device *dev,
+                                    __be16 proto, u16 vid)
 {
         struct virtnet_info *vi = netdev_priv(dev);
         struct scatterlist sg;
@@ -1376,7 +1378,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
         if (vi->has_cvq) {
                 vi->cvq = vqs[total_vqs - 1];
                 if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
-                        vi->dev->features |= NETIF_F_HW_VLAN_FILTER;
+                        vi->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
         }
 
         for (i = 0; i < vi->max_queue_pairs; i++) {
@@ -1511,6 +1513,8 @@ static int virtnet_probe(struct virtio_device *vdev)
                 /* (!csum && gso) case will be fixed by register_netdev() */
         }
 
+        dev->vlan_features = dev->features;
+
         /* Configuration may specify what MAC to use.  Otherwise random. */
         if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC,
                                   offsetof(struct virtio_net_config, mac),
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index eae7a03d4f9b..55a62cae2cb4 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1293,7 +1293,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
                         skb->protocol = eth_type_trans(skb, adapter->netdev);
 
                         if (unlikely(rcd->ts))
-                                __vlan_hwaccel_put_tag(skb, rcd->tci);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), rcd->tci);
 
                         if (adapter->netdev->features & NETIF_F_LRO)
                                 netif_receive_skb(skb);
@@ -1931,7 +1931,7 @@ vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter)
 
 
 static int
-vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+vmxnet3_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
 
@@ -1953,7 +1953,7 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 
 
 static int
-vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
 
@@ -2107,7 +2107,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                 devRead->misc.uptFeatures |= UPT1_F_LRO;
                 devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS);
         }
-        if (adapter->netdev->features & NETIF_F_HW_VLAN_RX)
+        if (adapter->netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
 
         devRead->misc.mtu = cpu_to_le32(adapter->netdev->mtu);
@@ -2669,14 +2669,15 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter, bool dma64)
         struct net_device *netdev = adapter->netdev;
 
         netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
-                NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_TX |
-                NETIF_F_HW_VLAN_RX | NETIF_F_TSO | NETIF_F_TSO6 |
+                NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_CTAG_TX |
+                NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_TSO | NETIF_F_TSO6 |
                 NETIF_F_LRO;
         if (dma64)
                 netdev->hw_features |= NETIF_F_HIGHDMA;
         netdev->vlan_features = netdev->hw_features &
-                                ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-        netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_FILTER;
+                                ~(NETIF_F_HW_VLAN_CTAG_TX |
+                                  NETIF_F_HW_VLAN_CTAG_RX);
+        netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;
 }
 
 
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 63a124340cbe..600ab56c0008 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -263,7 +263,8 @@ int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features)
         unsigned long flags;
         netdev_features_t changed = features ^ netdev->features;
 
-        if (changed & (NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_HW_VLAN_RX)) {
+        if (changed & (NETIF_F_RXCSUM | NETIF_F_LRO |
+                       NETIF_F_HW_VLAN_CTAG_RX)) {
                 if (features & NETIF_F_RXCSUM)
                         adapter->shared->devRead.misc.uptFeatures |=
                         UPT1_F_RXCSUM;
@@ -279,7 +280,7 @@ int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features)
                         adapter->shared->devRead.misc.uptFeatures &=
                                                         ~UPT1_F_LRO;
 
-                if (features & NETIF_F_HW_VLAN_RX)
+                if (features & NETIF_F_HW_VLAN_CTAG_RX)
                         adapter->shared->devRead.misc.uptFeatures |=
                         UPT1_F_RXVLAN;
                 else
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 7cee7a3068ec..ba81f3c39a83 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1,14 +1,13 @@
 /*
  * VXLAN: Virtual eXtensible Local Area Network
  *
- * Copyright (c) 2012 Vyatta Inc.
+ * Copyright (c) 2012-2013 Vyatta Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
  * TODO
- *  - use IANA UDP port number (when defined)
  *  - IPv6 (not in RFC)
  */
 
@@ -33,7 +32,7 @@
 #include <net/arp.h>
 #include <net/ndisc.h>
 #include <net/ip.h>
-#include <net/ipip.h>
+#include <net/ip_tunnels.h>
 #include <net/icmp.h>
 #include <net/udp.h>
 #include <net/rtnetlink.h>
@@ -65,7 +64,10 @@ struct vxlanhdr {
         __be32 vx_vni;
 };
 
-/* UDP port for VXLAN traffic. */
+/* UDP port for VXLAN traffic.
+ * The IANA assigned port is 4789, but the Linux default is 8472
+ * for compatability with early adopters.
+ */
 static unsigned int vxlan_port __read_mostly = 8472;
 module_param_named(udp_port, vxlan_port, uint, 0444);
 MODULE_PARM_DESC(udp_port, "Destination UDP port");
@@ -81,35 +83,34 @@ struct vxlan_net {
         struct hlist_head vni_list[VNI_HASH_SIZE];
 };
 
+struct vxlan_rdst {
+        struct rcu_head          rcu;
+        __be32                   remote_ip;
+        __be16                   remote_port;
+        u32                      remote_vni;
+        u32                      remote_ifindex;
+        struct vxlan_rdst       *remote_next;
+};
+
 /* Forwarding table entry */
 struct vxlan_fdb {
         struct hlist_node hlist;        /* linked list of entries */
         struct rcu_head   rcu;
         unsigned long     updated;      /* jiffies */
         unsigned long     used;
-        __be32            remote_ip;
+        struct vxlan_rdst remote;
         u16               state;        /* see ndm_state */
+        u8                flags;        /* see ndm_flags */
         u8                eth_addr[ETH_ALEN];
 };
 
-/* Per-cpu network traffic stats */
-struct vxlan_stats {
-        u64                     rx_packets;
-        u64                     rx_bytes;
-        u64                     tx_packets;
-        u64                     tx_bytes;
-        struct u64_stats_sync   syncp;
-};
-
 /* Pseudo network device */
 struct vxlan_dev {
         struct hlist_node hlist;
         struct net_device *dev;
-        struct vxlan_stats __percpu *stats;
-        __u32             vni;          /* virtual network id */
-        __be32            gaddr;        /* multicast group */
+        struct vxlan_rdst default_dst;  /* default destination */
         __be32            saddr;        /* source address */
-        unsigned int      link;         /* link to multicast over */
+        __be16            dst_port;
         __u16             port_min;     /* source port range */
         __u16             port_max;
         __u8              tos;          /* TOS override */
@@ -147,7 +148,7 @@ static struct vxlan_dev *vxlan_find_vni(struct net *net, u32 id)
         struct vxlan_dev *vxlan;
 
         hlist_for_each_entry_rcu(vxlan, vni_head(net, id), hlist) {
-                if (vxlan->vni == id)
+                if (vxlan->default_dst.remote_vni == id)
                         return vxlan;
         }
 
@@ -157,7 +158,8 @@ static struct vxlan_dev *vxlan_find_vni(struct net *net, u32 id)
 /* Fill in neighbour message in skbuff. */
 static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
                            const struct vxlan_fdb *fdb,
-                           u32 portid, u32 seq, int type, unsigned int flags)
+                           u32 portid, u32 seq, int type, unsigned int flags,
+                           const struct vxlan_rdst *rdst)
 {
         unsigned long now = jiffies;
         struct nda_cacheinfo ci;
@@ -176,19 +178,29 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
 
         if (type == RTM_GETNEIGH) {
                 ndm->ndm_family = AF_INET;
-                send_ip = fdb->remote_ip != 0;
+                send_ip = rdst->remote_ip != htonl(INADDR_ANY);
                 send_eth = !is_zero_ether_addr(fdb->eth_addr);
         } else
                 ndm->ndm_family = AF_BRIDGE;
         ndm->ndm_state = fdb->state;
         ndm->ndm_ifindex = vxlan->dev->ifindex;
-        ndm->ndm_flags = NTF_SELF;
+        ndm->ndm_flags = fdb->flags;
         ndm->ndm_type = NDA_DST;
 
         if (send_eth && nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->eth_addr))
                 goto nla_put_failure;
 
-        if (send_ip && nla_put_be32(skb, NDA_DST, fdb->remote_ip))
+        if (send_ip && nla_put_be32(skb, NDA_DST, rdst->remote_ip))
+                goto nla_put_failure;
+
+        if (rdst->remote_port && rdst->remote_port != vxlan->dst_port &&
+            nla_put_be16(skb, NDA_PORT, rdst->remote_port))
+                goto nla_put_failure;
+        if (rdst->remote_vni != vxlan->default_dst.remote_vni &&
+            nla_put_be32(skb, NDA_VNI, rdst->remote_vni))
+                goto nla_put_failure;
+        if (rdst->remote_ifindex &&
+            nla_put_u32(skb, NDA_IFINDEX, rdst->remote_ifindex))
                 goto nla_put_failure;
 
         ci.ndm_used      = jiffies_to_clock_t(now - fdb->used);
@@ -211,6 +223,9 @@ static inline size_t vxlan_nlmsg_size(void)
         return NLMSG_ALIGN(sizeof(struct ndmsg))
                 + nla_total_size(ETH_ALEN) /* NDA_LLADDR */
                 + nla_total_size(sizeof(__be32)) /* NDA_DST */
+                + nla_total_size(sizeof(__be16)) /* NDA_PORT */
+                + nla_total_size(sizeof(__be32)) /* NDA_VNI */
+                + nla_total_size(sizeof(__u32)) /* NDA_IFINDEX */
                 + nla_total_size(sizeof(struct nda_cacheinfo));
 }
 
@@ -225,7 +240,7 @@ static void vxlan_fdb_notify(struct vxlan_dev *vxlan,
         if (skb == NULL)
                 goto errout;
 
-        err = vxlan_fdb_info(skb, vxlan, fdb, 0, 0, type, 0);
+        err = vxlan_fdb_info(skb, vxlan, fdb, 0, 0, type, 0, &fdb->remote);
         if (err < 0) {
                 /* -EMSGSIZE implies BUG in vxlan_nlmsg_size() */
                 WARN_ON(err == -EMSGSIZE);
@@ -247,7 +262,8 @@ static void vxlan_ip_miss(struct net_device *dev, __be32 ipa)
 
         memset(&f, 0, sizeof f);
         f.state = NUD_STALE;
-        f.remote_ip = ipa; /* goes to NDA_DST */
+        f.remote.remote_ip = ipa; /* goes to NDA_DST */
+        f.remote.remote_vni = VXLAN_N_VID;
 
         vxlan_fdb_notify(vxlan, &f, RTM_GETNEIGH);
 }
@@ -300,10 +316,39 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,
         return NULL;
 }
 
+/* Add/update destinations for multicast */
+static int vxlan_fdb_append(struct vxlan_fdb *f,
+                            __be32 ip, __be16 port, __u32 vni, __u32 ifindex)
+{
+        struct vxlan_rdst *rd_prev, *rd;
+
+        rd_prev = NULL;
+        for (rd = &f->remote; rd; rd = rd->remote_next) {
+                if (rd->remote_ip == ip &&
+                    rd->remote_port == port &&
+                    rd->remote_vni == vni &&
+                    rd->remote_ifindex == ifindex)
+                        return 0;
+                rd_prev = rd;
+        }
+        rd = kmalloc(sizeof(*rd), GFP_ATOMIC);
+        if (rd == NULL)
+                return -ENOBUFS;
+        rd->remote_ip = ip;
+        rd->remote_port = port;
+        rd->remote_vni = vni;
+        rd->remote_ifindex = ifindex;
+        rd->remote_next = NULL;
+        rd_prev->remote_next = rd;
+        return 1;
+}
+
 /* Add new entry to forwarding table -- assumes lock held */
 static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                             const u8 *mac, __be32 ip,
-                            __u16 state, __u16 flags)
+                            __u16 state, __u16 flags,
+                            __be16 port, __u32 vni, __u32 ifindex,
+                            __u8 ndm_flags)
 {
         struct vxlan_fdb *f;
         int notify = 0;
@@ -320,6 +365,19 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                         f->updated = jiffies;
                         notify = 1;
                 }
+                if (f->flags != ndm_flags) {
+                        f->flags = ndm_flags;
+                        f->updated = jiffies;
+                        notify = 1;
+                }
+                if ((flags & NLM_F_APPEND) &&
+                    is_multicast_ether_addr(f->eth_addr)) {
+                        int rc = vxlan_fdb_append(f, ip, port, vni, ifindex);
+
+                        if (rc < 0)
+                                return rc;
+                        notify |= rc;
+                }
         } else {
                 if (!(flags & NLM_F_CREATE))
                         return -ENOENT;
@@ -333,8 +391,13 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                         return -ENOMEM;
 
                 notify = 1;
-                f->remote_ip = ip;
+                f->remote.remote_ip = ip;
+                f->remote.remote_port = port;
+                f->remote.remote_vni = vni;
+                f->remote.remote_ifindex = ifindex;
+                f->remote.remote_next = NULL;
                 f->state = state;
+                f->flags = ndm_flags;
                 f->updated = f->used = jiffies;
                 memcpy(f->eth_addr, mac, ETH_ALEN);
 
@@ -349,6 +412,19 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
         return 0;
 }
 
+static void vxlan_fdb_free(struct rcu_head *head)
+{
+        struct vxlan_fdb *f = container_of(head, struct vxlan_fdb, rcu);
+
+        while (f->remote.remote_next) {
+                struct vxlan_rdst *rd = f->remote.remote_next;
+
+                f->remote.remote_next = rd->remote_next;
+                kfree(rd);
+        }
+        kfree(f);
+}
+
 static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f)
 {
         netdev_dbg(vxlan->dev,
@@ -358,7 +434,7 @@ static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f)
         vxlan_fdb_notify(vxlan, f, RTM_DELNEIGH);
 
         hlist_del_rcu(&f->hlist);
-        kfree_rcu(f, rcu);
+        call_rcu(&f->rcu, vxlan_fdb_free);
 }
 
 /* Add static entry (via netlink) */
@@ -367,7 +443,10 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                          const unsigned char *addr, u16 flags)
 {
         struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct net *net = dev_net(vxlan->dev);
         __be32 ip;
+        __be16 port;
+        u32 vni, ifindex;
         int err;
 
         if (!(ndm->ndm_state & (NUD_PERMANENT|NUD_REACHABLE))) {
@@ -384,8 +463,36 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 
         ip = nla_get_be32(tb[NDA_DST]);
 
+        if (tb[NDA_PORT]) {
+                if (nla_len(tb[NDA_PORT]) != sizeof(__be16))
+                        return -EINVAL;
+                port = nla_get_be16(tb[NDA_PORT]);
+        } else
+                port = vxlan->dst_port;
+
+        if (tb[NDA_VNI]) {
+                if (nla_len(tb[NDA_VNI]) != sizeof(u32))
+                        return -EINVAL;
+                vni = nla_get_u32(tb[NDA_VNI]);
+        } else
+                vni = vxlan->default_dst.remote_vni;
+
+        if (tb[NDA_IFINDEX]) {
+                struct net_device *tdev;
+
+                if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32))
+                        return -EINVAL;
+                ifindex = nla_get_u32(tb[NDA_IFINDEX]);
+                tdev = dev_get_by_index(net, ifindex);
+                if (!tdev)
+                        return -EADDRNOTAVAIL;
+                dev_put(tdev);
+        } else
+                ifindex = 0;
+
         spin_lock_bh(&vxlan->hash_lock);
-        err = vxlan_fdb_create(vxlan, addr, ip, ndm->ndm_state, flags);
+        err = vxlan_fdb_create(vxlan, addr, ip, ndm->ndm_state, flags,
+                               port, vni, ifindex, ndm->ndm_flags);
         spin_unlock_bh(&vxlan->hash_lock);
 
         return err;
@@ -423,18 +530,21 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                 int err;
 
                 hlist_for_each_entry_rcu(f, &vxlan->fdb_head[h], hlist) {
-                        if (idx < cb->args[0])
-                                goto skip;
-
-                        err = vxlan_fdb_info(skb, vxlan, f,
-                                             NETLINK_CB(cb->skb).portid,
-                                             cb->nlh->nlmsg_seq,
-                                             RTM_NEWNEIGH,
-                                             NLM_F_MULTI);
-                        if (err < 0)
-                                break;
+                        struct vxlan_rdst *rd;
+                        for (rd = &f->remote; rd; rd = rd->remote_next) {
+                                if (idx < cb->args[0])
+                                        goto skip;
+
+                                err = vxlan_fdb_info(skb, vxlan, f,
+                                                     NETLINK_CB(cb->skb).portid,
+                                                     cb->nlh->nlmsg_seq,
+                                                     RTM_NEWNEIGH,
+                                                     NLM_F_MULTI, rd);
+                                if (err < 0)
+                                        break;
 skip:
-                        ++idx;
+                                ++idx;
+                        }
                 }
         }
 
@@ -454,22 +564,25 @@ static void vxlan_snoop(struct net_device *dev,
         f = vxlan_find_mac(vxlan, src_mac);
         if (likely(f)) {
                 f->used = jiffies;
-                if (likely(f->remote_ip == src_ip))
+                if (likely(f->remote.remote_ip == src_ip))
                         return;
 
                 if (net_ratelimit())
                         netdev_info(dev,
                                     "%pM migrated from %pI4 to %pI4\n",
-                                    src_mac, &f->remote_ip, &src_ip);
+                                    src_mac, &f->remote.remote_ip, &src_ip);
 
-                f->remote_ip = src_ip;
+                f->remote.remote_ip = src_ip;
                 f->updated = jiffies;
         } else {
                 /* learned new entry */
                 spin_lock(&vxlan->hash_lock);
                 err = vxlan_fdb_create(vxlan, src_mac, src_ip,
                                        NUD_REACHABLE,
-                                       NLM_F_EXCL|NLM_F_CREATE);
+                                       NLM_F_EXCL|NLM_F_CREATE,
+                                       vxlan->dst_port,
+                                       vxlan->default_dst.remote_vni,
+                                       0, NTF_SELF);
                 spin_unlock(&vxlan->hash_lock);
         }
 }
@@ -490,7 +603,7 @@ static bool vxlan_group_used(struct vxlan_net *vn,
                         if (!netif_running(vxlan->dev))
                                 continue;
 
-                        if (vxlan->gaddr == this->gaddr)
+                        if (vxlan->default_dst.remote_ip == this->default_dst.remote_ip)
                                 return true;
                 }
 
@@ -504,8 +617,8 @@ static int vxlan_join_group(struct net_device *dev)
         struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
         struct sock *sk = vn->sock->sk;
         struct ip_mreqn mreq = {
-                .imr_multiaddr.s_addr   = vxlan->gaddr,
-                .imr_ifindex            = vxlan->link,
+                .imr_multiaddr.s_addr   = vxlan->default_dst.remote_ip,
+                .imr_ifindex            = vxlan->default_dst.remote_ifindex,
         };
         int err;
 
@@ -532,8 +645,8 @@ static int vxlan_leave_group(struct net_device *dev)
         int err = 0;
         struct sock *sk = vn->sock->sk;
         struct ip_mreqn mreq = {
-                .imr_multiaddr.s_addr   = vxlan->gaddr,
-                .imr_ifindex            = vxlan->link,
+                .imr_multiaddr.s_addr   = vxlan->default_dst.remote_ip,
+                .imr_ifindex            = vxlan->default_dst.remote_ifindex,
         };
 
         /* Only leave group when last vxlan is done. */
@@ -556,7 +669,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
         struct iphdr *oip;
         struct vxlanhdr *vxh;
         struct vxlan_dev *vxlan;
-        struct vxlan_stats *stats;
+        struct pcpu_tstats *stats;
         __u32 vni;
         int err;
 
@@ -632,7 +745,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                 }
         }
 
-        stats = this_cpu_ptr(vxlan->stats);
+        stats = this_cpu_ptr(vxlan->dev->tstats);
         u64_stats_update_begin(&stats->syncp);
         stats->rx_packets++;
         stats->rx_bytes += skb->len;
@@ -691,7 +804,6 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb)
         n = neigh_lookup(&arp_tbl, &tip, dev);
 
         if (n) {
-                struct vxlan_dev *vxlan = netdev_priv(dev);
                 struct vxlan_fdb *f;
                 struct sk_buff  *reply;
 
@@ -701,7 +813,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb)
                 }
 
                 f = vxlan_find_mac(vxlan, n->ha);
-                if (f && f->remote_ip == 0) {
+                if (f && f->remote.remote_ip == htonl(INADDR_ANY)) {
                         /* bridge-local neighbor */
                         neigh_release(n);
                         goto out;
@@ -763,28 +875,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
         return false;
 }
 
-/* Extract dsfield from inner protocol */
-static inline u8 vxlan_get_dsfield(const struct iphdr *iph,
-                                   const struct sk_buff *skb)
-{
-        if (skb->protocol == htons(ETH_P_IP))
-                return iph->tos;
-        else if (skb->protocol == htons(ETH_P_IPV6))
-                return ipv6_get_dsfield((const struct ipv6hdr *)iph);
-        else
-                return 0;
-}
-
-/* Propogate ECN bits out */
-static inline u8 vxlan_ecn_encap(u8 tos,
-                                 const struct iphdr *iph,
-                                 const struct sk_buff *skb)
-{
-        u8 inner = vxlan_get_dsfield(iph, skb);
-
-        return INET_ECN_encapsulate(tos, inner);
-}
-
 static void vxlan_sock_free(struct sk_buff *skb)
 {
         sock_put(skb->sk);
@@ -807,7 +897,7 @@ static void vxlan_set_owner(struct net_device *dev, struct sk_buff *skb)
  *     better and maybe available from hardware
  *   secondary choice is to use jhash on the Ethernet header
  */
-static u16 vxlan_src_port(const struct vxlan_dev *vxlan, struct sk_buff *skb)
+static __be16 vxlan_src_port(const struct vxlan_dev *vxlan, struct sk_buff *skb)
 {
         unsigned int range = (vxlan->port_max - vxlan->port_min) + 1;
         u32 hash;
@@ -817,71 +907,78 @@ static u16 vxlan_src_port(const struct vxlan_dev *vxlan, struct sk_buff *skb)
                 hash = jhash(skb->data, 2 * ETH_ALEN,
                              (__force u32) skb->protocol);
 
-        return (((u64) hash * range) >> 32) + vxlan->port_min;
+        return htons((((u64) hash * range) >> 32) + vxlan->port_min);
 }
 
-/* Transmit local packets over Vxlan
- *
- * Outer IP header inherits ECN and DF from inner header.
- * Outer UDP destination is the VXLAN assigned port.
- *           source port is based on hash of flow
- */
-static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
+static int handle_offloads(struct sk_buff *skb)
+{
+        if (skb_is_gso(skb)) {
+                int err = skb_unclone(skb, GFP_ATOMIC);
+                if (unlikely(err))
+                        return err;
+
+                skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL;
+        } else if (skb->ip_summed != CHECKSUM_PARTIAL)
+                skb->ip_summed = CHECKSUM_NONE;
+
+        return 0;
+}
+
+/* Bypass encapsulation if the destination is local */
+static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
+                               struct vxlan_dev *dst_vxlan)
+{
+        struct pcpu_tstats *tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
+        struct pcpu_tstats *rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);
+
+        skb->pkt_type = PACKET_HOST;
+        skb->encapsulation = 0;
+        skb->dev = dst_vxlan->dev;
+        __skb_pull(skb, skb_network_offset(skb));
+
+        if (dst_vxlan->flags & VXLAN_F_LEARN)
+                vxlan_snoop(skb->dev, htonl(INADDR_LOOPBACK),
+                            eth_hdr(skb)->h_source);
+
+        u64_stats_update_begin(&tx_stats->syncp);
+        tx_stats->tx_packets++;
+        tx_stats->tx_bytes += skb->len;
+        u64_stats_update_end(&tx_stats->syncp);
+
+        if (netif_rx(skb) == NET_RX_SUCCESS) {
+                u64_stats_update_begin(&rx_stats->syncp);
+                rx_stats->rx_packets++;
+                rx_stats->rx_bytes += skb->len;
+                u64_stats_update_end(&rx_stats->syncp);
+        } else {
+                skb->dev->stats.rx_dropped++;
+        }
+}
+
+static netdev_tx_t vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
+                                  struct vxlan_rdst *rdst, bool did_rsc)
 {
         struct vxlan_dev *vxlan = netdev_priv(dev);
         struct rtable *rt;
         const struct iphdr *old_iph;
-        struct ethhdr *eth;
         struct iphdr *iph;
         struct vxlanhdr *vxh;
         struct udphdr *uh;
         struct flowi4 fl4;
-        unsigned int pkt_len = skb->len;
         __be32 dst;
-        __u16 src_port;
+        __be16 src_port, dst_port;
+        u32 vni;
         __be16 df = 0;
         __u8 tos, ttl;
-        int err;
-        bool did_rsc = false;
-        const struct vxlan_fdb *f;
-
-        skb_reset_mac_header(skb);
-        eth = eth_hdr(skb);
 
-        if ((vxlan->flags & VXLAN_F_PROXY) && ntohs(eth->h_proto) == ETH_P_ARP)
-                return arp_reduce(dev, skb);
-        else if ((vxlan->flags&VXLAN_F_RSC) && ntohs(eth->h_proto) == ETH_P_IP)
-                did_rsc = route_shortcircuit(dev, skb);
-
-        f = vxlan_find_mac(vxlan, eth->h_dest);
-        if (f == NULL) {
-                did_rsc = false;
-                dst = vxlan->gaddr;
-                if (!dst && (vxlan->flags & VXLAN_F_L2MISS) &&
-                    !is_multicast_ether_addr(eth->h_dest))
-                        vxlan_fdb_miss(vxlan, eth->h_dest);
-        } else
-                dst = f->remote_ip;
+        dst_port = rdst->remote_port ? rdst->remote_port : vxlan->dst_port;
+        vni = rdst->remote_vni;
+        dst = rdst->remote_ip;
 
         if (!dst) {
                 if (did_rsc) {
-                        __skb_pull(skb, skb_network_offset(skb));
-                        skb->ip_summed = CHECKSUM_NONE;
-                        skb->pkt_type = PACKET_HOST;
-
                         /* short-circuited back to local bridge */
-                        if (netif_rx(skb) == NET_RX_SUCCESS) {
-                                struct vxlan_stats *stats =
-                                                this_cpu_ptr(vxlan->stats);
-
-                                u64_stats_update_begin(&stats->syncp);
-                                stats->tx_packets++;
-                                stats->tx_bytes += pkt_len;
-                                u64_stats_update_end(&stats->syncp);
-                        } else {
-                                dev->stats.tx_errors++;
-                                dev->stats.tx_aborted_errors++;
-                        }
+                        vxlan_encap_bypass(skb, vxlan, vxlan);
                         return NETDEV_TX_OK;
                 }
                 goto drop;
@@ -904,12 +1001,12 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 
         tos = vxlan->tos;
         if (tos == 1)
-                tos = vxlan_get_dsfield(old_iph, skb);
+                tos = ip_tunnel_get_dsfield(old_iph, skb);
 
         src_port = vxlan_src_port(vxlan, skb);
 
         memset(&fl4, 0, sizeof(fl4));
-        fl4.flowi4_oif = vxlan->link;
+        fl4.flowi4_oif = rdst->remote_ifindex;
         fl4.flowi4_tos = RT_TOS(tos);
         fl4.daddr = dst;
         fl4.saddr = vxlan->saddr;
@@ -928,6 +1025,19 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto tx_error;
         }
 
+        /* Bypass encapsulation if the destination is local */
+        if (rt->rt_flags & RTCF_LOCAL &&
+            !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) {
+                struct vxlan_dev *dst_vxlan;
+
+                ip_rt_put(rt);
+                dst_vxlan = vxlan_find_vni(dev_net(dev), vni);
+                if (!dst_vxlan)
+                        goto tx_error;
+                vxlan_encap_bypass(skb, vxlan, dst_vxlan);
+                return NETDEV_TX_OK;
+        }
+
         memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
         IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
                               IPSKB_REROUTED);
@@ -936,14 +1046,14 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 
         vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
         vxh->vx_flags = htonl(VXLAN_FLAGS);
-        vxh->vx_vni = htonl(vxlan->vni << 8);
+        vxh->vx_vni = htonl(vni << 8);
 
         __skb_push(skb, sizeof(*uh));
         skb_reset_transport_header(skb);
         uh = udp_hdr(skb);
 
-        uh->dest = htons(vxlan_port);
-        uh->source = htons(src_port);
+        uh->dest = dst_port;
+        uh->source = src_port;
 
         uh->len = htons(skb->len);
         uh->check = 0;
@@ -955,7 +1065,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
         iph->ihl        = sizeof(struct iphdr) >> 2;
         iph->frag_off   = df;
         iph->protocol   = IPPROTO_UDP;
-        iph->tos        = vxlan_ecn_encap(tos, old_iph, skb);
+        iph->tos        = ip_tunnel_ecn_encap(tos, old_iph, skb);
         iph->daddr      = dst;
         iph->saddr      = fl4.saddr;
         iph->ttl        = ttl ? : ip4_dst_hoplimit(&rt->dst);
@@ -965,22 +1075,10 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 
         vxlan_set_owner(dev, skb);
 
-        /* See iptunnel_xmit() */
-        if (skb->ip_summed != CHECKSUM_PARTIAL)
-                skb->ip_summed = CHECKSUM_NONE;
-
-        err = ip_local_out(skb);
-        if (likely(net_xmit_eval(err) == 0)) {
-                struct vxlan_stats *stats = this_cpu_ptr(vxlan->stats);
+        if (handle_offloads(skb))
+                goto drop;
 
-                u64_stats_update_begin(&stats->syncp);
-                stats->tx_packets++;
-                stats->tx_bytes += pkt_len;
-                u64_stats_update_end(&stats->syncp);
-        } else {
-                dev->stats.tx_errors++;
-                dev->stats.tx_aborted_errors++;
-        }
+        iptunnel_xmit(skb, dev);
         return NETDEV_TX_OK;
 
 drop:
@@ -994,6 +1092,65 @@ tx_free:
         return NETDEV_TX_OK;
 }
 
+/* Transmit local packets over Vxlan
+ *
+ * Outer IP header inherits ECN and DF from inner header.
+ * Outer UDP destination is the VXLAN assigned port.
+ *           source port is based on hash of flow
+ */
+static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct ethhdr *eth;
+        bool did_rsc = false;
+        struct vxlan_rdst *rdst0, *rdst;
+        struct vxlan_fdb *f;
+        int rc1, rc;
+
+        skb_reset_mac_header(skb);
+        eth = eth_hdr(skb);
+
+        if ((vxlan->flags & VXLAN_F_PROXY) && ntohs(eth->h_proto) == ETH_P_ARP)
+                return arp_reduce(dev, skb);
+
+        f = vxlan_find_mac(vxlan, eth->h_dest);
+        did_rsc = false;
+
+        if (f && (f->flags & NTF_ROUTER) && (vxlan->flags & VXLAN_F_RSC) &&
+            ntohs(eth->h_proto) == ETH_P_IP) {
+                did_rsc = route_shortcircuit(dev, skb);
+                if (did_rsc)
+                        f = vxlan_find_mac(vxlan, eth->h_dest);
+        }
+
+        if (f == NULL) {
+                rdst0 = &vxlan->default_dst;
+
+                if (rdst0->remote_ip == htonl(INADDR_ANY) &&
+                    (vxlan->flags & VXLAN_F_L2MISS) &&
+                    !is_multicast_ether_addr(eth->h_dest))
+                        vxlan_fdb_miss(vxlan, eth->h_dest);
+        } else
+                rdst0 = &f->remote;
+
+        rc = NETDEV_TX_OK;
+
+        /* if there are multiple destinations, send copies */
+        for (rdst = rdst0->remote_next; rdst; rdst = rdst->remote_next) {
+                struct sk_buff *skb1;
+
+                skb1 = skb_clone(skb, GFP_ATOMIC);
+                rc1 = vxlan_xmit_one(skb1, dev, rdst, did_rsc);
+                if (rc == NETDEV_TX_OK)
+                        rc = rc1;
+        }
+
+        rc1 = vxlan_xmit_one(skb, dev, rdst0, did_rsc);
+        if (rc == NETDEV_TX_OK)
+                rc = rc1;
+        return rc;
+}
+
 /* Walk the forwarding table and purge stale entries */
 static void vxlan_cleanup(unsigned long arg)
 {
@@ -1034,10 +1191,8 @@ static void vxlan_cleanup(unsigned long arg)
 /* Setup stats when device is created */
 static int vxlan_init(struct net_device *dev)
 {
-        struct vxlan_dev *vxlan = netdev_priv(dev);
-
-        vxlan->stats = alloc_percpu(struct vxlan_stats);
-        if (!vxlan->stats)
+        dev->tstats = alloc_percpu(struct pcpu_tstats);
+        if (!dev->tstats)
                 return -ENOMEM;
 
         return 0;
@@ -1049,7 +1204,7 @@ static int vxlan_open(struct net_device *dev)
         struct vxlan_dev *vxlan = netdev_priv(dev);
         int err;
 
-        if (vxlan->gaddr) {
+        if (IN_MULTICAST(ntohl(vxlan->default_dst.remote_ip))) {
                 err = vxlan_join_group(dev);
                 if (err)
                         return err;
@@ -1083,7 +1238,7 @@ static int vxlan_stop(struct net_device *dev)
 {
         struct vxlan_dev *vxlan = netdev_priv(dev);
 
-        if (vxlan->gaddr)
+        if (IN_MULTICAST(ntohl(vxlan->default_dst.remote_ip)))
                 vxlan_leave_group(dev);
 
         del_timer_sync(&vxlan->age_timer);
@@ -1093,49 +1248,6 @@ static int vxlan_stop(struct net_device *dev)
         return 0;
 }
 
-/* Merge per-cpu statistics */
-static struct rtnl_link_stats64 *vxlan_stats64(struct net_device *dev,
-                                               struct rtnl_link_stats64 *stats)
-{
-        struct vxlan_dev *vxlan = netdev_priv(dev);
-        struct vxlan_stats tmp, sum = { 0 };
-        unsigned int cpu;
-
-        for_each_possible_cpu(cpu) {
-                unsigned int start;
-                const struct vxlan_stats *stats
-                        = per_cpu_ptr(vxlan->stats, cpu);
-
-                do {
-                        start = u64_stats_fetch_begin_bh(&stats->syncp);
-                        memcpy(&tmp, stats, sizeof(tmp));
-                } while (u64_stats_fetch_retry_bh(&stats->syncp, start));
-
-                sum.tx_bytes   += tmp.tx_bytes;
-                sum.tx_packets += tmp.tx_packets;
-                sum.rx_bytes   += tmp.rx_bytes;
-                sum.rx_packets += tmp.rx_packets;
-        }
-
-        stats->tx_bytes   = sum.tx_bytes;
-        stats->tx_packets = sum.tx_packets;
-        stats->rx_bytes   = sum.rx_bytes;
-        stats->rx_packets = sum.rx_packets;
-
-        stats->multicast = dev->stats.multicast;
-        stats->rx_length_errors = dev->stats.rx_length_errors;
-        stats->rx_frame_errors = dev->stats.rx_frame_errors;
-        stats->rx_errors = dev->stats.rx_errors;
-
-        stats->tx_dropped = dev->stats.tx_dropped;
-        stats->tx_carrier_errors  = dev->stats.tx_carrier_errors;
-        stats->tx_aborted_errors  = dev->stats.tx_aborted_errors;
-        stats->collisions  = dev->stats.collisions;
-        stats->tx_errors = dev->stats.tx_errors;
-
-        return stats;
-}
-
 /* Stub, nothing needs to be done. */
 static void vxlan_set_multicast_list(struct net_device *dev)
 {
@@ -1146,7 +1258,7 @@ static const struct net_device_ops vxlan_netdev_ops = {
         .ndo_open               = vxlan_open,
         .ndo_stop               = vxlan_stop,
         .ndo_start_xmit         = vxlan_xmit,
-        .ndo_get_stats64        = vxlan_stats64,
+        .ndo_get_stats64        = ip_tunnel_get_stats64,
         .ndo_set_rx_mode        = vxlan_set_multicast_list,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
@@ -1163,9 +1275,7 @@ static struct device_type vxlan_type = {
 
 static void vxlan_free(struct net_device *dev)
 {
-        struct vxlan_dev *vxlan = netdev_priv(dev);
-
-        free_percpu(vxlan->stats);
+        free_percpu(dev->tstats);
         free_netdev(dev);
 }
 
@@ -1189,8 +1299,10 @@ static void vxlan_setup(struct net_device *dev)
         dev->features   |= NETIF_F_NETNS_LOCAL;
         dev->features   |= NETIF_F_SG | NETIF_F_HW_CSUM;
         dev->features   |= NETIF_F_RXCSUM;
+        dev->features   |= NETIF_F_GSO_SOFTWARE;
 
         dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
+        dev->hw_features |= NETIF_F_GSO_SOFTWARE;
         dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
         dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 
@@ -1203,6 +1315,7 @@ static void vxlan_setup(struct net_device *dev)
         inet_get_local_port_range(&low, &high);
         vxlan->port_min = low;
         vxlan->port_max = high;
+        vxlan->dst_port = htons(vxlan_port);
 
         vxlan->dev = dev;
 
@@ -1225,6 +1338,7 @@ static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {
         [IFLA_VXLAN_RSC]        = { .type = NLA_U8 },
         [IFLA_VXLAN_L2MISS]     = { .type = NLA_U8 },
         [IFLA_VXLAN_L3MISS]     = { .type = NLA_U8 },
+        [IFLA_VXLAN_PORT]       = { .type = NLA_U16 },
 };
 
 static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -1250,14 +1364,6 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])
                         return -ERANGE;
         }
 
-        if (data[IFLA_VXLAN_GROUP]) {
-                __be32 gaddr = nla_get_be32(data[IFLA_VXLAN_GROUP]);
-                if (!IN_MULTICAST(ntohl(gaddr))) {
-                        pr_debug("group address is not IPv4 multicast\n");
-                        return -EADDRNOTAVAIL;
-                }
-        }
-
         if (data[IFLA_VXLAN_PORT_RANGE]) {
                 const struct ifla_vxlan_port_range *p
                         = nla_data(data[IFLA_VXLAN_PORT_RANGE]);
@@ -1288,6 +1394,7 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
                          struct nlattr *tb[], struct nlattr *data[])
 {
         struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct vxlan_rdst *dst = &vxlan->default_dst;
         __u32 vni;
         int err;
 
@@ -1299,21 +1406,21 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
                 pr_info("duplicate VNI %u\n", vni);
                 return -EEXIST;
         }
-        vxlan->vni = vni;
+        dst->remote_vni = vni;
 
         if (data[IFLA_VXLAN_GROUP])
-                vxlan->gaddr = nla_get_be32(data[IFLA_VXLAN_GROUP]);
+                dst->remote_ip = nla_get_be32(data[IFLA_VXLAN_GROUP]);
 
         if (data[IFLA_VXLAN_LOCAL])
                 vxlan->saddr = nla_get_be32(data[IFLA_VXLAN_LOCAL]);
 
         if (data[IFLA_VXLAN_LINK] &&
-            (vxlan->link = nla_get_u32(data[IFLA_VXLAN_LINK]))) {
+            (dst->remote_ifindex = nla_get_u32(data[IFLA_VXLAN_LINK]))) {
                 struct net_device *lowerdev
-                         = __dev_get_by_index(net, vxlan->link);
+                         = __dev_get_by_index(net, dst->remote_ifindex);
 
                 if (!lowerdev) {
-                        pr_info("ifindex %d does not exist\n", vxlan->link);
+                        pr_info("ifindex %d does not exist\n", dst->remote_ifindex);
                         return -ENODEV;
                 }
 
@@ -1361,11 +1468,14 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
                 vxlan->port_max = ntohs(p->high);
         }
 
+        if (data[IFLA_VXLAN_PORT])
+                vxlan->dst_port = nla_get_be16(data[IFLA_VXLAN_PORT]);
+
         SET_ETHTOOL_OPS(dev, &vxlan_ethtool_ops);
 
         err = register_netdevice(dev);
         if (!err)
-                hlist_add_head_rcu(&vxlan->hlist, vni_head(net, vxlan->vni));
+                hlist_add_head_rcu(&vxlan->hlist, vni_head(net, dst->remote_vni));
 
         return err;
 }
@@ -1396,24 +1506,26 @@ static size_t vxlan_get_size(const struct net_device *dev)
                 nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_AGEING */
                 nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_LIMIT */
                 nla_total_size(sizeof(struct ifla_vxlan_port_range)) +
+                nla_total_size(sizeof(__be16))+ /* IFLA_VXLAN_PORT */
                 0;
 }
 
 static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
         const struct vxlan_dev *vxlan = netdev_priv(dev);
+        const struct vxlan_rdst *dst = &vxlan->default_dst;
         struct ifla_vxlan_port_range ports = {
                 .low =  htons(vxlan->port_min),
                 .high = htons(vxlan->port_max),
         };
 
-        if (nla_put_u32(skb, IFLA_VXLAN_ID, vxlan->vni))
+        if (nla_put_u32(skb, IFLA_VXLAN_ID, dst->remote_vni))
                 goto nla_put_failure;
 
-        if (vxlan->gaddr && nla_put_be32(skb, IFLA_VXLAN_GROUP, vxlan->gaddr))
+        if (dst->remote_ip && nla_put_be32(skb, IFLA_VXLAN_GROUP, dst->remote_ip))
                 goto nla_put_failure;
 
-        if (vxlan->link && nla_put_u32(skb, IFLA_VXLAN_LINK, vxlan->link))
+        if (dst->remote_ifindex && nla_put_u32(skb, IFLA_VXLAN_LINK, dst->remote_ifindex))
                 goto nla_put_failure;
 
         if (vxlan->saddr && nla_put_be32(skb, IFLA_VXLAN_LOCAL, vxlan->saddr))
@@ -1431,7 +1543,8 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
             nla_put_u8(skb, IFLA_VXLAN_L3MISS,
                         !!(vxlan->flags & VXLAN_F_L3MISS)) ||
             nla_put_u32(skb, IFLA_VXLAN_AGEING, vxlan->age_interval) ||
-            nla_put_u32(skb, IFLA_VXLAN_LIMIT, vxlan->addrmax))
+            nla_put_u32(skb, IFLA_VXLAN_LIMIT, vxlan->addrmax) ||
+            nla_put_be16(skb, IFLA_VXLAN_PORT, vxlan->dst_port))
                 goto nla_put_failure;
 
         if (nla_put(skb, IFLA_VXLAN_PORT_RANGE, sizeof(ports), &ports))
@@ -1555,10 +1668,11 @@ static void __exit vxlan_cleanup_module(void)
 {
         rtnl_link_unregister(&vxlan_link_ops);
         unregister_pernet_device(&vxlan_net_ops);
+        rcu_barrier();
 }
 module_exit(vxlan_cleanup_module);
 
 MODULE_LICENSE("GPL");
 MODULE_VERSION(VXLAN_VERSION);
-MODULE_AUTHOR("Stephen Hemminger <shemminger@vyatta.com>");
+MODULE_AUTHOR("Stephen Hemminger <stephen@networkplumber.org>");
 MODULE_ALIAS_RTNL_LINK("vxlan");
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 3d339e04efb7..f9a24e599dee 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1293,7 +1293,8 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed)
 {
         struct adm8211_priv *priv = dev->priv;
         struct ieee80211_conf *conf = &dev->conf;
-        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        int channel =
+                ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);
 
         if (channel != priv->channel) {
                 priv->channel = channel;
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 5ac5f7ae2721..34c8a33cac06 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1943,12 +1943,12 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed)
         struct at76_priv *priv = hw->priv;
 
         at76_dbg(DBG_MAC80211, "%s(): channel %d",
-                 __func__, hw->conf.channel->hw_value);
+                 __func__, hw->conf.chandef.chan->hw_value);
         at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:");
 
         mutex_lock(&priv->mtx);
 
-        priv->channel = hw->conf.channel->hw_value;
+        priv->channel = hw->conf.chandef.chan->hw_value;
 
         if (is_valid_ether_addr(priv->bssid))
                 at76_join(priv);
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c
index 7157f7d311c5..17d7fece35d2 100644
--- a/drivers/net/wireless/ath/ar5523/ar5523.c
+++ b/drivers/net/wireless/ath/ar5523/ar5523.c
@@ -457,14 +457,14 @@ static int ar5523_set_chan(struct ar5523 *ar)
         memset(&reset, 0, sizeof(reset));
         reset.flags |= cpu_to_be32(UATH_CHAN_2GHZ);
         reset.flags |= cpu_to_be32(UATH_CHAN_OFDM);
-        reset.freq = cpu_to_be32(conf->channel->center_freq);
+        reset.freq = cpu_to_be32(conf->chandef.chan->center_freq);
         reset.maxrdpower = cpu_to_be32(50);     /* XXX */
         reset.channelchange = cpu_to_be32(1);
         reset.keeprccontent = cpu_to_be32(0);
 
         ar5523_dbg(ar, "set chan flags 0x%x freq %d\n",
                    be32_to_cpu(reset.flags),
-                   conf->channel->center_freq);
+                   conf->chandef.chan->center_freq);
         return ar5523_cmd_write(ar, WDCMSG_RESET, &reset, sizeof(reset), 0);
 }
 
@@ -594,7 +594,7 @@ static void ar5523_data_rx_cb(struct urb *urb)
         rx_status = IEEE80211_SKB_RXCB(data->skb);
         memset(rx_status, 0, sizeof(*rx_status));
         rx_status->freq = be32_to_cpu(desc->channel);
-        rx_status->band = hw->conf.channel->band;
+        rx_status->band = hw->conf.chandef.chan->band;
         rx_status->signal = -95 + be32_to_cpu(desc->rssi);
 
         ieee80211_rx_irqsafe(hw, data->skb);
@@ -1091,7 +1091,7 @@ static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
         return ret;
 }
 
-static void ar5523_flush(struct ieee80211_hw *hw, bool drop)
+static void ar5523_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct ar5523 *ar = hw->priv;
 
@@ -1153,13 +1153,13 @@ static int ar5523_get_wlan_mode(struct ar5523 *ar,
         struct ieee80211_sta *sta;
         u32 sta_rate_set;
 
-        band = ar->hw->wiphy->bands[ar->hw->conf.channel->band];
+        band = ar->hw->wiphy->bands[ar->hw->conf.chandef.chan->band];
         sta = ieee80211_find_sta(ar->vif, bss_conf->bssid);
         if (!sta) {
                 ar5523_info(ar, "STA not found!\n");
                 return WLAN_MODE_11b;
         }
-        sta_rate_set = sta->supp_rates[ar->hw->conf.channel->band];
+        sta_rate_set = sta->supp_rates[ar->hw->conf.chandef.chan->band];
 
         for (bit = 0; bit < band->n_bitrates; bit++) {
                 if (sta_rate_set & 1) {
@@ -1197,11 +1197,11 @@ static void ar5523_create_rateset(struct ar5523 *ar,
                 ar5523_info(ar, "STA not found. Cannot set rates\n");
                 sta_rate_set = bss_conf->basic_rates;
         } else
-                sta_rate_set = sta->supp_rates[ar->hw->conf.channel->band];
+                sta_rate_set = sta->supp_rates[ar->hw->conf.chandef.chan->band];
 
         ar5523_dbg(ar, "sta rate_set = %08x\n", sta_rate_set);
 
-        band = ar->hw->wiphy->bands[ar->hw->conf.channel->band];
+        band = ar->hw->wiphy->bands[ar->hw->conf.chandef.chan->band];
         for (bit = 0; bit < band->n_bitrates; bit++) {
                 BUG_ON(i >= AR5523_MAX_NRATES);
                 ar5523_dbg(ar, "Considering rate %d : %d\n",
diff --git a/drivers/net/wireless/ath/ath5k/Makefile b/drivers/net/wireless/ath/ath5k/Makefile
index f60b3899afc4..1b3a34f7f224 100644
--- a/drivers/net/wireless/ath/ath5k/Makefile
+++ b/drivers/net/wireless/ath/ath5k/Makefile
@@ -10,6 +10,7 @@ ath5k-y				+= phy.o
 ath5k-y                         += reset.o
 ath5k-y                         += attach.o
 ath5k-y                         += base.o
+CFLAGS_base.o                   += -I$(src)
 ath5k-y                         += led.o
 ath5k-y                         += rfkill.o
 ath5k-y                         += ani.o
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 3150def17193..2d691b8b95b9 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -1523,7 +1523,8 @@ int ath5k_hw_dma_stop(struct ath5k_hw *ah);
 /* EEPROM access functions */
 int ath5k_eeprom_init(struct ath5k_hw *ah);
 void ath5k_eeprom_detach(struct ath5k_hw *ah);
-
+int ath5k_eeprom_mode_from_channel(struct ath5k_hw *ah,
+                struct ieee80211_channel *channel);
 
 /* Protocol Control Unit Functions */
 /* Helpers */
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 1d264c0f5a9b..9b20d9ee2719 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2639,7 +2639,7 @@ int ath5k_start(struct ieee80211_hw *hw)
          * be followed by initialization of the appropriate bits
          * and then setup of the interrupt mask.
          */
-        ah->curchan = ah->hw->conf.channel;
+        ah->curchan = ah->hw->conf.chandef.chan;
         ah->imask = AR5K_INT_RXOK
                 | AR5K_INT_RXERR
                 | AR5K_INT_RXEOL
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index b7e0258887e7..94d34ee02265 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -1779,7 +1779,8 @@ ath5k_eeprom_detach(struct ath5k_hw *ah)
 }
 
 int
-ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel)
+ath5k_eeprom_mode_from_channel(struct ath5k_hw *ah,
+                struct ieee80211_channel *channel)
 {
         switch (channel->hw_value) {
         case AR5K_MODE_11A:
@@ -1789,6 +1790,7 @@ ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel)
         case AR5K_MODE_11B:
                 return AR5K_EEPROM_MODE_11B;
         default:
-                return -1;
+                ATH5K_WARN(ah, "channel is not A/B/G!");
+                return AR5K_EEPROM_MODE_11A;
         }
 }
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h
index 94a9bbea6874..693296ee9693 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.h
+++ b/drivers/net/wireless/ath/ath5k/eeprom.h
@@ -493,6 +493,3 @@ struct ath5k_eeprom_info {
         /* Antenna raw switch tables */
         u32     ee_antenna[AR5K_EEPROM_N_MODES][AR5K_ANT_MAX];
 };
-
-int
-ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel);
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 4264341533ea..06f86f435711 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -202,7 +202,7 @@ ath5k_config(struct ieee80211_hw *hw, u32 changed)
         mutex_lock(&ah->lock);
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-                ret = ath5k_chan_set(ah, conf->channel);
+                ret = ath5k_chan_set(ah, conf->chandef.chan);
                 if (ret < 0)
                         goto unlock;
         }
@@ -678,7 +678,7 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey)
 
         memcpy(survey, &ah->survey, sizeof(*survey));
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->noise = ah->ah_noise_floor;
         survey->filled = SURVEY_INFO_NOISE_DBM |
                         SURVEY_INFO_CHANNEL_TIME |
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index a78afa98c650..d6bc7cb61bfb 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1612,11 +1612,7 @@ ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
 
         ah->ah_cal_mask |= AR5K_CALIBRATION_NF;
 
-        ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);
-        if (WARN_ON(ee_mode < 0)) {
-                ah->ah_cal_mask &= ~AR5K_CALIBRATION_NF;
-                return;
-        }
+        ee_mode = ath5k_eeprom_mode_from_channel(ah, ah->ah_current_channel);
 
         /* completed NF calibration, test threshold */
         nf = ath5k_hw_read_measured_noise_floor(ah);
@@ -2317,12 +2313,7 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
 
         def_ant = ah->ah_def_ant;
 
-        ee_mode = ath5k_eeprom_mode_from_channel(channel);
-        if (ee_mode < 0) {
-                ATH5K_ERR(ah,
-                        "invalid channel: %d\n", channel->center_freq);
-                return;
-        }
+        ee_mode = ath5k_eeprom_mode_from_channel(ah, channel);
 
         switch (ant_mode) {
         case AR5K_ANTMODE_DEFAULT:
@@ -3622,12 +3613,7 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                 return -EINVAL;
         }
 
-        ee_mode = ath5k_eeprom_mode_from_channel(channel);
-        if (ee_mode < 0) {
-                ATH5K_ERR(ah,
-                        "invalid channel: %d\n", channel->center_freq);
-                return -EINVAL;
-        }
+        ee_mode = ath5k_eeprom_mode_from_channel(ah, channel);
 
         /* Initialize TX power table */
         switch (ah->ah_radio) {
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index e2d8b2cf19eb..a3399c4f13a9 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -984,9 +984,7 @@ ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
         if (ah->ah_version == AR5K_AR5210)
                 return;
 
-        ee_mode = ath5k_eeprom_mode_from_channel(channel);
-        if (WARN_ON(ee_mode < 0))
-                return;
+        ee_mode = ath5k_eeprom_mode_from_channel(ah, channel);
 
         /* Adjust power delta for channel 14 */
         if (channel->center_freq == 2484)
diff --git a/drivers/net/wireless/ath/ath5k/trace.h b/drivers/net/wireless/ath/ath5k/trace.h
index 00f015819344..c6eef519bb61 100644
--- a/drivers/net/wireless/ath/ath5k/trace.h
+++ b/drivers/net/wireless/ath/ath5k/trace.h
@@ -97,7 +97,7 @@ TRACE_EVENT(ath5k_tx_complete,
 #if defined(CONFIG_ATH5K_TRACER) && !defined(__CHECKER__)
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/net/wireless/ath/ath5k
+#define TRACE_INCLUDE_PATH .
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE trace
 
diff --git a/drivers/net/wireless/ath/ath6kl/Kconfig b/drivers/net/wireless/ath/ath6kl/Kconfig
index 630c83db056e..e39e5860a2e9 100644
--- a/drivers/net/wireless/ath/ath6kl/Kconfig
+++ b/drivers/net/wireless/ath/ath6kl/Kconfig
@@ -30,6 +30,15 @@ config ATH6KL_DEBUG
         ---help---
           Enables debug support
 
+config ATH6KL_TRACING
+        bool "Atheros ath6kl tracing support"
+        depends on ATH6KL
+        depends on EVENT_TRACING
+        ---help---
+          Select this to ath6kl use tracing infrastructure.
+
+          If unsure, say Y to make it easier to debug problems.
+
 config ATH6KL_REGDOMAIN
         bool "Atheros ath6kl regdomain support"
         depends on ATH6KL
diff --git a/drivers/net/wireless/ath/ath6kl/Makefile b/drivers/net/wireless/ath/ath6kl/Makefile
index cab0ec0d5380..dc2b3b46781e 100644
--- a/drivers/net/wireless/ath/ath6kl/Makefile
+++ b/drivers/net/wireless/ath/ath6kl/Makefile
@@ -35,10 +35,15 @@ ath6kl_core-y += txrx.o
 ath6kl_core-y += wmi.o
 ath6kl_core-y += core.o
 ath6kl_core-y += recovery.o
+
 ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
+ath6kl_core-$(CONFIG_ATH6KL_TRACING) += trace.o
 
 obj-$(CONFIG_ATH6KL_SDIO) += ath6kl_sdio.o
 ath6kl_sdio-y += sdio.o
 
 obj-$(CONFIG_ATH6KL_USB) += ath6kl_usb.o
 ath6kl_usb-y += usb.o
+
+# for tracing framework to find trace.h
+CFLAGS_trace.o := -I$(src)
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 752ffc4f4166..5c9736a94e54 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -402,7 +402,7 @@ static bool ath6kl_is_valid_iftype(struct ath6kl *ar, enum nl80211_iftype type,
         if (type == NL80211_IFTYPE_STATION ||
             type == NL80211_IFTYPE_AP || type == NL80211_IFTYPE_ADHOC) {
                 for (i = 0; i < ar->vif_max; i++) {
-                        if ((ar->avail_idx_map >> i) & BIT(0)) {
+                        if ((ar->avail_idx_map) & BIT(i)) {
                                 *if_idx = i;
                                 return true;
                         }
@@ -412,7 +412,7 @@ static bool ath6kl_is_valid_iftype(struct ath6kl *ar, enum nl80211_iftype type,
         if (type == NL80211_IFTYPE_P2P_CLIENT ||
             type == NL80211_IFTYPE_P2P_GO) {
                 for (i = ar->max_norm_iface; i < ar->vif_max; i++) {
-                        if ((ar->avail_idx_map >> i) & BIT(0)) {
+                        if ((ar->avail_idx_map) & BIT(i)) {
                                 *if_idx = i;
                                 return true;
                         }
@@ -1535,7 +1535,9 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy,
 
         ath6kl_cfg80211_vif_stop(vif, test_bit(WMI_READY, &ar->flag));
 
+        rtnl_lock();
         ath6kl_cfg80211_vif_cleanup(vif);
+        rtnl_unlock();
 
         return 0;
 }
@@ -2990,13 +2992,15 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev,
 {
         struct ath6kl *ar = ath6kl_priv(dev);
         struct ath6kl_vif *vif = netdev_priv(dev);
+        int err;
 
         if (vif->nw_type != AP_NETWORK)
                 return -EOPNOTSUPP;
 
-        /* Use this only for authorizing/unauthorizing a station */
-        if (!(params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED)))
-                return -EOPNOTSUPP;
+        err = cfg80211_check_station_change(wiphy, params,
+                                            CFG80211_STA_AP_MLME_CLIENT);
+        if (err)
+                return err;
 
         if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))
                 return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx,
@@ -3659,7 +3663,6 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
         vif->sme_state = SME_DISCONNECTED;
         set_bit(WLAN_ENABLED, &vif->flags);
         ar->wlan_pwr_state = WLAN_POWER_STATE_ON;
-        set_bit(NETDEV_REGISTERED, &vif->flags);
 
         if (type == NL80211_IFTYPE_ADHOC)
                 ar->ibss_if_active = true;
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 61b2f98b4e77..26b0f92424e1 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -560,7 +560,6 @@ enum ath6kl_vif_state {
         WMM_ENABLED,
         NETQ_STOPPED,
         DTIM_EXPIRED,
-        NETDEV_REGISTERED,
         CLEAR_BSSFILTER_ON_BEACON,
         DTIM_PERIOD_AVAIL,
         WLAN_ENABLED,
@@ -936,8 +935,6 @@ void aggr_recv_addba_req_evt(struct ath6kl_vif *vif, u8 tid, u16 seq_no,
                              u8 win_sz);
 void ath6kl_wakeup_event(void *dev);
 
-void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,
-                         bool wait_fot_compltn, bool cold_reset);
 void ath6kl_init_control_info(struct ath6kl_vif *vif);
 struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar);
 void ath6kl_cfg80211_vif_stop(struct ath6kl_vif *vif, bool wmi_ready);
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 15cfe30e54fd..fe38b836cb26 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -56,6 +56,60 @@ int ath6kl_printk(const char *level, const char *fmt, ...)
 }
 EXPORT_SYMBOL(ath6kl_printk);
 
+int ath6kl_info(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+        int ret;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+        ret = ath6kl_printk(KERN_INFO, "%pV", &vaf);
+        trace_ath6kl_log_info(&vaf);
+        va_end(args);
+
+        return ret;
+}
+EXPORT_SYMBOL(ath6kl_info);
+
+int ath6kl_err(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+        int ret;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+        ret = ath6kl_printk(KERN_ERR, "%pV", &vaf);
+        trace_ath6kl_log_err(&vaf);
+        va_end(args);
+
+        return ret;
+}
+EXPORT_SYMBOL(ath6kl_err);
+
+int ath6kl_warn(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+        int ret;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+        ret = ath6kl_printk(KERN_WARNING, "%pV", &vaf);
+        trace_ath6kl_log_warn(&vaf);
+        va_end(args);
+
+        return ret;
+}
+EXPORT_SYMBOL(ath6kl_warn);
+
 #ifdef CONFIG_ATH6KL_DEBUG
 
 void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...)
@@ -63,15 +117,15 @@ void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...)
         struct va_format vaf;
         va_list args;
 
-        if (!(debug_mask & mask))
-                return;
-
         va_start(args, fmt);
 
         vaf.fmt = fmt;
         vaf.va = &args;
 
-        ath6kl_printk(KERN_DEBUG, "%pV", &vaf);
+        if (debug_mask & mask)
+                ath6kl_printk(KERN_DEBUG, "%pV", &vaf);
+
+        trace_ath6kl_log_dbg(mask, &vaf);
 
         va_end(args);
 }
@@ -87,6 +141,10 @@ void ath6kl_dbg_dump(enum ATH6K_DEBUG_MASK mask,
 
                 print_hex_dump_bytes(prefix, DUMP_PREFIX_OFFSET, buf, len);
         }
+
+        /* tracing code doesn't like null strings :/ */
+        trace_ath6kl_log_dbg_dump(msg ? msg : "", prefix ? prefix : "",
+                                  buf, len);
 }
 EXPORT_SYMBOL(ath6kl_dbg_dump);
 
@@ -1752,8 +1810,10 @@ int ath6kl_debug_init_fs(struct ath6kl *ar)
         debugfs_create_file("tgt_stats", S_IRUSR, ar->debugfs_phy, ar,
                             &fops_tgt_stats);
 
-        debugfs_create_file("credit_dist_stats", S_IRUSR, ar->debugfs_phy, ar,
-                            &fops_credit_dist_stats);
+        if (ar->hif_type == ATH6KL_HIF_TYPE_SDIO)
+                debugfs_create_file("credit_dist_stats", S_IRUSR,
+                                    ar->debugfs_phy, ar,
+                                    &fops_credit_dist_stats);
 
         debugfs_create_file("endpoint_stats", S_IRUSR | S_IWUSR,
                             ar->debugfs_phy, ar, &fops_endpoint_stats);
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index f97cd4ead543..74369de00fb5 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -19,6 +19,7 @@
 #define DEBUG_H
 
 #include "hif.h"
+#include "trace.h"
 
 enum ATH6K_DEBUG_MASK {
         ATH6KL_DBG_CREDIT       = BIT(0),
@@ -51,13 +52,9 @@ enum ATH6K_DEBUG_MASK {
 extern unsigned int debug_mask;
 extern __printf(2, 3)
 int ath6kl_printk(const char *level, const char *fmt, ...);
-
-#define ath6kl_info(fmt, ...)                           \
-        ath6kl_printk(KERN_INFO, fmt, ##__VA_ARGS__)
-#define ath6kl_err(fmt, ...)                                    \
-        ath6kl_printk(KERN_ERR, fmt, ##__VA_ARGS__)
-#define ath6kl_warn(fmt, ...)                                   \
-        ath6kl_printk(KERN_WARNING, fmt, ##__VA_ARGS__)
+extern __printf(1, 2) int ath6kl_info(const char *fmt, ...);
+extern __printf(1, 2) int ath6kl_err(const char *fmt, ...);
+extern __printf(1, 2) int ath6kl_warn(const char *fmt, ...);
 
 enum ath6kl_war {
         ATH6KL_WAR_INVALID_RATE,
diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c
index a6b614421fa4..fea7709b5dda 100644
--- a/drivers/net/wireless/ath/ath6kl/hif.c
+++ b/drivers/net/wireless/ath/ath6kl/hif.c
@@ -22,6 +22,7 @@
 #include "target.h"
 #include "hif-ops.h"
 #include "debug.h"
+#include "trace.h"
 
 #define MAILBOX_FOR_BLOCK_SIZE          1
 
@@ -436,6 +437,8 @@ static int proc_pending_irqs(struct ath6kl_device *dev, bool *done)
 
                 ath6kl_dump_registers(dev, &dev->irq_proc_reg,
                                       &dev->irq_en_reg);
+                trace_ath6kl_sdio_irq(&dev->irq_en_reg,
+                                      sizeof(dev->irq_en_reg));
 
                 /* Update only those registers that are enabled */
                 host_int_status = dev->irq_proc_reg.host_int_status &
diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index fbb78dfe078f..65e5b719093d 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -19,6 +19,8 @@
 #include "hif.h"
 #include "debug.h"
 #include "hif-ops.h"
+#include "trace.h"
+
 #include <asm/unaligned.h>
 
 #define CALC_TXRX_PADDED_LEN(dev, len)  (__ALIGN_MASK((len), (dev)->block_mask))
@@ -537,6 +539,8 @@ static int ath6kl_htc_tx_issue(struct htc_target *target,
                                 packet->buf, padded_len,
                                 HIF_WR_ASYNC_BLOCK_INC, packet);
 
+        trace_ath6kl_htc_tx(status, packet->endpoint, packet->buf, send_len);
+
         return status;
 }
 
@@ -757,7 +761,8 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
 {
         struct htc_target *target = endpoint->target;
         struct hif_scatter_req *scat_req = NULL;
-        int n_scat, n_sent_bundle = 0, tot_pkts_bundle = 0;
+        int n_scat, n_sent_bundle = 0, tot_pkts_bundle = 0, i;
+        struct htc_packet *packet;
         int status;
         u32 txb_mask;
         u8 ac = WMM_NUM_AC;
@@ -832,6 +837,13 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
                 ath6kl_dbg(ATH6KL_DBG_HTC,
                            "htc tx scatter bytes %d entries %d\n",
                            scat_req->len, scat_req->scat_entries);
+
+                for (i = 0; i < scat_req->scat_entries; i++) {
+                        packet = scat_req->scat_list[i].packet;
+                        trace_ath6kl_htc_tx(packet->status, packet->endpoint,
+                                            packet->buf, packet->act_len);
+                }
+
                 ath6kl_hif_submit_scat_req(target->dev, scat_req, false);
 
                 if (status)
@@ -1903,6 +1915,7 @@ static void ath6kl_htc_rx_complete(struct htc_endpoint *endpoint,
                 ath6kl_dbg(ATH6KL_DBG_HTC,
                            "htc rx complete ep %d packet 0x%p\n",
                            endpoint->eid, packet);
+
                 endpoint->ep_cb.rx(endpoint->target, packet);
 }
 
@@ -2011,6 +2024,9 @@ static int ath6kl_htc_rx_process_packets(struct htc_target *target,
         list_for_each_entry_safe(packet, tmp_pkt, comp_pktq, list) {
                 ep = &target->endpoint[packet->endpoint];
 
+                trace_ath6kl_htc_rx(packet->status, packet->endpoint,
+                                    packet->buf, packet->act_len);
+
                 /* process header for each of the recv packet */
                 status = ath6kl_htc_rx_process_hdr(target, packet, lk_ahds,
                                                    n_lk_ahd);
@@ -2291,6 +2307,9 @@ static struct htc_packet *htc_wait_for_ctrl_msg(struct htc_target *target)
         if (ath6kl_htc_rx_packet(target, packet, packet->act_len))
                 goto fail_ctrl_rx;
 
+        trace_ath6kl_htc_rx(packet->status, packet->endpoint,
+                            packet->buf, packet->act_len);
+
         /* process receive header */
         packet->status = ath6kl_htc_rx_process_hdr(target, packet, NULL, NULL);
 
diff --git a/drivers/net/wireless/ath/ath6kl/htc_pipe.c b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
index 281390178e3d..67aa924ed8b3 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
@@ -988,8 +988,6 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,
 
         htc_hdr = (struct htc_frame_hdr *) netdata;
 
-        ep = &target->endpoint[htc_hdr->eid];
-
         if (htc_hdr->eid >= ENDPOINT_MAX) {
                 ath6kl_dbg(ATH6KL_DBG_HTC,
                            "HTC Rx: invalid EndpointID=%d\n",
@@ -997,6 +995,7 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,
                 status = -EINVAL;
                 goto free_skb;
         }
+        ep = &target->endpoint[htc_hdr->eid];
 
         payload_len = le16_to_cpu(get_unaligned(&htc_hdr->payld_len));
 
@@ -1168,8 +1167,8 @@ static int htc_wait_recv_ctrl_message(struct htc_target *target)
         }
 
         if (count <= 0) {
-                ath6kl_dbg(ATH6KL_DBG_HTC, "%s: Timeout!\n", __func__);
-                return -ECOMM;
+                ath6kl_warn("htc pipe control receive timeout!\n");
+                return -ETIMEDOUT;
         }
 
         return 0;
@@ -1582,16 +1581,16 @@ static int ath6kl_htc_pipe_wait_target(struct htc_target *target)
                 return status;
 
         if (target->pipe.ctrl_response_len < sizeof(*ready_msg)) {
-                ath6kl_dbg(ATH6KL_DBG_HTC, "invalid htc ready msg len:%d!\n",
-                           target->pipe.ctrl_response_len);
+                ath6kl_warn("invalid htc pipe ready msg len: %d\n",
+                            target->pipe.ctrl_response_len);
                 return -ECOMM;
         }
 
         ready_msg = (struct htc_ready_ext_msg *) target->pipe.ctrl_response_buf;
 
         if (ready_msg->ver2_0_info.msg_id != cpu_to_le16(HTC_MSG_READY_ID)) {
-                ath6kl_dbg(ATH6KL_DBG_HTC, "invalid htc ready msg : 0x%X !\n",
-                           ready_msg->ver2_0_info.msg_id);
+                ath6kl_warn("invalid htc pipe ready msg: 0x%x\n",
+                            ready_msg->ver2_0_info.msg_id);
                 return -ECOMM;
         }
 
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 5d434cf88f35..40ffee6184fd 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -201,8 +201,8 @@ struct sk_buff *ath6kl_buf_alloc(int size)
         u16 reserved;
 
         /* Add chacheline space at front and back of buffer */
-        reserved = (2 * L1_CACHE_BYTES) + ATH6KL_DATA_OFFSET +
-                   sizeof(struct htc_packet) + ATH6KL_HTC_ALIGN_BYTES;
+        reserved = roundup((2 * L1_CACHE_BYTES) + ATH6KL_DATA_OFFSET +
+                   sizeof(struct htc_packet) + ATH6KL_HTC_ALIGN_BYTES, 4);
         skb = dev_alloc_skb(size + reserved);
 
         if (skb)
@@ -1549,10 +1549,89 @@ static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type)
         return NULL;
 }
 
+
+static const struct fw_capa_str_map {
+        int id;
+        const char *name;
+} fw_capa_map[] = {
+        { ATH6KL_FW_CAPABILITY_HOST_P2P, "host-p2p" },
+        { ATH6KL_FW_CAPABILITY_SCHED_SCAN, "sched-scan" },
+        { ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX, "sta-p2pdev-duplex" },
+        { ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT, "inactivity-timeout" },
+        { ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE, "rsn-cap-override" },
+        { ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER, "wow-mc-filter" },
+        { ATH6KL_FW_CAPABILITY_BMISS_ENHANCE, "bmiss-enhance" },
+        { ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST, "sscan-match-list" },
+        { ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD, "rssi-scan-thold" },
+        { ATH6KL_FW_CAPABILITY_CUSTOM_MAC_ADDR, "custom-mac-addr" },
+        { ATH6KL_FW_CAPABILITY_TX_ERR_NOTIFY, "tx-err-notify" },
+        { ATH6KL_FW_CAPABILITY_REGDOMAIN, "regdomain" },
+        { ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2, "sched-scan-v2" },
+        { ATH6KL_FW_CAPABILITY_HEART_BEAT_POLL, "hb-poll" },
+};
+
+static const char *ath6kl_init_get_fw_capa_name(unsigned int id)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(fw_capa_map); i++) {
+                if (fw_capa_map[i].id == id)
+                        return fw_capa_map[i].name;
+        }
+
+        return "<unknown>";
+}
+
+static void ath6kl_init_get_fwcaps(struct ath6kl *ar, char *buf, size_t buf_len)
+{
+        u8 *data = (u8 *) ar->fw_capabilities;
+        size_t trunc_len, len = 0;
+        int i, index, bit;
+        char *trunc = "...";
+
+        for (i = 0; i < ATH6KL_FW_CAPABILITY_MAX; i++) {
+                index = i / 8;
+                bit = i % 8;
+
+                if (index >= sizeof(ar->fw_capabilities) * 4)
+                        break;
+
+                if (buf_len - len < 4) {
+                        ath6kl_warn("firmware capability buffer too small!\n");
+
+                        /* add "..." to the end of string */
+                        trunc_len = strlen(trunc) + 1;
+                        strncpy(buf + buf_len - trunc_len, trunc, trunc_len);
+
+                        return;
+                }
+
+                if (data[index] & (1 << bit)) {
+                        len += scnprintf(buf + len, buf_len - len, "%s,",
+                                            ath6kl_init_get_fw_capa_name(i));
+                }
+        }
+
+        /* overwrite the last comma */
+        if (len > 0)
+                len--;
+
+        buf[len] = '\0';
+}
+
+static int ath6kl_init_hw_reset(struct ath6kl *ar)
+{
+        ath6kl_dbg(ATH6KL_DBG_BOOT, "cold resetting the device");
+
+        return ath6kl_diag_write32(ar, RESET_CONTROL_ADDRESS,
+                                   cpu_to_le32(RESET_CONTROL_COLD_RST));
+}
+
 static int __ath6kl_init_hw_start(struct ath6kl *ar)
 {
         long timeleft;
         int ret, i;
+        char buf[200];
 
         ath6kl_dbg(ATH6KL_DBG_BOOT, "hw start\n");
 
@@ -1569,24 +1648,35 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
                 goto err_power_off;
 
         /* Do we need to finish the BMI phase */
-        /* FIXME: return error from ath6kl_bmi_done() */
-        if (ath6kl_bmi_done(ar)) {
-                ret = -EIO;
+        ret = ath6kl_bmi_done(ar);
+        if (ret)
                 goto err_power_off;
-        }
 
         /*
          * The reason we have to wait for the target here is that the
          * driver layer has to init BMI in order to set the host block
          * size.
          */
-        if (ath6kl_htc_wait_target(ar->htc_target)) {
-                ret = -EIO;
+        ret = ath6kl_htc_wait_target(ar->htc_target);
+
+        if (ret == -ETIMEDOUT) {
+                /*
+                 * Most likely USB target is in odd state after reboot and
+                 * needs a reset. A cold reset makes the whole device
+                 * disappear from USB bus and initialisation starts from
+                 * beginning.
+                 */
+                ath6kl_warn("htc wait target timed out, resetting device\n");
+                ath6kl_init_hw_reset(ar);
+                goto err_power_off;
+        } else if (ret) {
+                ath6kl_err("htc wait target failed: %d\n", ret);
                 goto err_power_off;
         }
 
-        if (ath6kl_init_service_ep(ar)) {
-                ret = -EIO;
+        ret = ath6kl_init_service_ep(ar);
+        if (ret) {
+                ath6kl_err("Endpoint service initilisation failed: %d\n", ret);
                 goto err_cleanup_scatter;
         }
 
@@ -1617,6 +1707,8 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
                             ar->wiphy->fw_version,
                             ar->fw_api,
                             test_bit(TESTMODE, &ar->flag) ? " testmode" : "");
+                ath6kl_init_get_fwcaps(ar, buf, sizeof(buf));
+                ath6kl_info("firmware supports: %s\n", buf);
         }
 
         if (ar->version.abi_ver != ATH6KL_ABI_VERSION) {
@@ -1765,9 +1857,7 @@ void ath6kl_stop_txrx(struct ath6kl *ar)
          * Try to reset the device if we can. The driver may have been
          * configure NOT to reset the target during a debug session.
          */
-        ath6kl_dbg(ATH6KL_DBG_TRC,
-                   "attempting to reset target on instance destroy\n");
-        ath6kl_reset_device(ar, ar->target_type, true, true);
+        ath6kl_init_hw_reset(ar);
 
         up(&ar->sem);
 }
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index bd50b6b7b492..d4fcfcad57d0 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -345,39 +345,6 @@ out:
         return ret;
 }
 
-/* FIXME: move to a better place, target.h? */
-#define AR6003_RESET_CONTROL_ADDRESS 0x00004000
-#define AR6004_RESET_CONTROL_ADDRESS 0x00004000
-
-void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,
-                         bool wait_fot_compltn, bool cold_reset)
-{
-        int status = 0;
-        u32 address;
-        __le32 data;
-
-        if (target_type != TARGET_TYPE_AR6003 &&
-            target_type != TARGET_TYPE_AR6004)
-                return;
-
-        data = cold_reset ? cpu_to_le32(RESET_CONTROL_COLD_RST) :
-                            cpu_to_le32(RESET_CONTROL_MBOX_RST);
-
-        switch (target_type) {
-        case TARGET_TYPE_AR6003:
-                address = AR6003_RESET_CONTROL_ADDRESS;
-                break;
-        case TARGET_TYPE_AR6004:
-                address = AR6004_RESET_CONTROL_ADDRESS;
-                break;
-        }
-
-        status = ath6kl_diag_write32(ar, address, data);
-
-        if (status)
-                ath6kl_err("failed to reset target\n");
-}
-
 static void ath6kl_install_static_wep_keys(struct ath6kl_vif *vif)
 {
         u8 index;
@@ -1327,9 +1294,11 @@ void init_netdev(struct net_device *dev)
         dev->watchdog_timeo = ATH6KL_TX_TIMEOUT;
 
         dev->needed_headroom = ETH_HLEN;
-        dev->needed_headroom += sizeof(struct ath6kl_llc_snap_hdr) +
-                                sizeof(struct wmi_data_hdr) + HTC_HDR_LENGTH
-                                + WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES;
+        dev->needed_headroom += roundup(sizeof(struct ath6kl_llc_snap_hdr) +
+                                        sizeof(struct wmi_data_hdr) +
+                                        HTC_HDR_LENGTH +
+                                        WMI_MAX_TX_META_SZ +
+                                        ATH6KL_HTC_ALIGN_BYTES, 4);
 
         dev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
 
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index d111980d44c0..fb141454c6d2 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -28,6 +28,7 @@
 #include "target.h"
 #include "debug.h"
 #include "cfg80211.h"
+#include "trace.h"
 
 struct ath6kl_sdio {
         struct sdio_func *func;
@@ -179,6 +180,8 @@ static int ath6kl_sdio_io(struct sdio_func *func, u32 request, u32 addr,
                    request & HIF_FIXED_ADDRESS ? " (fixed)" : "", buf, len);
         ath6kl_dbg_dump(ATH6KL_DBG_SDIO_DUMP, NULL, "sdio ", buf, len);
 
+        trace_ath6kl_sdio(addr, request, buf, len);
+
         return ret;
 }
 
@@ -309,6 +312,13 @@ static int ath6kl_sdio_scat_rw(struct ath6kl_sdio *ar_sdio,
         sdio_claim_host(ar_sdio->func);
 
         mmc_set_data_timeout(&data, ar_sdio->func->card);
+
+        trace_ath6kl_sdio_scat(scat_req->addr,
+                               scat_req->req,
+                               scat_req->len,
+                               scat_req->scat_entries,
+                               scat_req->scat_list);
+
         /* synchronous call to process request */
         mmc_wait_for_req(ar_sdio->func->card->host, &mmc_req);
 
@@ -1123,10 +1133,12 @@ static int ath6kl_sdio_bmi_write(struct ath6kl *ar, u8 *buf, u32 len)
 
         ret = ath6kl_sdio_read_write_sync(ar, addr, buf, len,
                                           HIF_WR_SYNC_BYTE_INC);
-        if (ret)
+        if (ret) {
                 ath6kl_err("unable to send the bmi data to the device\n");
+                return ret;
+        }
 
-        return ret;
+        return 0;
 }
 
 static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)
diff --git a/drivers/net/wireless/ath/ath6kl/target.h b/drivers/net/wireless/ath/ath6kl/target.h
index a98c12ba70c1..a580a629a0da 100644
--- a/drivers/net/wireless/ath/ath6kl/target.h
+++ b/drivers/net/wireless/ath/ath6kl/target.h
@@ -25,7 +25,7 @@
 #define AR6004_BOARD_DATA_SZ     6144
 #define AR6004_BOARD_EXT_DATA_SZ 0
 
-#define RESET_CONTROL_ADDRESS           0x00000000
+#define RESET_CONTROL_ADDRESS           0x00004000
 #define RESET_CONTROL_COLD_RST          0x00000100
 #define RESET_CONTROL_MBOX_RST          0x00000004
 
diff --git a/drivers/net/wireless/ath/ath6kl/trace.c b/drivers/net/wireless/ath/ath6kl/trace.c
new file mode 100644
index 000000000000..e7d64b1285cb
--- /dev/null
+++ b/drivers/net/wireless/ath/ath6kl/trace.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/module.h>
+
+#define CREATE_TRACE_POINTS
+#include "trace.h"
+
+EXPORT_TRACEPOINT_SYMBOL(ath6kl_sdio);
+EXPORT_TRACEPOINT_SYMBOL(ath6kl_sdio_scat);
diff --git a/drivers/net/wireless/ath/ath6kl/trace.h b/drivers/net/wireless/ath/ath6kl/trace.h
new file mode 100644
index 000000000000..1a1ea7881b4d
--- /dev/null
+++ b/drivers/net/wireless/ath/ath6kl/trace.h
@@ -0,0 +1,332 @@
+#if !defined(_ATH6KL_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
+
+#include <net/cfg80211.h>
+#include <linux/skbuff.h>
+#include <linux/tracepoint.h>
+#include "wmi.h"
+#include "hif.h"
+
+#if !defined(_ATH6KL_TRACE_H)
+static inline unsigned int ath6kl_get_wmi_id(void *buf, size_t buf_len)
+{
+        struct wmi_cmd_hdr *hdr = buf;
+
+        if (buf_len < sizeof(*hdr))
+                return 0;
+
+        return le16_to_cpu(hdr->cmd_id);
+}
+#endif /* __ATH6KL_TRACE_H */
+
+#define _ATH6KL_TRACE_H
+
+/* create empty functions when tracing is disabled */
+#if !defined(CONFIG_ATH6KL_TRACING)
+#undef TRACE_EVENT
+#define TRACE_EVENT(name, proto, ...) \
+static inline void trace_ ## name(proto) {}
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(...)
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(evt_class, name, proto, ...) \
+static inline void trace_ ## name(proto) {}
+#endif /* !CONFIG_ATH6KL_TRACING || __CHECKER__ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM ath6kl
+
+TRACE_EVENT(ath6kl_wmi_cmd,
+        TP_PROTO(void *buf, size_t buf_len),
+
+        TP_ARGS(buf, buf_len),
+
+        TP_STRUCT__entry(
+                __field(unsigned int, id)
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __entry->id = ath6kl_get_wmi_id(buf, buf_len);
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+        ),
+
+        TP_printk(
+                "id %d len %zd",
+                __entry->id, __entry->buf_len
+        )
+);
+
+TRACE_EVENT(ath6kl_wmi_event,
+        TP_PROTO(void *buf, size_t buf_len),
+
+        TP_ARGS(buf, buf_len),
+
+        TP_STRUCT__entry(
+                __field(unsigned int, id)
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __entry->id = ath6kl_get_wmi_id(buf, buf_len);
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+        ),
+
+        TP_printk(
+                "id %d len %zd",
+                __entry->id, __entry->buf_len
+        )
+);
+
+TRACE_EVENT(ath6kl_sdio,
+        TP_PROTO(unsigned int addr, int flags,
+                 void *buf, size_t buf_len),
+
+        TP_ARGS(addr, flags, buf, buf_len),
+
+        TP_STRUCT__entry(
+                __field(unsigned int, tx)
+                __field(unsigned int, addr)
+                __field(int, flags)
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __entry->addr = addr;
+                __entry->flags = flags;
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+
+                if (flags & HIF_WRITE)
+                        __entry->tx = 1;
+                else
+                        __entry->tx = 0;
+        ),
+
+        TP_printk(
+                "%s addr 0x%x flags 0x%x len %zd\n",
+                __entry->tx ? "tx" : "rx",
+                __entry->addr,
+                __entry->flags,
+                __entry->buf_len
+        )
+);
+
+TRACE_EVENT(ath6kl_sdio_scat,
+        TP_PROTO(unsigned int addr, int flags, unsigned int total_len,
+                 unsigned int entries, struct hif_scatter_item *list),
+
+        TP_ARGS(addr, flags, total_len, entries, list),
+
+        TP_STRUCT__entry(
+                __field(unsigned int, tx)
+                __field(unsigned int, addr)
+                __field(int, flags)
+                __field(unsigned int, entries)
+                __field(size_t, total_len)
+                __dynamic_array(unsigned int, len_array, entries)
+                __dynamic_array(u8, data, total_len)
+        ),
+
+        TP_fast_assign(
+                unsigned int *len_array;
+                int i, offset = 0;
+                size_t len;
+
+                __entry->addr = addr;
+                __entry->flags = flags;
+                __entry->entries = entries;
+                __entry->total_len = total_len;
+
+                if (flags & HIF_WRITE)
+                        __entry->tx = 1;
+                else
+                        __entry->tx = 0;
+
+                len_array = __get_dynamic_array(len_array);
+
+                for (i = 0; i < entries; i++) {
+                        len = list[i].len;
+
+                        memcpy((u8 *) __get_dynamic_array(data) + offset,
+                               list[i].buf, len);
+
+                        len_array[i] = len;
+                        offset += len;
+                }
+        ),
+
+        TP_printk(
+                "%s addr 0x%x flags 0x%x entries %d total_len %zd\n",
+                __entry->tx ? "tx" : "rx",
+                __entry->addr,
+                __entry->flags,
+                __entry->entries,
+                __entry->total_len
+        )
+);
+
+TRACE_EVENT(ath6kl_sdio_irq,
+        TP_PROTO(void *buf, size_t buf_len),
+
+        TP_ARGS(buf, buf_len),
+
+        TP_STRUCT__entry(
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+        ),
+
+        TP_printk(
+                "irq len %zd\n", __entry->buf_len
+        )
+);
+
+TRACE_EVENT(ath6kl_htc_rx,
+        TP_PROTO(int status, int endpoint, void *buf,
+                 size_t buf_len),
+
+        TP_ARGS(status, endpoint, buf, buf_len),
+
+        TP_STRUCT__entry(
+                __field(int, status)
+                __field(int, endpoint)
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __entry->status = status;
+                __entry->endpoint = endpoint;
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+        ),
+
+        TP_printk(
+                "status %d endpoint %d len %zd\n",
+                __entry->status,
+                __entry->endpoint,
+                __entry->buf_len
+        )
+);
+
+TRACE_EVENT(ath6kl_htc_tx,
+        TP_PROTO(int status, int endpoint, void *buf,
+                 size_t buf_len),
+
+        TP_ARGS(status, endpoint, buf, buf_len),
+
+        TP_STRUCT__entry(
+                __field(int, status)
+                __field(int, endpoint)
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __entry->status = status;
+                __entry->endpoint = endpoint;
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+        ),
+
+        TP_printk(
+                "status %d endpoint %d len %zd\n",
+                __entry->status,
+                __entry->endpoint,
+                __entry->buf_len
+        )
+);
+
+#define ATH6KL_MSG_MAX 200
+
+DECLARE_EVENT_CLASS(ath6kl_log_event,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf),
+        TP_STRUCT__entry(
+                __dynamic_array(char, msg, ATH6KL_MSG_MAX)
+        ),
+        TP_fast_assign(
+                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                       ATH6KL_MSG_MAX,
+                                       vaf->fmt,
+                                       *vaf->va) >= ATH6KL_MSG_MAX);
+        ),
+        TP_printk("%s", __get_str(msg))
+);
+
+DEFINE_EVENT(ath6kl_log_event, ath6kl_log_err,
+             TP_PROTO(struct va_format *vaf),
+             TP_ARGS(vaf)
+);
+
+DEFINE_EVENT(ath6kl_log_event, ath6kl_log_warn,
+             TP_PROTO(struct va_format *vaf),
+             TP_ARGS(vaf)
+);
+
+DEFINE_EVENT(ath6kl_log_event, ath6kl_log_info,
+             TP_PROTO(struct va_format *vaf),
+             TP_ARGS(vaf)
+);
+
+TRACE_EVENT(ath6kl_log_dbg,
+        TP_PROTO(unsigned int level, struct va_format *vaf),
+        TP_ARGS(level, vaf),
+        TP_STRUCT__entry(
+                __field(unsigned int, level)
+                __dynamic_array(char, msg, ATH6KL_MSG_MAX)
+        ),
+        TP_fast_assign(
+                __entry->level = level;
+                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                       ATH6KL_MSG_MAX,
+                                       vaf->fmt,
+                                       *vaf->va) >= ATH6KL_MSG_MAX);
+        ),
+        TP_printk("%s", __get_str(msg))
+);
+
+TRACE_EVENT(ath6kl_log_dbg_dump,
+        TP_PROTO(const char *msg, const char *prefix,
+                 const void *buf, size_t buf_len),
+
+        TP_ARGS(msg, prefix, buf, buf_len),
+
+        TP_STRUCT__entry(
+                __string(msg, msg)
+                __string(prefix, prefix)
+                __field(size_t, buf_len)
+                __dynamic_array(u8, buf, buf_len)
+        ),
+
+        TP_fast_assign(
+                __assign_str(msg, msg);
+                __assign_str(prefix, prefix);
+                __entry->buf_len = buf_len;
+                memcpy(__get_dynamic_array(buf), buf, buf_len);
+        ),
+
+        TP_printk(
+                "%s/%s\n", __get_str(prefix), __get_str(msg)
+        )
+);
+
+#endif /* _ ATH6KL_TRACE_H || TRACE_HEADER_MULTI_READ*/
+
+/* we don't want to use include/trace/events */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE trace
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index 78b369286579..ebb24045a8ae 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -20,6 +20,7 @@
 #include "core.h"
 #include "debug.h"
 #include "htc-ops.h"
+#include "trace.h"
 
 /*
  * tid - tid_mux0..tid_mux3
@@ -288,6 +289,8 @@ int ath6kl_control_tx(void *devt, struct sk_buff *skb,
         int status = 0;
         struct ath6kl_cookie *cookie = NULL;
 
+        trace_ath6kl_wmi_cmd(skb->data, skb->len);
+
         if (WARN_ON_ONCE(ar->state == ATH6KL_STATE_WOW)) {
                 dev_kfree_skb(skb);
                 return -EACCES;
@@ -1324,7 +1327,7 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
                    __func__, ar, ept, skb, packet->buf,
                    packet->act_len, status);
 
-        if (status || !(skb->data + HTC_HDR_LENGTH)) {
+        if (status || packet->act_len < HTC_HDR_LENGTH) {
                 dev_kfree_skb(skb);
                 return;
         }
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index 5fcd342762de..bed0d337712d 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -856,11 +856,9 @@ static int ath6kl_usb_submit_ctrl_out(struct ath6kl_usb *ar_usb,
         int ret;
 
         if (size > 0) {
-                buf = kmalloc(size, GFP_KERNEL);
+                buf = kmemdup(data, size, GFP_KERNEL);
                 if (buf == NULL)
                         return -ENOMEM;
-
-                memcpy(buf, data, size);
         }
 
         /* note: if successful returns number of bytes transfered */
@@ -872,8 +870,9 @@ static int ath6kl_usb_submit_ctrl_out(struct ath6kl_usb *ar_usb,
                               size, 1000);
 
         if (ret < 0) {
-                ath6kl_dbg(ATH6KL_DBG_USB, "%s failed,result = %d\n",
-                           __func__, ret);
+                ath6kl_warn("Failed to submit usb control message: %d\n", ret);
+                kfree(buf);
+                return ret;
         }
 
         kfree(buf);
@@ -903,8 +902,9 @@ static int ath6kl_usb_submit_ctrl_in(struct ath6kl_usb *ar_usb,
                                  size, 2 * HZ);
 
         if (ret < 0) {
-                ath6kl_dbg(ATH6KL_DBG_USB, "%s failed,result = %d\n",
-                           __func__, ret);
+                ath6kl_warn("Failed to read usb control message: %d\n", ret);
+                kfree(buf);
+                return ret;
         }
 
         memcpy((u8 *) data, buf, size);
@@ -961,8 +961,10 @@ static int ath6kl_usb_diag_read32(struct ath6kl *ar, u32 address, u32 *data)
                                 ATH6KL_USB_CONTROL_REQ_DIAG_RESP,
                                 ar_usb->diag_resp_buffer, &resp_len);
 
-        if (ret)
+        if (ret) {
+                ath6kl_warn("diag read32 failed: %d\n", ret);
                 return ret;
+        }
 
         resp = (struct ath6kl_usb_ctrl_diag_resp_read *)
                 ar_usb->diag_resp_buffer;
@@ -976,6 +978,7 @@ static int ath6kl_usb_diag_write32(struct ath6kl *ar, u32 address, __le32 data)
 {
         struct ath6kl_usb *ar_usb = ar->hif_priv;
         struct ath6kl_usb_ctrl_diag_cmd_write *cmd;
+        int ret;
 
         cmd = (struct ath6kl_usb_ctrl_diag_cmd_write *) ar_usb->diag_cmd_buffer;
 
@@ -984,12 +987,17 @@ static int ath6kl_usb_diag_write32(struct ath6kl *ar, u32 address, __le32 data)
         cmd->address = cpu_to_le32(address);
         cmd->value = data;
 
-        return ath6kl_usb_ctrl_msg_exchange(ar_usb,
-                                            ATH6KL_USB_CONTROL_REQ_DIAG_CMD,
-                                            (u8 *) cmd,
-                                            sizeof(*cmd),
-                                            0, NULL, NULL);
+        ret = ath6kl_usb_ctrl_msg_exchange(ar_usb,
+                                           ATH6KL_USB_CONTROL_REQ_DIAG_CMD,
+                                           (u8 *) cmd,
+                                           sizeof(*cmd),
+                                           0, NULL, NULL);
+        if (ret) {
+                ath6kl_warn("diag_write32 failed: %d\n", ret);
+                return ret;
+        }
 
+        return 0;
 }
 
 static int ath6kl_usb_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)
@@ -1001,7 +1009,7 @@ static int ath6kl_usb_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)
         ret = ath6kl_usb_submit_ctrl_in(ar_usb,
                                         ATH6KL_USB_CONTROL_REQ_RECV_BMI_RESP,
                                         0, 0, buf, len);
-        if (ret != 0) {
+        if (ret) {
                 ath6kl_err("Unable to read the bmi data from the device: %d\n",
                            ret);
                 return ret;
@@ -1019,7 +1027,7 @@ static int ath6kl_usb_bmi_write(struct ath6kl *ar, u8 *buf, u32 len)
         ret = ath6kl_usb_submit_ctrl_out(ar_usb,
                                          ATH6KL_USB_CONTROL_REQ_SEND_BMI_CMD,
                                          0, 0, buf, len);
-        if (ret != 0) {
+        if (ret) {
                 ath6kl_err("unable to send the bmi data to the device: %d\n",
                            ret);
                 return ret;
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index d76b5bd81a0d..87aefb4c4c23 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -20,6 +20,7 @@
 #include "core.h"
 #include "debug.h"
 #include "testmode.h"
+#include "trace.h"
 #include "../regd.h"
 #include "../regd_common.h"
 
@@ -2028,6 +2029,9 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx,
                 if (!sband)
                         continue;
 
+                if (WARN_ON(band >= ATH6KL_NUM_BANDS))
+                        break;
+
                 ratemask = rates[band];
                 supp_rates = sc->supp_rates[band].rates;
                 num_rates = 0;
@@ -4086,6 +4090,8 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)
                 return -EINVAL;
         }
 
+        trace_ath6kl_wmi_event(skb->data, skb->len);
+
         return ath6kl_wmi_proc_events(wmi, skb);
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index fd69376ecc83..391da5ad6a99 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -18,6 +18,7 @@
 #include "hw-ops.h"
 #include "../regd.h"
 #include "ar9002_phy.h"
+#include "ar5008_initvals.h"
 
 /* All code below is for AR5008, AR9001, AR9002 */
 
@@ -43,23 +44,16 @@ static const int m2ThreshLowExt_off = 127;
 static const int m1ThreshExt_off = 127;
 static const int m2ThreshExt_off = 127;
 
+static const struct ar5416IniArray bank0 = STATIC_INI_ARRAY(ar5416Bank0);
+static const struct ar5416IniArray bank1 = STATIC_INI_ARRAY(ar5416Bank1);
+static const struct ar5416IniArray bank2 = STATIC_INI_ARRAY(ar5416Bank2);
+static const struct ar5416IniArray bank3 = STATIC_INI_ARRAY(ar5416Bank3);
+static const struct ar5416IniArray bank7 = STATIC_INI_ARRAY(ar5416Bank7);
 
-static void ar5008_rf_bank_setup(u32 *bank, struct ar5416IniArray *array,
-                                 int col)
-{
-        int i;
-
-        for (i = 0; i < array->ia_rows; i++)
-                bank[i] = INI_RA(array, i, col);
-}
-
-
-#define REG_WRITE_RF_ARRAY(iniarray, regData, regWr) \
-        ar5008_write_rf_array(ah, iniarray, regData, &(regWr))
-
-static void ar5008_write_rf_array(struct ath_hw *ah, struct ar5416IniArray *array,
-                                  u32 *data, unsigned int *writecnt)
+static void ar5008_write_bank6(struct ath_hw *ah, unsigned int *writecnt)
 {
+        struct ar5416IniArray *array = &ah->iniBank6;
+        u32 *data = ah->analogBank6Data;
         int r;
 
         ENABLE_REGWRITE_BUFFER(ah);
@@ -165,7 +159,7 @@ static void ar5008_hw_force_bias(struct ath_hw *ah, u16 synth_freq)
         ar5008_hw_phy_modify_rx_buffer(ah->analogBank6Data, tmp_reg, 3, 181, 3);
 
         /* write Bank 6 with new params */
-        REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, reg_writes);
+        ar5008_write_bank6(ah, &reg_writes);
 }
 
 /**
@@ -469,31 +463,16 @@ static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
  */
 static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
 {
-#define ATH_ALLOC_BANK(bank, size) do { \
-                bank = devm_kzalloc(ah->dev, sizeof(u32) * size, GFP_KERNEL); \
-                if (!bank) \
-                        goto error; \
-        } while (0);
-
-        struct ath_common *common = ath9k_hw_common(ah);
+        int size = ah->iniBank6.ia_rows * sizeof(u32);
 
         if (AR_SREV_9280_20_OR_LATER(ah))
             return 0;
 
-        ATH_ALLOC_BANK(ah->analogBank0Data, ah->iniBank0.ia_rows);
-        ATH_ALLOC_BANK(ah->analogBank1Data, ah->iniBank1.ia_rows);
-        ATH_ALLOC_BANK(ah->analogBank2Data, ah->iniBank2.ia_rows);
-        ATH_ALLOC_BANK(ah->analogBank3Data, ah->iniBank3.ia_rows);
-        ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
-        ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
-        ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
-        ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);
+        ah->analogBank6Data = devm_kzalloc(ah->dev, size, GFP_KERNEL);
+        if (!ah->analogBank6Data)
+                return -ENOMEM;
 
         return 0;
-#undef ATH_ALLOC_BANK
-error:
-        ath_err(common, "Cannot allocate RF banks\n");
-        return -ENOMEM;
 }
 
 
@@ -517,6 +496,7 @@ static bool ar5008_hw_set_rf_regs(struct ath_hw *ah,
         u32 ob5GHz = 0, db5GHz = 0;
         u32 ob2GHz = 0, db2GHz = 0;
         int regWrites = 0;
+        int i;
 
         /*
          * Software does not need to program bank data
@@ -529,25 +509,8 @@ static bool ar5008_hw_set_rf_regs(struct ath_hw *ah,
         /* Setup rf parameters */
         eepMinorRev = ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV);
 
-        /* Setup Bank 0 Write */
-        ar5008_rf_bank_setup(ah->analogBank0Data, &ah->iniBank0, 1);
-
-        /* Setup Bank 1 Write */
-        ar5008_rf_bank_setup(ah->analogBank1Data, &ah->iniBank1, 1);
-
-        /* Setup Bank 2 Write */
-        ar5008_rf_bank_setup(ah->analogBank2Data, &ah->iniBank2, 1);
-
-        /* Setup Bank 6 Write */
-        ar5008_rf_bank_setup(ah->analogBank3Data, &ah->iniBank3,
-                      modesIndex);
-        {
-                int i;
-                for (i = 0; i < ah->iniBank6TPC.ia_rows; i++) {
-                        ah->analogBank6Data[i] =
-                            INI_RA(&ah->iniBank6TPC, i, modesIndex);
-                }
-        }
+        for (i = 0; i < ah->iniBank6.ia_rows; i++)
+                ah->analogBank6Data[i] = INI_RA(&ah->iniBank6, i, modesIndex);
 
         /* Only the 5 or 2 GHz OB/DB need to be set for a mode */
         if (eepMinorRev >= 2) {
@@ -568,22 +531,13 @@ static bool ar5008_hw_set_rf_regs(struct ath_hw *ah,
                 }
         }
 
-        /* Setup Bank 7 Setup */
-        ar5008_rf_bank_setup(ah->analogBank7Data, &ah->iniBank7, 1);
-
         /* Write Analog registers */
-        REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data,
-                           regWrites);
-        REG_WRITE_RF_ARRAY(&ah->iniBank1, ah->analogBank1Data,
-                           regWrites);
-        REG_WRITE_RF_ARRAY(&ah->iniBank2, ah->analogBank2Data,
-                           regWrites);
-        REG_WRITE_RF_ARRAY(&ah->iniBank3, ah->analogBank3Data,
-                           regWrites);
-        REG_WRITE_RF_ARRAY(&ah->iniBank6TPC, ah->analogBank6Data,
-                           regWrites);
-        REG_WRITE_RF_ARRAY(&ah->iniBank7, ah->analogBank7Data,
-                           regWrites);
+        REG_WRITE_ARRAY(&bank0, 1, regWrites);
+        REG_WRITE_ARRAY(&bank1, 1, regWrites);
+        REG_WRITE_ARRAY(&bank2, 1, regWrites);
+        REG_WRITE_ARRAY(&bank3, modesIndex, regWrites);
+        ar5008_write_bank6(ah, &regWrites);
+        REG_WRITE_ARRAY(&bank7, 1, regWrites);
 
         return true;
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index c55e5bbafc46..9f589744a9f9 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -731,7 +731,8 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)
                 if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
                                   AR_PHY_AGC_CONTROL_CAL, 0, AH_WAIT_TIMEOUT)) {
                         ath_dbg(common, CALIBRATE,
-                                "offset calibration failed to complete in 1ms; noisy environment?\n");
+                                "offset calibration failed to complete in %d ms; noisy environment?\n",
+                                AH_WAIT_TIMEOUT / 1000);
                         return false;
                 }
                 REG_CLR_BIT(ah, AR_PHY_TURBO, AR_PHY_FC_DYN2040_EN);
@@ -745,7 +746,8 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)
         if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL,
                           0, AH_WAIT_TIMEOUT)) {
                 ath_dbg(common, CALIBRATE,
-                        "offset calibration failed to complete in 1ms; noisy environment?\n");
+                        "offset calibration failed to complete in %d ms; noisy environment?\n",
+                        AH_WAIT_TIMEOUT / 1000);
                 return false;
         }
 
@@ -841,7 +843,8 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)
                                    AR_PHY_AGC_CONTROL_CAL,
                                    0, AH_WAIT_TIMEOUT)) {
                         ath_dbg(common, CALIBRATE,
-                                "offset calibration failed to complete in 1ms; noisy environment?\n");
+                                "offset calibration failed to complete in %d ms; noisy environment?\n",
+                                AH_WAIT_TIMEOUT / 1000);
                         return false;
                 }
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index f053d978540e..830daa12feb6 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -67,12 +67,10 @@ static int ar9002_hw_init_mode_regs(struct ath_hw *ah)
         } else if (AR_SREV_9100_OR_LATER(ah)) {
                 INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100);
                 INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100);
-                INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100);
                 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100);
         } else {
                 INIT_INI_ARRAY(&ah->iniModes, ar5416Modes);
                 INIT_INI_ARRAY(&ah->iniCommon, ar5416Common);
-                INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC);
                 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac);
         }
 
@@ -80,20 +78,11 @@ static int ar9002_hw_init_mode_regs(struct ath_hw *ah)
                 /* Common for AR5416, AR913x, AR9160 */
                 INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain);
 
-                INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0);
-                INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1);
-                INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2);
-                INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3);
-                INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7);
-
-                /* Common for AR5416, AR9160 */
-                if (!AR_SREV_9100(ah))
-                        INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6);
-
                 /* Common for AR913x, AR9160 */
                 if (!AR_SREV_5416(ah))
-                        INIT_INI_ARRAY(&ah->iniBank6TPC,
-                                      ar5416Bank6TPC_9100);
+                        INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC_9100);
+                else
+                        INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC);
         }
 
         /* iniAddac needs to be modified for these chips */
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index f76c3ca07a45..639ba7d18ea4 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -1126,7 +1126,8 @@ skip_tx_iqcal:
                         ar9003_hw_rtt_disable(ah);
 
                 ath_dbg(common, CALIBRATE,
-                        "offset calibration failed to complete in 1ms; noisy environment?\n");
+                        "offset calibration failed to complete in %d ms; noisy environment?\n",
+                        AH_WAIT_TIMEOUT / 1000);
                 return false;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 881e989ea470..e6b92ff265fd 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3606,6 +3606,12 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
         value = ar9003_hw_ant_ctrl_common_2_get(ah, is2ghz);
         REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2, AR_SWITCH_TABLE_COM2_ALL, value);
 
+        if ((AR_SREV_9462(ah)) && (ah->rxchainmask == 0x2)) {
+                value = ar9003_hw_ant_ctrl_chain_get(ah, 1, is2ghz);
+                REG_RMW_FIELD(ah, switch_chain_reg[0],
+                              AR_SWITCH_TABLE_ALL, value);
+        }
+
         for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
                 if ((ah->rxchainmask & BIT(chain)) ||
                     (ah->txchainmask & BIT(chain))) {
@@ -3772,6 +3778,17 @@ static void ar9003_hw_atten_apply(struct ath_hw *ah, struct ath9k_channel *chan)
                                           AR_PHY_EXT_ATTEN_CTL_2,
                                          };
 
+        if ((AR_SREV_9462(ah)) && (ah->rxchainmask == 0x2)) {
+                value = ar9003_hw_atten_chain_get(ah, 1, chan);
+                REG_RMW_FIELD(ah, ext_atten_reg[0],
+                              AR_PHY_EXT_ATTEN_CTL_XATTEN1_DB, value);
+
+                value = ar9003_hw_atten_chain_get_margin(ah, 1, chan);
+                REG_RMW_FIELD(ah, ext_atten_reg[0],
+                              AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN,
+                              value);
+        }
+
         /* Test value. if 0 then attenuation is unused. Don't load anything. */
         for (i = 0; i < 3; i++) {
                 if (ah->txchainmask & BIT(i)) {
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index ccc42a71b436..999ab08c34e6 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -37,28 +37,28 @@ static const u32 ar9462_pciephy_clkreq_enable_L1_2p0[][2] = {
         /* Addr      allmodes  */
         {0x00018c00, 0x18253ede},
         {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0003580c},
+        {0x00018c08, 0x0003780c},
 };
 
 static const u32 ar9462_2p0_baseband_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a800d},
         {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a01ae},
-        {0x00009824, 0x5ac640de, 0x5ac640d0, 0x5ac640d0, 0x63c640da},
+        {0x00009824, 0x63c640de, 0x5ac640d0, 0x5ac640d0, 0x63c640da},
         {0x00009828, 0x0796be89, 0x0696b081, 0x0696b881, 0x09143e81},
         {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
         {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
-        {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
+        {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a2},
         {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000d8},
         {0x00009e10, 0x92c88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec86d2e},
-        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3376605e, 0x32395d5e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3236605e, 0x32365a5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
         {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-        {0x00009e3c, 0xcf946222, 0xcf946222, 0xcfd5c782, 0xcfd5c282},
+        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282},
         {0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},
         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
@@ -82,9 +82,9 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {
         {0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},
         {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a3a4, 0x00000010, 0x00000010, 0x00000000, 0x00000000},
+        {0x0000a3a4, 0x00000050, 0x00000050, 0x00000000, 0x00000000},
         {0x0000a3a8, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa},
-        {0x0000a3ac, 0xaaaaaa00, 0xaaaaaa30, 0xaaaaaa00, 0xaaaaaa00},
+        {0x0000a3ac, 0xaaaaaa00, 0xaa30aa30, 0xaaaaaa00, 0xaaaaaa00},
         {0x0000a41c, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
         {0x0000a420, 0x000001ce, 0x000001ce, 0x000001ce, 0x000001ce},
         {0x0000a424, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
@@ -363,14 +363,14 @@ static const u32 ar9462_pciephy_clkreq_disable_L1_2p0[][2] = {
         /* Addr      allmodes  */
         {0x00018c00, 0x18213ede},
         {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0003580c},
+        {0x00018c08, 0x0003780c},
 };
 
 static const u32 ar9462_pciephy_pll_on_clkreq_disable_L1_2p0[][2] = {
         /* Addr      allmodes  */
         {0x00018c00, 0x18212ede},
         {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0003580c},
+        {0x00018c08, 0x0003780c},
 };
 
 static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = {
@@ -775,7 +775,7 @@ static const u32 ar9462_2p0_baseband_core[][2] = {
         {0x00009fc0, 0x803e4788},
         {0x00009fc4, 0x0001efb5},
         {0x00009fcc, 0x40000014},
-        {0x00009fd0, 0x01193b93},
+        {0x00009fd0, 0x0a193b93},
         {0x0000a20c, 0x00000000},
         {0x0000a220, 0x00000000},
         {0x0000a224, 0x00000000},
@@ -850,7 +850,7 @@ static const u32 ar9462_2p0_baseband_core[][2] = {
         {0x0000a7cc, 0x00000000},
         {0x0000a7d0, 0x00000000},
         {0x0000a7d4, 0x00000004},
-        {0x0000a7dc, 0x00000001},
+        {0x0000a7dc, 0x00000000},
         {0x0000a7f0, 0x80000000},
         {0x0000a8d0, 0x004b6a8e},
         {0x0000a8d4, 0x00000820},
@@ -886,7 +886,7 @@ static const u32 ar9462_modes_high_ob_db_tx_gain_table_2p0[][5] = {
         {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
         {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
         {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050da, 0x000050da, 0x000050de, 0x000050de},
         {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
         {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
@@ -906,20 +906,20 @@ static const u32 ar9462_modes_high_ob_db_tx_gain_table_2p0[][5] = {
         {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
         {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
         {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb6, 0x59025eb6, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001c84, 0x44001c84},
+        {0x0000a548, 0x55025eb3, 0x55025eb3, 0x3e001a81, 0x3e001a81},
+        {0x0000a54c, 0x58025ef3, 0x58025ef3, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001a84, 0x44001a84},
         {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
         {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
         {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
         {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a564, 0x751ffff6, 0x751ffff6, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x751ffff6, 0x751ffff6, 0x58001ef0, 0x58001ef0},
+        {0x0000a56c, 0x751ffff6, 0x751ffff6, 0x5a001ef4, 0x5a001ef4},
+        {0x0000a570, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6},
+        {0x0000a574, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6},
+        {0x0000a578, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6},
+        {0x0000a57c, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6},
         {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -1053,7 +1053,6 @@ static const u32 ar9462_2p0_mac_core[][2] = {
         {0x00008044, 0x00000000},
         {0x00008048, 0x00000000},
         {0x0000804c, 0xffffffff},
-        {0x00008050, 0xffffffff},
         {0x00008054, 0x00000000},
         {0x00008058, 0x00000000},
         {0x0000805c, 0x000fc78f},
@@ -1117,9 +1116,9 @@ static const u32 ar9462_2p0_mac_core[][2] = {
         {0x000081f8, 0x00000000},
         {0x000081fc, 0x00000000},
         {0x00008240, 0x00100000},
-        {0x00008244, 0x0010f424},
+        {0x00008244, 0x0010f400},
         {0x00008248, 0x00000800},
-        {0x0000824c, 0x0001e848},
+        {0x0000824c, 0x0001e800},
         {0x00008250, 0x00000000},
         {0x00008254, 0x00000000},
         {0x00008258, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index a56b2416e2f9..8a1888d02070 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -234,6 +234,7 @@ struct ath_buf {
         dma_addr_t bf_daddr;            /* physical addr of desc */
         dma_addr_t bf_buf_addr; /* physical addr of data buffer, for DMA */
         bool bf_stale;
+        struct ieee80211_tx_rate rates[4];
         struct ath_buf_state bf_state;
 };
 
@@ -311,6 +312,7 @@ struct ath_rx_edma {
 struct ath_rx {
         u8 defant;
         u8 rxotherant;
+        bool discard_next;
         u32 *rxlink;
         u32 num_pkts;
         unsigned int rxfilter;
@@ -657,11 +659,10 @@ enum sc_op_flags {
 struct ath_rate_table;
 
 struct ath9k_vif_iter_data {
-        const u8 *hw_macaddr; /* phy's hardware address, set
-                               * before starting iteration for
-                               * valid bssid mask.
-                               */
+        u8 hw_macaddr[ETH_ALEN]; /* address of the first vif */
         u8 mask[ETH_ALEN]; /* bssid mask */
+        bool has_hw_macaddr;
+
         int naps;      /* number of AP vifs */
         int nmeshes;   /* number of mesh vifs */
         int nstations; /* number of station vifs */
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 5f05c26d1ec4..2ff570f7f8ff 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -79,7 +79,7 @@ static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
         u8 chainmask = ah->txchainmask;
         u8 rate = 0;
 
-        sband = &sc->sbands[common->hw->conf.channel->band];
+        sband = &sc->sbands[common->hw->conf.chandef.chan->band];
         rate = sband->bitrates[rateidx].hw_value;
         if (vif->bss_conf.use_short_preamble)
                 rate |= sband->bitrates[rateidx].hw_value_short;
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 1e8508530e98..7304e7585009 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -208,7 +208,7 @@ bool ath9k_hw_reset_calvalid(struct ath_hw *ah)
                 return true;
 
         ath_dbg(common, CALIBRATE, "Resetting Cal %d state for channel %u\n",
-                currCal->calData->calType, conf->channel->center_freq);
+                currCal->calData->calType, conf->chandef.chan->center_freq);
 
         ah->caldata->CalValid &= ~currCal->calData->calType;
         currCal->calState = CAL_WAITING;
@@ -369,7 +369,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
         struct ieee80211_channel *c = chan->chan;
         struct ath9k_hw_cal_data *caldata = ah->caldata;
 
-        chan->channelFlags &= (~CHANNEL_CW_INT);
         if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) {
                 ath_dbg(common, CALIBRATE,
                         "NF did not complete in calibration window\n");
@@ -384,7 +383,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
                 ath_dbg(common, CALIBRATE,
                         "noise floor failed detected; detected %d, threshold %d\n",
                         nf, nfThresh);
-                chan->channelFlags |= CHANNEL_CW_INT;
         }
 
         if (!caldata) {
@@ -410,7 +408,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
         int i, j;
 
         ah->caldata->channel = chan->channel;
-        ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT;
+        ah->caldata->channelFlags = chan->channelFlags;
         ah->caldata->chanmode = chan->chanmode;
         h = ah->caldata->nfCalHist;
         default_nf = ath9k_hw_get_default_nf(ah, chan);
diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h
index 60dcb6c22db9..3d70b8c2bcdd 100644
--- a/drivers/net/wireless/ath/ath9k/calib.h
+++ b/drivers/net/wireless/ath/ath9k/calib.h
@@ -33,6 +33,12 @@ struct ar5416IniArray {
         u32 ia_columns;
 };
 
+#define STATIC_INI_ARRAY(array) {                       \
+                .ia_array = (u32 *)(array),             \
+                .ia_rows = ARRAY_SIZE(array),           \
+                .ia_columns = ARRAY_SIZE(array[0]),     \
+        }
+
 #define INIT_INI_ARRAY(iniarray, array) do {    \
                 (iniarray)->ia_array = (u32 *)(array);          \
                 (iniarray)->ia_rows = ARRAY_SIZE(array);        \
diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
index 905f1b313961..344fdde1d7a3 100644
--- a/drivers/net/wireless/ath/ath9k/common.c
+++ b/drivers/net/wireless/ath/ath9k/common.c
@@ -27,20 +27,6 @@ MODULE_AUTHOR("Atheros Communications");
 MODULE_DESCRIPTION("Shared library for Atheros wireless 802.11n LAN cards.");
 MODULE_LICENSE("Dual BSD/GPL");
 
-int ath9k_cmn_padpos(__le16 frame_control)
-{
-        int padpos = 24;
-        if (ieee80211_has_a4(frame_control)) {
-                padpos += ETH_ALEN;
-        }
-        if (ieee80211_is_data_qos(frame_control)) {
-                padpos += IEEE80211_QOS_CTL_LEN;
-        }
-
-        return padpos;
-}
-EXPORT_SYMBOL(ath9k_cmn_padpos);
-
 int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb)
 {
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -133,13 +119,14 @@ EXPORT_SYMBOL(ath9k_cmn_update_ichannel);
 struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,
                                                struct ath_hw *ah)
 {
-        struct ieee80211_channel *curchan = hw->conf.channel;
+        struct ieee80211_channel *curchan = hw->conf.chandef.chan;
         struct ath9k_channel *channel;
         u8 chan_idx;
 
         chan_idx = curchan->hw_value;
         channel = &ah->channels[chan_idx];
-        ath9k_cmn_update_ichannel(channel, curchan, hw->conf.channel_type);
+        ath9k_cmn_update_ichannel(channel, curchan,
+                                  cfg80211_get_chandef_type(&hw->conf.chandef));
 
         return channel;
 }
diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h
index 050ca4a4850d..207d06995b15 100644
--- a/drivers/net/wireless/ath/ath9k/common.h
+++ b/drivers/net/wireless/ath/ath9k/common.h
@@ -40,9 +40,8 @@
         x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN);      \
 } while (0)
 #define ATH_EP_RND(x, mul)                                              \
-        ((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
+        (((x) + ((mul)/2)) / (mul))
 
-int ath9k_cmn_padpos(__le16 frame_control);
 int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);
 void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
                                struct ieee80211_channel *chan,
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 3714b971d18e..e6307b86363a 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -537,6 +537,7 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
         PR("AMPDUs Completed:", a_completed);
         PR("AMPDUs Retried:  ", a_retries);
         PR("AMPDUs XRetried: ", a_xretries);
+        PR("TXERR Filtered:  ", txerr_filtered);
         PR("FIFO Underrun:   ", fifo_underrun);
         PR("TXOP Exceeded:   ", xtxop);
         PR("TXTIMER Expiry:  ", timer_exp);
@@ -756,6 +757,8 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
                         TX_STAT_INC(qnum, completed);
         }
 
+        if (ts->ts_status & ATH9K_TXERR_FILT)
+                TX_STAT_INC(qnum, txerr_filtered);
         if (ts->ts_status & ATH9K_TXERR_FIFO)
                 TX_STAT_INC(qnum, fifo_underrun);
         if (ts->ts_status & ATH9K_TXERR_XTXOP)
@@ -1909,6 +1912,7 @@ static const char ath9k_gstrings_stats[][ETH_GSTRING_LEN] = {
         AMKSTR(d_tx_desc_cfg_err),
         AMKSTR(d_tx_data_underrun),
         AMKSTR(d_tx_delim_underrun),
+        "d_rx_crc_err",
         "d_rx_decrypt_crc_err",
         "d_rx_phy_err",
         "d_rx_mic_err",
@@ -1989,6 +1993,7 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw,
         AWDATA(data_underrun);
         AWDATA(delim_underrun);
 
+        AWDATA_RX(crc_err);
         AWDATA_RX(decrypt_crc_err);
         AWDATA_RX(phy_err);
         AWDATA_RX(mic_err);
@@ -2067,7 +2072,7 @@ int ath9k_init_debug(struct ath_hw *ah)
                             &fops_modal_eeprom);
         sc->rfs_chan_spec_scan = relay_open("spectral_scan",
                                             sc->debug.debugfs_phy,
-                                            262144, 4, &rfs_spec_scan_cb,
+                                            1024, 256, &rfs_spec_scan_cb,
                                             NULL);
         debugfs_create_file("spectral_scan_ctl", S_IRUSR | S_IWUSR,
                             sc->debug.debugfs_phy, sc,
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 410d6d8f1aa7..794a7ec83a24 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -142,6 +142,7 @@ struct ath_interrupt_stats {
  * @a_completed: Total AMPDUs completed
  * @a_retries: No. of AMPDUs retried (SW)
  * @a_xretries: No. of AMPDUs dropped due to xretries
+ * @txerr_filtered: No. of frames with TXERR_FILT flag set.
  * @fifo_underrun: FIFO underrun occurrences
         Valid only for:
                 - non-aggregate condition.
@@ -168,6 +169,7 @@ struct ath_tx_stats {
         u32 a_completed;
         u32 a_retries;
         u32 a_xretries;
+        u32 txerr_filtered;
         u32 fifo_underrun;
         u32 xtxop;
         u32 timer_exp;
diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c
index ecc81792f2dc..7187d3671512 100644
--- a/drivers/net/wireless/ath/ath9k/dfs.c
+++ b/drivers/net/wireless/ath/ath9k/dfs.c
@@ -55,12 +55,6 @@ ath9k_postprocess_radar_event(struct ath_softc *sc,
         u8 rssi;
         u16 dur;
 
-        ath_dbg(ath9k_hw_common(sc->sc_ah), DFS,
-                "pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n",
-                ard->pulse_bw_info,
-                ard->pulse_length_pri, ard->rssi,
-                ard->pulse_length_ext, ard->ext_rssi);
-
         /*
          * Only the last 2 bits of the BW info are relevant, they indicate
          * which channel the radar was detected in.
@@ -193,9 +187,7 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
                 DFS_STAT_INC(sc, pulses_processed);
                 if (pd != NULL && pd->add_pulse(pd, &pe)) {
                         DFS_STAT_INC(sc, radar_detected);
-                        /*
-                         * TODO: forward radar event to DFS management layer
-                         */
+                        ieee80211_radar_detected(sc->hw);
                 }
         }
 }
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c
index 55d28072adeb..b7611b7bbe43 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_debug.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c
@@ -105,6 +105,24 @@ static ssize_t write_file_dfs(struct file *file, const char __user *user_buf,
         return count;
 }
 
+static ssize_t write_file_simulate_radar(struct file *file,
+                                         const char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+        struct ath_softc *sc = file->private_data;
+
+        ieee80211_radar_detected(sc->hw);
+
+        return count;
+}
+
+static const struct file_operations fops_simulate_radar = {
+        .write = write_file_simulate_radar,
+        .open = simple_open,
+        .owner = THIS_MODULE,
+        .llseek = default_llseek,
+};
+
 static const struct file_operations fops_dfs_stats = {
         .read = read_file_dfs,
         .write = write_file_dfs,
@@ -117,4 +135,6 @@ void ath9k_dfs_init_debug(struct ath_softc *sc)
 {
         debugfs_create_file("dfs_stats", S_IRUSR,
                             sc->debug.debugfs_phy, sc, &fops_dfs_stats);
+        debugfs_create_file("dfs_simulate_radar", S_IWUSR,
+                            sc->debug.debugfs_phy, sc, &fops_simulate_radar);
 }
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
index 73fe8d6db566..491305c81fce 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@ -19,6 +19,7 @@
 
 #include "dfs_pattern_detector.h"
 #include "dfs_pri_detector.h"
+#include "ath9k.h"
 
 /*
  * tolerated deviation of radar time stamp in usecs on both sides
@@ -142,6 +143,7 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
 {
         u32 sz, i;
         struct channel_detector *cd;
+        struct ath_common *common = ath9k_hw_common(dpd->ah);
 
         cd = kmalloc(sizeof(*cd), GFP_ATOMIC);
         if (cd == NULL)
@@ -165,7 +167,8 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
         return cd;
 
 fail:
-        pr_err("failed to allocate channel_detector for freq=%d\n", freq);
+        ath_dbg(common, DFS,
+                "failed to allocate channel_detector for freq=%d\n", freq);
         channel_detector_exit(dpd, cd);
         return NULL;
 }
@@ -216,34 +219,34 @@ static bool
 dpd_add_pulse(struct dfs_pattern_detector *dpd, struct pulse_event *event)
 {
         u32 i;
-        bool ts_wraparound;
         struct channel_detector *cd;
 
-        if (dpd->region == NL80211_DFS_UNSET) {
-                /*
-                 * pulses received for a non-supported or un-initialized
-                 * domain are treated as detected radars
-                 */
+        /*
+         * pulses received for a non-supported or un-initialized
+         * domain are treated as detected radars for fail-safety
+         */
+        if (dpd->region == NL80211_DFS_UNSET)
                 return true;
-        }
 
         cd = channel_detector_get(dpd, event->freq);
         if (cd == NULL)
                 return false;
 
-        ts_wraparound = (event->ts < dpd->last_pulse_ts);
         dpd->last_pulse_ts = event->ts;
-        if (ts_wraparound) {
-                /*
-                 * reset detector on time stamp wraparound
-                 * with monotonic time stamps, this should never happen
-                 */
-                pr_warn("DFS: time stamp wraparound detected, resetting\n");
+        /* reset detector on time stamp wraparound, caused by TSF reset */
+        if (event->ts < dpd->last_pulse_ts)
                 dpd_reset(dpd);
-        }
+
         /* do type individual pattern matching */
         for (i = 0; i < dpd->num_radar_types; i++) {
-                if (cd->detectors[i]->add_pulse(cd->detectors[i], event) != 0) {
+                struct pri_detector *pd = cd->detectors[i];
+                struct pri_sequence *ps = pd->add_pulse(pd, event);
+                if (ps != NULL) {
+                        ath_dbg(ath9k_hw_common(dpd->ah), DFS,
+                                "DFS: radar found on freq=%d: id=%d, pri=%d, "
+                                "count=%d, count_false=%d\n",
+                                event->freq, pd->rs->type_id,
+                                ps->pri, ps->count, ps->count_falses);
                         channel_detector_reset(dpd, cd);
                         return true;
                 }
@@ -285,9 +288,10 @@ static struct dfs_pattern_detector default_dpd = {
 };
 
 struct dfs_pattern_detector *
-dfs_pattern_detector_init(enum nl80211_dfs_regions region)
+dfs_pattern_detector_init(struct ath_hw *ah, enum nl80211_dfs_regions region)
 {
         struct dfs_pattern_detector *dpd;
+        struct ath_common *common = ath9k_hw_common(ah);
 
         dpd = kmalloc(sizeof(*dpd), GFP_KERNEL);
         if (dpd == NULL)
@@ -296,10 +300,11 @@ dfs_pattern_detector_init(enum nl80211_dfs_regions region)
         *dpd = default_dpd;
         INIT_LIST_HEAD(&dpd->channel_detectors);
 
+        dpd->ah = ah;
         if (dpd->set_dfs_domain(dpd, region))
                 return dpd;
 
-        pr_err("Could not set DFS domain to %d. ", region);
+        ath_dbg(common, DFS,"Could not set DFS domain to %d", region);
         kfree(dpd);
         return NULL;
 }
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h
index cda52f39f28a..90a5abcc4265 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h
@@ -80,6 +80,8 @@ struct dfs_pattern_detector {
         enum nl80211_dfs_regions region;
         u8 num_radar_types;
         u64 last_pulse_ts;
+        /* needed for ath_dbg() */
+        struct ath_hw *ah;
 
         const struct radar_detector_specs *radar_spec;
         struct list_head channel_detectors;
@@ -92,10 +94,10 @@ struct dfs_pattern_detector {
  */
 #if defined(CONFIG_ATH9K_DFS_CERTIFIED)
 extern struct dfs_pattern_detector *
-dfs_pattern_detector_init(enum nl80211_dfs_regions region);
+dfs_pattern_detector_init(struct ath_hw *ah, enum nl80211_dfs_regions region);
 #else
 static inline struct dfs_pattern_detector *
-dfs_pattern_detector_init(enum nl80211_dfs_regions region)
+dfs_pattern_detector_init(struct ath_hw *ah, enum nl80211_dfs_regions region)
 {
         return NULL;
 }
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
index 5e48c5515b8c..5ba4b6fe37c0 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
@@ -23,28 +23,6 @@
 #include "dfs_debug.h"
 
 /**
- * struct pri_sequence - sequence of pulses matching one PRI
- * @head: list_head
- * @pri: pulse repetition interval (PRI) in usecs
- * @dur: duration of sequence in usecs
- * @count: number of pulses in this sequence
- * @count_falses: number of not matching pulses in this sequence
- * @first_ts: time stamp of first pulse in usecs
- * @last_ts: time stamp of last pulse in usecs
- * @deadline_ts: deadline when this sequence becomes invalid (first_ts + dur)
- */
-struct pri_sequence {
-        struct list_head head;
-        u32 pri;
-        u32 dur;
-        u32 count;
-        u32 count_falses;
-        u64 first_ts;
-        u64 last_ts;
-        u64 deadline_ts;
-};
-
-/**
  * struct pulse_elem - elements in pulse queue
  * @ts: time stamp in usecs
  */
@@ -393,8 +371,8 @@ static void pri_detector_exit(struct pri_detector *de)
         kfree(de);
 }
 
-static bool pri_detector_add_pulse(struct pri_detector *de,
-                                   struct pulse_event *event)
+static struct pri_sequence *pri_detector_add_pulse(struct pri_detector *de,
+                                                   struct pulse_event *event)
 {
         u32 max_updated_seq;
         struct pri_sequence *ps;
@@ -403,38 +381,33 @@ static bool pri_detector_add_pulse(struct pri_detector *de,
 
         /* ignore pulses not within width range */
         if ((rs->width_min > event->width) || (rs->width_max < event->width))
-                return false;
+                return NULL;
 
         if ((ts - de->last_ts) < rs->max_pri_tolerance)
                 /* if delta to last pulse is too short, don't use this pulse */
-                return false;
+                return NULL;
         de->last_ts = ts;
 
         max_updated_seq = pseq_handler_add_to_existing_seqs(de, ts);
 
         if (!pseq_handler_create_sequences(de, ts, max_updated_seq)) {
-                pr_err("failed to create pulse sequences\n");
                 pri_detector_reset(de, ts);
                 return false;
         }
 
         ps = pseq_handler_check_detection(de);
 
-        if (ps != NULL) {
-                pr_info("DFS: radar found: pri=%d, count=%d, count_false=%d\n",
-                         ps->pri, ps->count, ps->count_falses);
-                pri_detector_reset(de, ts);
-                return true;
-        }
-        pulse_queue_enqueue(de, ts);
-        return false;
+        if (ps == NULL)
+                pulse_queue_enqueue(de, ts);
+
+        return ps;
 }
 
-struct pri_detector *
-pri_detector_init(const struct radar_detector_specs *rs)
+struct pri_detector *pri_detector_init(const struct radar_detector_specs *rs)
 {
         struct pri_detector *de;
-        de = kzalloc(sizeof(*de), GFP_KERNEL);
+
+        de = kzalloc(sizeof(*de), GFP_ATOMIC);
         if (de == NULL)
                 return NULL;
         de->exit = pri_detector_exit;
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h
index 81cde9f28e44..723962d1abc6 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h
+++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h
@@ -20,9 +20,31 @@
 #include <linux/list.h>
 
 /**
+ * struct pri_sequence - sequence of pulses matching one PRI
+ * @head: list_head
+ * @pri: pulse repetition interval (PRI) in usecs
+ * @dur: duration of sequence in usecs
+ * @count: number of pulses in this sequence
+ * @count_falses: number of not matching pulses in this sequence
+ * @first_ts: time stamp of first pulse in usecs
+ * @last_ts: time stamp of last pulse in usecs
+ * @deadline_ts: deadline when this sequence becomes invalid (first_ts + dur)
+ */
+struct pri_sequence {
+        struct list_head head;
+        u32 pri;
+        u32 dur;
+        u32 count;
+        u32 count_falses;
+        u64 first_ts;
+        u64 last_ts;
+        u64 deadline_ts;
+};
+
+/**
  * struct pri_detector - PRI detector element for a dedicated radar type
  * @exit(): destructor
- * @add_pulse(): add pulse event, returns true if pattern was detected
+ * @add_pulse(): add pulse event, returns pri_sequence if pattern was detected
  * @reset(): clear states and reset to given time stamp
  * @rs: detector specs for this detector element
  * @last_ts: last pulse time stamp considered for this element in usecs
@@ -34,7 +56,8 @@
  */
 struct pri_detector {
         void (*exit)     (struct pri_detector *de);
-        bool (*add_pulse)(struct pri_detector *de, struct pulse_event *e);
+        struct pri_sequence *
+             (*add_pulse)(struct pri_detector *de, struct pulse_event *e);
         void (*reset)    (struct pri_detector *de, u64 ts);
 
 /* private: internal use only */
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index d0ce1f5bba10..f13f458dd656 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -308,7 +308,7 @@ static void ath9k_htc_send_buffered(struct ath9k_htc_priv *priv,
         while(skb) {
                 hdr = (struct ieee80211_hdr *) skb->data;
 
-                padpos = ath9k_cmn_padpos(hdr->frame_control);
+                padpos = ieee80211_hdrlen(hdr->frame_control);
                 padsize = padpos & 3;
                 if (padsize && skb->len > padpos) {
                         if (skb_headroom(skb) < padsize) {
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index a8016d70088a..0743a47cef8f 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -190,7 +190,7 @@ void ath9k_htc_reset(struct ath9k_htc_priv *priv)
 {
         struct ath_hw *ah = priv->ah;
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ieee80211_channel *channel = priv->hw->conf.channel;
+        struct ieee80211_channel *channel = priv->hw->conf.chandef.chan;
         struct ath9k_hw_cal_data *caldata = NULL;
         enum htc_phymode mode;
         __be16 htc_mode;
@@ -250,7 +250,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
         struct ath_common *common = ath9k_hw_common(ah);
         struct ieee80211_conf *conf = &common->hw->conf;
         bool fastcc;
-        struct ieee80211_channel *channel = hw->conf.channel;
+        struct ieee80211_channel *channel = hw->conf.chandef.chan;
         struct ath9k_hw_cal_data *caldata = NULL;
         enum htc_phymode mode;
         __be16 htc_mode;
@@ -602,7 +602,7 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,
         u32 caps = 0;
         int i, j;
 
-        sband = priv->hw->wiphy->bands[priv->hw->conf.channel->band];
+        sband = priv->hw->wiphy->bands[priv->hw->conf.chandef.chan->band];
 
         for (i = 0, j = 0; i < sband->n_bitrates; i++) {
                 if (sta->supp_rates[sband->band] & BIT(i)) {
@@ -866,7 +866,7 @@ static void ath9k_htc_tx(struct ieee80211_hw *hw,
         hdr = (struct ieee80211_hdr *) skb->data;
 
         /* Add the padding after the header if this is not already done */
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
+        padpos = ieee80211_hdrlen(hdr->frame_control);
         padsize = padpos & 3;
         if (padsize && skb->len > padpos) {
                 if (skb_headroom(skb) < padsize) {
@@ -904,7 +904,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
         struct ath9k_htc_priv *priv = hw->priv;
         struct ath_hw *ah = priv->ah;
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ieee80211_channel *curchan = hw->conf.channel;
+        struct ieee80211_channel *curchan = hw->conf.chandef.chan;
         struct ath9k_channel *init_channel;
         int ret = 0;
         enum htc_phymode mode;
@@ -1193,15 +1193,17 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || chip_reset) {
-                struct ieee80211_channel *curchan = hw->conf.channel;
+                struct ieee80211_channel *curchan = hw->conf.chandef.chan;
+                enum nl80211_channel_type channel_type =
+                        cfg80211_get_chandef_type(&hw->conf.chandef);
                 int pos = curchan->hw_value;
 
                 ath_dbg(common, CONFIG, "Set channel: %d MHz\n",
                         curchan->center_freq);
 
                 ath9k_cmn_update_ichannel(&priv->ah->channels[pos],
-                                          hw->conf.channel,
-                                          hw->conf.channel_type);
+                                          hw->conf.chandef.chan,
+                                          channel_type);
 
                 if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {
                         ath_err(common, "Unable to set channel\n");
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index bd8251c1c749..6bd0e92ea2aa 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -490,7 +490,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv,
                 if (txs->ts_flags & ATH9K_HTC_TXSTAT_SGI)
                         rate->flags |= IEEE80211_TX_RC_SHORT_GI;
         } else {
-                if (cur_conf->channel->band == IEEE80211_BAND_5GHZ)
+                if (cur_conf->chandef.chan->band == IEEE80211_BAND_5GHZ)
                         rate->idx += 4; /* No CCK rates */
         }
 
@@ -939,7 +939,7 @@ static void ath9k_process_rate(struct ieee80211_hw *hw,
                 return;
         }
 
-        band = hw->conf.channel->band;
+        band = hw->conf.chandef.chan->band;
         sband = hw->wiphy->bands[band];
 
         for (i = 0; i < sband->n_bitrates; i++) {
@@ -966,7 +966,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
         struct sk_buff *skb = rxbuf->skb;
         struct ath_common *common = ath9k_hw_common(priv->ah);
         struct ath_htc_rx_status *rxstatus;
-        int hdrlen, padpos, padsize;
+        int hdrlen, padsize;
         int last_rssi = ATH_RSSI_DUMMY_MARKER;
         __le16 fc;
 
@@ -996,11 +996,9 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
         fc = hdr->frame_control;
         hdrlen = ieee80211_get_hdrlen_from_skb(skb);
 
-        padpos = ath9k_cmn_padpos(fc);
-
-        padsize = padpos & 3;
-        if (padsize && skb->len >= padpos+padsize+FCS_LEN) {
-                memmove(skb->data + padsize, skb->data, padpos);
+        padsize = hdrlen & 3;
+        if (padsize && skb->len >= hdrlen+padsize+FCS_LEN) {
+                memmove(skb->data + padsize, skb->data, hdrlen);
                 skb_pull(skb, padsize);
         }
 
@@ -1082,8 +1080,8 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
         }
 
         rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
-        rx_status->band = hw->conf.channel->band;
-        rx_status->freq = hw->conf.channel->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->signal =  rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;
         rx_status->antenna = rxbuf->rxstatus.rs_antenna;
         rx_status->flag |= RX_FLAG_MACTIME_END;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 07e25260c31d..7f25da8444fe 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -139,7 +139,7 @@ static void ath9k_hw_set_clockrate(struct ath_hw *ah)
                 clockrate = 117;
         else if (!ah->curchan) /* should really check for CCK instead */
                 clockrate = ATH9K_CLOCK_RATE_CCK;
-        else if (conf->channel->band == IEEE80211_BAND_2GHZ)
+        else if (conf->chandef.chan->band == IEEE80211_BAND_2GHZ)
                 clockrate = ATH9K_CLOCK_RATE_2GHZ_OFDM;
         else if (ah->caps.hw_caps & ATH9K_HW_CAP_FASTCLOCK)
                 clockrate = ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM;
@@ -1100,7 +1100,8 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
         }
 
         /* As defined by IEEE 802.11-2007 17.3.8.6 */
-        acktimeout = slottime + sifstime + 3 * ah->coverage_class + ack_offset;
+        slottime += 3 * ah->coverage_class;
+        acktimeout = slottime + sifstime + ack_offset;
         ctstimeout = acktimeout;
 
         /*
@@ -1110,7 +1111,8 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
          * BA frames in some implementations, but it has been found to fix ACK
          * timeout issues in other cases as well.
          */
-        if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ &&
+        if (conf->chandef.chan &&
+            conf->chandef.chan->band == IEEE80211_BAND_2GHZ &&
             !IS_CHAN_HALF_RATE(chan) && !IS_CHAN_QUARTER_RATE(chan)) {
                 acktimeout += 64 - sifstime - ah->slottime;
                 ctstimeout += 48 - sifstime - ah->slottime;
@@ -1669,6 +1671,103 @@ bool ath9k_hw_check_alive(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ath9k_hw_check_alive);
 
+static void ath9k_hw_init_mfp(struct ath_hw *ah)
+{
+        /* Setup MFP options for CCMP */
+        if (AR_SREV_9280_20_OR_LATER(ah)) {
+                /* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt
+                 * frames when constructing CCMP AAD. */
+                REG_RMW_FIELD(ah, AR_AES_MUTE_MASK1, AR_AES_MUTE_MASK1_FC_MGMT,
+                              0xc7ff);
+                ah->sw_mgmt_crypto = false;
+        } else if (AR_SREV_9160_10_OR_LATER(ah)) {
+                /* Disable hardware crypto for management frames */
+                REG_CLR_BIT(ah, AR_PCU_MISC_MODE2,
+                            AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE);
+                REG_SET_BIT(ah, AR_PCU_MISC_MODE2,
+                            AR_PCU_MISC_MODE2_NO_CRYPTO_FOR_NON_DATA_PKT);
+                ah->sw_mgmt_crypto = true;
+        } else {
+                ah->sw_mgmt_crypto = true;
+        }
+}
+
+static void ath9k_hw_reset_opmode(struct ath_hw *ah,
+                                  u32 macStaId1, u32 saveDefAntenna)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        REG_RMW(ah, AR_STA_ID1, macStaId1
+                  | AR_STA_ID1_RTS_USE_DEF
+                  | (ah->config.ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)
+                  | ah->sta_id1_defaults,
+                  ~AR_STA_ID1_SADH_MASK);
+        ath_hw_setbssidmask(common);
+        REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);
+        ath9k_hw_write_associd(ah);
+        REG_WRITE(ah, AR_ISR, ~0);
+        REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
+
+        REGWRITE_BUFFER_FLUSH(ah);
+
+        ath9k_hw_set_operating_mode(ah, ah->opmode);
+}
+
+static void ath9k_hw_init_queues(struct ath_hw *ah)
+{
+        int i;
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        for (i = 0; i < AR_NUM_DCU; i++)
+                REG_WRITE(ah, AR_DQCUMASK(i), 1 << i);
+
+        REGWRITE_BUFFER_FLUSH(ah);
+
+        ah->intr_txqs = 0;
+        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
+                ath9k_hw_resettxqueue(ah, i);
+}
+
+/*
+ * For big endian systems turn on swapping for descriptors
+ */
+static void ath9k_hw_init_desc(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        if (AR_SREV_9100(ah)) {
+                u32 mask;
+                mask = REG_READ(ah, AR_CFG);
+                if (mask & (AR_CFG_SWRB | AR_CFG_SWTB | AR_CFG_SWRG)) {
+                        ath_dbg(common, RESET, "CFG Byte Swap Set 0x%x\n",
+                                mask);
+                } else {
+                        mask = INIT_CONFIG_STATUS | AR_CFG_SWRB | AR_CFG_SWTB;
+                        REG_WRITE(ah, AR_CFG, mask);
+                        ath_dbg(common, RESET, "Setting CFG 0x%x\n",
+                                REG_READ(ah, AR_CFG));
+                }
+        } else {
+                if (common->bus_ops->ath_bus_type == ATH_USB) {
+                        /* Configure AR9271 target WLAN */
+                        if (AR_SREV_9271(ah))
+                                REG_WRITE(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB);
+                        else
+                                REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
+                }
+#ifdef __BIG_ENDIAN
+                else if (AR_SREV_9330(ah) || AR_SREV_9340(ah) ||
+                         AR_SREV_9550(ah))
+                        REG_RMW(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB, 0);
+                else
+                        REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
+#endif
+        }
+}
+
 /*
  * Fast channel change:
  * (Change synthesizer based on channel freq without resetting chip)
@@ -1746,7 +1845,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         u32 saveDefAntenna;
         u32 macStaId1;
         u64 tsf = 0;
-        int i, r;
+        int r;
         bool start_mci_reset = false;
         bool save_fullsleep = ah->chip_fullsleep;
 
@@ -1763,10 +1862,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 ath9k_hw_getnf(ah, ah->curchan);
 
         ah->caldata = caldata;
-        if (caldata &&
-            (chan->channel != caldata->channel ||
-             (chan->channelFlags & ~CHANNEL_CW_INT) !=
-             (caldata->channelFlags & ~CHANNEL_CW_INT))) {
+        if (caldata && (chan->channel != caldata->channel ||
+                        chan->channelFlags != caldata->channelFlags)) {
                 /* Operating channel changed, reset channel calibration data */
                 memset(caldata, 0, sizeof(*caldata));
                 ath9k_init_nfcal_hist_buffer(ah, chan);
@@ -1853,22 +1950,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 ath9k_hw_settsf64(ah, tsf);
         }
 
-        /* Setup MFP options for CCMP */
-        if (AR_SREV_9280_20_OR_LATER(ah)) {
-                /* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt
-                 * frames when constructing CCMP AAD. */
-                REG_RMW_FIELD(ah, AR_AES_MUTE_MASK1, AR_AES_MUTE_MASK1_FC_MGMT,
-                              0xc7ff);
-                ah->sw_mgmt_crypto = false;
-        } else if (AR_SREV_9160_10_OR_LATER(ah)) {
-                /* Disable hardware crypto for management frames */
-                REG_CLR_BIT(ah, AR_PCU_MISC_MODE2,
-                            AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE);
-                REG_SET_BIT(ah, AR_PCU_MISC_MODE2,
-                            AR_PCU_MISC_MODE2_NO_CRYPTO_FOR_NON_DATA_PKT);
-                ah->sw_mgmt_crypto = true;
-        } else
-                ah->sw_mgmt_crypto = true;
+        ath9k_hw_init_mfp(ah);
 
         if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
                 ath9k_hw_set_delta_slope(ah, chan);
@@ -1876,24 +1958,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_spur_mitigate_freq(ah, chan);
         ah->eep_ops->set_board_values(ah, chan);
 
-        ENABLE_REGWRITE_BUFFER(ah);
-
-        REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));
-        REG_WRITE(ah, AR_STA_ID1, get_unaligned_le16(common->macaddr + 4)
-                  | macStaId1
-                  | AR_STA_ID1_RTS_USE_DEF
-                  | (ah->config.
-                     ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)
-                  | ah->sta_id1_defaults);
-        ath_hw_setbssidmask(common);
-        REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);
-        ath9k_hw_write_associd(ah);
-        REG_WRITE(ah, AR_ISR, ~0);
-        REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
-
-        REGWRITE_BUFFER_FLUSH(ah);
-
-        ath9k_hw_set_operating_mode(ah, ah->opmode);
+        ath9k_hw_reset_opmode(ah, macStaId1, saveDefAntenna);
 
         r = ath9k_hw_rf_set_freq(ah, chan);
         if (r)
@@ -1901,17 +1966,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
         ath9k_hw_set_clockrate(ah);
 
-        ENABLE_REGWRITE_BUFFER(ah);
-
-        for (i = 0; i < AR_NUM_DCU; i++)
-                REG_WRITE(ah, AR_DQCUMASK(i), 1 << i);
-
-        REGWRITE_BUFFER_FLUSH(ah);
-
-        ah->intr_txqs = 0;
-        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
-                ath9k_hw_resettxqueue(ah, i);
-
+        ath9k_hw_init_queues(ah);
         ath9k_hw_init_interrupt_masks(ah, ah->opmode);
         ath9k_hw_ani_cache_ini_regs(ah);
         ath9k_hw_init_qos(ah);
@@ -1966,38 +2021,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
         REGWRITE_BUFFER_FLUSH(ah);
 
-        /*
-         * For big endian systems turn on swapping for descriptors
-         */
-        if (AR_SREV_9100(ah)) {
-                u32 mask;
-                mask = REG_READ(ah, AR_CFG);
-                if (mask & (AR_CFG_SWRB | AR_CFG_SWTB | AR_CFG_SWRG)) {
-                        ath_dbg(common, RESET, "CFG Byte Swap Set 0x%x\n",
-                                mask);
-                } else {
-                        mask =
-                                INIT_CONFIG_STATUS | AR_CFG_SWRB | AR_CFG_SWTB;
-                        REG_WRITE(ah, AR_CFG, mask);
-                        ath_dbg(common, RESET, "Setting CFG 0x%x\n",
-                                REG_READ(ah, AR_CFG));
-                }
-        } else {
-                if (common->bus_ops->ath_bus_type == ATH_USB) {
-                        /* Configure AR9271 target WLAN */
-                        if (AR_SREV_9271(ah))
-                                REG_WRITE(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB);
-                        else
-                                REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
-                }
-#ifdef __BIG_ENDIAN
-                else if (AR_SREV_9330(ah) || AR_SREV_9340(ah) ||
-                         AR_SREV_9550(ah))
-                        REG_RMW(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB, 0);
-                else
-                        REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
-#endif
-        }
+        ath9k_hw_init_desc(ah);
 
         if (ath9k_hw_btcoex_is_enabled(ah))
                 ath9k_hw_btcoex_enable(ah);
@@ -2010,7 +2034,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
         if (AR_SREV_9300_20_OR_LATER(ah)) {
                 ar9003_hw_bb_watchdog_config(ah);
-
                 ar9003_hw_disable_phy_restart(ah);
         }
 
@@ -2358,8 +2381,11 @@ static bool ath9k_hw_dfs_tested(struct ath_hw *ah)
 {
 
         switch (ah->hw_version.macVersion) {
+        /* for temporary testing DFS with 9280 */
+        case AR_SREV_VERSION_9280:
         /* AR9580 will likely be our first target to get testing on */
         case AR_SREV_VERSION_9580:
+                return true;
         default:
                 return false;
         }
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 784e81ccb903..ae3034374bc4 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -363,7 +363,6 @@ enum ath9k_int {
         ATH9K_INT_NOCARD = 0xffffffff
 };
 
-#define CHANNEL_CW_INT    0x00002
 #define CHANNEL_CCK       0x00020
 #define CHANNEL_OFDM      0x00040
 #define CHANNEL_2GHZ      0x00080
@@ -848,14 +847,7 @@ struct ath_hw {
         struct ath_hw_ops ops;
 
         /* Used to program the radio on non single-chip devices */
-        u32 *analogBank0Data;
-        u32 *analogBank1Data;
-        u32 *analogBank2Data;
-        u32 *analogBank3Data;
         u32 *analogBank6Data;
-        u32 *analogBank6TPCData;
-        u32 *analogBank7Data;
-        u32 *bank6Temp;
 
         int coverage_class;
         u32 slottime;
@@ -886,14 +878,8 @@ struct ath_hw {
 
         struct ar5416IniArray iniModes;
         struct ar5416IniArray iniCommon;
-        struct ar5416IniArray iniBank0;
         struct ar5416IniArray iniBB_RfGain;
-        struct ar5416IniArray iniBank1;
-        struct ar5416IniArray iniBank2;
-        struct ar5416IniArray iniBank3;
         struct ar5416IniArray iniBank6;
-        struct ar5416IniArray iniBank6TPC;
-        struct ar5416IniArray iniBank7;
         struct ar5416IniArray iniAddac;
         struct ar5416IniArray iniPcieSerdes;
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index af932c9444de..0237b2868961 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -319,6 +319,10 @@ static void ath9k_reg_notifier(struct wiphy *wiphy,
                 ath9k_ps_wakeup(sc);
                 ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit, false);
                 sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
+                /* synchronize DFS detector if regulatory domain changed */
+                if (sc->dfs_detector != NULL)
+                        sc->dfs_detector->set_dfs_domain(sc->dfs_detector,
+                                                         request->dfs_region);
                 ath9k_ps_restore(sc);
         }
 }
@@ -573,7 +577,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         atomic_set(&ah->intr_ref_cnt, -1);
         sc->sc_ah = ah;
 
-        sc->dfs_detector = dfs_pattern_detector_init(NL80211_DFS_UNSET);
+        sc->dfs_detector = dfs_pattern_detector_init(ah, NL80211_DFS_UNSET);
 
         if (!pdata) {
                 ah->ah_flags |= AH_USE_EEPROM;
@@ -727,12 +731,28 @@ static const struct ieee80211_iface_limit if_limits[] = {
                                  BIT(NL80211_IFTYPE_P2P_GO) },
 };
 
-static const struct ieee80211_iface_combination if_comb = {
-        .limits = if_limits,
-        .n_limits = ARRAY_SIZE(if_limits),
-        .max_interfaces = 2048,
-        .num_different_channels = 1,
-        .beacon_int_infra_match = true,
+
+static const struct ieee80211_iface_limit if_dfs_limits[] = {
+        { .max = 1,     .types = BIT(NL80211_IFTYPE_AP) },
+};
+
+static const struct ieee80211_iface_combination if_comb[] = {
+        {
+                .limits = if_limits,
+                .n_limits = ARRAY_SIZE(if_limits),
+                .max_interfaces = 2048,
+                .num_different_channels = 1,
+                .beacon_int_infra_match = true,
+        },
+        {
+                .limits = if_dfs_limits,
+                .n_limits = ARRAY_SIZE(if_dfs_limits),
+                .max_interfaces = 1,
+                .num_different_channels = 1,
+                .beacon_int_infra_match = true,
+                .radar_detect_widths =  BIT(NL80211_CHAN_NO_HT) |
+                                        BIT(NL80211_CHAN_HT20),
+        }
 };
 
 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
@@ -746,7 +766,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                 IEEE80211_HW_SUPPORTS_PS |
                 IEEE80211_HW_PS_NULLFUNC_STACK |
                 IEEE80211_HW_SPECTRUM_MGMT |
-                IEEE80211_HW_REPORTS_TX_ACK_STATUS;
+                IEEE80211_HW_REPORTS_TX_ACK_STATUS |
+                IEEE80211_HW_SUPPORTS_RC_TABLE;
 
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
                  hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
@@ -763,8 +784,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                 BIT(NL80211_IFTYPE_ADHOC) |
                 BIT(NL80211_IFTYPE_MESH_POINT);
 
-        hw->wiphy->iface_combinations = &if_comb;
-        hw->wiphy->n_iface_combinations = 1;
+        hw->wiphy->iface_combinations = if_comb;
+        hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
 
         if (AR_SREV_5416(sc->sc_ah))
                 hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
index 7fdac6c7b3ea..849259b07370 100644
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -214,7 +214,7 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
         txctl.txq = sc->tx.txq_map[IEEE80211_AC_BE];
 
         memset(tx_info, 0, sizeof(*tx_info));
-        tx_info->band = hw->conf.channel->band;
+        tx_info->band = hw->conf.chandef.chan->band;
         tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
         tx_info->control.rates[0].idx = 0;
         tx_info->control.rates[0].count = 1;
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 811007ec07a7..498fee04afa0 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -615,6 +615,14 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
                         rs->rs_status |= ATH9K_RXERR_DECRYPT;
                 else if (ads.ds_rxstatus8 & AR_MichaelErr)
                         rs->rs_status |= ATH9K_RXERR_MIC;
+        } else {
+                if (ads.ds_rxstatus8 &
+                    (AR_CRCErr | AR_PHYErr | AR_DecryptCRCErr | AR_MichaelErr))
+                        rs->rs_status |= ATH9K_RXERR_CORRUPT_DESC;
+
+                /* Only up to MCS16 supported, everything above is invalid */
+                if (rs->rs_rate >= 0x90)
+                        rs->rs_status |= ATH9K_RXERR_CORRUPT_DESC;
         }
 
         if (ads.ds_rxstatus8 & AR_KeyMiss)
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 1ff817061ebc..5865f92998e1 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -183,6 +183,7 @@ struct ath_htc_rx_status {
 #define ATH9K_RXERR_DECRYPT       0x08
 #define ATH9K_RXERR_MIC           0x10
 #define ATH9K_RXERR_KEYMISS       0x20
+#define ATH9K_RXERR_CORRUPT_DESC  0x40
 
 #define ATH9K_RX_MORE             0x01
 #define ATH9K_RX_MORE_AGGR        0x02
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 988372d218a4..6963862a1872 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -589,7 +589,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
         struct ath_softc *sc = hw->priv;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ieee80211_channel *curchan = hw->conf.channel;
+        struct ieee80211_channel *curchan = hw->conf.chandef.chan;
         struct ath9k_channel *init_channel;
         int r;
 
@@ -839,10 +839,14 @@ static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
         struct ath9k_vif_iter_data *iter_data = data;
         int i;
 
-        if (iter_data->hw_macaddr)
+        if (iter_data->has_hw_macaddr) {
                 for (i = 0; i < ETH_ALEN; i++)
                         iter_data->mask[i] &=
                                 ~(iter_data->hw_macaddr[i] ^ mac[i]);
+        } else {
+                memcpy(iter_data->hw_macaddr, mac, ETH_ALEN);
+                iter_data->has_hw_macaddr = true;
+        }
 
         switch (vif->type) {
         case NL80211_IFTYPE_AP:
@@ -891,7 +895,6 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
          * together with the BSSID mask when matching addresses.
          */
         memset(iter_data, 0, sizeof(*iter_data));
-        iter_data->hw_macaddr = common->macaddr;
         memset(&iter_data->mask, 0xff, ETH_ALEN);
 
         if (vif)
@@ -901,6 +904,8 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
         ieee80211_iterate_active_interfaces_atomic(
                 sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
                 ath9k_vif_iter, iter_data);
+
+        memcpy(common->macaddr, iter_data->hw_macaddr, ETH_ALEN);
 }
 
 /* Called with sc->mutex held. */
@@ -1188,7 +1193,9 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
-                struct ieee80211_channel *curchan = hw->conf.channel;
+                struct ieee80211_channel *curchan = hw->conf.chandef.chan;
+                enum nl80211_channel_type channel_type =
+                        cfg80211_get_chandef_type(&conf->chandef);
                 int pos = curchan->hw_value;
                 int old_pos = -1;
                 unsigned long flags;
@@ -1197,7 +1204,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                         old_pos = ah->curchan - &ah->channels[0];
 
                 ath_dbg(common, CONFIG, "Set channel: %d MHz type: %d\n",
-                        curchan->center_freq, conf->channel_type);
+                        curchan->center_freq, channel_type);
 
                 /* update survey stats for the old channel before switching */
                 spin_lock_irqsave(&common->cc_lock, flags);
@@ -1212,7 +1219,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                         ath9k_hw_getnf(ah, ah->curchan);
 
                 ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
-                                          curchan, conf->channel_type);
+                                          curchan, channel_type);
 
                 /*
                  * If the operating channel changes, change the survey in-use flags
@@ -1249,10 +1256,27 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 if (old_pos >= 0)
                         ath_update_survey_nf(sc, old_pos);
 
-                /* perform spectral scan if requested. */
-                if (sc->scanning && sc->spectral_mode == SPECTRAL_CHANSCAN)
-                        ath9k_spectral_scan_trigger(hw);
-
+                /*
+                 * Enable radar pulse detection if on a DFS channel. Spectral
+                 * scanning and radar detection can not be used concurrently.
+                 */
+                if (hw->conf.radar_enabled) {
+                        u32 rxfilter;
+
+                        /* set HW specific DFS configuration */
+                        ath9k_hw_set_radar_params(ah);
+                        rxfilter = ath9k_hw_getrxfilter(ah);
+                        rxfilter |= ATH9K_RX_FILTER_PHYRADAR |
+                                    ATH9K_RX_FILTER_PHYERR;
+                        ath9k_hw_setrxfilter(ah, rxfilter);
+                        ath_dbg(common, DFS, "DFS enabled at freq %d\n",
+                                curchan->center_freq);
+                } else {
+                        /* perform spectral scan if requested. */
+                        if (sc->scanning &&
+                            sc->spectral_mode == SPECTRAL_CHANSCAN)
+                                ath9k_spectral_scan_trigger(hw);
+                }
         }
 
         if (changed & IEEE80211_CONF_CHANGE_POWER) {
@@ -1749,7 +1773,7 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
         mutex_unlock(&sc->mutex);
 }
 
-static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
+static void ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct ath_softc *sc = hw->priv;
         struct ath_hw *ah = sc->sc_ah;
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 96ac433ba7f6..aa4d368d8d3d 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -814,7 +814,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
          * So, set fourth rate in series to be same as third one for
          * above conditions.
          */
-        if ((sc->hw->conf.channel->band == IEEE80211_BAND_2GHZ) &&
+        if ((sc->hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ) &&
             (conf_is_ht(&sc->hw->conf))) {
                 u8 dot11rate = rate_table->info[rix].dot11rate;
                 u8 phy = rate_table->info[rix].phy;
@@ -1328,7 +1328,7 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
 
                 ath_dbg(ath9k_hw_common(sc->sc_ah), CONFIG,
                         "Operating HT Bandwidth changed to: %d\n",
-                        sc->hw->conf.channel_type);
+                        cfg80211_get_chandef_type(&sc->hw->conf.chandef));
         }
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index ee156e543147..8be2b5d8c155 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -124,13 +124,13 @@ static bool ath_rx_edma_buf_link(struct ath_softc *sc,
 
         SKB_CB_ATHBUF(skb) = bf;
         ath9k_hw_addrxbuf_edma(ah, bf->bf_buf_addr, qtype);
-        skb_queue_tail(&rx_edma->rx_fifo, skb);
+        __skb_queue_tail(&rx_edma->rx_fifo, skb);
 
         return true;
 }
 
 static void ath_rx_addbuffer_edma(struct ath_softc *sc,
-                                  enum ath9k_rx_qtype qtype, int size)
+                                  enum ath9k_rx_qtype qtype)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_buf *bf, *tbf;
@@ -155,7 +155,7 @@ static void ath_rx_remove_buffer(struct ath_softc *sc,
 
         rx_edma = &sc->rx.rx_edma[qtype];
 
-        while ((skb = skb_dequeue(&rx_edma->rx_fifo)) != NULL) {
+        while ((skb = __skb_dequeue(&rx_edma->rx_fifo)) != NULL) {
                 bf = SKB_CB_ATHBUF(skb);
                 BUG_ON(!bf);
                 list_add_tail(&bf->list, &sc->rx.rxbuf);
@@ -250,15 +250,9 @@ rx_init_fail:
 static void ath_edma_start_recv(struct ath_softc *sc)
 {
         ath9k_hw_rxena(sc->sc_ah);
-
-        ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP,
-                              sc->rx.rx_edma[ATH9K_RX_QUEUE_HP].rx_fifo_hwsize);
-
-        ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_LP,
-                              sc->rx.rx_edma[ATH9K_RX_QUEUE_LP].rx_fifo_hwsize);
-
+        ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP);
+        ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_LP);
         ath_opmode_init(sc);
-
         ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
 }
 
@@ -280,49 +274,47 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
         common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
                              sc->sc_ah->caps.rx_status_len;
 
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 return ath_rx_edma_init(sc, nbufs);
-        } else {
-                ath_dbg(common, CONFIG, "cachelsz %u rxbufsize %u\n",
-                        common->cachelsz, common->rx_bufsize);
 
-                /* Initialize rx descriptors */
+        ath_dbg(common, CONFIG, "cachelsz %u rxbufsize %u\n",
+                common->cachelsz, common->rx_bufsize);
 
-                error = ath_descdma_setup(sc, &sc->rx.rxdma, &sc->rx.rxbuf,
-                                "rx", nbufs, 1, 0);
-                if (error != 0) {
-                        ath_err(common,
-                                "failed to allocate rx descriptors: %d\n",
-                                error);
+        /* Initialize rx descriptors */
+
+        error = ath_descdma_setup(sc, &sc->rx.rxdma, &sc->rx.rxbuf,
+                                  "rx", nbufs, 1, 0);
+        if (error != 0) {
+                ath_err(common,
+                        "failed to allocate rx descriptors: %d\n",
+                        error);
+                goto err;
+        }
+
+        list_for_each_entry(bf, &sc->rx.rxbuf, list) {
+                skb = ath_rxbuf_alloc(common, common->rx_bufsize,
+                                      GFP_KERNEL);
+                if (skb == NULL) {
+                        error = -ENOMEM;
                         goto err;
                 }
 
-                list_for_each_entry(bf, &sc->rx.rxbuf, list) {
-                        skb = ath_rxbuf_alloc(common, common->rx_bufsize,
-                                              GFP_KERNEL);
-                        if (skb == NULL) {
-                                error = -ENOMEM;
-                                goto err;
-                        }
-
-                        bf->bf_mpdu = skb;
-                        bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
-                                        common->rx_bufsize,
-                                        DMA_FROM_DEVICE);
-                        if (unlikely(dma_mapping_error(sc->dev,
-                                                        bf->bf_buf_addr))) {
-                                dev_kfree_skb_any(skb);
-                                bf->bf_mpdu = NULL;
-                                bf->bf_buf_addr = 0;
-                                ath_err(common,
-                                        "dma_mapping_error() on RX init\n");
-                                error = -ENOMEM;
-                                goto err;
-                        }
+                bf->bf_mpdu = skb;
+                bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
+                                                 common->rx_bufsize,
+                                                 DMA_FROM_DEVICE);
+                if (unlikely(dma_mapping_error(sc->dev,
+                                               bf->bf_buf_addr))) {
+                        dev_kfree_skb_any(skb);
+                        bf->bf_mpdu = NULL;
+                        bf->bf_buf_addr = 0;
+                        ath_err(common,
+                                "dma_mapping_error() on RX init\n");
+                        error = -ENOMEM;
+                        goto err;
                 }
-                sc->rx.rxlink = NULL;
         }
-
+        sc->rx.rxlink = NULL;
 err:
         if (error)
                 ath_rx_cleanup(sc);
@@ -340,17 +332,17 @@ void ath_rx_cleanup(struct ath_softc *sc)
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
                 ath_rx_edma_cleanup(sc);
                 return;
-        } else {
-                list_for_each_entry(bf, &sc->rx.rxbuf, list) {
-                        skb = bf->bf_mpdu;
-                        if (skb) {
-                                dma_unmap_single(sc->dev, bf->bf_buf_addr,
-                                                common->rx_bufsize,
-                                                DMA_FROM_DEVICE);
-                                dev_kfree_skb(skb);
-                                bf->bf_buf_addr = 0;
-                                bf->bf_mpdu = NULL;
-                        }
+        }
+
+        list_for_each_entry(bf, &sc->rx.rxbuf, list) {
+                skb = bf->bf_mpdu;
+                if (skb) {
+                        dma_unmap_single(sc->dev, bf->bf_buf_addr,
+                                         common->rx_bufsize,
+                                         DMA_FROM_DEVICE);
+                        dev_kfree_skb(skb);
+                        bf->bf_buf_addr = 0;
+                        bf->bf_mpdu = NULL;
                 }
         }
 }
@@ -381,6 +373,10 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
         rfilt = ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
                 | ATH9K_RX_FILTER_MCAST;
 
+        /* if operating on a DFS channel, enable radar pulse detection */
+        if (sc->hw->conf.radar_enabled)
+                rfilt |= ATH9K_RX_FILTER_PHYRADAR | ATH9K_RX_FILTER_PHYERR;
+
         if (sc->rx.rxfilter & FIF_PROBE_REQ)
                 rfilt |= ATH9K_RX_FILTER_PROBEREQ;
 
@@ -723,6 +719,13 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
                 ret = ath9k_hw_rxprocdesc(ah, tds, &trs);
                 if (ret == -EINPROGRESS)
                         return NULL;
+
+                /*
+                 * mark descriptor as zero-length and set the 'more'
+                 * flag to ensure that both buffers get discarded
+                 */
+                rs->rs_datalen = 0;
+                rs->rs_more = true;
         }
 
         list_del(&bf->list);
@@ -859,7 +862,7 @@ static int ath9k_process_rate(struct ath_common *common,
         unsigned int i = 0;
         struct ath_softc __maybe_unused *sc = common->priv;
 
-        band = hw->conf.channel->band;
+        band = hw->conf.chandef.chan->band;
         sband = hw->wiphy->bands[band];
 
         if (rx_stats->rs_rate & 0x80) {
@@ -929,14 +932,20 @@ static void ath9k_process_rssi(struct ath_common *common,
  * up the frame up to let mac80211 handle the actual error case, be it no
  * decryption key or real decryption error. This let us keep statistics there.
  */
-static int ath9k_rx_skb_preprocess(struct ath_common *common,
-                                   struct ieee80211_hw *hw,
+static int ath9k_rx_skb_preprocess(struct ath_softc *sc,
                                    struct ieee80211_hdr *hdr,
                                    struct ath_rx_status *rx_stats,
                                    struct ieee80211_rx_status *rx_status,
                                    bool *decrypt_error)
 {
-        struct ath_hw *ah = common->ah;
+        struct ieee80211_hw *hw = sc->hw;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        bool discard_current = sc->rx.discard_next;
+
+        sc->rx.discard_next = rx_stats->rs_more;
+        if (discard_current)
+                return -EINVAL;
 
         /*
          * everything but the rate is checked here, the rate check is done
@@ -954,14 +963,15 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common,
         if (ath9k_process_rate(common, hw, rx_stats, rx_status))
                 return -EINVAL;
 
-        rx_status->band = hw->conf.channel->band;
-        rx_status->freq = hw->conf.channel->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->signal = ah->noise + rx_stats->rs_rssi;
         rx_status->antenna = rx_stats->rs_antenna;
         rx_status->flag |= RX_FLAG_MACTIME_END;
         if (rx_stats->rs_moreaggr)
                 rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
 
+        sc->rx.discard_next = false;
         return 0;
 }
 
@@ -981,7 +991,7 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common,
         hdr = (struct ieee80211_hdr *) skb->data;
         hdrlen = ieee80211_get_hdrlen_from_skb(skb);
         fc = hdr->frame_control;
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
+        padpos = ieee80211_hdrlen(fc);
 
         /* The MAC header is padded to have 32-bit boundary if the
          * packet payload is non-zero. The general calculation for
@@ -1162,6 +1172,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
         u64 tsf = 0;
         u32 tsf_lower = 0;
         unsigned long flags;
+        dma_addr_t new_buf_addr;
 
         if (edma)
                 dma_type = DMA_BIDIRECTIONAL;
@@ -1228,6 +1239,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                     unlikely(tsf_lower - rs.rs_tstamp > 0x10000000))
                         rxs->mactime += 0x100000000ULL;
 
+                if (rs.rs_phyerr == ATH9K_PHYERR_RADAR)
+                        ath9k_dfs_process_phyerr(sc, hdr, &rs, rxs->mactime);
+
                 if (rs.rs_status & ATH9K_RXERR_PHY) {
                         if (ath_process_fft(sc, hdr, &rs, rxs->mactime)) {
                                 RX_STAT_INC(rx_spectral);
@@ -1235,8 +1249,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         }
                 }
 
-                retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
-                                                 rxs, &decrypt_error);
+                retval = ath9k_rx_skb_preprocess(sc, hdr, &rs, rxs,
+                                                 &decrypt_error);
                 if (retval)
                         goto requeue_drop_frag;
 
@@ -1257,10 +1271,20 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         goto requeue_drop_frag;
                 }
 
+                /* We will now give hardware our shiny new allocated skb */
+                new_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
+                                              common->rx_bufsize, dma_type);
+                if (unlikely(dma_mapping_error(sc->dev, new_buf_addr))) {
+                        dev_kfree_skb_any(requeue_skb);
+                        goto requeue_drop_frag;
+                }
+
                 /* Unmap the frame */
                 dma_unmap_single(sc->dev, bf->bf_buf_addr,
-                                 common->rx_bufsize,
-                                 dma_type);
+                                 common->rx_bufsize, dma_type);
+
+                bf->bf_mpdu = requeue_skb;
+                bf->bf_buf_addr = new_buf_addr;
 
                 skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
                 if (ah->caps.rx_status_len)
@@ -1270,21 +1294,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         ath9k_rx_skb_postprocess(common, hdr_skb, &rs,
                                                  rxs, decrypt_error);
 
-                /* We will now give hardware our shiny new allocated skb */
-                bf->bf_mpdu = requeue_skb;
-                bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
-                                                 common->rx_bufsize,
-                                                 dma_type);
-                if (unlikely(dma_mapping_error(sc->dev,
-                          bf->bf_buf_addr))) {
-                        dev_kfree_skb_any(requeue_skb);
-                        bf->bf_mpdu = NULL;
-                        bf->bf_buf_addr = 0;
-                        ath_err(common, "dma_mapping_error() on RX\n");
-                        ieee80211_rx(hw, skb);
-                        break;
-                }
-
                 if (rs.rs_more) {
                         RX_STAT_INC(rx_frags);
                         /*
@@ -1302,6 +1311,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         sc->rx.frag = skb;
                         goto requeue;
                 }
+                if (rs.rs_status & ATH9K_RXERR_CORRUPT_DESC)
+                        goto requeue_drop_frag;
 
                 if (sc->rx.frag) {
                         int space = skb->len - skb_tailroom(hdr_skb);
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 5929850649f0..5c4ab5026dca 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -1493,9 +1493,6 @@ enum {
 #define AR9271_RADIO_RF_RST                     0x20
 #define AR9271_GATE_MAC_CTL                     0x4000
 
-#define AR_STA_ID0                 0x8000
-#define AR_STA_ID1                 0x8004
-#define AR_STA_ID1_SADH_MASK       0x0000FFFF
 #define AR_STA_ID1_STA_AP          0x00010000
 #define AR_STA_ID1_ADHOC           0x00020000
 #define AR_STA_ID1_PWR_SAV         0x00040000
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 89a64411b82e..eab0fcb7ded6 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -157,6 +157,13 @@ static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)
                            seqno << IEEE80211_SEQ_SEQ_SHIFT);
 }
 
+static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,
+                          struct ath_buf *bf)
+{
+        ieee80211_get_tx_rates(vif, sta, bf->bf_mpdu, bf->rates,
+                               ARRAY_SIZE(bf->rates));
+}
+
 static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 {
         struct ath_txq *txq = tid->ac->txq;
@@ -189,6 +196,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
                         sendbar = true;
                 } else {
+                        ath_set_rates(tid->an->vif, tid->an->sta, bf);
                         ath_tx_send_normal(sc, txq, NULL, skb);
                 }
         }
@@ -407,7 +415,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
         tx_info = IEEE80211_SKB_CB(skb);
 
-        memcpy(rates, tx_info->control.rates, sizeof(rates));
+        memcpy(rates, bf->rates, sizeof(rates));
 
         retries = ts->ts_longretry + 1;
         for (i = 0; i < ts->ts_rateindex; i++)
@@ -516,8 +524,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                  * not a holding desc.
                  */
                 INIT_LIST_HEAD(&bf_head);
-                if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) ||
-                    bf_next != NULL || !bf_last->bf_stale)
+                if (bf_next != NULL || !bf_last->bf_stale)
                         list_move_tail(&bf->list, &bf_head);
 
                 if (!txpending || (tid->state & AGGR_CLEANUP)) {
@@ -537,8 +544,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                 !txfail);
                 } else {
                         /* retry the un-acked ones */
-                        if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
-                            bf->bf_next == NULL && bf_last->bf_stale) {
+                        if (bf->bf_next == NULL && bf_last->bf_stale) {
                                 struct ath_buf *tbf;
 
                                 tbf = ath_clone_txbuf(sc, bf_last);
@@ -738,8 +744,6 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
                                   bool first_subfrm)
 {
 #define FIRST_DESC_NDELIMS 60
-        struct sk_buff *skb = bf->bf_mpdu;
-        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         u32 nsymbits, nsymbols;
         u16 minlen;
         u8 flags, rix;
@@ -780,8 +784,8 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
         if (tid->an->mpdudensity == 0)
                 return ndelim;
 
-        rix = tx_info->control.rates[0].idx;
-        flags = tx_info->control.rates[0].flags;
+        rix = bf->rates[0].idx;
+        flags = bf->rates[0].flags;
         width = (flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ? 1 : 0;
         half_gi = (flags & IEEE80211_TX_RC_SHORT_GI) ? 1 : 0;
 
@@ -860,6 +864,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                         bf_first = bf;
 
                 if (!rl) {
+                        ath_set_rates(tid->an->vif, tid->an->sta, bf);
                         aggr_limit = ath_lookup_rate(sc, bf, tid);
                         rl = 1;
                 }
@@ -1000,14 +1005,14 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
 
         skb = bf->bf_mpdu;
         tx_info = IEEE80211_SKB_CB(skb);
-        rates = tx_info->control.rates;
+        rates = bf->rates;
         hdr = (struct ieee80211_hdr *)skb->data;
 
         /* set dur_update_en for l-sig computation except for PS-Poll frames */
         info->dur_update = !ieee80211_is_pspoll(hdr->frame_control);
         info->rtscts_rate = fi->rtscts_rate;
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < ARRAY_SIZE(bf->rates); i++) {
                 bool is_40, is_sgi, is_sp;
                 int phy;
 
@@ -1745,6 +1750,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
                 return;
         }
 
+        ath_set_rates(tid->an->vif, tid->an->sta, bf);
         bf->bf_state.bf_type = BUF_AMPDU;
         INIT_LIST_HEAD(&bf_head);
         list_add(&bf->list, &bf_head);
@@ -1894,49 +1900,6 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
         return bf;
 }
 
-/* FIXME: tx power */
-static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
-                             struct ath_tx_control *txctl)
-{
-        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ath_atx_tid *tid = NULL;
-        struct ath_buf *bf;
-        u8 tidno;
-
-        if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {
-                tidno = ieee80211_get_qos_ctl(hdr)[0] &
-                        IEEE80211_QOS_CTL_TID_MASK;
-                tid = ATH_AN_2_TID(txctl->an, tidno);
-
-                WARN_ON(tid->ac->txq != txctl->txq);
-        }
-
-        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
-                /*
-                 * Try aggregation if it's a unicast data frame
-                 * and the destination is HT capable.
-                 */
-                ath_tx_send_ampdu(sc, tid, skb, txctl);
-        } else {
-                bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
-                if (!bf) {
-                        if (txctl->paprd)
-                                dev_kfree_skb_any(skb);
-                        else
-                                ieee80211_free_txskb(sc->hw, skb);
-                        return;
-                }
-
-                bf->bf_state.bfs_paprd = txctl->paprd;
-
-                if (txctl->paprd)
-                        bf->bf_state.bfs_paprd_timestamp = jiffies;
-
-                ath_tx_send_normal(sc, txctl->txq, tid, skb);
-        }
-}
-
 /* Upon failure caller should free skb */
 int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                  struct ath_tx_control *txctl)
@@ -1947,8 +1910,11 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
         struct ieee80211_vif *vif = info->control.vif;
         struct ath_softc *sc = hw->priv;
         struct ath_txq *txq = txctl->txq;
+        struct ath_atx_tid *tid = NULL;
+        struct ath_buf *bf;
         int padpos, padsize;
         int frmlen = skb->len + FCS_LEN;
+        u8 tidno;
         int q;
 
         /* NOTE:  sta can be NULL according to net/mac80211.h */
@@ -1971,7 +1937,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
         }
 
         /* Add the padding after the header if this is not already done */
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
+        padpos = ieee80211_hdrlen(hdr->frame_control);
         padsize = padpos & 3;
         if (padsize && skb->len > padpos) {
                 if (skb_headroom(skb) < padsize)
@@ -2004,8 +1970,41 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                 txq->stopped = true;
         }
 
-        ath_tx_start_dma(sc, skb, txctl);
+        if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {
+                tidno = ieee80211_get_qos_ctl(hdr)[0] &
+                        IEEE80211_QOS_CTL_TID_MASK;
+                tid = ATH_AN_2_TID(txctl->an, tidno);
+
+                WARN_ON(tid->ac->txq != txctl->txq);
+        }
+
+        if ((info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
+                /*
+                 * Try aggregation if it's a unicast data frame
+                 * and the destination is HT capable.
+                 */
+                ath_tx_send_ampdu(sc, tid, skb, txctl);
+                goto out;
+        }
 
+        bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
+        if (!bf) {
+                if (txctl->paprd)
+                        dev_kfree_skb_any(skb);
+                else
+                        ieee80211_free_txskb(sc->hw, skb);
+                goto out;
+        }
+
+        bf->bf_state.bfs_paprd = txctl->paprd;
+
+        if (txctl->paprd)
+                bf->bf_state.bfs_paprd_timestamp = jiffies;
+
+        ath_set_rates(vif, sta, bf);
+        ath_tx_send_normal(sc, txctl->txq, tid, skb);
+
+out:
         ath_txq_unlock(sc, txq);
 
         return 0;
@@ -2033,7 +2032,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 /* Frame was ACKed */
                 tx_info->flags |= IEEE80211_TX_STAT_ACK;
 
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
+        padpos = ieee80211_hdrlen(hdr->frame_control);
         padsize = padpos & 3;
         if (padsize && skb->len>padpos+padsize) {
                 /*
@@ -2264,6 +2263,7 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
         struct ath_txq *txq;
         struct ath_buf *bf, *lastbf;
         struct list_head bf_head;
+        struct list_head *fifo_list;
         int status;
 
         for (;;) {
@@ -2291,20 +2291,24 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
 
                 TX_STAT_INC(txq->axq_qnum, txprocdesc);
 
-                if (list_empty(&txq->txq_fifo[txq->txq_tailidx])) {
+                fifo_list = &txq->txq_fifo[txq->txq_tailidx];
+                if (list_empty(fifo_list)) {
                         ath_txq_unlock(sc, txq);
                         return;
                 }
 
-                bf = list_first_entry(&txq->txq_fifo[txq->txq_tailidx],
-                                      struct ath_buf, list);
+                bf = list_first_entry(fifo_list, struct ath_buf, list);
+                if (bf->bf_stale) {
+                        list_del(&bf->list);
+                        ath_tx_return_buffer(sc, bf);
+                        bf = list_first_entry(fifo_list, struct ath_buf, list);
+                }
+
                 lastbf = bf->bf_lastbf;
 
                 INIT_LIST_HEAD(&bf_head);
-                list_cut_position(&bf_head, &txq->txq_fifo[txq->txq_tailidx],
-                                  &lastbf->list);
-
-                if (list_empty(&txq->txq_fifo[txq->txq_tailidx])) {
+                if (list_is_last(&lastbf->list, fifo_list)) {
+                        list_splice_tail_init(fifo_list, &bf_head);
                         INCR(txq->txq_tailidx, ATH_TXFIFO_DEPTH);
 
                         if (!list_empty(&txq->axq_q)) {
@@ -2315,6 +2319,11 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
                                 list_splice_tail_init(&txq->axq_q, &bf_q);
                                 ath_tx_txqaddbuf(sc, txq, &bf_q, true);
                         }
+                } else {
+                        lastbf->bf_stale = true;
+                        if (bf != lastbf)
+                                list_cut_position(&bf_head, fifo_list,
+                                                  lastbf->list.prev);
                 }
 
                 ath_tx_process_buffer(sc, txq, &ts, bf, &bf_head);
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 25599741cd8a..9dce106cd6d4 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -70,12 +70,6 @@
 
 static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = { 3, 2, 1, 0 };
 
-enum carl9170_rf_init_mode {
-        CARL9170_RFI_NONE,
-        CARL9170_RFI_WARM,
-        CARL9170_RFI_COLD,
-};
-
 #define CARL9170_MAX_RX_BUFFER_SIZE             8192
 
 enum carl9170_device_state {
@@ -599,7 +593,7 @@ int carl9170_led_set_state(struct ar9170 *ar, const u32 led_state);
 
 /* PHY / RF */
 int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
-        enum nl80211_channel_type bw, enum carl9170_rf_init_mode rfi);
+                         enum nl80211_channel_type bw);
 int carl9170_get_noisefloor(struct ar9170 *ar);
 
 /* FW */
diff --git a/drivers/net/wireless/ath/carl9170/debug.c b/drivers/net/wireless/ath/carl9170/debug.c
index 93fe6003a493..3d70cd277fd7 100644
--- a/drivers/net/wireless/ath/carl9170/debug.c
+++ b/drivers/net/wireless/ath/carl9170/debug.c
@@ -654,8 +654,8 @@ static ssize_t carl9170_debugfs_bug_write(struct ar9170 *ar, const char *buf,
                 goto out;
 
         case 'P':
-                err = carl9170_set_channel(ar, ar->hw->conf.channel,
-                        ar->hw->conf.channel_type, CARL9170_RFI_COLD);
+                err = carl9170_set_channel(ar, ar->hw->conf.chandef.chan,
+                        cfg80211_get_chandef_type(&ar->hw->conf.chandef));
                 if (err < 0)
                         count = err;
 
diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
index 24d75ab94f0d..a2f005703c04 100644
--- a/drivers/net/wireless/ath/carl9170/mac.c
+++ b/drivers/net/wireless/ath/carl9170/mac.c
@@ -48,7 +48,7 @@ int carl9170_set_dyn_sifs_ack(struct ar9170 *ar)
         if (conf_is_ht40(&ar->hw->conf))
                 val = 0x010a;
         else {
-                if (ar->hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+                if (ar->hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                         val = 0x105;
                 else
                         val = 0x104;
@@ -66,7 +66,7 @@ int carl9170_set_rts_cts_rate(struct ar9170 *ar)
                 rts_rate = 0x1da;
                 cts_rate = 0x10a;
         } else {
-                if (ar->hw->conf.channel->band == IEEE80211_BAND_2GHZ) {
+                if (ar->hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ) {
                         /* 11 mbit CCK */
                         rts_rate = 033;
                         cts_rate = 003;
@@ -93,7 +93,7 @@ int carl9170_set_slot_time(struct ar9170 *ar)
                 return 0;
         }
 
-        if ((ar->hw->conf.channel->band == IEEE80211_BAND_5GHZ) ||
+        if ((ar->hw->conf.chandef.chan->band == IEEE80211_BAND_5GHZ) ||
             vif->bss_conf.use_short_slot)
                 slottime = 9;
 
@@ -120,7 +120,7 @@ int carl9170_set_mac_rates(struct ar9170 *ar)
         basic |= (vif->bss_conf.basic_rates & 0xff0) << 4;
         rcu_read_unlock();
 
-        if (ar->hw->conf.channel->band == IEEE80211_BAND_5GHZ)
+        if (ar->hw->conf.chandef.chan->band == IEEE80211_BAND_5GHZ)
                 mandatory = 0xff00; /* OFDM 6/9/12/18/24/36/48/54 */
         else
                 mandatory = 0xff0f; /* OFDM (6/9../54) + CCK (1/2/5.5/11) */
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index f293b3ff4756..e9010a481dfd 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -929,6 +929,9 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+                enum nl80211_channel_type channel_type =
+                        cfg80211_get_chandef_type(&hw->conf.chandef);
+
                 /* adjust slot time for 5 GHz */
                 err = carl9170_set_slot_time(ar);
                 if (err)
@@ -938,8 +941,8 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                 if (err)
                         goto out;
 
-                err = carl9170_set_channel(ar, hw->conf.channel,
-                        hw->conf.channel_type, CARL9170_RFI_NONE);
+                err = carl9170_set_channel(ar, hw->conf.chandef.chan,
+                                           channel_type);
                 if (err)
                         goto out;
 
@@ -957,7 +960,7 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                err = carl9170_set_mac_tpc(ar, ar->hw->conf.channel);
+                err = carl9170_set_mac_tpc(ar, ar->hw->conf.chandef.chan);
                 if (err)
                         goto out;
         }
@@ -1703,7 +1706,7 @@ found:
         return 0;
 }
 
-static void carl9170_op_flush(struct ieee80211_hw *hw, bool drop)
+static void carl9170_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct ar9170 *ar = hw->priv;
         unsigned int vid;
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index b72c09cf43a4..ab4ee7d39ad3 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -1331,7 +1331,7 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw)
          * CTL_ETSI for 2GHz and CTL_FCC for 5GHz.
          */
         ctl_grp = ath_regd_get_band_ctl(&ar->common.regulatory,
-                                        ar->hw->conf.channel->band);
+                                        ar->hw->conf.chandef.chan->band);
 
         /* ctl group not found - either invalid band (NO_CTL) or ww roaming */
         if (ctl_grp == NO_CTL || ctl_grp == SD_NO_CTL)
@@ -1341,7 +1341,7 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw)
                 /* skip CTL and heavy clip for CTL_MKK and CTL_ETSI */
                 return;
 
-        if (ar->hw->conf.channel->band == IEEE80211_BAND_2GHZ) {
+        if (ar->hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ) {
                 modes = mode_list_2ghz;
                 nr_modes = ARRAY_SIZE(mode_list_2ghz);
         } else {
@@ -1569,16 +1569,14 @@ static enum carl9170_bw nl80211_to_carl(enum nl80211_channel_type type)
 }
 
 int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
-                         enum nl80211_channel_type _bw,
-                         enum carl9170_rf_init_mode rfi)
+                         enum nl80211_channel_type _bw)
 {
         const struct carl9170_phy_freq_params *freqpar;
         struct carl9170_rf_init_result rf_res;
         struct carl9170_rf_init rf;
-        u32 cmd, tmp, offs = 0, new_ht = 0;
+        u32 tmp, offs = 0, new_ht = 0;
         int err;
         enum carl9170_bw bw;
-        bool warm_reset;
         struct ieee80211_channel *old_channel = NULL;
 
         bw = nl80211_to_carl(_bw);
@@ -1592,51 +1590,27 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
         /* may be NULL at first setup */
         if (ar->channel) {
                 old_channel = ar->channel;
-                warm_reset = (old_channel->band != channel->band) ||
-                             (old_channel->center_freq ==
-                              channel->center_freq) ||
-                             (ar->ht_settings != new_ht);
-
                 ar->channel = NULL;
-        } else {
-                warm_reset = true;
         }
 
-        /* HW workaround */
-        if (!ar->hw->wiphy->bands[IEEE80211_BAND_5GHZ] &&
-            channel->center_freq <= 2417)
-                warm_reset = true;
-
-        if (rfi != CARL9170_RFI_NONE || warm_reset) {
-                u32 val;
-
-                if (rfi == CARL9170_RFI_COLD)
-                        val = AR9170_PWR_RESET_BB_COLD_RESET;
-                else
-                        val = AR9170_PWR_RESET_BB_WARM_RESET;
-
-                /* warm/cold reset BB/ADDA */
-                err = carl9170_write_reg(ar, AR9170_PWR_REG_RESET, val);
-                if (err)
-                        return err;
-
-                err = carl9170_write_reg(ar, AR9170_PWR_REG_RESET, 0x0);
-                if (err)
-                        return err;
+        /* cold reset BB/ADDA */
+        err = carl9170_write_reg(ar, AR9170_PWR_REG_RESET,
+                                 AR9170_PWR_RESET_BB_COLD_RESET);
+        if (err)
+                return err;
 
-                err = carl9170_init_phy(ar, channel->band);
-                if (err)
-                        return err;
+        err = carl9170_write_reg(ar, AR9170_PWR_REG_RESET, 0x0);
+        if (err)
+                return err;
 
-                err = carl9170_init_rf_banks_0_7(ar,
-                        channel->band == IEEE80211_BAND_5GHZ);
-                if (err)
-                        return err;
+        err = carl9170_init_phy(ar, channel->band);
+        if (err)
+                return err;
 
-                cmd = CARL9170_CMD_RF_INIT;
-        } else {
-                cmd = CARL9170_CMD_FREQUENCY;
-        }
+        err = carl9170_init_rf_banks_0_7(ar,
+                                         channel->band == IEEE80211_BAND_5GHZ);
+        if (err)
+                return err;
 
         err = carl9170_exec_cmd(ar, CARL9170_CMD_FREQ_START, 0, NULL, 0, NULL);
         if (err)
@@ -1648,8 +1622,8 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
                 return err;
 
         err = carl9170_init_rf_bank4_pwr(ar,
-                channel->band == IEEE80211_BAND_5GHZ,
-                channel->center_freq, bw);
+                                         channel->band == IEEE80211_BAND_5GHZ,
+                                         channel->center_freq, bw);
         if (err)
                 return err;
 
@@ -1703,13 +1677,8 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
         rf.delta_slope_coeff_man = cpu_to_le32(freqpar->coeff_man);
         rf.delta_slope_coeff_exp_shgi = cpu_to_le32(freqpar->coeff_exp_shgi);
         rf.delta_slope_coeff_man_shgi = cpu_to_le32(freqpar->coeff_man_shgi);
-
-        if (rfi != CARL9170_RFI_NONE)
-                rf.finiteLoopCount = cpu_to_le32(2000);
-        else
-                rf.finiteLoopCount = cpu_to_le32(1000);
-
-        err = carl9170_exec_cmd(ar, cmd, sizeof(rf), &rf,
+        rf.finiteLoopCount = cpu_to_le32(2000);
+        err = carl9170_exec_cmd(ar, CARL9170_CMD_RF_INIT, sizeof(rf), &rf,
                                 sizeof(rf_res), &rf_res);
         if (err)
                 return err;
@@ -1724,9 +1693,8 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
                           old_channel->center_freq : -1, channel->center_freq,
                           err);
 
-                if ((rfi == CARL9170_RFI_COLD) || (ar->chan_fail > 3)) {
-                        /*
-                         * We have tried very hard to change to _another_
+                if (ar->chan_fail > 3) {
+                        /* We have tried very hard to change to _another_
                          * channel and we've failed to do so!
                          * Chances are that the PHY/RF is no longer
                          * operable (due to corruptions/fatal events/bugs?)
@@ -1736,8 +1704,7 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
                         return 0;
                 }
 
-                err = carl9170_set_channel(ar, channel, _bw,
-                                           CARL9170_RFI_COLD);
+                err = carl9170_set_channel(ar, channel, _bw);
                 if (err)
                         return err;
         } else {
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 9c0b150d5b8e..c61cafa2665b 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -387,8 +387,7 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar,
         u8 tid;
 
         if (!(txinfo->flags & IEEE80211_TX_CTL_AMPDU) ||
-            txinfo->flags & IEEE80211_TX_CTL_INJECTED ||
-           (!(super->f.mac_control & cpu_to_le16(AR9170_TX_MAC_AGGR))))
+            txinfo->flags & IEEE80211_TX_CTL_INJECTED)
                 return;
 
         rcu_read_lock();
@@ -981,30 +980,6 @@ static int carl9170_tx_prepare(struct ar9170 *ar,
 
                 SET_VAL(CARL9170_TX_SUPER_AMPDU_FACTOR,
                         txc->s.ampdu_settings, factor);
-
-                for (i = 0; i < CARL9170_TX_MAX_RATES; i++) {
-                        txrate = &info->control.rates[i];
-                        if (txrate->idx >= 0) {
-                                txc->s.ri[i] =
-                                        CARL9170_TX_SUPER_RI_AMPDU;
-
-                                if (WARN_ON(!(txrate->flags &
-                                              IEEE80211_TX_RC_MCS))) {
-                                        /*
-                                         * Not sure if it's even possible
-                                         * to aggregate non-ht rates with
-                                         * this HW.
-                                         */
-                                        goto err_out;
-                                }
-                                continue;
-                        }
-
-                        txrate->idx = 0;
-                        txrate->count = ar->hw->max_rate_tries;
-                }
-
-                mac_tmp |= cpu_to_le16(AR9170_TX_MAC_AGGR);
         }
 
         /*
@@ -1012,11 +987,31 @@ static int carl9170_tx_prepare(struct ar9170 *ar,
          * taken from mac_control. For all fallback rate, the firmware
          * updates the mac_control flags from the rate info field.
          */
-        for (i = 1; i < CARL9170_TX_MAX_RATES; i++) {
+        for (i = 0; i < CARL9170_TX_MAX_RATES; i++) {
+                __le32 phy_set;
                 txrate = &info->control.rates[i];
                 if (txrate->idx < 0)
                         break;
 
+                phy_set = carl9170_tx_physet(ar, info, txrate);
+                if (i == 0) {
+                        /* first rate - part of the hw's frame header */
+                        txc->f.phy_control = phy_set;
+
+                        if (ampdu && txrate->flags & IEEE80211_TX_RC_MCS)
+                                mac_tmp |= cpu_to_le16(AR9170_TX_MAC_AGGR);
+                        if (carl9170_tx_rts_check(ar, txrate, ampdu, no_ack))
+                                mac_tmp |= cpu_to_le16(AR9170_TX_MAC_PROT_RTS);
+                        else if (carl9170_tx_cts_check(ar, txrate))
+                                mac_tmp |= cpu_to_le16(AR9170_TX_MAC_PROT_CTS);
+
+                } else {
+                        /* fallback rates are stored in the firmware's
+                         * retry rate set array.
+                         */
+                        txc->s.rr[i - 1] = phy_set;
+                }
+
                 SET_VAL(CARL9170_TX_SUPER_RI_TRIES, txc->s.ri[i],
                         txrate->count);
 
@@ -1027,21 +1022,13 @@ static int carl9170_tx_prepare(struct ar9170 *ar,
                         txc->s.ri[i] |= (AR9170_TX_MAC_PROT_CTS <<
                                 CARL9170_TX_SUPER_RI_ERP_PROT_S);
 
-                txc->s.rr[i - 1] = carl9170_tx_physet(ar, info, txrate);
+                if (ampdu && (txrate->flags & IEEE80211_TX_RC_MCS))
+                        txc->s.ri[i] |= CARL9170_TX_SUPER_RI_AMPDU;
         }
 
-        txrate = &info->control.rates[0];
-        SET_VAL(CARL9170_TX_SUPER_RI_TRIES, txc->s.ri[0], txrate->count);
-
-        if (carl9170_tx_rts_check(ar, txrate, ampdu, no_ack))
-                mac_tmp |= cpu_to_le16(AR9170_TX_MAC_PROT_RTS);
-        else if (carl9170_tx_cts_check(ar, txrate))
-                mac_tmp |= cpu_to_le16(AR9170_TX_MAC_PROT_CTS);
-
         txc->s.len = cpu_to_le16(skb->len);
         txc->f.length = cpu_to_le16(len + FCS_LEN);
         txc->f.mac_control = mac_tmp;
-        txc->f.phy_control = carl9170_tx_physet(ar, info, txrate);
 
         arinfo = (void *)info->rate_driver_data;
         arinfo->timeout = jiffies;
@@ -1381,9 +1368,9 @@ static void carl9170_tx(struct ar9170 *ar)
 }
 
 static bool carl9170_tx_ampdu_queue(struct ar9170 *ar,
-        struct ieee80211_sta *sta, struct sk_buff *skb)
+        struct ieee80211_sta *sta, struct sk_buff *skb,
+        struct ieee80211_tx_info *txinfo)
 {
-        struct _carl9170_tx_superframe *super = (void *) skb->data;
         struct carl9170_sta_info *sta_info;
         struct carl9170_sta_tid *agg;
         struct sk_buff *iter;
@@ -1450,7 +1437,7 @@ err_unlock:
 
 err_unlock_rcu:
         rcu_read_unlock();
-        super->f.mac_control &= ~cpu_to_le16(AR9170_TX_MAC_AGGR);
+        txinfo->flags &= ~IEEE80211_TX_CTL_AMPDU;
         carl9170_tx_status(ar, skb, false);
         ar->tx_dropped++;
         return false;
@@ -1492,7 +1479,7 @@ void carl9170_op_tx(struct ieee80211_hw *hw,
                  * sta == NULL checks are redundant in this
                  * special case.
                  */
-                run = carl9170_tx_ampdu_queue(ar, sta, skb);
+                run = carl9170_tx_ampdu_queue(ar, sta, skb, info);
                 if (run)
                         carl9170_tx_ampdu(ar);
 
diff --git a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c
index 39e8a590d7fc..eae9abf540a7 100644
--- a/drivers/net/wireless/ath/hw.c
+++ b/drivers/net/wireless/ath/hw.c
@@ -118,6 +118,12 @@
 void ath_hw_setbssidmask(struct ath_common *common)
 {
         void *ah = common->ah;
+        u32 id1;
+
+        REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));
+        id1 = REG_READ(ah, AR_STA_ID1) & ~AR_STA_ID1_SADH_MASK;
+        id1 |= get_unaligned_le16(common->macaddr + 4);
+        REG_WRITE(ah, AR_STA_ID1, id1);
 
         REG_WRITE(ah, AR_BSSMSKL, get_unaligned_le32(common->bssidmask));
         REG_WRITE(ah, AR_BSSMSKU, get_unaligned_le16(common->bssidmask + 4));
diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
index 5c54aa43ca2d..1816b4e7dc26 100644
--- a/drivers/net/wireless/ath/key.c
+++ b/drivers/net/wireless/ath/key.c
@@ -45,7 +45,8 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry)
         void *ah = common->ah;
 
         if (entry >= common->keymax) {
-                ath_err(common, "keycache entry %u out of range\n", entry);
+                ath_err(common, "keyreset: keycache entry %u out of range\n",
+                        entry);
                 return false;
         }
 
@@ -91,7 +92,8 @@ static bool ath_hw_keysetmac(struct ath_common *common,
         void *ah = common->ah;
 
         if (entry >= common->keymax) {
-                ath_err(common, "keycache entry %u out of range\n", entry);
+                ath_err(common, "keysetmac: keycache entry %u out of range\n",
+                        entry);
                 return false;
         }
 
@@ -133,7 +135,8 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
         u32 keyType;
 
         if (entry >= common->keymax) {
-                ath_err(common, "keycache entry %u out of range\n", entry);
+                ath_err(common, "set-entry: keycache entry %u out of range\n",
+                        entry);
                 return false;
         }
 
diff --git a/drivers/net/wireless/ath/reg.h b/drivers/net/wireless/ath/reg.h
index 298e53f3fa48..3ad4c774bd22 100644
--- a/drivers/net/wireless/ath/reg.h
+++ b/drivers/net/wireless/ath/reg.h
@@ -23,6 +23,10 @@
 #define AR_MIBC_CMC             0x00000004
 #define AR_MIBC_MCS             0x00000008
 
+#define AR_STA_ID0              0x8000
+#define AR_STA_ID1              0x8004
+#define AR_STA_ID1_SADH_MASK    0x0000ffff
+
 /*
  * BSSID mask registers. See ath_hw_set_bssid_mask()
  * for detailed documentation about these registers.
diff --git a/drivers/net/wireless/ath/wil6210/Makefile b/drivers/net/wireless/ath/wil6210/Makefile
index 9396dc9fe3c5..d288eea0a26a 100644
--- a/drivers/net/wireless/ath/wil6210/Makefile
+++ b/drivers/net/wireless/ath/wil6210/Makefile
@@ -9,5 +9,7 @@ wil6210-objs += wmi.o
 wil6210-objs += interrupt.o
 wil6210-objs += txrx.o
 
-subdir-ccflags-y += -Werror
+ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
+        subdir-ccflags-y += -Werror
+endif
 subdir-ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 9ecc1968262c..c5d4a87abaaf 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -14,16 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/sched.h>
-#include <linux/etherdevice.h>
-#include <linux/wireless.h>
-#include <linux/ieee80211.h>
-#include <linux/slab.h>
-#include <linux/version.h>
-#include <net/cfg80211.h>
-
 #include "wil6210.h"
 #include "wmi.h"
 
@@ -292,7 +282,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
 
         /* WMI_CONNECT_CMD */
         memset(&conn, 0, sizeof(conn));
-        switch (bss->capability & 0x03) {
+        switch (bss->capability & WLAN_CAPABILITY_DMG_TYPE_MASK) {
         case WLAN_CAPABILITY_DMG_TYPE_AP:
                 conn.network_type = WMI_NETTYPE_INFRA;
                 break;
@@ -437,17 +427,18 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
         if (rc)
                 return rc;
 
-        rc = wmi_set_channel(wil, channel->hw_value);
-        if (rc)
-                return rc;
-
         /* MAC address - pre-requisite for other commands */
         wmi_set_mac_address(wil, ndev->dev_addr);
 
         /* IE's */
         /* bcon 'head IE's are not relevant for 60g band */
-        wmi_set_ie(wil, WMI_FRAME_BEACON, bcon->beacon_ies_len,
-                   bcon->beacon_ies);
+        /*
+         * FW do not form regular beacon, so bcon IE's are not set
+         * For the DMG bcon, when it will be supported, bcon IE's will
+         * be reused; add something like:
+         * wmi_set_ie(wil, WMI_FRAME_BEACON, bcon->beacon_ies_len,
+         * bcon->beacon_ies);
+         */
         wmi_set_ie(wil, WMI_FRAME_PROBE_RESP, bcon->proberesp_ies_len,
                    bcon->proberesp_ies);
         wmi_set_ie(wil, WMI_FRAME_ASSOC_RESP, bcon->assocresp_ies_len,
@@ -455,7 +446,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
 
         wil->secure_pcp = info->privacy;
 
-        rc = wmi_set_bcon(wil, info->beacon_interval, wmi_nettype);
+        rc = wmi_pcp_start(wil, info->beacon_interval, wmi_nettype,
+                           channel->hw_value);
         if (rc)
                 return rc;
 
@@ -472,11 +464,8 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy,
 {
         int rc = 0;
         struct wil6210_priv *wil = wiphy_to_wil(wiphy);
-        struct wireless_dev *wdev = ndev->ieee80211_ptr;
-        u8 wmi_nettype = wil_iftype_nl2wmi(wdev->iftype);
 
-        /* To stop beaconing, set BI to 0 */
-        rc = wmi_set_bcon(wil, 0, wmi_nettype);
+        rc = wmi_pcp_stop(wil);
 
         return rc;
 }
diff --git a/drivers/net/wireless/ath/wil6210/dbg_hexdump.h b/drivers/net/wireless/ath/wil6210/dbg_hexdump.h
deleted file mode 100644
index e5712f026c47..000000000000
--- a/drivers/net/wireless/ath/wil6210/dbg_hexdump.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef WIL_DBG_HEXDUMP_H_
-#define WIL_DBG_HEXDUMP_H_
-
-#include <linux/printk.h>
-#include <linux/dynamic_debug.h>
-
-#if defined(CONFIG_DYNAMIC_DEBUG)
-#define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize,      \
-                                 groupsize, buf, len, ascii)            \
-        dynamic_hex_dump(prefix_str, prefix_type, rowsize,              \
-                             groupsize, buf, len, ascii)
-
-#else /* defined(CONFIG_DYNAMIC_DEBUG) */
-#define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize,      \
-                                 groupsize, buf, len, ascii)            \
-        print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, rowsize,    \
-                       groupsize, buf, len, ascii)
-#endif /* defined(CONFIG_DYNAMIC_DEBUG) */
-
-#endif /* WIL_DBG_HEXDUMP_H_ */
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 65fc9683bfd8..4be07f5e22b9 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -312,14 +312,6 @@ static const struct file_operations fops_memread = {
         .llseek         = seq_lseek,
 };
 
-static int wil_default_open(struct inode *inode, struct file *file)
-{
-        if (inode->i_private)
-                file->private_data = inode->i_private;
-
-        return 0;
-}
-
 static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
 {
@@ -361,7 +353,7 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_ioblob = {
         .read =         wil_read_file_ioblob,
-        .open =         wil_default_open,
+        .open =         simple_open,
         .llseek =       default_llseek,
 };
 
@@ -396,7 +388,7 @@ static ssize_t wil_write_file_reset(struct file *file, const char __user *buf,
 
 static const struct file_operations fops_reset = {
         .write = wil_write_file_reset,
-        .open  = wil_default_open,
+        .open  = simple_open,
 };
 /*---------Tx descriptor------------*/
 
@@ -526,7 +518,50 @@ static ssize_t wil_write_file_ssid(struct file *file, const char __user *buf,
 static const struct file_operations fops_ssid = {
         .read = wil_read_file_ssid,
         .write = wil_write_file_ssid,
-        .open  = wil_default_open,
+        .open  = simple_open,
+};
+
+/*---------temp------------*/
+static void print_temp(struct seq_file *s, const char *prefix, u32 t)
+{
+        switch (t) {
+        case 0:
+        case ~(u32)0:
+                seq_printf(s, "%s N/A\n", prefix);
+        break;
+        default:
+                seq_printf(s, "%s %d.%03d\n", prefix, t / 1000, t % 1000);
+                break;
+        }
+}
+
+static int wil_temp_debugfs_show(struct seq_file *s, void *data)
+{
+        struct wil6210_priv *wil = s->private;
+        u32 t_m, t_r;
+
+        int rc = wmi_get_temperature(wil, &t_m, &t_r);
+        if (rc) {
+                seq_printf(s, "Failed\n");
+                return 0;
+        }
+
+        print_temp(s, "MAC temperature   :", t_m);
+        print_temp(s, "Radio temperature :", t_r);
+
+        return 0;
+}
+
+static int wil_temp_seq_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, wil_temp_debugfs_show, inode->i_private);
+}
+
+static const struct file_operations fops_temp = {
+        .open           = wil_temp_seq_open,
+        .release        = single_release,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
 };
 
 /*----------------*/
@@ -563,6 +598,7 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
         debugfs_create_file("mem_val", S_IRUGO, dbg, wil, &fops_memread);
 
         debugfs_create_file("reset", S_IWUSR, dbg, wil, &fops_reset);
+        debugfs_create_file("temp", S_IRUGO, dbg, wil, &fops_temp);
 
         wil->rgf_blob.data = (void * __force)wil->csr + 0;
         wil->rgf_blob.size = 0xa000;
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index dc97e7b2609c..e3c1e7684f9c 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -240,6 +240,15 @@ static void wil_notify_fw_error(struct wil6210_priv *wil)
         kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
 }
 
+static void wil_cache_mbox_regs(struct wil6210_priv *wil)
+{
+        /* make shadow copy of registers that should not change on run time */
+        wil_memcpy_fromio_32(&wil->mbox_ctl, wil->csr + HOST_MBOX,
+                             sizeof(struct wil6210_mbox_ctl));
+        wil_mbox_ring_le2cpus(&wil->mbox_ctl.rx);
+        wil_mbox_ring_le2cpus(&wil->mbox_ctl.tx);
+}
+
 static irqreturn_t wil6210_irq_misc(int irq, void *cookie)
 {
         struct wil6210_priv *wil = cookie;
@@ -257,14 +266,19 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie)
         wil6210_mask_irq_misc(wil);
 
         if (isr & ISR_MISC_FW_ERROR) {
-                wil_dbg_irq(wil, "IRQ: Firmware error\n");
+                wil_err(wil, "Firmware error detected\n");
                 clear_bit(wil_status_fwready, &wil->status);
-                wil_notify_fw_error(wil);
-                isr &= ~ISR_MISC_FW_ERROR;
+                /*
+                 * do not clear @isr here - we do 2-nd part in thread
+                 * there, user space get notified, and it should be done
+                 * in non-atomic context
+                 */
         }
 
         if (isr & ISR_MISC_FW_READY) {
                 wil_dbg_irq(wil, "IRQ: FW ready\n");
+                wil_cache_mbox_regs(wil);
+                set_bit(wil_status_reset_done, &wil->status);
                 /**
                  * Actual FW ready indicated by the
                  * WMI_FW_READY_EVENTID
@@ -289,6 +303,11 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie)
 
         wil_dbg_irq(wil, "Thread ISR MISC 0x%08x\n", isr);
 
+        if (isr & ISR_MISC_FW_ERROR) {
+                wil_notify_fw_error(wil);
+                isr &= ~ISR_MISC_FW_ERROR;
+        }
+
         if (isr & ISR_MISC_MBOX_EVT) {
                 wil_dbg_irq(wil, "MBOX event\n");
                 wmi_recv_cmd(wil);
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 761c389586d4..a0478e2f6868 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -14,12 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/sched.h>
-#include <linux/ieee80211.h>
-#include <linux/wireless.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/if_arp.h>
 
@@ -109,13 +103,24 @@ static void wil_connect_timer_fn(ulong x)
         schedule_work(&wil->disconnect_worker);
 }
 
-static void wil_cache_mbox_regs(struct wil6210_priv *wil)
+static void wil_connect_worker(struct work_struct *work)
 {
-        /* make shadow copy of registers that should not change on run time */
-        wil_memcpy_fromio_32(&wil->mbox_ctl, wil->csr + HOST_MBOX,
-                             sizeof(struct wil6210_mbox_ctl));
-        wil_mbox_ring_le2cpus(&wil->mbox_ctl.rx);
-        wil_mbox_ring_le2cpus(&wil->mbox_ctl.tx);
+        int rc;
+        struct wil6210_priv *wil = container_of(work, struct wil6210_priv,
+                                                connect_worker);
+        int cid = wil->pending_connect_cid;
+
+        if (cid < 0) {
+                wil_err(wil, "No connection pending\n");
+                return;
+        }
+
+        wil_dbg_wmi(wil, "Configure for connection CID %d\n", cid);
+
+        rc = wil_vring_init_tx(wil, 0, WIL6210_TX_RING_SIZE, cid, 0);
+        wil->pending_connect_cid = -1;
+        if (rc == 0)
+                wil_link_on(wil);
 }
 
 int wil_priv_init(struct wil6210_priv *wil)
@@ -130,7 +135,7 @@ int wil_priv_init(struct wil6210_priv *wil)
         wil->pending_connect_cid = -1;
         setup_timer(&wil->connect_timer, wil_connect_timer_fn, (ulong)wil);
 
-        INIT_WORK(&wil->wmi_connect_worker, wmi_connect_worker);
+        INIT_WORK(&wil->connect_worker, wil_connect_worker);
         INIT_WORK(&wil->disconnect_worker, wil_disconnect_worker);
         INIT_WORK(&wil->wmi_event_worker, wmi_event_worker);
 
@@ -147,8 +152,6 @@ int wil_priv_init(struct wil6210_priv *wil)
                 return -EAGAIN;
         }
 
-        wil_cache_mbox_regs(wil);
-
         return 0;
 }
 
@@ -185,15 +188,11 @@ static void wil_target_reset(struct wil6210_priv *wil)
         W(RGF_USER_MAC_CPU_0,  BIT(1)); /* mac_cpu_man_rst */
         W(RGF_USER_USER_CPU_0, BIT(1)); /* user_cpu_man_rst */
 
-        msleep(100);
-
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0xFE000000);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_1, 0x0000003F);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0x00000170);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0xFFE7FC00);
 
-        msleep(100);
-
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_3, 0);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_1, 0);
@@ -203,12 +202,6 @@ static void wil_target_reset(struct wil6210_priv *wil)
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0x00000080);
         W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0);
 
-        msleep(2000);
-
-        W(RGF_USER_USER_CPU_0, BIT(0)); /* user_cpu_man_de_rst */
-
-        msleep(2000);
-
         wil_dbg_misc(wil, "Reset completed\n");
 
 #undef W
@@ -265,8 +258,6 @@ int wil_reset(struct wil6210_priv *wil)
         wil->pending_connect_cid = -1;
         INIT_COMPLETION(wil->wmi_ready);
 
-        wil_cache_mbox_regs(wil);
-
         /* TODO: release MAC reset */
         wil6210_enable_irq(wil);
 
@@ -352,9 +343,9 @@ static int __wil_up(struct wil6210_priv *wil)
                         wil_err(wil, "SSID not set\n");
                         return -EINVAL;
                 }
-                wmi_set_ssid(wil, wdev->ssid_len, wdev->ssid);
-                if (channel)
-                        wmi_set_channel(wil, channel->hw_value);
+                rc = wmi_set_ssid(wil, wdev->ssid_len, wdev->ssid);
+                if (rc)
+                        return rc;
                 break;
         default:
                 break;
@@ -364,9 +355,12 @@ static int __wil_up(struct wil6210_priv *wil)
         wmi_set_mac_address(wil, ndev->dev_addr);
 
         /* Set up beaconing if required. */
-        rc = wmi_set_bcon(wil, bi, wmi_nettype);
-        if (rc)
-                return rc;
+        if (bi > 0) {
+                rc = wmi_pcp_start(wil, bi, wmi_nettype,
+                                   (channel ? channel->hw_value : 0));
+                if (rc)
+                        return rc;
+        }
 
         /* Rx VRING. After MAC and beacon */
         wil_rx_init(wil);
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 8ce2e33dce20..098a8ec6b841 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -14,10 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/module.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/slab.h>
 
 #include "wil6210.h"
 
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index 81c35c6e3832..eb1dc7ad80fb 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -14,10 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
 #include <linux/debugfs.h>
 #include <linux/pci.h>
 #include <linux/moduleparam.h>
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index d1315b442375..797024507c71 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -14,10 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/hardirq.h>
 #include <net/ieee80211_radiotap.h>
 #include <linux/if_arp.h>
 #include <linux/moduleparam.h>
@@ -83,8 +80,6 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
          */
         vring->va = dma_alloc_coherent(dev, sz, &vring->pa, GFP_KERNEL);
         if (!vring->va) {
-                wil_err(wil, "vring_alloc [%d] failed to alloc DMA mem\n",
-                        vring->size);
                 kfree(vring->ctx);
                 vring->ctx = NULL;
                 return -ENOMEM;
@@ -196,8 +191,7 @@ static int wil_vring_alloc_skb(struct wil6210_priv *wil, struct vring *vring,
  *  - Phy info
  */
 static void wil_rx_add_radiotap_header(struct wil6210_priv *wil,
-                                       struct sk_buff *skb,
-                                       volatile struct vring_rx_desc *d)
+                                       struct sk_buff *skb)
 {
         struct wireless_dev *wdev = wil->wdev;
         struct wil6210_rtap {
@@ -221,6 +215,7 @@ static void wil_rx_add_radiotap_header(struct wil6210_priv *wil,
                 __le16 vendor_skip;
                 u8 vendor_data[0];
         } __packed;
+        struct vring_rx_desc *d = wil_skb_rxdesc(skb);
         struct wil6210_rtap_vendor *rtap_vendor;
         int rtap_len = sizeof(struct wil6210_rtap);
         int phy_length = 0; /* phy info header size, bytes */
@@ -317,6 +312,8 @@ static void wil_swap_ethaddr(void *data)
 /**
  * reap 1 frame from @swhead
  *
+ * Rx descriptor copied to skb->cb
+ *
  * Safe to call from IRQ
  */
 static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
@@ -325,12 +322,15 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
         struct device *dev = wil_to_dev(wil);
         struct net_device *ndev = wil_to_ndev(wil);
         volatile struct vring_rx_desc *d;
+        struct vring_rx_desc *d1;
         struct sk_buff *skb;
         dma_addr_t pa;
         unsigned int sz = RX_BUF_LEN;
         u8 ftype;
         u8 ds_bits;
 
+        BUILD_BUG_ON(sizeof(struct vring_rx_desc) > sizeof(skb->cb));
+
         if (wil_vring_is_empty(vring))
                 return NULL;
 
@@ -345,11 +345,14 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
         dma_unmap_single(dev, pa, sz, DMA_FROM_DEVICE);
         skb_trim(skb, d->dma.length);
 
-        wil->stats.last_mcs_rx = wil_rxdesc_mcs(d);
+        d1 = wil_skb_rxdesc(skb);
+        *d1 = *d;
+
+        wil->stats.last_mcs_rx = wil_rxdesc_mcs(d1);
 
         /* use radiotap header only if required */
         if (ndev->type == ARPHRD_IEEE80211_RADIOTAP)
-                wil_rx_add_radiotap_header(wil, skb, d);
+                wil_rx_add_radiotap_header(wil, skb);
 
         wil_dbg_txrx(wil, "Rx[%3d] : %d bytes\n", vring->swhead, d->dma.length);
         wil_hex_dump_txrx("Rx ", DUMP_PREFIX_NONE, 32, 4,
@@ -365,7 +368,7 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
          * Driver should recognize it by frame type, that is found
          * in Rx descriptor. If type is not data, it is 802.11 frame as is
          */
-        ftype = wil_rxdesc_ftype(d) << 2;
+        ftype = wil_rxdesc_ftype(d1) << 2;
         if (ftype != IEEE80211_FTYPE_DATA) {
                 wil_dbg_txrx(wil, "Non-data frame ftype 0x%08x\n", ftype);
                 /* TODO: process it */
@@ -380,7 +383,7 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
                 return NULL;
         }
 
-        ds_bits = wil_rxdesc_ds_bits(d);
+        ds_bits = wil_rxdesc_ds_bits(d1);
         if (ds_bits == 1) {
                 /*
                  * HW bug - in ToDS mode, i.e. Rx on AP side,
@@ -522,6 +525,7 @@ int wil_vring_init_tx(struct wil6210_priv *wil, int id, int size,
                 .vring_cfg = {
                         .tx_sw_ring = {
                                 .max_mpdu_size = cpu_to_le16(TX_BUF_LEN),
+                                .ring_size = cpu_to_le16(size),
                         },
                         .ringid = id,
                         .cidxtid = (cid & 0xf) | ((tid & 0xf) << 4),
@@ -553,14 +557,13 @@ int wil_vring_init_tx(struct wil6210_priv *wil, int id, int size,
                 goto out;
 
         cmd.vring_cfg.tx_sw_ring.ring_mem_base = cpu_to_le64(vring->pa);
-        cmd.vring_cfg.tx_sw_ring.ring_size = cpu_to_le16(vring->size);
 
         rc = wmi_call(wil, WMI_VRING_CFG_CMDID, &cmd, sizeof(cmd),
                       WMI_VRING_CFG_DONE_EVENTID, &reply, sizeof(reply), 100);
         if (rc)
                 goto out_free;
 
-        if (reply.cmd.status != WMI_VRING_CFG_SUCCESS) {
+        if (reply.cmd.status != WMI_FW_STATUS_SUCCESS) {
                 wil_err(wil, "Tx config failed, status 0x%02x\n",
                         reply.cmd.status);
                 rc = -EINVAL;
@@ -784,9 +787,14 @@ void wil_tx_complete(struct wil6210_priv *wil, int ringid)
         wil_dbg_txrx(wil, "%s(%d)\n", __func__, ringid);
 
         while (!wil_vring_is_empty(vring)) {
-                volatile struct vring_tx_desc *d = &vring->va[vring->swtail].tx;
+                volatile struct vring_tx_desc *d1 =
+                                              &vring->va[vring->swtail].tx;
+                struct vring_tx_desc dd, *d = &dd;
                 dma_addr_t pa;
                 struct sk_buff *skb;
+
+                dd = *d1;
+
                 if (!(d->dma.status & TX_DMA_STATUS_DU))
                         break;
 
diff --git a/drivers/net/wireless/ath/wil6210/txrx.h b/drivers/net/wireless/ath/wil6210/txrx.h
index 45a61f597c5c..adef12fb2aee 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.h
+++ b/drivers/net/wireless/ath/wil6210/txrx.h
@@ -339,24 +339,59 @@ union vring_desc {
         struct vring_rx_desc rx;
 } __packed;
 
-static inline int wil_rxdesc_phy_length(volatile struct vring_rx_desc *d)
+static inline int wil_rxdesc_tid(struct vring_rx_desc *d)
 {
-        return WIL_GET_BITS(d->dma.d0, 16, 29);
+        return WIL_GET_BITS(d->mac.d0, 0, 3);
 }
 
-static inline int wil_rxdesc_mcs(volatile struct vring_rx_desc *d)
+static inline int wil_rxdesc_cid(struct vring_rx_desc *d)
 {
-        return WIL_GET_BITS(d->mac.d1, 21, 24);
+        return WIL_GET_BITS(d->mac.d0, 4, 6);
 }
 
-static inline int wil_rxdesc_ds_bits(volatile struct vring_rx_desc *d)
+static inline int wil_rxdesc_mid(struct vring_rx_desc *d)
 {
-        return WIL_GET_BITS(d->mac.d1, 8, 9);
+        return WIL_GET_BITS(d->mac.d0, 8, 9);
 }
 
-static inline int wil_rxdesc_ftype(volatile struct vring_rx_desc *d)
+static inline int wil_rxdesc_ftype(struct vring_rx_desc *d)
 {
         return WIL_GET_BITS(d->mac.d0, 10, 11);
 }
 
+static inline int wil_rxdesc_subtype(struct vring_rx_desc *d)
+{
+        return WIL_GET_BITS(d->mac.d0, 12, 15);
+}
+
+static inline int wil_rxdesc_seq(struct vring_rx_desc *d)
+{
+        return WIL_GET_BITS(d->mac.d0, 16, 27);
+}
+
+static inline int wil_rxdesc_ext_subtype(struct vring_rx_desc *d)
+{
+        return WIL_GET_BITS(d->mac.d0, 28, 31);
+}
+
+static inline int wil_rxdesc_ds_bits(struct vring_rx_desc *d)
+{
+        return WIL_GET_BITS(d->mac.d1, 8, 9);
+}
+
+static inline int wil_rxdesc_mcs(struct vring_rx_desc *d)
+{
+        return WIL_GET_BITS(d->mac.d1, 21, 24);
+}
+
+static inline int wil_rxdesc_phy_length(struct vring_rx_desc *d)
+{
+        return WIL_GET_BITS(d->dma.d0, 16, 29);
+}
+
+static inline struct vring_rx_desc *wil_skb_rxdesc(struct sk_buff *skb)
+{
+        return (void *)skb->cb;
+}
+
 #endif /* WIL6210_TXRX_H */
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index aea961ff8f08..8f76ecd8a7e5 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -21,8 +21,6 @@
 #include <linux/wireless.h>
 #include <net/cfg80211.h>
 
-#include "dbg_hexdump.h"
-
 #define WIL_NAME "wil6210"
 
 /**
@@ -188,6 +186,7 @@ enum { /* for wil6210_priv.status */
         wil_status_fwready = 0,
         wil_status_fwconnected,
         wil_status_dontscan,
+        wil_status_reset_done,
         wil_status_irqen, /* FIXME: interrupts enabled - for debug */
 };
 
@@ -210,6 +209,8 @@ struct wil6210_priv {
         struct wireless_dev *wdev;
         void __iomem *csr;
         ulong status;
+        u32 fw_version;
+        u8 n_mids; /* number of additional MIDs as reported by FW */
         /* profile */
         u32 monitor_flags;
         u32 secure_pcp; /* create secure PCP? */
@@ -227,7 +228,7 @@ struct wil6210_priv {
         struct workqueue_struct *wmi_wq; /* for deferred calls */
         struct work_struct wmi_event_worker;
         struct workqueue_struct *wmi_wq_conn; /* for connect worker */
-        struct work_struct wmi_connect_worker;
+        struct work_struct connect_worker;
         struct work_struct disconnect_worker;
         struct timer_list connect_timer;
         int pending_connect_cid;
@@ -277,13 +278,13 @@ struct wil6210_priv {
 
 #define wil_hex_dump_txrx(prefix_str, prefix_type, rowsize,     \
                           groupsize, buf, len, ascii)           \
-                          wil_print_hex_dump_debug("DBG[TXRX]" prefix_str,\
+                          print_hex_dump_debug("DBG[TXRX]" prefix_str,\
                                          prefix_type, rowsize,  \
                                          groupsize, buf, len, ascii)
 
 #define wil_hex_dump_wmi(prefix_str, prefix_type, rowsize,      \
                          groupsize, buf, len, ascii)            \
-                         wil_print_hex_dump_debug("DBG[ WMI]" prefix_str,\
+                         print_hex_dump_debug("DBG[ WMI]" prefix_str,\
                                         prefix_type, rowsize,   \
                                         groupsize, buf, len, ascii)
 
@@ -313,7 +314,6 @@ int wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len);
 void wmi_recv_cmd(struct wil6210_priv *wil);
 int wmi_call(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len,
              u16 reply_id, void *reply, u8 reply_size, int to_msec);
-void wmi_connect_worker(struct work_struct *work);
 void wmi_event_worker(struct work_struct *work);
 void wmi_event_flush(struct wil6210_priv *wil);
 int wmi_set_ssid(struct wil6210_priv *wil, u8 ssid_len, const void *ssid);
@@ -328,6 +328,8 @@ int wmi_add_cipher_key(struct wil6210_priv *wil, u8 key_index,
 int wmi_echo(struct wil6210_priv *wil);
 int wmi_set_ie(struct wil6210_priv *wil, u8 type, u16 ie_len, const void *ie);
 int wmi_rx_chain_add(struct wil6210_priv *wil, struct vring *vring);
+int wmi_p2p_cfg(struct wil6210_priv *wil, int channel);
+int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_m, u32 *t_r);
 
 int wil6210_init_irq(struct wil6210_priv *wil, int irq);
 void wil6210_fini_irq(struct wil6210_priv *wil, int irq);
@@ -341,7 +343,8 @@ struct wireless_dev *wil_cfg80211_init(struct device *dev);
 void wil_wdev_free(struct wil6210_priv *wil);
 
 int wmi_set_mac_address(struct wil6210_priv *wil, void *addr);
-int wmi_set_bcon(struct wil6210_priv *wil, int bi, u8 wmi_nettype);
+int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan);
+int wmi_pcp_stop(struct wil6210_priv *wil);
 void wil6210_disconnect(struct wil6210_priv *wil, void *bssid);
 
 int wil_rx_init(struct wil6210_priv *wil);
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 0bb3b76b4b58..45b04e383f9a 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -14,9 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/pci.h>
-#include <linux/io.h>
-#include <linux/list.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 
@@ -272,16 +269,18 @@ static void wmi_evt_ready(struct wil6210_priv *wil, int id, void *d, int len)
         struct net_device *ndev = wil_to_ndev(wil);
         struct wireless_dev *wdev = wil->wdev;
         struct wmi_ready_event *evt = d;
-        u32 ver = le32_to_cpu(evt->sw_version);
+        wil->fw_version = le32_to_cpu(evt->sw_version);
+        wil->n_mids = evt->numof_additional_mids;
 
-        wil_dbg_wmi(wil, "FW ver. %d; MAC %pM\n", ver, evt->mac);
+        wil_dbg_wmi(wil, "FW ver. %d; MAC %pM; %d MID's\n", wil->fw_version,
+                    evt->mac, wil->n_mids);
 
         if (!is_valid_ether_addr(ndev->dev_addr)) {
                 memcpy(ndev->dev_addr, evt->mac, ETH_ALEN);
                 memcpy(ndev->perm_addr, evt->mac, ETH_ALEN);
         }
         snprintf(wdev->wiphy->fw_version, sizeof(wdev->wiphy->fw_version),
-                 "%d", ver);
+                 "%d", wil->fw_version);
 }
 
 static void wmi_evt_fw_ready(struct wil6210_priv *wil, int id, void *d,
@@ -324,17 +323,9 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len)
 
         if (ieee80211_is_beacon(fc) || ieee80211_is_probe_resp(fc)) {
                 struct cfg80211_bss *bss;
-                u64 tsf = le64_to_cpu(rx_mgmt_frame->u.beacon.timestamp);
-                u16 cap = le16_to_cpu(rx_mgmt_frame->u.beacon.capab_info);
-                u16 bi = le16_to_cpu(rx_mgmt_frame->u.beacon.beacon_int);
-                const u8 *ie_buf = rx_mgmt_frame->u.beacon.variable;
-                size_t ie_len = d_len - offsetof(struct ieee80211_mgmt,
-                                                 u.beacon.variable);
-                wil_dbg_wmi(wil, "Capability info : 0x%04x\n", cap);
-
-                bss = cfg80211_inform_bss(wiphy, channel, rx_mgmt_frame->bssid,
-                                          tsf, cap, bi, ie_buf, ie_len,
-                                          signal, GFP_KERNEL);
+
+                bss = cfg80211_inform_bss_frame(wiphy, channel, rx_mgmt_frame,
+                                                d_len, signal, GFP_KERNEL);
                 if (bss) {
                         wil_dbg_wmi(wil, "Added BSS %pM\n",
                                     rx_mgmt_frame->bssid);
@@ -342,6 +333,9 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len)
                 } else {
                         wil_err(wil, "cfg80211_inform_bss() failed\n");
                 }
+        } else {
+                cfg80211_rx_mgmt(wil->wdev, freq, signal,
+                                 (void *)rx_mgmt_frame, d_len, GFP_KERNEL);
         }
 }
 
@@ -443,7 +437,7 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len)
         memcpy(wil->dst_addr[0], evt->bssid, ETH_ALEN);
 
         wil->pending_connect_cid = evt->cid;
-        queue_work(wil->wmi_wq_conn, &wil->wmi_connect_worker);
+        queue_work(wil->wmi_wq_conn, &wil->connect_worker);
 }
 
 static void wmi_evt_disconnect(struct wil6210_priv *wil, int id,
@@ -528,6 +522,37 @@ static void wmi_evt_eapol_rx(struct wil6210_priv *wil, int id,
         }
 }
 
+static void wmi_evt_linkup(struct wil6210_priv *wil, int id, void *d, int len)
+{
+        struct net_device *ndev = wil_to_ndev(wil);
+        struct wmi_data_port_open_event *evt = d;
+
+        wil_dbg_wmi(wil, "Link UP for CID %d\n", evt->cid);
+
+        netif_carrier_on(ndev);
+}
+
+static void wmi_evt_linkdown(struct wil6210_priv *wil, int id, void *d, int len)
+{
+        struct net_device *ndev = wil_to_ndev(wil);
+        struct wmi_wbe_link_down_event *evt = d;
+
+        wil_dbg_wmi(wil, "Link DOWN for CID %d, reason %d\n",
+                    evt->cid, le32_to_cpu(evt->reason));
+
+        netif_carrier_off(ndev);
+}
+
+static void wmi_evt_ba_status(struct wil6210_priv *wil, int id, void *d,
+                              int len)
+{
+        struct wmi_vring_ba_status_event *evt = d;
+
+        wil_dbg_wmi(wil, "BACK[%d] %s {%d} timeout %d\n",
+                    evt->ringid, evt->status ? "N/A" : "OK", evt->agg_wsize,
+                    __le16_to_cpu(evt->ba_timeout));
+}
+
 static const struct {
         int eventid;
         void (*handler)(struct wil6210_priv *wil, int eventid,
@@ -541,6 +566,9 @@ static const struct {
         {WMI_DISCONNECT_EVENTID,        wmi_evt_disconnect},
         {WMI_NOTIFY_REQ_DONE_EVENTID,   wmi_evt_notify},
         {WMI_EAPOL_RX_EVENTID,          wmi_evt_eapol_rx},
+        {WMI_DATA_PORT_OPEN_EVENTID,    wmi_evt_linkup},
+        {WMI_WBE_LINKDOWN_EVENTID,      wmi_evt_linkdown},
+        {WMI_BA_STATUS_EVENTID,         wmi_evt_ba_status},
 };
 
 /*
@@ -559,6 +587,11 @@ void wmi_recv_cmd(struct wil6210_priv *wil)
         void __iomem *src;
         ulong flags;
 
+        if (!test_bit(wil_status_reset_done, &wil->status)) {
+                wil_err(wil, "Reset not completed\n");
+                return;
+        }
+
         for (;;) {
                 u16 len;
 
@@ -683,18 +716,39 @@ int wmi_set_mac_address(struct wil6210_priv *wil, void *addr)
         return wmi_send(wil, WMI_SET_MAC_ADDRESS_CMDID, &cmd, sizeof(cmd));
 }
 
-int wmi_set_bcon(struct wil6210_priv *wil, int bi, u8 wmi_nettype)
+int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
 {
-        struct wmi_bcon_ctrl_cmd cmd = {
+        int rc;
+
+        struct wmi_pcp_start_cmd cmd = {
                 .bcon_interval = cpu_to_le16(bi),
                 .network_type = wmi_nettype,
                 .disable_sec_offload = 1,
+                .channel = chan,
         };
+        struct {
+                struct wil6210_mbox_hdr_wmi wmi;
+                struct wmi_pcp_started_event evt;
+        } __packed reply;
 
         if (!wil->secure_pcp)
                 cmd.disable_sec = 1;
 
-        return wmi_send(wil, WMI_BCON_CTRL_CMDID, &cmd, sizeof(cmd));
+        rc = wmi_call(wil, WMI_PCP_START_CMDID, &cmd, sizeof(cmd),
+                      WMI_PCP_STARTED_EVENTID, &reply, sizeof(reply), 100);
+        if (rc)
+                return rc;
+
+        if (reply.evt.status != WMI_FW_STATUS_SUCCESS)
+                rc = -EINVAL;
+
+        return rc;
+}
+
+int wmi_pcp_stop(struct wil6210_priv *wil)
+{
+        return wmi_call(wil, WMI_PCP_STOP_CMDID, NULL, 0,
+                        WMI_PCP_STOPPED_EVENTID, NULL, 0, 20);
 }
 
 int wmi_set_ssid(struct wil6210_priv *wil, u8 ssid_len, const void *ssid)
@@ -765,6 +819,16 @@ int wmi_get_channel(struct wil6210_priv *wil, int *channel)
         return 0;
 }
 
+int wmi_p2p_cfg(struct wil6210_priv *wil, int channel)
+{
+        struct wmi_p2p_cfg_cmd cmd = {
+                .discovery_mode = WMI_DISCOVERY_MODE_NON_OFFLOAD,
+                .channel = channel - 1,
+        };
+
+        return wmi_send(wil, WMI_P2P_CFG_CMDID, &cmd, sizeof(cmd));
+}
+
 int wmi_tx_eapol(struct wil6210_priv *wil, struct sk_buff *skb)
 {
         struct wmi_eapol_tx_cmd *cmd;
@@ -843,7 +907,7 @@ int wmi_set_ie(struct wil6210_priv *wil, u8 type, u16 ie_len, const void *ie)
         /* BUG: FW API define ieLen as u8. Will fix FW */
         cmd->ie_len = cpu_to_le16(ie_len);
         memcpy(cmd->ie_info, ie, ie_len);
-        rc = wmi_send(wil, WMI_SET_APPIE_CMDID, &cmd, len);
+        rc = wmi_send(wil, WMI_SET_APPIE_CMDID, cmd, len);
         kfree(cmd);
 
         return rc;
@@ -898,6 +962,31 @@ int wmi_rx_chain_add(struct wil6210_priv *wil, struct vring *vring)
         return rc;
 }
 
+int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_m, u32 *t_r)
+{
+        int rc;
+        struct wmi_temp_sense_cmd cmd = {
+                .measure_marlon_m_en = cpu_to_le32(!!t_m),
+                .measure_marlon_r_en = cpu_to_le32(!!t_r),
+        };
+        struct {
+                struct wil6210_mbox_hdr_wmi wmi;
+                struct wmi_temp_sense_done_event evt;
+        } __packed reply;
+
+        rc = wmi_call(wil, WMI_TEMP_SENSE_CMDID, &cmd, sizeof(cmd),
+                      WMI_TEMP_SENSE_DONE_EVENTID, &reply, sizeof(reply), 100);
+        if (rc)
+                return rc;
+
+        if (t_m)
+                *t_m = le32_to_cpu(reply.evt.marlon_m_t1000);
+        if (t_r)
+                *t_r = le32_to_cpu(reply.evt.marlon_r_t1000);
+
+        return 0;
+}
+
 void wmi_event_flush(struct wil6210_priv *wil)
 {
         struct pending_wmi_event *evt, *t;
@@ -997,24 +1086,3 @@ void wmi_event_worker(struct work_struct *work)
                 kfree(evt);
         }
 }
-
-void wmi_connect_worker(struct work_struct *work)
-{
-        int rc;
-        struct wil6210_priv *wil = container_of(work, struct wil6210_priv,
-                                                wmi_connect_worker);
-
-        if (wil->pending_connect_cid < 0) {
-                wil_err(wil, "No connection pending\n");
-                return;
-        }
-
-        wil_dbg_wmi(wil, "Configure for connection CID %d\n",
-                    wil->pending_connect_cid);
-
-        rc = wil_vring_init_tx(wil, 0, WIL6210_TX_RING_SIZE,
-                               wil->pending_connect_cid, 0);
-        wil->pending_connect_cid = -1;
-        if (rc == 0)
-                wil_link_on(wil);
-}
diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 3bbf87572b07..50b8528394f4 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -36,6 +36,7 @@
 enum wmi_command_id {
         WMI_CONNECT_CMDID               = 0x0001,
         WMI_DISCONNECT_CMDID            = 0x0003,
+        WMI_DISCONNECT_STA_CMDID        = 0x0004,
         WMI_START_SCAN_CMDID            = 0x0007,
         WMI_SET_BSS_FILTER_CMDID        = 0x0009,
         WMI_SET_PROBED_SSID_CMDID       = 0x000a,
@@ -44,7 +45,6 @@ enum wmi_command_id {
         WMI_ADD_CIPHER_KEY_CMDID        = 0x0016,
         WMI_DELETE_CIPHER_KEY_CMDID     = 0x0017,
         WMI_SET_APPIE_CMDID             = 0x003f,
-        WMI_GET_APPIE_CMDID             = 0x0040,
         WMI_SET_WSC_STATUS_CMDID        = 0x0041,
         WMI_PXMT_RANGE_CFG_CMDID        = 0x0042,
         WMI_PXMT_SNR2_RANGE_CFG_CMDID   = 0x0043,
@@ -55,11 +55,11 @@ enum wmi_command_id {
         WMI_DEEP_ECHO_CMDID             = 0x0804,
         WMI_CONFIG_MAC_CMDID            = 0x0805,
         WMI_CONFIG_PHY_DEBUG_CMDID      = 0x0806,
-        WMI_ADD_STATION_CMDID           = 0x0807,
         WMI_ADD_DEBUG_TX_PCKT_CMDID     = 0x0808,
         WMI_PHY_GET_STATISTICS_CMDID    = 0x0809,
         WMI_FS_TUNE_CMDID               = 0x080a,
         WMI_CORR_MEASURE_CMDID          = 0x080b,
+        WMI_READ_RSSI_CMDID             = 0x080c,
         WMI_TEMP_SENSE_CMDID            = 0x080e,
         WMI_DC_CALIB_CMDID              = 0x080f,
         WMI_SEND_TONE_CMDID             = 0x0810,
@@ -75,9 +75,9 @@ enum wmi_command_id {
         MAC_IO_STATIC_PARAMS_CMDID      = 0x081b,
         MAC_IO_DYNAMIC_PARAMS_CMDID     = 0x081c,
         WMI_SILENT_RSSI_CALIB_CMDID     = 0x081d,
+        WMI_RF_RX_TEST_CMDID            = 0x081e,
         WMI_CFG_RX_CHAIN_CMDID          = 0x0820,
         WMI_VRING_CFG_CMDID             = 0x0821,
-        WMI_RX_ON_CMDID                 = 0x0822,
         WMI_VRING_BA_EN_CMDID           = 0x0823,
         WMI_VRING_BA_DIS_CMDID          = 0x0824,
         WMI_RCP_ADDBA_RESP_CMDID        = 0x0825,
@@ -87,7 +87,6 @@ enum wmi_command_id {
         WMI_SET_PCP_CHANNEL_CMDID       = 0x0829,
         WMI_GET_PCP_CHANNEL_CMDID       = 0x082a,
         WMI_SW_TX_REQ_CMDID             = 0x082b,
-        WMI_RX_OFF_CMDID                = 0x082c,
         WMI_READ_MAC_RXQ_CMDID          = 0x0830,
         WMI_READ_MAC_TXQ_CMDID          = 0x0831,
         WMI_WRITE_MAC_RXQ_CMDID         = 0x0832,
@@ -112,6 +111,18 @@ enum wmi_command_id {
         WMI_FLASH_READ_CMDID            = 0x0902,
         WMI_FLASH_WRITE_CMDID           = 0x0903,
         WMI_SECURITY_UNIT_TEST_CMDID    = 0x0904,
+        /*P2P*/
+        WMI_P2P_CFG_CMDID               = 0x0910,
+        WMI_PORT_ALLOCATE_CMDID         = 0x0911,
+        WMI_PORT_DELETE_CMDID           = 0x0912,
+        WMI_POWER_MGMT_CFG_CMDID        = 0x0913,
+        WMI_START_LISTEN_CMDID          = 0x0914,
+        WMI_START_SEARCH_CMDID          = 0x0915,
+        WMI_DISCOVERY_START_CMDID       = 0x0916,
+        WMI_DISCOVERY_STOP_CMDID        = 0x0917,
+        WMI_PCP_START_CMDID             = 0x0918,
+        WMI_PCP_STOP_CMDID              = 0x0919,
+        WMI_GET_PCP_FACTOR_CMDID        = 0x091b,
 
         WMI_SET_MAC_ADDRESS_CMDID       = 0xf003,
         WMI_ABORT_SCAN_CMDID            = 0xf007,
@@ -132,18 +143,6 @@ enum wmi_command_id {
  */
 
 /*
- * Frame Types
- */
-enum wmi_mgmt_frame_type {
-        WMI_FRAME_BEACON        = 0,
-        WMI_FRAME_PROBE_REQ     = 1,
-        WMI_FRAME_PROBE_RESP    = 2,
-        WMI_FRAME_ASSOC_REQ     = 3,
-        WMI_FRAME_ASSOC_RESP    = 4,
-        WMI_NUM_MGMT_FRAME,
-};
-
-/*
  * WMI_CONNECT_CMDID
  */
 enum wmi_network_type {
@@ -184,7 +183,7 @@ enum wmi_crypto_type {
 enum wmi_connect_ctrl_flag_bits {
         WMI_CONNECT_ASSOC_POLICY_USER           = 0x0001,
         WMI_CONNECT_SEND_REASSOC                = 0x0002,
-        WMI_CONNECT_IGNORE_WPAx_GROUP_CIPHER    = 0x0004,
+        WMI_CONNECT_IGNORE_WPA_GROUP_CIPHER     = 0x0004,
         WMI_CONNECT_PROFILE_MATCH_DONE          = 0x0008,
         WMI_CONNECT_IGNORE_AAC_BEACON           = 0x0010,
         WMI_CONNECT_CSA_FOLLOW_BSS              = 0x0020,
@@ -212,6 +211,13 @@ struct wmi_connect_cmd {
         u8 reserved1[2];
 } __packed;
 
+/*
+ * WMI_DISCONNECT_STA_CMDID
+ */
+struct wmi_disconnect_sta_cmd {
+        u8 dst_mac[WMI_MAC_LEN];
+        __le16 disconnect_reason;
+} __packed;
 
 /*
  * WMI_RECONNECT_CMDID
@@ -289,10 +295,12 @@ struct wmi_delete_cipher_key_cmd {
 enum wmi_scan_type {
         WMI_LONG_SCAN           = 0,
         WMI_SHORT_SCAN          = 1,
+        WMI_PBC_SCAN            = 2,
 };
 
 struct wmi_start_scan_cmd {
         u8 reserved[8];
+
         __le32 home_dwell_time; /* Max duration in the home channel(ms) */
         __le32 force_scan_interval;     /* Time interval between scans (ms)*/
         u8 scan_type;           /* wmi_scan_type */
@@ -309,7 +317,7 @@ struct wmi_start_scan_cmd {
 /*
  * WMI_SET_PROBED_SSID_CMDID
  */
-#define MAX_PROBED_SSID_INDEX   (15)
+#define MAX_PROBED_SSID_INDEX   (3)
 
 enum wmi_ssid_flag {
         WMI_SSID_FLAG_DISABLE   = 0,    /* disables entry */
@@ -328,6 +336,20 @@ struct wmi_probed_ssid_cmd {
  * WMI_SET_APPIE_CMDID
  * Add Application specified IE to a management frame
  */
+#define WMI_MAX_IE_LEN          (1024)
+
+/*
+ * Frame Types
+ */
+enum wmi_mgmt_frame_type {
+        WMI_FRAME_BEACON        = 0,
+        WMI_FRAME_PROBE_REQ     = 1,
+        WMI_FRAME_PROBE_RESP    = 2,
+        WMI_FRAME_ASSOC_REQ     = 3,
+        WMI_FRAME_ASSOC_RESP    = 4,
+        WMI_NUM_MGMT_FRAME,
+};
+
 struct wmi_set_appie_cmd {
         u8 mgmt_frm_type;       /* enum wmi_mgmt_frame_type */
         u8 reserved;
@@ -335,13 +357,18 @@ struct wmi_set_appie_cmd {
         u8 ie_info[0];
 } __packed;
 
-#define WMI_MAX_IE_LEN (1024)
 
+/*
+ * WMI_PXMT_RANGE_CFG_CMDID
+ */
 struct wmi_pxmt_range_cfg_cmd {
         u8 dst_mac[WMI_MAC_LEN];
         __le16 range;
 } __packed;
 
+/*
+ * WMI_PXMT_SNR2_RANGE_CFG_CMDID
+ */
 struct wmi_pxmt_snr2_range_cfg_cmd {
         s8 snr2range_arr[WMI_PROX_RANGE_NUM-1];
 } __packed;
@@ -359,6 +386,23 @@ struct wmi_rf_mgmt_cmd {
         __le32 rf_mgmt_type;
 } __packed;
 
+
+/*
+ * WMI_RF_RX_TEST_CMDID
+ */
+struct wmi_rf_rx_test_cmd {
+        __le32 sector;
+} __packed;
+
+/*
+ * WMI_CORR_MEASURE_CMDID
+ */
+struct wmi_corr_measure_cmd {
+        s32 freq_mhz;
+        __le32 length_samples;
+        __le32 iterations;
+} __packed;
+
 /*
  * WMI_SET_SSID_CMDID
  */
@@ -388,6 +432,74 @@ struct wmi_bcon_ctrl_cmd {
         u8 disable_sec;
 } __packed;
 
+
+/******* P2P ***********/
+
+/*
+ * WMI_PORT_ALLOCATE_CMDID
+ */
+enum wmi_port_role {
+        WMI_PORT_STA            = 0,
+        WMI_PORT_PCP            = 1,
+        WMI_PORT_AP             = 2,
+        WMI_PORT_P2P_DEV        = 3,
+        WMI_PORT_P2P_CLIENT     = 4,
+        WMI_PORT_P2P_GO         = 5,
+};
+
+struct wmi_port_allocate_cmd {
+        u8 mac[WMI_MAC_LEN];
+        u8 port_role;
+        u8 midid;
+} __packed;
+
+/*
+ * WMI_PORT_DELETE_CMDID
+ */
+struct wmi_delete_port_cmd {
+        u8 mid;
+        u8 reserved[3];
+} __packed;
+
+/*
+ * WMI_P2P_CFG_CMDID
+ */
+enum wmi_discovery_mode {
+        WMI_DISCOVERY_MODE_NON_OFFLOAD  = 0,
+        WMI_DISCOVERY_MODE_OFFLOAD      = 1,
+};
+
+struct wmi_p2p_cfg_cmd {
+        u8 discovery_mode;      /* wmi_discovery_mode */
+        u8 channel;
+        __le16 bcon_interval; /* base to listen/search duration calculation */
+} __packed;
+
+/*
+ * WMI_POWER_MGMT_CFG_CMDID
+ */
+enum wmi_power_source_type {
+        WMI_POWER_SOURCE_BATTERY        = 0,
+        WMI_POWER_SOURCE_OTHER          = 1,
+};
+
+struct wmi_power_mgmt_cfg_cmd {
+        u8 power_source;        /* wmi_power_source_type */
+        u8 reserved[3];
+} __packed;
+
+/*
+ * WMI_PCP_START_CMDID
+ */
+struct wmi_pcp_start_cmd {
+        __le16 bcon_interval;
+        u8 reserved0[10];
+        u8 network_type;
+        u8 channel;
+        u8 disable_sec_offload;
+        u8 disable_sec;
+} __packed;
+
 /*
  * WMI_SW_TX_REQ_CMDID
  */
@@ -435,16 +547,17 @@ enum wmi_vring_cfg_schd_params_priority {
         WMI_SCH_PRIO_HIGH                       = 1,
 };
 
+#define CIDXTID_CID_POS (0)
+#define CIDXTID_CID_LEN (4)
+#define CIDXTID_CID_MSK (0xF)
+#define CIDXTID_TID_POS (4)
+#define CIDXTID_TID_LEN (4)
+#define CIDXTID_TID_MSK (0xF0)
+
 struct wmi_vring_cfg {
         struct wmi_sw_ring_cfg tx_sw_ring;
         u8 ringid;                              /* 0-23 vrings */
 
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
 
         u8 encap_trans_type;
@@ -501,8 +614,14 @@ struct wmi_vring_ba_dis_cmd {
  */
 struct wmi_notify_req_cmd {
         u8 cid;
-        u8 reserved[3];
+        u8 year;
+        u8 month;
+        u8 day;
         __le32 interval_usec;
+        u8 hour;
+        u8 minute;
+        u8 second;
+        u8 miliseconds;
 } __packed;
 
 /*
@@ -548,6 +667,11 @@ enum wmi_cfg_rx_chain_cmd_nwifi_ds_trans_type {
         WMI_NWIFI_RX_TRANS_MODE_PBSS2STA        = 2,
 };
 
+enum wmi_cfg_rx_chain_cmd_reorder_type {
+        WMI_RX_HW_REORDER = 0,
+        WMI_RX_SW_REORDER = 1,
+};
+
 struct wmi_cfg_rx_chain_cmd {
         __le32 action;
         struct wmi_sw_ring_cfg rx_sw_ring;
@@ -596,7 +720,8 @@ struct wmi_cfg_rx_chain_cmd {
         __le16 wb_thrsh;
         __le32 itr_value;
         __le16 host_thrsh;
-        u8 reserved[2];
+        u8 reorder_type;
+        u8 reserved;
         struct wmi_sniffer_cfg sniffer_cfg;
 } __packed;
 
@@ -604,15 +729,7 @@ struct wmi_cfg_rx_chain_cmd {
  * WMI_RCP_ADDBA_RESP_CMDID
  */
 struct wmi_rcp_addba_resp_cmd {
-
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
-
         u8 dialog_token;
         __le16 status_code;
         __le16 ba_param_set;    /* ieee80211_ba_parameterset field to send */
@@ -623,15 +740,7 @@ struct wmi_rcp_addba_resp_cmd {
  * WMI_RCP_DELBA_CMDID
  */
 struct wmi_rcp_delba_cmd {
-
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
-
         u8 reserved;
         __le16 reason;
 } __packed;
@@ -640,15 +749,7 @@ struct wmi_rcp_delba_cmd {
  * WMI_RCP_ADDBA_REQ_CMDID
  */
 struct wmi_rcp_addba_req_cmd {
-
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
-
         u8 dialog_token;
         /* ieee80211_ba_parameterset field as it received */
         __le16 ba_param_set;
@@ -665,7 +766,6 @@ struct wmi_set_mac_address_cmd {
         u8 reserved[2];
 } __packed;
 
-
 /*
 * WMI_EAPOL_TX_CMDID
 */
@@ -692,6 +792,17 @@ struct wmi_echo_cmd {
 } __packed;
 
 /*
+ * WMI_TEMP_SENSE_CMDID
+ *
+ * Measure MAC and radio temperatures
+ */
+struct wmi_temp_sense_cmd {
+        __le32 measure_marlon_m_en;
+        __le32 measure_marlon_r_en;
+} __packed;
+
+
+/*
  * WMI Events
  */
 
@@ -699,7 +810,6 @@ struct wmi_echo_cmd {
  * List of Events (target to host)
  */
 enum wmi_event_id {
-        WMI_IMM_RSP_EVENTID                     = 0x0000,
         WMI_READY_EVENTID                       = 0x1001,
         WMI_CONNECT_EVENTID                     = 0x1002,
         WMI_DISCONNECT_EVENTID                  = 0x1003,
@@ -709,13 +819,9 @@ enum wmi_event_id {
         WMI_FW_READY_EVENTID                    = 0x1801,
         WMI_EXIT_FAST_MEM_ACC_MODE_EVENTID      = 0x0200,
         WMI_ECHO_RSP_EVENTID                    = 0x1803,
-        WMI_CONFIG_MAC_DONE_EVENTID             = 0x1805,
-        WMI_CONFIG_PHY_DEBUG_DONE_EVENTID       = 0x1806,
-        WMI_ADD_STATION_DONE_EVENTID            = 0x1807,
-        WMI_ADD_DEBUG_TX_PCKT_DONE_EVENTID      = 0x1808,
-        WMI_PHY_GET_STATISTICS_EVENTID          = 0x1809,
         WMI_FS_TUNE_DONE_EVENTID                = 0x180a,
-        WMI_CORR_MEASURE_DONE_EVENTID           = 0x180b,
+        WMI_CORR_MEASURE_EVENTID                = 0x180b,
+        WMI_READ_RSSI_EVENTID                   = 0x180c,
         WMI_TEMP_SENSE_DONE_EVENTID             = 0x180e,
         WMI_DC_CALIB_DONE_EVENTID               = 0x180f,
         WMI_IQ_TX_CALIB_DONE_EVENTID            = 0x1811,
@@ -727,10 +833,9 @@ enum wmi_event_id {
         WMI_MARLON_R_WRITE_DONE_EVENTID         = 0x1819,
         WMI_MARLON_R_TXRX_SEL_DONE_EVENTID      = 0x181a,
         WMI_SILENT_RSSI_CALIB_DONE_EVENTID      = 0x181d,
-
+        WMI_RF_RX_TEST_DONE_EVENTID             = 0x181e,
         WMI_CFG_RX_CHAIN_DONE_EVENTID           = 0x1820,
         WMI_VRING_CFG_DONE_EVENTID              = 0x1821,
-        WMI_RX_ON_DONE_EVENTID                  = 0x1822,
         WMI_BA_STATUS_EVENTID                   = 0x1823,
         WMI_RCP_ADDBA_REQ_EVENTID               = 0x1824,
         WMI_ADDBA_RESP_SENT_EVENTID             = 0x1825,
@@ -738,7 +843,6 @@ enum wmi_event_id {
         WMI_GET_SSID_EVENTID                    = 0x1828,
         WMI_GET_PCP_CHANNEL_EVENTID             = 0x182a,
         WMI_SW_TX_COMPLETE_EVENTID              = 0x182b,
-        WMI_RX_OFF_DONE_EVENTID                 = 0x182c,
 
         WMI_READ_MAC_RXQ_EVENTID                = 0x1830,
         WMI_READ_MAC_TXQ_EVENTID                = 0x1831,
@@ -765,7 +869,16 @@ enum wmi_event_id {
         WMI_UNIT_TEST_EVENTID                   = 0x1900,
         WMI_FLASH_READ_DONE_EVENTID             = 0x1902,
         WMI_FLASH_WRITE_DONE_EVENTID            = 0x1903,
-
+        /*P2P*/
+        WMI_PORT_ALLOCATED_EVENTID              = 0x1911,
+        WMI_PORT_DELETED_EVENTID                = 0x1912,
+        WMI_LISTEN_STARTED_EVENTID              = 0x1914,
+        WMI_SEARCH_STARTED_EVENTID              = 0x1915,
+        WMI_DISCOVERY_STARTED_EVENTID           = 0x1916,
+        WMI_DISCOVERY_STOPPED_EVENTID           = 0x1917,
+        WMI_PCP_STARTED_EVENTID                 = 0x1918,
+        WMI_PCP_STOPPED_EVENTID                 = 0x1919,
+        WMI_PCP_FACTOR_EVENTID                  = 0x191a,
         WMI_SET_CHANNEL_EVENTID                 = 0x9000,
         WMI_ASSOC_REQ_EVENTID                   = 0x9001,
         WMI_EAPOL_RX_EVENTID                    = 0x9002,
@@ -777,6 +890,12 @@ enum wmi_event_id {
  * Events data structures
  */
 
+
+enum wmi_fw_status {
+        WMI_FW_STATUS_SUCCESS,
+        WMI_FW_STATUS_FAILURE,
+};
+
 /*
  * WMI_RF_MGMT_STATUS_EVENTID
  */
@@ -857,7 +976,7 @@ struct wmi_ready_event {
         __le32 abi_version;
         u8 mac[WMI_MAC_LEN];
         u8 phy_capability;              /* enum wmi_phy_capability */
-        u8 reserved;
+        u8 numof_additional_mids;
 } __packed;
 
 /*
@@ -876,6 +995,8 @@ struct wmi_notify_req_done_event {
         __le16 other_rx_sector;
         __le16 other_tx_sector;
         __le16 range;
+        u8 sqi;
+        u8 reserved[3];
 } __packed;
 
 /*
@@ -951,27 +1072,15 @@ struct wmi_vring_ba_status_event {
  * WMI_DELBA_EVENTID
  */
 struct wmi_delba_event {
-
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
-
         u8 from_initiator;
         __le16 reason;
 } __packed;
 
+
 /*
  * WMI_VRING_CFG_DONE_EVENTID
  */
-enum wmi_vring_cfg_done_event_status {
-        WMI_VRING_CFG_SUCCESS           = 0,
-        WMI_VRING_CFG_FAILURE           = 1,
-};
-
 struct wmi_vring_cfg_done_event {
         u8 ringid;
         u8 status;
@@ -982,21 +1091,8 @@ struct wmi_vring_cfg_done_event {
 /*
  * WMI_ADDBA_RESP_SENT_EVENTID
  */
-enum wmi_rcp_addba_resp_sent_event_status {
-        WMI_ADDBA_SUCCESS               = 0,
-        WMI_ADDBA_FAIL                  = 1,
-};
-
 struct wmi_rcp_addba_resp_sent_event {
-
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
-
         u8 reserved;
         __le16 status;
 } __packed;
@@ -1005,15 +1101,7 @@ struct wmi_rcp_addba_resp_sent_event {
  * WMI_RCP_ADDBA_REQ_EVENTID
  */
 struct wmi_rcp_addba_req_event {
-
-        #define CIDXTID_CID_POS (0)
-        #define CIDXTID_CID_LEN (4)
-        #define CIDXTID_CID_MSK (0xF)
-        #define CIDXTID_TID_POS (4)
-        #define CIDXTID_TID_LEN (4)
-        #define CIDXTID_TID_MSK (0xF0)
         u8 cidxtid;
-
         u8 dialog_token;
         __le16 ba_param_set;    /* ieee80211_ba_parameterset as it received */
         __le16 ba_timeout;
@@ -1055,6 +1143,7 @@ struct wmi_data_port_open_event {
         u8 reserved[3];
 } __packed;
 
+
 /*
  * WMI_GET_PCP_CHANNEL_EVENTID
  */
@@ -1063,6 +1152,54 @@ struct wmi_get_pcp_channel_event {
         u8 reserved[3];
 } __packed;
 
+
+/*
+* WMI_PORT_ALLOCATED_EVENTID
+*/
+struct wmi_port_allocated_event {
+        u8 status;      /* wmi_fw_status */
+        u8 reserved[3];
+} __packed;
+
+/*
+* WMI_PORT_DELETED_EVENTID
+*/
+struct wmi_port_deleted_event {
+        u8 status;      /* wmi_fw_status */
+        u8 reserved[3];
+} __packed;
+
+/*
+ * WMI_LISTEN_STARTED_EVENTID
+ */
+struct wmi_listen_started_event {
+        u8 status;      /* wmi_fw_status */
+        u8 reserved[3];
+} __packed;
+
+/*
+ * WMI_SEARCH_STARTED_EVENTID
+ */
+struct wmi_search_started_event {
+        u8 status;      /* wmi_fw_status */
+        u8 reserved[3];
+} __packed;
+
+/*
+ * WMI_PCP_STARTED_EVENTID
+ */
+struct wmi_pcp_started_event {
+        u8 status;      /* wmi_fw_status */
+        u8 reserved[3];
+} __packed;
+
+/*
+ * WMI_PCP_FACTOR_EVENTID
+ */
+struct wmi_pcp_factor_event {
+        __le32 pcp_factor;
+} __packed;
+
 /*
  * WMI_SW_TX_COMPLETE_EVENTID
  */
@@ -1078,6 +1215,23 @@ struct wmi_sw_tx_complete_event {
 } __packed;
 
 /*
+ * WMI_CORR_MEASURE_EVENTID
+ */
+struct wmi_corr_measure_event {
+        s32 i;
+        s32 q;
+        s32 image_i;
+        s32 image_q;
+} __packed;
+
+/*
+ * WMI_READ_RSSI_EVENTID
+ */
+struct wmi_read_rssi_event {
+        __le32 ina_rssi_adc_dbm;
+} __packed;
+
+/*
  * WMI_GET_SSID_EVENTID
  */
 struct wmi_get_ssid_event {
@@ -1091,7 +1245,8 @@ struct wmi_get_ssid_event {
 struct wmi_rx_mgmt_info {
         u8 mcs;
         s8 snr;
-        __le16 range;
+        u8 range;
+        u8 sqi;
         __le16 stype;
         __le16 status;
         __le32 len;
@@ -1113,4 +1268,14 @@ struct wmi_echo_event {
         __le32 echoed_value;
 } __packed;
 
+/*
+ * WMI_TEMP_SENSE_DONE_EVENTID
+ *
+ * Measure MAC and radio temperatures
+ */
+struct wmi_temp_sense_done_event {
+        __le32 marlon_m_t1000;
+        __le32 marlon_r_t1000;
+} __packed;
+
 #endif /* __WILOCITY_WMI_H__ */
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 287c6b670a36..078e6f3477a9 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -131,7 +131,7 @@ config B43_PHY_LP
 
 config B43_PHY_HT
         bool "Support for HT-PHY (high throughput) devices"
-        depends on B43
+        depends on B43 && B43_BCMA
         ---help---
           Support for the HT-PHY.
 
@@ -166,8 +166,8 @@ config B43_DEBUG
           Broadcom 43xx debugging.
 
           This adds additional runtime sanity checks and statistics to the driver.
-          These checks and statistics might me expensive and hurt runtime performance
-          of your system.
+          These checks and statistics might be expensive and hurt the runtime
+          performance of your system.
           This also adds the b43 debugfs interface.
 
           Do not enable this, unless you are debugging the driver.
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 10e288d470e7..7f3d461f7e8d 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -285,7 +285,9 @@ enum {
 #define B43_SHM_SH_DTIMPER              0x0012  /* DTIM period */
 #define B43_SHM_SH_NOSLPZNATDTIM        0x004C  /* NOSLPZNAT DTIM */
 /* SHM_SHARED beacon/AP variables */
+#define B43_SHM_SH_BT_BASE0             0x0068  /* Beacon template base 0 */
 #define B43_SHM_SH_BTL0                 0x0018  /* Beacon template length 0 */
+#define B43_SHM_SH_BT_BASE1             0x0468  /* Beacon template base 1 */
 #define B43_SHM_SH_BTL1                 0x001A  /* Beacon template length 1 */
 #define B43_SHM_SH_BTSFOFF              0x001C  /* Beacon TSF offset */
 #define B43_SHM_SH_TIMBPOS              0x001E  /* TIM B position in beacon */
@@ -473,6 +475,12 @@ enum {
 #define B43_MACCMD_CCA                  0x00000008      /* Clear channel assessment */
 #define B43_MACCMD_BGNOISE              0x00000010      /* Background noise */
 
+/* See BCMA_CLKCTLST_EXTRESREQ and BCMA_CLKCTLST_EXTRESST */
+#define B43_BCMA_CLKCTLST_80211_PLL_REQ 0x00000100
+#define B43_BCMA_CLKCTLST_PHY_PLL_REQ   0x00000200
+#define B43_BCMA_CLKCTLST_80211_PLL_ST  0x01000000
+#define B43_BCMA_CLKCTLST_PHY_PLL_ST    0x02000000
+
 /* BCMA 802.11 core specific IO Control (BCMA_IOCTL) flags */
 #define B43_BCMA_IOCTL_PHY_CLKEN        0x00000004      /* PHY Clock Enable */
 #define B43_BCMA_IOCTL_PHY_RESET        0x00000008      /* PHY Reset */
@@ -972,7 +980,7 @@ static inline int b43_is_mode(struct b43_wl *wl, int type)
  */
 static inline enum ieee80211_band b43_current_band(struct b43_wl *wl)
 {
-        return wl->hw->conf.channel->band;
+        return wl->hw->conf.chandef.chan->band;
 }
 
 static inline int b43_bus_may_powerdown(struct b43_wldev *wldev)
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 122146943bf2..523355b87659 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -419,8 +419,6 @@ static inline
 
 static int alloc_ringmemory(struct b43_dmaring *ring)
 {
-        gfp_t flags = GFP_KERNEL;
-
         /* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
          * alignment and 8K buffers for 64-bit DMA with 8K alignment.
          * In practice we could use smaller buffers for the latter, but the
@@ -435,12 +433,9 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
 
         ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev,
                                             ring_mem_size, &(ring->dmabase),
-                                            flags);
-        if (!ring->descbase) {
-                b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
+                                            GFP_KERNEL | __GFP_ZERO);
+        if (!ring->descbase)
                 return -ENOMEM;
-        }
-        memset(ring->descbase, 0, ring_mem_size);
 
         return 0;
 }
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 05682736e466..d377f77d30b5 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1189,10 +1189,15 @@ static void b43_bcma_phy_reset(struct b43_wldev *dev)
 
 static void b43_bcma_wireless_core_reset(struct b43_wldev *dev, bool gmode)
 {
+        u32 req = B43_BCMA_CLKCTLST_80211_PLL_REQ |
+                  B43_BCMA_CLKCTLST_PHY_PLL_REQ;
+        u32 status = B43_BCMA_CLKCTLST_80211_PLL_ST |
+                     B43_BCMA_CLKCTLST_PHY_PLL_ST;
+
         b43_device_enable(dev, B43_BCMA_IOCTL_PHY_CLKEN);
         bcma_core_set_clockmode(dev->dev->bdev, BCMA_CLKMODE_FAST);
         b43_bcma_phy_reset(dev);
-        bcma_core_pll_ctl(dev->dev->bdev, 0x300, 0x3000000, true);
+        bcma_core_pll_ctl(dev->dev->bdev, req, status, true);
 }
 #endif
 
@@ -1305,17 +1310,19 @@ static u32 b43_jssi_read(struct b43_wldev *dev)
 {
         u32 val = 0;
 
-        val = b43_shm_read16(dev, B43_SHM_SHARED, 0x08A);
+        val = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_JSSI1);
         val <<= 16;
-        val |= b43_shm_read16(dev, B43_SHM_SHARED, 0x088);
+        val |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_JSSI0);
 
         return val;
 }
 
 static void b43_jssi_write(struct b43_wldev *dev, u32 jssi)
 {
-        b43_shm_write16(dev, B43_SHM_SHARED, 0x088, (jssi & 0x0000FFFF));
-        b43_shm_write16(dev, B43_SHM_SHARED, 0x08A, (jssi & 0xFFFF0000) >> 16);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_JSSI0,
+                        (jssi & 0x0000FFFF));
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_JSSI1,
+                        (jssi & 0xFFFF0000) >> 16);
 }
 
 static void b43_generate_noise_sample(struct b43_wldev *dev)
@@ -1618,7 +1625,7 @@ static void b43_upload_beacon0(struct b43_wldev *dev)
 
         if (wl->beacon0_uploaded)
                 return;
-        b43_write_beacon_template(dev, 0x68, 0x18);
+        b43_write_beacon_template(dev, B43_SHM_SH_BT_BASE0, B43_SHM_SH_BTL0);
         wl->beacon0_uploaded = true;
 }
 
@@ -1628,7 +1635,7 @@ static void b43_upload_beacon1(struct b43_wldev *dev)
 
         if (wl->beacon1_uploaded)
                 return;
-        b43_write_beacon_template(dev, 0x468, 0x1A);
+        b43_write_beacon_template(dev, B43_SHM_SH_BT_BASE1, B43_SHM_SH_BTL1);
         wl->beacon1_uploaded = true;
 }
 
@@ -2775,9 +2782,7 @@ static int b43_gpio_init(struct b43_wldev *dev)
         switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
         case B43_BUS_BCMA:
-                bcma_cc_write32(&dev->dev->bdev->bus->drv_cc, BCMA_CC_GPIOCTL,
-                                (bcma_cc_read32(&dev->dev->bdev->bus->drv_cc,
-                                        BCMA_CC_GPIOCTL) & ~mask) | set);
+                bcma_chipco_gpio_control(&dev->dev->bdev->bus->drv_cc, mask, set);
                 break;
 #endif
 #ifdef CONFIG_B43_SSB
@@ -2802,8 +2807,7 @@ static void b43_gpio_cleanup(struct b43_wldev *dev)
         switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
         case B43_BUS_BCMA:
-                bcma_cc_write32(&dev->dev->bdev->bus->drv_cc, BCMA_CC_GPIOCTL,
-                                0);
+                bcma_chipco_gpio_control(&dev->dev->bdev->bus->drv_cc, ~0, 0);
                 break;
 #endif
 #ifdef CONFIG_B43_SSB
@@ -3111,7 +3115,7 @@ static int b43_chip_init(struct b43_wldev *dev)
 
         /* Probe Response Timeout value */
         /* FIXME: Default to 0, has to be set by ioctl probably... :-/ */
-        b43_shm_write16(dev, B43_SHM_SHARED, 0x0074, 0x0000);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_PRMAXTIME, 0);
 
         /* Initially set the wireless operation mode. */
         b43_adjust_opmode(dev);
@@ -3848,7 +3852,7 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         dev = wl->current_dev;
 
         /* Switch the band (if necessary). This might change the active core. */
-        err = b43_switch_band(wl, conf->channel);
+        err = b43_switch_band(wl, conf->chandef.chan);
         if (err)
                 goto out_unlock_mutex;
 
@@ -3878,8 +3882,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
 
         /* Switch to the requested channel.
          * The firmware takes care of races with the TX handler. */
-        if (conf->channel->hw_value != phy->channel)
-                b43_switch_channel(dev, conf->channel->hw_value);
+        if (conf->chandef.chan->hw_value != phy->channel)
+                b43_switch_channel(dev, conf->chandef.chan->hw_value);
 
         dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_MONITOR);
 
@@ -5002,7 +5006,7 @@ static int b43_op_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = SURVEY_INFO_NOISE_DBM;
         survey->noise = dev->stats.link_noise;
 
diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
index 7416c5e9154d..5d6833f18498 100644
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -30,6 +30,17 @@
 #include "radio_2059.h"
 #include "main.h"
 
+/* Force values to keep compatibility with wl */
+enum ht_rssi_type {
+        HT_RSSI_W1 = 0,
+        HT_RSSI_W2 = 1,
+        HT_RSSI_NB = 2,
+        HT_RSSI_IQ = 3,
+        HT_RSSI_TSSI_2G = 4,
+        HT_RSSI_TSSI_5G = 5,
+        HT_RSSI_TBD = 6,
+};
+
 /**************************************************
  * Radio 2059.
  **************************************************/
@@ -37,8 +48,9 @@
 static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
                         const struct b43_phy_ht_channeltab_e_radio2059 *e)
 {
-        u8 i;
-        u16 routing;
+        static const u16 routing[] = { R2059_C1, R2059_C2, R2059_C3, };
+        u16 r;
+        int core;
 
         b43_radio_write(dev, 0x16, e->radio_syn16);
         b43_radio_write(dev, 0x17, e->radio_syn17);
@@ -53,25 +65,17 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
         b43_radio_write(dev, 0x41, e->radio_syn41);
         b43_radio_write(dev, 0x43, e->radio_syn43);
         b43_radio_write(dev, 0x47, e->radio_syn47);
-        b43_radio_write(dev, 0x4a, e->radio_syn4a);
-        b43_radio_write(dev, 0x58, e->radio_syn58);
-        b43_radio_write(dev, 0x5a, e->radio_syn5a);
-        b43_radio_write(dev, 0x6a, e->radio_syn6a);
-        b43_radio_write(dev, 0x6d, e->radio_syn6d);
-        b43_radio_write(dev, 0x6e, e->radio_syn6e);
-        b43_radio_write(dev, 0x92, e->radio_syn92);
-        b43_radio_write(dev, 0x98, e->radio_syn98);
-
-        for (i = 0; i < 2; i++) {
-                routing = i ? R2059_RXRX1 : R2059_TXRX0;
-                b43_radio_write(dev, routing | 0x4a, e->radio_rxtx4a);
-                b43_radio_write(dev, routing | 0x58, e->radio_rxtx58);
-                b43_radio_write(dev, routing | 0x5a, e->radio_rxtx5a);
-                b43_radio_write(dev, routing | 0x6a, e->radio_rxtx6a);
-                b43_radio_write(dev, routing | 0x6d, e->radio_rxtx6d);
-                b43_radio_write(dev, routing | 0x6e, e->radio_rxtx6e);
-                b43_radio_write(dev, routing | 0x92, e->radio_rxtx92);
-                b43_radio_write(dev, routing | 0x98, e->radio_rxtx98);
+
+        for (core = 0; core < 3; core++) {
+                r = routing[core];
+                b43_radio_write(dev, r | 0x4a, e->radio_rxtx4a);
+                b43_radio_write(dev, r | 0x58, e->radio_rxtx58);
+                b43_radio_write(dev, r | 0x5a, e->radio_rxtx5a);
+                b43_radio_write(dev, r | 0x6a, e->radio_rxtx6a);
+                b43_radio_write(dev, r | 0x6d, e->radio_rxtx6d);
+                b43_radio_write(dev, r | 0x6e, e->radio_rxtx6e);
+                b43_radio_write(dev, r | 0x92, e->radio_rxtx92);
+                b43_radio_write(dev, r | 0x98, e->radio_rxtx98);
         }
 
         udelay(50);
@@ -87,7 +91,7 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
 
 static void b43_radio_2059_init(struct b43_wldev *dev)
 {
-        const u16 routing[] = { R2059_SYN, R2059_TXRX0, R2059_RXRX1 };
+        const u16 routing[] = { R2059_C1, R2059_C2, R2059_C3 };
         const u16 radio_values[3][2] = {
                 { 0x61, 0xE9 }, { 0x69, 0xD5 }, { 0x73, 0x99 },
         };
@@ -106,17 +110,17 @@ static void b43_radio_2059_init(struct b43_wldev *dev)
         b43_radio_mask(dev, 0xc0, ~0x0080);
 
         if (1) { /* FIXME */
-                b43_radio_set(dev, R2059_RXRX1 | 0x4, 0x1);
+                b43_radio_set(dev, R2059_C3 | 0x4, 0x1);
                 udelay(10);
-                b43_radio_set(dev, R2059_RXRX1 | 0x0BF, 0x1);
-                b43_radio_maskset(dev, R2059_RXRX1 | 0x19B, 0x3, 0x2);
+                b43_radio_set(dev, R2059_C3 | 0x0BF, 0x1);
+                b43_radio_maskset(dev, R2059_C3 | 0x19B, 0x3, 0x2);
 
-                b43_radio_set(dev, R2059_RXRX1 | 0x4, 0x2);
+                b43_radio_set(dev, R2059_C3 | 0x4, 0x2);
                 udelay(100);
-                b43_radio_mask(dev, R2059_RXRX1 | 0x4, ~0x2);
+                b43_radio_mask(dev, R2059_C3 | 0x4, ~0x2);
 
                 for (i = 0; i < 10000; i++) {
-                        if (b43_radio_read(dev, R2059_RXRX1 | 0x145) & 1) {
+                        if (b43_radio_read(dev, R2059_C3 | 0x145) & 1) {
                                 i = 0;
                                 break;
                         }
@@ -125,7 +129,7 @@ static void b43_radio_2059_init(struct b43_wldev *dev)
                 if (i)
                         b43err(dev->wl, "radio 0x945 timeout\n");
 
-                b43_radio_mask(dev, R2059_RXRX1 | 0x4, ~0x1);
+                b43_radio_mask(dev, R2059_C3 | 0x4, ~0x1);
                 b43_radio_set(dev, 0xa, 0x60);
 
                 for (i = 0; i < 3; i++) {
@@ -154,9 +158,84 @@ static void b43_radio_2059_init(struct b43_wldev *dev)
 }
 
 /**************************************************
+ * RF
+ **************************************************/
+
+static void b43_phy_ht_force_rf_sequence(struct b43_wldev *dev, u16 rf_seq)
+{
+        u8 i;
+
+        u16 save_seq_mode = b43_phy_read(dev, B43_PHY_HT_RF_SEQ_MODE);
+        b43_phy_set(dev, B43_PHY_HT_RF_SEQ_MODE, 0x3);
+
+        b43_phy_set(dev, B43_PHY_HT_RF_SEQ_TRIG, rf_seq);
+        for (i = 0; i < 200; i++) {
+                if (!(b43_phy_read(dev, B43_PHY_HT_RF_SEQ_STATUS) & rf_seq)) {
+                        i = 0;
+                        break;
+                }
+                msleep(1);
+        }
+        if (i)
+                b43err(dev->wl, "Forcing RF sequence timeout\n");
+
+        b43_phy_write(dev, B43_PHY_HT_RF_SEQ_MODE, save_seq_mode);
+}
+
+static void b43_phy_ht_pa_override(struct b43_wldev *dev, bool enable)
+{
+        struct b43_phy_ht *htphy = dev->phy.ht;
+        static const u16 regs[3] = { B43_PHY_HT_RF_CTL_INT_C1,
+                                     B43_PHY_HT_RF_CTL_INT_C2,
+                                     B43_PHY_HT_RF_CTL_INT_C3 };
+        int i;
+
+        if (enable) {
+                for (i = 0; i < 3; i++)
+                        b43_phy_write(dev, regs[i], htphy->rf_ctl_int_save[i]);
+        } else {
+                for (i = 0; i < 3; i++)
+                        htphy->rf_ctl_int_save[i] = b43_phy_read(dev, regs[i]);
+                /* TODO: Does 5GHz band use different value (not 0x0400)? */
+                for (i = 0; i < 3; i++)
+                        b43_phy_write(dev, regs[i], 0x0400);
+        }
+}
+
+/**************************************************
  * Various PHY ops
  **************************************************/
 
+static u16 b43_phy_ht_classifier(struct b43_wldev *dev, u16 mask, u16 val)
+{
+        u16 tmp;
+        u16 allowed = B43_PHY_HT_CLASS_CTL_CCK_EN |
+                      B43_PHY_HT_CLASS_CTL_OFDM_EN |
+                      B43_PHY_HT_CLASS_CTL_WAITED_EN;
+
+        tmp = b43_phy_read(dev, B43_PHY_HT_CLASS_CTL);
+        tmp &= allowed;
+        tmp &= ~mask;
+        tmp |= (val & mask);
+        b43_phy_maskset(dev, B43_PHY_HT_CLASS_CTL, ~allowed, tmp);
+
+        return tmp;
+}
+
+static void b43_phy_ht_reset_cca(struct b43_wldev *dev)
+{
+        u16 bbcfg;
+
+        b43_phy_force_clock(dev, true);
+        bbcfg = b43_phy_read(dev, B43_PHY_HT_BBCFG);
+        b43_phy_write(dev, B43_PHY_HT_BBCFG, bbcfg | B43_PHY_HT_BBCFG_RSTCCA);
+        udelay(1);
+        b43_phy_write(dev, B43_PHY_HT_BBCFG, bbcfg & ~B43_PHY_HT_BBCFG_RSTCCA);
+        b43_phy_force_clock(dev, false);
+
+        b43_phy_ht_force_rf_sequence(dev, B43_PHY_HT_RF_SEQ_TRIG_RST2RX);
+}
+
 static void b43_phy_ht_zero_extg(struct b43_wldev *dev)
 {
         u8 i, j;
@@ -176,10 +255,10 @@ static void b43_phy_ht_afe_unk1(struct b43_wldev *dev)
 {
         u8 i;
 
-        const u16 ctl_regs[3][2] = {
-                { B43_PHY_HT_AFE_CTL1, B43_PHY_HT_AFE_CTL2 },
-                { B43_PHY_HT_AFE_CTL3, B43_PHY_HT_AFE_CTL4 },
-                { B43_PHY_HT_AFE_CTL5, B43_PHY_HT_AFE_CTL6},
+        static const u16 ctl_regs[3][2] = {
+                { B43_PHY_HT_AFE_C1_OVER, B43_PHY_HT_AFE_C1 },
+                { B43_PHY_HT_AFE_C2_OVER, B43_PHY_HT_AFE_C2 },
+                { B43_PHY_HT_AFE_C3_OVER, B43_PHY_HT_AFE_C3},
         };
 
         for (i = 0; i < 3; i++) {
@@ -193,27 +272,6 @@ static void b43_phy_ht_afe_unk1(struct b43_wldev *dev)
         }
 }
 
-static void b43_phy_ht_force_rf_sequence(struct b43_wldev *dev, u16 rf_seq)
-{
-        u8 i;
-
-        u16 save_seq_mode = b43_phy_read(dev, B43_PHY_HT_RF_SEQ_MODE);
-        b43_phy_set(dev, B43_PHY_HT_RF_SEQ_MODE, 0x3);
-
-        b43_phy_set(dev, B43_PHY_HT_RF_SEQ_TRIG, rf_seq);
-        for (i = 0; i < 200; i++) {
-                if (!(b43_phy_read(dev, B43_PHY_HT_RF_SEQ_STATUS) & rf_seq)) {
-                        i = 0;
-                        break;
-                }
-                msleep(1);
-        }
-        if (i)
-                b43err(dev->wl, "Forcing RF sequence timeout\n");
-
-        b43_phy_write(dev, B43_PHY_HT_RF_SEQ_MODE, save_seq_mode);
-}
-
 static void b43_phy_ht_read_clip_detection(struct b43_wldev *dev, u16 *clip_st)
 {
         clip_st[0] = b43_phy_read(dev, B43_PHY_HT_C1_CLIP1THRES);
@@ -240,15 +298,456 @@ static void b43_phy_ht_bphy_init(struct b43_wldev *dev)
 }
 
 /**************************************************
+ * Samples
+ **************************************************/
+
+static void b43_phy_ht_stop_playback(struct b43_wldev *dev)
+{
+        struct b43_phy_ht *phy_ht = dev->phy.ht;
+        u16 tmp;
+        int i;
+
+        tmp = b43_phy_read(dev, B43_PHY_HT_SAMP_STAT);
+        if (tmp & 0x1)
+                b43_phy_set(dev, B43_PHY_HT_SAMP_CMD, B43_PHY_HT_SAMP_CMD_STOP);
+        else if (tmp & 0x2)
+                b43_phy_mask(dev, B43_PHY_HT_IQLOCAL_CMDGCTL, 0x7FFF);
+
+        b43_phy_mask(dev, B43_PHY_HT_SAMP_CMD, ~0x0004);
+
+        for (i = 0; i < 3; i++) {
+                if (phy_ht->bb_mult_save[i] >= 0) {
+                        b43_httab_write(dev, B43_HTTAB16(13, 0x63 + i * 4),
+                                        phy_ht->bb_mult_save[i]);
+                        b43_httab_write(dev, B43_HTTAB16(13, 0x67 + i * 4),
+                                        phy_ht->bb_mult_save[i]);
+                }
+        }
+}
+
+static u16 b43_phy_ht_load_samples(struct b43_wldev *dev)
+{
+        int i;
+        u16 len = 20 << 3;
+
+        b43_phy_write(dev, B43_PHY_HT_TABLE_ADDR, 0x4400);
+
+        for (i = 0; i < len; i++) {
+                b43_phy_write(dev, B43_PHY_HT_TABLE_DATAHI, 0);
+                b43_phy_write(dev, B43_PHY_HT_TABLE_DATALO, 0);
+        }
+
+        return len;
+}
+
+static void b43_phy_ht_run_samples(struct b43_wldev *dev, u16 samps, u16 loops,
+                                   u16 wait)
+{
+        struct b43_phy_ht *phy_ht = dev->phy.ht;
+        u16 save_seq_mode;
+        int i;
+
+        for (i = 0; i < 3; i++) {
+                if (phy_ht->bb_mult_save[i] < 0)
+                        phy_ht->bb_mult_save[i] = b43_httab_read(dev, B43_HTTAB16(13, 0x63 + i * 4));
+        }
+
+        b43_phy_write(dev, B43_PHY_HT_SAMP_DEP_CNT, samps - 1);
+        if (loops != 0xFFFF)
+                loops--;
+        b43_phy_write(dev, B43_PHY_HT_SAMP_LOOP_CNT, loops);
+        b43_phy_write(dev, B43_PHY_HT_SAMP_WAIT_CNT, wait);
+
+        save_seq_mode = b43_phy_read(dev, B43_PHY_HT_RF_SEQ_MODE);
+        b43_phy_set(dev, B43_PHY_HT_RF_SEQ_MODE,
+                    B43_PHY_HT_RF_SEQ_MODE_CA_OVER);
+
+        /* TODO: find out mask bits! Do we need more function arguments? */
+        b43_phy_mask(dev, B43_PHY_HT_SAMP_CMD, ~0);
+        b43_phy_mask(dev, B43_PHY_HT_SAMP_CMD, ~0);
+        b43_phy_mask(dev, B43_PHY_HT_IQLOCAL_CMDGCTL, ~0);
+        b43_phy_set(dev, B43_PHY_HT_SAMP_CMD, 0x1);
+
+        for (i = 0; i < 100; i++) {
+                if (!(b43_phy_read(dev, B43_PHY_HT_RF_SEQ_STATUS) & 1)) {
+                        i = 0;
+                        break;
+                }
+                udelay(10);
+        }
+        if (i)
+                b43err(dev->wl, "run samples timeout\n");
+
+        b43_phy_write(dev, B43_PHY_HT_RF_SEQ_MODE, save_seq_mode);
+}
+
+static void b43_phy_ht_tx_tone(struct b43_wldev *dev)
+{
+        u16 samp;
+
+        samp = b43_phy_ht_load_samples(dev);
+        b43_phy_ht_run_samples(dev, samp, 0xFFFF, 0);
+}
+
+/**************************************************
+ * RSSI
+ **************************************************/
+
+static void b43_phy_ht_rssi_select(struct b43_wldev *dev, u8 core_sel,
+                                   enum ht_rssi_type rssi_type)
+{
+        static const u16 ctl_regs[3][2] = {
+                { B43_PHY_HT_AFE_C1, B43_PHY_HT_AFE_C1_OVER, },
+                { B43_PHY_HT_AFE_C2, B43_PHY_HT_AFE_C2_OVER, },
+                { B43_PHY_HT_AFE_C3, B43_PHY_HT_AFE_C3_OVER, },
+        };
+        static const u16 radio_r[] = { R2059_C1, R2059_C2, R2059_C3, };
+        int core;
+
+        if (core_sel == 0) {
+                b43err(dev->wl, "RSSI selection for core off not implemented yet\n");
+        } else {
+                for (core = 0; core < 3; core++) {
+                        /* Check if caller requested a one specific core */
+                        if ((core_sel == 1 && core != 0) ||
+                            (core_sel == 2 && core != 1) ||
+                            (core_sel == 3 && core != 2))
+                                continue;
+
+                        switch (rssi_type) {
+                        case HT_RSSI_TSSI_2G:
+                                b43_phy_set(dev, ctl_regs[core][0], 0x3 << 8);
+                                b43_phy_set(dev, ctl_regs[core][0], 0x3 << 10);
+                                b43_phy_set(dev, ctl_regs[core][1], 0x1 << 9);
+                                b43_phy_set(dev, ctl_regs[core][1], 0x1 << 10);
+
+                                b43_radio_set(dev, R2059_C3 | 0xbf, 0x1);
+                                b43_radio_write(dev, radio_r[core] | 0x159,
+                                                0x11);
+                                break;
+                        default:
+                                b43err(dev->wl, "RSSI selection for type %d not implemented yet\n",
+                                       rssi_type);
+                        }
+                }
+        }
+}
+
+static void b43_phy_ht_poll_rssi(struct b43_wldev *dev, enum ht_rssi_type type,
+                                 s32 *buf, u8 nsamp)
+{
+        u16 phy_regs_values[12];
+        static const u16 phy_regs_to_save[] = {
+                B43_PHY_HT_AFE_C1, B43_PHY_HT_AFE_C1_OVER,
+                0x848, 0x841,
+                B43_PHY_HT_AFE_C2, B43_PHY_HT_AFE_C2_OVER,
+                0x868, 0x861,
+                B43_PHY_HT_AFE_C3, B43_PHY_HT_AFE_C3_OVER,
+                0x888, 0x881,
+        };
+        u16 tmp[3];
+        int i;
+
+        for (i = 0; i < 12; i++)
+                phy_regs_values[i] = b43_phy_read(dev, phy_regs_to_save[i]);
+
+        b43_phy_ht_rssi_select(dev, 5, type);
+
+        for (i = 0; i < 6; i++)
+                buf[i] = 0;
+
+        for (i = 0; i < nsamp; i++) {
+                tmp[0] = b43_phy_read(dev, B43_PHY_HT_RSSI_C1);
+                tmp[1] = b43_phy_read(dev, B43_PHY_HT_RSSI_C2);
+                tmp[2] = b43_phy_read(dev, B43_PHY_HT_RSSI_C3);
+
+                buf[0] += ((s8)((tmp[0] & 0x3F) << 2)) >> 2;
+                buf[1] += ((s8)(((tmp[0] >> 8) & 0x3F) << 2)) >> 2;
+                buf[2] += ((s8)((tmp[1] & 0x3F) << 2)) >> 2;
+                buf[3] += ((s8)(((tmp[1] >> 8) & 0x3F) << 2)) >> 2;
+                buf[4] += ((s8)((tmp[2] & 0x3F) << 2)) >> 2;
+                buf[5] += ((s8)(((tmp[2] >> 8) & 0x3F) << 2)) >> 2;
+        }
+
+        for (i = 0; i < 12; i++)
+                b43_phy_write(dev, phy_regs_to_save[i], phy_regs_values[i]);
+}
+
+/**************************************************
+ * Tx/Rx
+ **************************************************/
+
+static void b43_phy_ht_tx_power_fix(struct b43_wldev *dev)
+{
+        int i;
+
+        for (i = 0; i < 3; i++) {
+                u16 mask;
+                u32 tmp = b43_httab_read(dev, B43_HTTAB32(26, 0xE8));
+
+                if (0) /* FIXME */
+                        mask = 0x2 << (i * 4);
+                else
+                        mask = 0;
+                b43_phy_mask(dev, B43_PHY_EXTG(0x108), mask);
+
+                b43_httab_write(dev, B43_HTTAB16(7, 0x110 + i), tmp >> 16);
+                b43_httab_write(dev, B43_HTTAB8(13, 0x63 + (i * 4)),
+                                tmp & 0xFF);
+                b43_httab_write(dev, B43_HTTAB8(13, 0x73 + (i * 4)),
+                                tmp & 0xFF);
+        }
+}
+
+static void b43_phy_ht_tx_power_ctl(struct b43_wldev *dev, bool enable)
+{
+        struct b43_phy_ht *phy_ht = dev->phy.ht;
+        u16 en_bits = B43_PHY_HT_TXPCTL_CMD_C1_COEFF |
+                      B43_PHY_HT_TXPCTL_CMD_C1_HWPCTLEN |
+                      B43_PHY_HT_TXPCTL_CMD_C1_PCTLEN;
+        static const u16 cmd_regs[3] = { B43_PHY_HT_TXPCTL_CMD_C1,
+                                         B43_PHY_HT_TXPCTL_CMD_C2,
+                                         B43_PHY_HT_TXPCTL_CMD_C3 };
+        static const u16 status_regs[3] = { B43_PHY_HT_TX_PCTL_STATUS_C1,
+                                            B43_PHY_HT_TX_PCTL_STATUS_C2,
+                                            B43_PHY_HT_TX_PCTL_STATUS_C3 };
+        int i;
+
+        if (!enable) {
+                if (b43_phy_read(dev, B43_PHY_HT_TXPCTL_CMD_C1) & en_bits) {
+                        /* We disable enabled TX pwr ctl, save it's state */
+                        for (i = 0; i < 3; i++)
+                                phy_ht->tx_pwr_idx[i] =
+                                        b43_phy_read(dev, status_regs[i]);
+                }
+                b43_phy_mask(dev, B43_PHY_HT_TXPCTL_CMD_C1, ~en_bits);
+        } else {
+                b43_phy_set(dev, B43_PHY_HT_TXPCTL_CMD_C1, en_bits);
+
+                if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+                        for (i = 0; i < 3; i++)
+                                b43_phy_write(dev, cmd_regs[i], 0x32);
+                }
+
+                for (i = 0; i < 3; i++)
+                        if (phy_ht->tx_pwr_idx[i] <=
+                            B43_PHY_HT_TXPCTL_CMD_C1_INIT)
+                                b43_phy_write(dev, cmd_regs[i],
+                                              phy_ht->tx_pwr_idx[i]);
+        }
+
+        phy_ht->tx_pwr_ctl = enable;
+}
+
+static void b43_phy_ht_tx_power_ctl_idle_tssi(struct b43_wldev *dev)
+{
+        struct b43_phy_ht *phy_ht = dev->phy.ht;
+        static const u16 base[] = { 0x840, 0x860, 0x880 };
+        u16 save_regs[3][3];
+        s32 rssi_buf[6];
+        int core;
+
+        for (core = 0; core < 3; core++) {
+                save_regs[core][1] = b43_phy_read(dev, base[core] + 6);
+                save_regs[core][2] = b43_phy_read(dev, base[core] + 7);
+                save_regs[core][0] = b43_phy_read(dev, base[core] + 0);
+
+                b43_phy_write(dev, base[core] + 6, 0);
+                b43_phy_mask(dev, base[core] + 7, ~0xF); /* 0xF? Or just 0x6? */
+                b43_phy_set(dev, base[core] + 0, 0x0400);
+                b43_phy_set(dev, base[core] + 0, 0x1000);
+        }
+
+        b43_phy_ht_tx_tone(dev);
+        udelay(20);
+        b43_phy_ht_poll_rssi(dev, HT_RSSI_TSSI_2G, rssi_buf, 1);
+        b43_phy_ht_stop_playback(dev);
+        b43_phy_ht_reset_cca(dev);
+
+        phy_ht->idle_tssi[0] = rssi_buf[0] & 0xff;
+        phy_ht->idle_tssi[1] = rssi_buf[2] & 0xff;
+        phy_ht->idle_tssi[2] = rssi_buf[4] & 0xff;
+
+        for (core = 0; core < 3; core++) {
+                b43_phy_write(dev, base[core] + 0, save_regs[core][0]);
+                b43_phy_write(dev, base[core] + 6, save_regs[core][1]);
+                b43_phy_write(dev, base[core] + 7, save_regs[core][2]);
+        }
+}
+
+static void b43_phy_ht_tssi_setup(struct b43_wldev *dev)
+{
+        static const u16 routing[] = { R2059_C1, R2059_C2, R2059_C3, };
+        int core;
+
+        /* 0x159 is probably TX_SSI_MUX or TSSIG (by comparing to N-PHY) */
+        for (core = 0; core < 3; core++) {
+                b43_radio_set(dev, 0x8bf, 0x1);
+                b43_radio_write(dev, routing[core] | 0x0159, 0x0011);
+        }
+}
+
+static void b43_phy_ht_tx_power_ctl_setup(struct b43_wldev *dev)
+{
+        struct b43_phy_ht *phy_ht = dev->phy.ht;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+
+        u8 *idle = phy_ht->idle_tssi;
+        u8 target[3];
+        s16 a1[3], b0[3], b1[3];
+
+        u16 freq = dev->phy.channel_freq;
+        int i, c;
+
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                for (c = 0; c < 3; c++) {
+                        target[c] = sprom->core_pwr_info[c].maxpwr_2g;
+                        a1[c] = sprom->core_pwr_info[c].pa_2g[0];
+                        b0[c] = sprom->core_pwr_info[c].pa_2g[1];
+                        b1[c] = sprom->core_pwr_info[c].pa_2g[2];
+                }
+        } else if (freq >= 4900 && freq < 5100) {
+                for (c = 0; c < 3; c++) {
+                        target[c] = sprom->core_pwr_info[c].maxpwr_5gl;
+                        a1[c] = sprom->core_pwr_info[c].pa_5gl[0];
+                        b0[c] = sprom->core_pwr_info[c].pa_5gl[1];
+                        b1[c] = sprom->core_pwr_info[c].pa_5gl[2];
+                }
+        } else if (freq >= 5100 && freq < 5500) {
+                for (c = 0; c < 3; c++) {
+                        target[c] = sprom->core_pwr_info[c].maxpwr_5g;
+                        a1[c] = sprom->core_pwr_info[c].pa_5g[0];
+                        b0[c] = sprom->core_pwr_info[c].pa_5g[1];
+                        b1[c] = sprom->core_pwr_info[c].pa_5g[2];
+                }
+        } else if (freq >= 5500) {
+                for (c = 0; c < 3; c++) {
+                        target[c] = sprom->core_pwr_info[c].maxpwr_5gh;
+                        a1[c] = sprom->core_pwr_info[c].pa_5gh[0];
+                        b0[c] = sprom->core_pwr_info[c].pa_5gh[1];
+                        b1[c] = sprom->core_pwr_info[c].pa_5gh[2];
+                }
+        } else {
+                target[0] = target[1] = target[2] = 52;
+                a1[0] = a1[1] = a1[2] = -424;
+                b0[0] = b0[1] = b0[2] = 5612;
+                b1[0] = b1[1] = b1[2] = -1393;
+        }
+
+        b43_phy_set(dev, B43_PHY_HT_TSSIMODE, B43_PHY_HT_TSSIMODE_EN);
+        b43_phy_mask(dev, B43_PHY_HT_TXPCTL_CMD_C1,
+                     ~B43_PHY_HT_TXPCTL_CMD_C1_PCTLEN & 0xFFFF);
+
+        /* TODO: Does it depend on sprom->fem.ghz2.tssipos? */
+        b43_phy_set(dev, B43_PHY_HT_TXPCTL_IDLE_TSSI, 0x4000);
+
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_CMD_C1,
+                        ~B43_PHY_HT_TXPCTL_CMD_C1_INIT, 0x19);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_CMD_C2,
+                        ~B43_PHY_HT_TXPCTL_CMD_C2_INIT, 0x19);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_CMD_C3,
+                        ~B43_PHY_HT_TXPCTL_CMD_C3_INIT, 0x19);
+
+        b43_phy_set(dev, B43_PHY_HT_TXPCTL_IDLE_TSSI,
+                    B43_PHY_HT_TXPCTL_IDLE_TSSI_BINF);
+
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_IDLE_TSSI,
+                        ~B43_PHY_HT_TXPCTL_IDLE_TSSI_C1,
+                        idle[0] << B43_PHY_HT_TXPCTL_IDLE_TSSI_C1_SHIFT);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_IDLE_TSSI,
+                        ~B43_PHY_HT_TXPCTL_IDLE_TSSI_C2,
+                        idle[1] << B43_PHY_HT_TXPCTL_IDLE_TSSI_C2_SHIFT);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_IDLE_TSSI2,
+                        ~B43_PHY_HT_TXPCTL_IDLE_TSSI2_C3,
+                        idle[2] << B43_PHY_HT_TXPCTL_IDLE_TSSI2_C3_SHIFT);
+
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_N, ~B43_PHY_HT_TXPCTL_N_TSSID,
+                        0xf0);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_N, ~B43_PHY_HT_TXPCTL_N_NPTIL2,
+                        0x3 << B43_PHY_HT_TXPCTL_N_NPTIL2_SHIFT);
+#if 0
+        /* TODO: what to mask/set? */
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_CMD_C1, 0x800, 0)
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_CMD_C1, 0x400, 0)
+#endif
+
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_TARG_PWR,
+                        ~B43_PHY_HT_TXPCTL_TARG_PWR_C1,
+                        target[0] << B43_PHY_HT_TXPCTL_TARG_PWR_C1_SHIFT);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_TARG_PWR,
+                        ~B43_PHY_HT_TXPCTL_TARG_PWR_C2 & 0xFFFF,
+                        target[1] << B43_PHY_HT_TXPCTL_TARG_PWR_C2_SHIFT);
+        b43_phy_maskset(dev, B43_PHY_HT_TXPCTL_TARG_PWR2,
+                        ~B43_PHY_HT_TXPCTL_TARG_PWR2_C3,
+                        target[2] << B43_PHY_HT_TXPCTL_TARG_PWR2_C3_SHIFT);
+
+        for (c = 0; c < 3; c++) {
+                s32 num, den, pwr;
+                u32 regval[64];
+
+                for (i = 0; i < 64; i++) {
+                        num = 8 * (16 * b0[c] + b1[c] * i);
+                        den = 32768 + a1[c] * i;
+                        pwr = max((4 * num + den / 2) / den, -8);
+                        regval[i] = pwr;
+                }
+                b43_httab_write_bulk(dev, B43_HTTAB16(26 + c, 0), 64, regval);
+        }
+}
+
+/**************************************************
  * Channel switching ops.
  **************************************************/
 
+static void b43_phy_ht_spur_avoid(struct b43_wldev *dev,
+                                  struct ieee80211_channel *new_channel)
+{
+        struct bcma_device *core = dev->dev->bdev;
+        int spuravoid = 0;
+        u16 tmp;
+
+        /* Check for 13 and 14 is just a guess, we don't have enough logs. */
+        if (new_channel->hw_value == 13 || new_channel->hw_value == 14)
+                spuravoid = 1;
+        bcma_core_pll_ctl(core, B43_BCMA_CLKCTLST_PHY_PLL_REQ, 0, false);
+        bcma_pmu_spuravoid_pllupdate(&core->bus->drv_cc, spuravoid);
+        bcma_core_pll_ctl(core,
+                          B43_BCMA_CLKCTLST_80211_PLL_REQ |
+                          B43_BCMA_CLKCTLST_PHY_PLL_REQ,
+                          B43_BCMA_CLKCTLST_80211_PLL_ST |
+                          B43_BCMA_CLKCTLST_PHY_PLL_ST, false);
+
+        /* Values has been taken from wlc_bmac_switch_macfreq comments */
+        switch (spuravoid) {
+        case 2: /* 126MHz */
+                tmp = 0x2082;
+                break;
+        case 1: /* 123MHz */
+                tmp = 0x5341;
+                break;
+        default: /* 120MHz */
+                tmp = 0x8889;
+        }
+
+        b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, tmp);
+        b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);
+
+        /* TODO: reset PLL */
+
+        if (spuravoid)
+                b43_phy_set(dev, B43_PHY_HT_BBCFG, B43_PHY_HT_BBCFG_RSTRX);
+        else
+                b43_phy_mask(dev, B43_PHY_HT_BBCFG,
+                                ~B43_PHY_HT_BBCFG_RSTRX & 0xFFFF);
+
+        b43_phy_ht_reset_cca(dev);
+}
+
 static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
                                 const struct b43_phy_ht_channeltab_e_phy *e,
                                 struct ieee80211_channel *new_channel)
 {
         bool old_band_5ghz;
-        u8 i;
 
         old_band_5ghz = b43_phy_read(dev, B43_PHY_HT_BANDCTL) & 0; /* FIXME */
         if (new_channel->band == IEEE80211_BAND_5GHZ && !old_band_5ghz) {
@@ -264,25 +763,20 @@ static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
         b43_phy_write(dev, B43_PHY_HT_BW5, e->bw5);
         b43_phy_write(dev, B43_PHY_HT_BW6, e->bw6);
 
-        /* TODO: some ops on PHY regs 0x0B0 and 0xC0A */
-
-        /* TODO: separated function? */
-        for (i = 0; i < 3; i++) {
-                u16 mask;
-                u32 tmp = b43_httab_read(dev, B43_HTTAB32(26, 0xE8));
+        if (new_channel->hw_value == 14) {
+                b43_phy_ht_classifier(dev, B43_PHY_HT_CLASS_CTL_OFDM_EN, 0);
+                b43_phy_set(dev, B43_PHY_HT_TEST, 0x0800);
+        } else {
+                b43_phy_ht_classifier(dev, B43_PHY_HT_CLASS_CTL_OFDM_EN,
+                                      B43_PHY_HT_CLASS_CTL_OFDM_EN);
+                if (new_channel->band == IEEE80211_BAND_2GHZ)
+                        b43_phy_mask(dev, B43_PHY_HT_TEST, ~0x840);
+        }
 
-                if (0) /* FIXME */
-                        mask = 0x2 << (i * 4);
-                else
-                        mask = 0;
-                b43_phy_mask(dev, B43_PHY_EXTG(0x108), mask);
+        if (1) /* TODO: On N it's for early devices only, what about HT? */
+                b43_phy_ht_tx_power_fix(dev);
 
-                b43_httab_write(dev, B43_HTTAB16(7, 0x110 + i), tmp >> 16);
-                b43_httab_write(dev, B43_HTTAB8(13, 0x63 + (i * 4)),
-                                tmp & 0xFF);
-                b43_httab_write(dev, B43_HTTAB8(13, 0x73 + (i * 4)),
-                                tmp & 0xFF);
-        }
+        b43_phy_ht_spur_avoid(dev, new_channel);
 
         b43_phy_write(dev, 0x017e, 0x3830);
 }
@@ -337,14 +831,29 @@ static void b43_phy_ht_op_prepare_structs(struct b43_wldev *dev)
 {
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_ht *phy_ht = phy->ht;
+        int i;
 
         memset(phy_ht, 0, sizeof(*phy_ht));
+
+        phy_ht->tx_pwr_ctl = true;
+        for (i = 0; i < 3; i++)
+                phy_ht->tx_pwr_idx[i] = B43_PHY_HT_TXPCTL_CMD_C1_INIT + 1;
+
+        for (i = 0; i < 3; i++)
+                phy_ht->bb_mult_save[i] = -1;
 }
 
 static int b43_phy_ht_op_init(struct b43_wldev *dev)
 {
+        struct b43_phy_ht *phy_ht = dev->phy.ht;
         u16 tmp;
         u16 clip_state[3];
+        bool saved_tx_pwr_ctl;
+
+        if (dev->dev->bus_type != B43_BUS_BCMA) {
+                b43err(dev->wl, "HT-PHY is supported only on BCMA bus!\n");
+                return -EOPNOTSUPP;
+        }
 
         b43_phy_ht_tables_init(dev);
 
@@ -357,9 +866,9 @@ static int b43_phy_ht_op_init(struct b43_wldev *dev)
 
         b43_phy_mask(dev, B43_PHY_EXTG(0), ~0x3);
 
-        b43_phy_write(dev, B43_PHY_HT_AFE_CTL1, 0);
-        b43_phy_write(dev, B43_PHY_HT_AFE_CTL3, 0);
-        b43_phy_write(dev, B43_PHY_HT_AFE_CTL5, 0);
+        b43_phy_write(dev, B43_PHY_HT_AFE_C1_OVER, 0);
+        b43_phy_write(dev, B43_PHY_HT_AFE_C2_OVER, 0);
+        b43_phy_write(dev, B43_PHY_HT_AFE_C3_OVER, 0);
 
         b43_phy_write(dev, B43_PHY_EXTG(0x103), 0x20);
         b43_phy_write(dev, B43_PHY_EXTG(0x101), 0x20);
@@ -371,8 +880,11 @@ static int b43_phy_ht_op_init(struct b43_wldev *dev)
         if (0) /* TODO: condition */
                 ; /* TODO: PHY op on reg 0x217 */
 
-        b43_phy_read(dev, 0xb0); /* TODO: what for? */
-        b43_phy_set(dev, 0xb0, 0x1);
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)
+                b43_phy_ht_classifier(dev, B43_PHY_HT_CLASS_CTL_CCK_EN, 0);
+        else
+                b43_phy_ht_classifier(dev, B43_PHY_HT_CLASS_CTL_CCK_EN,
+                                      B43_PHY_HT_CLASS_CTL_CCK_EN);
 
         b43_phy_set(dev, 0xb1, 0x91);
         b43_phy_write(dev, 0x32f, 0x0003);
@@ -448,12 +960,13 @@ static int b43_phy_ht_op_init(struct b43_wldev *dev)
 
         b43_mac_phy_clock_set(dev, true);
 
+        b43_phy_ht_pa_override(dev, false);
         b43_phy_ht_force_rf_sequence(dev, B43_PHY_HT_RF_SEQ_TRIG_RX2TX);
         b43_phy_ht_force_rf_sequence(dev, B43_PHY_HT_RF_SEQ_TRIG_RST2RX);
-
-        /* TODO: PHY op on reg 0xb0 */
+        b43_phy_ht_pa_override(dev, true);
 
         /* TODO: Should we restore it? Or store it in global PHY info? */
+        b43_phy_ht_classifier(dev, 0, 0);
         b43_phy_ht_read_clip_detection(dev, clip_state);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
@@ -462,6 +975,14 @@ static int b43_phy_ht_op_init(struct b43_wldev *dev)
         b43_httab_write_bulk(dev, B43_HTTAB32(0x1a, 0xc0),
                         B43_HTTAB_1A_C0_LATE_SIZE, b43_httab_0x1a_0xc0_late);
 
+        saved_tx_pwr_ctl = phy_ht->tx_pwr_ctl;
+        b43_phy_ht_tx_power_fix(dev);
+        b43_phy_ht_tx_power_ctl(dev, false);
+        b43_phy_ht_tx_power_ctl_idle_tssi(dev);
+        b43_phy_ht_tx_power_ctl_setup(dev);
+        b43_phy_ht_tssi_setup(dev);
+        b43_phy_ht_tx_power_ctl(dev, saved_tx_pwr_ctl);
+
         return 0;
 }
 
@@ -506,27 +1027,28 @@ static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,
 static void b43_phy_ht_op_switch_analog(struct b43_wldev *dev, bool on)
 {
         if (on) {
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL2, 0x00cd);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL1, 0x0000);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL4, 0x00cd);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL3, 0x0000);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL6, 0x00cd);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL5, 0x0000);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C1, 0x00cd);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C1_OVER, 0x0000);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C2, 0x00cd);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C2_OVER, 0x0000);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C3, 0x00cd);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C3_OVER, 0x0000);
         } else {
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL1, 0x07ff);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL2, 0x00fd);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL3, 0x07ff);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL4, 0x00fd);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL5, 0x07ff);
-                b43_phy_write(dev, B43_PHY_HT_AFE_CTL6, 0x00fd);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C1_OVER, 0x07ff);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C1, 0x00fd);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C2_OVER, 0x07ff);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C2, 0x00fd);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C3_OVER, 0x07ff);
+                b43_phy_write(dev, B43_PHY_HT_AFE_C3, 0x00fd);
         }
 }
 
 static int b43_phy_ht_op_switch_channel(struct b43_wldev *dev,
                                         unsigned int new_channel)
 {
-        struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
-        enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
+        struct ieee80211_channel *channel = dev->wl->hw->conf.chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&dev->wl->hw->conf.chandef);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
                 if ((new_channel < 1) || (new_channel > 14))
diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/b43/phy_ht.h
index 6544c4293b34..6cae370d1018 100644
--- a/drivers/net/wireless/b43/phy_ht.h
+++ b/drivers/net/wireless/b43/phy_ht.h
@@ -12,18 +12,65 @@
 #define B43_PHY_HT_TABLE_ADDR                   0x072 /* Table address */
 #define B43_PHY_HT_TABLE_DATALO                 0x073 /* Table data low */
 #define B43_PHY_HT_TABLE_DATAHI                 0x074 /* Table data high */
+#define B43_PHY_HT_CLASS_CTL                    0x0B0 /* Classifier control */
+#define  B43_PHY_HT_CLASS_CTL_CCK_EN            0x0001 /* CCK enable */
+#define  B43_PHY_HT_CLASS_CTL_OFDM_EN           0x0002 /* OFDM enable */
+#define  B43_PHY_HT_CLASS_CTL_WAITED_EN         0x0004 /* Waited enable */
+#define B43_PHY_HT_IQLOCAL_CMDGCTL              0x0C2   /* I/Q LO cal command G control */
+#define B43_PHY_HT_SAMP_CMD                     0x0C3   /* Sample command */
+#define  B43_PHY_HT_SAMP_CMD_STOP               0x0002  /* Stop */
+#define B43_PHY_HT_SAMP_LOOP_CNT                0x0C4   /* Sample loop count */
+#define B43_PHY_HT_SAMP_WAIT_CNT                0x0C5   /* Sample wait count */
+#define B43_PHY_HT_SAMP_DEP_CNT                 0x0C6   /* Sample depth count */
+#define B43_PHY_HT_SAMP_STAT                    0x0C7   /* Sample status */
+#define B43_PHY_HT_EST_PWR_C1                   0x118
+#define B43_PHY_HT_EST_PWR_C2                   0x119
+#define B43_PHY_HT_EST_PWR_C3                   0x11A
+#define B43_PHY_HT_TSSIMODE                     0x122   /* TSSI mode */
+#define  B43_PHY_HT_TSSIMODE_EN                 0x0001  /* TSSI enable */
+#define  B43_PHY_HT_TSSIMODE_PDEN               0x0002  /* Power det enable */
 #define B43_PHY_HT_BW1                          0x1CE
 #define B43_PHY_HT_BW2                          0x1CF
 #define B43_PHY_HT_BW3                          0x1D0
 #define B43_PHY_HT_BW4                          0x1D1
 #define B43_PHY_HT_BW5                          0x1D2
 #define B43_PHY_HT_BW6                          0x1D3
+#define B43_PHY_HT_TXPCTL_CMD_C1                0x1E7   /* TX power control command */
+#define  B43_PHY_HT_TXPCTL_CMD_C1_INIT          0x007F  /* Init */
+#define  B43_PHY_HT_TXPCTL_CMD_C1_COEFF         0x2000  /* Power control coefficients */
+#define  B43_PHY_HT_TXPCTL_CMD_C1_HWPCTLEN      0x4000  /* Hardware TX power control enable */
+#define  B43_PHY_HT_TXPCTL_CMD_C1_PCTLEN        0x8000  /* TX power control enable */
+#define B43_PHY_HT_TXPCTL_N                     0x1E8   /* TX power control N num */
+#define  B43_PHY_HT_TXPCTL_N_TSSID              0x00FF  /* N TSSI delay */
+#define  B43_PHY_HT_TXPCTL_N_TSSID_SHIFT        0
+#define  B43_PHY_HT_TXPCTL_N_NPTIL2             0x0700  /* N PT integer log2 */
+#define  B43_PHY_HT_TXPCTL_N_NPTIL2_SHIFT       8
+#define B43_PHY_HT_TXPCTL_IDLE_TSSI             0x1E9   /* TX power control idle TSSI */
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI_C1         0x003F
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI_C1_SHIFT   0
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI_C2         0x3F00
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI_C2_SHIFT   8
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI_BINF       0x8000  /* Raw TSSI offset bin format */
+#define B43_PHY_HT_TXPCTL_TARG_PWR              0x1EA   /* TX power control target power */
+#define  B43_PHY_HT_TXPCTL_TARG_PWR_C1          0x00FF  /* Power 0 */
+#define  B43_PHY_HT_TXPCTL_TARG_PWR_C1_SHIFT    0
+#define  B43_PHY_HT_TXPCTL_TARG_PWR_C2          0xFF00  /* Power 1 */
+#define  B43_PHY_HT_TXPCTL_TARG_PWR_C2_SHIFT    8
+#define B43_PHY_HT_TX_PCTL_STATUS_C1            0x1ED
+#define B43_PHY_HT_TX_PCTL_STATUS_C2            0x1EE
+#define B43_PHY_HT_TXPCTL_CMD_C2                0x222
+#define  B43_PHY_HT_TXPCTL_CMD_C2_INIT          0x007F
+#define B43_PHY_HT_RSSI_C1                      0x219
+#define B43_PHY_HT_RSSI_C2                      0x21A
+#define B43_PHY_HT_RSSI_C3                      0x21B
 
 #define B43_PHY_HT_C1_CLIP1THRES                B43_PHY_OFDM(0x00E)
 #define B43_PHY_HT_C2_CLIP1THRES                B43_PHY_OFDM(0x04E)
 #define B43_PHY_HT_C3_CLIP1THRES                B43_PHY_OFDM(0x08E)
 
 #define B43_PHY_HT_RF_SEQ_MODE                  B43_PHY_EXTG(0x000)
+#define  B43_PHY_HT_RF_SEQ_MODE_CA_OVER         0x0001  /* Core active override */
+#define  B43_PHY_HT_RF_SEQ_MODE_TR_OVER         0x0002  /* Trigger override */
 #define B43_PHY_HT_RF_SEQ_TRIG                  B43_PHY_EXTG(0x003)
 #define  B43_PHY_HT_RF_SEQ_TRIG_RX2TX           0x0001 /* RX2TX */
 #define  B43_PHY_HT_RF_SEQ_TRIG_TX2RX           0x0002 /* TX2RX */
@@ -36,12 +83,28 @@
 
 #define B43_PHY_HT_RF_CTL1                      B43_PHY_EXTG(0x010)
 
-#define B43_PHY_HT_AFE_CTL1                     B43_PHY_EXTG(0x110)
-#define B43_PHY_HT_AFE_CTL2                     B43_PHY_EXTG(0x111)
-#define B43_PHY_HT_AFE_CTL3                     B43_PHY_EXTG(0x114)
-#define B43_PHY_HT_AFE_CTL4                     B43_PHY_EXTG(0x115)
-#define B43_PHY_HT_AFE_CTL5                     B43_PHY_EXTG(0x118)
-#define B43_PHY_HT_AFE_CTL6                     B43_PHY_EXTG(0x119)
+#define B43_PHY_HT_RF_CTL_INT_C1                B43_PHY_EXTG(0x04c)
+#define B43_PHY_HT_RF_CTL_INT_C2                B43_PHY_EXTG(0x06c)
+#define B43_PHY_HT_RF_CTL_INT_C3                B43_PHY_EXTG(0x08c)
+
+#define B43_PHY_HT_AFE_C1_OVER                  B43_PHY_EXTG(0x110)
+#define B43_PHY_HT_AFE_C1                       B43_PHY_EXTG(0x111)
+#define B43_PHY_HT_AFE_C2_OVER                  B43_PHY_EXTG(0x114)
+#define B43_PHY_HT_AFE_C2                       B43_PHY_EXTG(0x115)
+#define B43_PHY_HT_AFE_C3_OVER                  B43_PHY_EXTG(0x118)
+#define B43_PHY_HT_AFE_C3                       B43_PHY_EXTG(0x119)
+
+#define B43_PHY_HT_TXPCTL_CMD_C3                B43_PHY_EXTG(0x164)
+#define  B43_PHY_HT_TXPCTL_CMD_C3_INIT          0x007F
+#define B43_PHY_HT_TXPCTL_IDLE_TSSI2            B43_PHY_EXTG(0x165)     /* TX power control idle TSSI */
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI2_C3        0x003F
+#define  B43_PHY_HT_TXPCTL_IDLE_TSSI2_C3_SHIFT  0
+#define B43_PHY_HT_TXPCTL_TARG_PWR2             B43_PHY_EXTG(0x166)     /* TX power control target power */
+#define  B43_PHY_HT_TXPCTL_TARG_PWR2_C3         0x00FF
+#define  B43_PHY_HT_TXPCTL_TARG_PWR2_C3_SHIFT   0
+#define B43_PHY_HT_TX_PCTL_STATUS_C3            B43_PHY_EXTG(0x169)
+
+#define B43_PHY_HT_TEST                         B43_PHY_N_BMODE(0x00A)
 
 
 /* Values for PHY registers used on channel switching */
@@ -56,6 +119,14 @@ struct b43_phy_ht_channeltab_e_phy {
 
 
 struct b43_phy_ht {
+        u16 rf_ctl_int_save[3];
+
+        bool tx_pwr_ctl;
+        u8 tx_pwr_idx[3];
+
+        s32 bb_mult_save[3];
+
+        u8 idle_tssi[3];
 };
 
 
diff --git a/drivers/net/wireless/b43/phy_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index a13e28ef6246..0bafa3b17035 100644
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -808,8 +808,9 @@ static void b43_phy_lcn_op_switch_analog(struct b43_wldev *dev, bool on)
 static int b43_phy_lcn_op_switch_channel(struct b43_wldev *dev,
                                         unsigned int new_channel)
 {
-        struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
-        enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
+        struct ieee80211_channel *channel = dev->wl->hw->conf.chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&dev->wl->hw->conf.chandef);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
                 if ((new_channel < 1) || (new_channel > 14))
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index 3ae28561f7a4..92190dacf689 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -104,14 +104,8 @@ static void lpphy_read_band_sprom(struct b43_wldev *dev)
                 maxpwr = sprom->maxpwr_bg;
                 lpphy->max_tx_pwr_med_band = maxpwr;
                 cckpo = sprom->cck2gpo;
-                /*
-                 * We don't read SPROM's opo as specs say. On rev8 SPROMs
-                 * opo == ofdm2gpo and we don't know any SSB with LP-PHY
-                 * and SPROM rev below 8.
-                 */
-                B43_WARN_ON(sprom->revision < 8);
-                ofdmpo = sprom->ofdm2gpo;
                 if (cckpo) {
+                        ofdmpo = sprom->ofdm2gpo;
                         for (i = 0; i < 4; i++) {
                                 lpphy->tx_max_rate[i] =
                                         maxpwr - (ofdmpo & 0xF) * 2;
@@ -124,11 +118,11 @@ static void lpphy_read_band_sprom(struct b43_wldev *dev)
                                 ofdmpo >>= 4;
                         }
                 } else {
-                        ofdmpo &= 0xFF;
+                        u8 opo = sprom->opo;
                         for (i = 0; i < 4; i++)
                                 lpphy->tx_max_rate[i] = maxpwr;
                         for (i = 4; i < 15; i++)
-                                lpphy->tx_max_rate[i] = maxpwr - ofdmpo;
+                                lpphy->tx_max_rate[i] = maxpwr - opo;
                 }
         } else { /* 5GHz */
                 lpphy->tx_isolation_low_band = sprom->tri5gl;
@@ -287,8 +281,8 @@ static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev)
                 b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_8, 0xFFC0, 0x000A);
                 b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_8, 0xC0FF, 0x0B00);
         } else if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ ||
-                  (dev->dev->board_type == 0x048A) || ((dev->phy.rev == 0) &&
-                  (sprom->boardflags_lo & B43_BFL_FEM))) {
+                   (dev->dev->board_type == SSB_BOARD_BU4312) ||
+                   (dev->phy.rev == 0 && (sprom->boardflags_lo & B43_BFL_FEM))) {
                 b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_1, 0xFFC0, 0x0001);
                 b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_1, 0xC0FF, 0x0400);
                 b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_2, 0xFFC0, 0x0001);
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index b70f220bc4b3..7c970d3ae358 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -69,14 +69,27 @@ enum b43_nphy_rf_sequence {
         B43_RFSEQ_UPDATE_GAINU,
 };
 
-enum b43_nphy_rssi_type {
-        B43_NPHY_RSSI_X = 0,
-        B43_NPHY_RSSI_Y,
-        B43_NPHY_RSSI_Z,
-        B43_NPHY_RSSI_PWRDET,
-        B43_NPHY_RSSI_TSSI_I,
-        B43_NPHY_RSSI_TSSI_Q,
-        B43_NPHY_RSSI_TBD,
+enum n_intc_override {
+        N_INTC_OVERRIDE_OFF = 0,
+        N_INTC_OVERRIDE_TRSW = 1,
+        N_INTC_OVERRIDE_PA = 2,
+        N_INTC_OVERRIDE_EXT_LNA_PU = 3,
+        N_INTC_OVERRIDE_EXT_LNA_GAIN = 4,
+};
+
+enum n_rssi_type {
+        N_RSSI_W1 = 0,
+        N_RSSI_W2,
+        N_RSSI_NB,
+        N_RSSI_IQ,
+        N_RSSI_TSSI_2G,
+        N_RSSI_TSSI_5G,
+        N_RSSI_TBD,
+};
+
+enum n_rail_type {
+        N_RAIL_I = 0,
+        N_RAIL_Q = 1,
 };
 
 static inline bool b43_nphy_ipa(struct b43_wldev *dev)
@@ -94,7 +107,7 @@ static u8 b43_nphy_get_rx_core_state(struct b43_wldev *dev)
 }
 
 /**************************************************
- * RF (just without b43_nphy_rf_control_intc_override)
+ * RF (just without b43_nphy_rf_ctl_intc_override)
  **************************************************/
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ForceRFSeq */
@@ -128,9 +141,9 @@ ok:
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlOverrideRev7 */
-static void b43_nphy_rf_control_override_rev7(struct b43_wldev *dev, u16 field,
-                                              u16 value, u8 core, bool off,
-                                              u8 override)
+static void b43_nphy_rf_ctl_override_rev7(struct b43_wldev *dev, u16 field,
+                                          u16 value, u8 core, bool off,
+                                          u8 override)
 {
         const struct nphy_rf_control_override_rev7 *e;
         u16 en_addrs[3][2] = {
@@ -168,8 +181,8 @@ static void b43_nphy_rf_control_override_rev7(struct b43_wldev *dev, u16 field,
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlOverride */
-static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,
-                                                u16 value, u8 core, bool off)
+static void b43_nphy_rf_ctl_override(struct b43_wldev *dev, u16 field,
+                                     u16 value, u8 core, bool off)
 {
         int i;
         u8 index = fls(field);
@@ -244,14 +257,14 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlIntcOverride */
-static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
-                                                u16 value, u8 core)
+static void b43_nphy_rf_ctl_intc_override(struct b43_wldev *dev,
+                                          enum n_intc_override intc_override,
+                                          u16 value, u8 core)
 {
         u8 i, j;
         u16 reg, tmp, val;
 
         B43_WARN_ON(dev->phy.rev < 3);
-        B43_WARN_ON(field > 4);
 
         for (i = 0; i < 2; i++) {
                 if ((core == 1 && i == 1) || (core == 2 && !i))
@@ -261,12 +274,12 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                         B43_NPHY_RFCTL_INTC1 : B43_NPHY_RFCTL_INTC2;
                 b43_phy_set(dev, reg, 0x400);
 
-                switch (field) {
-                case 0:
+                switch (intc_override) {
+                case N_INTC_OVERRIDE_OFF:
                         b43_phy_write(dev, reg, 0);
                         b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
                         break;
-                case 1:
+                case N_INTC_OVERRIDE_TRSW:
                         if (!i) {
                                 b43_phy_maskset(dev, B43_NPHY_RFCTL_INTC1,
                                                 0xFC3F, (value << 6));
@@ -307,7 +320,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                                                 0xFFFE);
                         }
                         break;
-                case 2:
+                case N_INTC_OVERRIDE_PA:
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
                                 tmp = 0x0020;
                                 val = value << 5;
@@ -317,7 +330,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                         }
                         b43_phy_maskset(dev, reg, ~tmp, val);
                         break;
-                case 3:
+                case N_INTC_OVERRIDE_EXT_LNA_PU:
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
                                 tmp = 0x0001;
                                 val = value;
@@ -327,7 +340,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                         }
                         b43_phy_maskset(dev, reg, ~tmp, val);
                         break;
-                case 4:
+                case N_INTC_OVERRIDE_EXT_LNA_GAIN:
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
                                 tmp = 0x0002;
                                 val = value << 1;
@@ -1011,7 +1024,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
 
         if (sprom->revision < 4)
                 workaround = (dev->dev->board_vendor != PCI_VENDOR_ID_BROADCOM
-                              && dev->dev->board_type == 0x46D
+                              && dev->dev->board_type == SSB_BOARD_CB2_4321
                               && dev->dev->board_rev >= 0x41);
         else
                 workaround =
@@ -1207,8 +1220,9 @@ static void b43_nphy_run_samples(struct b43_wldev *dev, u16 samps, u16 loops,
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ScaleOffsetRssi */
 static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
-                                        s8 offset, u8 core, u8 rail,
-                                        enum b43_nphy_rssi_type type)
+                                        s8 offset, u8 core,
+                                        enum n_rail_type rail,
+                                        enum n_rssi_type rssi_type)
 {
         u16 tmp;
         bool core1or5 = (core == 1) || (core == 5);
@@ -1217,63 +1231,74 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
         offset = clamp_val(offset, -32, 31);
         tmp = ((scale & 0x3F) << 8) | (offset & 0x3F);
 
-        if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_Z))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, tmp);
-        if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_Z))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z, tmp);
-        if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_Z))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Z, tmp);
-        if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_Z))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, tmp);
-
-        if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_X))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, tmp);
-        if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_X))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_X, tmp);
-        if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_X))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_X, tmp);
-        if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_X))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, tmp);
-
-        if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_Y))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, tmp);
-        if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_Y))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y, tmp);
-        if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_Y))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Y, tmp);
-        if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_Y))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, tmp);
-
-        if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_TBD))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TBD, tmp);
-        if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_TBD))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TBD, tmp);
-        if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_TBD))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TBD, tmp);
-        if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_TBD))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TBD, tmp);
-
-        if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_PWRDET))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0I_PWRDET, tmp);
-        if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_PWRDET))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_PWRDET, tmp);
-        if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_PWRDET))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1I_PWRDET, tmp);
-        if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_PWRDET))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_PWRDET, tmp);
-
-        if (core1or5 && (type == B43_NPHY_RSSI_TSSI_I))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TSSI, tmp);
-        if (core2or5 && (type == B43_NPHY_RSSI_TSSI_I))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TSSI, tmp);
-
-        if (core1or5 && (type == B43_NPHY_RSSI_TSSI_Q))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TSSI, tmp);
-        if (core2or5 && (type == B43_NPHY_RSSI_TSSI_Q))
-                b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TSSI, tmp);
+        switch (rssi_type) {
+        case N_RSSI_NB:
+                if (core1or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, tmp);
+                if (core1or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z, tmp);
+                if (core2or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Z, tmp);
+                if (core2or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, tmp);
+                break;
+        case N_RSSI_W1:
+                if (core1or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, tmp);
+                if (core1or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_X, tmp);
+                if (core2or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_X, tmp);
+                if (core2or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, tmp);
+                break;
+        case N_RSSI_W2:
+                if (core1or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, tmp);
+                if (core1or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y, tmp);
+                if (core2or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Y, tmp);
+                if (core2or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, tmp);
+                break;
+        case N_RSSI_TBD:
+                if (core1or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TBD, tmp);
+                if (core1or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TBD, tmp);
+                if (core2or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TBD, tmp);
+                if (core2or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TBD, tmp);
+                break;
+        case N_RSSI_IQ:
+                if (core1or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0I_PWRDET, tmp);
+                if (core1or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_PWRDET, tmp);
+                if (core2or5 && rail == N_RAIL_I)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1I_PWRDET, tmp);
+                if (core2or5 && rail == N_RAIL_Q)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_PWRDET, tmp);
+                break;
+        case N_RSSI_TSSI_2G:
+                if (core1or5)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TSSI, tmp);
+                if (core2or5)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TSSI, tmp);
+                break;
+        case N_RSSI_TSSI_5G:
+                if (core1or5)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TSSI, tmp);
+                if (core2or5)
+                        b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TSSI, tmp);
+                break;
+        }
 }
 
-static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
+static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code,
+                                      enum n_rssi_type rssi_type)
 {
         u8 i;
         u16 reg, val;
@@ -1296,7 +1321,9 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
                                 B43_NPHY_AFECTL_OVER1 : B43_NPHY_AFECTL_OVER;
                         b43_phy_maskset(dev, reg, 0xFDFF, 0x0200);
 
-                        if (type < 3) {
+                        if (rssi_type == N_RSSI_W1 ||
+                            rssi_type == N_RSSI_W2 ||
+                            rssi_type == N_RSSI_NB) {
                                 reg = (i == 0) ?
                                         B43_NPHY_AFECTL_C1 :
                                         B43_NPHY_AFECTL_C2;
@@ -1307,9 +1334,9 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
                                         B43_NPHY_RFCTL_LUT_TRSW_UP2;
                                 b43_phy_maskset(dev, reg, 0xFFC3, 0);
 
-                                if (type == 0)
+                                if (rssi_type == N_RSSI_W1)
                                         val = (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) ? 4 : 8;
-                                else if (type == 1)
+                                else if (rssi_type == N_RSSI_W2)
                                         val = 16;
                                 else
                                         val = 32;
@@ -1320,9 +1347,9 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
                                         B43_NPHY_TXF_40CO_B32S1;
                                 b43_phy_set(dev, reg, 0x0020);
                         } else {
-                                if (type == 6)
+                                if (rssi_type == N_RSSI_TBD)
                                         val = 0x0100;
-                                else if (type == 3)
+                                else if (rssi_type == N_RSSI_IQ)
                                         val = 0x0200;
                                 else
                                         val = 0x0300;
@@ -1334,7 +1361,8 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
                                 b43_phy_maskset(dev, reg, 0xFCFF, val);
                                 b43_phy_maskset(dev, reg, 0xF3FF, val << 2);
 
-                                if (type != 3 && type != 6) {
+                                if (rssi_type != N_RSSI_IQ &&
+                                    rssi_type != N_RSSI_TBD) {
                                         enum ieee80211_band band =
                                                 b43_current_band(dev->wl);
 
@@ -1344,7 +1372,7 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
                                                 val = 0x11;
                                         reg = (i == 0) ? 0x2000 : 0x3000;
                                         reg |= B2055_PADDRV;
-                                        b43_radio_write16(dev, reg, val);
+                                        b43_radio_write(dev, reg, val);
 
                                         reg = (i == 0) ?
                                                 B43_NPHY_AFECTL_OVER1 :
@@ -1356,33 +1384,43 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
         }
 }
 
-static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
+static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code,
+                                      enum n_rssi_type rssi_type)
 {
         u16 val;
+        bool rssi_w1_w2_nb = false;
 
-        if (type < 3)
+        switch (rssi_type) {
+        case N_RSSI_W1:
+        case N_RSSI_W2:
+        case N_RSSI_NB:
                 val = 0;
-        else if (type == 6)
+                rssi_w1_w2_nb = true;
+                break;
+        case N_RSSI_TBD:
                 val = 1;
-        else if (type == 3)
+                break;
+        case N_RSSI_IQ:
                 val = 2;
-        else
+                break;
+        default:
                 val = 3;
+        }
 
         val = (val << 12) | (val << 14);
         b43_phy_maskset(dev, B43_NPHY_AFECTL_C1, 0x0FFF, val);
         b43_phy_maskset(dev, B43_NPHY_AFECTL_C2, 0x0FFF, val);
 
-        if (type < 3) {
+        if (rssi_w1_w2_nb) {
                 b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO1, 0xFFCF,
-                                (type + 1) << 4);
+                                (rssi_type + 1) << 4);
                 b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO2, 0xFFCF,
-                                (type + 1) << 4);
+                                (rssi_type + 1) << 4);
         }
 
         if (code == 0) {
                 b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x3000);
-                if (type < 3) {
+                if (rssi_w1_w2_nb) {
                         b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,
                                 ~(B43_NPHY_RFCTL_CMD_RXEN |
                                   B43_NPHY_RFCTL_CMD_CORESEL));
@@ -1398,7 +1436,7 @@ static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
                 }
         } else {
                 b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x3000);
-                if (type < 3) {
+                if (rssi_w1_w2_nb) {
                         b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD,
                                 ~(B43_NPHY_RFCTL_CMD_RXEN |
                                   B43_NPHY_RFCTL_CMD_CORESEL),
@@ -1418,7 +1456,8 @@ static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSISel */
-static void b43_nphy_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
+static void b43_nphy_rssi_select(struct b43_wldev *dev, u8 code,
+                                 enum n_rssi_type type)
 {
         if (dev->phy.rev >= 3)
                 b43_nphy_rev3_rssi_select(dev, code, type);
@@ -1427,11 +1466,12 @@ static void b43_nphy_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SetRssi2055Vcm */
-static void b43_nphy_set_rssi_2055_vcm(struct b43_wldev *dev, u8 type, u8 *buf)
+static void b43_nphy_set_rssi_2055_vcm(struct b43_wldev *dev,
+                                       enum n_rssi_type rssi_type, u8 *buf)
 {
         int i;
         for (i = 0; i < 2; i++) {
-                if (type == 2) {
+                if (rssi_type == N_RSSI_NB) {
                         if (i == 0) {
                                 b43_radio_maskset(dev, B2055_C1_B0NB_RSSIVCM,
                                                   0xFC, buf[0]);
@@ -1455,8 +1495,8 @@ static void b43_nphy_set_rssi_2055_vcm(struct b43_wldev *dev, u8 type, u8 *buf)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/PollRssi */
-static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
-                                u8 nsamp)
+static int b43_nphy_poll_rssi(struct b43_wldev *dev, enum n_rssi_type rssi_type,
+                              s32 *buf, u8 nsamp)
 {
         int i;
         int out;
@@ -1487,7 +1527,7 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
                 save_regs_phy[8] = 0;
         }
 
-        b43_nphy_rssi_select(dev, 5, type);
+        b43_nphy_rssi_select(dev, 5, rssi_type);
 
         if (dev->phy.rev < 2) {
                 save_regs_phy[8] = b43_phy_read(dev, B43_NPHY_GPIO_SEL);
@@ -1574,7 +1614,7 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
 
         u16 r; /* routing */
         u8 rx_core_state;
-        u8 core, i, j;
+        int core, i, j, vcm;
 
         class = b43_nphy_classifier(dev, 0, 0);
         b43_nphy_classifier(dev, 7, 4);
@@ -1586,19 +1626,19 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
         for (i = 0; i < ARRAY_SIZE(regs_to_store); i++)
                 saved_regs_phy[i] = b43_phy_read(dev, regs_to_store[i]);
 
-        b43_nphy_rf_control_intc_override(dev, 0, 0, 7);
-        b43_nphy_rf_control_intc_override(dev, 1, 1, 7);
-        b43_nphy_rf_control_override(dev, 0x1, 0, 0, false);
-        b43_nphy_rf_control_override(dev, 0x2, 1, 0, false);
-        b43_nphy_rf_control_override(dev, 0x80, 1, 0, false);
-        b43_nphy_rf_control_override(dev, 0x40, 1, 0, false);
+        b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_OFF, 0, 7);
+        b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_TRSW, 1, 7);
+        b43_nphy_rf_ctl_override(dev, 0x1, 0, 0, false);
+        b43_nphy_rf_ctl_override(dev, 0x2, 1, 0, false);
+        b43_nphy_rf_ctl_override(dev, 0x80, 1, 0, false);
+        b43_nphy_rf_ctl_override(dev, 0x40, 1, 0, false);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
-                b43_nphy_rf_control_override(dev, 0x20, 0, 0, false);
-                b43_nphy_rf_control_override(dev, 0x10, 1, 0, false);
+                b43_nphy_rf_ctl_override(dev, 0x20, 0, 0, false);
+                b43_nphy_rf_ctl_override(dev, 0x10, 1, 0, false);
         } else {
-                b43_nphy_rf_control_override(dev, 0x10, 0, 0, false);
-                b43_nphy_rf_control_override(dev, 0x20, 1, 0, false);
+                b43_nphy_rf_ctl_override(dev, 0x10, 0, 0, false);
+                b43_nphy_rf_ctl_override(dev, 0x20, 1, 0, false);
         }
 
         rx_core_state = b43_nphy_get_rx_core_state(dev);
@@ -1606,35 +1646,44 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
                 if (!(rx_core_state & (1 << core)))
                         continue;
                 r = core ? B2056_RX1 : B2056_RX0;
-                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 0, 2);
-                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 1, 2);
-                for (i = 0; i < 8; i++) {
+                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, N_RAIL_I,
+                                           N_RSSI_NB);
+                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, N_RAIL_Q,
+                                           N_RSSI_NB);
+
+                /* Grab RSSI results for every possible VCM */
+                for (vcm = 0; vcm < 8; vcm++) {
                         b43_radio_maskset(dev, r | B2056_RX_RSSI_MISC, 0xE3,
-                                        i << 2);
-                        b43_nphy_poll_rssi(dev, 2, results[i], 8);
+                                        vcm << 2);
+                        b43_nphy_poll_rssi(dev, N_RSSI_NB, results[vcm], 8);
                 }
+
+                /* Find out which VCM got the best results */
                 for (i = 0; i < 4; i += 2) {
-                        s32 curr;
+                        s32 currd;
                         s32 mind = 0x100000;
                         s32 minpoll = 249;
                         u8 minvcm = 0;
                         if (2 * core != i)
                                 continue;
-                        for (j = 0; j < 8; j++) {
-                                curr = results[j][i] * results[j][i] +
-                                        results[j][i + 1] * results[j][i];
-                                if (curr < mind) {
-                                        mind = curr;
-                                        minvcm = j;
+                        for (vcm = 0; vcm < 8; vcm++) {
+                                currd = results[vcm][i] * results[vcm][i] +
+                                        results[vcm][i + 1] * results[vcm][i];
+                                if (currd < mind) {
+                                        mind = currd;
+                                        minvcm = vcm;
                                 }
-                                if (results[j][i] < minpoll)
-                                        minpoll = results[j][i];
+                                if (results[vcm][i] < minpoll)
+                                        minpoll = results[vcm][i];
                         }
                         vcm_final = minvcm;
                         results_min[i] = minpoll;
                 }
+
+                /* Select the best VCM */
                 b43_radio_maskset(dev, r | B2056_RX_RSSI_MISC, 0xE3,
                                   vcm_final << 2);
+
                 for (i = 0; i < 4; i++) {
                         if (core != i / 2)
                                 continue;
@@ -1647,16 +1696,19 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
                                 offset[i] = -32;
                         b43_nphy_scale_offset_rssi(dev, 0, offset[i],
                                                    (i / 2 == 0) ? 1 : 2,
-                                                   (i % 2 == 0) ? 0 : 1,
-                                                   2);
+                                                   (i % 2 == 0) ? N_RAIL_I : N_RAIL_Q,
+                                                   N_RSSI_NB);
                 }
         }
+
         for (core = 0; core < 2; core++) {
                 if (!(rx_core_state & (1 << core)))
                         continue;
                 for (i = 0; i < 2; i++) {
-                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 0, i);
-                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 1, i);
+                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1,
+                                                   N_RAIL_I, i);
+                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1,
+                                                   N_RAIL_Q, i);
                         b43_nphy_poll_rssi(dev, i, poll_results, 8);
                         for (j = 0; j < 4; j++) {
                                 if (j / 2 == core) {
@@ -1696,8 +1748,13 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
                 rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_5G;
                 rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G;
         }
-        rssical_radio_regs[0] = b43_radio_read(dev, 0x602B);
-        rssical_radio_regs[0] = b43_radio_read(dev, 0x702B);
+        if (dev->phy.rev >= 7) {
+        } else {
+                rssical_radio_regs[0] = b43_radio_read(dev, B2056_RX0 |
+                                                       B2056_RX_RSSI_MISC);
+                rssical_radio_regs[1] = b43_radio_read(dev, B2056_RX1 |
+                                                       B2056_RX_RSSI_MISC);
+        }
         rssical_phy_regs[0] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_Z);
         rssical_phy_regs[1] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z);
         rssical_phy_regs[2] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_Z);
@@ -1723,9 +1780,9 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal */
-static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
+static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, enum n_rssi_type type)
 {
-        int i, j;
+        int i, j, vcm;
         u8 state[4];
         u8 code, val;
         u16 class, override;
@@ -1743,10 +1800,10 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
         s32 results[4][4] = { };
         s32 miniq[4][2] = { };
 
-        if (type == 2) {
+        if (type == N_RSSI_NB) {
                 code = 0;
                 val = 6;
-        } else if (type < 2) {
+        } else if (type == N_RSSI_W1 || type == N_RSSI_W2) {
                 code = 25;
                 val = 4;
         } else {
@@ -1765,63 +1822,63 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
                 override = 0x110;
 
         regs_save_phy[0] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);
-        regs_save_radio[0] = b43_radio_read16(dev, B2055_C1_PD_RXTX);
+        regs_save_radio[0] = b43_radio_read(dev, B2055_C1_PD_RXTX);
         b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, override);
-        b43_radio_write16(dev, B2055_C1_PD_RXTX, val);
+        b43_radio_write(dev, B2055_C1_PD_RXTX, val);
 
         regs_save_phy[1] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2);
-        regs_save_radio[1] = b43_radio_read16(dev, B2055_C2_PD_RXTX);
+        regs_save_radio[1] = b43_radio_read(dev, B2055_C2_PD_RXTX);
         b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, override);
-        b43_radio_write16(dev, B2055_C2_PD_RXTX, val);
+        b43_radio_write(dev, B2055_C2_PD_RXTX, val);
 
-        state[0] = b43_radio_read16(dev, B2055_C1_PD_RSSIMISC) & 0x07;
-        state[1] = b43_radio_read16(dev, B2055_C2_PD_RSSIMISC) & 0x07;
+        state[0] = b43_radio_read(dev, B2055_C1_PD_RSSIMISC) & 0x07;
+        state[1] = b43_radio_read(dev, B2055_C2_PD_RSSIMISC) & 0x07;
         b43_radio_mask(dev, B2055_C1_PD_RSSIMISC, 0xF8);
         b43_radio_mask(dev, B2055_C2_PD_RSSIMISC, 0xF8);
-        state[2] = b43_radio_read16(dev, B2055_C1_SP_RSSI) & 0x07;
-        state[3] = b43_radio_read16(dev, B2055_C2_SP_RSSI) & 0x07;
+        state[2] = b43_radio_read(dev, B2055_C1_SP_RSSI) & 0x07;
+        state[3] = b43_radio_read(dev, B2055_C2_SP_RSSI) & 0x07;
 
         b43_nphy_rssi_select(dev, 5, type);
-        b43_nphy_scale_offset_rssi(dev, 0, 0, 5, 0, type);
-        b43_nphy_scale_offset_rssi(dev, 0, 0, 5, 1, type);
+        b43_nphy_scale_offset_rssi(dev, 0, 0, 5, N_RAIL_I, type);
+        b43_nphy_scale_offset_rssi(dev, 0, 0, 5, N_RAIL_Q, type);
 
-        for (i = 0; i < 4; i++) {
+        for (vcm = 0; vcm < 4; vcm++) {
                 u8 tmp[4];
                 for (j = 0; j < 4; j++)
-                        tmp[j] = i;
-                if (type != 1)
+                        tmp[j] = vcm;
+                if (type != N_RSSI_W2)
                         b43_nphy_set_rssi_2055_vcm(dev, type, tmp);
-                b43_nphy_poll_rssi(dev, type, results[i], 8);
-                if (type < 2)
+                b43_nphy_poll_rssi(dev, type, results[vcm], 8);
+                if (type == N_RSSI_W1 || type == N_RSSI_W2)
                         for (j = 0; j < 2; j++)
-                                miniq[i][j] = min(results[i][2 * j],
-                                                results[i][2 * j + 1]);
+                                miniq[vcm][j] = min(results[vcm][2 * j],
+                                                    results[vcm][2 * j + 1]);
         }
 
         for (i = 0; i < 4; i++) {
                 s32 mind = 0x100000;
                 u8 minvcm = 0;
                 s32 minpoll = 249;
-                s32 curr;
-                for (j = 0; j < 4; j++) {
-                        if (type == 2)
-                                curr = abs(results[j][i]);
+                s32 currd;
+                for (vcm = 0; vcm < 4; vcm++) {
+                        if (type == N_RSSI_NB)
+                                currd = abs(results[vcm][i] - code * 8);
                         else
-                                curr = abs(miniq[j][i / 2] - code * 8);
+                                currd = abs(miniq[vcm][i / 2] - code * 8);
 
-                        if (curr < mind) {
-                                mind = curr;
-                                minvcm = j;
+                        if (currd < mind) {
+                                mind = currd;
+                                minvcm = vcm;
                         }
 
-                        if (results[j][i] < minpoll)
-                                minpoll = results[j][i];
+                        if (results[vcm][i] < minpoll)
+                                minpoll = results[vcm][i];
                 }
                 results_min[i] = minpoll;
                 vcm_final[i] = minvcm;
         }
 
-        if (type != 1)
+        if (type != N_RSSI_W2)
                 b43_nphy_set_rssi_2055_vcm(dev, type, vcm_final);
 
         for (i = 0; i < 4; i++) {
@@ -1836,7 +1893,7 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
                         offset[i] = code - 32;
 
                 core = (i / 2) ? 2 : 1;
-                rail = (i % 2) ? 1 : 0;
+                rail = (i % 2) ? N_RAIL_Q : N_RAIL_I;
 
                 b43_nphy_scale_offset_rssi(dev, 0, offset[i], core, rail,
                                                 type);
@@ -1847,37 +1904,37 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
 
         switch (state[2]) {
         case 1:
-                b43_nphy_rssi_select(dev, 1, 2);
+                b43_nphy_rssi_select(dev, 1, N_RSSI_NB);
                 break;
         case 4:
-                b43_nphy_rssi_select(dev, 1, 0);
+                b43_nphy_rssi_select(dev, 1, N_RSSI_W1);
                 break;
         case 2:
-                b43_nphy_rssi_select(dev, 1, 1);
+                b43_nphy_rssi_select(dev, 1, N_RSSI_W2);
                 break;
         default:
-                b43_nphy_rssi_select(dev, 1, 1);
+                b43_nphy_rssi_select(dev, 1, N_RSSI_W2);
                 break;
         }
 
         switch (state[3]) {
         case 1:
-                b43_nphy_rssi_select(dev, 2, 2);
+                b43_nphy_rssi_select(dev, 2, N_RSSI_NB);
                 break;
         case 4:
-                b43_nphy_rssi_select(dev, 2, 0);
+                b43_nphy_rssi_select(dev, 2, N_RSSI_W1);
                 break;
         default:
-                b43_nphy_rssi_select(dev, 2, 1);
+                b43_nphy_rssi_select(dev, 2, N_RSSI_W2);
                 break;
         }
 
         b43_nphy_rssi_select(dev, 0, type);
 
         b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, regs_save_phy[0]);
-        b43_radio_write16(dev, B2055_C1_PD_RXTX, regs_save_radio[0]);
+        b43_radio_write(dev, B2055_C1_PD_RXTX, regs_save_radio[0]);
         b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, regs_save_phy[1]);
-        b43_radio_write16(dev, B2055_C2_PD_RXTX, regs_save_radio[1]);
+        b43_radio_write(dev, B2055_C2_PD_RXTX, regs_save_radio[1]);
 
         b43_nphy_classifier(dev, 7, class);
         b43_nphy_write_clip_detection(dev, clip_state);
@@ -1895,9 +1952,9 @@ static void b43_nphy_rssi_cal(struct b43_wldev *dev)
         if (dev->phy.rev >= 3) {
                 b43_nphy_rev3_rssi_cal(dev);
         } else {
-                b43_nphy_rev2_rssi_cal(dev, B43_NPHY_RSSI_Z);
-                b43_nphy_rev2_rssi_cal(dev, B43_NPHY_RSSI_X);
-                b43_nphy_rev2_rssi_cal(dev, B43_NPHY_RSSI_Y);
+                b43_nphy_rev2_rssi_cal(dev, N_RSSI_NB);
+                b43_nphy_rev2_rssi_cal(dev, N_RSSI_W1);
+                b43_nphy_rev2_rssi_cal(dev, N_RSSI_W2);
         }
 }
 
@@ -1930,10 +1987,8 @@ static void b43_nphy_gain_ctl_workarounds_rev3plus(struct b43_wldev *dev)
         b43_phy_set(dev, B43_NPHY_RXCTL, 0x0040);
 
         /* Set Clip 2 detect */
-        b43_phy_set(dev, B43_NPHY_C1_CGAINI,
-                        B43_NPHY_C1_CGAINI_CL2DETECT);
-        b43_phy_set(dev, B43_NPHY_C2_CGAINI,
-                        B43_NPHY_C2_CGAINI_CL2DETECT);
+        b43_phy_set(dev, B43_NPHY_C1_CGAINI, B43_NPHY_C1_CGAINI_CL2DETECT);
+        b43_phy_set(dev, B43_NPHY_C2_CGAINI, B43_NPHY_C2_CGAINI_CL2DETECT);
 
         b43_radio_write(dev, B2056_RX0 | B2056_RX_BIASPOLE_LNAG1_IDAC,
                         0x17);
@@ -1967,22 +2022,22 @@ static void b43_nphy_gain_ctl_workarounds_rev3plus(struct b43_wldev *dev)
         b43_ntab_write_bulk(dev, B43_NTAB8(2, 0x40), 6, lpf_bits);
         b43_ntab_write_bulk(dev, B43_NTAB8(3, 0x40), 6, lpf_bits);
 
-        b43_phy_write(dev, B43_NPHY_C1_INITGAIN, e->init_gain);
-        b43_phy_write(dev, 0x2A7, e->init_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C1_INITGAIN_A, e->init_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C2_INITGAIN_A, e->init_gain);
+
         b43_ntab_write_bulk(dev, B43_NTAB16(7, 0x106), 2,
                                 e->rfseq_init);
 
-        /* TODO: check defines. Do not match variables names */
-        b43_phy_write(dev, B43_NPHY_C1_CLIP1_MEDGAIN, e->cliphi_gain);
-        b43_phy_write(dev, 0x2A9, e->cliphi_gain);
-        b43_phy_write(dev, B43_NPHY_C1_CLIP2_GAIN, e->clipmd_gain);
-        b43_phy_write(dev, 0x2AB, e->clipmd_gain);
-        b43_phy_write(dev, B43_NPHY_C2_CLIP1_HIGAIN, e->cliplo_gain);
-        b43_phy_write(dev, 0x2AD, e->cliplo_gain);
-
-        b43_phy_maskset(dev, 0x27D, 0xFF00, e->crsmin);
-        b43_phy_maskset(dev, 0x280, 0xFF00, e->crsminl);
-        b43_phy_maskset(dev, 0x283, 0xFF00, e->crsminu);
+        b43_phy_write(dev, B43_NPHY_REV3_C1_CLIP_HIGAIN_A, e->cliphi_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C2_CLIP_HIGAIN_A, e->cliphi_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C1_CLIP_MEDGAIN_A, e->clipmd_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C2_CLIP_MEDGAIN_A, e->clipmd_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C1_CLIP_LOGAIN_A, e->cliplo_gain);
+        b43_phy_write(dev, B43_NPHY_REV3_C2_CLIP_LOGAIN_A, e->cliplo_gain);
+
+        b43_phy_maskset(dev, B43_NPHY_CRSMINPOWER0, 0xFF00, e->crsmin);
+        b43_phy_maskset(dev, B43_NPHY_CRSMINPOWERL0, 0xFF00, e->crsminl);
+        b43_phy_maskset(dev, B43_NPHY_CRSMINPOWERU0, 0xFF00, e->crsminu);
         b43_phy_write(dev, B43_NPHY_C1_NBCLIPTHRES, e->nbclip);
         b43_phy_write(dev, B43_NPHY_C2_NBCLIPTHRES, e->nbclip);
         b43_phy_maskset(dev, B43_NPHY_C1_CLIPWBTHRES,
@@ -2164,8 +2219,8 @@ static void b43_nphy_workarounds_rev7plus(struct b43_wldev *dev)
                 b43_phy_maskset(dev, B43_NPHY_FREQGAIN7, 0x80FF, 0x4000);
         }
         if (phy->rev <= 8) {
-                b43_phy_write(dev, 0x23F, 0x1B0);
-                b43_phy_write(dev, 0x240, 0x1B0);
+                b43_phy_write(dev, B43_NPHY_FORCEFRONT0, 0x1B0);
+                b43_phy_write(dev, B43_NPHY_FORCEFRONT1, 0x1B0);
         }
         if (phy->rev >= 8)
                 b43_phy_maskset(dev, B43_NPHY_TXTAILCNT, ~0xFF, 0x72);
@@ -2182,8 +2237,8 @@ static void b43_nphy_workarounds_rev7plus(struct b43_wldev *dev)
                 b43_nphy_set_rf_sequence(dev, 0, rx2tx_events_ipa,
                                 rx2tx_delays_ipa, ARRAY_SIZE(rx2tx_events_ipa));
 
-        b43_phy_maskset(dev, 0x299, 0x3FFF, 0x4000);
-        b43_phy_maskset(dev, 0x29D, 0x3FFF, 0x4000);
+        b43_phy_maskset(dev, B43_NPHY_EPS_OVERRIDEI_0, 0x3FFF, 0x4000);
+        b43_phy_maskset(dev, B43_NPHY_EPS_OVERRIDEI_1, 0x3FFF, 0x4000);
 
         lpf_20 = b43_nphy_read_lpf_ctl(dev, 0x154);
         lpf_40 = b43_nphy_read_lpf_ctl(dev, 0x159);
@@ -2260,11 +2315,11 @@ static void b43_nphy_workarounds_rev7plus(struct b43_wldev *dev)
                         b43_ntab_write(dev, B43_NTAB16(7, 0x159 + core * 16),
                                        rx2tx_lut_40_11n);
                 }
-                b43_nphy_rf_control_override_rev7(dev, 16, 1, 3, false, 2);
+                b43_nphy_rf_ctl_override_rev7(dev, 16, 1, 3, false, 2);
         }
         b43_phy_write(dev, 0x32F, 0x3);
         if (phy->radio_rev == 4 || phy->radio_rev == 6)
-                b43_nphy_rf_control_override_rev7(dev, 4, 1, 3, false, 0);
+                b43_nphy_rf_ctl_override_rev7(dev, 4, 1, 3, false, 0);
 
         if (phy->radio_rev == 3 || phy->radio_rev == 4 || phy->radio_rev == 6) {
                 if (sprom->revision &&
@@ -2450,8 +2505,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         u16 tmp16;
         u32 tmp32;
 
-        b43_phy_write(dev, 0x23f, 0x1f8);
-        b43_phy_write(dev, 0x240, 0x1f8);
+        b43_phy_write(dev, B43_NPHY_FORCEFRONT0, 0x1f8);
+        b43_phy_write(dev, B43_NPHY_FORCEFRONT1, 0x1f8);
 
         tmp32 = b43_ntab_read(dev, B43_NTAB32(30, 0));
         tmp32 &= 0xffffff;
@@ -2464,8 +2519,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         b43_phy_write(dev, B43_NPHY_PHASETR_B1, 0x00CD);
         b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x0020);
 
-        b43_phy_write(dev, B43_NPHY_C2_CLIP1_MEDGAIN, 0x000C);
-        b43_phy_write(dev, 0x2AE, 0x000C);
+        b43_phy_write(dev, B43_NPHY_REV3_C1_CLIP_LOGAIN_B, 0x000C);
+        b43_phy_write(dev, B43_NPHY_REV3_C2_CLIP_LOGAIN_B, 0x000C);
 
         /* TX to RX */
         b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays,
@@ -2490,7 +2545,7 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
                 0x2 : 0x9C40;
         b43_phy_write(dev, B43_NPHY_ENDROP_TLEN, tmp16);
 
-        b43_phy_maskset(dev, 0x294, 0xF0FF, 0x0700);
+        b43_phy_maskset(dev, B43_NPHY_SGILTRNOFFSET, 0xF0FF, 0x0700);
 
         if (!dev->phy.is_40mhz) {
                 b43_ntab_write(dev, B43_NTAB32(16, 3), 0x18D);
@@ -2542,18 +2597,18 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         }
 
         /* Dropped probably-always-true condition */
-        b43_phy_write(dev, 0x224, 0x03eb);
-        b43_phy_write(dev, 0x225, 0x03eb);
-        b43_phy_write(dev, 0x226, 0x0341);
-        b43_phy_write(dev, 0x227, 0x0341);
-        b43_phy_write(dev, 0x228, 0x042b);
-        b43_phy_write(dev, 0x229, 0x042b);
-        b43_phy_write(dev, 0x22a, 0x0381);
-        b43_phy_write(dev, 0x22b, 0x0381);
-        b43_phy_write(dev, 0x22c, 0x042b);
-        b43_phy_write(dev, 0x22d, 0x042b);
-        b43_phy_write(dev, 0x22e, 0x0381);
-        b43_phy_write(dev, 0x22f, 0x0381);
+        b43_phy_write(dev, B43_NPHY_ED_CRS40ASSERTTHRESH0, 0x03eb);
+        b43_phy_write(dev, B43_NPHY_ED_CRS40ASSERTTHRESH1, 0x03eb);
+        b43_phy_write(dev, B43_NPHY_ED_CRS40DEASSERTTHRESH1, 0x0341);
+        b43_phy_write(dev, B43_NPHY_ED_CRS40DEASSERTTHRESH1, 0x0341);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20LASSERTTHRESH0, 0x042b);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20LASSERTTHRESH1, 0x042b);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20LDEASSERTTHRESH0, 0x0381);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20LDEASSERTTHRESH1, 0x0381);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20UASSERTTHRESH0, 0x042b);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20UASSERTTHRESH1, 0x042b);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20UDEASSERTTHRESH0, 0x0381);
+        b43_phy_write(dev, B43_NPHY_ED_CRS20UDEASSERTTHRESH1, 0x0381);
 
         if (dev->phy.rev >= 6 && sprom->boardflags2_lo & B43_BFL2_SINGLEANT_CCK)
                 ; /* TODO: 0x0080000000000000 HF */
@@ -2572,7 +2627,7 @@ static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
         u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };
 
         if (sprom->boardflags2_lo & B43_BFL2_SKWRKFEM_BRD ||
-            dev->dev->board_type == 0x8B) {
+            dev->dev->board_type == BCMA_BOARD_TYPE_BCM943224M93) {
                 delays1[0] = 0x1;
                 delays1[5] = 0x14;
         }
@@ -2789,10 +2844,6 @@ static void b43_nphy_iq_cal_gain_params(struct b43_wldev *dev, u16 core,
  * Tx and Rx
  **************************************************/
 
-void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)
-{//TODO
-}
-
 static void b43_nphy_op_adjust_txpower(struct b43_wldev *dev)
 {//TODO
 }
@@ -3124,21 +3175,21 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)
                 b43_nphy_ipa_internal_tssi_setup(dev);
 
         if (phy->rev >= 7)
-                b43_nphy_rf_control_override_rev7(dev, 0x2000, 0, 3, false, 0);
+                b43_nphy_rf_ctl_override_rev7(dev, 0x2000, 0, 3, false, 0);
         else if (phy->rev >= 3)
-                b43_nphy_rf_control_override(dev, 0x2000, 0, 3, false);
+                b43_nphy_rf_ctl_override(dev, 0x2000, 0, 3, false);
 
         b43_nphy_stop_playback(dev);
         b43_nphy_tx_tone(dev, 0xFA0, 0, false, false);
         udelay(20);
-        tmp = b43_nphy_poll_rssi(dev, 4, rssi, 1);
+        tmp = b43_nphy_poll_rssi(dev, N_RSSI_TSSI_2G, rssi, 1);
         b43_nphy_stop_playback(dev);
-        b43_nphy_rssi_select(dev, 0, 0);
+        b43_nphy_rssi_select(dev, 0, N_RSSI_W1);
 
         if (phy->rev >= 7)
-                b43_nphy_rf_control_override_rev7(dev, 0x2000, 0, 3, true, 0);
+                b43_nphy_rf_ctl_override_rev7(dev, 0x2000, 0, 3, true, 0);
         else if (phy->rev >= 3)
-                b43_nphy_rf_control_override(dev, 0x2000, 0, 3, true);
+                b43_nphy_rf_ctl_override(dev, 0x2000, 0, 3, true);
 
         if (phy->rev >= 3) {
                 nphy->pwr_ctl_info[0].idle_tssi_5g = (tmp >> 24) & 0xFF;
@@ -3577,8 +3628,8 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core)
                 b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0007);
         }
 
-        b43_nphy_rf_control_intc_override(dev, 2, 0, 3);
-        b43_nphy_rf_control_override(dev, 8, 0, 3, false);
+        b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_PA, 0, 3);
+        b43_nphy_rf_ctl_override(dev, 8, 0, 3, false);
         b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX);
 
         if (core == 0) {
@@ -3588,8 +3639,10 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core)
                 rxval = 4;
                 txval = 2;
         }
-        b43_nphy_rf_control_intc_override(dev, 1, rxval, (core + 1));
-        b43_nphy_rf_control_intc_override(dev, 1, txval, (2 - core));
+        b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_TRSW, rxval,
+                                      core + 1);
+        b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_TRSW, txval,
+                                      2 - core);
 }
 #endif
 
@@ -3851,9 +3904,13 @@ static void b43_nphy_restore_rssi_cal(struct b43_wldev *dev)
                 rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G;
         }
 
-        /* TODO use some definitions */
-        b43_radio_maskset(dev, 0x602B, 0xE3, rssical_radio_regs[0]);
-        b43_radio_maskset(dev, 0x702B, 0xE3, rssical_radio_regs[1]);
+        if (dev->phy.rev >= 7) {
+        } else {
+                b43_radio_maskset(dev, B2056_RX0 | B2056_RX_RSSI_MISC, 0xE3,
+                                  rssical_radio_regs[0]);
+                b43_radio_maskset(dev, B2056_RX1 | B2056_RX_RSSI_MISC, 0xE3,
+                                  rssical_radio_regs[1]);
+        }
 
         b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, rssical_phy_regs[0]);
         b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z, rssical_phy_regs[1]);
@@ -3884,75 +3941,75 @@ static void b43_nphy_tx_cal_radio_setup(struct b43_wldev *dev)
                 tmp = (i == 0) ? 0x2000 : 0x3000;
                 offset = i * 11;
 
-                save[offset + 0] = b43_radio_read16(dev, B2055_CAL_RVARCTL);
-                save[offset + 1] = b43_radio_read16(dev, B2055_CAL_LPOCTL);
-                save[offset + 2] = b43_radio_read16(dev, B2055_CAL_TS);
-                save[offset + 3] = b43_radio_read16(dev, B2055_CAL_RCCALRTS);
-                save[offset + 4] = b43_radio_read16(dev, B2055_CAL_RCALRTS);
-                save[offset + 5] = b43_radio_read16(dev, B2055_PADDRV);
-                save[offset + 6] = b43_radio_read16(dev, B2055_XOCTL1);
-                save[offset + 7] = b43_radio_read16(dev, B2055_XOCTL2);
-                save[offset + 8] = b43_radio_read16(dev, B2055_XOREGUL);
-                save[offset + 9] = b43_radio_read16(dev, B2055_XOMISC);
-                save[offset + 10] = b43_radio_read16(dev, B2055_PLL_LFC1);
+                save[offset + 0] = b43_radio_read(dev, B2055_CAL_RVARCTL);
+                save[offset + 1] = b43_radio_read(dev, B2055_CAL_LPOCTL);
+                save[offset + 2] = b43_radio_read(dev, B2055_CAL_TS);
+                save[offset + 3] = b43_radio_read(dev, B2055_CAL_RCCALRTS);
+                save[offset + 4] = b43_radio_read(dev, B2055_CAL_RCALRTS);
+                save[offset + 5] = b43_radio_read(dev, B2055_PADDRV);
+                save[offset + 6] = b43_radio_read(dev, B2055_XOCTL1);
+                save[offset + 7] = b43_radio_read(dev, B2055_XOCTL2);
+                save[offset + 8] = b43_radio_read(dev, B2055_XOREGUL);
+                save[offset + 9] = b43_radio_read(dev, B2055_XOMISC);
+                save[offset + 10] = b43_radio_read(dev, B2055_PLL_LFC1);
 
                 if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
-                        b43_radio_write16(dev, tmp | B2055_CAL_RVARCTL, 0x0A);
-                        b43_radio_write16(dev, tmp | B2055_CAL_LPOCTL, 0x40);
-                        b43_radio_write16(dev, tmp | B2055_CAL_TS, 0x55);
-                        b43_radio_write16(dev, tmp | B2055_CAL_RCCALRTS, 0);
-                        b43_radio_write16(dev, tmp | B2055_CAL_RCALRTS, 0);
+                        b43_radio_write(dev, tmp | B2055_CAL_RVARCTL, 0x0A);
+                        b43_radio_write(dev, tmp | B2055_CAL_LPOCTL, 0x40);
+                        b43_radio_write(dev, tmp | B2055_CAL_TS, 0x55);
+                        b43_radio_write(dev, tmp | B2055_CAL_RCCALRTS, 0);
+                        b43_radio_write(dev, tmp | B2055_CAL_RCALRTS, 0);
                         if (nphy->ipa5g_on) {
-                                b43_radio_write16(dev, tmp | B2055_PADDRV, 4);
-                                b43_radio_write16(dev, tmp | B2055_XOCTL1, 1);
+                                b43_radio_write(dev, tmp | B2055_PADDRV, 4);
+                                b43_radio_write(dev, tmp | B2055_XOCTL1, 1);
                         } else {
-                                b43_radio_write16(dev, tmp | B2055_PADDRV, 0);
-                                b43_radio_write16(dev, tmp | B2055_XOCTL1, 0x2F);
+                                b43_radio_write(dev, tmp | B2055_PADDRV, 0);
+                                b43_radio_write(dev, tmp | B2055_XOCTL1, 0x2F);
                         }
-                        b43_radio_write16(dev, tmp | B2055_XOCTL2, 0);
+                        b43_radio_write(dev, tmp | B2055_XOCTL2, 0);
                 } else {
-                        b43_radio_write16(dev, tmp | B2055_CAL_RVARCTL, 0x06);
-                        b43_radio_write16(dev, tmp | B2055_CAL_LPOCTL, 0x40);
-                        b43_radio_write16(dev, tmp | B2055_CAL_TS, 0x55);
-                        b43_radio_write16(dev, tmp | B2055_CAL_RCCALRTS, 0);
-                        b43_radio_write16(dev, tmp | B2055_CAL_RCALRTS, 0);
-                        b43_radio_write16(dev, tmp | B2055_XOCTL1, 0);
+                        b43_radio_write(dev, tmp | B2055_CAL_RVARCTL, 0x06);
+                        b43_radio_write(dev, tmp | B2055_CAL_LPOCTL, 0x40);
+                        b43_radio_write(dev, tmp | B2055_CAL_TS, 0x55);
+                        b43_radio_write(dev, tmp | B2055_CAL_RCCALRTS, 0);
+                        b43_radio_write(dev, tmp | B2055_CAL_RCALRTS, 0);
+                        b43_radio_write(dev, tmp | B2055_XOCTL1, 0);
                         if (nphy->ipa2g_on) {
-                                b43_radio_write16(dev, tmp | B2055_PADDRV, 6);
-                                b43_radio_write16(dev, tmp | B2055_XOCTL2,
+                                b43_radio_write(dev, tmp | B2055_PADDRV, 6);
+                                b43_radio_write(dev, tmp | B2055_XOCTL2,
                                         (dev->phy.rev < 5) ? 0x11 : 0x01);
                         } else {
-                                b43_radio_write16(dev, tmp | B2055_PADDRV, 0);
-                                b43_radio_write16(dev, tmp | B2055_XOCTL2, 0);
+                                b43_radio_write(dev, tmp | B2055_PADDRV, 0);
+                                b43_radio_write(dev, tmp | B2055_XOCTL2, 0);
                         }
                 }
-                b43_radio_write16(dev, tmp | B2055_XOREGUL, 0);
-                b43_radio_write16(dev, tmp | B2055_XOMISC, 0);
-                b43_radio_write16(dev, tmp | B2055_PLL_LFC1, 0);
+                b43_radio_write(dev, tmp | B2055_XOREGUL, 0);
+                b43_radio_write(dev, tmp | B2055_XOMISC, 0);
+                b43_radio_write(dev, tmp | B2055_PLL_LFC1, 0);
             }
         } else {
-                save[0] = b43_radio_read16(dev, B2055_C1_TX_RF_IQCAL1);
-                b43_radio_write16(dev, B2055_C1_TX_RF_IQCAL1, 0x29);
+                save[0] = b43_radio_read(dev, B2055_C1_TX_RF_IQCAL1);
+                b43_radio_write(dev, B2055_C1_TX_RF_IQCAL1, 0x29);
 
-                save[1] = b43_radio_read16(dev, B2055_C1_TX_RF_IQCAL2);
-                b43_radio_write16(dev, B2055_C1_TX_RF_IQCAL2, 0x54);
+                save[1] = b43_radio_read(dev, B2055_C1_TX_RF_IQCAL2);
+                b43_radio_write(dev, B2055_C1_TX_RF_IQCAL2, 0x54);
 
-                save[2] = b43_radio_read16(dev, B2055_C2_TX_RF_IQCAL1);
-                b43_radio_write16(dev, B2055_C2_TX_RF_IQCAL1, 0x29);
+                save[2] = b43_radio_read(dev, B2055_C2_TX_RF_IQCAL1);
+                b43_radio_write(dev, B2055_C2_TX_RF_IQCAL1, 0x29);
 
-                save[3] = b43_radio_read16(dev, B2055_C2_TX_RF_IQCAL2);
-                b43_radio_write16(dev, B2055_C2_TX_RF_IQCAL2, 0x54);
+                save[3] = b43_radio_read(dev, B2055_C2_TX_RF_IQCAL2);
+                b43_radio_write(dev, B2055_C2_TX_RF_IQCAL2, 0x54);
 
-                save[3] = b43_radio_read16(dev, B2055_C1_PWRDET_RXTX);
-                save[4] = b43_radio_read16(dev, B2055_C2_PWRDET_RXTX);
+                save[3] = b43_radio_read(dev, B2055_C1_PWRDET_RXTX);
+                save[4] = b43_radio_read(dev, B2055_C2_PWRDET_RXTX);
 
                 if (!(b43_phy_read(dev, B43_NPHY_BANDCTL) &
                     B43_NPHY_BANDCTL_5GHZ)) {
-                        b43_radio_write16(dev, B2055_C1_PWRDET_RXTX, 0x04);
-                        b43_radio_write16(dev, B2055_C2_PWRDET_RXTX, 0x04);
+                        b43_radio_write(dev, B2055_C1_PWRDET_RXTX, 0x04);
+                        b43_radio_write(dev, B2055_C2_PWRDET_RXTX, 0x04);
                 } else {
-                        b43_radio_write16(dev, B2055_C1_PWRDET_RXTX, 0x20);
-                        b43_radio_write16(dev, B2055_C2_PWRDET_RXTX, 0x20);
+                        b43_radio_write(dev, B2055_C1_PWRDET_RXTX, 0x20);
+                        b43_radio_write(dev, B2055_C2_PWRDET_RXTX, 0x20);
                 }
 
                 if (dev->phy.rev < 2) {
@@ -4148,9 +4205,9 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev)
                 regs[7] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);
                 regs[8] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2);
 
-                b43_nphy_rf_control_intc_override(dev, 2, 1, 3);
-                b43_nphy_rf_control_intc_override(dev, 1, 2, 1);
-                b43_nphy_rf_control_intc_override(dev, 1, 8, 2);
+                b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_PA, 1, 3);
+                b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_TRSW, 2, 1);
+                b43_nphy_rf_ctl_intc_override(dev, N_INTC_OVERRIDE_TRSW, 8, 2);
 
                 regs[9] = b43_phy_read(dev, B43_NPHY_PAPD_EN0);
                 regs[10] = b43_phy_read(dev, B43_NPHY_PAPD_EN1);
@@ -4683,7 +4740,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,
 
                         tmp[0] = ((cur_hpf2 << 8) | (cur_hpf1 << 4) |
                                         (cur_lna << 2));
-                        b43_nphy_rf_control_override(dev, 0x400, tmp[0], 3,
+                        b43_nphy_rf_ctl_override(dev, 0x400, tmp[0], 3,
                                                                         false);
                         b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
                         b43_nphy_stop_playback(dev);
@@ -4732,7 +4789,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,
                         break;
         }
 
-        b43_nphy_rf_control_override(dev, 0x400, 0, 3, true);
+        b43_nphy_rf_ctl_override(dev, 0x400, 0, 3, true);
         b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
         b43_ntab_write_bulk(dev, B43_NTAB16(7, 0x110), 2, gain_save);
 
@@ -4801,18 +4858,6 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
  * N-PHY init
  **************************************************/
 
-/*
- * Upload the N-PHY tables.
- * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables
- */
-static void b43_nphy_tables_init(struct b43_wldev *dev)
-{
-        if (dev->phy.rev < 3)
-                b43_nphy_rev0_1_2_tables_init(dev);
-        else
-                b43_nphy_rev3plus_tables_init(dev);
-}
-
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */
 static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)
 {
@@ -4892,7 +4937,7 @@ static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/Init/N */
-int b43_phy_initn(struct b43_wldev *dev)
+static int b43_phy_initn(struct b43_wldev *dev)
 {
         struct ssb_sprom *sprom = dev->dev->bus_sprom;
         struct b43_phy *phy = &dev->phy;
@@ -4962,7 +5007,7 @@ int b43_phy_initn(struct b43_wldev *dev)
 
         if (sprom->boardflags2_lo & B43_BFL2_SKWRKFEM_BRD ||
             (dev->dev->board_vendor == PCI_VENDOR_ID_APPLE &&
-             dev->dev->board_type == 0x8B))
+             dev->dev->board_type == BCMA_BOARD_TYPE_BCM943224M93))
                 b43_phy_write(dev, B43_NPHY_TXREALFD, 0xA0);
         else
                 b43_phy_write(dev, B43_NPHY_TXREALFD, 0xB8);
@@ -5104,63 +5149,11 @@ static void b43_chantab_phy_upload(struct b43_wldev *dev,
 /* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */
 static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
 {
-        struct bcma_drv_cc __maybe_unused *cc;
-        u32 __maybe_unused pmu_ctl;
-
         switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
         case B43_BUS_BCMA:
-                cc = &dev->dev->bdev->bus->drv_cc;
-                if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) {
-                        if (avoid) {
-                                bcma_chipco_pll_write(cc, 0x0, 0x11500010);
-                                bcma_chipco_pll_write(cc, 0x1, 0x000C0C06);
-                                bcma_chipco_pll_write(cc, 0x2, 0x0F600a08);
-                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
-                                bcma_chipco_pll_write(cc, 0x4, 0x2001E920);
-                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
-                        } else {
-                                bcma_chipco_pll_write(cc, 0x0, 0x11100010);
-                                bcma_chipco_pll_write(cc, 0x1, 0x000c0c06);
-                                bcma_chipco_pll_write(cc, 0x2, 0x03000a08);
-                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
-                                bcma_chipco_pll_write(cc, 0x4, 0x200005c0);
-                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
-                        }
-                        pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD;
-                } else if (dev->dev->chip_id == 0x4716) {
-                        if (avoid) {
-                                bcma_chipco_pll_write(cc, 0x0, 0x11500060);
-                                bcma_chipco_pll_write(cc, 0x1, 0x080C0C06);
-                                bcma_chipco_pll_write(cc, 0x2, 0x0F600000);
-                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
-                                bcma_chipco_pll_write(cc, 0x4, 0x2001E924);
-                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
-                        } else {
-                                bcma_chipco_pll_write(cc, 0x0, 0x11100060);
-                                bcma_chipco_pll_write(cc, 0x1, 0x080c0c06);
-                                bcma_chipco_pll_write(cc, 0x2, 0x03000000);
-                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
-                                bcma_chipco_pll_write(cc, 0x4, 0x200005c0);
-                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
-                        }
-                        pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD |
-                                  BCMA_CC_PMU_CTL_NOILPONW;
-                } else if (dev->dev->chip_id == 0x4322 ||
-                           dev->dev->chip_id == 0x4340 ||
-                           dev->dev->chip_id == 0x4341) {
-                        bcma_chipco_pll_write(cc, 0x0, 0x11100070);
-                        bcma_chipco_pll_write(cc, 0x1, 0x1014140a);
-                        bcma_chipco_pll_write(cc, 0x5, 0x88888854);
-                        if (avoid)
-                                bcma_chipco_pll_write(cc, 0x2, 0x05201828);
-                        else
-                                bcma_chipco_pll_write(cc, 0x2, 0x05001828);
-                        pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD;
-                } else {
-                        return;
-                }
-                bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl);
+                bcma_pmu_spuravoid_pllupdate(&dev->dev->bdev->bus->drv_cc,
+                                             avoid);
                 break;
 #endif
 #ifdef CONFIG_B43_SSB
@@ -5531,8 +5524,9 @@ static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on)
 static int b43_nphy_op_switch_channel(struct b43_wldev *dev,
                                       unsigned int new_channel)
 {
-        struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
-        enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
+        struct ieee80211_channel *channel = dev->wl->hw->conf.chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&dev->wl->hw->conf.chandef);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
                 if ((new_channel < 1) || (new_channel > 14))
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index 092c0140c249..9a5b6bc27d24 100644
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -54,10 +54,15 @@
 #define  B43_NPHY_C1_INITGAIN_HPVGA2_SHIFT      7
 #define  B43_NPHY_C1_INITGAIN_TRRX              0x1000 /* TR RX index */
 #define  B43_NPHY_C1_INITGAIN_TRTX              0x2000 /* TR TX index */
+#define B43_NPHY_REV3_C1_INITGAIN_A             B43_PHY_N(0x020)
 #define B43_NPHY_C1_CLIP1_HIGAIN                B43_PHY_N(0x021) /* Core 1 clip1 high gain code */
+#define B43_NPHY_REV3_C1_INITGAIN_B             B43_PHY_N(0x021)
 #define B43_NPHY_C1_CLIP1_MEDGAIN               B43_PHY_N(0x022) /* Core 1 clip1 medium gain code */
+#define B43_NPHY_REV3_C1_CLIP_HIGAIN_A          B43_PHY_N(0x022)
 #define B43_NPHY_C1_CLIP1_LOGAIN                B43_PHY_N(0x023) /* Core 1 clip1 low gain code */
+#define B43_NPHY_REV3_C1_CLIP_HIGAIN_B          B43_PHY_N(0x023)
 #define B43_NPHY_C1_CLIP2_GAIN                  B43_PHY_N(0x024) /* Core 1 clip2 gain code */
+#define B43_NPHY_REV3_C1_CLIP_MEDGAIN_A         B43_PHY_N(0x024)
 #define B43_NPHY_C1_FILTERGAIN                  B43_PHY_N(0x025) /* Core 1 filter gain */
 #define B43_NPHY_C1_LPF_QHPF_BW                 B43_PHY_N(0x026) /* Core 1 LPF Q HP F bandwidth */
 #define B43_NPHY_C1_CLIPWBTHRES                 B43_PHY_N(0x027) /* Core 1 clip wideband threshold */
@@ -107,10 +112,15 @@
 #define  B43_NPHY_C2_INITGAIN_HPVGA2_SHIFT      7
 #define  B43_NPHY_C2_INITGAIN_TRRX              0x1000 /* TR RX index */
 #define  B43_NPHY_C2_INITGAIN_TRTX              0x2000 /* TR TX index */
+#define B43_NPHY_REV3_C1_CLIP_MEDGAIN_B         B43_PHY_N(0x036)
 #define B43_NPHY_C2_CLIP1_HIGAIN                B43_PHY_N(0x037) /* Core 2 clip1 high gain code */
+#define B43_NPHY_REV3_C1_CLIP_LOGAIN_A          B43_PHY_N(0x037)
 #define B43_NPHY_C2_CLIP1_MEDGAIN               B43_PHY_N(0x038) /* Core 2 clip1 medium gain code */
+#define B43_NPHY_REV3_C1_CLIP_LOGAIN_B          B43_PHY_N(0x038)
 #define B43_NPHY_C2_CLIP1_LOGAIN                B43_PHY_N(0x039) /* Core 2 clip1 low gain code */
+#define B43_NPHY_REV3_C1_CLIP2_GAIN_A           B43_PHY_N(0x039)
 #define B43_NPHY_C2_CLIP2_GAIN                  B43_PHY_N(0x03A) /* Core 2 clip2 gain code */
+#define B43_NPHY_REV3_C1_CLIP2_GAIN_B           B43_PHY_N(0x03A)
 #define B43_NPHY_C2_FILTERGAIN                  B43_PHY_N(0x03B) /* Core 2 filter gain */
 #define B43_NPHY_C2_LPF_QHPF_BW                 B43_PHY_N(0x03C) /* Core 2 LPF Q HP F bandwidth */
 #define B43_NPHY_C2_CLIPWBTHRES                 B43_PHY_N(0x03D) /* Core 2 clip wideband threshold */
@@ -706,10 +716,146 @@
 #define B43_NPHY_TXPCTL_INIT                    B43_PHY_N(0x222) /* TX power control init */
 #define  B43_NPHY_TXPCTL_INIT_PIDXI1            0x00FF /* Power index init 1 */
 #define  B43_NPHY_TXPCTL_INIT_PIDXI1_SHIFT      0
+#define B43_NPHY_ED_CRSEN                       B43_PHY_N(0x223)
+#define B43_NPHY_ED_CRS40ASSERTTHRESH0          B43_PHY_N(0x224)
+#define B43_NPHY_ED_CRS40ASSERTTHRESH1          B43_PHY_N(0x225)
+#define B43_NPHY_ED_CRS40DEASSERTTHRESH0        B43_PHY_N(0x226)
+#define B43_NPHY_ED_CRS40DEASSERTTHRESH1        B43_PHY_N(0x227)
+#define B43_NPHY_ED_CRS20LASSERTTHRESH0         B43_PHY_N(0x228)
+#define B43_NPHY_ED_CRS20LASSERTTHRESH1         B43_PHY_N(0x229)
+#define B43_NPHY_ED_CRS20LDEASSERTTHRESH0       B43_PHY_N(0x22A)
+#define B43_NPHY_ED_CRS20LDEASSERTTHRESH1       B43_PHY_N(0x22B)
+#define B43_NPHY_ED_CRS20UASSERTTHRESH0         B43_PHY_N(0x22C)
+#define B43_NPHY_ED_CRS20UASSERTTHRESH1         B43_PHY_N(0x22D)
+#define B43_NPHY_ED_CRS20UDEASSERTTHRESH0       B43_PHY_N(0x22E)
+#define B43_NPHY_ED_CRS20UDEASSERTTHRESH1       B43_PHY_N(0x22F)
+#define B43_NPHY_ED_CRS                         B43_PHY_N(0x230)
+#define B43_NPHY_TIMEOUTEN                      B43_PHY_N(0x231)
+#define B43_NPHY_OFDMPAYDECODETIMEOUTLEN        B43_PHY_N(0x232)
+#define B43_NPHY_CCKPAYDECODETIMEOUTLEN         B43_PHY_N(0x233)
+#define B43_NPHY_NONPAYDECODETIMEOUTLEN         B43_PHY_N(0x234)
+#define B43_NPHY_TIMEOUTSTATUS                  B43_PHY_N(0x235)
+#define B43_NPHY_RFCTRLCORE0GPIO0               B43_PHY_N(0x236)
+#define B43_NPHY_RFCTRLCORE0GPIO1               B43_PHY_N(0x237)
+#define B43_NPHY_RFCTRLCORE0GPIO2               B43_PHY_N(0x238)
+#define B43_NPHY_RFCTRLCORE0GPIO3               B43_PHY_N(0x239)
+#define B43_NPHY_RFCTRLCORE1GPIO0               B43_PHY_N(0x23A)
+#define B43_NPHY_RFCTRLCORE1GPIO1               B43_PHY_N(0x23B)
+#define B43_NPHY_RFCTRLCORE1GPIO2               B43_PHY_N(0x23C)
+#define B43_NPHY_RFCTRLCORE1GPIO3               B43_PHY_N(0x23D)
+#define B43_NPHY_BPHYTESTCONTROL                B43_PHY_N(0x23E)
+/* REV3+ */
+#define B43_NPHY_FORCEFRONT0                    B43_PHY_N(0x23F)
+#define B43_NPHY_FORCEFRONT1                    B43_PHY_N(0x240)
+#define B43_NPHY_NORMVARHYSTTH                  B43_PHY_N(0x241)
+#define B43_NPHY_TXCCKERROR                     B43_PHY_N(0x242)
+#define B43_NPHY_AFESEQINITDACGAIN              B43_PHY_N(0x243)
+#define B43_NPHY_TXANTSWLUT                     B43_PHY_N(0x244)
+#define B43_NPHY_CORECONFIG                     B43_PHY_N(0x245)
+#define B43_NPHY_ANTENNADIVDWELLTIME            B43_PHY_N(0x246)
+#define B43_NPHY_ANTENNACCKDIVDWELLTIME         B43_PHY_N(0x247)
+#define B43_NPHY_ANTENNADIVBACKOFFGAIN          B43_PHY_N(0x248)
+#define B43_NPHY_ANTENNADIVMINGAIN              B43_PHY_N(0x249)
+#define B43_NPHY_BRDSEL_NORMVARHYSTTH           B43_PHY_N(0x24A)
+#define B43_NPHY_RXANTSWITCHCTRL                B43_PHY_N(0x24B)
+#define B43_NPHY_ENERGYDROPTIMEOUTLEN2          B43_PHY_N(0x24C)
+#define B43_NPHY_ML_LOG_TXEVM0                  B43_PHY_N(0x250)
+#define B43_NPHY_ML_LOG_TXEVM1                  B43_PHY_N(0x251)
+#define B43_NPHY_ML_LOG_TXEVM2                  B43_PHY_N(0x252)
+#define B43_NPHY_ML_LOG_TXEVM3                  B43_PHY_N(0x253)
+#define B43_NPHY_ML_LOG_TXEVM4                  B43_PHY_N(0x254)
+#define B43_NPHY_ML_LOG_TXEVM5                  B43_PHY_N(0x255)
+#define B43_NPHY_ML_LOG_TXEVM6                  B43_PHY_N(0x256)
+#define B43_NPHY_ML_LOG_TXEVM7                  B43_PHY_N(0x257)
+#define B43_NPHY_ML_SCALE_TWEAK                 B43_PHY_N(0x258)
+#define B43_NPHY_MLUA                           B43_PHY_N(0x259)
+#define B43_NPHY_ZFUA                           B43_PHY_N(0x25A)
+#define B43_NPHY_CHANUPSYM01                    B43_PHY_N(0x25B)
+#define B43_NPHY_CHANUPSYM2                     B43_PHY_N(0x25C)
+#define B43_NPHY_RXSTRNFILT20NUM00              B43_PHY_N(0x25D)
+#define B43_NPHY_RXSTRNFILT20NUM01              B43_PHY_N(0x25E)
+#define B43_NPHY_RXSTRNFILT20NUM02              B43_PHY_N(0x25F)
+#define B43_NPHY_RXSTRNFILT20DEN00              B43_PHY_N(0x260)
+#define B43_NPHY_RXSTRNFILT20DEN01              B43_PHY_N(0x261)
+#define B43_NPHY_RXSTRNFILT20NUM10              B43_PHY_N(0x262)
+#define B43_NPHY_RXSTRNFILT20NUM11              B43_PHY_N(0x263)
+#define B43_NPHY_RXSTRNFILT20NUM12              B43_PHY_N(0x264)
+#define B43_NPHY_RXSTRNFILT20DEN10              B43_PHY_N(0x265)
+#define B43_NPHY_RXSTRNFILT20DEN11              B43_PHY_N(0x266)
+#define B43_NPHY_RXSTRNFILT40NUM00              B43_PHY_N(0x267)
+#define B43_NPHY_RXSTRNFILT40NUM01              B43_PHY_N(0x268)
+#define B43_NPHY_RXSTRNFILT40NUM02              B43_PHY_N(0x269)
+#define B43_NPHY_RXSTRNFILT40DEN00              B43_PHY_N(0x26A)
+#define B43_NPHY_RXSTRNFILT40DEN01              B43_PHY_N(0x26B)
+#define B43_NPHY_RXSTRNFILT40NUM10              B43_PHY_N(0x26C)
+#define B43_NPHY_RXSTRNFILT40NUM11              B43_PHY_N(0x26D)
+#define B43_NPHY_RXSTRNFILT40NUM12              B43_PHY_N(0x26E)
+#define B43_NPHY_RXSTRNFILT40DEN10              B43_PHY_N(0x26F)
+#define B43_NPHY_RXSTRNFILT40DEN11              B43_PHY_N(0x270)
+#define B43_NPHY_CRSHIGHPOWTHRESHOLD1           B43_PHY_N(0x271)
+#define B43_NPHY_CRSHIGHPOWTHRESHOLD2           B43_PHY_N(0x272)
+#define B43_NPHY_CRSHIGHLOWPOWTHRESHOLD         B43_PHY_N(0x273)
+#define B43_NPHY_CRSHIGHPOWTHRESHOLD1L          B43_PHY_N(0x274)
+#define B43_NPHY_CRSHIGHPOWTHRESHOLD2L          B43_PHY_N(0x275)
+#define B43_NPHY_CRSHIGHLOWPOWTHRESHOLDL        B43_PHY_N(0x276)
+#define B43_NPHY_CRSHIGHPOWTHRESHOLD1U          B43_PHY_N(0x277)
+#define B43_NPHY_CRSHIGHPOWTHRESHOLD2U          B43_PHY_N(0x278)
+#define B43_NPHY_CRSHIGHLOWPOWTHRESHOLDU        B43_PHY_N(0x279)
+#define B43_NPHY_CRSACIDETECTTHRESH             B43_PHY_N(0x27A)
+#define B43_NPHY_CRSACIDETECTTHRESHL            B43_PHY_N(0x27B)
+#define B43_NPHY_CRSACIDETECTTHRESHU            B43_PHY_N(0x27C)
+#define B43_NPHY_CRSMINPOWER0                   B43_PHY_N(0x27D)
+#define B43_NPHY_CRSMINPOWER1                   B43_PHY_N(0x27E)
+#define B43_NPHY_CRSMINPOWER2                   B43_PHY_N(0x27F)
+#define B43_NPHY_CRSMINPOWERL0                  B43_PHY_N(0x280)
+#define B43_NPHY_CRSMINPOWERL1                  B43_PHY_N(0x281)
+#define B43_NPHY_CRSMINPOWERL2                  B43_PHY_N(0x282)
+#define B43_NPHY_CRSMINPOWERU0                  B43_PHY_N(0x283)
+#define B43_NPHY_CRSMINPOWERU1                  B43_PHY_N(0x284)
+#define B43_NPHY_CRSMINPOWERU2                  B43_PHY_N(0x285)
+#define B43_NPHY_STRPARAM                       B43_PHY_N(0x286)
+#define B43_NPHY_STRPARAML                      B43_PHY_N(0x287)
+#define B43_NPHY_STRPARAMU                      B43_PHY_N(0x288)
+#define B43_NPHY_BPHYCRSMINPOWER0               B43_PHY_N(0x289)
+#define B43_NPHY_BPHYCRSMINPOWER1               B43_PHY_N(0x28A)
+#define B43_NPHY_BPHYCRSMINPOWER2               B43_PHY_N(0x28B)
+#define B43_NPHY_BPHYFILTDEN0COEF               B43_PHY_N(0x28C)
+#define B43_NPHY_BPHYFILTDEN1COEF               B43_PHY_N(0x28D)
+#define B43_NPHY_BPHYFILTDEN2COEF               B43_PHY_N(0x28E)
+#define B43_NPHY_BPHYFILTNUM0COEF               B43_PHY_N(0x28F)
+#define B43_NPHY_BPHYFILTNUM1COEF               B43_PHY_N(0x290)
+#define B43_NPHY_BPHYFILTNUM2COEF               B43_PHY_N(0x291)
+#define B43_NPHY_BPHYFILTNUM01COEF2             B43_PHY_N(0x292)
+#define B43_NPHY_BPHYFILTBYPASS                 B43_PHY_N(0x293)
+#define B43_NPHY_SGILTRNOFFSET                  B43_PHY_N(0x294)
+#define B43_NPHY_RADAR_T2_MIN                   B43_PHY_N(0x295)
+#define B43_NPHY_TXPWRCTRLDAMPING               B43_PHY_N(0x296)
 #define B43_NPHY_PAPD_EN0                       B43_PHY_N(0x297) /* PAPD Enable0 TBD */
 #define B43_NPHY_EPS_TABLE_ADJ0                 B43_PHY_N(0x298) /* EPS Table Adj0 TBD */
+#define B43_NPHY_EPS_OVERRIDEI_0                B43_PHY_N(0x299)
+#define B43_NPHY_EPS_OVERRIDEQ_0                B43_PHY_N(0x29A)
 #define B43_NPHY_PAPD_EN1                       B43_PHY_N(0x29B) /* PAPD Enable1 TBD */
 #define B43_NPHY_EPS_TABLE_ADJ1                 B43_PHY_N(0x29C) /* EPS Table Adj1 TBD */
+#define B43_NPHY_EPS_OVERRIDEI_1                B43_PHY_N(0x29D)
+#define B43_NPHY_EPS_OVERRIDEQ_1                B43_PHY_N(0x29E)
+#define B43_NPHY_PAPD_CAL_ADDRESS               B43_PHY_N(0x29F)
+#define B43_NPHY_PAPD_CAL_YREFEPSILON           B43_PHY_N(0x2A0)
+#define B43_NPHY_PAPD_CAL_SETTLE                B43_PHY_N(0x2A1)
+#define B43_NPHY_PAPD_CAL_CORRELATE             B43_PHY_N(0x2A2)
+#define B43_NPHY_PAPD_CAL_SHIFTS0               B43_PHY_N(0x2A3)
+#define B43_NPHY_PAPD_CAL_SHIFTS1               B43_PHY_N(0x2A4)
+#define B43_NPHY_SAMPLE_START_ADDR              B43_PHY_N(0x2A5)
+#define B43_NPHY_RADAR_ADC_TO_DBM               B43_PHY_N(0x2A6)
+#define B43_NPHY_REV3_C2_INITGAIN_A             B43_PHY_N(0x2A7)
+#define B43_NPHY_REV3_C2_INITGAIN_B             B43_PHY_N(0x2A8)
+#define B43_NPHY_REV3_C2_CLIP_HIGAIN_A          B43_PHY_N(0x2A9)
+#define B43_NPHY_REV3_C2_CLIP_HIGAIN_B          B43_PHY_N(0x2AA)
+#define B43_NPHY_REV3_C2_CLIP_MEDGAIN_A         B43_PHY_N(0x2AB)
+#define B43_NPHY_REV3_C2_CLIP_MEDGAIN_B         B43_PHY_N(0x2AC)
+#define B43_NPHY_REV3_C2_CLIP_LOGAIN_A          B43_PHY_N(0x2AD)
+#define B43_NPHY_REV3_C2_CLIP_LOGAIN_B          B43_PHY_N(0x2AE)
+#define B43_NPHY_REV3_C2_CLIP2_GAIN_A           B43_PHY_N(0x2AF)
+#define B43_NPHY_REV3_C2_CLIP2_GAIN_B           B43_PHY_N(0x2B0)
 
 #define B43_PHY_B_BBCFG                         B43_PHY_N_BMODE(0x001) /* BB config */
 #define B43_PHY_B_TEST                          B43_PHY_N_BMODE(0x00A)
diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/b43/radio_2056.c
index ce037fb6789a..b4fd9345d673 100644
--- a/drivers/net/wireless/b43/radio_2056.c
+++ b/drivers/net/wireless/b43/radio_2056.c
@@ -2980,7 +2980,7 @@ static const struct b2056_inittab_entry b2056_inittab_rev8_rx[] = {
         .rx             = prefix##_rx,                  \
         .rx_length      = ARRAY_SIZE(prefix##_rx)
 
-struct b2056_inittabs_pts b2056_inittabs[] = {
+static const struct b2056_inittabs_pts b2056_inittabs[] = {
         [3] = { INITTABSPTS(b2056_inittab_rev3) },
         [4] = { INITTABSPTS(b2056_inittab_rev4) },
         [5] = { INITTABSPTS(b2056_inittab_rev5) },
@@ -9035,7 +9035,7 @@ static void b2056_upload_inittab(struct b43_wldev *dev, bool ghz5,
 void b2056_upload_inittabs(struct b43_wldev *dev,
                            bool ghz5, bool ignore_uploadflag)
 {
-        struct b2056_inittabs_pts *pts;
+        const struct b2056_inittabs_pts *pts;
 
         if (dev->phy.rev >= ARRAY_SIZE(b2056_inittabs)) {
                 B43_WARN_ON(1);
@@ -9057,7 +9057,7 @@ void b2056_upload_inittabs(struct b43_wldev *dev,
 
 void b2056_upload_syn_pll_cp2(struct b43_wldev *dev, bool ghz5)
 {
-        struct b2056_inittabs_pts *pts;
+        const struct b2056_inittabs_pts *pts;
         const struct b2056_inittab_entry *e;
 
         if (dev->phy.rev >= ARRAY_SIZE(b2056_inittabs)) {
diff --git a/drivers/net/wireless/b43/radio_2059.c b/drivers/net/wireless/b43/radio_2059.c
index d4ce8a12ff9a..38e31d857e3e 100644
--- a/drivers/net/wireless/b43/radio_2059.c
+++ b/drivers/net/wireless/b43/radio_2059.c
@@ -27,7 +27,7 @@
 
 #define RADIOREGS(r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \
                   r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, \
-                  r20, r21, r22, r23, r24, r25, r26, r27, r28) \
+                  r20) \
         .radio_syn16                    = r00,  \
         .radio_syn17                    = r01,  \
         .radio_syn22                    = r02,  \
@@ -41,22 +41,14 @@
         .radio_syn41                    = r10,  \
         .radio_syn43                    = r11,  \
         .radio_syn47                    = r12,  \
-        .radio_syn4a                    = r13,  \
-        .radio_syn58                    = r14,  \
-        .radio_syn5a                    = r15,  \
-        .radio_syn6a                    = r16,  \
-        .radio_syn6d                    = r17,  \
-        .radio_syn6e                    = r18,  \
-        .radio_syn92                    = r19,  \
-        .radio_syn98                    = r20,  \
-        .radio_rxtx4a                   = r21,  \
-        .radio_rxtx58                   = r22,  \
-        .radio_rxtx5a                   = r23,  \
-        .radio_rxtx6a                   = r24,  \
-        .radio_rxtx6d                   = r25,  \
-        .radio_rxtx6e                   = r26,  \
-        .radio_rxtx92                   = r27,  \
-        .radio_rxtx98                   = r28
+        .radio_rxtx4a                   = r13,  \
+        .radio_rxtx58                   = r14,  \
+        .radio_rxtx5a                   = r15,  \
+        .radio_rxtx6a                   = r16,  \
+        .radio_rxtx6d                   = r17,  \
+        .radio_rxtx6e                   = r18,  \
+        .radio_rxtx92                   = r19,  \
+        .radio_rxtx98                   = r20
 
 #define PHYREGS(r0, r1, r2, r3, r4, r5) \
         .phy_regs.bw1   = r0,   \
@@ -70,91 +62,78 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi
   {     .freq                   = 2412,
         RADIOREGS(0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c,
                   0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
   },
   {     .freq                   = 2417,
         RADIOREGS(0x4b, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x71,
                   0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
   },
   {     .freq                   = 2422,
         RADIOREGS(0x4e, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x76,
                   0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
   },
   {     .freq                   = 2427,
         RADIOREGS(0x52, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x7b,
                   0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
   },
   {     .freq                   = 2432,
         RADIOREGS(0x55, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x80,
                   0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
   },
   {     .freq                   = 2437,
         RADIOREGS(0x58, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x85,
                   0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
   },
   {     .freq                   = 2442,
         RADIOREGS(0x5c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8a,
                   0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
   },
   {     .freq                   = 2447,
         RADIOREGS(0x5f, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8f,
                   0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
   },
   {     .freq                   = 2452,
         RADIOREGS(0x62, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x94,
                   0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
   },
   {     .freq                   = 2457,
         RADIOREGS(0x66, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x99,
                   0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
   },
   {     .freq                   = 2462,
         RADIOREGS(0x69, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x9e,
                   0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
   },
   {     .freq                   = 2467,
         RADIOREGS(0x6c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0xa3,
                   0x09, 0x0f, 0x05, 0x00, 0x05, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
   },
   {     .freq                   = 2472,
         RADIOREGS(0x70, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0xa8,
                   0x09, 0x0f, 0x05, 0x00, 0x05, 0x00, 0x61, 0x03,
-                  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,
                   0x00, 0x00, 0x00, 0xf0, 0x00),
         PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
   },
diff --git a/drivers/net/wireless/b43/radio_2059.h b/drivers/net/wireless/b43/radio_2059.h
index e4d69e55e9fe..40a82d7f510c 100644
--- a/drivers/net/wireless/b43/radio_2059.h
+++ b/drivers/net/wireless/b43/radio_2059.h
@@ -5,9 +5,9 @@
 
 #include "phy_ht.h"
 
-#define R2059_SYN                       0x000
-#define R2059_TXRX0                     0x400
-#define R2059_RXRX1                     0x800
+#define R2059_C1                        0x000
+#define R2059_C2                        0x400
+#define R2059_C3                        0x800
 #define R2059_ALL                       0xC00
 
 /* Values for various registers uploaded on channel switching */
@@ -28,14 +28,6 @@ struct b43_phy_ht_channeltab_e_radio2059 {
         u8 radio_syn41;
         u8 radio_syn43;
         u8 radio_syn47;
-        u8 radio_syn4a;
-        u8 radio_syn58;
-        u8 radio_syn5a;
-        u8 radio_syn6a;
-        u8 radio_syn6d;
-        u8 radio_syn6e;
-        u8 radio_syn92;
-        u8 radio_syn98;
         u8 radio_rxtx4a;
         u8 radio_rxtx58;
         u8 radio_rxtx5a;
diff --git a/drivers/net/wireless/b43/sdio.h b/drivers/net/wireless/b43/sdio.h
index fb633094403a..1e93926f388f 100644
--- a/drivers/net/wireless/b43/sdio.h
+++ b/drivers/net/wireless/b43/sdio.h
@@ -25,12 +25,12 @@ void b43_sdio_exit(void);
 #else /* CONFIG_B43_SDIO */
 
 
-int b43_sdio_request_irq(struct b43_wldev *dev,
+static inline int b43_sdio_request_irq(struct b43_wldev *dev,
                          void (*handler)(struct b43_wldev *dev))
 {
         return -ENODEV;
 }
-void b43_sdio_free_irq(struct b43_wldev *dev)
+static inline void b43_sdio_free_irq(struct b43_wldev *dev)
 {
 }
 static inline int b43_sdio_init(void)
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index aaca60c6f575..94c755fdda14 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -2174,7 +2174,7 @@ static const u16 b43_ntab_loftlt1_r3[] = {
 /* volatile  tables, PHY revision >= 3 */
 
 /* indexed by antswctl2g */
-static const u16 b43_ntab_antswctl2g_r3[4][32] = {
+static const u16 b43_ntab_antswctl_r3[4][32] = {
         {
                 0x0082, 0x0082, 0x0211, 0x0222, 0x0328,
                 0x0000, 0x0000, 0x0000, 0x0144, 0x0000,
@@ -2800,7 +2800,7 @@ static const struct nphy_rf_control_override_rev7
         { 0x0010, 0x344, 0x345, 0x0010, 4 },
 };
 
-struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_wa_phy6_radio11_ghz2 = {
+static struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_wa_phy6_radio11_ghz2 = {
         { 10, 14, 19, 27 },
         { -5, 6, 10, 15 },
         { 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA },
@@ -2811,7 +2811,7 @@ struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_wa_phy6_radio11_ghz2 = {
         0x18, 0x18, 0x18,
         0x01D0, 0x5,
 };
-struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][4] = {
+static struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][4] = {
         { /* 2GHz */
                 { /* PHY rev 3 */
                         { 7, 11, 16, 23 },
@@ -3095,9 +3095,55 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
 }
 
 #define ntab_upload(dev, offset, data) do { \
-                b43_ntab_write_bulk(dev, offset, offset##_SIZE, data);  \
+                b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \
         } while (0)
-void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev)
+
+static void b43_nphy_tables_init_rev3(struct b43_wldev *dev)
+{
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+        u8 antswlut;
+
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)
+                antswlut = sprom->fem.ghz5.antswlut;
+        else
+                antswlut = sprom->fem.ghz2.antswlut;
+
+        /* Static tables */
+        ntab_upload(dev, B43_NTAB_FRAMESTRUCT_R3, b43_ntab_framestruct_r3);
+        ntab_upload(dev, B43_NTAB_PILOT_R3, b43_ntab_pilot_r3);
+        ntab_upload(dev, B43_NTAB_TMAP_R3, b43_ntab_tmap_r3);
+        ntab_upload(dev, B43_NTAB_INTLEVEL_R3, b43_ntab_intlevel_r3);
+        ntab_upload(dev, B43_NTAB_TDTRN_R3, b43_ntab_tdtrn_r3);
+        ntab_upload(dev, B43_NTAB_NOISEVAR0_R3, b43_ntab_noisevar0_r3);
+        ntab_upload(dev, B43_NTAB_NOISEVAR1_R3, b43_ntab_noisevar1_r3);
+        ntab_upload(dev, B43_NTAB_MCS_R3, b43_ntab_mcs_r3);
+        ntab_upload(dev, B43_NTAB_TDI20A0_R3, b43_ntab_tdi20a0_r3);
+        ntab_upload(dev, B43_NTAB_TDI20A1_R3, b43_ntab_tdi20a1_r3);
+        ntab_upload(dev, B43_NTAB_TDI40A0_R3, b43_ntab_tdi40a0_r3);
+        ntab_upload(dev, B43_NTAB_TDI40A1_R3, b43_ntab_tdi40a1_r3);
+        ntab_upload(dev, B43_NTAB_PILOTLT_R3, b43_ntab_pilotlt_r3);
+        ntab_upload(dev, B43_NTAB_CHANEST_R3, b43_ntab_channelest_r3);
+        ntab_upload(dev, B43_NTAB_FRAMELT_R3, b43_ntab_framelookup_r3);
+        ntab_upload(dev, B43_NTAB_C0_ESTPLT_R3, b43_ntab_estimatepowerlt0_r3);
+        ntab_upload(dev, B43_NTAB_C1_ESTPLT_R3, b43_ntab_estimatepowerlt1_r3);
+        ntab_upload(dev, B43_NTAB_C0_ADJPLT_R3, b43_ntab_adjustpower0_r3);
+        ntab_upload(dev, B43_NTAB_C1_ADJPLT_R3, b43_ntab_adjustpower1_r3);
+        ntab_upload(dev, B43_NTAB_C0_GAINCTL_R3, b43_ntab_gainctl0_r3);
+        ntab_upload(dev, B43_NTAB_C1_GAINCTL_R3, b43_ntab_gainctl1_r3);
+        ntab_upload(dev, B43_NTAB_C0_IQLT_R3, b43_ntab_iqlt0_r3);
+        ntab_upload(dev, B43_NTAB_C1_IQLT_R3, b43_ntab_iqlt1_r3);
+        ntab_upload(dev, B43_NTAB_C0_LOFEEDTH_R3, b43_ntab_loftlt0_r3);
+        ntab_upload(dev, B43_NTAB_C1_LOFEEDTH_R3, b43_ntab_loftlt1_r3);
+
+        /* Volatile tables */
+        if (antswlut < ARRAY_SIZE(b43_ntab_antswctl_r3))
+                ntab_upload(dev, B43_NTAB_ANT_SW_CTL_R3,
+                            b43_ntab_antswctl_r3[antswlut]);
+        else
+                B43_WARN_ON(1);
+}
+
+static void b43_nphy_tables_init_rev0(struct b43_wldev *dev)
 {
         /* Static tables */
         ntab_upload(dev, B43_NTAB_FRAMESTRUCT, b43_ntab_framestruct);
@@ -3130,48 +3176,13 @@ void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev)
         ntab_upload(dev, B43_NTAB_C1_LOFEEDTH, b43_ntab_loftlt1);
 }
 
-#define ntab_upload_r3(dev, offset, data) do { \
-                b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \
-        } while (0)
-void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables */
+void b43_nphy_tables_init(struct b43_wldev *dev)
 {
-        struct ssb_sprom *sprom = dev->dev->bus_sprom;
-
-        /* Static tables */
-        ntab_upload_r3(dev, B43_NTAB_FRAMESTRUCT_R3, b43_ntab_framestruct_r3);
-        ntab_upload_r3(dev, B43_NTAB_PILOT_R3, b43_ntab_pilot_r3);
-        ntab_upload_r3(dev, B43_NTAB_TMAP_R3, b43_ntab_tmap_r3);
-        ntab_upload_r3(dev, B43_NTAB_INTLEVEL_R3, b43_ntab_intlevel_r3);
-        ntab_upload_r3(dev, B43_NTAB_TDTRN_R3, b43_ntab_tdtrn_r3);
-        ntab_upload_r3(dev, B43_NTAB_NOISEVAR0_R3, b43_ntab_noisevar0_r3);
-        ntab_upload_r3(dev, B43_NTAB_NOISEVAR1_R3, b43_ntab_noisevar1_r3);
-        ntab_upload_r3(dev, B43_NTAB_MCS_R3, b43_ntab_mcs_r3);
-        ntab_upload_r3(dev, B43_NTAB_TDI20A0_R3, b43_ntab_tdi20a0_r3);
-        ntab_upload_r3(dev, B43_NTAB_TDI20A1_R3, b43_ntab_tdi20a1_r3);
-        ntab_upload_r3(dev, B43_NTAB_TDI40A0_R3, b43_ntab_tdi40a0_r3);
-        ntab_upload_r3(dev, B43_NTAB_TDI40A1_R3, b43_ntab_tdi40a1_r3);
-        ntab_upload_r3(dev, B43_NTAB_PILOTLT_R3, b43_ntab_pilotlt_r3);
-        ntab_upload_r3(dev, B43_NTAB_CHANEST_R3, b43_ntab_channelest_r3);
-        ntab_upload_r3(dev, B43_NTAB_FRAMELT_R3, b43_ntab_framelookup_r3);
-        ntab_upload_r3(dev, B43_NTAB_C0_ESTPLT_R3,
-                       b43_ntab_estimatepowerlt0_r3);
-        ntab_upload_r3(dev, B43_NTAB_C1_ESTPLT_R3,
-                       b43_ntab_estimatepowerlt1_r3);
-        ntab_upload_r3(dev, B43_NTAB_C0_ADJPLT_R3, b43_ntab_adjustpower0_r3);
-        ntab_upload_r3(dev, B43_NTAB_C1_ADJPLT_R3, b43_ntab_adjustpower1_r3);
-        ntab_upload_r3(dev, B43_NTAB_C0_GAINCTL_R3, b43_ntab_gainctl0_r3);
-        ntab_upload_r3(dev, B43_NTAB_C1_GAINCTL_R3, b43_ntab_gainctl1_r3);
-        ntab_upload_r3(dev, B43_NTAB_C0_IQLT_R3, b43_ntab_iqlt0_r3);
-        ntab_upload_r3(dev, B43_NTAB_C1_IQLT_R3, b43_ntab_iqlt1_r3);
-        ntab_upload_r3(dev, B43_NTAB_C0_LOFEEDTH_R3, b43_ntab_loftlt0_r3);
-        ntab_upload_r3(dev, B43_NTAB_C1_LOFEEDTH_R3, b43_ntab_loftlt1_r3);
-
-        /* Volatile tables */
-        if (sprom->fem.ghz2.antswlut < ARRAY_SIZE(b43_ntab_antswctl2g_r3))
-                ntab_upload_r3(dev, B43_NTAB_ANT_SW_CTL_R3,
-                               b43_ntab_antswctl2g_r3[sprom->fem.ghz2.antswlut]);
+        if (dev->phy.rev >= 3)
+                b43_nphy_tables_init_rev3(dev);
         else
-                B43_WARN_ON(1);
+                b43_nphy_tables_init_rev0(dev);
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index c600700ceedc..9ff33adcff89 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -115,22 +115,22 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
 #define B43_NTAB_NOISEVAR11_SIZE        256
 #define B43_NTAB_C0_ESTPLT              B43_NTAB8 (0x1A, 0x000) /* Estimate Power Lookup Table Core 0 */
 #define B43_NTAB_C0_ESTPLT_SIZE         64
-#define B43_NTAB_C1_ESTPLT              B43_NTAB8 (0x1B, 0x000) /* Estimate Power Lookup Table Core 1 */
-#define B43_NTAB_C1_ESTPLT_SIZE         64
 #define B43_NTAB_C0_ADJPLT              B43_NTAB8 (0x1A, 0x040) /* Adjust Power Lookup Table Core 0 */
 #define B43_NTAB_C0_ADJPLT_SIZE         128
-#define B43_NTAB_C1_ADJPLT              B43_NTAB8 (0x1B, 0x040) /* Adjust Power Lookup Table Core 1 */
-#define B43_NTAB_C1_ADJPLT_SIZE         128
 #define B43_NTAB_C0_GAINCTL             B43_NTAB32(0x1A, 0x0C0) /* Gain Control Lookup Table Core 0 */
 #define B43_NTAB_C0_GAINCTL_SIZE        128
-#define B43_NTAB_C1_GAINCTL             B43_NTAB32(0x1B, 0x0C0) /* Gain Control Lookup Table Core 1 */
-#define B43_NTAB_C1_GAINCTL_SIZE        128
 #define B43_NTAB_C0_IQLT                B43_NTAB32(0x1A, 0x140) /* IQ Lookup Table Core 0 */
 #define B43_NTAB_C0_IQLT_SIZE           128
-#define B43_NTAB_C1_IQLT                B43_NTAB32(0x1B, 0x140) /* IQ Lookup Table Core 1 */
-#define B43_NTAB_C1_IQLT_SIZE           128
 #define B43_NTAB_C0_LOFEEDTH            B43_NTAB16(0x1A, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 0 */
 #define B43_NTAB_C0_LOFEEDTH_SIZE       128
+#define B43_NTAB_C1_ESTPLT              B43_NTAB8 (0x1B, 0x000) /* Estimate Power Lookup Table Core 1 */
+#define B43_NTAB_C1_ESTPLT_SIZE         64
+#define B43_NTAB_C1_ADJPLT              B43_NTAB8 (0x1B, 0x040) /* Adjust Power Lookup Table Core 1 */
+#define B43_NTAB_C1_ADJPLT_SIZE         128
+#define B43_NTAB_C1_GAINCTL             B43_NTAB32(0x1B, 0x0C0) /* Gain Control Lookup Table Core 1 */
+#define B43_NTAB_C1_GAINCTL_SIZE        128
+#define B43_NTAB_C1_IQLT                B43_NTAB32(0x1B, 0x140) /* IQ Lookup Table Core 1 */
+#define B43_NTAB_C1_IQLT_SIZE           128
 #define B43_NTAB_C1_LOFEEDTH            B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */
 #define B43_NTAB_C1_LOFEEDTH_SIZE       128
 
@@ -154,15 +154,17 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
 #define B43_NTAB_CHANEST_R3             B43_NTAB32(22,   0) /* channel estimate  */
 #define B43_NTAB_FRAMELT_R3              B43_NTAB8(24,   0) /* frame lookup  */
 #define B43_NTAB_C0_ESTPLT_R3            B43_NTAB8(26,   0) /* estimated power lookup 0  */
-#define B43_NTAB_C1_ESTPLT_R3            B43_NTAB8(27,   0) /* estimated power lookup 1  */
 #define B43_NTAB_C0_ADJPLT_R3            B43_NTAB8(26,  64) /* adjusted power lookup 0  */
-#define B43_NTAB_C1_ADJPLT_R3            B43_NTAB8(27,  64) /* adjusted power lookup 1  */
 #define B43_NTAB_C0_GAINCTL_R3          B43_NTAB32(26, 192) /* gain control lookup 0  */
-#define B43_NTAB_C1_GAINCTL_R3          B43_NTAB32(27, 192) /* gain control lookup 1  */
 #define B43_NTAB_C0_IQLT_R3             B43_NTAB32(26, 320) /* I/Q lookup 0  */
-#define B43_NTAB_C1_IQLT_R3             B43_NTAB32(27, 320) /* I/Q lookup 1  */
 #define B43_NTAB_C0_LOFEEDTH_R3         B43_NTAB16(26, 448) /* Local Oscillator Feed Through lookup 0  */
+#define B43_NTAB_C0_PAPD_COMP_R3        B43_NTAB16(26, 576)
+#define B43_NTAB_C1_ESTPLT_R3            B43_NTAB8(27,   0) /* estimated power lookup 1  */
+#define B43_NTAB_C1_ADJPLT_R3            B43_NTAB8(27,  64) /* adjusted power lookup 1  */
+#define B43_NTAB_C1_GAINCTL_R3          B43_NTAB32(27, 192) /* gain control lookup 1  */
+#define B43_NTAB_C1_IQLT_R3             B43_NTAB32(27, 320) /* I/Q lookup 1  */
 #define B43_NTAB_C1_LOFEEDTH_R3         B43_NTAB16(27, 448) /* Local Oscillator Feed Through lookup 1 */
+#define B43_NTAB_C1_PAPD_COMP_R3        B43_NTAB16(27, 576)
 
 #define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_40_SIZE        18
 #define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_20_SIZE        18
@@ -182,8 +184,7 @@ void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value);
 void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
                           unsigned int nr_elements, const void *_data);
 
-void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev);
-void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev);
+void b43_nphy_tables_init(struct b43_wldev *dev);
 
 const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev);
 
diff --git a/drivers/net/wireless/b43/tables_phy_lcn.c b/drivers/net/wireless/b43/tables_phy_lcn.c
index 5176363cadf2..e347b8d80ea4 100644
--- a/drivers/net/wireless/b43/tables_phy_lcn.c
+++ b/drivers/net/wireless/b43/tables_phy_lcn.c
@@ -313,7 +313,7 @@ static const u32 b43_lcntab_0x18[] = {
  * TX gain.
  **************************************************/
 
-const struct b43_lcntab_tx_gain_tbl_entry
+static const struct b43_lcntab_tx_gain_tbl_entry
         b43_lcntab_tx_gain_tbl_2ghz_ext_pa_rev0[B43_LCNTAB_TX_GAIN_SIZE] = {
         { 0x03, 0x00, 0x1f, 0x0, 0x48 },
         { 0x03, 0x00, 0x1f, 0x0, 0x46 },
@@ -449,7 +449,7 @@ const struct b43_lcntab_tx_gain_tbl_entry
  * SW control.
  **************************************************/
 
-const u16 b43_lcntab_sw_ctl_4313_epa_rev0[] = {
+static const u16 b43_lcntab_sw_ctl_4313_epa_rev0[] = {
         0x0002, 0x0008, 0x0004, 0x0001, 0x0002, 0x0008,
         0x0004, 0x0001, 0x0002, 0x0008, 0x0004, 0x0001,
         0x0002, 0x0008, 0x0004, 0x0001, 0x0002, 0x0008,
@@ -631,7 +631,7 @@ static void b43_phy_lcn_upload_static_tables(struct b43_wldev *dev)
         lcntab_upload(dev, B43_LCNTAB32(0x18, 0), b43_lcntab_0x18);
 }
 
-void b43_phy_lcn_load_tx_gain_tab(struct b43_wldev *dev,
+static void b43_phy_lcn_load_tx_gain_tab(struct b43_wldev *dev,
                         const struct b43_lcntab_tx_gain_tbl_entry *gain_table)
 {
         u32 i;
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 2d3c6644f82d..faeafe219c57 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -334,13 +334,9 @@ static int alloc_ringmemory(struct b43legacy_dmaring *ring)
         ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev,
                                             B43legacy_DMA_RINGMEMSIZE,
                                             &(ring->dmabase),
-                                            GFP_KERNEL);
-        if (!ring->descbase) {
-                b43legacyerr(ring->dev->wl, "DMA ringmemory allocation"
-                             " failed\n");
+                                            GFP_KERNEL | __GFP_ZERO);
+        if (!ring->descbase)
                 return -ENOMEM;
-        }
-        memset(ring->descbase, 0, B43legacy_DMA_RINGMEMSIZE);
 
         return 0;
 }
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 8c3f70e1a013..572668821862 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2720,7 +2720,7 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
                 goto out_unlock_mutex;
 
         /* Switch the PHY mode (if necessary). */
-        switch (conf->channel->band) {
+        switch (conf->chandef.chan->band) {
         case IEEE80211_BAND_2GHZ:
                 if (phy->type == B43legacy_PHYTYPE_B)
                         new_phymode = B43legacy_PHYMODE_B;
@@ -2748,8 +2748,9 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
 
         /* Switch to the requested channel.
          * The firmware takes care of races with the TX handler. */
-        if (conf->channel->hw_value != phy->channel)
-                b43legacy_radio_selectchannel(dev, conf->channel->hw_value, 0);
+        if (conf->chandef.chan->hw_value != phy->channel)
+                b43legacy_radio_selectchannel(dev, conf->chandef.chan->hw_value,
+                                              0);
 
         dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_MONITOR);
 
@@ -3558,7 +3559,7 @@ static int b43legacy_op_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = SURVEY_INFO_NOISE_DBM;
         survey->noise = dev->stats.link_noise;
 
diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index 1d92d874ebb6..fc8a0fa6d3b2 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -12,8 +12,9 @@ config BRCMSMAC
         select CORDIC
         ---help---
           This module adds support for PCIe wireless adapters based on Broadcom
-          IEEE802.11n SoftMAC chipsets.  If you choose to build a module, it'll
-          be called brcmsmac.ko.
+          IEEE802.11n SoftMAC chipsets. It also has WLAN led support, which will
+          be available if you select BCMA_DRIVER_GPIO. If you choose to build a
+          module, the driver will be called brcmsmac.ko.
 
 config BRCMFMAC
         tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
@@ -36,15 +37,6 @@ config BRCMFMAC_SDIO
           IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to
           use the driver for a SDIO wireless card.
 
-config BRCMFMAC_SDIO_OOB
-        bool "Out of band interrupt support for SDIO interface chipset"
-        depends on BRCMFMAC_SDIO
-        ---help---
-          This option enables out-of-band interrupt support for Broadcom
-          SDIO Wifi chipset using fullmac in order to gain better
-          performance and deep sleep wake up capability on certain
-          platforms. Say N if you are unsure.
-
 config BRCMFMAC_USB
         bool "USB bus interface support for FullMAC driver"
         depends on USB
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
index 756e19fc2795..8e9b1221b32c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
@@ -26,10 +26,12 @@ brcmfmac-objs += \
                 wl_cfg80211.o \
                 fwil.o \
                 fweh.o \
+                fwsignal.o \
                 p2p.o \
                 dhd_cdc.o \
                 dhd_common.o \
-                dhd_linux.o
+                dhd_linux.o \
+                btcoex.o
 brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
                 dhd_sdio.o \
                 bcmsdh.o \
@@ -39,3 +41,5 @@ brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
                 usb.o
 brcmfmac-$(CONFIG_BRCMDBG) += \
                 dhd_dbg.o
+brcmfmac-$(CONFIG_BRCM_TRACING) += \
+                tracepoint.o
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 11fd1c735589..4891e3df2058 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -25,6 +25,7 @@
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/card.h>
+#include <linux/platform_data/brcmfmac-sdio.h>
 
 #include <defs.h>
 #include <brcm_hw_ids.h>
@@ -37,16 +38,15 @@
 
 #define SDIOH_API_ACCESS_RETRY_LIMIT    2
 
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
-static irqreturn_t brcmf_sdio_irqhandler(int irq, void *dev_id)
+
+static irqreturn_t brcmf_sdio_oob_irqhandler(int irq, void *dev_id)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(dev_id);
         struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
 
-        brcmf_dbg(INTR, "oob intr triggered\n");
+        brcmf_dbg(INTR, "OOB intr triggered\n");
 
-        /*
-         * out-of-band interrupt is level-triggered which won't
+        /* out-of-band interrupt is level-triggered which won't
          * be cleared until dpc
          */
         if (sdiodev->irq_en) {
@@ -59,72 +59,12 @@ static irqreturn_t brcmf_sdio_irqhandler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
-{
-        int ret = 0;
-        u8 data;
-        unsigned long flags;
-
-        brcmf_dbg(TRACE, "Entering: irq %d\n", sdiodev->irq);
-
-        ret = request_irq(sdiodev->irq, brcmf_sdio_irqhandler,
-                          sdiodev->irq_flags, "brcmf_oob_intr",
-                          &sdiodev->func[1]->dev);
-        if (ret != 0)
-                return ret;
-        spin_lock_init(&sdiodev->irq_en_lock);
-        spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
-        sdiodev->irq_en = true;
-        spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
-
-        ret = enable_irq_wake(sdiodev->irq);
-        if (ret != 0)
-                return ret;
-        sdiodev->irq_wake = true;
-
-        sdio_claim_host(sdiodev->func[1]);
-
-        /* must configure SDIO_CCCR_IENx to enable irq */
-        data = brcmf_sdio_regrb(sdiodev, SDIO_CCCR_IENx, &ret);
-        data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);
-
-        /* redirect, configure and enable io for interrupt signal */
-        data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
-        if (sdiodev->irq_flags & IRQF_TRIGGER_HIGH)
-                data |= SDIO_SEPINT_ACT_HI;
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
-
-        sdio_release_host(sdiodev->func[1]);
-
-        return 0;
-}
-
-int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
-{
-        brcmf_dbg(TRACE, "Entering\n");
-
-        sdio_claim_host(sdiodev->func[1]);
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
-        sdio_release_host(sdiodev->func[1]);
-
-        if (sdiodev->irq_wake) {
-                disable_irq_wake(sdiodev->irq);
-                sdiodev->irq_wake = false;
-        }
-        free_irq(sdiodev->irq, &sdiodev->func[1]->dev);
-        sdiodev->irq_en = false;
-
-        return 0;
-}
-#else           /* CONFIG_BRCMFMAC_SDIO_OOB */
-static void brcmf_sdio_irqhandler(struct sdio_func *func)
+static void brcmf_sdio_ib_irqhandler(struct sdio_func *func)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(&func->dev);
         struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
 
-        brcmf_dbg(INTR, "ib intr triggered\n");
+        brcmf_dbg(INTR, "IB intr triggered\n");
 
         brcmf_sdbrcm_isr(sdiodev->bus);
 }
@@ -136,28 +76,89 @@ static void brcmf_sdio_dummy_irqhandler(struct sdio_func *func)
 
 int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
 {
-        brcmf_dbg(TRACE, "Entering\n");
+        int ret = 0;
+        u8 data;
+        unsigned long flags;
 
-        sdio_claim_host(sdiodev->func[1]);
-        sdio_claim_irq(sdiodev->func[1], brcmf_sdio_irqhandler);
-        sdio_claim_irq(sdiodev->func[2], brcmf_sdio_dummy_irqhandler);
-        sdio_release_host(sdiodev->func[1]);
+        if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {
+                brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",
+                          sdiodev->pdata->oob_irq_nr);
+                ret = request_irq(sdiodev->pdata->oob_irq_nr,
+                                  brcmf_sdio_oob_irqhandler,
+                                  sdiodev->pdata->oob_irq_flags,
+                                  "brcmf_oob_intr",
+                                  &sdiodev->func[1]->dev);
+                if (ret != 0) {
+                        brcmf_err("request_irq failed %d\n", ret);
+                        return ret;
+                }
+                sdiodev->oob_irq_requested = true;
+                spin_lock_init(&sdiodev->irq_en_lock);
+                spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
+                sdiodev->irq_en = true;
+                spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
+
+                ret = enable_irq_wake(sdiodev->pdata->oob_irq_nr);
+                if (ret != 0) {
+                        brcmf_err("enable_irq_wake failed %d\n", ret);
+                        return ret;
+                }
+                sdiodev->irq_wake = true;
+
+                sdio_claim_host(sdiodev->func[1]);
+
+                /* must configure SDIO_CCCR_IENx to enable irq */
+                data = brcmf_sdio_regrb(sdiodev, SDIO_CCCR_IENx, &ret);
+                data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;
+                brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);
+
+                /* redirect, configure and enable io for interrupt signal */
+                data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
+                if (sdiodev->pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)
+                        data |= SDIO_SEPINT_ACT_HI;
+                brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
+
+                sdio_release_host(sdiodev->func[1]);
+        } else {
+                brcmf_dbg(SDIO, "Entering\n");
+                sdio_claim_host(sdiodev->func[1]);
+                sdio_claim_irq(sdiodev->func[1], brcmf_sdio_ib_irqhandler);
+                sdio_claim_irq(sdiodev->func[2], brcmf_sdio_dummy_irqhandler);
+                sdio_release_host(sdiodev->func[1]);
+        }
 
         return 0;
 }
 
 int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
 {
-        brcmf_dbg(TRACE, "Entering\n");
-
-        sdio_claim_host(sdiodev->func[1]);
-        sdio_release_irq(sdiodev->func[2]);
-        sdio_release_irq(sdiodev->func[1]);
-        sdio_release_host(sdiodev->func[1]);
+        brcmf_dbg(SDIO, "Entering\n");
+
+        if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {
+                sdio_claim_host(sdiodev->func[1]);
+                brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
+                brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
+                sdio_release_host(sdiodev->func[1]);
+
+                if (sdiodev->oob_irq_requested) {
+                        sdiodev->oob_irq_requested = false;
+                        if (sdiodev->irq_wake) {
+                                disable_irq_wake(sdiodev->pdata->oob_irq_nr);
+                                sdiodev->irq_wake = false;
+                        }
+                        free_irq(sdiodev->pdata->oob_irq_nr,
+                                 &sdiodev->func[1]->dev);
+                        sdiodev->irq_en = false;
+                }
+        } else {
+                sdio_claim_host(sdiodev->func[1]);
+                sdio_release_irq(sdiodev->func[2]);
+                sdio_release_irq(sdiodev->func[1]);
+                sdio_release_host(sdiodev->func[1]);
+        }
 
         return 0;
 }
-#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
 
 int
 brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
@@ -253,9 +254,9 @@ u8 brcmf_sdio_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
         u8 data;
         int retval;
 
-        brcmf_dbg(INFO, "addr:0x%08x\n", addr);
+        brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
         retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false);
-        brcmf_dbg(INFO, "data:0x%02x\n", data);
+        brcmf_dbg(SDIO, "data:0x%02x\n", data);
 
         if (ret)
                 *ret = retval;
@@ -268,9 +269,9 @@ u32 brcmf_sdio_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
         u32 data;
         int retval;
 
-        brcmf_dbg(INFO, "addr:0x%08x\n", addr);
+        brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
         retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false);
-        brcmf_dbg(INFO, "data:0x%08x\n", data);
+        brcmf_dbg(SDIO, "data:0x%08x\n", data);
 
         if (ret)
                 *ret = retval;
@@ -283,7 +284,7 @@ void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr,
 {
         int retval;
 
-        brcmf_dbg(INFO, "addr:0x%08x, data:0x%02x\n", addr, data);
+        brcmf_dbg(SDIO, "addr:0x%08x, data:0x%02x\n", addr, data);
         retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true);
 
         if (ret)
@@ -295,7 +296,7 @@ void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
 {
         int retval;
 
-        brcmf_dbg(INFO, "addr:0x%08x, data:0x%08x\n", addr, data);
+        brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
         retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true);
 
         if (ret)
@@ -358,7 +359,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
         uint width;
         int err = 0;
 
-        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
+        brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
                   fn, addr, pkt->len);
 
         width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
@@ -381,7 +382,7 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
         uint width;
         int err = 0;
 
-        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
+        brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
                   fn, addr, pktq->qlen);
 
         width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
@@ -428,7 +429,7 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
         uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
         int err = 0;
 
-        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
+        brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
                   fn, addr, pkt->len);
 
         /* Async not implemented yet */
@@ -457,48 +458,92 @@ done:
         return err;
 }
 
-int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
-                        u8 *buf, uint nbytes)
+int
+brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
+                 u8 *data, uint size)
 {
-        struct sk_buff *mypkt;
-        bool write = rw ? SDIOH_WRITE : SDIOH_READ;
-        int err;
+        int bcmerror = 0;
+        struct sk_buff *pkt;
+        u32 sdaddr;
+        uint dsize;
+
+        dsize = min_t(uint, SBSDIO_SB_OFT_ADDR_LIMIT, size);
+        pkt = dev_alloc_skb(dsize);
+        if (!pkt) {
+                brcmf_err("dev_alloc_skb failed: len %d\n", dsize);
+                return -EIO;
+        }
+        pkt->priority = 0;
 
-        addr &= SBSDIO_SB_OFT_ADDR_MASK;
-        addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
+        /* Determine initial transfer parameters */
+        sdaddr = address & SBSDIO_SB_OFT_ADDR_MASK;
+        if ((sdaddr + size) & SBSDIO_SBWINDOW_MASK)
+                dsize = (SBSDIO_SB_OFT_ADDR_LIMIT - sdaddr);
+        else
+                dsize = size;
 
-        mypkt = brcmu_pkt_buf_get_skb(nbytes);
-        if (!mypkt) {
-                brcmf_err("brcmu_pkt_buf_get_skb failed: len %d\n",
-                          nbytes);
-                return -EIO;
+        sdio_claim_host(sdiodev->func[1]);
+
+        /* Do the transfer(s) */
+        while (size) {
+                /* Set the backplane window to include the start address */
+                bcmerror = brcmf_sdcard_set_sbaddr_window(sdiodev, address);
+                if (bcmerror)
+                        break;
+
+                brcmf_dbg(SDIO, "%s %d bytes at offset 0x%08x in window 0x%08x\n",
+                          write ? "write" : "read", dsize,
+                          sdaddr, address & SBSDIO_SBWINDOW_MASK);
+
+                sdaddr &= SBSDIO_SB_OFT_ADDR_MASK;
+                sdaddr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
+
+                skb_put(pkt, dsize);
+                if (write)
+                        memcpy(pkt->data, data, dsize);
+                bcmerror = brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC,
+                                                      write, SDIO_FUNC_1,
+                                                      sdaddr, pkt);
+                if (bcmerror) {
+                        brcmf_err("membytes transfer failed\n");
+                        break;
+                }
+                if (!write)
+                        memcpy(data, pkt->data, dsize);
+                skb_trim(pkt, dsize);
+
+                /* Adjust for next transfer (if any) */
+                size -= dsize;
+                if (size) {
+                        data += dsize;
+                        address += dsize;
+                        sdaddr = 0;
+                        dsize = min_t(uint, SBSDIO_SB_OFT_ADDR_LIMIT, size);
+                }
         }
 
-        /* For a write, copy the buffer data into the packet. */
-        if (write)
-                memcpy(mypkt->data, buf, nbytes);
+        dev_kfree_skb(pkt);
 
-        err = brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC, write,
-                                         SDIO_FUNC_1, addr, mypkt);
+        /* Return the window to backplane enumeration space for core access */
+        if (brcmf_sdcard_set_sbaddr_window(sdiodev, sdiodev->sbwad))
+                brcmf_err("FAILED to set window back to 0x%x\n",
+                          sdiodev->sbwad);
 
-        /* For a read, copy the packet data back to the buffer. */
-        if (!err && !write)
-                memcpy(buf, mypkt->data, nbytes);
+        sdio_release_host(sdiodev->func[1]);
 
-        brcmu_pkt_buf_free_skb(mypkt);
-        return err;
+        return bcmerror;
 }
 
 int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
 {
         char t_func = (char)fn;
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         /* issue abort cmd52 command through F0 */
         brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0,
                                  SDIO_CCCR_ABORT, &t_func);
 
-        brcmf_dbg(TRACE, "Exit\n");
+        brcmf_dbg(SDIO, "Exit\n");
         return 0;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index d92d373733d7..44fa0cdbf97b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -26,6 +26,7 @@
 #include <linux/sched.h>        /* request_irq() */
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/brcmfmac-sdio.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
@@ -40,32 +41,30 @@
 
 #define DMA_ALIGN_MASK  0x03
 
+#define SDIO_DEVICE_ID_BROADCOM_43143   43143
 #define SDIO_DEVICE_ID_BROADCOM_43241   0x4324
 #define SDIO_DEVICE_ID_BROADCOM_4329    0x4329
 #define SDIO_DEVICE_ID_BROADCOM_4330    0x4330
 #define SDIO_DEVICE_ID_BROADCOM_4334    0x4334
+#define SDIO_DEVICE_ID_BROADCOM_4335    0x4335
 
 #define SDIO_FUNC1_BLOCKSIZE            64
 #define SDIO_FUNC2_BLOCKSIZE            512
 
 /* devices we support, null terminated */
 static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+        {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43143)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43241)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)},
+        {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4335)},
         { /* end: all zeroes */ },
 };
 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
 
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
-static struct list_head oobirq_lh;
-struct brcmf_sdio_oobirq {
-        unsigned int irq;
-        unsigned long flags;
-        struct list_head list;
-};
-#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
+static struct brcmfmac_sdio_platform_data *brcmfmac_sdio_pdata;
+
 
 static bool
 brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev)
@@ -139,7 +138,7 @@ int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
 {
         int err_ret;
 
-        brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);
+        brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);
 
         brcmf_pm_resume_wait(sdiodev, &sdiodev->request_byte_wait);
         if (brcmf_pm_resume_error(sdiodev))
@@ -179,7 +178,7 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,
                 return -EINVAL;
         }
 
-        brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
+        brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
                   rw, func, addr, nbytes);
 
         brcmf_pm_resume_wait(sdiodev, &sdiodev->request_word_wait);
@@ -252,7 +251,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
 
         struct sk_buff *pkt;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         brcmf_pm_resume_wait(sdiodev, &sdiodev->request_chain_wait);
         if (brcmf_pm_resume_error(sdiodev))
@@ -270,7 +269,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
                                   write ? "TX" : "RX", pkt, SGCount, addr,
                                   pkt_len, err_ret);
                 } else {
-                        brcmf_dbg(TRACE, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",
+                        brcmf_dbg(SDIO, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",
                                   write ? "TX" : "RX", pkt, SGCount, addr,
                                   pkt_len);
                 }
@@ -280,7 +279,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
                 SGCount++;
         }
 
-        brcmf_dbg(TRACE, "Exit\n");
+        brcmf_dbg(SDIO, "Exit\n");
         return err_ret;
 }
 
@@ -295,7 +294,7 @@ int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
         uint pkt_len;
         bool fifo = (fix_inc == SDIOH_DATA_FIX);
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         if (pkt == NULL)
                 return -EINVAL;
@@ -314,7 +313,7 @@ int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
                 brcmf_err("%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",
                           write ? "TX" : "RX", pkt, addr, pkt_len, status);
         } else {
-                brcmf_dbg(TRACE, "%s xfr'd %p, addr=0x%05x, len=%d\n",
+                brcmf_dbg(SDIO, "%s xfr'd %p, addr=0x%05x, len=%d\n",
                           write ? "TX" : "RX", pkt, addr, pkt_len);
         }
 
@@ -350,12 +349,12 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)
         u32 fbraddr;
         u8 func;
 
-        brcmf_dbg(TRACE, "\n");
+        brcmf_dbg(SDIO, "\n");
 
         /* Get the Card's common CIS address */
         sdiodev->func_cis_ptr[0] = brcmf_sdioh_get_cisaddr(sdiodev,
                                                            SDIO_CCCR_CIS);
-        brcmf_dbg(INFO, "Card's Common CIS Ptr = 0x%x\n",
+        brcmf_dbg(SDIO, "Card's Common CIS Ptr = 0x%x\n",
                   sdiodev->func_cis_ptr[0]);
 
         /* Get the Card's function CIS (for each function) */
@@ -363,7 +362,7 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)
              func <= sdiodev->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {
                 sdiodev->func_cis_ptr[func] =
                     brcmf_sdioh_get_cisaddr(sdiodev, SDIO_FBR_CIS + fbraddr);
-                brcmf_dbg(INFO, "Function %d CIS Ptr = 0x%x\n",
+                brcmf_dbg(SDIO, "Function %d CIS Ptr = 0x%x\n",
                           func, sdiodev->func_cis_ptr[func]);
         }
 
@@ -382,7 +381,7 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
 {
         int err_ret = 0;
 
-        brcmf_dbg(TRACE, "\n");
+        brcmf_dbg(SDIO, "\n");
 
         sdiodev->num_funcs = 2;
 
@@ -404,13 +403,13 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
 
 out:
         sdio_release_host(sdiodev->func[1]);
-        brcmf_dbg(TRACE, "Done\n");
+        brcmf_dbg(SDIO, "Done\n");
         return err_ret;
 }
 
 void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)
 {
-        brcmf_dbg(TRACE, "\n");
+        brcmf_dbg(SDIO, "\n");
 
         /* Disable Function 2 */
         sdio_claim_host(sdiodev->func[2]);
@@ -424,33 +423,6 @@ void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)
 
 }
 
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
-static int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev)
-{
-        struct brcmf_sdio_oobirq *oobirq_entry;
-
-        if (list_empty(&oobirq_lh)) {
-                brcmf_err("no valid oob irq resource\n");
-                return -ENXIO;
-        }
-
-        oobirq_entry = list_first_entry(&oobirq_lh, struct brcmf_sdio_oobirq,
-                                        list);
-
-        sdiodev->irq = oobirq_entry->irq;
-        sdiodev->irq_flags = oobirq_entry->flags;
-        list_del(&oobirq_entry->list);
-        kfree(oobirq_entry);
-
-        return 0;
-}
-#else
-static inline int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev)
-{
-        return 0;
-}
-#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
-
 static int brcmf_ops_sdio_probe(struct sdio_func *func,
                                 const struct sdio_device_id *id)
 {
@@ -458,11 +430,11 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
         struct brcmf_sdio_dev *sdiodev;
         struct brcmf_bus *bus_if;
 
-        brcmf_dbg(TRACE, "Enter\n");
-        brcmf_dbg(TRACE, "Class=%x\n", func->class);
-        brcmf_dbg(TRACE, "sdio vendor ID: 0x%04x\n", func->vendor);
-        brcmf_dbg(TRACE, "sdio device ID: 0x%04x\n", func->device);
-        brcmf_dbg(TRACE, "Function#: %d\n", func->num);
+        brcmf_dbg(SDIO, "Enter\n");
+        brcmf_dbg(SDIO, "Class=%x\n", func->class);
+        brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);
+        brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
+        brcmf_dbg(SDIO, "Function#: %d\n", func->num);
 
         /* Consume func num 1 but dont do anything with it. */
         if (func->num == 1)
@@ -491,23 +463,21 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
         dev_set_drvdata(&func->dev, bus_if);
         dev_set_drvdata(&sdiodev->func[1]->dev, bus_if);
         sdiodev->dev = &sdiodev->func[1]->dev;
+        sdiodev->pdata = brcmfmac_sdio_pdata;
 
         atomic_set(&sdiodev->suspend, false);
         init_waitqueue_head(&sdiodev->request_byte_wait);
         init_waitqueue_head(&sdiodev->request_word_wait);
         init_waitqueue_head(&sdiodev->request_chain_wait);
         init_waitqueue_head(&sdiodev->request_buffer_wait);
-        err = brcmf_sdio_getintrcfg(sdiodev);
-        if (err)
-                goto fail;
 
-        brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");
+        brcmf_dbg(SDIO, "F2 found, calling brcmf_sdio_probe...\n");
         err = brcmf_sdio_probe(sdiodev);
         if (err) {
                 brcmf_err("F2 error, probe failed %d...\n", err);
                 goto fail;
         }
-        brcmf_dbg(TRACE, "F2 init completed...\n");
+        brcmf_dbg(SDIO, "F2 init completed...\n");
         return 0;
 
 fail:
@@ -523,10 +493,10 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
         struct brcmf_bus *bus_if;
         struct brcmf_sdio_dev *sdiodev;
 
-        brcmf_dbg(TRACE, "Enter\n");
-        brcmf_dbg(TRACE, "sdio vendor ID: 0x%04x\n", func->vendor);
-        brcmf_dbg(TRACE, "sdio device ID: 0x%04x\n", func->device);
-        brcmf_dbg(TRACE, "Function: %d\n", func->num);
+        brcmf_dbg(SDIO, "Enter\n");
+        brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);
+        brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
+        brcmf_dbg(SDIO, "Function: %d\n", func->num);
 
         if (func->num != 1 && func->num != 2)
                 return;
@@ -543,7 +513,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
                 kfree(sdiodev);
         }
 
-        brcmf_dbg(TRACE, "Exit\n");
+        brcmf_dbg(SDIO, "Exit\n");
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -554,7 +524,7 @@ static int brcmf_sdio_suspend(struct device *dev)
         struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
         int ret = 0;
 
-        brcmf_dbg(TRACE, "\n");
+        brcmf_dbg(SDIO, "\n");
 
         atomic_set(&sdiodev->suspend, true);
 
@@ -594,7 +564,7 @@ static const struct dev_pm_ops brcmf_sdio_pm_ops = {
 static struct sdio_driver brcmf_sdmmc_driver = {
         .probe = brcmf_ops_sdio_probe,
         .remove = brcmf_ops_sdio_remove,
-        .name = "brcmfmac",
+        .name = BRCMFMAC_SDIO_PDATA_NAME,
         .id_table = brcmf_sdmmc_ids,
 #ifdef CONFIG_PM_SLEEP
         .drv = {
@@ -603,83 +573,65 @@ static struct sdio_driver brcmf_sdmmc_driver = {
 #endif  /* CONFIG_PM_SLEEP */
 };
 
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
 static int brcmf_sdio_pd_probe(struct platform_device *pdev)
 {
-        struct resource *res;
-        struct brcmf_sdio_oobirq *oobirq_entry;
-        int i, ret;
+        int ret;
 
-        INIT_LIST_HEAD(&oobirq_lh);
+        brcmf_dbg(SDIO, "Enter\n");
 
-        for (i = 0; ; i++) {
-                res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
-                if (!res)
-                        break;
+        brcmfmac_sdio_pdata = pdev->dev.platform_data;
 
-                oobirq_entry = kzalloc(sizeof(struct brcmf_sdio_oobirq),
-                                       GFP_KERNEL);
-                if (!oobirq_entry)
-                        return -ENOMEM;
-                oobirq_entry->irq = res->start;
-                oobirq_entry->flags = res->flags & IRQF_TRIGGER_MASK;
-                list_add_tail(&oobirq_entry->list, &oobirq_lh);
-        }
-        if (i == 0)
-                return -ENXIO;
+        if (brcmfmac_sdio_pdata->power_on)
+                brcmfmac_sdio_pdata->power_on();
 
         ret = sdio_register_driver(&brcmf_sdmmc_driver);
-
         if (ret)
                 brcmf_err("sdio_register_driver failed: %d\n", ret);
 
         return ret;
 }
 
-static struct platform_driver brcmf_sdio_pd = {
-        .probe          = brcmf_sdio_pd_probe,
-        .driver         = {
-                .name   = "brcmf_sdio_pd"
-        }
-};
-
-void brcmf_sdio_exit(void)
+static int brcmf_sdio_pd_remove(struct platform_device *pdev)
 {
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
+
+        if (brcmfmac_sdio_pdata->power_off)
+                brcmfmac_sdio_pdata->power_off();
 
         sdio_unregister_driver(&brcmf_sdmmc_driver);
 
-        platform_driver_unregister(&brcmf_sdio_pd);
+        return 0;
 }
 
-void brcmf_sdio_init(void)
-{
-        int ret;
-
-        brcmf_dbg(TRACE, "Enter\n");
-
-        ret = platform_driver_register(&brcmf_sdio_pd);
+static struct platform_driver brcmf_sdio_pd = {
+        .remove         = brcmf_sdio_pd_remove,
+        .driver         = {
+                .name   = BRCMFMAC_SDIO_PDATA_NAME
+        }
+};
 
-        if (ret)
-                brcmf_err("platform_driver_register failed: %d\n", ret);
-}
-#else
 void brcmf_sdio_exit(void)
 {
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
-        sdio_unregister_driver(&brcmf_sdmmc_driver);
+        if (brcmfmac_sdio_pdata)
+                platform_driver_unregister(&brcmf_sdio_pd);
+        else
+                sdio_unregister_driver(&brcmf_sdmmc_driver);
 }
 
 void brcmf_sdio_init(void)
 {
         int ret;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
-        ret = sdio_register_driver(&brcmf_sdmmc_driver);
+        ret = platform_driver_probe(&brcmf_sdio_pd, brcmf_sdio_pd_probe);
+        if (ret == -ENODEV) {
+                brcmf_dbg(SDIO, "No platform data available, registering without.\n");
+                ret = sdio_register_driver(&brcmf_sdmmc_driver);
+        }
 
         if (ret)
-                brcmf_err("sdio_register_driver failed: %d\n", ret);
+                brcmf_err("driver registration failed: %d\n", ret);
 }
-#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c
new file mode 100644
index 000000000000..0cb591b050b3
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c
@@ -0,0 +1,497 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <linux/slab.h>
+#include <linux/netdevice.h>
+#include <net/cfg80211.h>
+
+#include <brcmu_wifi.h>
+#include <brcmu_utils.h>
+#include <defs.h>
+#include <dhd.h>
+#include <dhd_dbg.h>
+#include "fwil.h"
+#include "fwil_types.h"
+#include "btcoex.h"
+#include "p2p.h"
+#include "wl_cfg80211.h"
+
+/* T1 start SCO/eSCO priority suppression */
+#define BRCMF_BTCOEX_OPPR_WIN_TIME   2000
+
+/* BT registers values during DHCP */
+#define BRCMF_BT_DHCP_REG50 0x8022
+#define BRCMF_BT_DHCP_REG51 0
+#define BRCMF_BT_DHCP_REG64 0
+#define BRCMF_BT_DHCP_REG65 0
+#define BRCMF_BT_DHCP_REG71 0
+#define BRCMF_BT_DHCP_REG66 0x2710
+#define BRCMF_BT_DHCP_REG41 0x33
+#define BRCMF_BT_DHCP_REG68 0x190
+
+/* number of samples for SCO detection */
+#define BRCMF_BT_SCO_SAMPLES 12
+
+/**
+* enum brcmf_btcoex_state - BT coex DHCP state machine states
+* @BRCMF_BT_DHCP_IDLE: DCHP is idle
+* @BRCMF_BT_DHCP_START: DHCP started, wait before
+*       boosting wifi priority
+* @BRCMF_BT_DHCP_OPPR_WIN: graceful DHCP opportunity ended,
+*       boost wifi priority
+* @BRCMF_BT_DHCP_FLAG_FORCE_TIMEOUT: wifi priority boost end,
+*       restore defaults
+*/
+enum brcmf_btcoex_state {
+        BRCMF_BT_DHCP_IDLE,
+        BRCMF_BT_DHCP_START,
+        BRCMF_BT_DHCP_OPPR_WIN,
+        BRCMF_BT_DHCP_FLAG_FORCE_TIMEOUT
+};
+
+/**
+ * struct brcmf_btcoex_info - BT coex related information
+ * @vif: interface for which request was done.
+ * @timer: timer for DHCP state machine
+ * @timeout: configured timeout.
+ * @timer_on:  DHCP timer active
+ * @dhcp_done: DHCP finished before T1/T2 timer expiration
+ * @bt_state: DHCP state machine state
+ * @work: DHCP state machine work
+ * @cfg: driver private data for cfg80211 interface
+ * @reg66: saved value of btc_params 66
+ * @reg41: saved value of btc_params 41
+ * @reg68: saved value of btc_params 68
+ * @saved_regs_part1: flag indicating regs 66,41,68
+ *      have been saved
+ * @reg51: saved value of btc_params 51
+ * @reg64: saved value of btc_params 64
+ * @reg65: saved value of btc_params 65
+ * @reg71: saved value of btc_params 71
+ * @saved_regs_part1: flag indicating regs 50,51,64,65,71
+ *      have been saved
+ */
+struct brcmf_btcoex_info {
+        struct brcmf_cfg80211_vif *vif;
+        struct timer_list timer;
+        u16 timeout;
+        bool timer_on;
+        bool dhcp_done;
+        enum brcmf_btcoex_state bt_state;
+        struct work_struct work;
+        struct brcmf_cfg80211_info *cfg;
+        u32 reg66;
+        u32 reg41;
+        u32 reg68;
+        bool saved_regs_part1;
+        u32 reg50;
+        u32 reg51;
+        u32 reg64;
+        u32 reg65;
+        u32 reg71;
+        bool saved_regs_part2;
+};
+
+/**
+ * brcmf_btcoex_params_write() - write btc_params firmware variable
+ * @ifp: interface
+ * @addr: btc_params register number
+ * @data: data to write
+ */
+static s32 brcmf_btcoex_params_write(struct brcmf_if *ifp, u32 addr, u32 data)
+{
+        struct {
+                __le32 addr;
+                __le32 data;
+        } reg_write;
+
+        reg_write.addr = cpu_to_le32(addr);
+        reg_write.data = cpu_to_le32(data);
+        return brcmf_fil_iovar_data_set(ifp, "btc_params",
+                                        &reg_write, sizeof(reg_write));
+}
+
+/**
+ * brcmf_btcoex_params_read() - read btc_params firmware variable
+ * @ifp: interface
+ * @addr: btc_params register number
+ * @data: read data
+ */
+static s32 brcmf_btcoex_params_read(struct brcmf_if *ifp, u32 addr, u32 *data)
+{
+        *data = addr;
+
+        return brcmf_fil_iovar_int_get(ifp, "btc_params", data);
+}
+
+/**
+ * brcmf_btcoex_boost_wifi() - control BT SCO/eSCO parameters
+ * @btci: BT coex info
+ * @trump_sco:
+ *      true - set SCO/eSCO parameters for compatibility
+ *              during DHCP window
+ *      false - restore saved parameter values
+ *
+ * Enhanced BT COEX settings for eSCO compatibility during DHCP window
+ */
+static void brcmf_btcoex_boost_wifi(struct brcmf_btcoex_info *btci,
+                                    bool trump_sco)
+{
+        struct brcmf_if *ifp = btci->cfg->pub->iflist[0];
+
+        if (trump_sco && !btci->saved_regs_part2) {
+                /* this should reduce eSCO agressive
+                 * retransmit w/o breaking it
+                 */
+
+                /* save current */
+                brcmf_dbg(TRACE, "new SCO/eSCO coex algo {save & override}\n");
+                brcmf_btcoex_params_read(ifp, 50, &btci->reg50);
+                brcmf_btcoex_params_read(ifp, 51, &btci->reg51);
+                brcmf_btcoex_params_read(ifp, 64, &btci->reg64);
+                brcmf_btcoex_params_read(ifp, 65, &btci->reg65);
+                brcmf_btcoex_params_read(ifp, 71, &btci->reg71);
+
+                btci->saved_regs_part2 = true;
+                brcmf_dbg(TRACE,
+                          "saved bt_params[50,51,64,65,71]: 0x%x 0x%x 0x%x 0x%x 0x%x\n",
+                          btci->reg50, btci->reg51, btci->reg64,
+                          btci->reg65, btci->reg71);
+
+                /* pacify the eSco   */
+                brcmf_btcoex_params_write(ifp, 50, BRCMF_BT_DHCP_REG50);
+                brcmf_btcoex_params_write(ifp, 51, BRCMF_BT_DHCP_REG51);
+                brcmf_btcoex_params_write(ifp, 64, BRCMF_BT_DHCP_REG64);
+                brcmf_btcoex_params_write(ifp, 65, BRCMF_BT_DHCP_REG65);
+                brcmf_btcoex_params_write(ifp, 71, BRCMF_BT_DHCP_REG71);
+
+        } else if (btci->saved_regs_part2) {
+                /* restore previously saved bt params */
+                brcmf_dbg(TRACE, "Do new SCO/eSCO coex algo {restore}\n");
+                brcmf_btcoex_params_write(ifp, 50, btci->reg50);
+                brcmf_btcoex_params_write(ifp, 51, btci->reg51);
+                brcmf_btcoex_params_write(ifp, 64, btci->reg64);
+                brcmf_btcoex_params_write(ifp, 65, btci->reg65);
+                brcmf_btcoex_params_write(ifp, 71, btci->reg71);
+
+                brcmf_dbg(TRACE,
+                          "restored bt_params[50,51,64,65,71]: 0x%x 0x%x 0x%x 0x%x 0x%x\n",
+                          btci->reg50, btci->reg51, btci->reg64,
+                          btci->reg65, btci->reg71);
+
+                btci->saved_regs_part2 = false;
+        } else {
+                brcmf_err("attempted to restore not saved BTCOEX params\n");
+        }
+}
+
+/**
+ * brcmf_btcoex_is_sco_active() - check if SCO/eSCO is active
+ * @ifp: interface
+ *
+ * return: true if SCO/eSCO session is active
+ */
+static bool brcmf_btcoex_is_sco_active(struct brcmf_if *ifp)
+{
+        int ioc_res = 0;
+        bool res = false;
+        int sco_id_cnt = 0;
+        u32 param27;
+        int i;
+
+        for (i = 0; i < BRCMF_BT_SCO_SAMPLES; i++) {
+                ioc_res = brcmf_btcoex_params_read(ifp, 27, &param27);
+
+                if (ioc_res < 0) {
+                        brcmf_err("ioc read btc params error\n");
+                        break;
+                }
+
+                brcmf_dbg(TRACE, "sample[%d], btc_params 27:%x\n", i, param27);
+
+                if ((param27 & 0x6) == 2) { /* count both sco & esco  */
+                        sco_id_cnt++;
+                }
+
+                if (sco_id_cnt > 2) {
+                        brcmf_dbg(TRACE,
+                                  "sco/esco detected, pkt id_cnt:%d samples:%d\n",
+                                  sco_id_cnt, i);
+                        res = true;
+                        break;
+                }
+        }
+        brcmf_dbg(TRACE, "exit: result=%d\n", res);
+        return res;
+}
+
+/**
+ * btcmf_btcoex_save_part1() - save first step parameters.
+ */
+static void btcmf_btcoex_save_part1(struct brcmf_btcoex_info *btci)
+{
+        struct brcmf_if *ifp = btci->vif->ifp;
+
+        if (!btci->saved_regs_part1) {
+                /* Retrieve and save original reg value */
+                brcmf_btcoex_params_read(ifp, 66, &btci->reg66);
+                brcmf_btcoex_params_read(ifp, 41, &btci->reg41);
+                brcmf_btcoex_params_read(ifp, 68, &btci->reg68);
+                btci->saved_regs_part1 = true;
+                brcmf_dbg(TRACE,
+                          "saved btc_params regs (66,41,68) 0x%x 0x%x 0x%x\n",
+                          btci->reg66, btci->reg41,
+                          btci->reg68);
+        }
+}
+
+/**
+ * brcmf_btcoex_restore_part1() - restore first step parameters.
+ */
+static void brcmf_btcoex_restore_part1(struct brcmf_btcoex_info *btci)
+{
+        struct brcmf_if *ifp;
+
+        if (btci->saved_regs_part1) {
+                btci->saved_regs_part1 = false;
+                ifp = btci->vif->ifp;
+                brcmf_btcoex_params_write(ifp, 66, btci->reg66);
+                brcmf_btcoex_params_write(ifp, 41, btci->reg41);
+                brcmf_btcoex_params_write(ifp, 68, btci->reg68);
+                brcmf_dbg(TRACE,
+                          "restored btc_params regs {66,41,68} 0x%x 0x%x 0x%x\n",
+                          btci->reg66, btci->reg41,
+                          btci->reg68);
+        }
+}
+
+/**
+ * brcmf_btcoex_timerfunc() - BT coex timer callback
+ */
+static void brcmf_btcoex_timerfunc(ulong data)
+{
+        struct brcmf_btcoex_info *bt_local = (struct brcmf_btcoex_info *)data;
+        brcmf_dbg(TRACE, "enter\n");
+
+        bt_local->timer_on = false;
+        schedule_work(&bt_local->work);
+}
+
+/**
+ * brcmf_btcoex_handler() - BT coex state machine work handler
+ * @work: work
+ */
+static void brcmf_btcoex_handler(struct work_struct *work)
+{
+        struct brcmf_btcoex_info *btci;
+        btci = container_of(work, struct brcmf_btcoex_info, work);
+        if (btci->timer_on) {
+                btci->timer_on = false;
+                del_timer_sync(&btci->timer);
+        }
+
+        switch (btci->bt_state) {
+        case BRCMF_BT_DHCP_START:
+                /* DHCP started provide OPPORTUNITY window
+                   to get DHCP address
+                */
+                brcmf_dbg(TRACE, "DHCP started\n");
+                btci->bt_state = BRCMF_BT_DHCP_OPPR_WIN;
+                if (btci->timeout < BRCMF_BTCOEX_OPPR_WIN_TIME) {
+                        mod_timer(&btci->timer, btci->timer.expires);
+                } else {
+                        btci->timeout -= BRCMF_BTCOEX_OPPR_WIN_TIME;
+                        mod_timer(&btci->timer,
+                                  jiffies +
+                                  msecs_to_jiffies(BRCMF_BTCOEX_OPPR_WIN_TIME));
+                }
+                btci->timer_on = true;
+                break;
+
+        case BRCMF_BT_DHCP_OPPR_WIN:
+                if (btci->dhcp_done) {
+                        brcmf_dbg(TRACE, "DHCP done before T1 expiration\n");
+                        goto idle;
+                }
+
+                /* DHCP is not over yet, start lowering BT priority */
+                brcmf_dbg(TRACE, "DHCP T1:%d expired\n",
+                          BRCMF_BTCOEX_OPPR_WIN_TIME);
+                brcmf_btcoex_boost_wifi(btci, true);
+
+                btci->bt_state = BRCMF_BT_DHCP_FLAG_FORCE_TIMEOUT;
+                mod_timer(&btci->timer,
+                          jiffies + msecs_to_jiffies(btci->timeout));
+                btci->timer_on = true;
+                break;
+
+        case BRCMF_BT_DHCP_FLAG_FORCE_TIMEOUT:
+                if (btci->dhcp_done)
+                        brcmf_dbg(TRACE, "DHCP done before T2 expiration\n");
+                else
+                        brcmf_dbg(TRACE, "DHCP T2:%d expired\n",
+                                  BRCMF_BT_DHCP_FLAG_FORCE_TIMEOUT);
+
+                goto idle;
+
+        default:
+                brcmf_err("invalid state=%d !!!\n", btci->bt_state);
+                goto idle;
+        }
+
+        return;
+
+idle:
+        btci->bt_state = BRCMF_BT_DHCP_IDLE;
+        btci->timer_on = false;
+        brcmf_btcoex_boost_wifi(btci, false);
+        cfg80211_crit_proto_stopped(&btci->vif->wdev, GFP_KERNEL);
+        brcmf_btcoex_restore_part1(btci);
+        btci->vif = NULL;
+}
+
+/**
+ * brcmf_btcoex_attach() - initialize BT coex data
+ * @cfg: driver private cfg80211 data
+ *
+ * return: 0 on success
+ */
+int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg)
+{
+        struct brcmf_btcoex_info *btci = NULL;
+        brcmf_dbg(TRACE, "enter\n");
+
+        btci = kmalloc(sizeof(struct brcmf_btcoex_info), GFP_KERNEL);
+        if (!btci)
+                return -ENOMEM;
+
+        btci->bt_state = BRCMF_BT_DHCP_IDLE;
+
+        /* Set up timer for BT  */
+        btci->timer_on = false;
+        btci->timeout = BRCMF_BTCOEX_OPPR_WIN_TIME;
+        init_timer(&btci->timer);
+        btci->timer.data = (ulong)btci;
+        btci->timer.function = brcmf_btcoex_timerfunc;
+        btci->cfg = cfg;
+        btci->saved_regs_part1 = false;
+        btci->saved_regs_part2 = false;
+
+        INIT_WORK(&btci->work, brcmf_btcoex_handler);
+
+        cfg->btcoex = btci;
+        return 0;
+}
+
+/**
+ * brcmf_btcoex_detach - clean BT coex data
+ * @cfg: driver private cfg80211 data
+ */
+void brcmf_btcoex_detach(struct brcmf_cfg80211_info *cfg)
+{
+        brcmf_dbg(TRACE, "enter\n");
+
+        if (!cfg->btcoex)
+                return;
+
+        if (cfg->btcoex->timer_on) {
+                cfg->btcoex->timer_on = false;
+                del_timer_sync(&cfg->btcoex->timer);
+        }
+
+        cancel_work_sync(&cfg->btcoex->work);
+
+        brcmf_btcoex_boost_wifi(cfg->btcoex, false);
+        brcmf_btcoex_restore_part1(cfg->btcoex);
+
+        kfree(cfg->btcoex);
+        cfg->btcoex = NULL;
+}
+
+static void brcmf_btcoex_dhcp_start(struct brcmf_btcoex_info *btci)
+{
+        struct brcmf_if *ifp = btci->vif->ifp;
+
+        btcmf_btcoex_save_part1(btci);
+        /* set new regs values */
+        brcmf_btcoex_params_write(ifp, 66, BRCMF_BT_DHCP_REG66);
+        brcmf_btcoex_params_write(ifp, 41, BRCMF_BT_DHCP_REG41);
+        brcmf_btcoex_params_write(ifp, 68, BRCMF_BT_DHCP_REG68);
+        btci->dhcp_done = false;
+        btci->bt_state = BRCMF_BT_DHCP_START;
+        schedule_work(&btci->work);
+        brcmf_dbg(TRACE, "enable BT DHCP Timer\n");
+}
+
+static void brcmf_btcoex_dhcp_end(struct brcmf_btcoex_info *btci)
+{
+        /* Stop any bt timer because DHCP session is done */
+        btci->dhcp_done = true;
+        if (btci->timer_on) {
+                brcmf_dbg(TRACE, "disable BT DHCP Timer\n");
+                btci->timer_on = false;
+                del_timer_sync(&btci->timer);
+
+                /* schedule worker if transition to IDLE is needed */
+                if (btci->bt_state != BRCMF_BT_DHCP_IDLE) {
+                        brcmf_dbg(TRACE, "bt_state:%d\n",
+                                  btci->bt_state);
+                        schedule_work(&btci->work);
+                }
+        } else {
+                /* Restore original values */
+                brcmf_btcoex_restore_part1(btci);
+        }
+}
+
+/**
+ * brcmf_btcoex_set_mode - set BT coex mode
+ * @cfg: driver private cfg80211 data
+ * @mode: Wifi-Bluetooth coexistence mode
+ *
+ * return: 0 on success
+ */
+int brcmf_btcoex_set_mode(struct brcmf_cfg80211_vif *vif,
+                          enum brcmf_btcoex_mode mode, u16 duration)
+{
+        struct brcmf_cfg80211_info *cfg = wiphy_priv(vif->wdev.wiphy);
+        struct brcmf_btcoex_info *btci = cfg->btcoex;
+        struct brcmf_if *ifp = cfg->pub->iflist[0];
+
+        switch (mode) {
+        case BRCMF_BTCOEX_DISABLED:
+                brcmf_dbg(TRACE, "DHCP session starts\n");
+                if (btci->bt_state != BRCMF_BT_DHCP_IDLE)
+                        return -EBUSY;
+                /* Start BT timer only for SCO connection */
+                if (brcmf_btcoex_is_sco_active(ifp)) {
+                        btci->timeout = duration;
+                        btci->vif = vif;
+                        brcmf_btcoex_dhcp_start(btci);
+                }
+                break;
+
+        case BRCMF_BTCOEX_ENABLED:
+                brcmf_dbg(TRACE, "DHCP session ends\n");
+                if (btci->bt_state != BRCMF_BT_DHCP_IDLE &&
+                    vif == btci->vif) {
+                        brcmf_btcoex_dhcp_end(btci);
+                }
+                break;
+        default:
+                brcmf_dbg(TRACE, "Unknown mode, ignored\n");
+        }
+        return 0;
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/btcoex.h b/drivers/net/wireless/brcm80211/brcmfmac/btcoex.h
new file mode 100644
index 000000000000..19647c68aa9e
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/btcoex.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef WL_BTCOEX_H_
+#define WL_BTCOEX_H_
+
+enum brcmf_btcoex_mode {
+        BRCMF_BTCOEX_DISABLED,
+        BRCMF_BTCOEX_ENABLED
+};
+
+int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg);
+void brcmf_btcoex_detach(struct brcmf_cfg80211_info *cfg);
+int brcmf_btcoex_set_mode(struct brcmf_cfg80211_vif *vif,
+                          enum brcmf_btcoex_mode mode, u16 duration);
+
+#endif /* WL_BTCOEX_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index ef6f23be6d32..28db9cf39672 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -28,6 +28,7 @@
 /*******************************************************************************
  * IO codes that are interpreted by dongle firmware
  ******************************************************************************/
+#define BRCMF_C_GET_VERSION                     1
 #define BRCMF_C_UP                              2
 #define BRCMF_C_DOWN                            3
 #define BRCMF_C_SET_PROMISC                     10
@@ -72,6 +73,7 @@
 #define BRCMF_C_SET_WSEC                        134
 #define BRCMF_C_GET_PHY_NOISE                   135
 #define BRCMF_C_GET_BSS_INFO                    136
+#define BRCMF_C_GET_BANDLIST                    140
 #define BRCMF_C_SET_SCB_TIMEOUT                 158
 #define BRCMF_C_GET_PHYLIST                     180
 #define BRCMF_C_SET_SCAN_CHANNEL_TIME           185
@@ -475,6 +477,11 @@ struct brcmf_sta_info_le {
         __le32  rx_decrypt_failures;    /* # of packet decrypted failed */
 };
 
+struct brcmf_chanspec_list {
+        __le32  count;          /* # of entries */
+        __le32  element[1];     /* variable length uint32 list */
+};
+
 /*
  * WLC_E_PROBRESP_MSG
  * WLC_E_P2P_PROBREQ_MSG
@@ -501,6 +508,7 @@ struct brcmf_dcmd {
 /* Forward decls for struct brcmf_pub (see below) */
 struct brcmf_proto;     /* device communication protocol info */
 struct brcmf_cfg80211_dev; /* cfg80211 device info */
+struct brcmf_fws_info; /* firmware signalling info */
 
 /* Common structure for module and instance linkage */
 struct brcmf_pub {
@@ -527,6 +535,10 @@ struct brcmf_pub {
         unsigned char proto_buf[BRCMF_DCMD_MAXLEN];
 
         struct brcmf_fweh_info fweh;
+
+        bool fw_signals;
+        struct brcmf_fws_info *fws;
+        spinlock_t fws_spinlock;
 #ifdef DEBUG
         struct dentry *dbgfs_dir;
 #endif
@@ -537,10 +549,25 @@ struct brcmf_if_event {
         u8 action;
         u8 flags;
         u8 bssidx;
+        u8 role;
 };
 
-/* forward declaration */
+/* forward declarations */
 struct brcmf_cfg80211_vif;
+struct brcmf_fws_mac_descriptor;
+
+/**
+ * enum brcmf_netif_stop_reason - reason for stopping netif queue.
+ *
+ * @BRCMF_NETIF_STOP_REASON_FWS_FC:
+ *      netif stopped due to firmware signalling flow control.
+ * @BRCMF_NETIF_STOP_REASON_BLOCK_BUS:
+ *      netif stopped due to bus blocking.
+ */
+enum brcmf_netif_stop_reason {
+        BRCMF_NETIF_STOP_REASON_FWS_FC = 1,
+        BRCMF_NETIF_STOP_REASON_BLOCK_BUS = 2
+};
 
 /**
  * struct brcmf_if - interface control information.
@@ -549,9 +576,13 @@ struct brcmf_cfg80211_vif;
  * @vif: points to cfg80211 specific interface information.
  * @ndev: associated network device.
  * @stats: interface specific network statistics.
+ * @setmacaddr_work: worker object for setting mac address.
+ * @multicast_work: worker object for multicast provisioning.
+ * @fws_desc: interface specific firmware-signalling descriptor.
  * @ifidx: interface index in device firmware.
  * @bssidx: index of bss associated with this interface.
  * @mac_addr: assigned mac address.
+ * @netif_stop: bitmap indicates reason why netif queues are stopped.
  * @pend_8021x_cnt: tracks outstanding number of 802.1x frames.
  * @pend_8021x_wait: used for signalling change in count.
  */
@@ -562,9 +593,11 @@ struct brcmf_if {
         struct net_device_stats stats;
         struct work_struct setmacaddr_work;
         struct work_struct multicast_work;
+        struct brcmf_fws_mac_descriptor *fws_desc;
         int ifidx;
         s32 bssidx;
         u8 mac_addr[ETH_ALEN];
+        u8 netif_stop;
         atomic_t pend_8021x_cnt;
         wait_queue_head_t pend_8021x_wait;
 };
@@ -582,13 +615,17 @@ extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
                                     void *buf, uint len);
 
 /* Remove any protocol-specific data header. */
-extern int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,
+extern int brcmf_proto_hdrpull(struct brcmf_pub *drvr, bool do_fws, u8 *ifidx,
                                struct sk_buff *rxp);
 
 extern int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
 extern struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx,
                                      s32 ifidx, char *name, u8 *mac_addr);
 extern void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx);
+void brcmf_txflowblock_if(struct brcmf_if *ifp,
+                          enum brcmf_netif_stop_reason reason, bool state);
 extern u32 brcmf_get_chip_info(struct brcmf_if *ifp);
+extern void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp,
+                             bool success);
 
 #endif                          /* _BRCMF_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index ad25c3408b59..080395f49fa5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -39,10 +39,12 @@ struct brcmf_bus_dcmd {
  * @txdata: send a data frame to the dongle (callee disposes skb).
  * @txctl: transmit a control request message to dongle.
  * @rxctl: receive a control response message from dongle.
+ * @gettxq: obtain a reference of bus transmit queue (optional).
  *
  * This structure provides an abstract interface towards the
  * bus specific driver. For control messages to common driver
- * will assure there is only one active transaction.
+ * will assure there is only one active transaction. Unless
+ * indicated otherwise these callbacks are mandatory.
  */
 struct brcmf_bus_ops {
         int (*init)(struct device *dev);
@@ -50,6 +52,7 @@ struct brcmf_bus_ops {
         int (*txdata)(struct device *dev, struct sk_buff *skb);
         int (*txctl)(struct device *dev, unsigned char *msg, uint len);
         int (*rxctl)(struct device *dev, unsigned char *msg, uint len);
+        struct pktq * (*gettxq)(struct device *dev);
 };
 
 /**
@@ -115,6 +118,14 @@ int brcmf_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint len)
         return bus->ops->rxctl(bus->dev, msg, len);
 }
 
+static inline
+struct pktq *brcmf_bus_gettxq(struct brcmf_bus *bus)
+{
+        if (!bus->ops->gettxq)
+                return ERR_PTR(-ENOENT);
+
+        return bus->ops->gettxq(bus->dev);
+}
 /*
  * interface functions from common layer
  */
@@ -134,7 +145,7 @@ extern void brcmf_dev_reset(struct device *dev);
 /* Indication from bus module to change flow-control state */
 extern void brcmf_txflowblock(struct device *dev, bool state);
 
-/* Notify tx completion */
+/* Notify the bus has transferred the tx packet to firmware */
 extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,
                              bool success);
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index a2354d951dd7..59c77aa3b959 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -28,6 +28,7 @@
 #include "dhd.h"
 #include "dhd_proto.h"
 #include "dhd_bus.h"
+#include "fwsignal.h"
 #include "dhd_dbg.h"
 
 struct brcmf_proto_cdc_dcmd {
@@ -71,13 +72,26 @@ struct brcmf_proto_cdc_dcmd {
         ((hdr)->flags2 = (((hdr)->flags2 & ~BDC_FLAG2_IF_MASK) | \
         ((idx) << BDC_FLAG2_IF_SHIFT)))
 
+/**
+ * struct brcmf_proto_bdc_header - BDC header format
+ *
+ * @flags: flags contain protocol and checksum info.
+ * @priority: 802.1d priority and USB flow control info (bit 4:7).
+ * @flags2: additional flags containing dongle interface index.
+ * @data_offset: start of packet data. header is following by firmware signals.
+ */
 struct brcmf_proto_bdc_header {
         u8 flags;
-        u8 priority;    /* 802.1d Priority, 4:7 flow control info for usb */
+        u8 priority;
         u8 flags2;
         u8 data_offset;
 };
 
+/*
+ * maximum length of firmware signal data between
+ * the BDC header and packet data in the tx path.
+ */
+#define BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES        12
 
 #define RETRIES 2 /* # of retries to retrieve matching dcmd response */
 #define BUS_HEADER_LEN  (16+64)         /* Must be atleast SDPCM_RESERVE
@@ -258,7 +272,7 @@ static void pkt_set_sum_good(struct sk_buff *skb, bool x)
         skb->ip_summed = (x ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE);
 }
 
-void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
+void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx, u8 offset,
                          struct sk_buff *pktbuf)
 {
         struct brcmf_proto_bdc_header *h;
@@ -266,7 +280,6 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
         brcmf_dbg(CDC, "Enter\n");
 
         /* Push BDC header used to convey priority for buses that don't */
-
         skb_push(pktbuf, BDC_HEADER_LEN);
 
         h = (struct brcmf_proto_bdc_header *)(pktbuf->data);
@@ -277,11 +290,11 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
 
         h->priority = (pktbuf->priority & BDC_PRIORITY_MASK);
         h->flags2 = 0;
-        h->data_offset = 0;
+        h->data_offset = offset;
         BDC_SET_IF_IDX(h, ifidx);
 }
 
-int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,
+int brcmf_proto_hdrpull(struct brcmf_pub *drvr, bool do_fws, u8 *ifidx,
                         struct sk_buff *pktbuf)
 {
         struct brcmf_proto_bdc_header *h;
@@ -290,8 +303,8 @@ int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,
 
         /* Pop BDC header used to convey priority for buses that don't */
 
-        if (pktbuf->len < BDC_HEADER_LEN) {
-                brcmf_err("rx data too short (%d < %d)\n",
+        if (pktbuf->len <= BDC_HEADER_LEN) {
+                brcmf_dbg(INFO, "rx data too short (%d <= %d)\n",
                           pktbuf->len, BDC_HEADER_LEN);
                 return -EBADE;
         }
@@ -328,7 +341,10 @@ int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,
         pktbuf->priority = h->priority & BDC_PRIORITY_MASK;
 
         skb_pull(pktbuf, BDC_HEADER_LEN);
-        skb_pull(pktbuf, h->data_offset << 2);
+        if (do_fws)
+                brcmf_fws_hdrpull(drvr, *ifidx, h->data_offset << 2, pktbuf);
+        else
+                skb_pull(pktbuf, h->data_offset << 2);
 
         if (pktbuf->len == 0)
                 return -ENODATA;
@@ -350,7 +366,7 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)
         }
 
         drvr->prot = cdc;
-        drvr->hdrlen += BDC_HEADER_LEN;
+        drvr->hdrlen += BDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
         drvr->bus_if->maxctl = BRCMF_DCMD_MAXLEN +
                         sizeof(struct brcmf_proto_cdc_dcmd) + ROUND_UP_MARGIN;
         return 0;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 4544342a0428..be0787cab24f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -24,6 +24,7 @@
 #include "dhd_proto.h"
 #include "dhd_dbg.h"
 #include "fwil.h"
+#include "tracepoint.h"
 
 #define PKTFILTER_BUF_SIZE              128
 #define BRCMF_ARPOL_MODE                0xb     /* agent|snoop|peer_autoreply */
@@ -373,3 +374,35 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
 done:
         return err;
 }
+
+#ifdef CONFIG_BRCM_TRACING
+void __brcmf_err(const char *func, const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+        pr_err("%s: %pV", func, &vaf);
+        trace_brcmf_err(func, &vaf);
+        va_end(args);
+}
+#endif
+#if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG)
+void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+        if (brcmf_msg_level & level)
+                pr_debug("%s %pV", func, &vaf);
+        trace_brcmf_dbg(level, func, &vaf);
+        va_end(args);
+}
+#endif
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
index 57671eddf79d..202869cd0932 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
@@ -22,6 +22,7 @@
 #include "dhd.h"
 #include "dhd_bus.h"
 #include "dhd_dbg.h"
+#include "tracepoint.h"
 
 static struct dentry *root_folder;
 
@@ -123,3 +124,82 @@ void brcmf_debugfs_create_sdio_count(struct brcmf_pub *drvr,
                 debugfs_create_file("counters", S_IRUGO, dentry,
                                     sdcnt, &brcmf_debugfs_sdio_counter_ops);
 }
+
+static
+ssize_t brcmf_debugfs_fws_stats_read(struct file *f, char __user *data,
+                                     size_t count, loff_t *ppos)
+{
+        struct brcmf_fws_stats *fwstats = f->private_data;
+        char buf[650];
+        int res;
+
+        /* only allow read from start */
+        if (*ppos > 0)
+                return 0;
+
+        res = scnprintf(buf, sizeof(buf),
+                        "header_pulls:      %u\n"
+                        "header_only_pkt:   %u\n"
+                        "tlv_parse_failed:  %u\n"
+                        "tlv_invalid_type:  %u\n"
+                        "mac_update_fails:  %u\n"
+                        "ps_update_fails:   %u\n"
+                        "if_update_fails:   %u\n"
+                        "pkt2bus:           %u\n"
+                        "generic_error:     %u\n"
+                        "rollback_success:  %u\n"
+                        "rollback_failed:   %u\n"
+                        "delayq_full:       %u\n"
+                        "supprq_full:       %u\n"
+                        "txs_indicate:      %u\n"
+                        "txs_discard:       %u\n"
+                        "txs_suppr_core:    %u\n"
+                        "txs_suppr_ps:      %u\n"
+                        "txs_tossed:        %u\n"
+                        "send_pkts:         BK:%u BE:%u VO:%u VI:%u BCMC:%u\n"
+                        "fifo_credits_sent: BK:%u BE:%u VO:%u VI:%u BCMC:%u\n",
+                        fwstats->header_pulls,
+                        fwstats->header_only_pkt,
+                        fwstats->tlv_parse_failed,
+                        fwstats->tlv_invalid_type,
+                        fwstats->mac_update_failed,
+                        fwstats->mac_ps_update_failed,
+                        fwstats->if_update_failed,
+                        fwstats->pkt2bus,
+                        fwstats->generic_error,
+                        fwstats->rollback_success,
+                        fwstats->rollback_failed,
+                        fwstats->delayq_full_error,
+                        fwstats->supprq_full_error,
+                        fwstats->txs_indicate,
+                        fwstats->txs_discard,
+                        fwstats->txs_supp_core,
+                        fwstats->txs_supp_ps,
+                        fwstats->txs_tossed,
+                        fwstats->send_pkts[0], fwstats->send_pkts[1],
+                        fwstats->send_pkts[2], fwstats->send_pkts[3],
+                        fwstats->send_pkts[4],
+                        fwstats->fifo_credits_sent[0],
+                        fwstats->fifo_credits_sent[1],
+                        fwstats->fifo_credits_sent[2],
+                        fwstats->fifo_credits_sent[3],
+                        fwstats->fifo_credits_sent[4]);
+
+        return simple_read_from_buffer(data, count, ppos, buf, res);
+}
+
+static const struct file_operations brcmf_debugfs_fws_stats_ops = {
+        .owner = THIS_MODULE,
+        .open = simple_open,
+        .read = brcmf_debugfs_fws_stats_read
+};
+
+void brcmf_debugfs_create_fws_stats(struct brcmf_pub *drvr,
+                                    struct brcmf_fws_stats *stats)
+{
+        struct dentry *dentry =  drvr->dbgfs_dir;
+
+        if (!IS_ERR_OR_NULL(dentry))
+                debugfs_create_file("fws_stats", S_IRUGO, dentry,
+                                    stats, &brcmf_debugfs_fws_stats_ops);
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index bc013cbe06f6..009c87bfd9ae 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -34,6 +34,7 @@
 #define BRCMF_SCAN_VAL  0x00004000
 #define BRCMF_CONN_VAL  0x00008000
 #define BRCMF_CDC_VAL   0x00010000
+#define BRCMF_SDIO_VAL  0x00020000
 
 /* set default print format */
 #undef pr_fmt
@@ -43,6 +44,7 @@
  * debugging is not selected. When debugging the driver error
  * messages are as important as other tracing or even more so.
  */
+#ifndef CONFIG_BRCM_TRACING
 #ifdef CONFIG_BRCMDBG
 #define brcmf_err(fmt, ...)     pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
 #else
@@ -52,15 +54,21 @@
                         pr_err("%s: " fmt, __func__, ##__VA_ARGS__);    \
         } while (0)
 #endif
+#else
+__printf(2, 3)
+void __brcmf_err(const char *func, const char *fmt, ...);
+#define brcmf_err(fmt, ...) \
+        __brcmf_err(__func__, fmt, ##__VA_ARGS__)
+#endif
 
-#if defined(DEBUG)
-
+#if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
+__printf(3, 4)
+void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...);
 #define brcmf_dbg(level, fmt, ...)                              \
 do {                                                            \
-        if (brcmf_msg_level & BRCMF_##level##_VAL)              \
-                pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);  \
+        __brcmf_dbg(BRCMF_##level##_VAL, __func__,              \
+                    fmt, ##__VA_ARGS__);                        \
 } while (0)
-
 #define BRCMF_DATA_ON()         (brcmf_msg_level & BRCMF_DATA_VAL)
 #define BRCMF_CTL_ON()          (brcmf_msg_level & BRCMF_CTL_VAL)
 #define BRCMF_HDRS_ON()         (brcmf_msg_level & BRCMF_HDRS_VAL)
@@ -69,7 +77,7 @@ do {								\
 #define BRCMF_EVENT_ON()        (brcmf_msg_level & BRCMF_EVENT_VAL)
 #define BRCMF_FIL_ON()          (brcmf_msg_level & BRCMF_FIL_VAL)
 
-#else   /* (defined DEBUG) || (defined DEBUG) */
+#else /* defined(DEBUG) || defined(CONFIG_BRCM_TRACING) */
 
 #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
 
@@ -81,10 +89,11 @@ do {								\
 #define BRCMF_EVENT_ON()        0
 #define BRCMF_FIL_ON()          0
 
-#endif                          /* defined(DEBUG) */
+#endif /* defined(DEBUG) || defined(CONFIG_BRCM_TRACING) */
 
 #define brcmf_dbg_hex_dump(test, data, len, fmt, ...)                   \
 do {                                                                    \
+        trace_brcmf_hexdump((void *)data, len);                         \
         if (test)                                                       \
                 brcmu_dbg_hex_dump(data, len, fmt, ##__VA_ARGS__);      \
 } while (0)
@@ -125,6 +134,32 @@ struct brcmf_sdio_count {
         ulong rx_readahead_cnt; /* packets where header read-ahead was used */
 };
 
+struct brcmf_fws_stats {
+        u32 tlv_parse_failed;
+        u32 tlv_invalid_type;
+        u32 header_only_pkt;
+        u32 header_pulls;
+        u32 pkt2bus;
+        u32 send_pkts[5];
+        u32 fifo_credits_sent[5];
+        u32 fifo_credits_back[6];
+        u32 generic_error;
+        u32 mac_update_failed;
+        u32 mac_ps_update_failed;
+        u32 if_update_failed;
+        u32 packet_request_failed;
+        u32 credit_request_failed;
+        u32 rollback_success;
+        u32 rollback_failed;
+        u32 delayq_full_error;
+        u32 supprq_full_error;
+        u32 txs_indicate;
+        u32 txs_discard;
+        u32 txs_supp_core;
+        u32 txs_supp_ps;
+        u32 txs_tossed;
+};
+
 struct brcmf_pub;
 #ifdef DEBUG
 void brcmf_debugfs_init(void);
@@ -134,6 +169,8 @@ void brcmf_debugfs_detach(struct brcmf_pub *drvr);
 struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
 void brcmf_debugfs_create_sdio_count(struct brcmf_pub *drvr,
                                      struct brcmf_sdio_count *sdcnt);
+void brcmf_debugfs_create_fws_stats(struct brcmf_pub *drvr,
+                                    struct brcmf_fws_stats *stats);
 #else
 static inline void brcmf_debugfs_init(void)
 {
@@ -148,6 +185,10 @@ static inline int brcmf_debugfs_attach(struct brcmf_pub *drvr)
 static inline void brcmf_debugfs_detach(struct brcmf_pub *drvr)
 {
 }
+static inline void brcmf_debugfs_create_fws_stats(struct brcmf_pub *drvr,
+                                                  struct brcmf_fws_stats *stats)
+{
+}
 #endif
 
 #endif                          /* _BRCMF_DBG_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index c06cea88df0d..59c25463e428 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -30,17 +30,18 @@
 #include "p2p.h"
 #include "wl_cfg80211.h"
 #include "fwil.h"
+#include "fwsignal.h"
 
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
-MODULE_SUPPORTED_DEVICE("Broadcom 802.11 WLAN fullmac cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
 #define MAX_WAIT_FOR_8021X_TX           50      /* msecs */
 
 /* Error bits */
 int brcmf_msg_level;
-module_param(brcmf_msg_level, int, 0);
+module_param_named(debug, brcmf_msg_level, int, S_IRUSR | S_IWUSR);
+MODULE_PARM_DESC(debug, "level of debug output");
 
 /* P2P0 enable */
 static int brcmf_p2p_enable;
@@ -222,18 +223,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
                 goto done;
         }
 
-        /* handle ethernet header */
-        eh = (struct ethhdr *)(skb->data);
-        if (is_multicast_ether_addr(eh->h_dest))
-                drvr->tx_multicast++;
-        if (ntohs(eh->h_proto) == ETH_P_PAE)
-                atomic_inc(&ifp->pend_8021x_cnt);
-
-        /* If the protocol uses a data header, apply it */
-        brcmf_proto_hdrpush(drvr, ifp->ifidx, skb);
-
-        /* Use bus module to send data frame */
-        ret =  brcmf_bus_txdata(drvr->bus_if, skb);
+        ret = brcmf_fws_process_skb(ifp, skb);
 
 done:
         if (ret) {
@@ -247,9 +237,27 @@ done:
         return NETDEV_TX_OK;
 }
 
+void brcmf_txflowblock_if(struct brcmf_if *ifp,
+                          enum brcmf_netif_stop_reason reason, bool state)
+{
+        if (!ifp)
+                return;
+
+        brcmf_dbg(TRACE, "enter: idx=%d stop=0x%X reason=%d state=%d\n",
+                  ifp->bssidx, ifp->netif_stop, reason, state);
+        if (state) {
+                if (!ifp->netif_stop)
+                        netif_stop_queue(ifp->ndev);
+                ifp->netif_stop |= reason;
+        } else {
+                ifp->netif_stop &= ~reason;
+                if (!ifp->netif_stop)
+                        netif_wake_queue(ifp->ndev);
+        }
+}
+
 void brcmf_txflowblock(struct device *dev, bool state)
 {
-        struct net_device *ndev;
         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
         struct brcmf_pub *drvr = bus_if->drvr;
         int i;
@@ -257,13 +265,8 @@ void brcmf_txflowblock(struct device *dev, bool state)
         brcmf_dbg(TRACE, "Enter\n");
 
         for (i = 0; i < BRCMF_MAX_IFS; i++)
-                if (drvr->iflist[i]) {
-                        ndev = drvr->iflist[i]->ndev;
-                        if (state)
-                                netif_stop_queue(ndev);
-                        else
-                                netif_wake_queue(ndev);
-                }
+                brcmf_txflowblock_if(drvr->iflist[i],
+                                     BRCMF_NETIF_STOP_REASON_BLOCK_BUS, state);
 }
 
 void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)
@@ -283,7 +286,7 @@ void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)
                 skb_unlink(skb, skb_list);
 
                 /* process and remove protocol-specific header */
-                ret = brcmf_proto_hdrpull(drvr, &ifidx, skb);
+                ret = brcmf_proto_hdrpull(drvr, drvr->fw_signals, &ifidx, skb);
                 ifp = drvr->iflist[ifidx];
 
                 if (ret || !ifp || !ifp->ndev) {
@@ -320,13 +323,8 @@ void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)
                 /* Strip header, count, deliver upward */
                 skb_pull(skb, ETH_HLEN);
 
-                /* Process special event packets and then discard them */
-                brcmf_fweh_process_skb(drvr, skb, &ifidx);
-
-                if (drvr->iflist[ifidx]) {
-                        ifp = drvr->iflist[ifidx];
-                        ifp->ndev->last_rx = jiffies;
-                }
+                /* Process special event packets */
+                brcmf_fweh_process_skb(drvr, skb);
 
                 if (!(ifp->ndev->flags & IFF_UP)) {
                         brcmu_pkt_buf_free_skb(skb);
@@ -349,31 +347,49 @@ void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)
         }
 }
 
-void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)
+void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp,
+                      bool success)
 {
-        u8 ifidx;
+        struct brcmf_if *ifp;
         struct ethhdr *eh;
+        u8 ifidx;
         u16 type;
-        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-        struct brcmf_pub *drvr = bus_if->drvr;
-        struct brcmf_if *ifp;
+        int res;
 
-        brcmf_proto_hdrpull(drvr, &ifidx, txp);
+        res = brcmf_proto_hdrpull(drvr, false, &ifidx, txp);
 
         ifp = drvr->iflist[ifidx];
         if (!ifp)
-                return;
+                goto done;
 
-        eh = (struct ethhdr *)(txp->data);
-        type = ntohs(eh->h_proto);
+        if (res == 0) {
+                eh = (struct ethhdr *)(txp->data);
+                type = ntohs(eh->h_proto);
 
-        if (type == ETH_P_PAE) {
-                atomic_dec(&ifp->pend_8021x_cnt);
-                if (waitqueue_active(&ifp->pend_8021x_wait))
-                        wake_up(&ifp->pend_8021x_wait);
+                if (type == ETH_P_PAE) {
+                        atomic_dec(&ifp->pend_8021x_cnt);
+                        if (waitqueue_active(&ifp->pend_8021x_wait))
+                                wake_up(&ifp->pend_8021x_wait);
+                }
         }
         if (!success)
                 ifp->stats.tx_errors++;
+done:
+        brcmu_pkt_buf_free_skb(txp);
+}
+
+void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pub *drvr = bus_if->drvr;
+
+        /* await txstatus signal for firmware if active */
+        if (brcmf_fws_fc_active(drvr->fws)) {
+                if (!success)
+                        brcmf_fws_bustxfail(drvr->fws, txp);
+        } else {
+                brcmf_txfinalize(drvr, txp, success);
+        }
 }
 
 static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev)
@@ -734,28 +750,35 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,
                 }
         }
 
-        /* Allocate netdev, including space for private structure */
-        ndev = alloc_netdev(sizeof(struct brcmf_if), name, ether_setup);
-        if (!ndev) {
-                brcmf_err("OOM - alloc_netdev\n");
-                return ERR_PTR(-ENOMEM);
+        if (!brcmf_p2p_enable && bssidx == 1) {
+                /* this is P2P_DEVICE interface */
+                brcmf_dbg(INFO, "allocate non-netdev interface\n");
+                ifp = kzalloc(sizeof(*ifp), GFP_KERNEL);
+                if (!ifp)
+                        return ERR_PTR(-ENOMEM);
+        } else {
+                brcmf_dbg(INFO, "allocate netdev interface\n");
+                /* Allocate netdev, including space for private structure */
+                ndev = alloc_netdev(sizeof(*ifp), name, ether_setup);
+                if (!ndev)
+                        return ERR_PTR(-ENOMEM);
+
+                ifp = netdev_priv(ndev);
+                ifp->ndev = ndev;
         }
 
-        ifp = netdev_priv(ndev);
-        ifp->ndev = ndev;
         ifp->drvr = drvr;
         drvr->iflist[bssidx] = ifp;
         ifp->ifidx = ifidx;
         ifp->bssidx = bssidx;
 
-
         init_waitqueue_head(&ifp->pend_8021x_wait);
 
         if (mac_addr != NULL)
                 memcpy(ifp->mac_addr, mac_addr, ETH_ALEN);
 
         brcmf_dbg(TRACE, " ==== pid:%x, if:%s (%pM) created ===\n",
-                  current->pid, ifp->ndev->name, ifp->mac_addr);
+                  current->pid, name, ifp->mac_addr);
 
         return ifp;
 }
@@ -787,11 +810,13 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx)
                 }
 
                 unregister_netdev(ifp->ndev);
-                drvr->iflist[bssidx] = NULL;
                 if (bssidx == 0)
                         brcmf_cfg80211_detach(drvr->config);
                 free_netdev(ifp->ndev);
+        } else {
+                kfree(ifp);
         }
+        drvr->iflist[bssidx] = NULL;
 }
 
 int brcmf_attach(uint bus_hdrlen, struct device *dev)
@@ -873,6 +898,13 @@ int brcmf_bus_start(struct device *dev)
         if (ret < 0)
                 goto fail;
 
+        drvr->fw_signals = true;
+        ret = brcmf_fws_init(drvr);
+        if (ret < 0)
+                goto fail;
+
+        brcmf_fws_add_interface(ifp);
+
         drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev);
         if (drvr->config == NULL) {
                 ret = -ENOMEM;
@@ -889,6 +921,10 @@ fail:
                 brcmf_err("failed: %d\n", ret);
                 if (drvr->config)
                         brcmf_cfg80211_detach(drvr->config);
+                if (drvr->fws) {
+                        brcmf_fws_del_interface(ifp);
+                        brcmf_fws_deinit(drvr);
+                }
                 free_netdev(ifp->ndev);
                 drvr->iflist[0] = NULL;
                 if (p2p_ifp) {
@@ -944,14 +980,18 @@ void brcmf_detach(struct device *dev)
 
         /* make sure primary interface removed last */
         for (i = BRCMF_MAX_IFS-1; i > -1; i--)
-                if (drvr->iflist[i])
+                if (drvr->iflist[i]) {
+                        brcmf_fws_del_interface(drvr->iflist[i]);
                         brcmf_del_if(drvr, i);
+                }
 
         brcmf_bus_detach(drvr);
 
         if (drvr->prot)
                 brcmf_proto_detach(drvr);
 
+        brcmf_fws_deinit(drvr);
+
         brcmf_debugfs_detach(drvr);
         bus_if->drvr = NULL;
         kfree(drvr);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
index 48fa70302192..ef9179883748 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
@@ -33,7 +33,7 @@ extern void brcmf_proto_stop(struct brcmf_pub *drvr);
 /* Add any protocol-specific data header.
  * Caller must reserve prot_hdrlen prepend space.
  */
-extern void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx,
+extern void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx, u8 offset,
                                 struct sk_buff *txp);
 
 /* Sets dongle media info (drv_version, mac address). */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 35fc68be158d..d2487518bd2a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -31,6 +31,7 @@
 #include <linux/bcma/bcma.h>
 #include <linux/debugfs.h>
 #include <linux/vmalloc.h>
+#include <linux/platform_data/brcmfmac-sdio.h>
 #include <asm/unaligned.h>
 #include <defs.h>
 #include <brcmu_wifi.h>
@@ -94,6 +95,7 @@ struct rte_console {
 
 #include "dhd_bus.h"
 #include "dhd_dbg.h"
+#include "tracepoint.h"
 
 #define TXQLEN          2048    /* bulk tx queue length */
 #define TXHI            (TXQLEN - 256)  /* turn on flow control above TXHI */
@@ -323,6 +325,9 @@ MODULE_FIRMWARE(BRCMF_SDIO_NV_NAME);
                                          */
 #define BRCMF_IDLE_INTERVAL     1
 
+#define KSO_WAIT_US 50
+#define MAX_KSO_ATTEMPTS (PMU_MAX_TRANSITION_DLY/KSO_WAIT_US)
+
 /*
  * Conversion of 802.1D priority to precedence level
  */
@@ -332,95 +337,6 @@ static uint prio2prec(u32 prio)
                (prio^2) : prio;
 }
 
-/* core registers */
-struct sdpcmd_regs {
-        u32 corecontrol;                /* 0x00, rev8 */
-        u32 corestatus;                 /* rev8 */
-        u32 PAD[1];
-        u32 biststatus;                 /* rev8 */
-
-        /* PCMCIA access */
-        u16 pcmciamesportaladdr;        /* 0x010, rev8 */
-        u16 PAD[1];
-        u16 pcmciamesportalmask;        /* rev8 */
-        u16 PAD[1];
-        u16 pcmciawrframebc;            /* rev8 */
-        u16 PAD[1];
-        u16 pcmciaunderflowtimer;       /* rev8 */
-        u16 PAD[1];
-
-        /* interrupt */
-        u32 intstatus;                  /* 0x020, rev8 */
-        u32 hostintmask;                /* rev8 */
-        u32 intmask;                    /* rev8 */
-        u32 sbintstatus;                /* rev8 */
-        u32 sbintmask;                  /* rev8 */
-        u32 funcintmask;                /* rev4 */
-        u32 PAD[2];
-        u32 tosbmailbox;                /* 0x040, rev8 */
-        u32 tohostmailbox;              /* rev8 */
-        u32 tosbmailboxdata;            /* rev8 */
-        u32 tohostmailboxdata;          /* rev8 */
-
-        /* synchronized access to registers in SDIO clock domain */
-        u32 sdioaccess;                 /* 0x050, rev8 */
-        u32 PAD[3];
-
-        /* PCMCIA frame control */
-        u8 pcmciaframectrl;             /* 0x060, rev8 */
-        u8 PAD[3];
-        u8 pcmciawatermark;             /* rev8 */
-        u8 PAD[155];
-
-        /* interrupt batching control */
-        u32 intrcvlazy;                 /* 0x100, rev8 */
-        u32 PAD[3];
-
-        /* counters */
-        u32 cmd52rd;                    /* 0x110, rev8 */
-        u32 cmd52wr;                    /* rev8 */
-        u32 cmd53rd;                    /* rev8 */
-        u32 cmd53wr;                    /* rev8 */
-        u32 abort;                      /* rev8 */
-        u32 datacrcerror;               /* rev8 */
-        u32 rdoutofsync;                /* rev8 */
-        u32 wroutofsync;                /* rev8 */
-        u32 writebusy;                  /* rev8 */
-        u32 readwait;                   /* rev8 */
-        u32 readterm;                   /* rev8 */
-        u32 writeterm;                  /* rev8 */
-        u32 PAD[40];
-        u32 clockctlstatus;             /* rev8 */
-        u32 PAD[7];
-
-        u32 PAD[128];                   /* DMA engines */
-
-        /* SDIO/PCMCIA CIS region */
-        char cis[512];                  /* 0x400-0x5ff, rev6 */
-
-        /* PCMCIA function control registers */
-        char pcmciafcr[256];            /* 0x600-6ff, rev6 */
-        u16 PAD[55];
-
-        /* PCMCIA backplane access */
-        u16 backplanecsr;               /* 0x76E, rev6 */
-        u16 backplaneaddr0;             /* rev6 */
-        u16 backplaneaddr1;             /* rev6 */
-        u16 backplaneaddr2;             /* rev6 */
-        u16 backplaneaddr3;             /* rev6 */
-        u16 backplanedata0;             /* rev6 */
-        u16 backplanedata1;             /* rev6 */
-        u16 backplanedata2;             /* rev6 */
-        u16 backplanedata3;             /* rev6 */
-        u16 PAD[31];
-
-        /* sprom "size" & "blank" info */
-        u16 spromstatus;                /* 0x7BE, rev2 */
-        u32 PAD[464];
-
-        u16 PAD[0x80];
-};
-
 #ifdef DEBUG
 /* Device console log buffer state */
 struct brcmf_console {
@@ -587,12 +503,14 @@ struct brcmf_sdio {
 
         bool txoff;             /* Transmit flow-controlled */
         struct brcmf_sdio_count sdcnt;
+        bool sr_enabled; /* SaveRestore enabled */
+        bool sleeping; /* SDIO bus sleeping */
 };
 
 /* clkstate */
 #define CLK_NONE        0
 #define CLK_SDONLY      1
-#define CLK_PENDING     2       /* Not used yet */
+#define CLK_PENDING     2
 #define CLK_AVAIL       3
 
 #ifdef DEBUG
@@ -600,7 +518,7 @@ static int qcount[NUMPRIO];
 static int tx_packets[NUMPRIO];
 #endif                          /* DEBUG */
 
-#define SDIO_DRIVE_STRENGTH     6       /* in milliamps */
+#define DEFAULT_SDIO_DRIVE_STRENGTH     6       /* in milliamps */
 
 #define RETRYCHAN(chan) ((chan) == SDPCM_EVENT_CHANNEL)
 
@@ -664,6 +582,62 @@ w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset)
         return ret;
 }
 
+static int
+brcmf_sdbrcm_kso_control(struct brcmf_sdio *bus, bool on)
+{
+        u8 wr_val = 0, rd_val, cmp_val, bmask;
+        int err = 0;
+        int try_cnt = 0;
+
+        brcmf_dbg(TRACE, "Enter\n");
+
+        wr_val = (on << SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT);
+        /* 1st KSO write goes to AOS wake up core if device is asleep  */
+        brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
+                         wr_val, &err);
+        if (err) {
+                brcmf_err("SDIO_AOS KSO write error: %d\n", err);
+                return err;
+        }
+
+        if (on) {
+                /* device WAKEUP through KSO:
+                 * write bit 0 & read back until
+                 * both bits 0 (kso bit) & 1 (dev on status) are set
+                 */
+                cmp_val = SBSDIO_FUNC1_SLEEPCSR_KSO_MASK |
+                          SBSDIO_FUNC1_SLEEPCSR_DEVON_MASK;
+                bmask = cmp_val;
+                usleep_range(2000, 3000);
+        } else {
+                /* Put device to sleep, turn off KSO */
+                cmp_val = 0;
+                /* only check for bit0, bit1(dev on status) may not
+                 * get cleared right away
+                 */
+                bmask = SBSDIO_FUNC1_SLEEPCSR_KSO_MASK;
+        }
+
+        do {
+                /* reliable KSO bit set/clr:
+                 * the sdiod sleep write access is synced to PMU 32khz clk
+                 * just one write attempt may fail,
+                 * read it back until it matches written value
+                 */
+                rd_val = brcmf_sdio_regrb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
+                                          &err);
+                if (((rd_val & bmask) == cmp_val) && !err)
+                        break;
+                brcmf_dbg(SDIO, "KSO wr/rd retry:%d (max: %d) ERR:%x\n",
+                          try_cnt, MAX_KSO_ATTEMPTS, err);
+                udelay(KSO_WAIT_US);
+                brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
+                                 wr_val, &err);
+        } while (try_cnt++ < MAX_KSO_ATTEMPTS);
+
+        return err;
+}
+
 #define PKT_AVAILABLE()         (intstatus & I_HMB_FRAME_IND)
 
 #define HOSTINTMASK             (I_HMB_SW_MASK | I_CHIPACTIVE)
@@ -675,10 +649,15 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
         u8 clkctl, clkreq, devctl;
         unsigned long timeout;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         clkctl = 0;
 
+        if (bus->sr_enabled) {
+                bus->clkstate = (on ? CLK_AVAIL : CLK_SDONLY);
+                return 0;
+        }
+
         if (on) {
                 /* Request HT Avail */
                 clkreq =
@@ -713,7 +692,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
                         devctl |= SBSDIO_DEVCTL_CA_INT_ONLY;
                         brcmf_sdio_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL,
                                          devctl, &err);
-                        brcmf_dbg(INFO, "CLKCTL: set PENDING\n");
+                        brcmf_dbg(SDIO, "CLKCTL: set PENDING\n");
                         bus->clkstate = CLK_PENDING;
 
                         return 0;
@@ -750,7 +729,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
 
                 /* Mark clock available */
                 bus->clkstate = CLK_AVAIL;
-                brcmf_dbg(INFO, "CLKCTL: turned ON\n");
+                brcmf_dbg(SDIO, "CLKCTL: turned ON\n");
 
 #if defined(DEBUG)
                 if (!bus->alp_only) {
@@ -775,7 +754,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
                 bus->clkstate = CLK_SDONLY;
                 brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
                                  clkreq, &err);
-                brcmf_dbg(INFO, "CLKCTL: turned OFF\n");
+                brcmf_dbg(SDIO, "CLKCTL: turned OFF\n");
                 if (err) {
                         brcmf_err("Failed access turning clock off: %d\n",
                                   err);
@@ -788,7 +767,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
 /* Change idle/active SD state */
 static int brcmf_sdbrcm_sdclk(struct brcmf_sdio *bus, bool on)
 {
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         if (on)
                 bus->clkstate = CLK_SDONLY;
@@ -805,7 +784,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
         uint oldstate = bus->clkstate;
 #endif                          /* DEBUG */
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         /* Early exit if we're already there */
         if (bus->clkstate == target) {
@@ -849,12 +828,69 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
                 break;
         }
 #ifdef DEBUG
-        brcmf_dbg(INFO, "%d -> %d\n", oldstate, bus->clkstate);
+        brcmf_dbg(SDIO, "%d -> %d\n", oldstate, bus->clkstate);
 #endif                          /* DEBUG */
 
         return 0;
 }
 
+static int
+brcmf_sdbrcm_bus_sleep(struct brcmf_sdio *bus, bool sleep, bool pendok)
+{
+        int err = 0;
+        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "request %s currently %s\n",
+                  (sleep ? "SLEEP" : "WAKE"),
+                  (bus->sleeping ? "SLEEP" : "WAKE"));
+
+        /* If SR is enabled control bus state with KSO */
+        if (bus->sr_enabled) {
+                /* Done if we're already in the requested state */
+                if (sleep == bus->sleeping)
+                        goto end;
+
+                /* Going to sleep */
+                if (sleep) {
+                        /* Don't sleep if something is pending */
+                        if (atomic_read(&bus->intstatus) ||
+                            atomic_read(&bus->ipend) > 0 ||
+                            (!atomic_read(&bus->fcstate) &&
+                            brcmu_pktq_mlen(&bus->txq, ~bus->flowcontrol) &&
+                            data_ok(bus)))
+                                 return -EBUSY;
+                        err = brcmf_sdbrcm_kso_control(bus, false);
+                        /* disable watchdog */
+                        if (!err)
+                                brcmf_sdbrcm_wd_timer(bus, 0);
+                } else {
+                        bus->idlecount = 0;
+                        err = brcmf_sdbrcm_kso_control(bus, true);
+                }
+                if (!err) {
+                        /* Change state */
+                        bus->sleeping = sleep;
+                        brcmf_dbg(SDIO, "new state %s\n",
+                                  (sleep ? "SLEEP" : "WAKE"));
+                } else {
+                        brcmf_err("error while changing bus sleep state %d\n",
+                                  err);
+                        return err;
+                }
+        }
+
+end:
+        /* control clocks */
+        if (sleep) {
+                if (!bus->sr_enabled)
+                        brcmf_sdbrcm_clkctl(bus, CLK_NONE, pendok);
+        } else {
+                brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, pendok);
+        }
+
+        return err;
+
+}
+
 static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
 {
         u32 intstatus = 0;
@@ -862,7 +898,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
         u8 fcbits;
         int ret;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(SDIO, "Enter\n");
 
         /* Read mailbox data and ack that we did so */
         ret = r_sdreg32(bus, &hmb_data,
@@ -875,7 +911,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
 
         /* Dongle recomposed rx frames, accept them again */
         if (hmb_data & HMB_DATA_NAKHANDLED) {
-                brcmf_dbg(INFO, "Dongle reports NAK handled, expect rtx of %d\n",
+                brcmf_dbg(SDIO, "Dongle reports NAK handled, expect rtx of %d\n",
                           bus->rx_seq);
                 if (!bus->rxskip)
                         brcmf_err("unexpected NAKHANDLED!\n");
@@ -896,7 +932,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
                                   "expecting %d\n",
                                   bus->sdpcm_ver, SDPCM_PROT_VERSION);
                 else
-                        brcmf_dbg(INFO, "Dongle ready, protocol version %d\n",
+                        brcmf_dbg(SDIO, "Dongle ready, protocol version %d\n",
                                   bus->sdpcm_ver);
         }
 
@@ -970,7 +1006,7 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)
         if (!retries)
                 brcmf_err("count never zeroed: last 0x%04x\n", lastrbc);
         else
-                brcmf_dbg(INFO, "flush took %d iterations\n", 0xffff - retries);
+                brcmf_dbg(SDIO, "flush took %d iterations\n", 0xffff - retries);
 
         if (rtx) {
                 bus->sdcnt.rxrtx++;
@@ -1173,7 +1209,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
         /* If packets, issue read(s) and send up packet chain */
         /* Return sequence numbers consumed? */
 
-        brcmf_dbg(TRACE, "start: glomd %p glom %p\n",
+        brcmf_dbg(SDIO, "start: glomd %p glom %p\n",
                   bus->glomd, skb_peek(&bus->glom));
 
         /* If there's a descriptor, generate the packet chain */
@@ -1546,7 +1582,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
         struct sk_buff_head pktlist;    /* needed for bus interface */
         u16 pad;                /* Number of pad bytes to read */
         uint rxleft = 0;        /* Remaining number of frames allowed */
-        int sdret;              /* Return code from calls */
+        int ret;                /* Return code from calls */
         uint rxcount = 0;       /* Total frames read */
         struct brcmf_sdio_read *rd = &bus->cur_read, rd_new;
         u8 head_read = 0;
@@ -1577,15 +1613,15 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
                 /* read header first for unknow frame length */
                 sdio_claim_host(bus->sdiodev->func[1]);
                 if (!rd->len) {
-                        sdret = brcmf_sdcard_recv_buf(bus->sdiodev,
+                        ret = brcmf_sdcard_recv_buf(bus->sdiodev,
                                                       bus->sdiodev->sbwad,
                                                       SDIO_FUNC_2, F2SYNC,
                                                       bus->rxhdr,
                                                       BRCMF_FIRSTREAD);
                         bus->sdcnt.f2rxhdrs++;
-                        if (sdret < 0) {
+                        if (ret < 0) {
                                 brcmf_err("RXHEADER FAILED: %d\n",
-                                          sdret);
+                                          ret);
                                 bus->sdcnt.rx_hdrfail++;
                                 brcmf_sdbrcm_rxfail(bus, true, true);
                                 sdio_release_host(bus->sdiodev->func[1]);
@@ -1637,14 +1673,14 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
                 skb_pull(pkt, head_read);
                 pkt_align(pkt, rd->len_left, BRCMF_SDALIGN);
 
-                sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                ret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
                                               SDIO_FUNC_2, F2SYNC, pkt);
                 bus->sdcnt.f2rxdata++;
                 sdio_release_host(bus->sdiodev->func[1]);
 
-                if (sdret < 0) {
+                if (ret < 0) {
                         brcmf_err("read %d bytes from channel %d failed: %d\n",
-                                  rd->len, rd->channel, sdret);
+                                  rd->len, rd->channel, ret);
                         brcmu_pkt_buf_free_skb(pkt);
                         sdio_claim_host(bus->sdiodev->func[1]);
                         brcmf_sdbrcm_rxfail(bus, true,
@@ -1775,13 +1811,12 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)
 /* Writes a HW/SW header into the packet and sends it. */
 /* Assumes: (a) header space already there, (b) caller holds lock */
 static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
-                              uint chan, bool free_pkt)
+                              uint chan)
 {
         int ret;
         u8 *frame;
         u16 len, pad = 0;
         u32 swheader;
-        struct sk_buff *new;
         int i;
 
         brcmf_dbg(TRACE, "Enter\n");
@@ -1795,30 +1830,14 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
                         brcmf_dbg(INFO, "insufficient headroom %d for %d pad\n",
                                   skb_headroom(pkt), pad);
                         bus->sdiodev->bus_if->tx_realloc++;
-                        new = brcmu_pkt_buf_get_skb(pkt->len + BRCMF_SDALIGN);
-                        if (!new) {
-                                brcmf_err("couldn't allocate new %d-byte packet\n",
-                                          pkt->len + BRCMF_SDALIGN);
-                                ret = -ENOMEM;
+                        ret = skb_cow(pkt, BRCMF_SDALIGN);
+                        if (ret)
                                 goto done;
-                        }
-
-                        pkt_align(new, pkt->len, BRCMF_SDALIGN);
-                        memcpy(new->data, pkt->data, pkt->len);
-                        if (free_pkt)
-                                brcmu_pkt_buf_free_skb(pkt);
-                        /* free the pkt if canned one is not used */
-                        free_pkt = true;
-                        pkt = new;
-                        frame = (u8 *) (pkt->data);
-                        /* precondition: (frame % BRCMF_SDALIGN) == 0) */
-                        pad = 0;
-                } else {
-                        skb_push(pkt, pad);
-                        frame = (u8 *) (pkt->data);
-                        /* precondition: pad + SDPCM_HDRLEN <= pkt->len */
-                        memset(frame, 0, pad + SDPCM_HDRLEN);
+                        pad = ((unsigned long)frame % BRCMF_SDALIGN);
                 }
+                skb_push(pkt, pad);
+                frame = (u8 *) (pkt->data);
+                memset(frame, 0, pad + SDPCM_HDRLEN);
         }
         /* precondition: pad < BRCMF_SDALIGN */
 
@@ -1833,8 +1852,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
             (((pad +
                SDPCM_HDRLEN) << SDPCM_DOFFSET_SHIFT) & SDPCM_DOFFSET_MASK);
 
-        put_unaligned_le32(swheader, frame + SDPCM_FRAMETAG_LEN);
-        put_unaligned_le32(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
+        *(((__le32 *) frame) + 1) = cpu_to_le32(swheader);
+        *(((__le32 *) frame) + 2) = 0;
 
 #ifdef DEBUG
         tx_packets[pkt->priority]++;
@@ -1900,11 +1919,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
 done:
         /* restore pkt buffer pointer before calling tx complete routine */
         skb_pull(pkt, SDPCM_HDRLEN + pad);
-        brcmf_txcomplete(bus->sdiodev->dev, pkt, ret != 0);
-
-        if (free_pkt)
-                brcmu_pkt_buf_free_skb(pkt);
-
+        brcmf_txcomplete(bus->sdiodev->dev, pkt, ret == 0);
         return ret;
 }
 
@@ -1932,7 +1947,7 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes)
                 spin_unlock_bh(&bus->txqlock);
                 datalen = pkt->len - SDPCM_HDRLEN;
 
-                ret = brcmf_sdbrcm_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);
+                ret = brcmf_sdbrcm_txpkt(bus, pkt, SDPCM_DATA_CHANNEL);
 
                 /* In poll mode, need to check for other events */
                 if (!bus->intr && cnt) {
@@ -1980,7 +1995,7 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev)
         sdio_claim_host(bus->sdiodev->func[1]);
 
         /* Enable clock for device interrupts */
-        brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
+        brcmf_sdbrcm_bus_sleep(bus, false, false);
 
         /* Disable and clear interrupts at the chip level also */
         w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, hostintmask));
@@ -2032,23 +2047,19 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev)
         bus->tx_seq = bus->rx_seq = 0;
 }
 
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
 static inline void brcmf_sdbrcm_clrintr(struct brcmf_sdio *bus)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&bus->sdiodev->irq_en_lock, flags);
-        if (!bus->sdiodev->irq_en && !atomic_read(&bus->ipend)) {
-                enable_irq(bus->sdiodev->irq);
-                bus->sdiodev->irq_en = true;
+        if (bus->sdiodev->oob_irq_requested) {
+                spin_lock_irqsave(&bus->sdiodev->irq_en_lock, flags);
+                if (!bus->sdiodev->irq_en && !atomic_read(&bus->ipend)) {
+                        enable_irq(bus->sdiodev->pdata->oob_irq_nr);
+                        bus->sdiodev->irq_en = true;
+                }
+                spin_unlock_irqrestore(&bus->sdiodev->irq_en_lock, flags);
         }
-        spin_unlock_irqrestore(&bus->sdiodev->irq_en_lock, flags);
 }
-#else
-static inline void brcmf_sdbrcm_clrintr(struct brcmf_sdio *bus)
-{
-}
-#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
 
 static inline void brcmf_sdbrcm_adddpctsk(struct brcmf_sdio *bus)
 {
@@ -2116,7 +2127,7 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
         sdio_claim_host(bus->sdiodev->func[1]);
 
         /* If waiting for HTAVAIL, check status */
-        if (bus->clkstate == CLK_PENDING) {
+        if (!bus->sr_enabled && bus->clkstate == CLK_PENDING) {
                 u8 clkctl, devctl = 0;
 
 #ifdef DEBUG
@@ -2138,7 +2149,7 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                         bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
                 }
 
-                brcmf_dbg(INFO, "DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n",
+                brcmf_dbg(SDIO, "DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n",
                           devctl, clkctl);
 
                 if (SBSDIO_HTAV(clkctl)) {
@@ -2162,7 +2173,7 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
         }
 
         /* Make sure backplane clock is on */
-        brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, true);
+        brcmf_sdbrcm_bus_sleep(bus, false, true);
 
         /* Pending interrupt indicates new device status */
         if (atomic_read(&bus->ipend) > 0) {
@@ -2308,12 +2319,22 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
         if ((bus->clkstate != CLK_PENDING)
             && bus->idletime == BRCMF_IDLE_IMMEDIATE) {
                 bus->activity = false;
+                brcmf_dbg(SDIO, "idle state\n");
                 sdio_claim_host(bus->sdiodev->func[1]);
-                brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
+                brcmf_sdbrcm_bus_sleep(bus, true, false);
                 sdio_release_host(bus->sdiodev->func[1]);
         }
 }
 
+static struct pktq *brcmf_sdbrcm_bus_gettxq(struct device *dev)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+        struct brcmf_sdio *bus = sdiodev->bus;
+
+        return &bus->txq;
+}
+
 static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
 {
         int ret = -EBADE;
@@ -2343,7 +2364,6 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
         if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) {
                 skb_pull(pkt, SDPCM_HDRLEN);
                 brcmf_txcomplete(bus->sdiodev->dev, pkt, false);
-                brcmu_pkt_buf_free_skb(pkt);
                 brcmf_err("out of bus->txq !!!\n");
                 ret = -ENOSR;
         } else {
@@ -2374,69 +2394,6 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
         return ret;
 }
 
-static int
-brcmf_sdbrcm_membytes(struct brcmf_sdio *bus, bool write, u32 address, u8 *data,
-                 uint size)
-{
-        int bcmerror = 0;
-        u32 sdaddr;
-        uint dsize;
-
-        /* Determine initial transfer parameters */
-        sdaddr = address & SBSDIO_SB_OFT_ADDR_MASK;
-        if ((sdaddr + size) & SBSDIO_SBWINDOW_MASK)
-                dsize = (SBSDIO_SB_OFT_ADDR_LIMIT - sdaddr);
-        else
-                dsize = size;
-
-        sdio_claim_host(bus->sdiodev->func[1]);
-
-        /* Set the backplane window to include the start address */
-        bcmerror = brcmf_sdcard_set_sbaddr_window(bus->sdiodev, address);
-        if (bcmerror) {
-                brcmf_err("window change failed\n");
-                goto xfer_done;
-        }
-
-        /* Do the transfer(s) */
-        while (size) {
-                brcmf_dbg(INFO, "%s %d bytes at offset 0x%08x in window 0x%08x\n",
-                          write ? "write" : "read", dsize,
-                          sdaddr, address & SBSDIO_SBWINDOW_MASK);
-                bcmerror = brcmf_sdcard_rwdata(bus->sdiodev, write,
-                                               sdaddr, data, dsize);
-                if (bcmerror) {
-                        brcmf_err("membytes transfer failed\n");
-                        break;
-                }
-
-                /* Adjust for next transfer (if any) */
-                size -= dsize;
-                if (size) {
-                        data += dsize;
-                        address += dsize;
-                        bcmerror = brcmf_sdcard_set_sbaddr_window(bus->sdiodev,
-                                                                  address);
-                        if (bcmerror) {
-                                brcmf_err("window change failed\n");
-                                break;
-                        }
-                        sdaddr = 0;
-                        dsize = min_t(uint, SBSDIO_SB_OFT_ADDR_LIMIT, size);
-                }
-        }
-
-xfer_done:
-        /* Return the window to backplane enumeration space for core access */
-        if (brcmf_sdcard_set_sbaddr_window(bus->sdiodev, bus->sdiodev->sbwad))
-                brcmf_err("FAILED to set window back to 0x%x\n",
-                          bus->sdiodev->sbwad);
-
-        sdio_release_host(bus->sdiodev->func[1]);
-
-        return bcmerror;
-}
-
 #ifdef DEBUG
 #define CONSOLE_LINE_MAX        192
 
@@ -2453,8 +2410,8 @@ static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
 
         /* Read console log struct */
         addr = bus->console_addr + offsetof(struct rte_console, log_le);
-        rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *)&c->log_le,
-                                   sizeof(c->log_le));
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, addr, (u8 *)&c->log_le,
+                              sizeof(c->log_le));
         if (rv < 0)
                 return rv;
 
@@ -2479,7 +2436,7 @@ static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
 
         /* Read the console buffer */
         addr = le32_to_cpu(c->log_le.buf);
-        rv = brcmf_sdbrcm_membytes(bus, false, addr, c->buf, c->bufsize);
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, addr, c->buf, c->bufsize);
         if (rv < 0)
                 return rv;
 
@@ -2604,7 +2561,7 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
 
         /* Make sure backplane clock is on */
         sdio_claim_host(bus->sdiodev->func[1]);
-        brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
+        brcmf_sdbrcm_bus_sleep(bus, false, false);
         sdio_release_host(bus->sdiodev->func[1]);
 
         /* Hardware tag: 2 byte len followed by 2 byte ~len check (all LE) */
@@ -2633,10 +2590,10 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
                                                  msecs_to_jiffies(2000));
 
                 if (!bus->ctrl_frame_stat) {
-                        brcmf_dbg(INFO, "ctrl_frame_stat == false\n");
+                        brcmf_dbg(SDIO, "ctrl_frame_stat == false\n");
                         ret = 0;
                 } else {
-                        brcmf_dbg(INFO, "ctrl_frame_stat == true\n");
+                        brcmf_dbg(SDIO, "ctrl_frame_stat == true\n");
                         ret = -1;
                 }
         }
@@ -2662,6 +2619,7 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
 
                 bus->activity = false;
                 sdio_claim_host(bus->sdiodev->func[1]);
+                brcmf_dbg(INFO, "idle\n");
                 brcmf_sdbrcm_clkctl(bus, CLK_NONE, true);
                 sdio_release_host(bus->sdiodev->func[1]);
         } else {
@@ -2691,23 +2649,22 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
         struct sdpcm_shared_le sh_le;
         __le32 addr_le;
 
-        shaddr = bus->ramsize - 4;
+        shaddr = bus->ci->rambase + bus->ramsize - 4;
 
         /*
          * Read last word in socram to determine
          * address of sdpcm_shared structure
          */
         sdio_claim_host(bus->sdiodev->func[1]);
-        brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
-        rv = brcmf_sdbrcm_membytes(bus, false, shaddr,
-                                   (u8 *)&addr_le, 4);
+        brcmf_sdbrcm_bus_sleep(bus, false, false);
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, shaddr, (u8 *)&addr_le, 4);
         sdio_release_host(bus->sdiodev->func[1]);
         if (rv < 0)
                 return rv;
 
         addr = le32_to_cpu(addr_le);
 
-        brcmf_dbg(INFO, "sdpcm_shared address 0x%08X\n", addr);
+        brcmf_dbg(SDIO, "sdpcm_shared address 0x%08X\n", addr);
 
         /*
          * Check if addr is valid.
@@ -2720,8 +2677,8 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
         }
 
         /* Read hndrte_shared structure */
-        rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *)&sh_le,
-                                   sizeof(struct sdpcm_shared_le));
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, addr, (u8 *)&sh_le,
+                              sizeof(struct sdpcm_shared_le));
         if (rv < 0)
                 return rv;
 
@@ -2734,8 +2691,8 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
         sh->console_addr = le32_to_cpu(sh_le.console_addr);
         sh->msgtrace_addr = le32_to_cpu(sh_le.msgtrace_addr);
 
-        if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
-                brcmf_err("sdpcm_shared version mismatch: dhd %d dongle %d\n",
+        if ((sh->flags & SDPCM_SHARED_VERSION_MASK) > SDPCM_SHARED_VERSION) {
+                brcmf_err("sdpcm shared version unsupported: dhd %d dongle %d\n",
                           SDPCM_SHARED_VERSION,
                           sh->flags & SDPCM_SHARED_VERSION_MASK);
                 return -EPROTO;
@@ -2757,22 +2714,22 @@ static int brcmf_sdio_dump_console(struct brcmf_sdio *bus,
 
         /* obtain console information from device memory */
         addr = sh->console_addr + offsetof(struct rte_console, log_le);
-        rv = brcmf_sdbrcm_membytes(bus, false, addr,
-                        (u8 *)&sh_val, sizeof(u32));
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, addr,
+                              (u8 *)&sh_val, sizeof(u32));
         if (rv < 0)
                 return rv;
         console_ptr = le32_to_cpu(sh_val);
 
         addr = sh->console_addr + offsetof(struct rte_console, log_le.buf_size);
-        rv = brcmf_sdbrcm_membytes(bus, false, addr,
-                        (u8 *)&sh_val, sizeof(u32));
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, addr,
+                              (u8 *)&sh_val, sizeof(u32));
         if (rv < 0)
                 return rv;
         console_size = le32_to_cpu(sh_val);
 
         addr = sh->console_addr + offsetof(struct rte_console, log_le.idx);
-        rv = brcmf_sdbrcm_membytes(bus, false, addr,
-                        (u8 *)&sh_val, sizeof(u32));
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, addr,
+                              (u8 *)&sh_val, sizeof(u32));
         if (rv < 0)
                 return rv;
         console_index = le32_to_cpu(sh_val);
@@ -2786,8 +2743,8 @@ static int brcmf_sdio_dump_console(struct brcmf_sdio *bus,
 
         /* obtain the console data from device */
         conbuf[console_size] = '\0';
-        rv = brcmf_sdbrcm_membytes(bus, false, console_ptr, (u8 *)conbuf,
-                                   console_size);
+        rv = brcmf_sdio_ramrw(bus->sdiodev, false, console_ptr, (u8 *)conbuf,
+                              console_size);
         if (rv < 0)
                 goto done;
 
@@ -2817,21 +2774,18 @@ static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,
         int error, res;
         char buf[350];
         struct brcmf_trap_info tr;
-        int nbytes;
         loff_t pos = 0;
 
-        if ((sh->flags & SDPCM_SHARED_TRAP) == 0)
+        if ((sh->flags & SDPCM_SHARED_TRAP) == 0) {
+                brcmf_dbg(INFO, "no trap in firmware\n");
                 return 0;
+        }
 
-        error = brcmf_sdbrcm_membytes(bus, false, sh->trap_addr, (u8 *)&tr,
-                                      sizeof(struct brcmf_trap_info));
+        error = brcmf_sdio_ramrw(bus->sdiodev, false, sh->trap_addr, (u8 *)&tr,
+                                 sizeof(struct brcmf_trap_info));
         if (error < 0)
                 return error;
 
-        nbytes = brcmf_sdio_dump_console(bus, sh, data, count);
-        if (nbytes < 0)
-                return nbytes;
-
         res = scnprintf(buf, sizeof(buf),
                         "dongle trap info: type 0x%x @ epc 0x%08x\n"
                         "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
@@ -2847,12 +2801,7 @@ static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,
                         le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
                         le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
 
-        error = simple_read_from_buffer(data+nbytes, count, &pos, buf, res);
-        if (error < 0)
-                return error;
-
-        nbytes += error;
-        return nbytes;
+        return simple_read_from_buffer(data, count, &pos, buf, res);
 }
 
 static int brcmf_sdio_assert_info(struct brcmf_sdio *bus,
@@ -2876,14 +2825,14 @@ static int brcmf_sdio_assert_info(struct brcmf_sdio *bus,
 
         sdio_claim_host(bus->sdiodev->func[1]);
         if (sh->assert_file_addr != 0) {
-                error = brcmf_sdbrcm_membytes(bus, false, sh->assert_file_addr,
-                                              (u8 *)file, 80);
+                error = brcmf_sdio_ramrw(bus->sdiodev, false,
+                                         sh->assert_file_addr, (u8 *)file, 80);
                 if (error < 0)
                         return error;
         }
         if (sh->assert_exp_addr != 0) {
-                error = brcmf_sdbrcm_membytes(bus, false, sh->assert_exp_addr,
-                                              (u8 *)expr, 80);
+                error = brcmf_sdio_ramrw(bus->sdiodev, false,
+                                         sh->assert_exp_addr, (u8 *)expr, 80);
                 if (error < 0)
                         return error;
         }
@@ -2934,14 +2883,20 @@ static int brcmf_sdbrcm_died_dump(struct brcmf_sdio *bus, char __user *data,
         error = brcmf_sdio_assert_info(bus, &sh, data, count);
         if (error < 0)
                 goto done;
-
         nbytes = error;
-        error = brcmf_sdio_trap_info(bus, &sh, data, count);
+
+        error = brcmf_sdio_trap_info(bus, &sh, data+nbytes, count);
+        if (error < 0)
+                goto done;
+        nbytes += error;
+
+        error = brcmf_sdio_dump_console(bus, &sh, data+nbytes, count);
         if (error < 0)
                 goto done;
+        nbytes += error;
 
-        error += nbytes;
-        *ppos += error;
+        error = nbytes;
+        *ppos += nbytes;
 done:
         return error;
 }
@@ -3035,84 +2990,8 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
         return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
-static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
+static bool brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)
 {
-        int bcmerror = 0;
-        u32 varaddr;
-        u32 varsizew;
-        __le32 varsizew_le;
-#ifdef DEBUG
-        char *nvram_ularray;
-#endif                          /* DEBUG */
-
-        /* Even if there are no vars are to be written, we still
-                 need to set the ramsize. */
-        varaddr = (bus->ramsize - 4) - bus->varsz;
-
-        if (bus->vars) {
-                /* Write the vars list */
-                bcmerror = brcmf_sdbrcm_membytes(bus, true, varaddr,
-                                                 bus->vars, bus->varsz);
-#ifdef DEBUG
-                /* Verify NVRAM bytes */
-                brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n",
-                          bus->varsz);
-                nvram_ularray = kmalloc(bus->varsz, GFP_ATOMIC);
-                if (!nvram_ularray)
-                        return -ENOMEM;
-
-                /* Upload image to verify downloaded contents. */
-                memset(nvram_ularray, 0xaa, bus->varsz);
-
-                /* Read the vars list to temp buffer for comparison */
-                bcmerror = brcmf_sdbrcm_membytes(bus, false, varaddr,
-                                                 nvram_ularray, bus->varsz);
-                if (bcmerror) {
-                        brcmf_err("error %d on reading %d nvram bytes at 0x%08x\n",
-                                  bcmerror, bus->varsz, varaddr);
-                }
-                /* Compare the org NVRAM with the one read from RAM */
-                if (memcmp(bus->vars, nvram_ularray, bus->varsz))
-                        brcmf_err("Downloaded NVRAM image is corrupted\n");
-                else
-                        brcmf_err("Download/Upload/Compare of NVRAM ok\n");
-
-                kfree(nvram_ularray);
-#endif                          /* DEBUG */
-        }
-
-        /* adjust to the user specified RAM */
-        brcmf_dbg(INFO, "Physical memory size: %d\n", bus->ramsize);
-        brcmf_dbg(INFO, "Vars are at %d, orig varsize is %d\n",
-                  varaddr, bus->varsz);
-
-        /*
-         * Determine the length token:
-         * Varsize, converted to words, in lower 16-bits, checksum
-         * in upper 16-bits.
-         */
-        if (bcmerror) {
-                varsizew = 0;
-                varsizew_le = cpu_to_le32(0);
-        } else {
-                varsizew = bus->varsz / 4;
-                varsizew = (~varsizew << 16) | (varsizew & 0x0000FFFF);
-                varsizew_le = cpu_to_le32(varsizew);
-        }
-
-        brcmf_dbg(INFO, "New varsize is %d, length token=0x%08x\n",
-                  bus->varsz, varsizew);
-
-        /* Write the length token to the last word */
-        bcmerror = brcmf_sdbrcm_membytes(bus, true, (bus->ramsize - 4),
-                                         (u8 *)&varsizew_le, 4);
-
-        return bcmerror;
-}
-
-static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)
-{
-        int bcmerror = 0;
         struct chip_info *ci = bus->ci;
 
         /* To enter download state, disable ARM and reset SOCRAM.
@@ -3121,41 +3000,19 @@ static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)
         if (enter) {
                 bus->alp_only = true;
 
-                ci->coredisable(bus->sdiodev, ci, BCMA_CORE_ARM_CM3);
-
-                ci->resetcore(bus->sdiodev, ci, BCMA_CORE_INTERNAL_MEM);
-
-                /* Clear the top bit of memory */
-                if (bus->ramsize) {
-                        u32 zeros = 0;
-                        brcmf_sdbrcm_membytes(bus, true, bus->ramsize - 4,
-                                         (u8 *)&zeros, 4);
-                }
+                brcmf_sdio_chip_enter_download(bus->sdiodev, ci);
         } else {
-                if (!ci->iscoreup(bus->sdiodev, ci, BCMA_CORE_INTERNAL_MEM)) {
-                        brcmf_err("SOCRAM core is down after reset?\n");
-                        bcmerror = -EBADE;
-                        goto fail;
-                }
-
-                bcmerror = brcmf_sdbrcm_write_vars(bus);
-                if (bcmerror) {
-                        brcmf_err("no vars written to RAM\n");
-                        bcmerror = 0;
-                }
-
-                w_sdreg32(bus, 0xFFFFFFFF,
-                          offsetof(struct sdpcmd_regs, intstatus));
-
-                ci->resetcore(bus->sdiodev, ci, BCMA_CORE_ARM_CM3);
+                if (!brcmf_sdio_chip_exit_download(bus->sdiodev, ci, bus->vars,
+                                                   bus->varsz))
+                        return false;
 
                 /* Allow HT Clock now that the ARM is running. */
                 bus->alp_only = false;
 
                 bus->sdiodev->bus_if->state = BRCMF_BUS_LOAD;
         }
-fail:
-        return bcmerror;
+
+        return true;
 }
 
 static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_sdio *bus)
@@ -3170,10 +3027,11 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_sdio *bus)
 
 static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus)
 {
-        int offset = 0;
+        int offset;
         uint len;
         u8 *memblock = NULL, *memptr;
         int ret;
+        u8 idx;
 
         brcmf_dbg(INFO, "Enter\n");
 
@@ -3194,10 +3052,15 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus)
                 memptr += (BRCMF_SDALIGN -
                            ((u32)(unsigned long)memblock % BRCMF_SDALIGN));
 
+        offset = bus->ci->rambase;
+
         /* Download image */
-        while ((len =
-                brcmf_sdbrcm_get_image((char *)memptr, MEMBLOCK, bus))) {
-                ret = brcmf_sdbrcm_membytes(bus, true, offset, memptr, len);
+        len = brcmf_sdbrcm_get_image((char *)memptr, MEMBLOCK, bus);
+        idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_ARM_CR4);
+        if (BRCMF_MAX_CORENUM != idx)
+                memcpy(&bus->ci->rst_vec, memptr, sizeof(bus->ci->rst_vec));
+        while (len) {
+                ret = brcmf_sdio_ramrw(bus->sdiodev, true, offset, memptr, len);
                 if (ret) {
                         brcmf_err("error %d on writing %d membytes at 0x%08x\n",
                                   ret, MEMBLOCK, offset);
@@ -3205,6 +3068,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus)
                 }
 
                 offset += MEMBLOCK;
+                len = brcmf_sdbrcm_get_image((char *)memptr, MEMBLOCK, bus);
         }
 
 err:
@@ -3312,7 +3176,7 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
         int bcmerror = -1;
 
         /* Keep arm in reset */
-        if (brcmf_sdbrcm_download_state(bus, true)) {
+        if (!brcmf_sdbrcm_download_state(bus, true)) {
                 brcmf_err("error placing ARM core in reset\n");
                 goto err;
         }
@@ -3328,7 +3192,7 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
         }
 
         /* Take arm out of reset */
-        if (brcmf_sdbrcm_download_state(bus, false)) {
+        if (!brcmf_sdbrcm_download_state(bus, false)) {
                 brcmf_err("error getting out of ARM core reset\n");
                 goto err;
         }
@@ -3339,6 +3203,103 @@ err:
         return bcmerror;
 }
 
+static bool brcmf_sdbrcm_sr_capable(struct brcmf_sdio *bus)
+{
+        u32 addr, reg;
+
+        brcmf_dbg(TRACE, "Enter\n");
+
+        /* old chips with PMU version less than 17 don't support save restore */
+        if (bus->ci->pmurev < 17)
+                return false;
+
+        /* read PMU chipcontrol register 3*/
+        addr = CORE_CC_REG(bus->ci->c_inf[0].base, chipcontrol_addr);
+        brcmf_sdio_regwl(bus->sdiodev, addr, 3, NULL);
+        addr = CORE_CC_REG(bus->ci->c_inf[0].base, chipcontrol_data);
+        reg = brcmf_sdio_regrl(bus->sdiodev, addr, NULL);
+
+        return (bool)reg;
+}
+
+static void brcmf_sdbrcm_sr_init(struct brcmf_sdio *bus)
+{
+        int err = 0;
+        u8 val;
+
+        brcmf_dbg(TRACE, "Enter\n");
+
+        val = brcmf_sdio_regrb(bus->sdiodev, SBSDIO_FUNC1_WAKEUPCTRL,
+                               &err);
+        if (err) {
+                brcmf_err("error reading SBSDIO_FUNC1_WAKEUPCTRL\n");
+                return;
+        }
+
+        val |= 1 << SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT;
+        brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_WAKEUPCTRL,
+                         val, &err);
+        if (err) {
+                brcmf_err("error writing SBSDIO_FUNC1_WAKEUPCTRL\n");
+                return;
+        }
+
+        /* Add CMD14 Support */
+        brcmf_sdio_regwb(bus->sdiodev, SDIO_CCCR_BRCM_CARDCAP,
+                         (SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT |
+                          SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT),
+                         &err);
+        if (err) {
+                brcmf_err("error writing SDIO_CCCR_BRCM_CARDCAP\n");
+                return;
+        }
+
+        brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
+                         SBSDIO_FORCE_HT, &err);
+        if (err) {
+                brcmf_err("error writing SBSDIO_FUNC1_CHIPCLKCSR\n");
+                return;
+        }
+
+        /* set flag */
+        bus->sr_enabled = true;
+        brcmf_dbg(INFO, "SR enabled\n");
+}
+
+/* enable KSO bit */
+static int brcmf_sdbrcm_kso_init(struct brcmf_sdio *bus)
+{
+        u8 val;
+        int err = 0;
+
+        brcmf_dbg(TRACE, "Enter\n");
+
+        /* KSO bit added in SDIO core rev 12 */
+        if (bus->ci->c_inf[1].rev < 12)
+                return 0;
+
+        val = brcmf_sdio_regrb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
+                               &err);
+        if (err) {
+                brcmf_err("error reading SBSDIO_FUNC1_SLEEPCSR\n");
+                return err;
+        }
+
+        if (!(val & SBSDIO_FUNC1_SLEEPCSR_KSO_MASK)) {
+                val |= (SBSDIO_FUNC1_SLEEPCSR_KSO_EN <<
+                        SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT);
+                brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
+                                 val, &err);
+                if (err) {
+                        brcmf_err("error writing SBSDIO_FUNC1_SLEEPCSR\n");
+                        return err;
+                }
+        }
+
+        return 0;
+}
+
+
 static bool
 brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
 {
@@ -3437,8 +3398,13 @@ static int brcmf_sdbrcm_bus_init(struct device *dev)
                 ret = -ENODEV;
         }
 
-        /* Restore previous clock setting */
-        brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
+        if (brcmf_sdbrcm_sr_capable(bus)) {
+                brcmf_sdbrcm_sr_init(bus);
+        } else {
+                /* Restore previous clock setting */
+                brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
+                                 saveclk, &err);
+        }
 
         if (ret == 0) {
                 ret = brcmf_sdio_intr_register(bus->sdiodev);
@@ -3499,7 +3465,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
         brcmf_dbg(TIMER, "Enter\n");
 
         /* Poll period: check device if appropriate. */
-        if (bus->poll && (++bus->polltick >= bus->pollrate)) {
+        if (!bus->sr_enabled &&
+            bus->poll && (++bus->polltick >= bus->pollrate)) {
                 u32 intstatus = 0;
 
                 /* Reset poll tick */
@@ -3550,7 +3517,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                         bus->console.count -= bus->console_interval;
                         sdio_claim_host(bus->sdiodev->func[1]);
                         /* Make sure backplane clock is on */
-                        brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
+                        brcmf_sdbrcm_bus_sleep(bus, false, false);
                         if (brcmf_sdbrcm_readconsole(bus) < 0)
                                 /* stop on error */
                                 bus->console_interval = 0;
@@ -3567,8 +3534,9 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                                 bus->activity = false;
                                 brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);
                         } else {
+                                brcmf_dbg(SDIO, "idle\n");
                                 sdio_claim_host(bus->sdiodev->func[1]);
-                                brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
+                                brcmf_sdbrcm_bus_sleep(bus, true, false);
                                 sdio_release_host(bus->sdiodev->func[1]);
                         }
                 }
@@ -3579,6 +3547,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
 
 static bool brcmf_sdbrcm_chipmatch(u16 chipid)
 {
+        if (chipid == BCM43143_CHIP_ID)
+                return true;
         if (chipid == BCM43241_CHIP_ID)
                 return true;
         if (chipid == BCM4329_CHIP_ID)
@@ -3587,6 +3557,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)
                 return true;
         if (chipid == BCM4334_CHIP_ID)
                 return true;
+        if (chipid == BCM4335_CHIP_ID)
+                return true;
         return false;
 }
 
@@ -3664,7 +3636,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
         int err = 0;
         int reg_addr;
         u32 reg_val;
-        u8 idx;
+        u32 drivestrength;
 
         bus->alp_only = true;
 
@@ -3700,8 +3672,16 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
                 goto fail;
         }
 
-        brcmf_sdio_chip_drivestrengthinit(bus->sdiodev, bus->ci,
-                                          SDIO_DRIVE_STRENGTH);
+        if (brcmf_sdbrcm_kso_init(bus)) {
+                brcmf_err("error enabling KSO\n");
+                goto fail;
+        }
+
+        if ((bus->sdiodev->pdata) && (bus->sdiodev->pdata->drive_strength))
+                drivestrength = bus->sdiodev->pdata->drive_strength;
+        else
+                drivestrength = DEFAULT_SDIO_DRIVE_STRENGTH;
+        brcmf_sdio_chip_drivestrengthinit(bus->sdiodev, bus->ci, drivestrength);
 
         /* Get info on the SOCRAM cores... */
         bus->ramsize = bus->ci->ramsize;
@@ -3710,12 +3690,37 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
                 goto fail;
         }
 
-        /* Set core control so an SDIO reset does a backplane reset */
-        idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
-        reg_addr = bus->ci->c_inf[idx].base +
-                   offsetof(struct sdpcmd_regs, corecontrol);
-        reg_val = brcmf_sdio_regrl(bus->sdiodev, reg_addr, NULL);
-        brcmf_sdio_regwl(bus->sdiodev, reg_addr, reg_val | CC_BPRESEN, NULL);
+        /* Set card control so an SDIO card reset does a WLAN backplane reset */
+        reg_val = brcmf_sdio_regrb(bus->sdiodev,
+                                   SDIO_CCCR_BRCM_CARDCTRL, &err);
+        if (err)
+                goto fail;
+
+        reg_val |= SDIO_CCCR_BRCM_CARDCTRL_WLANRESET;
+
+        brcmf_sdio_regwb(bus->sdiodev,
+                         SDIO_CCCR_BRCM_CARDCTRL, reg_val, &err);
+        if (err)
+                goto fail;
+
+        /* set PMUControl so a backplane reset does PMU state reload */
+        reg_addr = CORE_CC_REG(bus->ci->c_inf[0].base,
+                               pmucontrol);
+        reg_val = brcmf_sdio_regrl(bus->sdiodev,
+                                   reg_addr,
+                                   &err);
+        if (err)
+                goto fail;
+
+        reg_val |= (BCMA_CC_PMU_CTL_RES_RELOAD << BCMA_CC_PMU_CTL_RES_SHIFT);
+
+        brcmf_sdio_regwl(bus->sdiodev,
+                         reg_addr,
+                         reg_val,
+                         &err);
+        if (err)
+                goto fail;
+
 
         sdio_release_host(bus->sdiodev->func[1]);
 
@@ -3769,6 +3774,10 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus)
         bus->use_rxchain = false;
         bus->sd_rxchain = false;
 
+        /* SR state */
+        bus->sleeping = false;
+        bus->sr_enabled = false;
+
         return true;
 }
 
@@ -3856,6 +3865,7 @@ static struct brcmf_bus_ops brcmf_sdio_bus_ops = {
         .txdata = brcmf_sdbrcm_bus_txdata,
         .txctl = brcmf_sdbrcm_bus_txctl,
         .rxctl = brcmf_sdbrcm_bus_rxctl,
+        .gettxq = brcmf_sdbrcm_bus_gettxq,
 };
 
 void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
index e9d6f91a1f2b..5a64280e6485 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
@@ -20,6 +20,8 @@
 
 #include "dhd.h"
 #include "dhd_dbg.h"
+#include "tracepoint.h"
+#include "fwsignal.h"
 #include "fweh.h"
 #include "fwil.h"
 
@@ -154,7 +156,7 @@ static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
                 fweh = &ifp->drvr->fweh;
 
                 /* handle the event if valid interface and handler */
-                if (ifp->ndev && fweh->evt_handler[code])
+                if (fweh->evt_handler[code])
                         err = fweh->evt_handler[code](ifp, emsg, data);
                 else
                         brcmf_err("unhandled event %d ignored\n", code);
@@ -179,9 +181,9 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
         struct brcmf_if *ifp;
         int err = 0;
 
-        brcmf_dbg(EVENT, "action: %u idx: %u bsscfg: %u flags: %u\n",
-                  ifevent->action, ifevent->ifidx,
-                  ifevent->bssidx, ifevent->flags);
+        brcmf_dbg(EVENT, "action: %u idx: %u bsscfg: %u flags: %u role: %u\n",
+                  ifevent->action, ifevent->ifidx, ifevent->bssidx,
+                  ifevent->flags, ifevent->role);
 
         if (ifevent->ifidx >= BRCMF_MAX_IFS) {
                 brcmf_err("invalid interface index: %u\n",
@@ -198,15 +200,20 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
                                    emsg->ifname, emsg->addr);
                 if (IS_ERR(ifp))
                         return;
-
+                brcmf_fws_add_interface(ifp);
                 if (!drvr->fweh.evt_handler[BRCMF_E_IF])
                         err = brcmf_net_attach(ifp, false);
         }
 
+        if (ifevent->action == BRCMF_E_IF_CHANGE)
+                brcmf_fws_reset_interface(ifp);
+
         err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
 
-        if (ifevent->action == BRCMF_E_IF_DEL)
+        if (ifevent->action == BRCMF_E_IF_DEL) {
+                brcmf_fws_del_interface(ifp);
                 brcmf_del_if(drvr, ifevent->bssidx);
+        }
 }
 
 /**
@@ -400,13 +407,12 @@ int brcmf_fweh_activate_events(struct brcmf_if *ifp)
  *
  * @drvr: driver information object.
  * @event_packet: event packet to process.
- * @ifidx: index of the firmware interface (may change).
  *
  * If the packet buffer contains a firmware event message it will
  * dispatch the event to a registered handler (using worker).
  */
 void brcmf_fweh_process_event(struct brcmf_pub *drvr,
-                              struct brcmf_event *event_packet, u8 *ifidx)
+                              struct brcmf_event *event_packet)
 {
         enum brcmf_fweh_event_code code;
         struct brcmf_fweh_info *fweh = &drvr->fweh;
@@ -418,7 +424,6 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,
         /* get event info */
         code = get_unaligned_be32(&event_packet->msg.event_type);
         datalen = get_unaligned_be32(&event_packet->msg.datalen);
-        *ifidx = event_packet->msg.ifidx;
         data = &event_packet[1];
 
         if (code >= BRCMF_E_LAST)
@@ -435,7 +440,7 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,
                 return;
 
         event->code = code;
-        event->ifidx = *ifidx;
+        event->ifidx = event_packet->msg.ifidx;
 
         /* use memcpy to get aligned event message */
         memcpy(&event->emsg, &event_packet->msg, sizeof(event->emsg));
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
index 8c39b51dcccf..6ec5db9c60a5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
@@ -187,10 +187,10 @@ void brcmf_fweh_unregister(struct brcmf_pub *drvr,
                            enum brcmf_fweh_event_code code);
 int brcmf_fweh_activate_events(struct brcmf_if *ifp);
 void brcmf_fweh_process_event(struct brcmf_pub *drvr,
-                              struct brcmf_event *event_packet, u8 *ifidx);
+                              struct brcmf_event *event_packet);
 
 static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,
-                                          struct sk_buff *skb, u8 *ifidx)
+                                          struct sk_buff *skb)
 {
         struct brcmf_event *event_packet;
         u8 *data;
@@ -213,7 +213,7 @@ static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,
         if (usr_stype != BCMILCP_BCM_SUBTYPE_EVENT)
                 return;
 
-        brcmf_fweh_process_event(drvr, event_packet, ifidx);
+        brcmf_fweh_process_event(drvr, event_packet);
 }
 
 #endif /* FWEH_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
index 8d1def935b8d..04f395930d86 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
@@ -25,6 +25,7 @@
 #include "dhd.h"
 #include "dhd_bus.h"
 #include "dhd_dbg.h"
+#include "tracepoint.h"
 #include "fwil.h"
 
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
new file mode 100644
index 000000000000..5352dc1fdf3c
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -0,0 +1,2067 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/if_ether.h>
+#include <linux/spinlock.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/err.h>
+#include <linux/jiffies.h>
+#include <uapi/linux/nl80211.h>
+#include <net/cfg80211.h>
+
+#include <brcmu_utils.h>
+#include <brcmu_wifi.h>
+#include "dhd.h"
+#include "dhd_proto.h"
+#include "dhd_dbg.h"
+#include "dhd_bus.h"
+#include "fwil.h"
+#include "fwil_types.h"
+#include "fweh.h"
+#include "fwsignal.h"
+#include "p2p.h"
+#include "wl_cfg80211.h"
+
+/**
+ * DOC: Firmware Signalling
+ *
+ * Firmware can send signals to host and vice versa, which are passed in the
+ * data packets using TLV based header. This signalling layer is on top of the
+ * BDC bus protocol layer.
+ */
+
+/*
+ * single definition for firmware-driver flow control tlv's.
+ *
+ * each tlv is specified by BRCMF_FWS_TLV_DEF(name, ID, length).
+ * A length value 0 indicates variable length tlv.
+ */
+#define BRCMF_FWS_TLV_DEFLIST \
+        BRCMF_FWS_TLV_DEF(MAC_OPEN, 1, 1) \
+        BRCMF_FWS_TLV_DEF(MAC_CLOSE, 2, 1) \
+        BRCMF_FWS_TLV_DEF(MAC_REQUEST_CREDIT, 3, 2) \
+        BRCMF_FWS_TLV_DEF(TXSTATUS, 4, 4) \
+        BRCMF_FWS_TLV_DEF(PKTTAG, 5, 4) \
+        BRCMF_FWS_TLV_DEF(MACDESC_ADD,  6, 8) \
+        BRCMF_FWS_TLV_DEF(MACDESC_DEL, 7, 8) \
+        BRCMF_FWS_TLV_DEF(RSSI, 8, 1) \
+        BRCMF_FWS_TLV_DEF(INTERFACE_OPEN, 9, 1) \
+        BRCMF_FWS_TLV_DEF(INTERFACE_CLOSE, 10, 1) \
+        BRCMF_FWS_TLV_DEF(FIFO_CREDITBACK, 11, 6) \
+        BRCMF_FWS_TLV_DEF(PENDING_TRAFFIC_BMP, 12, 2) \
+        BRCMF_FWS_TLV_DEF(MAC_REQUEST_PACKET, 13, 3) \
+        BRCMF_FWS_TLV_DEF(HOST_REORDER_RXPKTS, 14, 10) \
+        BRCMF_FWS_TLV_DEF(TRANS_ID, 18, 6) \
+        BRCMF_FWS_TLV_DEF(COMP_TXSTATUS, 19, 1) \
+        BRCMF_FWS_TLV_DEF(FILLER, 255, 0)
+
+/*
+ * enum brcmf_fws_tlv_type - definition of tlv identifiers.
+ */
+#define BRCMF_FWS_TLV_DEF(name, id, len) \
+        BRCMF_FWS_TYPE_ ## name =  id,
+enum brcmf_fws_tlv_type {
+        BRCMF_FWS_TLV_DEFLIST
+        BRCMF_FWS_TYPE_INVALID
+};
+#undef BRCMF_FWS_TLV_DEF
+
+/*
+ * enum brcmf_fws_tlv_len - definition of tlv lengths.
+ */
+#define BRCMF_FWS_TLV_DEF(name, id, len) \
+        BRCMF_FWS_TYPE_ ## name ## _LEN = (len),
+enum brcmf_fws_tlv_len {
+        BRCMF_FWS_TLV_DEFLIST
+};
+#undef BRCMF_FWS_TLV_DEF
+
+#ifdef DEBUG
+/*
+ * brcmf_fws_tlv_names - array of tlv names.
+ */
+#define BRCMF_FWS_TLV_DEF(name, id, len) \
+        { id, #name },
+static struct {
+        enum brcmf_fws_tlv_type id;
+        const char *name;
+} brcmf_fws_tlv_names[] = {
+        BRCMF_FWS_TLV_DEFLIST
+};
+#undef BRCMF_FWS_TLV_DEF
+
+static const char *brcmf_fws_get_tlv_name(enum brcmf_fws_tlv_type id)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(brcmf_fws_tlv_names); i++)
+                if (brcmf_fws_tlv_names[i].id == id)
+                        return brcmf_fws_tlv_names[i].name;
+
+        return "INVALID";
+}
+#else
+static const char *brcmf_fws_get_tlv_name(enum brcmf_fws_tlv_type id)
+{
+        return "NODEBUG";
+}
+#endif /* DEBUG */
+
+/*
+ * flags used to enable tlv signalling from firmware.
+ */
+#define BRCMF_FWS_FLAGS_RSSI_SIGNALS                    0x0001
+#define BRCMF_FWS_FLAGS_XONXOFF_SIGNALS                 0x0002
+#define BRCMF_FWS_FLAGS_CREDIT_STATUS_SIGNALS           0x0004
+#define BRCMF_FWS_FLAGS_HOST_PROPTXSTATUS_ACTIVE        0x0008
+#define BRCMF_FWS_FLAGS_PSQ_GENERATIONFSM_ENABLE        0x0010
+#define BRCMF_FWS_FLAGS_PSQ_ZERO_BUFFER_ENABLE          0x0020
+#define BRCMF_FWS_FLAGS_HOST_RXREORDER_ACTIVE           0x0040
+
+#define BRCMF_FWS_MAC_DESC_TABLE_SIZE                   32
+#define BRCMF_FWS_MAC_DESC_ID_INVALID                   0xff
+
+#define BRCMF_FWS_HOSTIF_FLOWSTATE_OFF                  0
+#define BRCMF_FWS_HOSTIF_FLOWSTATE_ON                   1
+#define BRCMF_FWS_FLOWCONTROL_HIWATER                   128
+#define BRCMF_FWS_FLOWCONTROL_LOWATER                   64
+
+#define BRCMF_FWS_PSQ_PREC_COUNT                ((NL80211_NUM_ACS + 1) * 2)
+#define BRCMF_FWS_PSQ_LEN                               256
+
+#define BRCMF_FWS_HTOD_FLAG_PKTFROMHOST                 0x01
+#define BRCMF_FWS_HTOD_FLAG_PKT_REQUESTED               0x02
+
+#define BRCMF_FWS_RET_OK_NOSCHEDULE     0
+#define BRCMF_FWS_RET_OK_SCHEDULE       1
+
+/**
+ * enum brcmf_fws_skb_state - indicates processing state of skb.
+ *
+ * @BRCMF_FWS_SKBSTATE_NEW: sk_buff is newly arrived in the driver.
+ * @BRCMF_FWS_SKBSTATE_DELAYED: sk_buff had to wait on queue.
+ * @BRCMF_FWS_SKBSTATE_SUPPRESSED: sk_buff has been suppressed by firmware.
+ */
+enum brcmf_fws_skb_state {
+        BRCMF_FWS_SKBSTATE_NEW,
+        BRCMF_FWS_SKBSTATE_DELAYED,
+        BRCMF_FWS_SKBSTATE_SUPPRESSED
+};
+
+/**
+ * struct brcmf_skbuff_cb - control buffer associated with skbuff.
+ *
+ * @if_flags: holds interface index and packet related flags.
+ * @htod: host to device packet identifier (used in PKTTAG tlv).
+ * @state: transmit state of the packet.
+ * @mac: descriptor related to destination for this packet.
+ *
+ * This information is stored in control buffer struct sk_buff::cb, which
+ * provides 48 bytes of storage so this structure should not exceed that.
+ */
+struct brcmf_skbuff_cb {
+        u16 if_flags;
+        u32 htod;
+        enum brcmf_fws_skb_state state;
+        struct brcmf_fws_mac_descriptor *mac;
+};
+
+/*
+ * macro casting skbuff control buffer to struct brcmf_skbuff_cb.
+ */
+#define brcmf_skbcb(skb)        ((struct brcmf_skbuff_cb *)((skb)->cb))
+
+/*
+ * sk_buff control if flags
+ *
+ *      b[11]  - packet sent upon firmware request.
+ *      b[10]  - packet only contains signalling data.
+ *      b[9]   - packet is a tx packet.
+ *      b[8]   - packet uses FIFO credit (non-pspoll).
+ *      b[7]   - interface in AP mode.
+ *      b[6:4] - AC FIFO number.
+ *      b[3:0] - interface index.
+ */
+#define BRCMF_SKB_IF_FLAGS_REQUESTED_MASK       0x0800
+#define BRCMF_SKB_IF_FLAGS_REQUESTED_SHIFT      11
+#define BRCMF_SKB_IF_FLAGS_SIGNAL_ONLY_MASK     0x0400
+#define BRCMF_SKB_IF_FLAGS_SIGNAL_ONLY_SHIFT    10
+#define BRCMF_SKB_IF_FLAGS_TRANSMIT_MASK        0x0200
+#define BRCMF_SKB_IF_FLAGS_TRANSMIT_SHIFT       9
+#define BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK     0x0100
+#define BRCMF_SKB_IF_FLAGS_CREDITCHECK_SHIFT    8
+#define BRCMF_SKB_IF_FLAGS_IF_AP_MASK           0x0080
+#define BRCMF_SKB_IF_FLAGS_IF_AP_SHIFT          7
+#define BRCMF_SKB_IF_FLAGS_FIFO_MASK            0x0070
+#define BRCMF_SKB_IF_FLAGS_FIFO_SHIFT           4
+#define BRCMF_SKB_IF_FLAGS_INDEX_MASK           0x000f
+#define BRCMF_SKB_IF_FLAGS_INDEX_SHIFT          0
+
+#define brcmf_skb_if_flags_set_field(skb, field, value) \
+        brcmu_maskset16(&(brcmf_skbcb(skb)->if_flags), \
+                        BRCMF_SKB_IF_FLAGS_ ## field ## _MASK, \
+                        BRCMF_SKB_IF_FLAGS_ ## field ## _SHIFT, (value))
+#define brcmf_skb_if_flags_get_field(skb, field) \
+        brcmu_maskget16(brcmf_skbcb(skb)->if_flags, \
+                        BRCMF_SKB_IF_FLAGS_ ## field ## _MASK, \
+                        BRCMF_SKB_IF_FLAGS_ ## field ## _SHIFT)
+
+/*
+ * sk_buff control packet identifier
+ *
+ * 32-bit packet identifier used in PKTTAG tlv from host to dongle.
+ *
+ * - Generated at the host (e.g. dhd)
+ * - Seen as a generic sequence number by firmware except for the flags field.
+ *
+ * Generation   : b[31] => generation number for this packet [host->fw]
+ *                         OR, current generation number [fw->host]
+ * Flags        : b[30:27] => command, status flags
+ * FIFO-AC      : b[26:24] => AC-FIFO id
+ * h-slot       : b[23:8] => hanger-slot
+ * freerun      : b[7:0] => A free running counter
+ */
+#define BRCMF_SKB_HTOD_TAG_GENERATION_MASK              0x80000000
+#define BRCMF_SKB_HTOD_TAG_GENERATION_SHIFT             31
+#define BRCMF_SKB_HTOD_TAG_FLAGS_MASK                   0x78000000
+#define BRCMF_SKB_HTOD_TAG_FLAGS_SHIFT                  27
+#define BRCMF_SKB_HTOD_TAG_FIFO_MASK                    0x07000000
+#define BRCMF_SKB_HTOD_TAG_FIFO_SHIFT                   24
+#define BRCMF_SKB_HTOD_TAG_HSLOT_MASK                   0x00ffff00
+#define BRCMF_SKB_HTOD_TAG_HSLOT_SHIFT                  8
+#define BRCMF_SKB_HTOD_TAG_FREERUN_MASK                 0x000000ff
+#define BRCMF_SKB_HTOD_TAG_FREERUN_SHIFT                        0
+
+#define brcmf_skb_htod_tag_set_field(skb, field, value) \
+        brcmu_maskset32(&(brcmf_skbcb(skb)->htod), \
+                        BRCMF_SKB_HTOD_TAG_ ## field ## _MASK, \
+                        BRCMF_SKB_HTOD_TAG_ ## field ## _SHIFT, (value))
+#define brcmf_skb_htod_tag_get_field(skb, field) \
+        brcmu_maskget32(brcmf_skbcb(skb)->htod, \
+                        BRCMF_SKB_HTOD_TAG_ ## field ## _MASK, \
+                        BRCMF_SKB_HTOD_TAG_ ## field ## _SHIFT)
+
+#define BRCMF_FWS_TXSTAT_GENERATION_MASK        0x80000000
+#define BRCMF_FWS_TXSTAT_GENERATION_SHIFT       31
+#define BRCMF_FWS_TXSTAT_FLAGS_MASK             0x78000000
+#define BRCMF_FWS_TXSTAT_FLAGS_SHIFT            27
+#define BRCMF_FWS_TXSTAT_FIFO_MASK              0x07000000
+#define BRCMF_FWS_TXSTAT_FIFO_SHIFT             24
+#define BRCMF_FWS_TXSTAT_HSLOT_MASK             0x00FFFF00
+#define BRCMF_FWS_TXSTAT_HSLOT_SHIFT            8
+#define BRCMF_FWS_TXSTAT_PKTID_MASK             0x00FFFFFF
+#define BRCMF_FWS_TXSTAT_PKTID_SHIFT            0
+
+#define brcmf_txstatus_get_field(txs, field) \
+        brcmu_maskget32(txs, BRCMF_FWS_TXSTAT_ ## field ## _MASK, \
+                        BRCMF_FWS_TXSTAT_ ## field ## _SHIFT)
+
+/* How long to defer borrowing in jiffies */
+#define BRCMF_FWS_BORROW_DEFER_PERIOD           (HZ / 10)
+
+/**
+ * enum brcmf_fws_fifo - fifo indices used by dongle firmware.
+ *
+ * @BRCMF_FWS_FIFO_AC_BK: fifo for background traffic.
+ * @BRCMF_FWS_FIFO_AC_BE: fifo for best-effort traffic.
+ * @BRCMF_FWS_FIFO_AC_VI: fifo for video traffic.
+ * @BRCMF_FWS_FIFO_AC_VO: fifo for voice traffic.
+ * @BRCMF_FWS_FIFO_BCMC: fifo for broadcast/multicast (AP only).
+ * @BRCMF_FWS_FIFO_ATIM: fifo for ATIM (AP only).
+ * @BRCMF_FWS_FIFO_COUNT: number of fifos.
+ */
+enum brcmf_fws_fifo {
+        BRCMF_FWS_FIFO_AC_BK,
+        BRCMF_FWS_FIFO_AC_BE,
+        BRCMF_FWS_FIFO_AC_VI,
+        BRCMF_FWS_FIFO_AC_VO,
+        BRCMF_FWS_FIFO_BCMC,
+        BRCMF_FWS_FIFO_ATIM,
+        BRCMF_FWS_FIFO_COUNT
+};
+
+/**
+ * enum brcmf_fws_txstatus - txstatus flag values.
+ *
+ * @BRCMF_FWS_TXSTATUS_DISCARD:
+ *      host is free to discard the packet.
+ * @BRCMF_FWS_TXSTATUS_CORE_SUPPRESS:
+ *      802.11 core suppressed the packet.
+ * @BRCMF_FWS_TXSTATUS_FW_PS_SUPPRESS:
+ *      firmware suppress the packet as device is already in PS mode.
+ * @BRCMF_FWS_TXSTATUS_FW_TOSSED:
+ *      firmware tossed the packet.
+ */
+enum brcmf_fws_txstatus {
+        BRCMF_FWS_TXSTATUS_DISCARD,
+        BRCMF_FWS_TXSTATUS_CORE_SUPPRESS,
+        BRCMF_FWS_TXSTATUS_FW_PS_SUPPRESS,
+        BRCMF_FWS_TXSTATUS_FW_TOSSED
+};
+
+enum brcmf_fws_fcmode {
+        BRCMF_FWS_FCMODE_NONE,
+        BRCMF_FWS_FCMODE_IMPLIED_CREDIT,
+        BRCMF_FWS_FCMODE_EXPLICIT_CREDIT
+};
+
+enum brcmf_fws_mac_desc_state {
+        BRCMF_FWS_STATE_OPEN = 1,
+        BRCMF_FWS_STATE_CLOSE
+};
+
+/**
+ * struct brcmf_fws_mac_descriptor - firmware signalling data per node/interface
+ *
+ * @occupied: slot is in use.
+ * @mac_handle: handle for mac entry determined by firmware.
+ * @interface_id: interface index.
+ * @state: current state.
+ * @suppressed: mac entry is suppressed.
+ * @generation: generation bit.
+ * @ac_bitmap: ac queue bitmap.
+ * @requested_credit: credits requested by firmware.
+ * @ea: ethernet address.
+ * @seq: per-node free-running sequence.
+ * @psq: power-save queue.
+ * @transit_count: packet in transit to firmware.
+ */
+struct brcmf_fws_mac_descriptor {
+        u8 occupied;
+        u8 mac_handle;
+        u8 interface_id;
+        u8 state;
+        bool suppressed;
+        u8 generation;
+        u8 ac_bitmap;
+        u8 requested_credit;
+        u8 requested_packet;
+        u8 ea[ETH_ALEN];
+        u8 seq[BRCMF_FWS_FIFO_COUNT];
+        struct pktq psq;
+        int transit_count;
+        int suppress_count;
+        int suppr_transit_count;
+        bool send_tim_signal;
+        u8 traffic_pending_bmp;
+        u8 traffic_lastreported_bmp;
+};
+
+#define BRCMF_FWS_HANGER_MAXITEMS       1024
+
+/**
+ * enum brcmf_fws_hanger_item_state - state of hanger item.
+ *
+ * @BRCMF_FWS_HANGER_ITEM_STATE_FREE: item is free for use.
+ * @BRCMF_FWS_HANGER_ITEM_STATE_INUSE: item is in use.
+ * @BRCMF_FWS_HANGER_ITEM_STATE_INUSE_SUPPRESSED: item was suppressed.
+ */
+enum brcmf_fws_hanger_item_state {
+        BRCMF_FWS_HANGER_ITEM_STATE_FREE = 1,
+        BRCMF_FWS_HANGER_ITEM_STATE_INUSE,
+        BRCMF_FWS_HANGER_ITEM_STATE_INUSE_SUPPRESSED
+};
+
+
+/**
+ * struct brcmf_fws_hanger_item - single entry for tx pending packet.
+ *
+ * @state: entry is either free or occupied.
+ * @gen: generation.
+ * @pkt: packet itself.
+ */
+struct brcmf_fws_hanger_item {
+        enum brcmf_fws_hanger_item_state state;
+        u8 gen;
+        struct sk_buff *pkt;
+};
+
+/**
+ * struct brcmf_fws_hanger - holds packets awaiting firmware txstatus.
+ *
+ * @pushed: packets pushed to await txstatus.
+ * @popped: packets popped upon handling txstatus.
+ * @failed_to_push: packets that could not be pushed.
+ * @failed_to_pop: packets that could not be popped.
+ * @failed_slotfind: packets for which failed to find an entry.
+ * @slot_pos: last returned item index for a free entry.
+ * @items: array of hanger items.
+ */
+struct brcmf_fws_hanger {
+        u32 pushed;
+        u32 popped;
+        u32 failed_to_push;
+        u32 failed_to_pop;
+        u32 failed_slotfind;
+        u32 slot_pos;
+        struct brcmf_fws_hanger_item items[BRCMF_FWS_HANGER_MAXITEMS];
+};
+
+struct brcmf_fws_macdesc_table {
+        struct brcmf_fws_mac_descriptor nodes[BRCMF_FWS_MAC_DESC_TABLE_SIZE];
+        struct brcmf_fws_mac_descriptor iface[BRCMF_MAX_IFS];
+        struct brcmf_fws_mac_descriptor other;
+};
+
+struct brcmf_fws_info {
+        struct brcmf_pub *drvr;
+        struct brcmf_fws_stats stats;
+        struct brcmf_fws_hanger hanger;
+        enum brcmf_fws_fcmode fcmode;
+        struct brcmf_fws_macdesc_table desc;
+        struct workqueue_struct *fws_wq;
+        struct work_struct fws_dequeue_work;
+        u32 fifo_enqpkt[BRCMF_FWS_FIFO_COUNT];
+        int fifo_credit[BRCMF_FWS_FIFO_COUNT];
+        int credits_borrowed[BRCMF_FWS_FIFO_AC_VO + 1];
+        int deq_node_pos[BRCMF_FWS_FIFO_COUNT];
+        u32 fifo_credit_map;
+        u32 fifo_delay_map;
+        unsigned long borrow_defer_timestamp;
+};
+
+/*
+ * brcmf_fws_prio2fifo - mapping from 802.1d priority to firmware fifo index.
+ */
+static const int brcmf_fws_prio2fifo[] = {
+        BRCMF_FWS_FIFO_AC_BE,
+        BRCMF_FWS_FIFO_AC_BK,
+        BRCMF_FWS_FIFO_AC_BK,
+        BRCMF_FWS_FIFO_AC_BE,
+        BRCMF_FWS_FIFO_AC_VI,
+        BRCMF_FWS_FIFO_AC_VI,
+        BRCMF_FWS_FIFO_AC_VO,
+        BRCMF_FWS_FIFO_AC_VO
+};
+
+static int fcmode;
+module_param(fcmode, int, S_IRUSR);
+MODULE_PARM_DESC(fcmode, "mode of firmware signalled flow control");
+
+#define BRCMF_FWS_TLV_DEF(name, id, len) \
+        case BRCMF_FWS_TYPE_ ## name: \
+                return len;
+
+/**
+ * brcmf_fws_get_tlv_len() - returns defined length for given tlv id.
+ *
+ * @fws: firmware-signalling information.
+ * @id: identifier of the TLV.
+ *
+ * Return: the specified length for the given TLV; Otherwise -EINVAL.
+ */
+static int brcmf_fws_get_tlv_len(struct brcmf_fws_info *fws,
+                                 enum brcmf_fws_tlv_type id)
+{
+        switch (id) {
+        BRCMF_FWS_TLV_DEFLIST
+        default:
+                fws->stats.tlv_invalid_type++;
+                break;
+        }
+        return -EINVAL;
+}
+#undef BRCMF_FWS_TLV_DEF
+
+static bool brcmf_fws_ifidx_match(struct sk_buff *skb, void *arg)
+{
+        u32 ifidx = brcmf_skb_if_flags_get_field(skb, INDEX);
+        return ifidx == *(int *)arg;
+}
+
+static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,
+                                int ifidx)
+{
+        bool (*matchfn)(struct sk_buff *, void *) = NULL;
+        struct sk_buff *skb;
+        int prec;
+
+        if (ifidx != -1)
+                matchfn = brcmf_fws_ifidx_match;
+        for (prec = 0; prec < q->num_prec; prec++) {
+                skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
+                while (skb) {
+                        brcmu_pkt_buf_free_skb(skb);
+                        skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
+                }
+        }
+}
+
+static void brcmf_fws_hanger_init(struct brcmf_fws_hanger *hanger)
+{
+        int i;
+
+        brcmf_dbg(TRACE, "enter\n");
+        memset(hanger, 0, sizeof(*hanger));
+        for (i = 0; i < ARRAY_SIZE(hanger->items); i++)
+                hanger->items[i].state = BRCMF_FWS_HANGER_ITEM_STATE_FREE;
+}
+
+static u32 brcmf_fws_hanger_get_free_slot(struct brcmf_fws_hanger *h)
+{
+        u32 i;
+
+        brcmf_dbg(TRACE, "enter\n");
+        i = (h->slot_pos + 1) % BRCMF_FWS_HANGER_MAXITEMS;
+
+        while (i != h->slot_pos) {
+                if (h->items[i].state == BRCMF_FWS_HANGER_ITEM_STATE_FREE) {
+                        h->slot_pos = i;
+                        goto done;
+                }
+                i++;
+                if (i == BRCMF_FWS_HANGER_MAXITEMS)
+                        i = 0;
+        }
+        brcmf_err("all slots occupied\n");
+        h->failed_slotfind++;
+        i = BRCMF_FWS_HANGER_MAXITEMS;
+done:
+        brcmf_dbg(TRACE, "exit: %d\n", i);
+        return i;
+}
+
+static int brcmf_fws_hanger_pushpkt(struct brcmf_fws_hanger *h,
+                                           struct sk_buff *pkt, u32 slot_id)
+{
+        brcmf_dbg(TRACE, "enter\n");
+        if (slot_id >= BRCMF_FWS_HANGER_MAXITEMS)
+                return -ENOENT;
+
+        if (h->items[slot_id].state != BRCMF_FWS_HANGER_ITEM_STATE_FREE) {
+                brcmf_err("slot is not free\n");
+                h->failed_to_push++;
+                return -EINVAL;
+        }
+
+        h->items[slot_id].state = BRCMF_FWS_HANGER_ITEM_STATE_INUSE;
+        h->items[slot_id].pkt = pkt;
+        h->pushed++;
+        return 0;
+}
+
+static int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,
+                                          u32 slot_id, struct sk_buff **pktout,
+                                          bool remove_item)
+{
+        brcmf_dbg(TRACE, "enter\n");
+        if (slot_id >= BRCMF_FWS_HANGER_MAXITEMS)
+                return -ENOENT;
+
+        if (h->items[slot_id].state == BRCMF_FWS_HANGER_ITEM_STATE_FREE) {
+                brcmf_err("entry not in use\n");
+                h->failed_to_pop++;
+                return -EINVAL;
+        }
+
+        *pktout = h->items[slot_id].pkt;
+        if (remove_item) {
+                h->items[slot_id].state = BRCMF_FWS_HANGER_ITEM_STATE_FREE;
+                h->items[slot_id].pkt = NULL;
+                h->items[slot_id].gen = 0xff;
+                h->popped++;
+        }
+        return 0;
+}
+
+static int brcmf_fws_hanger_mark_suppressed(struct brcmf_fws_hanger *h,
+                                                   u32 slot_id, u8 gen)
+{
+        brcmf_dbg(TRACE, "enter\n");
+
+        if (slot_id >= BRCMF_FWS_HANGER_MAXITEMS)
+                return -ENOENT;
+
+        h->items[slot_id].gen = gen;
+
+        if (h->items[slot_id].state != BRCMF_FWS_HANGER_ITEM_STATE_INUSE) {
+                brcmf_err("entry not in use\n");
+                return -EINVAL;
+        }
+
+        h->items[slot_id].state = BRCMF_FWS_HANGER_ITEM_STATE_INUSE_SUPPRESSED;
+        return 0;
+}
+
+static int brcmf_fws_hanger_get_genbit(struct brcmf_fws_hanger *hanger,
+                                              struct sk_buff *pkt, u32 slot_id,
+                                              int *gen)
+{
+        brcmf_dbg(TRACE, "enter\n");
+        *gen = 0xff;
+
+        if (slot_id >= BRCMF_FWS_HANGER_MAXITEMS)
+                return -ENOENT;
+
+        if (hanger->items[slot_id].state == BRCMF_FWS_HANGER_ITEM_STATE_FREE) {
+                brcmf_err("slot not in use\n");
+                return -EINVAL;
+        }
+
+        *gen = hanger->items[slot_id].gen;
+        return 0;
+}
+
+static void brcmf_fws_hanger_cleanup(struct brcmf_fws_info *fws,
+                                     bool (*fn)(struct sk_buff *, void *),
+                                     int ifidx)
+{
+        struct brcmf_fws_hanger *h = &fws->hanger;
+        struct sk_buff *skb;
+        int i;
+        enum brcmf_fws_hanger_item_state s;
+
+        brcmf_dbg(TRACE, "enter: ifidx=%d\n", ifidx);
+        for (i = 0; i < ARRAY_SIZE(h->items); i++) {
+                s = h->items[i].state;
+                if (s == BRCMF_FWS_HANGER_ITEM_STATE_INUSE ||
+                    s == BRCMF_FWS_HANGER_ITEM_STATE_INUSE_SUPPRESSED) {
+                        skb = h->items[i].pkt;
+                        if (fn == NULL || fn(skb, &ifidx)) {
+                                /* suppress packets freed from psq */
+                                if (s == BRCMF_FWS_HANGER_ITEM_STATE_INUSE)
+                                        brcmu_pkt_buf_free_skb(skb);
+                                h->items[i].state =
+                                        BRCMF_FWS_HANGER_ITEM_STATE_FREE;
+                        }
+                }
+        }
+}
+
+static void brcmf_fws_init_mac_descriptor(struct brcmf_fws_mac_descriptor *desc,
+                                          u8 *addr, u8 ifidx)
+{
+        brcmf_dbg(TRACE,
+                  "enter: desc %p ea=%pM, ifidx=%u\n", desc, addr, ifidx);
+        desc->occupied = 1;
+        desc->state = BRCMF_FWS_STATE_OPEN;
+        desc->requested_credit = 0;
+        /* depending on use may need ifp->bssidx instead */
+        desc->interface_id = ifidx;
+        desc->ac_bitmap = 0xff; /* update this when handling APSD */
+        if (addr)
+                memcpy(&desc->ea[0], addr, ETH_ALEN);
+}
+
+static
+void brcmf_fws_clear_mac_descriptor(struct brcmf_fws_mac_descriptor *desc)
+{
+        brcmf_dbg(TRACE,
+                  "enter: ea=%pM, ifidx=%u\n", desc->ea, desc->interface_id);
+        desc->occupied = 0;
+        desc->state = BRCMF_FWS_STATE_CLOSE;
+        desc->requested_credit = 0;
+}
+
+static struct brcmf_fws_mac_descriptor *
+brcmf_fws_mac_descriptor_lookup(struct brcmf_fws_info *fws, u8 *ea)
+{
+        struct brcmf_fws_mac_descriptor *entry;
+        int i;
+
+        brcmf_dbg(TRACE, "enter: ea=%pM\n", ea);
+        if (ea == NULL)
+                return ERR_PTR(-EINVAL);
+
+        entry = &fws->desc.nodes[0];
+        for (i = 0; i < ARRAY_SIZE(fws->desc.nodes); i++) {
+                if (entry->occupied && !memcmp(entry->ea, ea, ETH_ALEN))
+                        return entry;
+                entry++;
+        }
+
+        return ERR_PTR(-ENOENT);
+}
+
+static struct brcmf_fws_mac_descriptor*
+brcmf_fws_find_mac_desc(struct brcmf_fws_info *fws, struct brcmf_if *ifp,
+                        u8 *da)
+{
+        struct brcmf_fws_mac_descriptor *entry = &fws->desc.other;
+        bool multicast;
+        enum nl80211_iftype iftype;
+
+        brcmf_dbg(TRACE, "enter: idx=%d\n", ifp->bssidx);
+
+        multicast = is_multicast_ether_addr(da);
+        iftype = brcmf_cfg80211_get_iftype(ifp);
+
+        /* Multicast destination and P2P clients get the interface entry.
+         * STA gets the interface entry if there is no exact match. For
+         * example, TDLS destinations have their own entry.
+         */
+        entry = NULL;
+        if ((multicast || iftype == NL80211_IFTYPE_STATION ||
+             iftype == NL80211_IFTYPE_P2P_CLIENT) && ifp->fws_desc)
+                entry = ifp->fws_desc;
+
+        if (entry != NULL && iftype != NL80211_IFTYPE_STATION)
+                goto done;
+
+        entry = brcmf_fws_mac_descriptor_lookup(fws, da);
+        if (IS_ERR(entry))
+                entry = &fws->desc.other;
+
+done:
+        brcmf_dbg(TRACE, "exit: entry=%p\n", entry);
+        return entry;
+}
+
+static bool brcmf_fws_mac_desc_closed(struct brcmf_fws_info *fws,
+                                      struct brcmf_fws_mac_descriptor *entry,
+                                      int fifo)
+{
+        struct brcmf_fws_mac_descriptor *if_entry;
+        bool closed;
+
+        /* for unique destination entries the related interface
+         * may be closed.
+         */
+        if (entry->mac_handle) {
+                if_entry = &fws->desc.iface[entry->interface_id];
+                if (if_entry->state == BRCMF_FWS_STATE_CLOSE)
+                        return true;
+        }
+        /* an entry is closed when the state is closed and
+         * the firmware did not request anything.
+         */
+        closed = entry->state == BRCMF_FWS_STATE_CLOSE &&
+                 !entry->requested_credit && !entry->requested_packet;
+
+        /* Or firmware does not allow traffic for given fifo */
+        return closed || !(entry->ac_bitmap & BIT(fifo));
+}
+
+static void brcmf_fws_mac_desc_cleanup(struct brcmf_fws_info *fws,
+                                       struct brcmf_fws_mac_descriptor *entry,
+                                       int ifidx)
+{
+        brcmf_dbg(TRACE, "enter: entry=(ea=%pM, ifid=%d), ifidx=%d\n",
+                  entry->ea, entry->interface_id, ifidx);
+        if (entry->occupied && (ifidx == -1 || ifidx == entry->interface_id)) {
+                brcmf_dbg(TRACE, "flush psq: ifidx=%d, qlen=%d\n",
+                          ifidx, entry->psq.len);
+                brcmf_fws_psq_flush(fws, &entry->psq, ifidx);
+                entry->occupied = !!(entry->psq.len);
+        }
+}
+
+static void brcmf_fws_bus_txq_cleanup(struct brcmf_fws_info *fws,
+                                      bool (*fn)(struct sk_buff *, void *),
+                                      int ifidx)
+{
+        struct brcmf_fws_hanger_item *hi;
+        struct pktq *txq;
+        struct sk_buff *skb;
+        int prec;
+        u32 hslot;
+
+        brcmf_dbg(TRACE, "enter: ifidx=%d\n", ifidx);
+        txq = brcmf_bus_gettxq(fws->drvr->bus_if);
+        if (IS_ERR(txq)) {
+                brcmf_dbg(TRACE, "no txq to clean up\n");
+                return;
+        }
+
+        for (prec = 0; prec < txq->num_prec; prec++) {
+                skb = brcmu_pktq_pdeq_match(txq, prec, fn, &ifidx);
+                while (skb) {
+                        hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);
+                        hi = &fws->hanger.items[hslot];
+                        WARN_ON(skb != hi->pkt);
+                        hi->state = BRCMF_FWS_HANGER_ITEM_STATE_FREE;
+                        brcmu_pkt_buf_free_skb(skb);
+                        skb = brcmu_pktq_pdeq_match(txq, prec, fn, &ifidx);
+                }
+        }
+}
+
+static void brcmf_fws_cleanup(struct brcmf_fws_info *fws, int ifidx)
+{
+        int i;
+        struct brcmf_fws_mac_descriptor *table;
+        bool (*matchfn)(struct sk_buff *, void *) = NULL;
+
+        brcmf_dbg(TRACE, "enter: ifidx=%d\n", ifidx);
+        if (fws == NULL)
+                return;
+
+        if (ifidx != -1)
+                matchfn = brcmf_fws_ifidx_match;
+
+        /* cleanup individual nodes */
+        table = &fws->desc.nodes[0];
+        for (i = 0; i < ARRAY_SIZE(fws->desc.nodes); i++)
+                brcmf_fws_mac_desc_cleanup(fws, &table[i], ifidx);
+
+        brcmf_fws_mac_desc_cleanup(fws, &fws->desc.other, ifidx);
+        brcmf_fws_bus_txq_cleanup(fws, matchfn, ifidx);
+        brcmf_fws_hanger_cleanup(fws, matchfn, ifidx);
+}
+
+static void brcmf_fws_tim_update(struct brcmf_fws_info *ctx,
+                                 struct brcmf_fws_mac_descriptor *entry,
+                                 int prec)
+{
+        brcmf_dbg(TRACE, "enter: ea=%pM\n", entry->ea);
+        if (entry->state == BRCMF_FWS_STATE_CLOSE) {
+                /* check delayedQ and suppressQ in one call using bitmap */
+                if (brcmu_pktq_mlen(&entry->psq, 3 << (prec * 2)) == 0)
+                        entry->traffic_pending_bmp =
+                                entry->traffic_pending_bmp & ~NBITVAL(prec);
+                else
+                        entry->traffic_pending_bmp =
+                                entry->traffic_pending_bmp | NBITVAL(prec);
+        }
+        /* request a TIM update to firmware at the next piggyback opportunity */
+        if (entry->traffic_lastreported_bmp != entry->traffic_pending_bmp)
+                entry->send_tim_signal = true;
+}
+
+static void
+brcmf_fws_flow_control_check(struct brcmf_fws_info *fws, struct pktq *pq,
+                             u8 if_id)
+{
+        struct brcmf_if *ifp = fws->drvr->iflist[if_id];
+
+        if (WARN_ON(!ifp))
+                return;
+
+        brcmf_dbg(TRACE,
+                  "enter: bssidx=%d, ifidx=%d\n", ifp->bssidx, ifp->ifidx);
+
+        if ((ifp->netif_stop & BRCMF_NETIF_STOP_REASON_FWS_FC) &&
+            pq->len <= BRCMF_FWS_FLOWCONTROL_LOWATER)
+                brcmf_txflowblock_if(ifp,
+                                     BRCMF_NETIF_STOP_REASON_FWS_FC, false);
+        if (!(ifp->netif_stop & BRCMF_NETIF_STOP_REASON_FWS_FC) &&
+            pq->len >= BRCMF_FWS_FLOWCONTROL_HIWATER)
+                brcmf_txflowblock_if(ifp, BRCMF_NETIF_STOP_REASON_FWS_FC, true);
+        return;
+}
+
+static int brcmf_fws_rssi_indicate(struct brcmf_fws_info *fws, s8 rssi)
+{
+        brcmf_dbg(CTL, "rssi %d\n", rssi);
+        return 0;
+}
+
+static
+int brcmf_fws_macdesc_indicate(struct brcmf_fws_info *fws, u8 type, u8 *data)
+{
+        struct brcmf_fws_mac_descriptor *entry, *existing;
+        u8 mac_handle;
+        u8 ifidx;
+        u8 *addr;
+
+        mac_handle = *data++;
+        ifidx = *data++;
+        addr = data;
+
+        entry = &fws->desc.nodes[mac_handle & 0x1F];
+        if (type == BRCMF_FWS_TYPE_MACDESC_DEL) {
+                brcmf_dbg(TRACE, "deleting mac %pM idx %d\n", addr, ifidx);
+                if (entry->occupied) {
+                        brcmf_fws_mac_desc_cleanup(fws, entry, -1);
+                        brcmf_fws_clear_mac_descriptor(entry);
+                } else
+                        fws->stats.mac_update_failed++;
+                return 0;
+        }
+
+        brcmf_dbg(TRACE,
+                  "add mac %pM handle %u idx %d\n", addr, mac_handle, ifidx);
+        existing = brcmf_fws_mac_descriptor_lookup(fws, addr);
+        if (IS_ERR(existing)) {
+                if (!entry->occupied) {
+                        entry->mac_handle = mac_handle;
+                        brcmf_fws_init_mac_descriptor(entry, addr, ifidx);
+                        brcmu_pktq_init(&entry->psq, BRCMF_FWS_PSQ_PREC_COUNT,
+                                        BRCMF_FWS_PSQ_LEN);
+                } else {
+                        fws->stats.mac_update_failed++;
+                }
+        } else {
+                if (entry != existing) {
+                        brcmf_dbg(TRACE, "relocate mac\n");
+                        memcpy(entry, existing,
+                               offsetof(struct brcmf_fws_mac_descriptor, psq));
+                        entry->mac_handle = mac_handle;
+                        brcmf_fws_clear_mac_descriptor(existing);
+                } else {
+                        brcmf_dbg(TRACE, "use existing\n");
+                        WARN_ON(entry->mac_handle != mac_handle);
+                        /* TODO: what should we do here: continue, reinit, .. */
+                }
+        }
+        return 0;
+}
+
+static int brcmf_fws_macdesc_state_indicate(struct brcmf_fws_info *fws,
+                                            u8 type, u8 *data)
+{
+        struct brcmf_fws_mac_descriptor *entry;
+        u8 mac_handle;
+        int i;
+
+        mac_handle = data[0];
+        entry = &fws->desc.nodes[mac_handle & 0x1F];
+        if (!entry->occupied) {
+                fws->stats.mac_ps_update_failed++;
+                return -ESRCH;
+        }
+
+        /* a state update should wipe old credits? */
+        entry->requested_credit = 0;
+        if (type == BRCMF_FWS_TYPE_MAC_OPEN) {
+                entry->state = BRCMF_FWS_STATE_OPEN;
+                return BRCMF_FWS_RET_OK_SCHEDULE;
+        } else {
+                entry->state = BRCMF_FWS_STATE_CLOSE;
+                for (i = BRCMF_FWS_FIFO_AC_BE; i < NL80211_NUM_ACS; i++)
+                        brcmf_fws_tim_update(fws, entry, i);
+        }
+        return BRCMF_FWS_RET_OK_NOSCHEDULE;
+}
+
+static int brcmf_fws_interface_state_indicate(struct brcmf_fws_info *fws,
+                                              u8 type, u8 *data)
+{
+        struct brcmf_fws_mac_descriptor *entry;
+        u8 ifidx;
+        int ret;
+
+        ifidx = data[0];
+
+        brcmf_dbg(TRACE, "enter: ifidx=%d\n", ifidx);
+        if (ifidx >= BRCMF_MAX_IFS) {
+                ret = -ERANGE;
+                goto fail;
+        }
+
+        entry = &fws->desc.iface[ifidx];
+        if (!entry->occupied) {
+                ret = -ESRCH;
+                goto fail;
+        }
+
+        switch (type) {
+        case BRCMF_FWS_TYPE_INTERFACE_OPEN:
+                entry->state = BRCMF_FWS_STATE_OPEN;
+                return BRCMF_FWS_RET_OK_SCHEDULE;
+        case BRCMF_FWS_TYPE_INTERFACE_CLOSE:
+                entry->state = BRCMF_FWS_STATE_CLOSE;
+                return BRCMF_FWS_RET_OK_NOSCHEDULE;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+fail:
+        fws->stats.if_update_failed++;
+        return ret;
+}
+
+static int brcmf_fws_request_indicate(struct brcmf_fws_info *fws, u8 type,
+                                      u8 *data)
+{
+        struct brcmf_fws_mac_descriptor *entry;
+
+        entry = &fws->desc.nodes[data[1] & 0x1F];
+        if (!entry->occupied) {
+                if (type == BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT)
+                        fws->stats.credit_request_failed++;
+                else
+                        fws->stats.packet_request_failed++;
+                return -ESRCH;
+        }
+
+        if (type == BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT)
+                entry->requested_credit = data[0];
+        else
+                entry->requested_packet = data[0];
+
+        entry->ac_bitmap = data[2];
+        return BRCMF_FWS_RET_OK_SCHEDULE;
+}
+
+static void brcmf_fws_return_credits(struct brcmf_fws_info *fws,
+                                     u8 fifo, u8 credits)
+{
+        int lender_ac;
+        int *borrowed;
+        int *fifo_credit;
+
+        if (!credits)
+                return;
+
+        if ((fifo == BRCMF_FWS_FIFO_AC_BE) &&
+            (fws->credits_borrowed[0])) {
+                for (lender_ac = BRCMF_FWS_FIFO_AC_VO; lender_ac >= 0;
+                     lender_ac--) {
+                        borrowed = &fws->credits_borrowed[lender_ac];
+                        if (*borrowed) {
+                                fws->fifo_credit_map |= (1 << lender_ac);
+                                fifo_credit = &fws->fifo_credit[lender_ac];
+                                if (*borrowed >= credits) {
+                                        *borrowed -= credits;
+                                        *fifo_credit += credits;
+                                        return;
+                                } else {
+                                        credits -= *borrowed;
+                                        *fifo_credit += *borrowed;
+                                        *borrowed = 0;
+                                }
+                        }
+                }
+        }
+
+        fws->fifo_credit_map |= 1 << fifo;
+        fws->fifo_credit[fifo] += credits;
+}
+
+static void brcmf_fws_schedule_deq(struct brcmf_fws_info *fws)
+{
+        /* only schedule dequeue when there are credits for delayed traffic */
+        if (fws->fifo_credit_map & fws->fifo_delay_map)
+                queue_work(fws->fws_wq, &fws->fws_dequeue_work);
+}
+
+static void brcmf_skb_pick_up_credit(struct brcmf_fws_info *fws, int fifo,
+                                     struct sk_buff *p)
+{
+        struct brcmf_fws_mac_descriptor *entry = brcmf_skbcb(p)->mac;
+
+        if (brcmf_skbcb(p)->if_flags & BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK) {
+                if (fws->fcmode != BRCMF_FWS_FCMODE_IMPLIED_CREDIT)
+                        return;
+                brcmf_fws_return_credits(fws, fifo, 1);
+        } else {
+                /*
+                 * if this packet did not count against FIFO credit, it
+                 * must have taken a requested_credit from the destination
+                 * entry (for pspoll etc.)
+                 */
+                if (!brcmf_skb_if_flags_get_field(p, REQUESTED))
+                        entry->requested_credit++;
+        }
+        brcmf_fws_schedule_deq(fws);
+}
+
+static int brcmf_fws_enq(struct brcmf_fws_info *fws,
+                         enum brcmf_fws_skb_state state, int fifo,
+                         struct sk_buff *p)
+{
+        int prec = 2 * fifo;
+        u32 *qfull_stat = &fws->stats.delayq_full_error;
+
+        struct brcmf_fws_mac_descriptor *entry;
+
+        entry = brcmf_skbcb(p)->mac;
+        if (entry == NULL) {
+                brcmf_err("no mac descriptor found for skb %p\n", p);
+                return -ENOENT;
+        }
+
+        brcmf_dbg(TRACE, "enter: ea=%pM, qlen=%d\n", entry->ea, entry->psq.len);
+        if (state == BRCMF_FWS_SKBSTATE_SUPPRESSED) {
+                prec += 1;
+                qfull_stat = &fws->stats.supprq_full_error;
+        }
+
+        if (brcmu_pktq_penq(&entry->psq, prec, p) == NULL) {
+                *qfull_stat += 1;
+                return -ENFILE;
+        }
+
+        /* increment total enqueued packet count */
+        fws->fifo_delay_map |= 1 << fifo;
+        fws->fifo_enqpkt[fifo]++;
+
+        /* update the sk_buff state */
+        brcmf_skbcb(p)->state = state;
+        if (state == BRCMF_FWS_SKBSTATE_SUPPRESSED)
+                entry->suppress_count++;
+
+        /*
+         * A packet has been pushed so update traffic
+         * availability bitmap, if applicable
+         */
+        brcmf_fws_tim_update(fws, entry, fifo);
+        brcmf_fws_flow_control_check(fws, &entry->psq,
+                                     brcmf_skb_if_flags_get_field(p, INDEX));
+        return 0;
+}
+
+static struct sk_buff *brcmf_fws_deq(struct brcmf_fws_info *fws, int fifo)
+{
+        struct brcmf_fws_mac_descriptor *table;
+        struct brcmf_fws_mac_descriptor *entry;
+        struct sk_buff *p;
+        int use_credit = 1;
+        int num_nodes;
+        int node_pos;
+        int prec_out;
+        int pmsk;
+        int i;
+
+        table = (struct brcmf_fws_mac_descriptor *)&fws->desc;
+        num_nodes = sizeof(fws->desc) / sizeof(struct brcmf_fws_mac_descriptor);
+        node_pos = fws->deq_node_pos[fifo];
+
+        for (i = 0; i < num_nodes; i++) {
+                entry = &table[(node_pos + i) % num_nodes];
+                if (!entry->occupied ||
+                    brcmf_fws_mac_desc_closed(fws, entry, fifo))
+                        continue;
+
+                if (entry->suppressed)
+                        pmsk = 2;
+                else
+                        pmsk = 3;
+                p = brcmu_pktq_mdeq(&entry->psq, pmsk << (fifo * 2), &prec_out);
+                if (p == NULL) {
+                        if (entry->suppressed) {
+                                if (entry->suppr_transit_count >
+                                    entry->suppress_count)
+                                        return NULL;
+                                entry->suppressed = false;
+                                p = brcmu_pktq_mdeq(&entry->psq,
+                                                    1 << (fifo * 2), &prec_out);
+                        }
+                }
+                if  (p == NULL)
+                        continue;
+
+                /* did the packet come from suppress sub-queue? */
+                if (entry->requested_credit > 0) {
+                        entry->requested_credit--;
+                        /*
+                         * if the packet was pulled out while destination is in
+                         * closed state but had a non-zero packets requested,
+                         * then this should not count against the FIFO credit.
+                         * That is due to the fact that the firmware will
+                         * most likely hold onto this packet until a suitable
+                         * time later to push it to the appropriate AC FIFO.
+                         */
+                        if (entry->state == BRCMF_FWS_STATE_CLOSE)
+                                use_credit = 0;
+                } else if (entry->requested_packet > 0) {
+                        entry->requested_packet--;
+                        brcmf_skb_if_flags_set_field(p, REQUESTED, 1);
+                        if (entry->state == BRCMF_FWS_STATE_CLOSE)
+                                use_credit = 0;
+                }
+                brcmf_skb_if_flags_set_field(p, CREDITCHECK, use_credit);
+
+                /* move dequeue position to ensure fair round-robin */
+                fws->deq_node_pos[fifo] = (node_pos + i + 1) % num_nodes;
+                brcmf_fws_flow_control_check(fws, &entry->psq,
+                                             brcmf_skb_if_flags_get_field(p,
+                                                                          INDEX)
+                                             );
+                /*
+                 * A packet has been picked up, update traffic
+                 * availability bitmap, if applicable
+                 */
+                brcmf_fws_tim_update(fws, entry, fifo);
+
+                /*
+                 * decrement total enqueued fifo packets and
+                 * clear delay bitmap if done.
+                 */
+                fws->fifo_enqpkt[fifo]--;
+                if (fws->fifo_enqpkt[fifo] == 0)
+                        fws->fifo_delay_map &= ~(1 << fifo);
+                goto done;
+        }
+        p = NULL;
+done:
+        brcmf_dbg(TRACE, "exit: fifo %d skb %p\n", fifo, p);
+        return p;
+}
+
+static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo,
+                                         struct sk_buff *skb, u32 genbit)
+{
+        struct brcmf_fws_mac_descriptor *entry = brcmf_skbcb(skb)->mac;
+        u32 hslot;
+        int ret;
+
+        hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);
+
+        /* this packet was suppressed */
+        if (!entry->suppressed || entry->generation != genbit) {
+                entry->suppressed = true;
+                entry->suppress_count = brcmu_pktq_mlen(&entry->psq,
+                                                        1 << (fifo * 2 + 1));
+                entry->suppr_transit_count = entry->transit_count;
+        }
+
+        entry->generation = genbit;
+
+        ret = brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_SUPPRESSED, fifo, skb);
+        if (ret != 0) {
+                /* suppress q is full, drop this packet */
+                brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
+                                        true);
+        } else {
+                /*
+                 * Mark suppressed to avoid a double free during
+                 * wlfc cleanup
+                 */
+                brcmf_fws_hanger_mark_suppressed(&fws->hanger, hslot,
+                                                 genbit);
+                entry->suppress_count++;
+        }
+
+        return ret;
+}
+
+static int
+brcmf_fws_txstatus_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,
+                           u32 genbit)
+{
+        u32 fifo;
+        int ret;
+        bool remove_from_hanger = true;
+        struct sk_buff *skb;
+        struct brcmf_fws_mac_descriptor *entry = NULL;
+
+        brcmf_dbg(TRACE, "status: flags=0x%X, hslot=%d\n",
+                  flags, hslot);
+
+        if (flags == BRCMF_FWS_TXSTATUS_DISCARD)
+                fws->stats.txs_discard++;
+        else if (flags == BRCMF_FWS_TXSTATUS_CORE_SUPPRESS) {
+                fws->stats.txs_supp_core++;
+                remove_from_hanger = false;
+        } else if (flags == BRCMF_FWS_TXSTATUS_FW_PS_SUPPRESS) {
+                fws->stats.txs_supp_ps++;
+                remove_from_hanger = false;
+        } else if (flags == BRCMF_FWS_TXSTATUS_FW_TOSSED)
+                fws->stats.txs_tossed++;
+        else
+                brcmf_err("unexpected txstatus\n");
+
+        ret = brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
+                                      remove_from_hanger);
+        if (ret != 0) {
+                brcmf_err("no packet in hanger slot: hslot=%d\n", hslot);
+                return ret;
+        }
+
+        entry = brcmf_skbcb(skb)->mac;
+        if (WARN_ON(!entry)) {
+                brcmu_pkt_buf_free_skb(skb);
+                return -EINVAL;
+        }
+
+        /* pick up the implicit credit from this packet */
+        fifo = brcmf_skb_htod_tag_get_field(skb, FIFO);
+        brcmf_skb_pick_up_credit(fws, fifo, skb);
+
+        if (!remove_from_hanger)
+                ret = brcmf_fws_txstatus_suppressed(fws, fifo, skb, genbit);
+
+        if (remove_from_hanger || ret) {
+                entry->transit_count--;
+                if (entry->suppressed)
+                        entry->suppr_transit_count--;
+
+                brcmf_txfinalize(fws->drvr, skb, true);
+        }
+        return 0;
+}
+
+static int brcmf_fws_fifocreditback_indicate(struct brcmf_fws_info *fws,
+                                             u8 *data)
+{
+        int i;
+
+        if (fws->fcmode != BRCMF_FWS_FCMODE_EXPLICIT_CREDIT) {
+                brcmf_dbg(INFO, "ignored\n");
+                return BRCMF_FWS_RET_OK_NOSCHEDULE;
+        }
+
+        brcmf_dbg(TRACE, "enter: data %pM\n", data);
+        for (i = 0; i < BRCMF_FWS_FIFO_COUNT; i++)
+                brcmf_fws_return_credits(fws, i, data[i]);
+
+        brcmf_dbg(INFO, "map: credit %x delay %x\n", fws->fifo_credit_map,
+                  fws->fifo_delay_map);
+        return BRCMF_FWS_RET_OK_SCHEDULE;
+}
+
+static int brcmf_fws_txstatus_indicate(struct brcmf_fws_info *fws, u8 *data)
+{
+        __le32 status_le;
+        u32 status;
+        u32 hslot;
+        u32 genbit;
+        u8 flags;
+
+        fws->stats.txs_indicate++;
+        memcpy(&status_le, data, sizeof(status_le));
+        status = le32_to_cpu(status_le);
+        flags = brcmf_txstatus_get_field(status, FLAGS);
+        hslot = brcmf_txstatus_get_field(status, HSLOT);
+        genbit = brcmf_txstatus_get_field(status, GENERATION);
+
+        return brcmf_fws_txstatus_process(fws, flags, hslot, genbit);
+}
+
+static int brcmf_fws_dbg_seqnum_check(struct brcmf_fws_info *fws, u8 *data)
+{
+        __le32 timestamp;
+
+        memcpy(&timestamp, &data[2], sizeof(timestamp));
+        brcmf_dbg(INFO, "received: seq %d, timestamp %d\n", data[1],
+                  le32_to_cpu(timestamp));
+        return 0;
+}
+
+/* using macro so sparse checking does not complain
+ * about locking imbalance.
+ */
+#define brcmf_fws_lock(drvr, flags)                             \
+do {                                                            \
+        flags = 0;                                              \
+        spin_lock_irqsave(&((drvr)->fws_spinlock), (flags));    \
+} while (0)
+
+/* using macro so sparse checking does not complain
+ * about locking imbalance.
+ */
+#define brcmf_fws_unlock(drvr, flags) \
+        spin_unlock_irqrestore(&((drvr)->fws_spinlock), (flags))
+
+static int brcmf_fws_notify_credit_map(struct brcmf_if *ifp,
+                                       const struct brcmf_event_msg *e,
+                                       void *data)
+{
+        struct brcmf_fws_info *fws = ifp->drvr->fws;
+        int i;
+        ulong flags;
+        u8 *credits = data;
+
+        if (e->datalen < BRCMF_FWS_FIFO_COUNT) {
+                brcmf_err("event payload too small (%d)\n", e->datalen);
+                return -EINVAL;
+        }
+
+        brcmf_dbg(TRACE, "enter: credits %pM\n", credits);
+        brcmf_fws_lock(ifp->drvr, flags);
+        for (i = 0; i < ARRAY_SIZE(fws->fifo_credit); i++) {
+                if (*credits)
+                        fws->fifo_credit_map |= 1 << i;
+                else
+                        fws->fifo_credit_map &= ~(1 << i);
+                fws->fifo_credit[i] = *credits++;
+        }
+        brcmf_fws_schedule_deq(fws);
+        brcmf_fws_unlock(ifp->drvr, flags);
+        return 0;
+}
+
+int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
+                      struct sk_buff *skb)
+{
+        struct brcmf_fws_info *fws = drvr->fws;
+        ulong flags;
+        u8 *signal_data;
+        s16 data_len;
+        u8 type;
+        u8 len;
+        u8 *data;
+        s32 status;
+        s32 err;
+
+        brcmf_dbg(TRACE, "enter: ifidx %d, skblen %u, sig %d\n",
+                  ifidx, skb->len, signal_len);
+
+        WARN_ON(signal_len > skb->len);
+
+        /* if flow control disabled, skip to packet data and leave */
+        if (!signal_len || !drvr->fw_signals) {
+                skb_pull(skb, signal_len);
+                return 0;
+        }
+
+        /* lock during tlv parsing */
+        brcmf_fws_lock(drvr, flags);
+
+        fws->stats.header_pulls++;
+        data_len = signal_len;
+        signal_data = skb->data;
+
+        status = BRCMF_FWS_RET_OK_NOSCHEDULE;
+        while (data_len > 0) {
+                /* extract tlv info */
+                type = signal_data[0];
+
+                /* FILLER type is actually not a TLV, but
+                 * a single byte that can be skipped.
+                 */
+                if (type == BRCMF_FWS_TYPE_FILLER) {
+                        signal_data += 1;
+                        data_len -= 1;
+                        continue;
+                }
+                len = signal_data[1];
+                data = signal_data + 2;
+
+                brcmf_dbg(INFO, "tlv type=%d (%s), len=%d, data[0]=%d\n", type,
+                          brcmf_fws_get_tlv_name(type), len, *data);
+
+                /* abort parsing when length invalid */
+                if (data_len < len + 2)
+                        break;
+
+                if (len != brcmf_fws_get_tlv_len(fws, type))
+                        break;
+
+                err = BRCMF_FWS_RET_OK_NOSCHEDULE;
+                switch (type) {
+                case BRCMF_FWS_TYPE_HOST_REORDER_RXPKTS:
+                case BRCMF_FWS_TYPE_COMP_TXSTATUS:
+                        break;
+                case BRCMF_FWS_TYPE_MACDESC_ADD:
+                case BRCMF_FWS_TYPE_MACDESC_DEL:
+                        brcmf_fws_macdesc_indicate(fws, type, data);
+                        break;
+                case BRCMF_FWS_TYPE_MAC_OPEN:
+                case BRCMF_FWS_TYPE_MAC_CLOSE:
+                        err = brcmf_fws_macdesc_state_indicate(fws, type, data);
+                        break;
+                case BRCMF_FWS_TYPE_INTERFACE_OPEN:
+                case BRCMF_FWS_TYPE_INTERFACE_CLOSE:
+                        err = brcmf_fws_interface_state_indicate(fws, type,
+                                                                 data);
+                        break;
+                case BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT:
+                case BRCMF_FWS_TYPE_MAC_REQUEST_PACKET:
+                        err = brcmf_fws_request_indicate(fws, type, data);
+                        break;
+                case BRCMF_FWS_TYPE_TXSTATUS:
+                        brcmf_fws_txstatus_indicate(fws, data);
+                        break;
+                case BRCMF_FWS_TYPE_FIFO_CREDITBACK:
+                        err = brcmf_fws_fifocreditback_indicate(fws, data);
+                        break;
+                case BRCMF_FWS_TYPE_RSSI:
+                        brcmf_fws_rssi_indicate(fws, *data);
+                        break;
+                case BRCMF_FWS_TYPE_TRANS_ID:
+                        brcmf_fws_dbg_seqnum_check(fws, data);
+                        break;
+                case BRCMF_FWS_TYPE_PKTTAG:
+                case BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP:
+                default:
+                        fws->stats.tlv_invalid_type++;
+                        break;
+                }
+                if (err == BRCMF_FWS_RET_OK_SCHEDULE)
+                        status = BRCMF_FWS_RET_OK_SCHEDULE;
+                signal_data += len + 2;
+                data_len -= len + 2;
+        }
+
+        if (data_len != 0)
+                fws->stats.tlv_parse_failed++;
+
+        if (status == BRCMF_FWS_RET_OK_SCHEDULE)
+                brcmf_fws_schedule_deq(fws);
+
+        /* signalling processing result does
+         * not affect the actual ethernet packet.
+         */
+        skb_pull(skb, signal_len);
+
+        /* this may be a signal-only packet
+         */
+        if (skb->len == 0)
+                fws->stats.header_only_pkt++;
+
+        brcmf_fws_unlock(drvr, flags);
+        return 0;
+}
+
+static int brcmf_fws_hdrpush(struct brcmf_fws_info *fws, struct sk_buff *skb)
+{
+        struct brcmf_fws_mac_descriptor *entry = brcmf_skbcb(skb)->mac;
+        u8 *wlh;
+        u16 data_offset = 0;
+        u8 fillers;
+        __le32 pkttag = cpu_to_le32(brcmf_skbcb(skb)->htod);
+
+        brcmf_dbg(TRACE, "enter: ea=%pM, ifidx=%u, pkttag=0x%08X\n",
+                  entry->ea, entry->interface_id, le32_to_cpu(pkttag));
+        if (entry->send_tim_signal)
+                data_offset += 2 + BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP_LEN;
+
+        /* +2 is for Type[1] and Len[1] in TLV, plus TIM signal */
+        data_offset += 2 + BRCMF_FWS_TYPE_PKTTAG_LEN;
+        fillers = round_up(data_offset, 4) - data_offset;
+        data_offset += fillers;
+
+        skb_push(skb, data_offset);
+        wlh = skb->data;
+
+        wlh[0] = BRCMF_FWS_TYPE_PKTTAG;
+        wlh[1] = BRCMF_FWS_TYPE_PKTTAG_LEN;
+        memcpy(&wlh[2], &pkttag, sizeof(pkttag));
+        wlh += BRCMF_FWS_TYPE_PKTTAG_LEN + 2;
+
+        if (entry->send_tim_signal) {
+                entry->send_tim_signal = 0;
+                wlh[0] = BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP;
+                wlh[1] = BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP_LEN;
+                wlh[2] = entry->mac_handle;
+                wlh[3] = entry->traffic_pending_bmp;
+                wlh += BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP_LEN + 2;
+                entry->traffic_lastreported_bmp = entry->traffic_pending_bmp;
+        }
+        if (fillers)
+                memset(wlh, BRCMF_FWS_TYPE_FILLER, fillers);
+
+        brcmf_proto_hdrpush(fws->drvr, brcmf_skb_if_flags_get_field(skb, INDEX),
+                            data_offset >> 2, skb);
+        return 0;
+}
+
+static int brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo,
+                                   struct sk_buff *p)
+{
+        struct brcmf_skbuff_cb *skcb = brcmf_skbcb(p);
+        struct brcmf_fws_mac_descriptor *entry = skcb->mac;
+        int rc = 0;
+        bool header_needed;
+        int hslot = BRCMF_FWS_HANGER_MAXITEMS;
+        u8 free_ctr;
+        u8 ifidx;
+        u8 flags;
+
+        header_needed = skcb->state != BRCMF_FWS_SKBSTATE_SUPPRESSED;
+
+        if (header_needed) {
+                /* obtaining free slot may fail, but that will be caught
+                 * by the hanger push. This assures the packet has a BDC
+                 * header upon return.
+                 */
+                hslot = brcmf_fws_hanger_get_free_slot(&fws->hanger);
+                free_ctr = entry->seq[fifo];
+                brcmf_skb_htod_tag_set_field(p, HSLOT, hslot);
+                brcmf_skb_htod_tag_set_field(p, FREERUN, free_ctr);
+                brcmf_skb_htod_tag_set_field(p, GENERATION, 1);
+                entry->transit_count++;
+        }
+        brcmf_skb_if_flags_set_field(p, TRANSMIT, 1);
+        brcmf_skb_htod_tag_set_field(p, FIFO, fifo);
+
+        flags = BRCMF_FWS_HTOD_FLAG_PKTFROMHOST;
+        if (!(skcb->if_flags & BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK)) {
+                /*
+                Indicate that this packet is being sent in response to an
+                explicit request from the firmware side.
+                */
+                flags |= BRCMF_FWS_HTOD_FLAG_PKT_REQUESTED;
+        }
+        brcmf_skb_htod_tag_set_field(p, FLAGS, flags);
+        if (header_needed) {
+                brcmf_fws_hdrpush(fws, p);
+                rc = brcmf_fws_hanger_pushpkt(&fws->hanger, p, hslot);
+                if (rc)
+                        brcmf_err("hanger push failed: rc=%d\n", rc);
+        } else {
+                int gen;
+
+                /* remove old header */
+                rc = brcmf_proto_hdrpull(fws->drvr, false, &ifidx, p);
+                if (rc == 0) {
+                        hslot = brcmf_skb_htod_tag_get_field(p, HSLOT);
+                        brcmf_fws_hanger_get_genbit(&fws->hanger, p,
+                                                    hslot, &gen);
+                        brcmf_skb_htod_tag_set_field(p, GENERATION, gen);
+
+                        /* push new header */
+                        brcmf_fws_hdrpush(fws, p);
+                }
+        }
+
+        return rc;
+}
+
+static void
+brcmf_fws_rollback_toq(struct brcmf_fws_info *fws, struct sk_buff *skb)
+{
+        /*
+        put the packet back to the head of queue
+
+        - suppressed packet goes back to suppress sub-queue
+        - pull out the header, if new or delayed packet
+
+        Note: hslot is used only when header removal is done.
+        */
+        struct brcmf_fws_mac_descriptor *entry;
+        enum brcmf_fws_skb_state state;
+        struct sk_buff *pktout;
+        int rc = 0;
+        int fifo;
+        int hslot;
+        u8 ifidx;
+
+        fifo = brcmf_skb_if_flags_get_field(skb, FIFO);
+        state = brcmf_skbcb(skb)->state;
+        entry = brcmf_skbcb(skb)->mac;
+
+        if (entry != NULL) {
+                if (state == BRCMF_FWS_SKBSTATE_SUPPRESSED) {
+                        /* wl-header is saved for suppressed packets */
+                        pktout = brcmu_pktq_penq_head(&entry->psq, 2 * fifo + 1,
+                                                      skb);
+                        if (pktout == NULL) {
+                                brcmf_err("suppress queue full\n");
+                                rc = -ENOSPC;
+                        }
+                } else {
+                        hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);
+
+                        /* remove header first */
+                        rc = brcmf_proto_hdrpull(fws->drvr, false, &ifidx, skb);
+                        if (rc) {
+                                brcmf_err("header removal failed\n");
+                                /* free the hanger slot */
+                                brcmf_fws_hanger_poppkt(&fws->hanger, hslot,
+                                                        &pktout, true);
+                                rc = -EINVAL;
+                                goto fail;
+                        }
+
+                        /* delay-q packets are going to delay-q */
+                        pktout = brcmu_pktq_penq_head(&entry->psq,
+                                                      2 * fifo, skb);
+                        if (pktout == NULL) {
+                                brcmf_err("delay queue full\n");
+                                rc = -ENOSPC;
+                        }
+
+                        /* free the hanger slot */
+                        brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &pktout,
+                                                true);
+
+                        /* decrement sequence count */
+                        entry->seq[fifo]--;
+                }
+                /*
+                if this packet did not count against FIFO credit, it must have
+                taken a requested_credit from the firmware (for pspoll etc.)
+                */
+                if (!(brcmf_skbcb(skb)->if_flags &
+                      BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK))
+                        entry->requested_credit++;
+        } else {
+                brcmf_err("no mac entry linked\n");
+                rc = -ENOENT;
+        }
+
+
+fail:
+        if (rc) {
+                brcmf_txfinalize(fws->drvr, skb, false);
+                fws->stats.rollback_failed++;
+        } else
+                fws->stats.rollback_success++;
+}
+
+static int brcmf_fws_borrow_credit(struct brcmf_fws_info *fws)
+{
+        int lender_ac;
+
+        if (time_after(fws->borrow_defer_timestamp, jiffies))
+                return -ENAVAIL;
+
+        for (lender_ac = 0; lender_ac <= BRCMF_FWS_FIFO_AC_VO; lender_ac++) {
+                if (fws->fifo_credit[lender_ac]) {
+                        fws->credits_borrowed[lender_ac]++;
+                        fws->fifo_credit[lender_ac]--;
+                        if (fws->fifo_credit[lender_ac] == 0)
+                                fws->fifo_credit_map &= ~(1 << lender_ac);
+                        brcmf_dbg(TRACE, "borrow credit from: %d\n", lender_ac);
+                        return 0;
+                }
+        }
+        return -ENAVAIL;
+}
+
+static int brcmf_fws_consume_credit(struct brcmf_fws_info *fws, int fifo,
+                                    struct sk_buff *skb)
+{
+        struct brcmf_fws_mac_descriptor *entry = brcmf_skbcb(skb)->mac;
+        int *credit = &fws->fifo_credit[fifo];
+        int use_credit = 1;
+
+        brcmf_dbg(TRACE, "enter: ac=%d, credits=%d\n", fifo, *credit);
+
+        if (entry->requested_credit > 0) {
+                /*
+                 * if the packet was pulled out while destination is in
+                 * closed state but had a non-zero packets requested,
+                 * then this should not count against the FIFO credit.
+                 * That is due to the fact that the firmware will
+                 * most likely hold onto this packet until a suitable
+                 * time later to push it to the appropriate AC FIFO.
+                 */
+                entry->requested_credit--;
+                if (entry->state == BRCMF_FWS_STATE_CLOSE)
+                        use_credit = 0;
+        } else if (entry->requested_packet > 0) {
+                entry->requested_packet--;
+                brcmf_skb_if_flags_set_field(skb, REQUESTED, 1);
+                if (entry->state == BRCMF_FWS_STATE_CLOSE)
+                        use_credit = 0;
+        }
+        brcmf_skb_if_flags_set_field(skb, CREDITCHECK, use_credit);
+        if (!use_credit) {
+                brcmf_dbg(TRACE, "exit: no creditcheck set\n");
+                return 0;
+        }
+
+        if (fifo != BRCMF_FWS_FIFO_AC_BE)
+                fws->borrow_defer_timestamp = jiffies +
+                                              BRCMF_FWS_BORROW_DEFER_PERIOD;
+
+        if (!(*credit)) {
+                /* Try to borrow a credit from other queue */
+                if (fifo == BRCMF_FWS_FIFO_AC_BE &&
+                    brcmf_fws_borrow_credit(fws) == 0)
+                        return 0;
+
+                brcmf_dbg(TRACE, "exit: ac=%d, credits depleted\n", fifo);
+                return -ENAVAIL;
+        }
+        (*credit)--;
+        if (!(*credit))
+                fws->fifo_credit_map &= ~(1 << fifo);
+        brcmf_dbg(TRACE, "exit: ac=%d, credits=%d\n", fifo, *credit);
+        return 0;
+}
+
+static int brcmf_fws_commit_skb(struct brcmf_fws_info *fws, int fifo,
+                                struct sk_buff *skb)
+{
+        struct brcmf_skbuff_cb *skcb = brcmf_skbcb(skb);
+        struct brcmf_fws_mac_descriptor *entry;
+        struct brcmf_bus *bus = fws->drvr->bus_if;
+        int rc;
+
+        entry = skcb->mac;
+        if (IS_ERR(entry))
+                return PTR_ERR(entry);
+
+        rc = brcmf_fws_precommit_skb(fws, fifo, skb);
+        if (rc < 0) {
+                fws->stats.generic_error++;
+                goto rollback;
+        }
+
+        rc = brcmf_bus_txdata(bus, skb);
+        if (rc < 0)
+                goto rollback;
+
+        entry->seq[fifo]++;
+        fws->stats.pkt2bus++;
+        if (brcmf_skbcb(skb)->if_flags & BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK) {
+                fws->stats.send_pkts[fifo]++;
+                fws->stats.fifo_credits_sent[fifo]++;
+        }
+
+        return rc;
+
+rollback:
+        brcmf_fws_rollback_toq(fws, skb);
+        return rc;
+}
+
+int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
+{
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct brcmf_fws_info *fws = drvr->fws;
+        struct brcmf_skbuff_cb *skcb = brcmf_skbcb(skb);
+        struct ethhdr *eh = (struct ethhdr *)(skb->data);
+        ulong flags;
+        int fifo = BRCMF_FWS_FIFO_BCMC;
+        bool multicast = is_multicast_ether_addr(eh->h_dest);
+
+        /* determine the priority */
+        if (!skb->priority)
+                skb->priority = cfg80211_classify8021d(skb);
+
+        drvr->tx_multicast += !!multicast;
+        if (ntohs(eh->h_proto) == ETH_P_PAE)
+                atomic_inc(&ifp->pend_8021x_cnt);
+
+        if (!brcmf_fws_fc_active(fws)) {
+                /* If the protocol uses a data header, apply it */
+                brcmf_proto_hdrpush(drvr, ifp->ifidx, 0, skb);
+
+                /* Use bus module to send data frame */
+                return brcmf_bus_txdata(drvr->bus_if, skb);
+        }
+
+        /* set control buffer information */
+        skcb->if_flags = 0;
+        skcb->mac = brcmf_fws_find_mac_desc(fws, ifp, eh->h_dest);
+        skcb->state = BRCMF_FWS_SKBSTATE_NEW;
+        brcmf_skb_if_flags_set_field(skb, INDEX, ifp->ifidx);
+        if (!multicast)
+                fifo = brcmf_fws_prio2fifo[skb->priority];
+        brcmf_skb_if_flags_set_field(skb, FIFO, fifo);
+
+        brcmf_dbg(TRACE, "ea=%pM, multi=%d, fifo=%d\n", eh->h_dest,
+                  multicast, fifo);
+
+        brcmf_fws_lock(drvr, flags);
+        if (skcb->mac->suppressed ||
+            brcmf_fws_mac_desc_closed(fws, skcb->mac, fifo) ||
+            brcmu_pktq_mlen(&skcb->mac->psq, 3 << (fifo * 2)) ||
+            (!multicast &&
+             brcmf_fws_consume_credit(fws, fifo, skb) < 0)) {
+                /* enqueue the packet in delayQ */
+                drvr->fws->fifo_delay_map |= 1 << fifo;
+                brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_DELAYED, fifo, skb);
+        } else {
+                if (brcmf_fws_commit_skb(fws, fifo, skb))
+                        if (!multicast)
+                                brcmf_skb_pick_up_credit(fws, fifo, skb);
+        }
+        brcmf_fws_unlock(drvr, flags);
+        return 0;
+}
+
+void brcmf_fws_reset_interface(struct brcmf_if *ifp)
+{
+        struct brcmf_fws_mac_descriptor *entry = ifp->fws_desc;
+
+        brcmf_dbg(TRACE, "enter: idx=%d\n", ifp->bssidx);
+        if (!entry)
+                return;
+
+        brcmf_fws_init_mac_descriptor(entry, ifp->mac_addr, ifp->ifidx);
+}
+
+void brcmf_fws_add_interface(struct brcmf_if *ifp)
+{
+        struct brcmf_fws_info *fws = ifp->drvr->fws;
+        struct brcmf_fws_mac_descriptor *entry;
+
+        brcmf_dbg(TRACE, "enter: idx=%d, mac=%pM\n",
+                  ifp->bssidx, ifp->mac_addr);
+        if (!ifp->ndev || !ifp->drvr->fw_signals)
+                return;
+
+        entry = &fws->desc.iface[ifp->ifidx];
+        ifp->fws_desc = entry;
+        brcmf_fws_init_mac_descriptor(entry, ifp->mac_addr, ifp->ifidx);
+        brcmu_pktq_init(&entry->psq, BRCMF_FWS_PSQ_PREC_COUNT,
+                        BRCMF_FWS_PSQ_LEN);
+}
+
+void brcmf_fws_del_interface(struct brcmf_if *ifp)
+{
+        struct brcmf_fws_mac_descriptor *entry = ifp->fws_desc;
+        ulong flags;
+
+        brcmf_dbg(TRACE, "enter: idx=%d\n", ifp->bssidx);
+        if (!entry)
+                return;
+
+        brcmf_fws_lock(ifp->drvr, flags);
+        ifp->fws_desc = NULL;
+        brcmf_fws_clear_mac_descriptor(entry);
+        brcmf_fws_cleanup(ifp->drvr->fws, ifp->ifidx);
+        brcmf_fws_unlock(ifp->drvr, flags);
+}
+
+static void brcmf_fws_dequeue_worker(struct work_struct *worker)
+{
+        struct brcmf_fws_info *fws;
+        struct sk_buff *skb;
+        ulong flags;
+        int fifo;
+        int credit;
+
+        fws = container_of(worker, struct brcmf_fws_info, fws_dequeue_work);
+
+        brcmf_dbg(TRACE, "enter: fws=%p\n", fws);
+        brcmf_fws_lock(fws->drvr, flags);
+        for (fifo = NL80211_NUM_ACS; fifo >= 0; fifo--) {
+                brcmf_dbg(TRACE, "fifo %d credit %d\n", fifo,
+                          fws->fifo_credit[fifo]);
+                for (credit = 0; credit < fws->fifo_credit[fifo]; /* nop */) {
+                        skb = brcmf_fws_deq(fws, fifo);
+                        if (!skb || brcmf_fws_commit_skb(fws, fifo, skb))
+                                break;
+                        if (brcmf_skbcb(skb)->if_flags &
+                            BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK)
+                                credit++;
+                }
+                if ((fifo == BRCMF_FWS_FIFO_AC_BE) &&
+                    (credit == fws->fifo_credit[fifo])) {
+                        fws->fifo_credit[fifo] -= credit;
+                        while (brcmf_fws_borrow_credit(fws) == 0) {
+                                skb = brcmf_fws_deq(fws, fifo);
+                                if (!skb) {
+                                        brcmf_fws_return_credits(fws, fifo, 1);
+                                        break;
+                                }
+                                if (brcmf_fws_commit_skb(fws, fifo, skb)) {
+                                        brcmf_fws_return_credits(fws, fifo, 1);
+                                        break;
+                                }
+                        }
+                } else {
+                        fws->fifo_credit[fifo] -= credit;
+                }
+        }
+        brcmf_fws_unlock(fws->drvr, flags);
+}
+
+int brcmf_fws_init(struct brcmf_pub *drvr)
+{
+        u32 tlv = BRCMF_FWS_FLAGS_RSSI_SIGNALS;
+        int rc;
+
+        if (!drvr->fw_signals)
+                return 0;
+
+        spin_lock_init(&drvr->fws_spinlock);
+
+        drvr->fws = kzalloc(sizeof(*(drvr->fws)), GFP_KERNEL);
+        if (!drvr->fws) {
+                rc = -ENOMEM;
+                goto fail;
+        }
+
+        /* set linkage back */
+        drvr->fws->drvr = drvr;
+        drvr->fws->fcmode = fcmode;
+
+        drvr->fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
+        if (drvr->fws->fws_wq == NULL) {
+                brcmf_err("workqueue creation failed\n");
+                rc = -EBADF;
+                goto fail;
+        }
+        INIT_WORK(&drvr->fws->fws_dequeue_work, brcmf_fws_dequeue_worker);
+
+        /* enable firmware signalling if fcmode active */
+        if (drvr->fws->fcmode != BRCMF_FWS_FCMODE_NONE)
+                tlv |= BRCMF_FWS_FLAGS_XONXOFF_SIGNALS |
+                       BRCMF_FWS_FLAGS_CREDIT_STATUS_SIGNALS |
+                       BRCMF_FWS_FLAGS_HOST_PROPTXSTATUS_ACTIVE;
+
+        rc = brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
+                                 brcmf_fws_notify_credit_map);
+        if (rc < 0) {
+                brcmf_err("register credit map handler failed\n");
+                goto fail;
+        }
+
+        /* setting the iovar may fail if feature is unsupported
+         * so leave the rc as is so driver initialization can
+         * continue.
+         */
+        if (brcmf_fil_iovar_int_set(drvr->iflist[0], "tlv", tlv)) {
+                brcmf_err("failed to set bdcv2 tlv signaling\n");
+                goto fail_event;
+        }
+
+        brcmf_fws_hanger_init(&drvr->fws->hanger);
+        brcmf_fws_init_mac_descriptor(&drvr->fws->desc.other, NULL, 0);
+        brcmu_pktq_init(&drvr->fws->desc.other.psq, BRCMF_FWS_PSQ_PREC_COUNT,
+                        BRCMF_FWS_PSQ_LEN);
+
+        /* create debugfs file for statistics */
+        brcmf_debugfs_create_fws_stats(drvr, &drvr->fws->stats);
+
+        /* TODO: remove upon feature delivery */
+        brcmf_err("%s bdcv2 tlv signaling [%x]\n",
+                  drvr->fw_signals ? "enabled" : "disabled", tlv);
+        return 0;
+
+fail_event:
+        brcmf_fweh_unregister(drvr, BRCMF_E_FIFO_CREDIT_MAP);
+fail:
+        brcmf_fws_deinit(drvr);
+        return rc;
+}
+
+void brcmf_fws_deinit(struct brcmf_pub *drvr)
+{
+        struct brcmf_fws_info *fws = drvr->fws;
+        ulong flags;
+
+        if (!fws)
+                return;
+
+        /* disable firmware signalling entirely
+         * to avoid using the workqueue.
+         */
+        drvr->fw_signals = false;
+
+        if (drvr->fws->fws_wq)
+                destroy_workqueue(drvr->fws->fws_wq);
+
+        /* cleanup */
+        brcmf_fws_lock(drvr, flags);
+        brcmf_fws_cleanup(fws, -1);
+        drvr->fws = NULL;
+        brcmf_fws_unlock(drvr, flags);
+
+        /* free top structure */
+        kfree(fws);
+}
+
+bool brcmf_fws_fc_active(struct brcmf_fws_info *fws)
+{
+        if (!fws)
+                return false;
+
+        brcmf_dbg(TRACE, "enter: mode=%d\n", fws->fcmode);
+        return fws->fcmode != BRCMF_FWS_FCMODE_NONE;
+}
+
+void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb)
+{
+        ulong flags;
+
+        brcmf_fws_lock(fws->drvr, flags);
+        brcmf_fws_txstatus_process(fws, BRCMF_FWS_TXSTATUS_FW_TOSSED,
+                                   brcmf_skb_htod_tag_get_field(skb, HSLOT), 0);
+        /* the packet never reached firmware so reclaim credit */
+        if (fws->fcmode == BRCMF_FWS_FCMODE_EXPLICIT_CREDIT &&
+            brcmf_skbcb(skb)->if_flags & BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK) {
+                brcmf_fws_return_credits(fws,
+                                         brcmf_skb_htod_tag_get_field(skb,
+                                                                      FIFO),
+                                         1);
+                brcmf_fws_schedule_deq(fws);
+        }
+        brcmf_fws_unlock(fws->drvr, flags);
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
new file mode 100644
index 000000000000..fbe483d23752
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2012 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+
+#ifndef FWSIGNAL_H_
+#define FWSIGNAL_H_
+
+int brcmf_fws_init(struct brcmf_pub *drvr);
+void brcmf_fws_deinit(struct brcmf_pub *drvr);
+bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);
+int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
+                      struct sk_buff *skb);
+int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb);
+
+void brcmf_fws_reset_interface(struct brcmf_if *ifp);
+void brcmf_fws_add_interface(struct brcmf_if *ifp);
+void brcmf_fws_del_interface(struct brcmf_if *ifp);
+void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb);
+
+#endif /* FWSIGNAL_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 4166e642068b..2b90da0d85f3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -15,6 +15,7 @@
  */
 #include <linux/slab.h>
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 #include <net/cfg80211.h>
 
 #include <brcmu_wifi.h>
@@ -423,29 +424,6 @@ static void brcmf_p2p_print_actframe(bool tx, void *frame, u32 frame_len)
 
 
 /**
- * brcmf_p2p_chnr_to_chspec() - convert channel number to chanspec.
- *
- * @channel: channel number
- */
-static u16 brcmf_p2p_chnr_to_chspec(u16 channel)
-{
-        u16 chanspec;
-
-        chanspec = channel & WL_CHANSPEC_CHAN_MASK;
-
-        if (channel <= CH_MAX_2G_CHANNEL)
-                chanspec |= WL_CHANSPEC_BAND_2G;
-        else
-                chanspec |= WL_CHANSPEC_BAND_5G;
-
-        chanspec |= WL_CHANSPEC_BW_20;
-        chanspec |= WL_CHANSPEC_CTL_SB_NONE;
-
-        return chanspec;
-}
-
-
-/**
  * brcmf_p2p_set_firmware() - prepare firmware for peer-to-peer operation.
  *
  * @ifp: ifp to use for iovars (primary).
@@ -455,7 +433,9 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
 {
         s32 ret = 0;
 
+        brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
         brcmf_fil_iovar_int_set(ifp, "apsta", 1);
+        brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
 
         /* In case of COB type, firmware has default mac address
          * After Initializing firmware, we have to set current mac address to
@@ -473,28 +453,35 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
  * brcmf_p2p_generate_bss_mac() - derive mac addresses for P2P.
  *
  * @p2p: P2P specific data.
+ * @dev_addr: optional device address.
  *
- * P2P needs mac addresses for P2P device and interface. These are
- * derived from the primary net device, ie. the permanent ethernet
- * address of the device.
+ * P2P needs mac addresses for P2P device and interface. If no device
+ * address it specified, these are derived from the primary net device, ie.
+ * the permanent ethernet address of the device.
  */
-static void brcmf_p2p_generate_bss_mac(struct brcmf_p2p_info *p2p)
+static void brcmf_p2p_generate_bss_mac(struct brcmf_p2p_info *p2p, u8 *dev_addr)
 {
         struct brcmf_if *pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
-        struct brcmf_if *p2p_ifp = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif->ifp;
+        bool local_admin = false;
+
+        if (!dev_addr || is_zero_ether_addr(dev_addr)) {
+                dev_addr = pri_ifp->mac_addr;
+                local_admin = true;
+        }
 
         /* Generate the P2P Device Address.  This consists of the device's
          * primary MAC address with the locally administered bit set.
          */
-        memcpy(p2p->dev_addr, pri_ifp->mac_addr, ETH_ALEN);
-        p2p->dev_addr[0] |= 0x02;
-        memcpy(p2p_ifp->mac_addr, p2p->dev_addr, ETH_ALEN);
+        memcpy(p2p->dev_addr, dev_addr, ETH_ALEN);
+        if (local_admin)
+                p2p->dev_addr[0] |= 0x02;
 
         /* Generate the P2P Interface Address.  If the discovery and connection
          * BSSCFGs need to simultaneously co-exist, then this address must be
          * different from the P2P Device Address, but also locally administered.
          */
         memcpy(p2p->int_addr, p2p->dev_addr, ETH_ALEN);
+        p2p->int_addr[0] |= 0x02;
         p2p->int_addr[4] ^= 0x80;
 }
 
@@ -773,7 +760,7 @@ exit:
  * validates the channels in the request.
  */
 static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
-                               struct net_device *ndev,
+                               struct brcmf_if *ifp,
                                struct cfg80211_scan_request *request,
                                u16 action)
 {
@@ -827,7 +814,8 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
                                            IEEE80211_CHAN_PASSIVE_SCAN))
                                 continue;
 
-                        chanspecs[i] = channel_to_chanspec(chan);
+                        chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf,
+                                                           chan);
                         brcmf_dbg(INFO, "%d: chan=%d, channel spec=%x\n",
                                   num_nodfs, chan->hw_value, chanspecs[i]);
                         num_nodfs++;
@@ -935,8 +923,8 @@ static s32
 brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
 {
         struct brcmf_cfg80211_vif *vif;
+        struct brcmu_chan ch;
         s32 err = 0;
-        u16 chanspec;
 
         vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
         if (!vif) {
@@ -951,9 +939,11 @@ brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
                 goto exit;
         }
 
-        chanspec = brcmf_p2p_chnr_to_chspec(channel);
+        ch.chnum = channel;
+        ch.bw = BRCMU_CHAN_BW_20;
+        p2p->cfg->d11inf.encchspec(&ch);
         err = brcmf_p2p_set_discover_state(vif->ifp, WL_P2P_DISC_ST_LISTEN,
-                                           chanspec, (u16)duration);
+                                           ch.chspec, (u16)duration);
         if (!err) {
                 set_bit(BRCMF_P2P_STATUS_DISCOVER_LISTEN, &p2p->status);
                 p2p->remain_on_channel_cookie++;
@@ -1065,6 +1055,7 @@ static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
         u32 channel_cnt;
         u16 *default_chan_list;
         u32 i;
+        struct brcmu_chan ch;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -1079,15 +1070,23 @@ static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
                 err = -ENOMEM;
                 goto exit;
         }
+        ch.bw = BRCMU_CHAN_BW_20;
         if (channel) {
+                ch.chnum = channel;
+                p2p->cfg->d11inf.encchspec(&ch);
                 /* insert same channel to the chan_list */
                 for (i = 0; i < channel_cnt; i++)
-                        default_chan_list[i] =
-                                        brcmf_p2p_chnr_to_chspec(channel);
+                        default_chan_list[i] = ch.chspec;
         } else {
-                default_chan_list[0] = brcmf_p2p_chnr_to_chspec(SOCIAL_CHAN_1);
-                default_chan_list[1] = brcmf_p2p_chnr_to_chspec(SOCIAL_CHAN_2);
-                default_chan_list[2] = brcmf_p2p_chnr_to_chspec(SOCIAL_CHAN_3);
+                ch.chnum = SOCIAL_CHAN_1;
+                p2p->cfg->d11inf.encchspec(&ch);
+                default_chan_list[0] = ch.chspec;
+                ch.chnum = SOCIAL_CHAN_2;
+                p2p->cfg->d11inf.encchspec(&ch);
+                default_chan_list[1] = ch.chspec;
+                ch.chnum = SOCIAL_CHAN_3;
+                p2p->cfg->d11inf.encchspec(&ch);
+                default_chan_list[2] = ch.chspec;
         }
         err = brcmf_p2p_escan(p2p, channel_cnt, default_chan_list,
                               WL_P2P_DISC_ST_SEARCH, WL_ESCAN_ACTION_START,
@@ -1217,6 +1216,7 @@ bool brcmf_p2p_scan_finding_common_channel(struct brcmf_cfg80211_info *cfg,
 {
         struct brcmf_p2p_info *p2p = &cfg->p2p;
         struct afx_hdl *afx_hdl = &p2p->afx_hdl;
+        struct brcmu_chan ch;
         u8 *ie;
         s32 err;
         u8 p2p_dev_addr[ETH_ALEN];
@@ -1242,8 +1242,12 @@ bool brcmf_p2p_scan_finding_common_channel(struct brcmf_cfg80211_info *cfg,
                                             p2p_dev_addr, sizeof(p2p_dev_addr));
         if ((err >= 0) &&
             (!memcmp(p2p_dev_addr, afx_hdl->tx_dst_addr, ETH_ALEN))) {
-                afx_hdl->peer_chan = bi->ctl_ch ? bi->ctl_ch :
-                                      CHSPEC_CHANNEL(le16_to_cpu(bi->chanspec));
+                if (!bi->ctl_ch) {
+                        ch.chspec = le16_to_cpu(bi->chanspec);
+                        cfg->d11inf.decchspec(&ch);
+                        bi->ctl_ch = ch.chnum;
+                }
+                afx_hdl->peer_chan = bi->ctl_ch;
                 brcmf_dbg(TRACE, "ACTION FRAME SCAN : Peer %pM found, channel : %d\n",
                           afx_hdl->tx_dst_addr, afx_hdl->peer_chan);
                 complete(&afx_hdl->act_frm_scan);
@@ -1261,7 +1265,7 @@ static void
 brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg)
 {
         struct brcmf_p2p_info *p2p = &cfg->p2p;
-        struct net_device *ndev = cfg->escan_info.ndev;
+        struct brcmf_if *ifp = cfg->escan_info.ifp;
 
         if (test_bit(BRCMF_P2P_STATUS_SENDING_ACT_FRAME, &p2p->status) &&
             (test_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status) ||
@@ -1271,12 +1275,12 @@ brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg)
                  * So abort scan for off channel completion.
                  */
                 if (p2p->af_sent_channel)
-                        brcmf_notify_escan_complete(cfg, ndev, true, true);
+                        brcmf_notify_escan_complete(cfg, ifp, true, true);
         } else if (test_bit(BRCMF_P2P_STATUS_WAITING_NEXT_AF_LISTEN,
                             &p2p->status)) {
                 brcmf_dbg(TRACE, "*** Wake UP ** abort listen for next af frame\n");
                 /* So abort scan to cancel listen */
-                brcmf_notify_escan_complete(cfg, ndev, true, true);
+                brcmf_notify_escan_complete(cfg, ifp, true, true);
         }
 }
 
@@ -1350,12 +1354,14 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
         u8 *frame = (u8 *)(rxframe + 1);
         struct brcmf_p2p_pub_act_frame *act_frm;
         struct brcmf_p2psd_gas_pub_act_frame *sd_act_frm;
-        u16 chanspec = be16_to_cpu(rxframe->chanspec);
+        struct brcmu_chan ch;
         struct ieee80211_mgmt *mgmt_frame;
         s32 freq;
         u16 mgmt_type;
         u8 action;
 
+        ch.chspec = be16_to_cpu(rxframe->chanspec);
+        cfg->d11inf.decchspec(&ch);
         /* Check if wpa_supplicant has registered for this frame */
         brcmf_dbg(INFO, "ifp->vif->mgmt_rx_reg %04x\n", ifp->vif->mgmt_rx_reg);
         mgmt_type = (IEEE80211_STYPE_ACTION & IEEE80211_FCTL_STYPE) >> 4;
@@ -1374,7 +1380,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
                                      &p2p->status) &&
                             (memcmp(afx_hdl->tx_dst_addr, e->addr,
                                     ETH_ALEN) == 0)) {
-                                afx_hdl->peer_chan = CHSPEC_CHANNEL(chanspec);
+                                afx_hdl->peer_chan = ch.chnum;
                                 brcmf_dbg(INFO, "GON request: Peer found, channel=%d\n",
                                           afx_hdl->peer_chan);
                                 complete(&afx_hdl->act_frm_scan);
@@ -1384,7 +1390,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
                 /* After complete GO Negotiation, roll back to mpc mode */
                 if ((action == P2P_PAF_GON_CONF) ||
                     (action == P2P_PAF_PROVDIS_RSP))
-                        brcmf_set_mpc(ifp->ndev, 1);
+                        brcmf_set_mpc(ifp, 1);
                 if (action == P2P_PAF_GON_CONF) {
                         brcmf_dbg(TRACE, "P2P: GO_NEG_PHASE status cleared\n");
                         clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
@@ -1417,11 +1423,12 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
         memcpy(&mgmt_frame->u, frame, mgmt_frame_len);
         mgmt_frame_len += offsetof(struct ieee80211_mgmt, u);
 
-        freq = ieee80211_channel_to_frequency(CHSPEC_CHANNEL(chanspec),
-                                              CHSPEC_IS2G(chanspec) ?
+        freq = ieee80211_channel_to_frequency(ch.chnum,
+                                              ch.band == BRCMU_CHAN_BAND_2G ?
                                               IEEE80211_BAND_2GHZ :
                                               IEEE80211_BAND_5GHZ);
-        wdev = ifp->ndev->ieee80211_ptr;
+
+        wdev = &ifp->vif->wdev;
         cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len,
                          GFP_ATOMIC);
 
@@ -1637,6 +1644,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
                                  struct brcmf_fil_af_params_le *af_params)
 {
         struct brcmf_p2p_info *p2p = &cfg->p2p;
+        struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_fil_action_frame_le *action_frame;
         struct brcmf_config_af_params config_af_params;
         struct afx_hdl *afx_hdl = &p2p->afx_hdl;
@@ -1725,7 +1733,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
 
         /* To make sure to send successfully action frame, turn off mpc */
         if (config_af_params.mpc_onoff == 0)
-                brcmf_set_mpc(ndev, 0);
+                brcmf_set_mpc(ifp, 0);
 
         /* set status and destination address before sending af */
         if (p2p->next_af_subtype != P2P_PAF_SUBTYPE_INVALID) {
@@ -1753,7 +1761,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
                  * care of current piggback algo, lets abort the scan here
                  * itself.
                  */
-                brcmf_notify_escan_complete(cfg, ndev, true, true);
+                brcmf_notify_escan_complete(cfg, ifp, true, true);
 
                 /* update channel */
                 af_params->channel = cpu_to_le32(afx_hdl->peer_chan);
@@ -1820,7 +1828,7 @@ exit:
         clear_bit(BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME, &p2p->status);
         /* if all done, turn mpc on again */
         if (config_af_params.mpc_onoff == 1)
-                brcmf_set_mpc(ndev, 1);
+                brcmf_set_mpc(ifp, 1);
 
         return ack;
 }
@@ -1839,10 +1847,10 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,
         struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
         struct brcmf_p2p_info *p2p = &cfg->p2p;
         struct afx_hdl *afx_hdl = &p2p->afx_hdl;
-        struct wireless_dev *wdev;
         struct brcmf_cfg80211_vif *vif = ifp->vif;
         struct brcmf_rx_mgmt_data *rxframe = (struct brcmf_rx_mgmt_data *)data;
         u16 chanspec = be16_to_cpu(rxframe->chanspec);
+        struct brcmu_chan ch;
         u8 *mgmt_frame;
         u32 mgmt_frame_len;
         s32 freq;
@@ -1851,9 +1859,12 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,
         brcmf_dbg(INFO, "Enter: event %d reason %d\n", e->event_code,
                   e->reason);
 
+        ch.chspec = be16_to_cpu(rxframe->chanspec);
+        cfg->d11inf.decchspec(&ch);
+
         if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, &p2p->status) &&
             (memcmp(afx_hdl->tx_dst_addr, e->addr, ETH_ALEN) == 0)) {
-                afx_hdl->peer_chan = CHSPEC_CHANNEL(chanspec);
+                afx_hdl->peer_chan = ch.chnum;
                 brcmf_dbg(INFO, "PROBE REQUEST: Peer found, channel=%d\n",
                           afx_hdl->peer_chan);
                 complete(&afx_hdl->act_frm_scan);
@@ -1878,12 +1889,13 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,
 
         mgmt_frame = (u8 *)(rxframe + 1);
         mgmt_frame_len = e->datalen - sizeof(*rxframe);
-        freq = ieee80211_channel_to_frequency(CHSPEC_CHANNEL(chanspec),
-                                              CHSPEC_IS2G(chanspec) ?
+        freq = ieee80211_channel_to_frequency(ch.chnum,
+                                              ch.band == BRCMU_CHAN_BAND_2G ?
                                               IEEE80211_BAND_2GHZ :
                                               IEEE80211_BAND_5GHZ);
-        wdev = ifp->ndev->ieee80211_ptr;
-        cfg80211_rx_mgmt(wdev, freq, 0, mgmt_frame, mgmt_frame_len, GFP_ATOMIC);
+
+        cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len,
+                         GFP_ATOMIC);
 
         brcmf_dbg(INFO, "mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n",
                   mgmt_frame_len, e->datalen, chanspec, freq);
@@ -1934,7 +1946,8 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg)
 
                 p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = p2p_vif;
 
-                brcmf_p2p_generate_bss_mac(p2p);
+                brcmf_p2p_generate_bss_mac(p2p, NULL);
+                memcpy(p2p_ifp->mac_addr, p2p->dev_addr, ETH_ALEN);
                 brcmf_p2p_set_firmware(pri_ifp, p2p->dev_addr);
 
                 /* Initialize P2P Discovery in the firmware */
@@ -2001,21 +2014,19 @@ static void brcmf_p2p_get_current_chanspec(struct brcmf_p2p_info *p2p,
 {
         struct brcmf_if *ifp;
         struct brcmf_fil_chan_info_le ci;
+        struct brcmu_chan ch;
         s32 err;
 
         ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
 
-        *chanspec = 11 & WL_CHANSPEC_CHAN_MASK;
+        ch.chnum = 11;
 
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_CHANNEL, &ci, sizeof(ci));
-        if (!err) {
-                *chanspec = le32_to_cpu(ci.hw_channel) & WL_CHANSPEC_CHAN_MASK;
-                if (*chanspec < CH_MAX_2G_CHANNEL)
-                        *chanspec |= WL_CHANSPEC_BAND_2G;
-                else
-                        *chanspec |= WL_CHANSPEC_BAND_5G;
-        }
-        *chanspec |= WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE;
+        if (!err)
+                ch.chnum = le32_to_cpu(ci.hw_channel);
+        ch.bw = BRCMU_CHAN_BW_20;
+        p2p->cfg->d11inf.encchspec(&ch);
+        *chanspec = ch.chspec;
 }
 
 /**
@@ -2040,13 +2051,13 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
                 brcmf_err("vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
                 return -EPERM;
         }
-        brcmf_notify_escan_complete(cfg, vif->ifp->ndev, true, true);
+        brcmf_notify_escan_complete(cfg, vif->ifp, true, true);
         vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
         if (!vif) {
                 brcmf_err("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
                 return -EPERM;
         }
-        brcmf_set_mpc(vif->ifp->ndev, 0);
+        brcmf_set_mpc(vif->ifp, 0);
 
         /* In concurrency case, STA may be already associated in a particular */
         /* channel. so retrieve the current channel of primary interface and  */
@@ -2124,13 +2135,105 @@ static int brcmf_p2p_release_p2p_if(struct brcmf_cfg80211_vif *vif)
 }
 
 /**
+ * brcmf_p2p_create_p2pdev() - create a P2P_DEVICE virtual interface.
+ *
+ * @p2p: P2P specific data.
+ * @wiphy: wiphy device of new interface.
+ * @addr: mac address for this new interface.
+ */
+static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
+                                                    struct wiphy *wiphy,
+                                                    u8 *addr)
+{
+        struct brcmf_cfg80211_vif *p2p_vif;
+        struct brcmf_if *p2p_ifp;
+        struct brcmf_if *pri_ifp;
+        int err;
+        u32 bssidx;
+
+        if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
+                return ERR_PTR(-ENOSPC);
+
+        p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE,
+                                  false);
+        if (IS_ERR(p2p_vif)) {
+                brcmf_err("could not create discovery vif\n");
+                return (struct wireless_dev *)p2p_vif;
+        }
+
+        pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
+        brcmf_p2p_generate_bss_mac(p2p, addr);
+        brcmf_p2p_set_firmware(pri_ifp, p2p->dev_addr);
+
+        brcmf_cfg80211_arm_vif_event(p2p->cfg, p2p_vif);
+
+        /* Initialize P2P Discovery in the firmware */
+        err = brcmf_fil_iovar_int_set(pri_ifp, "p2p_disc", 1);
+        if (err < 0) {
+                brcmf_err("set p2p_disc error\n");
+                brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
+                goto fail;
+        }
+
+        /* wait for firmware event */
+        err = brcmf_cfg80211_wait_vif_event_timeout(p2p->cfg, BRCMF_E_IF_ADD,
+                                                    msecs_to_jiffies(1500));
+        brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
+        if (!err) {
+                brcmf_err("timeout occurred\n");
+                err = -EIO;
+                goto fail;
+        }
+
+        /* discovery interface created */
+        p2p_ifp = p2p_vif->ifp;
+        p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = p2p_vif;
+        memcpy(p2p_ifp->mac_addr, p2p->dev_addr, ETH_ALEN);
+        memcpy(&p2p_vif->wdev.address, p2p->dev_addr, sizeof(p2p->dev_addr));
+
+        /* verify bsscfg index for P2P discovery */
+        err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bssidx);
+        if (err < 0) {
+                brcmf_err("retrieving discover bsscfg index failed\n");
+                goto fail;
+        }
+
+        WARN_ON(p2p_ifp->bssidx != bssidx);
+
+        init_completion(&p2p->send_af_done);
+        INIT_WORK(&p2p->afx_hdl.afx_work, brcmf_p2p_afx_handler);
+        init_completion(&p2p->afx_hdl.act_frm_scan);
+        init_completion(&p2p->wait_next_af);
+
+        return &p2p_vif->wdev;
+
+fail:
+        brcmf_free_vif(p2p_vif);
+        return ERR_PTR(err);
+}
+
+/**
+ * brcmf_p2p_delete_p2pdev() - delete P2P_DEVICE virtual interface.
+ *
+ * @vif: virtual interface object to delete.
+ */
+static void brcmf_p2p_delete_p2pdev(struct brcmf_cfg80211_vif *vif)
+{
+        struct brcmf_p2p_info *p2p = &vif->ifp->drvr->config->p2p;
+
+        cfg80211_unregister_wdev(&vif->wdev);
+        p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
+        brcmf_free_vif(vif);
+}
+
+/**
  * brcmf_p2p_add_vif() - create a new P2P virtual interface.
  *
  * @wiphy: wiphy device of new interface.
  * @name: name of the new interface.
  * @type: nl80211 interface type.
- * @flags: TBD
- * @params: TBD
+ * @flags: not used.
+ * @params: contains mac address for P2P device.
  */
 struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
                                        enum nl80211_iftype type, u32 *flags,
@@ -2157,6 +2260,9 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
                 iftype = BRCMF_FIL_P2P_IF_GO;
                 mode = WL_MODE_AP;
                 break;
+        case NL80211_IFTYPE_P2P_DEVICE:
+                return brcmf_p2p_create_p2pdev(&cfg->p2p, wiphy,
+                                               params->macaddr);
         default:
                 return ERR_PTR(-EOPNOTSUPP);
         }
@@ -2244,6 +2350,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)
                 break;
 
         case NL80211_IFTYPE_P2P_DEVICE:
+                brcmf_p2p_delete_p2pdev(vif);
+                return 0;
         default:
                 return -ENOTSUPP;
                 break;
@@ -2275,3 +2383,33 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)
 
         return err;
 }
+
+int brcmf_p2p_start_device(struct wiphy *wiphy, struct wireless_dev *wdev)
+{
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_p2p_info *p2p = &cfg->p2p;
+        struct brcmf_cfg80211_vif *vif;
+        int err;
+
+        vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
+        mutex_lock(&cfg->usr_sync);
+        err = brcmf_p2p_enable_discovery(p2p);
+        if (!err)
+                set_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state);
+        mutex_unlock(&cfg->usr_sync);
+        return err;
+}
+
+void brcmf_p2p_stop_device(struct wiphy *wiphy, struct wireless_dev *wdev)
+{
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_p2p_info *p2p = &cfg->p2p;
+        struct brcmf_cfg80211_vif *vif;
+
+        vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
+        mutex_lock(&cfg->usr_sync);
+        (void)brcmf_p2p_deinit_discovery(p2p);
+        brcmf_abort_scanning(cfg);
+        clear_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state);
+        mutex_unlock(&cfg->usr_sync);
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 14be2d5530ce..ca72177388b9 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -40,6 +40,15 @@
 #define BCM4329_CORE_ARM_BASE           0x18002000
 #define BCM4329_RAMSIZE                 0x48000
 
+/* bcm43143 */
+/* SDIO device core */
+#define BCM43143_CORE_BUS_BASE          0x18002000
+/* internal memory core */
+#define BCM43143_CORE_SOCRAM_BASE       0x18004000
+/* ARM Cortex M3 core, ID 0x82a */
+#define BCM43143_CORE_ARM_BASE          0x18003000
+#define BCM43143_RAMSIZE                0x70000
+
 #define SBCOREREV(sbidh) \
         ((((sbidh) & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT) | \
           ((sbidh) & SSB_IDHIGH_RCLO))
@@ -52,6 +61,9 @@
 #define CIB_REV_MASK            0xff000000
 #define CIB_REV_SHIFT           24
 
+/* ARM CR4 core specific control flag bits */
+#define ARMCR4_BCMA_IOCTL_CPUHALT       0x0020
+
 #define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) << 16) | (pmu))
 /* SDIO Pad drive strength to select value mappings */
 struct sdiod_drive_str {
@@ -70,6 +82,14 @@ static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = {
         {0, 0x1}
 };
 
+/* SDIO Drive Strength to sel value table for 43143 PMU Rev 17 (3.3V) */
+static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
+        {16, 0x7},
+        {12, 0x5},
+        {8,  0x3},
+        {4,  0x1}
+};
+
 u8
 brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid)
 {
@@ -149,7 +169,7 @@ brcmf_sdio_ai_iscoreup(struct brcmf_sdio_dev *sdiodev,
 
 static void
 brcmf_sdio_sb_coredisable(struct brcmf_sdio_dev *sdiodev,
-                          struct chip_info *ci, u16 coreid)
+                          struct chip_info *ci, u16 coreid, u32 core_bits)
 {
         u32 regdata, base;
         u8 idx;
@@ -235,7 +255,7 @@ brcmf_sdio_sb_coredisable(struct brcmf_sdio_dev *sdiodev,
 
 static void
 brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev,
-                          struct chip_info *ci, u16 coreid)
+                          struct chip_info *ci, u16 coreid, u32 core_bits)
 {
         u8 idx;
         u32 regdata;
@@ -249,19 +269,36 @@ brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev,
         if ((regdata & BCMA_RESET_CTL_RESET) != 0)
                 return;
 
-        brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL, 0, NULL);
-        regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+        /* ensure no pending backplane operation
+         * 300uc should be sufficient for backplane ops to be finish
+         * extra 10ms is taken into account for firmware load stage
+         * after 10300us carry on disabling the core anyway
+         */
+        SPINWAIT(brcmf_sdio_regrl(sdiodev,
+                                  ci->c_inf[idx].wrapbase+BCMA_RESET_ST,
+                                  NULL), 10300);
+        regdata = brcmf_sdio_regrl(sdiodev,
+                                   ci->c_inf[idx].wrapbase+BCMA_RESET_ST,
                                    NULL);
-        udelay(10);
+        if (regdata)
+                brcmf_err("disabling core 0x%x with reset status %x\n",
+                          coreid, regdata);
 
         brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
                          BCMA_RESET_CTL_RESET, NULL);
         udelay(1);
+
+        brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+                         core_bits, NULL);
+        regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+                                   NULL);
+        usleep_range(10, 20);
+
 }
 
 static void
 brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,
-                        struct chip_info *ci, u16 coreid)
+                        struct chip_info *ci, u16 coreid, u32 core_bits)
 {
         u32 regdata;
         u8 idx;
@@ -272,7 +309,7 @@ brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,
          * Must do the disable sequence first to work for
          * arbitrary current core state.
          */
-        brcmf_sdio_sb_coredisable(sdiodev, ci, coreid);
+        brcmf_sdio_sb_coredisable(sdiodev, ci, coreid, 0);
 
         /*
          * Now do the initialization sequence.
@@ -325,7 +362,7 @@ brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,
 
 static void
 brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev,
-                        struct chip_info *ci, u16 coreid)
+                        struct chip_info *ci, u16 coreid, u32 core_bits)
 {
         u8 idx;
         u32 regdata;
@@ -333,31 +370,69 @@ brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev,
         idx = brcmf_sdio_chip_getinfidx(ci, coreid);
 
         /* must disable first to work for arbitrary current core state */
-        brcmf_sdio_ai_coredisable(sdiodev, ci, coreid);
+        brcmf_sdio_ai_coredisable(sdiodev, ci, coreid, core_bits);
 
         /* now do initialization sequence */
         brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
-                         BCMA_IOCTL_FGC | BCMA_IOCTL_CLK, NULL);
+                         core_bits | BCMA_IOCTL_FGC | BCMA_IOCTL_CLK, NULL);
         regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
                                    NULL);
         brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
                          0, NULL);
+        regdata = brcmf_sdio_regrl(sdiodev,
+                                   ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
+                                   NULL);
         udelay(1);
 
         brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
-                         BCMA_IOCTL_CLK, NULL);
+                         core_bits | BCMA_IOCTL_CLK, NULL);
         regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
                                    NULL);
         udelay(1);
 }
 
+#ifdef DEBUG
+/* safety check for chipinfo */
+static int brcmf_sdio_chip_cichk(struct chip_info *ci)
+{
+        u8 core_idx;
+
+        /* check RAM core presence for ARM CM3 core */
+        core_idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_ARM_CM3);
+        if (BRCMF_MAX_CORENUM != core_idx) {
+                core_idx = brcmf_sdio_chip_getinfidx(ci,
+                                                     BCMA_CORE_INTERNAL_MEM);
+                if (BRCMF_MAX_CORENUM == core_idx) {
+                        brcmf_err("RAM core not provided with ARM CM3 core\n");
+                        return -ENODEV;
+                }
+        }
+
+        /* check RAM base for ARM CR4 core */
+        core_idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_ARM_CR4);
+        if (BRCMF_MAX_CORENUM != core_idx) {
+                if (ci->rambase == 0) {
+                        brcmf_err("RAM base not provided with ARM CR4 core\n");
+                        return -ENOMEM;
+                }
+        }
+
+        return 0;
+}
+#else   /* DEBUG */
+static inline int brcmf_sdio_chip_cichk(struct chip_info *ci)
+{
+        return 0;
+}
+#endif
+
 static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
                                        struct chip_info *ci, u32 regs)
 {
         u32 regdata;
+        int ret;
 
-        /*
-         * Get CC core rev
+        /* Get CC core rev
          * Chipid is assume to be at offset 0 from regs arg
          * For different chiptypes or old sdio hosts w/o chipcommon,
          * other ways of recognition should be added here.
@@ -375,6 +450,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
 
         /* Address of cores for new chips should be added here */
         switch (ci->chip) {
+        case BCM43143_CHIP_ID:
+                ci->c_inf[0].wrapbase = ci->c_inf[0].base + 0x00100000;
+                ci->c_inf[0].cib = 0x2b000000;
+                ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;
+                ci->c_inf[1].base = BCM43143_CORE_BUS_BASE;
+                ci->c_inf[1].wrapbase = ci->c_inf[1].base + 0x00100000;
+                ci->c_inf[1].cib = 0x18000000;
+                ci->c_inf[2].id = BCMA_CORE_INTERNAL_MEM;
+                ci->c_inf[2].base = BCM43143_CORE_SOCRAM_BASE;
+                ci->c_inf[2].wrapbase = ci->c_inf[2].base + 0x00100000;
+                ci->c_inf[2].cib = 0x14000000;
+                ci->c_inf[3].id = BCMA_CORE_ARM_CM3;
+                ci->c_inf[3].base = BCM43143_CORE_ARM_BASE;
+                ci->c_inf[3].wrapbase = ci->c_inf[3].base + 0x00100000;
+                ci->c_inf[3].cib = 0x07000000;
+                ci->ramsize = BCM43143_RAMSIZE;
+                break;
         case BCM43241_CHIP_ID:
                 ci->c_inf[0].wrapbase = 0x18100000;
                 ci->c_inf[0].cib = 0x2a084411;
@@ -435,11 +527,29 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
                 ci->c_inf[3].cib = 0x07004211;
                 ci->ramsize = 0x80000;
                 break;
+        case BCM4335_CHIP_ID:
+                ci->c_inf[0].wrapbase = 0x18100000;
+                ci->c_inf[0].cib = 0x2b084411;
+                ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;
+                ci->c_inf[1].base = 0x18005000;
+                ci->c_inf[1].wrapbase = 0x18105000;
+                ci->c_inf[1].cib = 0x0f004211;
+                ci->c_inf[2].id = BCMA_CORE_ARM_CR4;
+                ci->c_inf[2].base = 0x18002000;
+                ci->c_inf[2].wrapbase = 0x18102000;
+                ci->c_inf[2].cib = 0x01084411;
+                ci->ramsize = 0xc0000;
+                ci->rambase = 0x180000;
+                break;
         default:
                 brcmf_err("chipid 0x%x is not supported\n", ci->chip);
                 return -ENODEV;
         }
 
+        ret = brcmf_sdio_chip_cichk(ci);
+        if (ret)
+                return ret;
+
         switch (ci->socitype) {
         case SOCI_SB:
                 ci->iscoreup = brcmf_sdio_sb_iscoreup;
@@ -539,7 +649,7 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
          * Make sure any on-chip ARM is off (in case strapping is wrong),
          * or downloaded code was already running.
          */
-        ci->coredisable(sdiodev, ci, BCMA_CORE_ARM_CM3);
+        ci->coredisable(sdiodev, ci, BCMA_CORE_ARM_CM3, 0);
 }
 
 int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,
@@ -600,21 +710,37 @@ void
 brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
                                   struct chip_info *ci, u32 drivestrength)
 {
-        struct sdiod_drive_str *str_tab = NULL;
-        u32 str_mask = 0;
-        u32 str_shift = 0;
+        const struct sdiod_drive_str *str_tab = NULL;
+        u32 str_mask;
+        u32 str_shift;
         char chn[8];
         u32 base = ci->c_inf[0].base;
+        u32 i;
+        u32 drivestrength_sel = 0;
+        u32 cc_data_temp;
+        u32 addr;
 
         if (!(ci->c_inf[0].caps & CC_CAP_PMU))
                 return;
 
         switch (SDIOD_DRVSTR_KEY(ci->chip, ci->pmurev)) {
         case SDIOD_DRVSTR_KEY(BCM4330_CHIP_ID, 12):
-                str_tab = (struct sdiod_drive_str *)&sdiod_drvstr_tab1_1v8;
+                str_tab = sdiod_drvstr_tab1_1v8;
                 str_mask = 0x00003800;
                 str_shift = 11;
                 break;
+        case SDIOD_DRVSTR_KEY(BCM43143_CHIP_ID, 17):
+                /* note: 43143 does not support tristate */
+                i = ARRAY_SIZE(sdiod_drvstr_tab2_3v3) - 1;
+                if (drivestrength >= sdiod_drvstr_tab2_3v3[i].strength) {
+                        str_tab = sdiod_drvstr_tab2_3v3;
+                        str_mask = 0x00000007;
+                        str_shift = 0;
+                } else
+                        brcmf_err("Invalid SDIO Drive strength for chip %s, strength=%d\n",
+                                  brcmf_sdio_chip_name(ci->chip, chn, 8),
+                                  drivestrength);
+                break;
         default:
                 brcmf_err("No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",
                           brcmf_sdio_chip_name(ci->chip, chn, 8),
@@ -623,30 +749,207 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
         }
 
         if (str_tab != NULL) {
-                u32 drivestrength_sel = 0;
-                u32 cc_data_temp;
-                int i;
-
                 for (i = 0; str_tab[i].strength != 0; i++) {
                         if (drivestrength >= str_tab[i].strength) {
                                 drivestrength_sel = str_tab[i].sel;
                                 break;
                         }
                 }
-
-                brcmf_sdio_regwl(sdiodev, CORE_CC_REG(base, chipcontrol_addr),
-                                 1, NULL);
-                cc_data_temp =
-                        brcmf_sdio_regrl(sdiodev,
-                                         CORE_CC_REG(base, chipcontrol_addr),
-                                         NULL);
+                addr = CORE_CC_REG(base, chipcontrol_addr);
+                brcmf_sdio_regwl(sdiodev, addr, 1, NULL);
+                cc_data_temp = brcmf_sdio_regrl(sdiodev, addr, NULL);
                 cc_data_temp &= ~str_mask;
                 drivestrength_sel <<= str_shift;
                 cc_data_temp |= drivestrength_sel;
-                brcmf_sdio_regwl(sdiodev, CORE_CC_REG(base, chipcontrol_addr),
-                                 cc_data_temp, NULL);
+                brcmf_sdio_regwl(sdiodev, addr, cc_data_temp, NULL);
 
-                brcmf_dbg(INFO, "SDIO: %dmA drive strength selected, set to 0x%08x\n",
-                          drivestrength, cc_data_temp);
+                brcmf_dbg(INFO, "SDIO: %d mA (req=%d mA) drive strength selected, set to 0x%08x\n",
+                          str_tab[i].strength, drivestrength, cc_data_temp);
         }
 }
+
+#ifdef DEBUG
+static bool
+brcmf_sdio_chip_verifynvram(struct brcmf_sdio_dev *sdiodev, u32 nvram_addr,
+                            char *nvram_dat, uint nvram_sz)
+{
+        char *nvram_ularray;
+        int err;
+        bool ret = true;
+
+        /* read back and verify */
+        brcmf_dbg(INFO, "Compare NVRAM dl & ul; size=%d\n", nvram_sz);
+        nvram_ularray = kmalloc(nvram_sz, GFP_KERNEL);
+        /* do not proceed while no memory but  */
+        if (!nvram_ularray)
+                return true;
+
+        /* Upload image to verify downloaded contents. */
+        memset(nvram_ularray, 0xaa, nvram_sz);
+
+        /* Read the vars list to temp buffer for comparison */
+        err = brcmf_sdio_ramrw(sdiodev, false, nvram_addr, nvram_ularray,
+                               nvram_sz);
+        if (err) {
+                brcmf_err("error %d on reading %d nvram bytes at 0x%08x\n",
+                          err, nvram_sz, nvram_addr);
+        } else if (memcmp(nvram_dat, nvram_ularray, nvram_sz)) {
+                brcmf_err("Downloaded NVRAM image is corrupted\n");
+                ret = false;
+        }
+        kfree(nvram_ularray);
+
+        return ret;
+}
+#else   /* DEBUG */
+static inline bool
+brcmf_sdio_chip_verifynvram(struct brcmf_sdio_dev *sdiodev, u32 nvram_addr,
+                            char *nvram_dat, uint nvram_sz)
+{
+        return true;
+}
+#endif  /* DEBUG */
+
+static bool brcmf_sdio_chip_writenvram(struct brcmf_sdio_dev *sdiodev,
+                                       struct chip_info *ci,
+                                       char *nvram_dat, uint nvram_sz)
+{
+        int err;
+        u32 nvram_addr;
+        u32 token;
+        __le32 token_le;
+
+        nvram_addr = (ci->ramsize - 4) - nvram_sz + ci->rambase;
+
+        /* Write the vars list */
+        err = brcmf_sdio_ramrw(sdiodev, true, nvram_addr, nvram_dat, nvram_sz);
+        if (err) {
+                brcmf_err("error %d on writing %d nvram bytes at 0x%08x\n",
+                          err, nvram_sz, nvram_addr);
+                return false;
+        }
+
+        if (!brcmf_sdio_chip_verifynvram(sdiodev, nvram_addr,
+                                         nvram_dat, nvram_sz))
+                return false;
+
+        /* generate token:
+         * nvram size, converted to words, in lower 16-bits, checksum
+         * in upper 16-bits.
+         */
+        token = nvram_sz / 4;
+        token = (~token << 16) | (token & 0x0000FFFF);
+        token_le = cpu_to_le32(token);
+
+        brcmf_dbg(INFO, "RAM size: %d\n", ci->ramsize);
+        brcmf_dbg(INFO, "nvram is placed at %d, size %d, token=0x%08x\n",
+                  nvram_addr, nvram_sz, token);
+
+        /* Write the length token to the last word */
+        if (brcmf_sdio_ramrw(sdiodev, true, (ci->ramsize - 4 + ci->rambase),
+                             (u8 *)&token_le, 4))
+                return false;
+
+        return true;
+}
+
+static void
+brcmf_sdio_chip_cm3_enterdl(struct brcmf_sdio_dev *sdiodev,
+                            struct chip_info *ci)
+{
+        u32 zeros = 0;
+
+        ci->coredisable(sdiodev, ci, BCMA_CORE_ARM_CM3, 0);
+        ci->resetcore(sdiodev, ci, BCMA_CORE_INTERNAL_MEM, 0);
+
+        /* clear length token */
+        brcmf_sdio_ramrw(sdiodev, true, ci->ramsize - 4, (u8 *)&zeros, 4);
+}
+
+static bool
+brcmf_sdio_chip_cm3_exitdl(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,
+                           char *nvram_dat, uint nvram_sz)
+{
+        u8 core_idx;
+        u32 reg_addr;
+
+        if (!ci->iscoreup(sdiodev, ci, BCMA_CORE_INTERNAL_MEM)) {
+                brcmf_err("SOCRAM core is down after reset?\n");
+                return false;
+        }
+
+        if (!brcmf_sdio_chip_writenvram(sdiodev, ci, nvram_dat, nvram_sz))
+                return false;
+
+        /* clear all interrupts */
+        core_idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_SDIO_DEV);
+        reg_addr = ci->c_inf[core_idx].base;
+        reg_addr += offsetof(struct sdpcmd_regs, intstatus);
+        brcmf_sdio_regwl(sdiodev, reg_addr, 0xFFFFFFFF, NULL);
+
+        ci->resetcore(sdiodev, ci, BCMA_CORE_ARM_CM3, 0);
+
+        return true;
+}
+
+static inline void
+brcmf_sdio_chip_cr4_enterdl(struct brcmf_sdio_dev *sdiodev,
+                            struct chip_info *ci)
+{
+        ci->resetcore(sdiodev, ci, BCMA_CORE_ARM_CR4,
+                      ARMCR4_BCMA_IOCTL_CPUHALT);
+}
+
+static bool
+brcmf_sdio_chip_cr4_exitdl(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,
+                           char *nvram_dat, uint nvram_sz)
+{
+        u8 core_idx;
+        u32 reg_addr;
+
+        if (!brcmf_sdio_chip_writenvram(sdiodev, ci, nvram_dat, nvram_sz))
+                return false;
+
+        /* clear all interrupts */
+        core_idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_SDIO_DEV);
+        reg_addr = ci->c_inf[core_idx].base;
+        reg_addr += offsetof(struct sdpcmd_regs, intstatus);
+        brcmf_sdio_regwl(sdiodev, reg_addr, 0xFFFFFFFF, NULL);
+
+        /* Write reset vector to address 0 */
+        brcmf_sdio_ramrw(sdiodev, true, 0, (void *)&ci->rst_vec,
+                         sizeof(ci->rst_vec));
+
+        /* restore ARM */
+        ci->resetcore(sdiodev, ci, BCMA_CORE_ARM_CR4, 0);
+
+        return true;
+}
+
+void brcmf_sdio_chip_enter_download(struct brcmf_sdio_dev *sdiodev,
+                                    struct chip_info *ci)
+{
+        u8 arm_core_idx;
+
+        arm_core_idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_ARM_CM3);
+        if (BRCMF_MAX_CORENUM != arm_core_idx) {
+                brcmf_sdio_chip_cm3_enterdl(sdiodev, ci);
+                return;
+        }
+
+        brcmf_sdio_chip_cr4_enterdl(sdiodev, ci);
+}
+
+bool brcmf_sdio_chip_exit_download(struct brcmf_sdio_dev *sdiodev,
+                                   struct chip_info *ci, char *nvram_dat,
+                                   uint nvram_sz)
+{
+        u8 arm_core_idx;
+
+        arm_core_idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_ARM_CM3);
+        if (BRCMF_MAX_CORENUM != arm_core_idx)
+                return brcmf_sdio_chip_cm3_exitdl(sdiodev, ci, nvram_dat,
+                                                  nvram_sz);
+
+        return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, nvram_dat, nvram_sz);
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
index ce974d76bd92..83c041f1bf4a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
@@ -73,15 +73,17 @@ struct chip_info {
         u32 pmurev;
         u32 pmucaps;
         u32 ramsize;
+        u32 rambase;
+        u32 rst_vec;    /* reset vertor for ARM CR4 core */
 
         bool (*iscoreup)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,
                          u16 coreid);
         u32 (*corerev)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,
                          u16 coreid);
         void (*coredisable)(struct brcmf_sdio_dev *sdiodev,
-                        struct chip_info *ci, u16 coreid);
+                        struct chip_info *ci, u16 coreid, u32 core_bits);
         void (*resetcore)(struct brcmf_sdio_dev *sdiodev,
-                        struct chip_info *ci, u16 coreid);
+                        struct chip_info *ci, u16 coreid, u32 core_bits);
 };
 
 struct sbconfig {
@@ -124,6 +126,95 @@ struct sbconfig {
         u32 sbidhigh;   /* identification */
 };
 
+/* sdio core registers */
+struct sdpcmd_regs {
+        u32 corecontrol;                /* 0x00, rev8 */
+        u32 corestatus;                 /* rev8 */
+        u32 PAD[1];
+        u32 biststatus;                 /* rev8 */
+
+        /* PCMCIA access */
+        u16 pcmciamesportaladdr;        /* 0x010, rev8 */
+        u16 PAD[1];
+        u16 pcmciamesportalmask;        /* rev8 */
+        u16 PAD[1];
+        u16 pcmciawrframebc;            /* rev8 */
+        u16 PAD[1];
+        u16 pcmciaunderflowtimer;       /* rev8 */
+        u16 PAD[1];
+
+        /* interrupt */
+        u32 intstatus;                  /* 0x020, rev8 */
+        u32 hostintmask;                /* rev8 */
+        u32 intmask;                    /* rev8 */
+        u32 sbintstatus;                /* rev8 */
+        u32 sbintmask;                  /* rev8 */
+        u32 funcintmask;                /* rev4 */
+        u32 PAD[2];
+        u32 tosbmailbox;                /* 0x040, rev8 */
+        u32 tohostmailbox;              /* rev8 */
+        u32 tosbmailboxdata;            /* rev8 */
+        u32 tohostmailboxdata;          /* rev8 */
+
+        /* synchronized access to registers in SDIO clock domain */
+        u32 sdioaccess;                 /* 0x050, rev8 */
+        u32 PAD[3];
+
+        /* PCMCIA frame control */
+        u8 pcmciaframectrl;             /* 0x060, rev8 */
+        u8 PAD[3];
+        u8 pcmciawatermark;             /* rev8 */
+        u8 PAD[155];
+
+        /* interrupt batching control */
+        u32 intrcvlazy;                 /* 0x100, rev8 */
+        u32 PAD[3];
+
+        /* counters */
+        u32 cmd52rd;                    /* 0x110, rev8 */
+        u32 cmd52wr;                    /* rev8 */
+        u32 cmd53rd;                    /* rev8 */
+        u32 cmd53wr;                    /* rev8 */
+        u32 abort;                      /* rev8 */
+        u32 datacrcerror;               /* rev8 */
+        u32 rdoutofsync;                /* rev8 */
+        u32 wroutofsync;                /* rev8 */
+        u32 writebusy;                  /* rev8 */
+        u32 readwait;                   /* rev8 */
+        u32 readterm;                   /* rev8 */
+        u32 writeterm;                  /* rev8 */
+        u32 PAD[40];
+        u32 clockctlstatus;             /* rev8 */
+        u32 PAD[7];
+
+        u32 PAD[128];                   /* DMA engines */
+
+        /* SDIO/PCMCIA CIS region */
+        char cis[512];                  /* 0x400-0x5ff, rev6 */
+
+        /* PCMCIA function control registers */
+        char pcmciafcr[256];            /* 0x600-6ff, rev6 */
+        u16 PAD[55];
+
+        /* PCMCIA backplane access */
+        u16 backplanecsr;               /* 0x76E, rev6 */
+        u16 backplaneaddr0;             /* rev6 */
+        u16 backplaneaddr1;             /* rev6 */
+        u16 backplaneaddr2;             /* rev6 */
+        u16 backplaneaddr3;             /* rev6 */
+        u16 backplanedata0;             /* rev6 */
+        u16 backplanedata1;             /* rev6 */
+        u16 backplanedata2;             /* rev6 */
+        u16 backplanedata3;             /* rev6 */
+        u16 PAD[31];
+
+        /* sprom "size" & "blank" info */
+        u16 spromstatus;                /* 0x7BE, rev2 */
+        u32 PAD[464];
+
+        u16 PAD[0x80];
+};
+
 extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,
                                   struct chip_info **ci_ptr, u32 regs);
 extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);
@@ -131,6 +222,10 @@ extern void brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
                                               struct chip_info *ci,
                                               u32 drivestrength);
 extern u8 brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid);
-
+extern void brcmf_sdio_chip_enter_download(struct brcmf_sdio_dev *sdiodev,
+                                           struct chip_info *ci);
+extern bool brcmf_sdio_chip_exit_download(struct brcmf_sdio_dev *sdiodev,
+                                          struct chip_info *ci, char *nvram_dat,
+                                          uint nvram_sz);
 
 #endif          /* _BRCMFMAC_SDIO_CHIP_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index 0d30afd8c672..7c1b6332747e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -48,7 +48,13 @@
 #define SBSDIO_NUM_FUNCTION             3
 
 /* function 0 vendor specific CCCR registers */
-#define SDIO_CCCR_BRCM_SEPINT           0xf2
+#define SDIO_CCCR_BRCM_CARDCAP                  0xf0
+#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT    0x02
+#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT        0x04
+#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC        0x08
+#define SDIO_CCCR_BRCM_CARDCTRL         0xf1
+#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET       0x02
+#define SDIO_CCCR_BRCM_SEPINT                   0xf2
 
 #define  SDIO_SEPINT_MASK               0x01
 #define  SDIO_SEPINT_OE                 0x02
@@ -97,9 +103,23 @@
 #define SBSDIO_FUNC1_RFRAMEBCLO         0x1001B
 /* Read Frame Byte Count High */
 #define SBSDIO_FUNC1_RFRAMEBCHI         0x1001C
+/* MesBusyCtl (rev 11) */
+#define SBSDIO_FUNC1_MESBUSYCTRL        0x1001D
+/* Sdio Core Rev 12 */
+#define SBSDIO_FUNC1_WAKEUPCTRL         0x1001E
+#define SBSDIO_FUNC1_WCTRL_ALPWAIT_MASK         0x1
+#define SBSDIO_FUNC1_WCTRL_ALPWAIT_SHIFT        0
+#define SBSDIO_FUNC1_WCTRL_HTWAIT_MASK          0x2
+#define SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT         1
+#define SBSDIO_FUNC1_SLEEPCSR           0x1001F
+#define SBSDIO_FUNC1_SLEEPCSR_KSO_MASK          0x1
+#define SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT         0
+#define SBSDIO_FUNC1_SLEEPCSR_KSO_EN            1
+#define SBSDIO_FUNC1_SLEEPCSR_DEVON_MASK        0x2
+#define SBSDIO_FUNC1_SLEEPCSR_DEVON_SHIFT       1
 
 #define SBSDIO_FUNC1_MISC_REG_START     0x10000 /* f1 misc register start */
-#define SBSDIO_FUNC1_MISC_REG_LIMIT     0x1001C /* f1 misc register end */
+#define SBSDIO_FUNC1_MISC_REG_LIMIT     0x1001F /* f1 misc register end */
 
 /* function 1 OCP space */
 
@@ -154,13 +174,11 @@ struct brcmf_sdio_dev {
         wait_queue_head_t request_buffer_wait;
         struct device *dev;
         struct brcmf_bus *bus_if;
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
-        unsigned int irq;               /* oob interrupt number */
-        unsigned long irq_flags;        /* board specific oob flags */
+        struct brcmfmac_sdio_platform_data *pdata;
+        bool oob_irq_requested;
         bool irq_en;                    /* irq enable flags */
         spinlock_t irq_en_lock;
         bool irq_wake;                  /* irq wake enable flags */
-#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
 };
 
 /* Register/deregister interrupt handler. */
@@ -224,6 +242,8 @@ brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
  */
 extern int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw,
                                u32 addr, u8 *buf, uint nbytes);
+extern int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write,
+                            u32 address, u8 *data, uint size);
 
 /* Issue an abort to the specified function */
 extern int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
new file mode 100644
index 000000000000..b505db48c60d
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2012 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/module.h> /* bug in tracepoint.h, it should include this */
+
+#ifndef __CHECKER__
+#define CREATE_TRACE_POINTS
+#include "tracepoint.h"
+#endif
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
new file mode 100644
index 000000000000..9df1f7a681e0
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#if !defined(BRCMF_TRACEPOINT_H_) || defined(TRACE_HEADER_MULTI_READ)
+#define BRCMF_TRACEPOINT_H_
+
+#include <linux/types.h>
+#include <linux/tracepoint.h>
+
+#ifndef CONFIG_BRCM_TRACING
+
+#undef TRACE_EVENT
+#define TRACE_EVENT(name, proto, ...) \
+static inline void trace_ ## name(proto) {}
+
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(...)
+
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(evt_class, name, proto, ...) \
+static inline void trace_ ## name(proto) {}
+
+#endif /* CONFIG_BRCM_TRACING */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM    brcmfmac
+
+#define MAX_MSG_LEN             100
+
+TRACE_EVENT(brcmf_err,
+        TP_PROTO(const char *func, struct va_format *vaf),
+        TP_ARGS(func, vaf),
+        TP_STRUCT__entry(
+                __string(func, func)
+                __dynamic_array(char, msg, MAX_MSG_LEN)
+        ),
+        TP_fast_assign(
+                __assign_str(func, func);
+                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                       MAX_MSG_LEN, vaf->fmt,
+                                       *vaf->va) >= MAX_MSG_LEN);
+        ),
+        TP_printk("%s: %s", __get_str(func), __get_str(msg))
+);
+
+TRACE_EVENT(brcmf_dbg,
+        TP_PROTO(u32 level, const char *func, struct va_format *vaf),
+        TP_ARGS(level, func, vaf),
+        TP_STRUCT__entry(
+                __field(u32, level)
+                __string(func, func)
+                __dynamic_array(char, msg, MAX_MSG_LEN)
+        ),
+        TP_fast_assign(
+                __entry->level = level;
+                __assign_str(func, func);
+                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                       MAX_MSG_LEN, vaf->fmt,
+                                       *vaf->va) >= MAX_MSG_LEN);
+        ),
+        TP_printk("%s: %s", __get_str(func), __get_str(msg))
+);
+
+TRACE_EVENT(brcmf_hexdump,
+        TP_PROTO(void *data, size_t len),
+        TP_ARGS(data, len),
+        TP_STRUCT__entry(
+                __field(unsigned long, len)
+                __dynamic_array(u8, hdata, len)
+        ),
+        TP_fast_assign(
+                __entry->len = len;
+                memcpy(__get_dynamic_array(hdata), data, len);
+        ),
+        TP_printk("hexdump [length=%lu]", __entry->len)
+);
+
+#ifdef CONFIG_BRCM_TRACING
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE tracepoint
+
+#include <trace/define_trace.h>
+
+#endif /* CONFIG_BRCM_TRACING */
+
+#endif /* BRCMF_TRACEPOINT_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 42289e9ea886..01aed7ad6bec 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -112,11 +112,6 @@ struct brcmf_usbdev_info {
 static void brcmf_usb_rx_refill(struct brcmf_usbdev_info *devinfo,
                                 struct brcmf_usbreq  *req);
 
-MODULE_AUTHOR("Broadcom Corporation");
-MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN fullmac usb driver.");
-MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN fullmac usb cards");
-MODULE_LICENSE("Dual BSD/GPL");
-
 static struct brcmf_usbdev *brcmf_usb_get_buspub(struct device *dev)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
@@ -422,8 +417,6 @@ static void brcmf_usb_tx_complete(struct urb *urb)
         brcmf_usb_del_fromq(devinfo, req);
 
         brcmf_txcomplete(devinfo->dev, req->skb, urb->status == 0);
-
-        brcmu_pkt_buf_free_skb(req->skb);
         req->skb = NULL;
         brcmf_usb_enq(devinfo, &devinfo->tx_freeq, req, &devinfo->tx_freecount);
         if (devinfo->tx_freecount > devinfo->tx_high_watermark &&
@@ -577,15 +570,17 @@ static int brcmf_usb_tx(struct device *dev, struct sk_buff *skb)
         int ret;
 
         brcmf_dbg(USB, "Enter, skb=%p\n", skb);
-        if (devinfo->bus_pub.state != BRCMFMAC_USB_STATE_UP)
-                return -EIO;
+        if (devinfo->bus_pub.state != BRCMFMAC_USB_STATE_UP) {
+                ret = -EIO;
+                goto fail;
+        }
 
         req = brcmf_usb_deq(devinfo, &devinfo->tx_freeq,
                                         &devinfo->tx_freecount);
         if (!req) {
-                brcmu_pkt_buf_free_skb(skb);
                 brcmf_err("no req to send\n");
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto fail;
         }
 
         req->skb = skb;
@@ -598,18 +593,21 @@ static int brcmf_usb_tx(struct device *dev, struct sk_buff *skb)
         if (ret) {
                 brcmf_err("brcmf_usb_tx usb_submit_urb FAILED\n");
                 brcmf_usb_del_fromq(devinfo, req);
-                brcmu_pkt_buf_free_skb(req->skb);
                 req->skb = NULL;
                 brcmf_usb_enq(devinfo, &devinfo->tx_freeq, req,
-                                                &devinfo->tx_freecount);
-        } else {
-                if (devinfo->tx_freecount < devinfo->tx_low_watermark &&
-                        !devinfo->tx_flowblock) {
-                        brcmf_txflowblock(dev, true);
-                        devinfo->tx_flowblock = true;
-                }
+                              &devinfo->tx_freecount);
+                goto fail;
         }
 
+        if (devinfo->tx_freecount < devinfo->tx_low_watermark &&
+            !devinfo->tx_flowblock) {
+                brcmf_txflowblock(dev, true);
+                devinfo->tx_flowblock = true;
+        }
+        return 0;
+
+fail:
+        brcmf_txcomplete(dev, skb, false);
         return ret;
 }
 
@@ -1485,6 +1483,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = {
         { USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_BCMFW) },
         { }
 };
+
 MODULE_DEVICE_TABLE(usb, brcmf_usb_devid_table);
 MODULE_FIRMWARE(BRCMF_USB_43143_FW_NAME);
 MODULE_FIRMWARE(BRCMF_USB_43236_FW_NAME);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 78da3eff75e8..6d758f285352 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -26,8 +26,10 @@
 #include <brcmu_wifi.h>
 #include "dhd.h"
 #include "dhd_dbg.h"
+#include "tracepoint.h"
 #include "fwil_types.h"
 #include "p2p.h"
+#include "btcoex.h"
 #include "wl_cfg80211.h"
 #include "fwil.h"
 
@@ -182,64 +184,6 @@ static struct ieee80211_channel __wl_5ghz_a_channels[] = {
         CHAN5G(216, 0),
 };
 
-static struct ieee80211_channel __wl_5ghz_n_channels[] = {
-        CHAN5G(32, 0), CHAN5G(34, 0),
-        CHAN5G(36, 0), CHAN5G(38, 0),
-        CHAN5G(40, 0), CHAN5G(42, 0),
-        CHAN5G(44, 0), CHAN5G(46, 0),
-        CHAN5G(48, 0), CHAN5G(50, 0),
-        CHAN5G(52, 0), CHAN5G(54, 0),
-        CHAN5G(56, 0), CHAN5G(58, 0),
-        CHAN5G(60, 0), CHAN5G(62, 0),
-        CHAN5G(64, 0), CHAN5G(66, 0),
-        CHAN5G(68, 0), CHAN5G(70, 0),
-        CHAN5G(72, 0), CHAN5G(74, 0),
-        CHAN5G(76, 0), CHAN5G(78, 0),
-        CHAN5G(80, 0), CHAN5G(82, 0),
-        CHAN5G(84, 0), CHAN5G(86, 0),
-        CHAN5G(88, 0), CHAN5G(90, 0),
-        CHAN5G(92, 0), CHAN5G(94, 0),
-        CHAN5G(96, 0), CHAN5G(98, 0),
-        CHAN5G(100, 0), CHAN5G(102, 0),
-        CHAN5G(104, 0), CHAN5G(106, 0),
-        CHAN5G(108, 0), CHAN5G(110, 0),
-        CHAN5G(112, 0), CHAN5G(114, 0),
-        CHAN5G(116, 0), CHAN5G(118, 0),
-        CHAN5G(120, 0), CHAN5G(122, 0),
-        CHAN5G(124, 0), CHAN5G(126, 0),
-        CHAN5G(128, 0), CHAN5G(130, 0),
-        CHAN5G(132, 0), CHAN5G(134, 0),
-        CHAN5G(136, 0), CHAN5G(138, 0),
-        CHAN5G(140, 0), CHAN5G(142, 0),
-        CHAN5G(144, 0), CHAN5G(145, 0),
-        CHAN5G(146, 0), CHAN5G(147, 0),
-        CHAN5G(148, 0), CHAN5G(149, 0),
-        CHAN5G(150, 0), CHAN5G(151, 0),
-        CHAN5G(152, 0), CHAN5G(153, 0),
-        CHAN5G(154, 0), CHAN5G(155, 0),
-        CHAN5G(156, 0), CHAN5G(157, 0),
-        CHAN5G(158, 0), CHAN5G(159, 0),
-        CHAN5G(160, 0), CHAN5G(161, 0),
-        CHAN5G(162, 0), CHAN5G(163, 0),
-        CHAN5G(164, 0), CHAN5G(165, 0),
-        CHAN5G(166, 0), CHAN5G(168, 0),
-        CHAN5G(170, 0), CHAN5G(172, 0),
-        CHAN5G(174, 0), CHAN5G(176, 0),
-        CHAN5G(178, 0), CHAN5G(180, 0),
-        CHAN5G(182, 0), CHAN5G(184, 0),
-        CHAN5G(186, 0), CHAN5G(188, 0),
-        CHAN5G(190, 0), CHAN5G(192, 0),
-        CHAN5G(194, 0), CHAN5G(196, 0),
-        CHAN5G(198, 0), CHAN5G(200, 0),
-        CHAN5G(202, 0), CHAN5G(204, 0),
-        CHAN5G(206, 0), CHAN5G(208, 0),
-        CHAN5G(210, 0), CHAN5G(212, 0),
-        CHAN5G(214, 0), CHAN5G(216, 0),
-        CHAN5G(218, 0), CHAN5G(220, 0),
-        CHAN5G(222, 0), CHAN5G(224, 0),
-        CHAN5G(226, 0), CHAN5G(228, 0),
-};
-
 static struct ieee80211_supported_band __wl_band_2ghz = {
         .band = IEEE80211_BAND_2GHZ,
         .channels = __wl_2ghz_channels,
@@ -256,12 +200,28 @@ static struct ieee80211_supported_band __wl_band_5ghz_a = {
         .n_bitrates = wl_a_rates_size,
 };
 
-static struct ieee80211_supported_band __wl_band_5ghz_n = {
-        .band = IEEE80211_BAND_5GHZ,
-        .channels = __wl_5ghz_n_channels,
-        .n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
-        .bitrates = wl_a_rates,
-        .n_bitrates = wl_a_rates_size,
+/* This is to override regulatory domains defined in cfg80211 module (reg.c)
+ * By default world regulatory domain defined in reg.c puts the flags
+ * NL80211_RRF_PASSIVE_SCAN and NL80211_RRF_NO_IBSS for 5GHz channels (for
+ * 36..48 and 149..165). With respect to these flags, wpa_supplicant doesn't
+ * start p2p operations on 5GHz channels. All the changes in world regulatory
+ * domain are to be done here.
+ */
+static const struct ieee80211_regdomain brcmf_regdom = {
+        .n_reg_rules = 4,
+        .alpha2 =  "99",
+        .reg_rules = {
+                /* IEEE 802.11b/g, channels 1..11 */
+                REG_RULE(2412-10, 2472+10, 40, 6, 20, 0),
+                /* If any */
+                /* IEEE 802.11 channel 14 - Only JP enables
+                 * this and for 802.11b only
+                 */
+                REG_RULE(2484-10, 2484+10, 20, 6, 20, 0),
+                /* IEEE 802.11a, channel 36..64 */
+                REG_RULE(5150-10, 5350+10, 40, 6, 20, 0),
+                /* IEEE 802.11a, channel 100..165 */
+                REG_RULE(5470-10, 5850+10, 40, 6, 20, 0), }
 };
 
 static const u32 __wl_cipher_suites[] = {
@@ -375,22 +335,16 @@ static u8 brcmf_mw_to_qdbm(u16 mw)
         return qdbm;
 }
 
-u16 channel_to_chanspec(struct ieee80211_channel *ch)
+u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,
+                        struct ieee80211_channel *ch)
 {
-        u16 chanspec;
+        struct brcmu_chan ch_inf;
 
-        chanspec = ieee80211_frequency_to_channel(ch->center_freq);
-        chanspec &= WL_CHANSPEC_CHAN_MASK;
+        ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq);
+        ch_inf.bw = BRCMU_CHAN_BW_20;
+        d11inf->encchspec(&ch_inf);
 
-        if (ch->band == IEEE80211_BAND_2GHZ)
-                chanspec |= WL_CHANSPEC_BAND_2G;
-        else
-                chanspec |= WL_CHANSPEC_BAND_5G;
-
-        chanspec |= WL_CHANSPEC_BW_20;
-        chanspec |= WL_CHANSPEC_CTL_SB_NONE;
-
-        return chanspec;
+        return ch_inf.chspec;
 }
 
 /* Traverse a string of 1-byte tag/1-byte length/variable-length value
@@ -523,17 +477,16 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
                 return ERR_PTR(-EOPNOTSUPP);
         case NL80211_IFTYPE_P2P_CLIENT:
         case NL80211_IFTYPE_P2P_GO:
+        case NL80211_IFTYPE_P2P_DEVICE:
                 return brcmf_p2p_add_vif(wiphy, name, type, flags, params);
         case NL80211_IFTYPE_UNSPECIFIED:
-        case NL80211_IFTYPE_P2P_DEVICE:
         default:
                 return ERR_PTR(-EINVAL);
         }
 }
 
-void brcmf_set_mpc(struct net_device *ndev, int mpc)
+void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)
 {
-        struct brcmf_if *ifp = netdev_priv(ndev);
         s32 err = 0;
 
         if (check_vif_up(ifp->vif)) {
@@ -546,10 +499,9 @@ void brcmf_set_mpc(struct net_device *ndev, int mpc)
         }
 }
 
-s32
-brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
-                            struct net_device *ndev,
-                            bool aborted, bool fw_abort)
+s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
+                                struct brcmf_if *ifp, bool aborted,
+                                bool fw_abort)
 {
         struct brcmf_scan_params_le params_le;
         struct cfg80211_scan_request *scan_request;
@@ -580,7 +532,7 @@ brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                 /* Scan is aborted by setting channel_list[0] to -1 */
                 params_le.channel_list[0] = cpu_to_le16(-1);
                 /* E-Scan (or anyother type) can be aborted by SCAN */
-                err = brcmf_fil_cmd_data_set(netdev_priv(ndev), BRCMF_C_SCAN,
+                err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,
                                              &params_le, sizeof(params_le));
                 if (err)
                         brcmf_err("Scan abort  failed\n");
@@ -594,12 +546,12 @@ brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                 cfg->sched_escan = false;
                 if (!aborted)
                         cfg80211_sched_scan_results(cfg_to_wiphy(cfg));
-                brcmf_set_mpc(ndev, 1);
+                brcmf_set_mpc(ifp, 1);
         } else if (scan_request) {
                 brcmf_dbg(SCAN, "ESCAN Completed scan: %s\n",
                           aborted ? "Aborted" : "Done");
                 cfg80211_scan_done(scan_request, aborted);
-                brcmf_set_mpc(ndev, 1);
+                brcmf_set_mpc(ifp, 1);
         }
         if (!test_and_clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status))
                 brcmf_dbg(SCAN, "Scan complete, probably P2P scan\n");
@@ -619,9 +571,9 @@ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)
 
         if (ndev) {
                 if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status) &&
-                    cfg->escan_info.ndev == ndev)
-                        brcmf_notify_escan_complete(cfg, ndev, true,
-                                                    true);
+                    cfg->escan_info.ifp == netdev_priv(ndev))
+                        brcmf_notify_escan_complete(cfg, netdev_priv(ndev),
+                                                    true, true);
 
                 brcmf_fil_iovar_int_set(netdev_priv(ndev), "mpc", 1);
         }
@@ -637,9 +589,9 @@ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)
                 return -EOPNOTSUPP;
         case NL80211_IFTYPE_P2P_CLIENT:
         case NL80211_IFTYPE_P2P_GO:
+        case NL80211_IFTYPE_P2P_DEVICE:
                 return brcmf_p2p_del_vif(wiphy, wdev);
         case NL80211_IFTYPE_UNSPECIFIED:
-        case NL80211_IFTYPE_P2P_DEVICE:
         default:
                 return -EINVAL;
         }
@@ -723,7 +675,8 @@ done:
         return err;
 }
 
-static void brcmf_escan_prep(struct brcmf_scan_params_le *params_le,
+static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,
+                             struct brcmf_scan_params_le *params_le,
                              struct cfg80211_scan_request *request)
 {
         u32 n_ssids;
@@ -755,7 +708,8 @@ static void brcmf_escan_prep(struct brcmf_scan_params_le *params_le,
                   n_channels);
         if (n_channels > 0) {
                 for (i = 0; i < n_channels; i++) {
-                        chanspec = channel_to_chanspec(request->channels[i]);
+                        chanspec = channel_to_chanspec(&cfg->d11inf,
+                                                       request->channels[i]);
                         brcmf_dbg(SCAN, "Chan : %d, Channel spec: %x\n",
                                   request->channels[i]->hw_value, chanspec);
                         params_le->channel_list[i] = cpu_to_le16(chanspec);
@@ -803,7 +757,7 @@ static void brcmf_escan_prep(struct brcmf_scan_params_le *params_le,
 }
 
 static s32
-brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct net_device *ndev,
+brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
                 struct cfg80211_scan_request *request, u16 action)
 {
         s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +
@@ -827,13 +781,12 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct net_device *ndev,
                 goto exit;
         }
         BUG_ON(params_size + sizeof("escan") >= BRCMF_DCMD_MEDLEN);
-        brcmf_escan_prep(&params->params_le, request);
+        brcmf_escan_prep(cfg, &params->params_le, request);
         params->version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);
         params->action = cpu_to_le16(action);
         params->sync_id = cpu_to_le16(0x1234);
 
-        err = brcmf_fil_iovar_data_set(netdev_priv(ndev), "escan",
-                                       params, params_size);
+        err = brcmf_fil_iovar_data_set(ifp, "escan", params, params_size);
         if (err) {
                 if (err == -EBUSY)
                         brcmf_dbg(INFO, "system busy : escan canceled\n");
@@ -848,7 +801,7 @@ exit:
 
 static s32
 brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy,
-               struct net_device *ndev, struct cfg80211_scan_request *request)
+               struct brcmf_if *ifp, struct cfg80211_scan_request *request)
 {
         s32 err;
         u32 passive_scan;
@@ -856,35 +809,35 @@ brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy,
         struct escan_info *escan = &cfg->escan_info;
 
         brcmf_dbg(SCAN, "Enter\n");
-        escan->ndev = ndev;
+        escan->ifp = ifp;
         escan->wiphy = wiphy;
         escan->escan_state = WL_ESCAN_STATE_SCANNING;
         passive_scan = cfg->active_scan ? 0 : 1;
-        err = brcmf_fil_cmd_int_set(netdev_priv(ndev), BRCMF_C_SET_PASSIVE_SCAN,
+        err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PASSIVE_SCAN,
                                     passive_scan);
         if (err) {
                 brcmf_err("error (%d)\n", err);
                 return err;
         }
-        brcmf_set_mpc(ndev, 0);
+        brcmf_set_mpc(ifp, 0);
         results = (struct brcmf_scan_results *)cfg->escan_info.escan_buf;
         results->version = 0;
         results->count = 0;
         results->buflen = WL_ESCAN_RESULTS_FIXED_SIZE;
 
-        err = escan->run(cfg, ndev, request, WL_ESCAN_ACTION_START);
+        err = escan->run(cfg, ifp, request, WL_ESCAN_ACTION_START);
         if (err)
-                brcmf_set_mpc(ndev, 1);
+                brcmf_set_mpc(ifp, 1);
         return err;
 }
 
 static s32
-brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,
+brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif,
                      struct cfg80211_scan_request *request,
                      struct cfg80211_ssid *this_ssid)
 {
-        struct brcmf_if *ifp = netdev_priv(ndev);
-        struct brcmf_cfg80211_info *cfg = ndev_to_cfg(ndev);
+        struct brcmf_if *ifp = vif->ifp;
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         struct cfg80211_ssid *ssids;
         struct brcmf_cfg80211_scan_req *sr = &cfg->scan_req_int;
         u32 passive_scan;
@@ -904,16 +857,19 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,
                           cfg->scan_status);
                 return -EAGAIN;
         }
+        if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
+                brcmf_err("Scanning suppressed: status (%lu)\n",
+                          cfg->scan_status);
+                return -EAGAIN;
+        }
         if (test_bit(BRCMF_VIF_STATUS_CONNECTING, &ifp->vif->sme_state)) {
                 brcmf_err("Connecting: status (%lu)\n", ifp->vif->sme_state);
                 return -EAGAIN;
         }
 
         /* If scan req comes for p2p0, send it over primary I/F */
-        if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif) {
-                ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
-                ndev = ifp->ndev;
-        }
+        if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
+                vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
 
         /* Arm scan timeout timer */
         mod_timer(&cfg->escan_timeout, jiffies +
@@ -934,11 +890,11 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,
         set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
         if (escan_req) {
                 cfg->escan_info.run = brcmf_run_escan;
-                err = brcmf_p2p_scan_prep(wiphy, request, ifp->vif);
+                err = brcmf_p2p_scan_prep(wiphy, request, vif);
                 if (err)
                         goto scan_out;
 
-                err = brcmf_do_escan(cfg, wiphy, ndev, request);
+                err = brcmf_do_escan(cfg, wiphy, vif->ifp, request);
                 if (err)
                         goto scan_out;
         } else {
@@ -962,7 +918,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,
                         brcmf_err("WLC_SET_PASSIVE_SCAN error (%d)\n", err);
                         goto scan_out;
                 }
-                brcmf_set_mpc(ndev, 0);
+                brcmf_set_mpc(ifp, 0);
                 err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,
                                              &sr->ssid_le, sizeof(sr->ssid_le));
                 if (err) {
@@ -972,7 +928,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,
                         else
                                 brcmf_err("WLC_SCAN error (%d)\n", err);
 
-                        brcmf_set_mpc(ndev, 1);
+                        brcmf_set_mpc(ifp, 1);
                         goto scan_out;
                 }
         }
@@ -990,16 +946,15 @@ scan_out:
 static s32
 brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
 {
-        struct net_device *ndev = request->wdev->netdev;
+        struct brcmf_cfg80211_vif *vif;
         s32 err = 0;
 
         brcmf_dbg(TRACE, "Enter\n");
-
-        if (!check_vif_up(container_of(request->wdev,
-                                       struct brcmf_cfg80211_vif, wdev)))
+        vif = container_of(request->wdev, struct brcmf_cfg80211_vif, wdev);
+        if (!check_vif_up(vif))
                 return -EIO;
 
-        err = brcmf_cfg80211_escan(wiphy, ndev, request, NULL);
+        err = brcmf_cfg80211_escan(wiphy, vif, request, NULL);
 
         if (err)
                 brcmf_err("scan error (%d)\n", err);
@@ -1097,6 +1052,7 @@ static void brcmf_init_prof(struct brcmf_cfg80211_profile *prof)
 
 static void brcmf_link_down(struct brcmf_cfg80211_vif *vif)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(vif->wdev.wiphy);
         s32 err = 0;
 
         brcmf_dbg(TRACE, "Enter\n");
@@ -1110,6 +1066,8 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif)
                 clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state);
         }
         clear_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state);
+        clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
+        brcmf_btcoex_set_mode(vif, BRCMF_BTCOEX_ENABLED, 0);
         brcmf_dbg(TRACE, "Exit\n");
 }
 
@@ -1229,7 +1187,8 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
                                 params->chandef.chan->center_freq);
                 if (params->channel_fixed) {
                         /* adding chanspec */
-                        chanspec = channel_to_chanspec(params->chandef.chan);
+                        chanspec = channel_to_chanspec(&cfg->d11inf,
+                                                       params->chandef.chan);
                         join_params.params_le.chanspec_list[0] =
                                 cpu_to_le16(chanspec);
                         join_params.params_le.chanspec_num = cpu_to_le32(1);
@@ -1619,7 +1578,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
         if (chan) {
                 cfg->channel =
                         ieee80211_frequency_to_channel(chan->center_freq);
-                chanspec = channel_to_chanspec(chan);
+                chanspec = channel_to_chanspec(&cfg->d11inf, chan);
                 brcmf_dbg(CONN, "channel=%d, center_req=%d, chanspec=0x%04x\n",
                           cfg->channel, chan->center_freq, chanspec);
         } else {
@@ -2278,6 +2237,7 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg,
         struct ieee80211_channel *notify_channel;
         struct cfg80211_bss *bss;
         struct ieee80211_supported_band *band;
+        struct brcmu_chan ch;
         s32 err = 0;
         u16 channel;
         u32 freq;
@@ -2292,8 +2252,12 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg,
                 return 0;
         }
 
-        channel = bi->ctl_ch ? bi->ctl_ch :
-                                CHSPEC_CHANNEL(le16_to_cpu(bi->chanspec));
+        if (!bi->ctl_ch) {
+                ch.chspec = le16_to_cpu(bi->chanspec);
+                cfg->d11inf.decchspec(&ch);
+                bi->ctl_ch = ch.chnum;
+        }
+        channel = bi->ctl_ch;
 
         if (channel <= CH_MAX_2G_CHANNEL)
                 band = wiphy->bands[IEEE80211_BAND_2GHZ];
@@ -2368,9 +2332,9 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg,
         struct brcmf_bss_info_le *bi = NULL;
         struct ieee80211_supported_band *band;
         struct cfg80211_bss *bss;
+        struct brcmu_chan ch;
         u8 *buf = NULL;
         s32 err = 0;
-        u16 channel;
         u32 freq;
         u16 notify_capability;
         u16 notify_interval;
@@ -2397,15 +2361,15 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg,
 
         bi = (struct brcmf_bss_info_le *)(buf + 4);
 
-        channel = bi->ctl_ch ? bi->ctl_ch :
-                                CHSPEC_CHANNEL(le16_to_cpu(bi->chanspec));
+        ch.chspec = le16_to_cpu(bi->chanspec);
+        cfg->d11inf.decchspec(&ch);
 
-        if (channel <= CH_MAX_2G_CHANNEL)
+        if (ch.band == BRCMU_CHAN_BAND_2G)
                 band = wiphy->bands[IEEE80211_BAND_2GHZ];
         else
                 band = wiphy->bands[IEEE80211_BAND_5GHZ];
 
-        freq = ieee80211_channel_to_frequency(channel, band->band);
+        freq = ieee80211_channel_to_frequency(ch.chnum, band->band);
         notify_channel = ieee80211_get_channel(wiphy, freq);
 
         notify_capability = le16_to_cpu(bi->capability);
@@ -2414,7 +2378,7 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg,
         notify_ielen = le32_to_cpu(bi->ie_length);
         notify_signal = (s16)le16_to_cpu(bi->RSSI) * 100;
 
-        brcmf_dbg(CONN, "channel: %d(%d)\n", channel, freq);
+        brcmf_dbg(CONN, "channel: %d(%d)\n", ch.chnum, freq);
         brcmf_dbg(CONN, "capability: %X\n", notify_capability);
         brcmf_dbg(CONN, "beacon interval: %d\n", notify_interval);
         brcmf_dbg(CONN, "signal: %d\n", notify_signal);
@@ -2510,7 +2474,7 @@ void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg)
         set_bit(BRCMF_SCAN_STATUS_ABORT, &cfg->scan_status);
         if (cfg->scan_request) {
                 escan->escan_state = WL_ESCAN_STATE_IDLE;
-                brcmf_notify_escan_complete(cfg, escan->ndev, true, true);
+                brcmf_notify_escan_complete(cfg, escan->ifp, true, true);
         }
         clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
         clear_bit(BRCMF_SCAN_STATUS_ABORT, &cfg->scan_status);
@@ -2522,7 +2486,7 @@ static void brcmf_cfg80211_escan_timeout_worker(struct work_struct *work)
                         container_of(work, struct brcmf_cfg80211_info,
                                      escan_timeout_work);
 
-        brcmf_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true);
+        brcmf_notify_escan_complete(cfg, cfg->escan_info.ifp, true, true);
 }
 
 static void brcmf_escan_timeout(unsigned long data)
@@ -2537,12 +2501,19 @@ static void brcmf_escan_timeout(unsigned long data)
 }
 
 static s32
-brcmf_compare_update_same_bss(struct brcmf_bss_info_le *bss,
+brcmf_compare_update_same_bss(struct brcmf_cfg80211_info *cfg,
+                              struct brcmf_bss_info_le *bss,
                               struct brcmf_bss_info_le *bss_info_le)
 {
+        struct brcmu_chan ch_bss, ch_bss_info_le;
+
+        ch_bss.chspec = le16_to_cpu(bss->chanspec);
+        cfg->d11inf.decchspec(&ch_bss);
+        ch_bss_info_le.chspec = le16_to_cpu(bss_info_le->chanspec);
+        cfg->d11inf.decchspec(&ch_bss_info_le);
+
         if (!memcmp(&bss_info_le->BSSID, &bss->BSSID, ETH_ALEN) &&
-                (CHSPEC_BAND(le16_to_cpu(bss_info_le->chanspec)) ==
-                CHSPEC_BAND(le16_to_cpu(bss->chanspec))) &&
+                ch_bss.band == ch_bss_info_le.band &&
                 bss_info_le->SSID_len == bss->SSID_len &&
                 !memcmp(bss_info_le->SSID, bss->SSID, bss_info_le->SSID_len)) {
                 if ((bss->flags & WLC_BSS_RSSI_ON_CHANNEL) ==
@@ -2573,7 +2544,6 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                              const struct brcmf_event_msg *e, void *data)
 {
         struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
-        struct net_device *ndev = ifp->ndev;
         s32 status;
         s32 err = 0;
         struct brcmf_escan_result_le *escan_result_le;
@@ -2586,9 +2556,8 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
 
         status = e->status;
 
-        if (!ndev || !test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
-                brcmf_err("scan not ready ndev %p drv_status %x\n", ndev,
-                          !test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status));
+        if (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
+                brcmf_err("scan not ready, bssidx=%d\n", ifp->bssidx);
                 return -EPERM;
         }
 
@@ -2642,7 +2611,8 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                         bss = bss ? (struct brcmf_bss_info_le *)
                                 ((unsigned char *)bss +
                                 le32_to_cpu(bss->length)) : list->bss_info_le;
-                        if (brcmf_compare_update_same_bss(bss, bss_info_le))
+                        if (brcmf_compare_update_same_bss(cfg, bss,
+                                                          bss_info_le))
                                 goto exit;
                 }
                 memcpy(&(cfg->escan_info.escan_buf[list->buflen]),
@@ -2659,7 +2629,7 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                                 cfg->escan_info.escan_buf;
                         brcmf_inform_bss(cfg);
                         aborted = status != BRCMF_E_STATUS_SUCCESS;
-                        brcmf_notify_escan_complete(cfg, ndev, aborted,
+                        brcmf_notify_escan_complete(cfg, ifp, aborted,
                                                     false);
                 } else
                         brcmf_dbg(SCAN, "Ignored scan complete result 0x%x\n",
@@ -2737,7 +2707,7 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,
                 brcmf_abort_scanning(cfg);
 
         /* Turn off watchdog timer */
-        brcmf_set_mpc(ndev, 1);
+        brcmf_set_mpc(netdev_priv(ndev), 1);
 
 exit:
         brcmf_dbg(TRACE, "Exit\n");
@@ -2895,7 +2865,6 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
                                 const struct brcmf_event_msg *e, void *data)
 {
         struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
-        struct net_device *ndev = ifp->ndev;
         struct brcmf_pno_net_info_le *netinfo, *netinfo_start;
         struct cfg80211_scan_request *request = NULL;
         struct cfg80211_ssid *ssid = NULL;
@@ -2979,7 +2948,7 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
                 }
 
                 set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
-                err = brcmf_do_escan(cfg, wiphy, ndev, request);
+                err = brcmf_do_escan(cfg, wiphy, ifp, request);
                 if (err) {
                         clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
                         goto out_err;
@@ -3051,16 +3020,21 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy,
         int i;
         int ret = 0;
 
-        brcmf_dbg(SCAN, "Enter n_match_sets:%d   n_ssids:%d\n",
+        brcmf_dbg(SCAN, "Enter n_match_sets:%d n_ssids:%d\n",
                   request->n_match_sets, request->n_ssids);
         if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
                 brcmf_err("Scanning already: status (%lu)\n", cfg->scan_status);
                 return -EAGAIN;
         }
+        if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
+                brcmf_err("Scanning suppressed: status (%lu)\n",
+                          cfg->scan_status);
+                return -EAGAIN;
+        }
 
-        if (!request || !request->n_ssids || !request->n_match_sets) {
+        if (!request->n_ssids || !request->n_match_sets) {
                 brcmf_err("Invalid sched scan req!! n_ssids:%d\n",
-                          request ? request->n_ssids : 0);
+                          request->n_ssids);
                 return -EINVAL;
         }
 
@@ -3136,7 +3110,7 @@ static int brcmf_cfg80211_sched_scan_stop(struct wiphy *wiphy,
         brcmf_dbg(SCAN, "enter\n");
         brcmf_dev_pno_clean(ndev);
         if (cfg->sched_escan)
-                brcmf_notify_escan_complete(cfg, ndev, true, true);
+                brcmf_notify_escan_complete(cfg, netdev_priv(ndev), true, true);
         return 0;
 }
 
@@ -3708,7 +3682,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                 ssid_le.SSID_len = cpu_to_le32((u32)settings->ssid_len);
         }
 
-        brcmf_set_mpc(ndev, 0);
+        brcmf_set_mpc(ifp, 0);
 
         /* find the RSN_IE */
         rsn_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
@@ -3816,7 +3790,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
 
 exit:
         if (err)
-                brcmf_set_mpc(ndev, 1);
+                brcmf_set_mpc(ifp, 1);
         return err;
 }
 
@@ -3856,7 +3830,7 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
                 if (err < 0)
                         brcmf_err("bss_enable config failed %d\n", err);
         }
-        brcmf_set_mpc(ndev, 1);
+        brcmf_set_mpc(ifp, 1);
         set_bit(BRCMF_VIF_STATUS_AP_CREATING, &ifp->vif->sme_state);
         clear_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);
 
@@ -3913,13 +3887,13 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
                                    struct wireless_dev *wdev,
                                    u16 frame_type, bool reg)
 {
-        struct brcmf_if *ifp = netdev_priv(wdev->netdev);
-        struct brcmf_cfg80211_vif *vif = ifp->vif;
+        struct brcmf_cfg80211_vif *vif;
         u16 mgmt_type;
 
         brcmf_dbg(TRACE, "Enter, frame_type %04x, reg=%d\n", frame_type, reg);
 
         mgmt_type = (frame_type & IEEE80211_FCTL_STYPE) >> 4;
+        vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
         if (reg)
                 vif->mgmt_rx_reg |= BIT(mgmt_type);
         else
@@ -3935,7 +3909,6 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
         const struct ieee80211_mgmt *mgmt;
-        struct brcmf_if *ifp;
         struct brcmf_cfg80211_vif *vif;
         s32 err = 0;
         s32 ie_offset;
@@ -3971,8 +3944,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                 ie_offset =  DOT11_MGMT_HDR_LEN +
                              DOT11_BCN_PRB_FIXED_LEN;
                 ie_len = len - ie_offset;
-                ifp = netdev_priv(wdev->netdev);
-                vif = ifp->vif;
+                vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
                 if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif)
                         vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
                 err = brcmf_vif_set_mgmt_ie(vif,
@@ -4007,7 +3979,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                           *cookie, le16_to_cpu(action_frame->len),
                           chan->center_freq);
 
-                ack = brcmf_p2p_send_action_frame(cfg, wdev->netdev,
+                ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg),
                                                   af_params);
 
                 cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack,
@@ -4045,6 +4017,39 @@ exit:
         return err;
 }
 
+static int brcmf_cfg80211_crit_proto_start(struct wiphy *wiphy,
+                                           struct wireless_dev *wdev,
+                                           enum nl80211_crit_proto_id proto,
+                                           u16 duration)
+{
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_cfg80211_vif *vif;
+
+        vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
+
+        /* only DHCP support for now */
+        if (proto != NL80211_CRIT_PROTO_DHCP)
+                return -EINVAL;
+
+        /* suppress and abort scanning */
+        set_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
+        brcmf_abort_scanning(cfg);
+
+        return brcmf_btcoex_set_mode(vif, BRCMF_BTCOEX_DISABLED, duration);
+}
+
+static void brcmf_cfg80211_crit_proto_stop(struct wiphy *wiphy,
+                                           struct wireless_dev *wdev)
+{
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct brcmf_cfg80211_vif *vif;
+
+        vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
+
+        brcmf_btcoex_set_mode(vif, BRCMF_BTCOEX_ENABLED, 0);
+        clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
+}
+
 static struct cfg80211_ops wl_cfg80211_ops = {
         .add_virtual_intf = brcmf_cfg80211_add_iface,
         .del_virtual_intf = brcmf_cfg80211_del_iface,
@@ -4079,6 +4084,10 @@ static struct cfg80211_ops wl_cfg80211_ops = {
         .mgmt_tx = brcmf_cfg80211_mgmt_tx,
         .remain_on_channel = brcmf_p2p_remain_on_channel,
         .cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel,
+        .start_p2p_device = brcmf_p2p_start_device,
+        .stop_p2p_device = brcmf_p2p_stop_device,
+        .crit_proto_start = brcmf_cfg80211_crit_proto_start,
+        .crit_proto_stop = brcmf_cfg80211_crit_proto_stop,
 #ifdef CONFIG_NL80211_TESTMODE
         .testmode_cmd = brcmf_cfg80211_testmode
 #endif
@@ -4162,6 +4171,11 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {
                       BIT(IEEE80211_STYPE_AUTH >> 4) |
                       BIT(IEEE80211_STYPE_DEAUTH >> 4) |
                       BIT(IEEE80211_STYPE_ACTION >> 4)
+        },
+        [NL80211_IFTYPE_P2P_DEVICE] = {
+                .tx = 0xffff,
+                .rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+                      BIT(IEEE80211_STYPE_PROBE_REQ >> 4)
         }
 };
 
@@ -4187,13 +4201,6 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev)
         wiphy->iface_combinations = brcmf_iface_combos;
         wiphy->n_iface_combinations = ARRAY_SIZE(brcmf_iface_combos);
         wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
-        wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a;  /* Set
-                                                * it as 11a by default.
-                                                * This will be updated with
-                                                * 11n phy tables in
-                                                * "ifconfig up"
-                                                * if phy has 11n capability
-                                                */
         wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
         wiphy->cipher_suites = __wl_cipher_suites;
         wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
@@ -4203,6 +4210,9 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev)
         wiphy->mgmt_stypes = brcmf_txrx_stypes;
         wiphy->max_remain_on_channel_duration = 5000;
         brcmf_wiphy_pno_params(wiphy);
+        brcmf_dbg(INFO, "Registering custom regulatory\n");
+        wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+        wiphy_apply_custom_regulatory(wiphy, &brcmf_regdom);
         err = wiphy_register(wiphy);
         if (err < 0) {
                 brcmf_err("Could not register wiphy device (%d)\n", err);
@@ -4386,9 +4396,9 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg,
         struct ieee80211_channel *notify_channel = NULL;
         struct ieee80211_supported_band *band;
         struct brcmf_bss_info_le *bi;
+        struct brcmu_chan ch;
         u32 freq;
         s32 err = 0;
-        u32 target_channel;
         u8 *buf;
 
         brcmf_dbg(TRACE, "Enter\n");
@@ -4412,15 +4422,15 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg,
                 goto done;
 
         bi = (struct brcmf_bss_info_le *)(buf + 4);
-        target_channel = bi->ctl_ch ? bi->ctl_ch :
-                                      CHSPEC_CHANNEL(le16_to_cpu(bi->chanspec));
+        ch.chspec = le16_to_cpu(bi->chanspec);
+        cfg->d11inf.decchspec(&ch);
 
-        if (target_channel <= CH_MAX_2G_CHANNEL)
+        if (ch.band == BRCMU_CHAN_BAND_2G)
                 band = wiphy->bands[IEEE80211_BAND_2GHZ];
         else
                 band = wiphy->bands[IEEE80211_BAND_5GHZ];
 
-        freq = ieee80211_channel_to_frequency(target_channel, band->band);
+        freq = ieee80211_channel_to_frequency(ch.chnum, band->band);
         notify_channel = ieee80211_get_channel(wiphy, freq);
 
 done:
@@ -4621,9 +4631,11 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp,
 
                 ifp->vif = vif;
                 vif->ifp = ifp;
-                vif->wdev.netdev = ifp->ndev;
-                ifp->ndev->ieee80211_ptr = &vif->wdev;
-                SET_NETDEV_DEV(ifp->ndev, wiphy_dev(cfg->wiphy));
+                if (ifp->ndev) {
+                        vif->wdev.netdev = ifp->ndev;
+                        ifp->ndev->ieee80211_ptr = &vif->wdev;
+                        SET_NETDEV_DEV(ifp->ndev, wiphy_dev(cfg->wiphy));
+                }
                 mutex_unlock(&event->vif_event_lock);
                 wake_up(&event->vif_wq);
                 return 0;
@@ -4772,6 +4784,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
         struct brcmf_cfg80211_vif *vif;
         struct brcmf_if *ifp;
         s32 err = 0;
+        s32 io_type;
 
         if (!ndev) {
                 brcmf_err("ndev is invalid\n");
@@ -4812,6 +4825,21 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
                 brcmf_err("P2P initilisation failed (%d)\n", err);
                 goto cfg80211_p2p_attach_out;
         }
+        err = brcmf_btcoex_attach(cfg);
+        if (err) {
+                brcmf_err("BT-coex initialisation failed (%d)\n", err);
+                brcmf_p2p_detach(&cfg->p2p);
+                goto cfg80211_p2p_attach_out;
+        }
+
+        err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_VERSION,
+                                    &io_type);
+        if (err) {
+                brcmf_err("Failed to get D11 version (%d)\n", err);
+                goto cfg80211_p2p_attach_out;
+        }
+        cfg->d11inf.io_type = (u8)io_type;
+        brcmu_d11_attach(&cfg->d11inf);
 
         return cfg;
 
@@ -4830,6 +4858,7 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
         struct brcmf_cfg80211_vif *tmp;
 
         wl_deinit_priv(cfg);
+        brcmf_btcoex_detach(cfg);
         list_for_each_entry_safe(vif, tmp, &cfg->vif_list, list) {
                 brcmf_free_vif(vif);
         }
@@ -4926,34 +4955,234 @@ dongle_scantime_out:
         return err;
 }
 
-static s32 wl_update_wiphybands(struct brcmf_cfg80211_info *cfg)
+
+static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap)
+{
+        struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
+        struct ieee80211_channel *band_chan_arr;
+        struct brcmf_chanspec_list *list;
+        struct brcmu_chan ch;
+        s32 err;
+        u8 *pbuf;
+        u32 i, j;
+        u32 total;
+        enum ieee80211_band band;
+        u32 channel;
+        u32 *n_cnt;
+        bool ht40_allowed;
+        u32 index;
+        u32 ht40_flag;
+        bool update;
+        u32 array_size;
+
+        pbuf = kzalloc(BRCMF_DCMD_MEDLEN, GFP_KERNEL);
+
+        if (pbuf == NULL)
+                return -ENOMEM;
+
+        list = (struct brcmf_chanspec_list *)pbuf;
+
+        err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
+                                       BRCMF_DCMD_MEDLEN);
+        if (err) {
+                brcmf_err("get chanspecs error (%d)\n", err);
+                goto exit;
+        }
+
+        __wl_band_2ghz.n_channels = 0;
+        __wl_band_5ghz_a.n_channels = 0;
+
+        total = le32_to_cpu(list->count);
+        for (i = 0; i < total; i++) {
+                ch.chspec = (u16)le32_to_cpu(list->element[i]);
+                cfg->d11inf.decchspec(&ch);
+
+                if (ch.band == BRCMU_CHAN_BAND_2G) {
+                        band_chan_arr = __wl_2ghz_channels;
+                        array_size = ARRAY_SIZE(__wl_2ghz_channels);
+                        n_cnt = &__wl_band_2ghz.n_channels;
+                        band = IEEE80211_BAND_2GHZ;
+                        ht40_allowed = (bw_cap == WLC_N_BW_40ALL);
+                } else if (ch.band == BRCMU_CHAN_BAND_5G) {
+                        band_chan_arr = __wl_5ghz_a_channels;
+                        array_size = ARRAY_SIZE(__wl_5ghz_a_channels);
+                        n_cnt = &__wl_band_5ghz_a.n_channels;
+                        band = IEEE80211_BAND_5GHZ;
+                        ht40_allowed = !(bw_cap == WLC_N_BW_20ALL);
+                } else {
+                        brcmf_err("Invalid channel Sepc. 0x%x.\n", ch.chspec);
+                        continue;
+                }
+                if (!ht40_allowed && ch.bw == BRCMU_CHAN_BW_40)
+                        continue;
+                update = false;
+                for (j = 0; (j < *n_cnt && (*n_cnt < array_size)); j++) {
+                        if (band_chan_arr[j].hw_value == ch.chnum) {
+                                update = true;
+                                break;
+                        }
+                }
+                if (update)
+                        index = j;
+                else
+                        index = *n_cnt;
+                if (index <  array_size) {
+                        band_chan_arr[index].center_freq =
+                                ieee80211_channel_to_frequency(ch.chnum, band);
+                        band_chan_arr[index].hw_value = ch.chnum;
+
+                        if (ch.bw == BRCMU_CHAN_BW_40 && ht40_allowed) {
+                                /* assuming the order is HT20, HT40 Upper,
+                                 * HT40 lower from chanspecs
+                                 */
+                                ht40_flag = band_chan_arr[index].flags &
+                                            IEEE80211_CHAN_NO_HT40;
+                                if (ch.sb == BRCMU_CHAN_SB_U) {
+                                        if (ht40_flag == IEEE80211_CHAN_NO_HT40)
+                                                band_chan_arr[index].flags &=
+                                                        ~IEEE80211_CHAN_NO_HT40;
+                                        band_chan_arr[index].flags |=
+                                                IEEE80211_CHAN_NO_HT40PLUS;
+                                } else {
+                                        /* It should be one of
+                                         * IEEE80211_CHAN_NO_HT40 or
+                                         * IEEE80211_CHAN_NO_HT40PLUS
+                                         */
+                                        band_chan_arr[index].flags &=
+                                                        ~IEEE80211_CHAN_NO_HT40;
+                                        if (ht40_flag == IEEE80211_CHAN_NO_HT40)
+                                                band_chan_arr[index].flags |=
+                                                    IEEE80211_CHAN_NO_HT40MINUS;
+                                }
+                        } else {
+                                band_chan_arr[index].flags =
+                                                        IEEE80211_CHAN_NO_HT40;
+                                ch.bw = BRCMU_CHAN_BW_20;
+                                cfg->d11inf.encchspec(&ch);
+                                channel = ch.chspec;
+                                err = brcmf_fil_bsscfg_int_get(ifp,
+                                                               "per_chan_info",
+                                                               &channel);
+                                if (!err) {
+                                        if (channel & WL_CHAN_RADAR)
+                                                band_chan_arr[index].flags |=
+                                                        (IEEE80211_CHAN_RADAR |
+                                                        IEEE80211_CHAN_NO_IBSS);
+                                        if (channel & WL_CHAN_PASSIVE)
+                                                band_chan_arr[index].flags |=
+                                                    IEEE80211_CHAN_PASSIVE_SCAN;
+                                }
+                        }
+                        if (!update)
+                                (*n_cnt)++;
+                }
+        }
+exit:
+        kfree(pbuf);
+        return err;
+}
+
+
+static s32 brcmf_update_wiphybands(struct brcmf_cfg80211_info *cfg)
 {
         struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
         struct wiphy *wiphy;
         s32 phy_list;
+        u32 band_list[3];
+        u32 nmode;
+        u32 bw_cap = 0;
         s8 phy;
-        s32 err = 0;
+        s32 err;
+        u32 nband;
+        s32 i;
+        struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS];
+        s32 index;
 
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_PHYLIST,
                                      &phy_list, sizeof(phy_list));
         if (err) {
-                brcmf_err("error (%d)\n", err);
+                brcmf_err("BRCMF_C_GET_PHYLIST error (%d)\n", err);
                 return err;
         }
 
         phy = ((char *)&phy_list)[0];
-        brcmf_dbg(INFO, "%c phy\n", phy);
-        if (phy == 'n' || phy == 'a') {
-                wiphy = cfg_to_wiphy(cfg);
-                wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+        brcmf_dbg(INFO, "BRCMF_C_GET_PHYLIST reported: %c phy\n", phy);
+
+
+        err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BANDLIST,
+                                     &band_list, sizeof(band_list));
+        if (err) {
+                brcmf_err("BRCMF_C_GET_BANDLIST error (%d)\n", err);
+                return err;
+        }
+        brcmf_dbg(INFO, "BRCMF_C_GET_BANDLIST reported: 0x%08x 0x%08x 0x%08x phy\n",
+                  band_list[0], band_list[1], band_list[2]);
+
+        err = brcmf_fil_iovar_int_get(ifp, "nmode", &nmode);
+        if (err) {
+                brcmf_err("nmode error (%d)\n", err);
+        } else {
+                err = brcmf_fil_iovar_int_get(ifp, "mimo_bw_cap", &bw_cap);
+                if (err)
+                        brcmf_err("mimo_bw_cap error (%d)\n", err);
         }
+        brcmf_dbg(INFO, "nmode=%d, mimo_bw_cap=%d\n", nmode, bw_cap);
+
+        err = brcmf_construct_reginfo(cfg, bw_cap);
+        if (err) {
+                brcmf_err("brcmf_construct_reginfo failed (%d)\n", err);
+                return err;
+        }
+
+        nband = band_list[0];
+        memset(bands, 0, sizeof(bands));
+
+        for (i = 1; i <= nband && i < ARRAY_SIZE(band_list); i++) {
+                index = -1;
+                if ((band_list[i] == WLC_BAND_5G) &&
+                    (__wl_band_5ghz_a.n_channels > 0)) {
+                        index = IEEE80211_BAND_5GHZ;
+                        bands[index] = &__wl_band_5ghz_a;
+                        if ((bw_cap == WLC_N_BW_40ALL) ||
+                            (bw_cap == WLC_N_BW_20IN2G_40IN5G))
+                                bands[index]->ht_cap.cap |=
+                                                        IEEE80211_HT_CAP_SGI_40;
+                } else if ((band_list[i] == WLC_BAND_2G) &&
+                           (__wl_band_2ghz.n_channels > 0)) {
+                        index = IEEE80211_BAND_2GHZ;
+                        bands[index] = &__wl_band_2ghz;
+                        if (bw_cap == WLC_N_BW_40ALL)
+                                bands[index]->ht_cap.cap |=
+                                                        IEEE80211_HT_CAP_SGI_40;
+                }
+
+                if ((index >= 0) && nmode) {
+                        bands[index]->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
+                        bands[index]->ht_cap.cap |= IEEE80211_HT_CAP_DSSSCCK40;
+                        bands[index]->ht_cap.ht_supported = true;
+                        bands[index]->ht_cap.ampdu_factor =
+                                                IEEE80211_HT_MAX_AMPDU_64K;
+                        bands[index]->ht_cap.ampdu_density =
+                                                IEEE80211_HT_MPDU_DENSITY_16;
+                        /* An HT shall support all EQM rates for one spatial
+                         * stream
+                         */
+                        bands[index]->ht_cap.mcs.rx_mask[0] = 0xff;
+                }
+        }
+
+        wiphy = cfg_to_wiphy(cfg);
+        wiphy->bands[IEEE80211_BAND_2GHZ] = bands[IEEE80211_BAND_2GHZ];
+        wiphy->bands[IEEE80211_BAND_5GHZ] = bands[IEEE80211_BAND_5GHZ];
+        wiphy_apply_custom_regulatory(wiphy, &brcmf_regdom);
 
         return err;
 }
 
+
 static s32 brcmf_dongle_probecap(struct brcmf_cfg80211_info *cfg)
 {
-        return wl_update_wiphybands(cfg);
+        return brcmf_update_wiphybands(cfg);
 }
 
 static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
@@ -5059,6 +5288,13 @@ s32 brcmf_cfg80211_down(struct net_device *ndev)
         return err;
 }
 
+enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp)
+{
+        struct wireless_dev *wdev = &ifp->vif->wdev;
+
+        return wdev->iftype;
+}
+
 u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state)
 {
         struct brcmf_cfg80211_vif *vif;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index 8b5d4989906c..a71cff84cdcf 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -17,6 +17,9 @@
 #ifndef _wl_cfg80211_h_
 #define _wl_cfg80211_h_
 
+/* for brcmu_d11inf */
+#include <brcmu_d11.h>
+
 #define WL_NUM_SCAN_MAX                 10
 #define WL_NUM_PMKIDS_MAX               MAXPMKID
 #define WL_TLV_INFO_MAX                 1024
@@ -74,14 +77,16 @@
 
 
 /**
- * enum brcmf_scan_status - dongle scan status
+ * enum brcmf_scan_status - scan engine status
  *
  * @BRCMF_SCAN_STATUS_BUSY: scanning in progress on dongle.
  * @BRCMF_SCAN_STATUS_ABORT: scan being aborted on dongle.
+ * @BRCMF_SCAN_STATUS_SUPPRESS: scanning is suppressed in driver.
  */
 enum brcmf_scan_status {
         BRCMF_SCAN_STATUS_BUSY,
         BRCMF_SCAN_STATUS_ABORT,
+        BRCMF_SCAN_STATUS_SUPPRESS,
 };
 
 /**
@@ -238,9 +243,8 @@ struct escan_info {
         u32 escan_state;
         u8 escan_buf[WL_ESCAN_BUF_SIZE];
         struct wiphy *wiphy;
-        struct net_device *ndev;
-        s32 (*run)(struct brcmf_cfg80211_info *cfg,
-                   struct net_device *ndev,
+        struct brcmf_if *ifp;
+        s32 (*run)(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
                    struct cfg80211_scan_request *request, u16 action);
 };
 
@@ -347,6 +351,7 @@ struct brcmf_cfg80211_vif_event {
  * @wiphy: wiphy object for cfg80211 interface.
  * @conf: dongle configuration.
  * @p2p: peer-to-peer specific information.
+ * @btcoex: Bluetooth coexistence information.
  * @scan_request: cfg80211 scan request object.
  * @usr_sync: mainly for dongle up/down synchronization.
  * @bss_list: bss_list holding scanned ap information.
@@ -380,6 +385,7 @@ struct brcmf_cfg80211_info {
         struct wiphy *wiphy;
         struct brcmf_cfg80211_conf *conf;
         struct brcmf_p2p_info p2p;
+        struct brcmf_btcoex_info *btcoex;
         struct cfg80211_scan_request *scan_request;
         struct mutex usr_sync;
         struct brcmf_scan_results *bss_list;
@@ -409,6 +415,7 @@ struct brcmf_cfg80211_info {
         u8 vif_cnt;
         struct brcmf_cfg80211_vif_event vif_event;
         struct completion vif_disabled;
+        struct brcmu_d11inf d11inf;
 };
 
 /**
@@ -475,6 +482,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg);
 s32 brcmf_cfg80211_up(struct net_device *ndev);
 s32 brcmf_cfg80211_down(struct net_device *ndev);
+enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);
 
 struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
                                            enum nl80211_iftype type,
@@ -485,7 +493,8 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
                           const u8 *vndr_ie_buf, u32 vndr_ie_len);
 s32 brcmf_vif_clear_mgmt_ies(struct brcmf_cfg80211_vif *vif);
 struct brcmf_tlv *brcmf_parse_tlvs(void *buf, int buflen, uint key);
-u16 channel_to_chanspec(struct ieee80211_channel *ch);
+u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,
+                        struct ieee80211_channel *ch);
 u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state);
 void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
                                   struct brcmf_cfg80211_vif *vif);
@@ -493,9 +502,9 @@ bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
 int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
                                           u8 action, ulong timeout);
 s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
-                                struct net_device *ndev,
-                                bool aborted, bool fw_abort);
-void brcmf_set_mpc(struct net_device *ndev, int mpc);
+                                struct brcmf_if *ifp, bool aborted,
+                                bool fw_abort);
+void brcmf_set_mpc(struct brcmf_if *ndev, int mpc);
 void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg);
 
 #endif                          /* _wl_cfg80211_h_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
index d3d4151c3eda..32464acccd90 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
@@ -21,7 +21,7 @@ ccflags-y := \
         -Idrivers/net/wireless/brcm80211/brcmsmac/phy \
         -Idrivers/net/wireless/brcm80211/include
 
-BRCMSMAC_OFILES := \
+brcmsmac-y := \
         mac80211_if.o \
         ucode_loader.o \
         ampdu.o \
@@ -43,7 +43,6 @@ BRCMSMAC_OFILES := \
         brcms_trace_events.o \
         debug.o
 
-MODULEPFX := brcmsmac
+brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
 
-obj-$(CONFIG_BRCMSMAC)  += $(MODULEPFX).o
-$(MODULEPFX)-objs       = $(BRCMSMAC_OFILES)
+obj-$(CONFIG_BRCMSMAC)  += brcmsmac.o
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index f0888a9ee32e..e4fd1ee3d690 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -318,12 +318,6 @@
 #define IS_SIM(chippkg) \
         ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
 
-#ifdef DEBUG
-#define SI_MSG(fmt, ...)        pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define SI_MSG(fmt, ...)        no_printk(fmt, ##__VA_ARGS__)
-#endif                          /* DEBUG */
-
 #define GOODCOREADDR(x, b) \
         (((x) >= (b)) && ((x) < ((b) + SI_MAXCORES * SI_CORE_SIZE)) && \
                 IS_ALIGNED((x), SI_CORE_SIZE))
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index 10ee314c4229..cc87926f5055 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -379,7 +379,7 @@ brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                          u8 local_constraint_qdbm)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
-        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.chandef.chan;
         struct txpwr_limits txpwr;
 
         brcms_c_channel_reg_limits(wlc_cm, chanspec, &txpwr);
@@ -404,7 +404,7 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
                        struct txpwr_limits *txpwr)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
-        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.chandef.chan;
         uint i;
         uint chan;
         int maxpwr;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
index 3f659e09f1cc..9035cc4d6ff3 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/d11.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
@@ -457,6 +457,7 @@ struct d11regs {
 /*== maccontrol register ==*/
 #define MCTL_GMODE              (1U << 31)
 #define MCTL_DISCARD_PMQ        (1 << 30)
+#define MCTL_TBTTHOLD           (1 << 28)
 #define MCTL_WAKE               (1 << 26)
 #define MCTL_HPS                (1 << 25)
 #define MCTL_PROMISC            (1 << 24)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/led.c b/drivers/net/wireless/brcm80211/brcmsmac/led.c
new file mode 100644
index 000000000000..74b17cecb189
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmsmac/led.c
@@ -0,0 +1,126 @@
+#include <net/mac80211.h>
+#include <linux/bcma/bcma_driver_chipcommon.h>
+#include <linux/gpio.h>
+
+#include "mac80211_if.h"
+#include "pub.h"
+#include "main.h"
+#include "led.h"
+
+        /* number of leds */
+#define  BRCMS_LED_NO           4
+        /* behavior mask */
+#define  BRCMS_LED_BEH_MASK     0x7f
+        /* activelow (polarity) bit */
+#define  BRCMS_LED_AL_MASK      0x80
+        /* radio enabled */
+#define  BRCMS_LED_RADIO        3
+
+static void brcms_radio_led_ctrl(struct brcms_info *wl, bool state)
+{
+        if (wl->radio_led.gpio == -1)
+                return;
+
+        if (wl->radio_led.active_low)
+                state = !state;
+
+        if (state)
+                gpio_set_value(wl->radio_led.gpio, 1);
+        else
+                gpio_set_value(wl->radio_led.gpio, 0);
+}
+
+
+/* Callback from the LED subsystem. */
+static void brcms_led_brightness_set(struct led_classdev *led_dev,
+                                   enum led_brightness brightness)
+{
+        struct brcms_info *wl = container_of(led_dev,
+                struct brcms_info, led_dev);
+        brcms_radio_led_ctrl(wl, brightness);
+}
+
+void brcms_led_unregister(struct brcms_info *wl)
+{
+        if (wl->led_dev.dev)
+                led_classdev_unregister(&wl->led_dev);
+        if (wl->radio_led.gpio != -1)
+                gpio_free(wl->radio_led.gpio);
+}
+
+int brcms_led_register(struct brcms_info *wl)
+{
+        int i, err;
+        struct brcms_led *radio_led = &wl->radio_led;
+        /* get CC core */
+        struct bcma_drv_cc *cc_drv  = &wl->wlc->hw->d11core->bus->drv_cc;
+        struct gpio_chip *bcma_gpio = &cc_drv->gpio;
+        struct ssb_sprom *sprom = &wl->wlc->hw->d11core->bus->sprom;
+        u8 *leds[] = { &sprom->gpio0,
+                &sprom->gpio1,
+                &sprom->gpio2,
+                &sprom->gpio3 };
+        unsigned gpio = -1;
+        bool active_low = false;
+
+        /* none by default */
+        radio_led->gpio = -1;
+        radio_led->active_low = false;
+
+        if (!bcma_gpio || !gpio_is_valid(bcma_gpio->base))
+                return -ENODEV;
+
+        /* find radio enabled LED */
+        for (i = 0; i < BRCMS_LED_NO; i++) {
+                u8 led = *leds[i];
+                if ((led & BRCMS_LED_BEH_MASK) == BRCMS_LED_RADIO) {
+                        gpio = bcma_gpio->base + i;
+                        if (led & BRCMS_LED_AL_MASK)
+                                active_low = true;
+                        break;
+                }
+        }
+
+        if (gpio == -1 || !gpio_is_valid(gpio))
+                return -ENODEV;
+
+        /* request and configure LED gpio */
+        err = gpio_request_one(gpio,
+                                active_low ? GPIOF_OUT_INIT_HIGH
+                                        : GPIOF_OUT_INIT_LOW,
+                                "radio on");
+        if (err) {
+                wiphy_err(wl->wiphy, "requesting led gpio %d failed (err: %d)\n",
+                          gpio, err);
+                return err;
+        }
+        err = gpio_direction_output(gpio, 1);
+        if (err) {
+                wiphy_err(wl->wiphy, "cannot set led gpio %d to output (err: %d)\n",
+                          gpio, err);
+                return err;
+        }
+
+        snprintf(wl->radio_led.name, sizeof(wl->radio_led.name),
+                 "brcmsmac-%s:radio", wiphy_name(wl->wiphy));
+
+        wl->led_dev.name = wl->radio_led.name;
+        wl->led_dev.default_trigger =
+                ieee80211_get_radio_led_name(wl->pub->ieee_hw);
+        wl->led_dev.brightness_set = brcms_led_brightness_set;
+        err = led_classdev_register(wiphy_dev(wl->wiphy), &wl->led_dev);
+
+        if (err) {
+                wiphy_err(wl->wiphy, "cannot register led device: %s (err: %d)\n",
+                          wl->radio_led.name, err);
+                return err;
+        }
+
+        wiphy_info(wl->wiphy, "registered radio enabled led device: %s gpio: %d\n",
+                   wl->radio_led.name,
+                   gpio);
+        radio_led->gpio = gpio;
+        radio_led->active_low = active_low;
+
+        return 0;
+}
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/led.h b/drivers/net/wireless/brcm80211/brcmsmac/led.h
new file mode 100644
index 000000000000..17a0b1f5dbcf
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmsmac/led.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _BRCM_LED_H_
+#define _BRCM_LED_H_
+struct brcms_led {
+        char name[32];
+        unsigned gpio;
+        bool active_low;
+};
+
+#ifdef CONFIG_BCMA_DRIVER_GPIO
+void brcms_led_unregister(struct brcms_info *wl);
+int brcms_led_register(struct brcms_info *wl);
+#else
+static inline void brcms_led_unregister(struct brcms_info *wl) {};
+static inline int brcms_led_register(struct brcms_info *wl)
+{
+        return -ENOTSUPP;
+};
+#endif
+
+#endif /* _BRCM_LED_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index e2340b231aa1..3a6544710c8a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010 Broadcom Corporation
+ * Copyright (c) 2013 Hauke Mehrtens <hauke@hauke-m.de>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -34,6 +35,7 @@
 #include "mac80211_if.h"
 #include "main.h"
 #include "debug.h"
+#include "led.h"
 
 #define N_TX_QUEUES     4 /* #tx queues on mac80211<->driver interface */
 #define BRCMS_FLUSH_TIMEOUT     500 /* msec */
@@ -334,6 +336,7 @@ static void brcms_remove(struct bcma_device *pdev)
         struct brcms_info *wl = hw->priv;
 
         if (wl->wlc) {
+                brcms_led_unregister(wl);
                 wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, false);
                 wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
                 ieee80211_unregister_hw(hw);
@@ -487,18 +490,26 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
         struct brcms_info *wl = hw->priv;
 
-        /* Just STA for now */
-        if (vif->type != NL80211_IFTYPE_STATION) {
+        /* Just STA, AP and ADHOC for now */
+        if (vif->type != NL80211_IFTYPE_STATION &&
+            vif->type != NL80211_IFTYPE_AP &&
+            vif->type != NL80211_IFTYPE_ADHOC) {
                 brcms_err(wl->wlc->hw->d11core,
-                          "%s: Attempt to add type %d, only STA for now\n",
+                          "%s: Attempt to add type %d, only STA, AP and AdHoc for now\n",
                           __func__, vif->type);
                 return -EOPNOTSUPP;
         }
 
         spin_lock_bh(&wl->lock);
-        memcpy(wl->pub->cur_etheraddr, vif->addr, sizeof(vif->addr));
         wl->mute_tx = false;
         brcms_c_mute(wl->wlc, false);
+        if (vif->type == NL80211_IFTYPE_STATION)
+                brcms_c_start_station(wl->wlc, vif->addr);
+        else if (vif->type == NL80211_IFTYPE_AP)
+                brcms_c_start_ap(wl->wlc, vif->addr, vif->bss_conf.bssid,
+                                 vif->bss_conf.ssid, vif->bss_conf.ssid_len);
+        else if (vif->type == NL80211_IFTYPE_ADHOC)
+                brcms_c_start_adhoc(wl->wlc, vif->addr);
         spin_unlock_bh(&wl->lock);
 
         return 0;
@@ -546,10 +557,10 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
                                   new_int);
         }
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-                if (conf->channel_type == NL80211_CHAN_HT20 ||
-                    conf->channel_type == NL80211_CHAN_NO_HT)
+                if (conf->chandef.width == NL80211_CHAN_WIDTH_20 ||
+                    conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT)
                         err = brcms_c_set_channel(wl->wlc,
-                                                  conf->channel->hw_value);
+                                                  conf->chandef.chan->hw_value);
                 else
                         err = -ENOTSUPP;
         }
@@ -650,14 +661,43 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
                 brcms_c_set_addrmatch(wl->wlc, RCM_BSSID_OFFSET, info->bssid);
                 spin_unlock_bh(&wl->lock);
         }
-        if (changed & BSS_CHANGED_BEACON)
+        if (changed & BSS_CHANGED_SSID) {
+                /* BSSID changed, for whatever reason (IBSS and managed mode) */
+                spin_lock_bh(&wl->lock);
+                brcms_c_set_ssid(wl->wlc, info->ssid, info->ssid_len);
+                spin_unlock_bh(&wl->lock);
+        }
+        if (changed & BSS_CHANGED_BEACON) {
                 /* Beacon data changed, retrieve new beacon (beaconing modes) */
-                brcms_err(core, "%s: beacon changed\n", __func__);
+                struct sk_buff *beacon;
+                u16 tim_offset = 0;
+
+                spin_lock_bh(&wl->lock);
+                beacon = ieee80211_beacon_get_tim(hw, vif, &tim_offset, NULL);
+                brcms_c_set_new_beacon(wl->wlc, beacon, tim_offset,
+                                       info->dtim_period);
+                spin_unlock_bh(&wl->lock);
+        }
+
+        if (changed & BSS_CHANGED_AP_PROBE_RESP) {
+                struct sk_buff *probe_resp;
+
+                spin_lock_bh(&wl->lock);
+                probe_resp = ieee80211_proberesp_get(hw, vif);
+                brcms_c_set_new_probe_resp(wl->wlc, probe_resp);
+                spin_unlock_bh(&wl->lock);
+        }
 
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
                 /* Beaconing should be enabled/disabled (beaconing modes) */
                 brcms_err(core, "%s: Beacon enabled: %s\n", __func__,
                           info->enable_beacon ? "true" : "false");
+                if (info->enable_beacon &&
+                    hw->wiphy->flags & WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD) {
+                        brcms_c_enable_probe_resp(wl->wlc, true);
+                } else {
+                        brcms_c_enable_probe_resp(wl->wlc, false);
+                }
         }
 
         if (changed & BSS_CHANGED_CQM) {
@@ -855,7 +895,7 @@ static bool brcms_tx_flush_completed(struct brcms_info *wl)
         return result;
 }
 
-static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop)
+static void brcms_ops_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct brcms_info *wl = hw->priv;
         int ret;
@@ -870,6 +910,28 @@ static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop)
                            "ret=%d\n", jiffies_to_msecs(ret));
 }
 
+static u64 brcms_ops_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+        struct brcms_info *wl = hw->priv;
+        u64 tsf;
+
+        spin_lock_bh(&wl->lock);
+        tsf = brcms_c_tsf_get(wl->wlc);
+        spin_unlock_bh(&wl->lock);
+
+        return tsf;
+}
+
+static void brcms_ops_set_tsf(struct ieee80211_hw *hw,
+                           struct ieee80211_vif *vif, u64 tsf)
+{
+        struct brcms_info *wl = hw->priv;
+
+        spin_lock_bh(&wl->lock);
+        brcms_c_tsf_set(wl->wlc, tsf);
+        spin_unlock_bh(&wl->lock);
+}
+
 static const struct ieee80211_ops brcms_ops = {
         .tx = brcms_ops_tx,
         .start = brcms_ops_start,
@@ -886,6 +948,8 @@ static const struct ieee80211_ops brcms_ops = {
         .ampdu_action = brcms_ops_ampdu_action,
         .rfkill_poll = brcms_ops_rfkill_poll,
         .flush = brcms_ops_flush,
+        .get_tsf = brcms_ops_get_tsf,
+        .set_tsf = brcms_ops_set_tsf,
 };
 
 void brcms_dpc(unsigned long data)
@@ -1004,7 +1068,16 @@ static int ieee_hw_init(struct ieee80211_hw *hw)
 
         /* channel change time is dependent on chip and band  */
         hw->channel_change_time = 7 * 1000;
-        hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+        hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
+                                     BIT(NL80211_IFTYPE_AP) |
+                                     BIT(NL80211_IFTYPE_ADHOC);
+
+        /*
+         * deactivate sending probe responses by ucude, because this will
+         * cause problems when WPS is used.
+         *
+         * hw->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
+         */
 
         hw->rate_control_algorithm = "minstrel_ht";
 
@@ -1151,6 +1224,8 @@ static int brcms_bcma_probe(struct bcma_device *pdev)
                 pr_err("%s: brcms_attach failed!\n", __func__);
                 return -ENODEV;
         }
+        brcms_led_register(wl);
+
         return 0;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
index 947ccacf43e6..4090032e81a2 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
@@ -20,8 +20,10 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
+#include <linux/leds.h>
 
 #include "ucode_loader.h"
+#include "led.h"
 /*
  * Starting index for 5G rates in the
  * legacy rate table.
@@ -81,6 +83,8 @@ struct brcms_info {
         struct wiphy *wiphy;
         struct brcms_ucode ucode;
         bool mute_tx;
+        struct brcms_led radio_led;
+        struct led_classdev led_dev;
 };
 
 /* misc callbacks */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 8ef02dca8f8c..28e7aeedd184 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010 Broadcom Corporation
+ * Copyright (c) 2013 Hauke Mehrtens <hauke@hauke-m.de>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -448,6 +449,10 @@ static void brcms_c_detach_mfree(struct brcms_c_info *wlc)
         kfree(wlc->corestate);
         kfree(wlc->hw->bandstate[0]);
         kfree(wlc->hw);
+        if (wlc->beacon)
+                dev_kfree_skb_any(wlc->beacon);
+        if (wlc->probe_resp)
+                dev_kfree_skb_any(wlc->probe_resp);
 
         /* free the wlc */
         kfree(wlc);
@@ -1069,7 +1074,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
 
 static void brcms_c_tbtt(struct brcms_c_info *wlc)
 {
-        if (!wlc->bsscfg->BSS)
+        if (wlc->bsscfg->type == BRCMS_TYPE_ADHOC)
                 /*
                  * DirFrmQ is now valid...defer setting until end
                  * of ATIM window
@@ -2163,6 +2168,32 @@ void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
         }
 }
 
+void brcms_c_start_station(struct brcms_c_info *wlc, u8 *addr)
+{
+        memcpy(wlc->pub->cur_etheraddr, addr, sizeof(wlc->pub->cur_etheraddr));
+        wlc->bsscfg->type = BRCMS_TYPE_STATION;
+}
+
+void brcms_c_start_ap(struct brcms_c_info *wlc, u8 *addr, const u8 *bssid,
+                      u8 *ssid, size_t ssid_len)
+{
+        brcms_c_set_ssid(wlc, ssid, ssid_len);
+
+        memcpy(wlc->pub->cur_etheraddr, addr, sizeof(wlc->pub->cur_etheraddr));
+        memcpy(wlc->bsscfg->BSSID, bssid, sizeof(wlc->bsscfg->BSSID));
+        wlc->bsscfg->type = BRCMS_TYPE_AP;
+
+        brcms_b_mctrl(wlc->hw, MCTL_AP | MCTL_INFRA, MCTL_AP | MCTL_INFRA);
+}
+
+void brcms_c_start_adhoc(struct brcms_c_info *wlc, u8 *addr)
+{
+        memcpy(wlc->pub->cur_etheraddr, addr, sizeof(wlc->pub->cur_etheraddr));
+        wlc->bsscfg->type = BRCMS_TYPE_ADHOC;
+
+        brcms_b_mctrl(wlc->hw, MCTL_AP | MCTL_INFRA, 0);
+}
+
 /* Initialize GPIOs that are controlled by D11 core */
 static void brcms_c_gpio_init(struct brcms_c_info *wlc)
 {
@@ -3043,8 +3074,6 @@ static void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail)
  */
 static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
 {
-        struct brcms_bss_cfg *cfg = wlc->bsscfg;
-
         /* disallow PS when one of the following global conditions meets */
         if (!wlc->pub->associated)
                 return false;
@@ -3053,16 +3082,11 @@ static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
         if (wlc->filter_flags & FIF_PROMISC_IN_BSS)
                 return false;
 
-        if (cfg->associated) {
-                /*
-                 * disallow PS when one of the following
-                 * bsscfg specific conditions meets
-                 */
-                if (!cfg->BSS)
-                        return false;
+        if (wlc->bsscfg->type == BRCMS_TYPE_AP)
+                return false;
 
+        if (wlc->bsscfg->type == BRCMS_TYPE_ADHOC)
                 return false;
-        }
 
         return true;
 }
@@ -3771,7 +3795,7 @@ static int brcms_c_set_mac(struct brcms_bss_cfg *bsscfg)
         struct brcms_c_info *wlc = bsscfg->wlc;
 
         /* enter the MAC addr into the RXE match registers */
-        brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, bsscfg->cur_etheraddr);
+        brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, wlc->pub->cur_etheraddr);
 
         brcms_c_ampdu_macaddr_upd(wlc);
 
@@ -3787,6 +3811,15 @@ static void brcms_c_set_bssid(struct brcms_bss_cfg *bsscfg)
         brcms_c_set_addrmatch(bsscfg->wlc, RCM_BSSID_OFFSET, bsscfg->BSSID);
 }
 
+void brcms_c_set_ssid(struct brcms_c_info *wlc, u8 *ssid, size_t ssid_len)
+{
+        u8 len = min_t(u8, sizeof(wlc->bsscfg->SSID), ssid_len);
+        memset(wlc->bsscfg->SSID, 0, sizeof(wlc->bsscfg->SSID));
+
+        memcpy(wlc->bsscfg->SSID, ssid, len);
+        wlc->bsscfg->SSID_len = len;
+}
+
 static void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw, bool shortslot)
 {
         wlc_hw->shortslot = shortslot;
@@ -3821,7 +3854,7 @@ static void brcms_c_set_home_chanspec(struct brcms_c_info *wlc, u16 chanspec)
         if (wlc->home_chanspec != chanspec) {
                 wlc->home_chanspec = chanspec;
 
-                if (wlc->bsscfg->associated)
+                if (wlc->pub->associated)
                         wlc->bsscfg->current_bss->chanspec = chanspec;
         }
 }
@@ -4091,10 +4124,14 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
                                           *shm_entry++);
         }
 
-        if (suspend) {
+        if (suspend)
                 brcms_c_suspend_mac_and_wait(wlc);
+
+        brcms_c_update_beacon(wlc);
+        brcms_c_update_probe_resp(wlc, false);
+
+        if (suspend)
                 brcms_c_enable_mac(wlc);
-        }
 }
 
 static void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)
@@ -4332,7 +4369,6 @@ static void brcms_c_info_init(struct brcms_c_info *wlc, int unit)
 
         /* WME QoS mode is Auto by default */
         wlc->pub->_ampdu = AMPDU_AGG_HOST;
-        wlc->pub->bcmerror = 0;
 }
 
 static uint brcms_c_attach_module(struct brcms_c_info *wlc)
@@ -5072,8 +5108,8 @@ int brcms_c_up(struct brcms_c_info *wlc)
                                 struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
                                 mboolset(wlc->pub->radio_disabled,
                                          WL_RADIO_HW_DISABLE);
-
-                                if (bsscfg->enable && bsscfg->BSS)
+                                if (bsscfg->type == BRCMS_TYPE_STATION ||
+                                    bsscfg->type == BRCMS_TYPE_ADHOC)
                                         brcms_err(wlc->hw->d11core,
                                                   "wl%d: up: rfdisable -> "
                                                   "bsscfg_disable()\n",
@@ -5099,7 +5135,7 @@ int brcms_c_up(struct brcms_c_info *wlc)
         wlc->pub->up = true;
 
         if (wlc->bandinit_pending) {
-                ch = wlc->pub->ieee_hw->conf.channel;
+                ch = wlc->pub->ieee_hw->conf.chandef.chan;
                 brcms_c_suspend_mac_and_wait(wlc);
                 brcms_c_set_chanspec(wlc, ch20mhz_chspec(ch->hw_value));
                 wlc->bandinit_pending = false;
@@ -5434,7 +5470,7 @@ static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)
         u8 r;
         bool war = false;
 
-        if (wlc->bsscfg->associated)
+        if (wlc->pub->associated)
                 r = wlc->bsscfg->current_bss->rateset.rates[0];
         else
                 r = wlc->default_bss->rateset.rates[0];
@@ -5528,7 +5564,7 @@ int brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcm_rateset *rs)
         /* merge rateset coming in with the current mcsset */
         if (wlc->pub->_n_enab & SUPPORT_11N) {
                 struct brcms_bss_info *mcsset_bss;
-                if (wlc->bsscfg->associated)
+                if (wlc->pub->associated)
                         mcsset_bss = wlc->bsscfg->current_bss;
                 else
                         mcsset_bss = wlc->default_bss;
@@ -5543,12 +5579,36 @@ int brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcm_rateset *rs)
         return bcmerror;
 }
 
+static void brcms_c_time_lock(struct brcms_c_info *wlc)
+{
+        bcma_set32(wlc->hw->d11core, D11REGOFFS(maccontrol), MCTL_TBTTHOLD);
+        /* Commit the write */
+        bcma_read32(wlc->hw->d11core, D11REGOFFS(maccontrol));
+}
+
+static void brcms_c_time_unlock(struct brcms_c_info *wlc)
+{
+        bcma_mask32(wlc->hw->d11core, D11REGOFFS(maccontrol), ~MCTL_TBTTHOLD);
+        /* Commit the write */
+        bcma_read32(wlc->hw->d11core, D11REGOFFS(maccontrol));
+}
+
 int brcms_c_set_beacon_period(struct brcms_c_info *wlc, u16 period)
 {
+        u32 bcnint_us;
+
         if (period == 0)
                 return -EINVAL;
 
         wlc->default_bss->beacon_period = period;
+
+        bcnint_us = period << 10;
+        brcms_c_time_lock(wlc);
+        bcma_write32(wlc->hw->d11core, D11REGOFFS(tsf_cfprep),
+                     (bcnint_us << CFPREP_CBI_SHIFT));
+        bcma_write32(wlc->hw->d11core, D11REGOFFS(tsf_cfpstart), bcnint_us);
+        brcms_c_time_unlock(wlc);
+
         return 0;
 }
 
@@ -7291,72 +7351,110 @@ brcms_c_mod_prb_rsp_rate_table(struct brcms_c_info *wlc, uint frame_len)
         }
 }
 
-/*      Max buffering needed for beacon template/prb resp template is 142 bytes.
- *
- *      PLCP header is 6 bytes.
- *      802.11 A3 header is 24 bytes.
- *      Max beacon frame body template length is 112 bytes.
- *      Max probe resp frame body template length is 110 bytes.
- *
- *      *len on input contains the max length of the packet available.
- *
- *      The *len value is set to the number of bytes in buf used, and starts
- *      with the PLCP and included up to, but not including, the 4 byte FCS.
- */
-static void
-brcms_c_bcn_prb_template(struct brcms_c_info *wlc, u16 type,
-                         u32 bcn_rspec,
-                         struct brcms_bss_cfg *cfg, u16 *buf, int *len)
+int brcms_c_get_header_len(void)
 {
-        static const u8 ether_bcast[ETH_ALEN] = {255, 255, 255, 255, 255, 255};
-        struct cck_phy_hdr *plcp;
-        struct ieee80211_mgmt *h;
-        int hdr_len, body_len;
-
-        hdr_len = D11_PHY_HDR_LEN + DOT11_MAC_HDR_LEN;
+        return TXOFF;
+}
 
-        /* calc buffer size provided for frame body */
-        body_len = *len - hdr_len;
-        /* return actual size */
-        *len = hdr_len + body_len;
+static void brcms_c_beacon_write(struct brcms_c_info *wlc,
+                                 struct sk_buff *beacon, u16 tim_offset,
+                                 u16 dtim_period, bool bcn0, bool bcn1)
+{
+        size_t len;
+        struct ieee80211_tx_info *tx_info;
+        struct brcms_hardware *wlc_hw = wlc->hw;
+        struct ieee80211_hw *ieee_hw = brcms_c_pub(wlc)->ieee_hw;
 
-        /* format PHY and MAC headers */
-        memset(buf, 0, hdr_len);
+        /* Get tx_info */
+        tx_info = IEEE80211_SKB_CB(beacon);
 
-        plcp = (struct cck_phy_hdr *) buf;
+        len = min_t(size_t, beacon->len, BCN_TMPL_LEN);
+        wlc->bcn_rspec = ieee80211_get_tx_rate(ieee_hw, tx_info)->hw_value;
 
-        /*
-         * PLCP for Probe Response frames are filled in from
-         * core's rate table
-         */
-        if (type == IEEE80211_STYPE_BEACON)
-                /* fill in PLCP */
-                brcms_c_compute_plcp(wlc, bcn_rspec,
-                                 (DOT11_MAC_HDR_LEN + body_len + FCS_LEN),
-                                 (u8 *) plcp);
+        brcms_c_compute_plcp(wlc, wlc->bcn_rspec,
+                             len + FCS_LEN - D11_PHY_HDR_LEN, beacon->data);
 
         /* "Regular" and 16 MBSS but not for 4 MBSS */
         /* Update the phytxctl for the beacon based on the rspec */
-        brcms_c_beacon_phytxctl_txant_upd(wlc, bcn_rspec);
+        brcms_c_beacon_phytxctl_txant_upd(wlc, wlc->bcn_rspec);
 
-        h = (struct ieee80211_mgmt *)&plcp[1];
+        if (bcn0) {
+                /* write the probe response into the template region */
+                brcms_b_write_template_ram(wlc_hw, T_BCN0_TPL_BASE,
+                                            (len + 3) & ~3, beacon->data);
 
-        /* fill in 802.11 header */
-        h->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | type);
+                /* write beacon length to SCR */
+                brcms_b_write_shm(wlc_hw, M_BCN0_FRM_BYTESZ, (u16) len);
+        }
+        if (bcn1) {
+                /* write the probe response into the template region */
+                brcms_b_write_template_ram(wlc_hw, T_BCN1_TPL_BASE,
+                                            (len + 3) & ~3, beacon->data);
 
-        /* DUR is 0 for multicast bcn, or filled in by MAC for prb resp */
-        /* A1 filled in by MAC for prb resp, broadcast for bcn */
-        if (type == IEEE80211_STYPE_BEACON)
-                memcpy(&h->da, &ether_bcast, ETH_ALEN);
-        memcpy(&h->sa, &cfg->cur_etheraddr, ETH_ALEN);
-        memcpy(&h->bssid, &cfg->BSSID, ETH_ALEN);
+                /* write beacon length to SCR */
+                brcms_b_write_shm(wlc_hw, M_BCN1_FRM_BYTESZ, (u16) len);
+        }
 
-        /* SEQ filled in by MAC */
+        if (tim_offset != 0) {
+                brcms_b_write_shm(wlc_hw, M_TIMBPOS_INBEACON,
+                                  tim_offset + D11B_PHY_HDR_LEN);
+                brcms_b_write_shm(wlc_hw, M_DOT11_DTIMPERIOD, dtim_period);
+        } else {
+                brcms_b_write_shm(wlc_hw, M_TIMBPOS_INBEACON,
+                                  len + D11B_PHY_HDR_LEN);
+                brcms_b_write_shm(wlc_hw, M_DOT11_DTIMPERIOD, 0);
+        }
 }
 
-int brcms_c_get_header_len(void)
+static void brcms_c_update_beacon_hw(struct brcms_c_info *wlc,
+                                     struct sk_buff *beacon, u16 tim_offset,
+                                     u16 dtim_period)
 {
-        return TXOFF;
+        struct brcms_hardware *wlc_hw = wlc->hw;
+        struct bcma_device *core = wlc_hw->d11core;
+
+        /* Hardware beaconing for this config */
+        u32 both_valid = MCMD_BCN0VLD | MCMD_BCN1VLD;
+
+        /* Check if both templates are in use, if so sched. an interrupt
+         *      that will call back into this routine
+         */
+        if ((bcma_read32(core, D11REGOFFS(maccommand)) & both_valid) == both_valid)
+                /* clear any previous status */
+                bcma_write32(core, D11REGOFFS(macintstatus), MI_BCNTPL);
+
+        if (wlc->beacon_template_virgin) {
+                wlc->beacon_template_virgin = false;
+                brcms_c_beacon_write(wlc, beacon, tim_offset, dtim_period, true,
+                                     true);
+                /* mark beacon0 valid */
+                bcma_set32(core, D11REGOFFS(maccommand), MCMD_BCN0VLD);
+                return;
+        }
+
+        /* Check that after scheduling the interrupt both of the
+         *      templates are still busy. if not clear the int. & remask
+         */
+        if ((bcma_read32(core, D11REGOFFS(maccommand)) & both_valid) == both_valid) {
+                wlc->defmacintmask |= MI_BCNTPL;
+                return;
+        }
+
+        if (!(bcma_read32(core, D11REGOFFS(maccommand)) & MCMD_BCN0VLD)) {
+                brcms_c_beacon_write(wlc, beacon, tim_offset, dtim_period, true,
+                                     false);
+                /* mark beacon0 valid */
+                bcma_set32(core, D11REGOFFS(maccommand), MCMD_BCN0VLD);
+                return;
+        }
+        if (!(bcma_read32(core, D11REGOFFS(maccommand)) & MCMD_BCN1VLD)) {
+                brcms_c_beacon_write(wlc, beacon, tim_offset, dtim_period,
+                                     false, true);
+                /* mark beacon0 valid */
+                bcma_set32(core, D11REGOFFS(maccommand), MCMD_BCN1VLD);
+                return;
+        }
+        return;
 }
 
 /*
@@ -7366,9 +7464,57 @@ void brcms_c_update_beacon(struct brcms_c_info *wlc)
 {
         struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
 
-        if (bsscfg->up && !bsscfg->BSS)
+        if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
+                             bsscfg->type == BRCMS_TYPE_ADHOC)) {
                 /* Clear the soft intmask */
                 wlc->defmacintmask &= ~MI_BCNTPL;
+                if (!wlc->beacon)
+                        return;
+                brcms_c_update_beacon_hw(wlc, wlc->beacon,
+                                         wlc->beacon_tim_offset,
+                                         wlc->beacon_dtim_period);
+        }
+}
+
+void brcms_c_set_new_beacon(struct brcms_c_info *wlc, struct sk_buff *beacon,
+                            u16 tim_offset, u16 dtim_period)
+{
+        if (!beacon)
+                return;
+        if (wlc->beacon)
+                dev_kfree_skb_any(wlc->beacon);
+        wlc->beacon = beacon;
+
+        /* add PLCP */
+        skb_push(wlc->beacon, D11_PHY_HDR_LEN);
+        wlc->beacon_tim_offset = tim_offset;
+        wlc->beacon_dtim_period = dtim_period;
+        brcms_c_update_beacon(wlc);
+}
+
+void brcms_c_set_new_probe_resp(struct brcms_c_info *wlc,
+                                struct sk_buff *probe_resp)
+{
+        if (!probe_resp)
+                return;
+        if (wlc->probe_resp)
+                dev_kfree_skb_any(wlc->probe_resp);
+        wlc->probe_resp = probe_resp;
+
+        /* add PLCP */
+        skb_push(wlc->probe_resp, D11_PHY_HDR_LEN);
+        brcms_c_update_probe_resp(wlc, false);
+}
+
+void brcms_c_enable_probe_resp(struct brcms_c_info *wlc, bool enable)
+{
+        /*
+         * prevent ucode from sending probe responses by setting the timeout
+         * to 1, it can not send it in that time frame.
+         */
+        wlc->prb_resp_timeout = enable ? BRCMS_PRB_RESP_TIMEOUT : 1;
+        brcms_b_write_shm(wlc->hw, M_PRS_MAXTIME, wlc->prb_resp_timeout);
+        /* TODO: if (enable) => also deactivate receiving of probe request */
 }
 
 /* Write ssid into shared memory */
@@ -7390,30 +7536,19 @@ brcms_c_shm_ssid_upd(struct brcms_c_info *wlc, struct brcms_bss_cfg *cfg)
 static void
 brcms_c_bss_update_probe_resp(struct brcms_c_info *wlc,
                               struct brcms_bss_cfg *cfg,
+                              struct sk_buff *probe_resp,
                               bool suspend)
 {
-        u16 *prb_resp;
-        int len = BCN_TMPL_LEN;
-
-        prb_resp = kmalloc(BCN_TMPL_LEN, GFP_ATOMIC);
-        if (!prb_resp)
-                return;
-
-        /*
-         * write the probe response to hardware, or save in
-         * the config structure
-         */
+        int len;
 
-        /* create the probe response template */
-        brcms_c_bcn_prb_template(wlc, IEEE80211_STYPE_PROBE_RESP, 0,
-                                 cfg, prb_resp, &len);
+        len = min_t(size_t, probe_resp->len, BCN_TMPL_LEN);
 
         if (suspend)
                 brcms_c_suspend_mac_and_wait(wlc);
 
         /* write the probe response into the template region */
         brcms_b_write_template_ram(wlc->hw, T_PRS_TPL_BASE,
-                                    (len + 3) & ~3, prb_resp);
+                                    (len + 3) & ~3, probe_resp->data);
 
         /* write the length of the probe response frame (+PLCP/-FCS) */
         brcms_b_write_shm(wlc->hw, M_PRB_RESP_FRM_LEN, (u16) len);
@@ -7427,13 +7562,11 @@ brcms_c_bss_update_probe_resp(struct brcms_c_info *wlc,
          * PLCP header for the call to brcms_c_mod_prb_rsp_rate_table()
          * by subtracting the PLCP len and adding the FCS.
          */
-        len += (-D11_PHY_HDR_LEN + FCS_LEN);
-        brcms_c_mod_prb_rsp_rate_table(wlc, (u16) len);
+        brcms_c_mod_prb_rsp_rate_table(wlc,
+                                      (u16)len + FCS_LEN - D11_PHY_HDR_LEN);
 
         if (suspend)
                 brcms_c_enable_mac(wlc);
-
-        kfree(prb_resp);
 }
 
 void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend)
@@ -7441,8 +7574,13 @@ void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend)
         struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
 
         /* update AP or IBSS probe responses */
-        if (bsscfg->up && !bsscfg->BSS)
-                brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend);
+        if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
+                             bsscfg->type == BRCMS_TYPE_ADHOC)) {
+                if (!wlc->probe_resp)
+                        return;
+                brcms_c_bss_update_probe_resp(wlc, bsscfg, wlc->probe_resp,
+                                              suspend);
+        }
 }
 
 int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
@@ -7481,7 +7619,6 @@ void brcms_c_scan_stop(struct brcms_c_info *wlc)
 void brcms_c_associate_upd(struct brcms_c_info *wlc, bool state)
 {
         wlc->pub->associated = state;
-        wlc->bsscfg->associated = state;
 }
 
 /*
@@ -7526,6 +7663,36 @@ void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc, u8 interval)
                 brcms_c_bcn_li_upd(wlc);
 }
 
+u64 brcms_c_tsf_get(struct brcms_c_info *wlc)
+{
+        u32 tsf_h, tsf_l;
+        u64 tsf;
+
+        brcms_b_read_tsf(wlc->hw, &tsf_l, &tsf_h);
+
+        tsf = tsf_h;
+        tsf <<= 32;
+        tsf |= tsf_l;
+
+        return tsf;
+}
+
+void brcms_c_tsf_set(struct brcms_c_info *wlc, u64 tsf)
+{
+        u32 tsf_h, tsf_l;
+
+        brcms_c_time_lock(wlc);
+
+        tsf_l = tsf;
+        tsf_h = (tsf >> 32);
+
+        /* read the tsf timer low, then high to get an atomic read */
+        bcma_write32(wlc->hw->d11core, D11REGOFFS(tsf_timerlow), tsf_l);
+        bcma_write32(wlc->hw->d11core, D11REGOFFS(tsf_timerhigh), tsf_h);
+
+        brcms_c_time_unlock(wlc);
+}
+
 int brcms_c_set_tx_power(struct brcms_c_info *wlc, int txpwr)
 {
         uint qdbm;
@@ -7737,6 +7904,10 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
                 brcms_rfkill_set_hw_state(wlc->wl);
         }
 
+        /* BCN template is available */
+        if (macintstatus & MI_BCNTPL)
+                brcms_c_update_beacon(wlc);
+
         /* it isn't done and needs to be resched if macintstatus is non-zero */
         return wlc->macintstatus != 0;
 
@@ -7748,7 +7919,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
 {
         struct bcma_device *core = wlc->hw->d11core;
-        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.chandef.chan;
         u16 chanspec;
 
         brcms_dbg_info(core, "wl%d\n", wlc->pub->unit);
@@ -7765,7 +7936,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
         brcms_c_set_bssid(wlc->bsscfg);
 
         /* Update tsf_cfprep if associated and up */
-        if (wlc->pub->associated && wlc->bsscfg->up) {
+        if (wlc->pub->associated && wlc->pub->up) {
                 u32 bi;
 
                 /* get beacon period and convert to uS */
@@ -7810,9 +7981,14 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
 
         /* read the ucode version if we have not yet done so */
         if (wlc->ucode_rev == 0) {
-                wlc->ucode_rev =
-                    brcms_b_read_shm(wlc->hw, M_BOM_REV_MAJOR) << NBITS(u16);
-                wlc->ucode_rev |= brcms_b_read_shm(wlc->hw, M_BOM_REV_MINOR);
+                u16 rev;
+                u16 patch;
+
+                rev = brcms_b_read_shm(wlc->hw, M_BOM_REV_MAJOR);
+                patch = brcms_b_read_shm(wlc->hw, M_BOM_REV_MINOR);
+                wlc->ucode_rev = (rev << NBITS(u16)) | patch;
+                snprintf(wlc->wiphy->fw_version,
+                         sizeof(wlc->wiphy->fw_version), "%u.%u", rev, patch);
         }
 
         /* ..now really unleash hell (allow the MAC out of suspend) */
@@ -7868,6 +8044,7 @@ brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
         pub->unit = unit;
         pub->_piomode = piomode;
         wlc->bandinit_pending = false;
+        wlc->beacon_template_virgin = true;
 
         /* populate struct brcms_c_info with default values  */
         brcms_c_info_init(wlc, unit);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h
index fb447747c2c6..b5d7a38b53fe 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
@@ -492,6 +492,8 @@ struct brcms_c_info {
         bool radio_monitor;
         bool going_down;
 
+        bool beacon_template_virgin;
+
         struct brcms_timer *wdtimer;
         struct brcms_timer *radio_timer;
 
@@ -561,6 +563,11 @@ struct brcms_c_info {
 
         struct wiphy *wiphy;
         struct scb pri_scb;
+
+        struct sk_buff *beacon;
+        u16 beacon_tim_offset;
+        u16 beacon_dtim_period;
+        struct sk_buff *probe_resp;
 };
 
 /* antsel module specific state */
@@ -576,14 +583,17 @@ struct antsel_info {
         struct brcms_antselcfg antcfg_cur; /* current antenna config (auto) */
 };
 
+enum brcms_bss_type {
+        BRCMS_TYPE_STATION,
+        BRCMS_TYPE_AP,
+        BRCMS_TYPE_ADHOC,
+};
+
 /*
  * BSS configuration state
  *
  * wlc: wlc to which this bsscfg belongs to.
- * up: is this configuration up operational
- * enable: is this configuration enabled
- * associated: is BSS in ASSOCIATED state
- * BSS: infraustructure or adhoc
+ * type: interface type
  * SSID_len: the length of SSID
  * SSID: SSID string
  *
@@ -599,14 +609,10 @@ struct antsel_info {
  */
 struct brcms_bss_cfg {
         struct brcms_c_info *wlc;
-        bool up;
-        bool enable;
-        bool associated;
-        bool BSS;
+        enum brcms_bss_type type;
         u8 SSID_len;
         u8 SSID[IEEE80211_MAX_SSID_LEN];
         u8 BSSID[ETH_ALEN];
-        u8 cur_etheraddr[ETH_ALEN];
         struct brcms_bss_info *current_bss;
 };
 
@@ -631,7 +637,6 @@ extern u16 brcms_c_compute_rtscts_dur(struct brcms_c_info *wlc, bool cts_only,
 extern void brcms_c_inval_dma_pkts(struct brcms_hardware *hw,
                                struct ieee80211_sta *sta,
                                void (*dma_callback_fn));
-extern void brcms_c_update_beacon(struct brcms_c_info *wlc);
 extern void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend);
 extern int brcms_c_set_nmode(struct brcms_c_info *wlc);
 extern void brcms_c_beacon_phytxctl_txant_upd(struct brcms_c_info *wlc,
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
index 91937c5025ce..b0fd807f2b2b 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -198,8 +198,6 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr)
 
 void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val)
 {
-        struct si_info *sii = container_of(pi->sh->sih, struct si_info, pub);
-
         if ((D11REV_GE(pi->sh->corerev, 24)) ||
             (D11REV_IS(pi->sh->corerev, 22)
              && (pi->pubpi.phy_type != PHY_TYPE_SSN))) {
@@ -211,7 +209,7 @@ void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val)
                 bcma_write16(pi->d11core, D11REGOFFS(phy4wdatalo), val);
         }
 
-        if ((sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) &&
+        if ((pi->d11core->bus->hosttype == BCMA_HOSTTYPE_PCI) &&
             (++pi->phy_wreg >= pi->phy_wreg_limit)) {
                 (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
                 pi->phy_wreg = 0;
@@ -297,10 +295,8 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)
         if (addr == 0x72)
                 (void)bcma_read16(pi->d11core, D11REGOFFS(phyregdata));
 #else
-        struct si_info *sii = container_of(pi->sh->sih, struct si_info, pub);
-
         bcma_write32(pi->d11core, D11REGOFFS(phyregaddr), addr | (val << 16));
-        if ((sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) &&
+        if ((pi->d11core->bus->hosttype == BCMA_HOSTTYPE_PCI) &&
             (++pi->phy_wreg >= pi->phy_wreg_limit)) {
                 pi->phy_wreg = 0;
                 (void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));
@@ -374,7 +370,6 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)
         if (sh == NULL)
                 return NULL;
 
-        sh->sih = shp->sih;
         sh->physhim = shp->physhim;
         sh->unit = shp->unit;
         sh->corerev = shp->corerev;
@@ -2911,29 +2906,24 @@ void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode)
                                 mod_phy_reg(pi, 0x44c, (0x1 << 2), (1) << 2);
 
                         }
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, gpiocontrol),
-                                  ~0x0, 0x0);
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, gpioout),
-                                  0x40, 0x40);
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, gpioouten),
-                                  0x40, 0x40);
+
+                        bcma_chipco_gpio_control(&pi->d11core->bus->drv_cc,
+                                                 0x0, 0x0);
+                        bcma_chipco_gpio_out(&pi->d11core->bus->drv_cc,
+                                             ~0x40, 0x40);
+                        bcma_chipco_gpio_outen(&pi->d11core->bus->drv_cc,
+                                               ~0x40, 0x40);
                 } else {
                         mod_phy_reg(pi, 0x44c, (0x1 << 2), (0) << 2);
 
                         mod_phy_reg(pi, 0x44d, (0x1 << 2), (0) << 2);
 
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, gpioout),
-                                  0x40, 0x00);
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, gpioouten),
-                                  0x40, 0x0);
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, gpiocontrol),
-                                  ~0x0, 0x40);
+                        bcma_chipco_gpio_out(&pi->d11core->bus->drv_cc,
+                                             ~0x40, 0x00);
+                        bcma_chipco_gpio_outen(&pi->d11core->bus->drv_cc,
+                                               ~0x40, 0x00);
+                        bcma_chipco_gpio_control(&pi->d11core->bus->drv_cc,
+                                                 0x0, 0x40);
                 }
         }
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
index af00e2c2b266..1dc767c31653 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
@@ -488,7 +488,6 @@ struct lcnphy_cal_results {
 struct shared_phy {
         struct brcms_phy *phy_head;
         uint unit;
-        struct si_pub *sih;
         struct phy_shim_info *physhim;
         uint corerev;
         u32 machwcap;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
index 18d37645e2cd..3d6b16ce4687 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -1595,11 +1595,15 @@ wlc_lcnphy_set_chanspec_tweaks(struct brcms_phy *pi, u16 chanspec)
         if (channel == 1 || channel == 2 || channel == 3 ||
             channel == 4 || channel == 9 ||
             channel == 10 || channel == 11 || channel == 12) {
-                si_pmu_pllcontrol(pi->sh->sih, 0x2, 0xffffffff, 0x03000c04);
-                si_pmu_pllcontrol(pi->sh->sih, 0x3, 0xffffff, 0x0);
-                si_pmu_pllcontrol(pi->sh->sih, 0x4, 0xffffffff, 0x200005c0);
-
-                si_pmu_pllupd(pi->sh->sih);
+                bcma_chipco_pll_write(&pi->d11core->bus->drv_cc, 0x2,
+                                      0x03000c04);
+                bcma_chipco_pll_maskset(&pi->d11core->bus->drv_cc, 0x3,
+                                        ~0x00ffffff, 0x0);
+                bcma_chipco_pll_write(&pi->d11core->bus->drv_cc, 0x4,
+                                      0x200005c0);
+
+                bcma_cc_set32(&pi->d11core->bus->drv_cc, BCMA_CC_PMU_CTL,
+                              BCMA_CC_PMU_CTL_PLL_UPD);
                 write_phy_reg(pi, 0x942, 0);
                 wlc_lcnphy_txrx_spur_avoidance_mode(pi, false);
                 pi_lcn->lcnphy_spurmod = false;
@@ -1607,11 +1611,15 @@ wlc_lcnphy_set_chanspec_tweaks(struct brcms_phy *pi, u16 chanspec)
 
                 write_phy_reg(pi, 0x425, 0x5907);
         } else {
-                si_pmu_pllcontrol(pi->sh->sih, 0x2, 0xffffffff, 0x03140c04);
-                si_pmu_pllcontrol(pi->sh->sih, 0x3, 0xffffff, 0x333333);
-                si_pmu_pllcontrol(pi->sh->sih, 0x4, 0xffffffff, 0x202c2820);
-
-                si_pmu_pllupd(pi->sh->sih);
+                bcma_chipco_pll_write(&pi->d11core->bus->drv_cc, 0x2,
+                                      0x03140c04);
+                bcma_chipco_pll_maskset(&pi->d11core->bus->drv_cc, 0x3,
+                                        ~0x00ffffff, 0x333333);
+                bcma_chipco_pll_write(&pi->d11core->bus->drv_cc, 0x4,
+                                      0x202c2820);
+
+                bcma_cc_set32(&pi->d11core->bus->drv_cc, BCMA_CC_PMU_CTL,
+                              BCMA_CC_PMU_CTL_PLL_UPD);
                 write_phy_reg(pi, 0x942, 0);
                 wlc_lcnphy_txrx_spur_avoidance_mode(pi, true);
 
@@ -4755,9 +4763,10 @@ void wlc_phy_init_lcnphy(struct brcms_phy *pi)
 
         wlc_phy_chanspec_set((struct brcms_phy_pub *) pi, pi->radio_chanspec);
 
-        si_pmu_regcontrol(pi->sh->sih, 0, 0xf, 0x9);
+        bcma_chipco_regctl_maskset(&pi->d11core->bus->drv_cc, 0, ~0xf, 0x9);
 
-        si_pmu_chipcontrol(pi->sh->sih, 0, 0xffffffff, 0x03CDDDDD);
+        bcma_chipco_chipctl_maskset(&pi->d11core->bus->drv_cc, 0, 0x0,
+                                    0x03CDDDDD);
 
         if ((pi->sh->boardflags & BFL_FEM)
             && wlc_lcnphy_tempsense_based_pwr_ctrl_enabled(pi))
@@ -4968,7 +4977,7 @@ bool wlc_phy_attach_lcnphy(struct brcms_phy *pi)
                 pi->hwpwrctrl_capable = true;
         }
 
-        pi->xtalfreq = si_pmu_alp_clock(pi->sh->sih);
+        pi->xtalfreq = bcma_chipco_get_alp_clock(&pi->d11core->bus->drv_cc);
         pi_lcn->lcnphy_papd_rxGnCtrl_init = 0;
 
         pi->pi_fptr.init = wlc_phy_init_lcnphy;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 65db9b7458dc..3e9f5b25be63 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -19321,14 +19321,13 @@ void wlc_phy_init_nphy(struct brcms_phy *pi)
              (pi->sh->chippkg == BCMA_PKG_ID_BCM4718))) {
                 if ((pi->sh->boardflags & BFL_EXTLNA) &&
                     (CHSPEC_IS2G(pi->radio_chanspec)))
-                        ai_cc_reg(pi->sh->sih,
-                                  offsetof(struct chipcregs, chipcontrol),
-                                  0x40, 0x40);
+                        bcma_cc_set32(&pi->d11core->bus->drv_cc,
+                                      BCMA_CC_CHIPCTL, 0x40);
         }
 
         if ((!PHY_IPA(pi)) && (pi->sh->chip == BCMA_CHIP_ID_BCM5357))
-                si_pmu_chipcontrol(pi->sh->sih, 1, CCTRL5357_EXTPA,
-                                   CCTRL5357_EXTPA);
+                bcma_chipco_chipctl_maskset(&pi->d11core->bus->drv_cc, 1,
+                                            ~CCTRL5357_EXTPA, CCTRL5357_EXTPA);
 
         if ((pi->nphy_gband_spurwar2_en) && CHSPEC_IS2G(pi->radio_chanspec) &&
             CHSPEC_IS40(pi->radio_chanspec)) {
@@ -21133,7 +21132,6 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,
                             const struct nphy_sfo_cfg *ci)
 {
         u16 val;
-        struct si_info *sii = container_of(pi->sh->sih, struct si_info, pub);
 
         val = read_phy_reg(pi, 0x09) & NPHY_BandControl_currentBand;
         if (CHSPEC_IS5G(chanspec) && !val) {
@@ -21221,11 +21219,11 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,
 
                 if ((pi->sh->chip == BCMA_CHIP_ID_BCM4716) ||
                     (pi->sh->chip == BCMA_CHIP_ID_BCM43225)) {
-                        bcma_pmu_spuravoid_pllupdate(&sii->icbus->drv_cc,
+                        bcma_pmu_spuravoid_pllupdate(&pi->d11core->bus->drv_cc,
                                                      spuravoid);
                 } else {
                         wlapi_bmac_core_phypll_ctl(pi->sh->physhim, false);
-                        bcma_pmu_spuravoid_pllupdate(&sii->icbus->drv_cc,
+                        bcma_pmu_spuravoid_pllupdate(&pi->d11core->bus->drv_cc,
                                                      spuravoid);
                         wlapi_bmac_core_phypll_ctl(pi->sh->physhim, true);
                 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c
index 7e9df566c733..71b80381f3ad 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c
@@ -115,60 +115,6 @@ u16 si_pmu_fast_pwrup_delay(struct si_pub *sih)
         return (u16) delay;
 }
 
-/* Read/write a chipcontrol reg */
-u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)
-{
-        ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol_addr), ~0, reg);
-        return ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol_data),
-                         mask, val);
-}
-
-/* Read/write a regcontrol reg */
-u32 si_pmu_regcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)
-{
-        ai_cc_reg(sih, offsetof(struct chipcregs, regcontrol_addr), ~0, reg);
-        return ai_cc_reg(sih, offsetof(struct chipcregs, regcontrol_data),
-                         mask, val);
-}
-
-/* Read/write a pllcontrol reg */
-u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)
-{
-        ai_cc_reg(sih, offsetof(struct chipcregs, pllcontrol_addr), ~0, reg);
-        return ai_cc_reg(sih, offsetof(struct chipcregs, pllcontrol_data),
-                         mask, val);
-}
-
-/* PMU PLL update */
-void si_pmu_pllupd(struct si_pub *sih)
-{
-        ai_cc_reg(sih, offsetof(struct chipcregs, pmucontrol),
-                  PCTL_PLL_PLLCTL_UPD, PCTL_PLL_PLLCTL_UPD);
-}
-
-/* query alp/xtal clock frequency */
-u32 si_pmu_alp_clock(struct si_pub *sih)
-{
-        u32 clock = ALP_CLOCK;
-
-        /* bail out with default */
-        if (!(ai_get_cccaps(sih) & CC_CAP_PMU))
-                return clock;
-
-        switch (ai_get_chip_id(sih)) {
-        case BCMA_CHIP_ID_BCM43224:
-        case BCMA_CHIP_ID_BCM43225:
-        case BCMA_CHIP_ID_BCM4313:
-                /* always 20Mhz */
-                clock = 20000 * 1000;
-                break;
-        default:
-                break;
-        }
-
-        return clock;
-}
-
 u32 si_pmu_measure_alpclk(struct si_pub *sih)
 {
         struct si_info *sii = container_of(sih, struct si_info, pub);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.h b/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
index f7cff873578b..20e2012d5a3a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
@@ -21,12 +21,6 @@
 #include "types.h"
 
 extern u16 si_pmu_fast_pwrup_delay(struct si_pub *sih);
-extern void si_pmu_sprom_enable(struct si_pub *sih, bool enable);
-extern u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);
-extern u32 si_pmu_regcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);
-extern u32 si_pmu_alp_clock(struct si_pub *sih);
-extern void si_pmu_pllupd(struct si_pub *sih);
-extern u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);
 extern u32 si_pmu_measure_alpclk(struct si_pub *sih);
 
 #endif /* _BRCM_PMU_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pub.h b/drivers/net/wireless/brcm80211/brcmsmac/pub.h
index b0f14b7b8616..d36ea5e1cc49 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/pub.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pub.h
@@ -164,8 +164,6 @@ struct brcms_pub {
 
         u8 cur_etheraddr[ETH_ALEN];     /* our local ethernet address */
 
-        int bcmerror;           /* last bcm error */
-
         u32 radio_disabled;     /* bit vector for radio disabled reasons */
 
         u16 boardrev;   /* version # of particular board */
@@ -326,10 +324,25 @@ extern void brcms_c_set_shortslot_override(struct brcms_c_info *wlc,
                                     s8 sslot_override);
 extern void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc,
                                         u8 interval);
+extern u64 brcms_c_tsf_get(struct brcms_c_info *wlc);
+extern void brcms_c_tsf_set(struct brcms_c_info *wlc, u64 tsf);
 extern int brcms_c_set_tx_power(struct brcms_c_info *wlc, int txpwr);
 extern int brcms_c_get_tx_power(struct brcms_c_info *wlc);
 extern bool brcms_c_check_radio_disabled(struct brcms_c_info *wlc);
 extern void brcms_c_mute(struct brcms_c_info *wlc, bool on);
 extern bool brcms_c_tx_flush_completed(struct brcms_c_info *wlc);
+extern void brcms_c_start_station(struct brcms_c_info *wlc, u8 *addr);
+extern void brcms_c_start_ap(struct brcms_c_info *wlc, u8 *addr,
+                             const u8 *bssid, u8 *ssid, size_t ssid_len);
+extern void brcms_c_start_adhoc(struct brcms_c_info *wlc, u8 *addr);
+extern void brcms_c_update_beacon(struct brcms_c_info *wlc);
+extern void brcms_c_set_new_beacon(struct brcms_c_info *wlc,
+                                   struct sk_buff *beacon, u16 tim_offset,
+                                   u16 dtim_period);
+extern void brcms_c_set_new_probe_resp(struct brcms_c_info *wlc,
+                                       struct sk_buff *probe_resp);
+extern void brcms_c_enable_probe_resp(struct brcms_c_info *wlc, bool enable);
+extern void brcms_c_set_ssid(struct brcms_c_info *wlc, u8 *ssid,
+                             size_t ssid_len);
 
 #endif                          /* _BRCM_PUB_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmutil/Makefile b/drivers/net/wireless/brcm80211/brcmutil/Makefile
index 6281c416289e..8a928184016a 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile
@@ -19,10 +19,5 @@ ccflags-y :=				\
         -Idrivers/net/wireless/brcm80211/brcmutil \
         -Idrivers/net/wireless/brcm80211/include
 
-BRCMUTIL_OFILES := \
-        utils.o
-
-MODULEPFX := brcmutil
-
-obj-$(CONFIG_BRCMUTIL)  += $(MODULEPFX).o
-$(MODULEPFX)-objs       = $(BRCMUTIL_OFILES)
+obj-$(CONFIG_BRCMUTIL)  += brcmutil.o
+brcmutil-objs   = utils.o d11.o
diff --git a/drivers/net/wireless/brcm80211/brcmutil/d11.c b/drivers/net/wireless/brcm80211/brcmutil/d11.c
new file mode 100644
index 000000000000..30e54e2c6c9b
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmutil/d11.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/*********************channel spec common functions*********************/
+
+#include <linux/module.h>
+
+#include <brcmu_utils.h>
+#include <brcmu_wifi.h>
+#include <brcmu_d11.h>
+
+static void brcmu_d11n_encchspec(struct brcmu_chan *ch)
+{
+        ch->chspec = ch->chnum & BRCMU_CHSPEC_CH_MASK;
+
+        switch (ch->bw) {
+        case BRCMU_CHAN_BW_20:
+                ch->chspec |= BRCMU_CHSPEC_D11N_BW_20 | BRCMU_CHSPEC_D11N_SB_N;
+                break;
+        case BRCMU_CHAN_BW_40:
+        default:
+                WARN_ON_ONCE(1);
+                break;
+        }
+
+        if (ch->chnum <= CH_MAX_2G_CHANNEL)
+                ch->chspec |= BRCMU_CHSPEC_D11N_BND_2G;
+        else
+                ch->chspec |= BRCMU_CHSPEC_D11N_BND_5G;
+}
+
+static void brcmu_d11ac_encchspec(struct brcmu_chan *ch)
+{
+        ch->chspec = ch->chnum & BRCMU_CHSPEC_CH_MASK;
+
+        switch (ch->bw) {
+        case BRCMU_CHAN_BW_20:
+                ch->chspec |= BRCMU_CHSPEC_D11AC_BW_20;
+                break;
+        case BRCMU_CHAN_BW_40:
+        case BRCMU_CHAN_BW_80:
+        case BRCMU_CHAN_BW_80P80:
+        case BRCMU_CHAN_BW_160:
+        default:
+                WARN_ON_ONCE(1);
+                break;
+        }
+
+        if (ch->chnum <= CH_MAX_2G_CHANNEL)
+                ch->chspec |= BRCMU_CHSPEC_D11AC_BND_2G;
+        else
+                ch->chspec |= BRCMU_CHSPEC_D11AC_BND_5G;
+}
+
+static void brcmu_d11n_decchspec(struct brcmu_chan *ch)
+{
+        u16 val;
+
+        ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
+
+        switch (ch->chspec & BRCMU_CHSPEC_D11N_BW_MASK) {
+        case BRCMU_CHSPEC_D11N_BW_20:
+                ch->bw = BRCMU_CHAN_BW_20;
+                break;
+        case BRCMU_CHSPEC_D11N_BW_40:
+                ch->bw = BRCMU_CHAN_BW_40;
+                val = ch->chspec & BRCMU_CHSPEC_D11N_SB_MASK;
+                if (val == BRCMU_CHSPEC_D11N_SB_L) {
+                        ch->sb = BRCMU_CHAN_SB_L;
+                        ch->chnum -= CH_10MHZ_APART;
+                } else {
+                        ch->sb = BRCMU_CHAN_SB_U;
+                        ch->chnum += CH_10MHZ_APART;
+                }
+                break;
+        default:
+                WARN_ON_ONCE(1);
+                break;
+        }
+
+        switch (ch->chspec & BRCMU_CHSPEC_D11N_BND_MASK) {
+        case BRCMU_CHSPEC_D11N_BND_5G:
+                ch->band = BRCMU_CHAN_BAND_5G;
+                break;
+        case BRCMU_CHSPEC_D11N_BND_2G:
+                ch->band = BRCMU_CHAN_BAND_2G;
+                break;
+        default:
+                WARN_ON_ONCE(1);
+                break;
+        }
+}
+
+static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
+{
+        u16 val;
+
+        ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
+
+        switch (ch->chspec & BRCMU_CHSPEC_D11AC_BW_MASK) {
+        case BRCMU_CHSPEC_D11AC_BW_20:
+                ch->bw = BRCMU_CHAN_BW_20;
+                break;
+        case BRCMU_CHSPEC_D11AC_BW_40:
+                ch->bw = BRCMU_CHAN_BW_40;
+                val = ch->chspec & BRCMU_CHSPEC_D11AC_SB_MASK;
+                if (val == BRCMU_CHSPEC_D11AC_SB_L) {
+                        ch->sb = BRCMU_CHAN_SB_L;
+                        ch->chnum -= CH_10MHZ_APART;
+                } else if (val == BRCMU_CHSPEC_D11AC_SB_U) {
+                        ch->sb = BRCMU_CHAN_SB_U;
+                        ch->chnum += CH_10MHZ_APART;
+                } else {
+                        WARN_ON_ONCE(1);
+                }
+                break;
+        case BRCMU_CHSPEC_D11AC_BW_80:
+                ch->bw = BRCMU_CHAN_BW_80;
+                break;
+        case BRCMU_CHSPEC_D11AC_BW_8080:
+        case BRCMU_CHSPEC_D11AC_BW_160:
+        default:
+                WARN_ON_ONCE(1);
+                break;
+        }
+
+        switch (ch->chspec & BRCMU_CHSPEC_D11AC_BND_MASK) {
+        case BRCMU_CHSPEC_D11AC_BND_5G:
+                ch->band = BRCMU_CHAN_BAND_5G;
+                break;
+        case BRCMU_CHSPEC_D11AC_BND_2G:
+                ch->band = BRCMU_CHAN_BAND_2G;
+                break;
+        default:
+                WARN_ON_ONCE(1);
+                break;
+        }
+}
+
+void brcmu_d11_attach(struct brcmu_d11inf *d11inf)
+{
+        if (d11inf->io_type == BRCMU_D11N_IOTYPE) {
+                d11inf->encchspec = brcmu_d11n_encchspec;
+                d11inf->decchspec = brcmu_d11n_decchspec;
+        } else {
+                d11inf->encchspec = brcmu_d11ac_encchspec;
+                d11inf->decchspec = brcmu_d11ac_decchspec;
+        }
+}
+EXPORT_SYMBOL(brcmu_d11_attach);
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index 3e6405e06ac0..0f7e1c7b6f58 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -45,17 +45,9 @@ void brcmu_pkt_buf_free_skb(struct sk_buff *skb)
 {
         if (!skb)
                 return;
+
         WARN_ON(skb->next);
-        if (skb->destructor)
-                /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if
-                 * destructor exists
-                 */
-                dev_kfree_skb_any(skb);
-        else
-                /* can free immediately (even in_irq()) if destructor
-                 * does not exist
-                 */
-                dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
 }
 EXPORT_SYMBOL(brcmu_pkt_buf_free_skb);
 
@@ -116,6 +108,31 @@ struct sk_buff *brcmu_pktq_pdeq(struct pktq *pq, int prec)
 }
 EXPORT_SYMBOL(brcmu_pktq_pdeq);
 
+/*
+ * precedence based dequeue with match function. Passing a NULL pointer
+ * for the match function parameter is considered to be a wildcard so
+ * any packet on the queue is returned. In that case it is no different
+ * from brcmu_pktq_pdeq() above.
+ */
+struct sk_buff *brcmu_pktq_pdeq_match(struct pktq *pq, int prec,
+                                      bool (*match_fn)(struct sk_buff *skb,
+                                                       void *arg), void *arg)
+{
+        struct sk_buff_head *q;
+        struct sk_buff *p, *next;
+
+        q = &pq->q[prec].skblist;
+        skb_queue_walk_safe(q, p, next) {
+                if (match_fn == NULL || match_fn(p, arg)) {
+                        skb_unlink(p, q);
+                        pq->len--;
+                        return p;
+                }
+        }
+        return NULL;
+}
+EXPORT_SYMBOL(brcmu_pktq_pdeq_match);
+
 struct sk_buff *brcmu_pktq_pdeq_tail(struct pktq *pq, int prec)
 {
         struct sk_buff_head *q;
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index e8682855b73a..c1fe245bb07e 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -29,6 +29,7 @@
 
 /* Chipcommon Core Chip IDs */
 #define BCM4313_CHIP_ID         0x4313
+#define BCM43143_CHIP_ID        43143
 #define BCM43224_CHIP_ID        43224
 #define BCM43225_CHIP_ID        43225
 #define BCM43235_CHIP_ID        43235
@@ -39,5 +40,6 @@
 #define BCM4330_CHIP_ID         0x4330
 #define BCM4331_CHIP_ID         0x4331
 #define BCM4334_CHIP_ID         0x4334
+#define BCM4335_CHIP_ID         0x4335
 
 #endif                          /* _BRCM_HW_IDS_H_ */
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_d11.h b/drivers/net/wireless/brcm80211/include/brcmu_d11.h
new file mode 100644
index 000000000000..92623f02b1c0
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/include/brcmu_d11.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _BRCMU_D11_H_
+#define _BRCMU_D11_H_
+
+/* d11 io type */
+#define BRCMU_D11N_IOTYPE               1
+#define BRCMU_D11AC_IOTYPE              2
+
+/* A chanspec (channel specification) holds the channel number, band,
+ * bandwidth and control sideband
+ */
+
+/* chanspec binary format */
+
+#define BRCMU_CHSPEC_INVALID            255
+/* bit 0~7 channel number
+ * for 80+80 channels: bit 0~3 low channel id, bit 4~7 high channel id
+ */
+#define BRCMU_CHSPEC_CH_MASK            0x00ff
+#define BRCMU_CHSPEC_CH_SHIFT           0
+#define BRCMU_CHSPEC_CHL_MASK           0x000f
+#define BRCMU_CHSPEC_CHL_SHIFT          0
+#define BRCMU_CHSPEC_CHH_MASK           0x00f0
+#define BRCMU_CHSPEC_CHH_SHIFT          4
+
+/* bit 8~16 for dot 11n IO types
+ * bit 8~9 sideband
+ * bit 10~11 bandwidth
+ * bit 12~13 spectral band
+ * bit 14~15 not used
+ */
+#define BRCMU_CHSPEC_D11N_SB_MASK       0x0300
+#define BRCMU_CHSPEC_D11N_SB_SHIFT      8
+#define  BRCMU_CHSPEC_D11N_SB_L         0x0100  /* control lower */
+#define  BRCMU_CHSPEC_D11N_SB_U         0x0200  /* control upper */
+#define  BRCMU_CHSPEC_D11N_SB_N         0x0300  /* none */
+#define BRCMU_CHSPEC_D11N_BW_MASK       0x0c00
+#define BRCMU_CHSPEC_D11N_BW_SHIFT      10
+#define  BRCMU_CHSPEC_D11N_BW_10        0x0400
+#define  BRCMU_CHSPEC_D11N_BW_20        0x0800
+#define  BRCMU_CHSPEC_D11N_BW_40        0x0c00
+#define BRCMU_CHSPEC_D11N_BND_MASK      0x3000
+#define BRCMU_CHSPEC_D11N_BND_SHIFT     12
+#define  BRCMU_CHSPEC_D11N_BND_5G       0x1000
+#define  BRCMU_CHSPEC_D11N_BND_2G       0x2000
+
+/* bit 8~16 for dot 11ac IO types
+ * bit 8~10 sideband
+ * bit 11~13 bandwidth
+ * bit 14~15 spectral band
+ */
+#define BRCMU_CHSPEC_D11AC_SB_MASK      0x0700
+#define BRCMU_CHSPEC_D11AC_SB_SHIFT     8
+#define  BRCMU_CHSPEC_D11AC_SB_LLL      0x0000
+#define  BRCMU_CHSPEC_D11AC_SB_LLU      0x0100
+#define  BRCMU_CHSPEC_D11AC_SB_LUL      0x0200
+#define  BRCMU_CHSPEC_D11AC_SB_LUU      0x0300
+#define  BRCMU_CHSPEC_D11AC_SB_ULL      0x0400
+#define  BRCMU_CHSPEC_D11AC_SB_ULU      0x0500
+#define  BRCMU_CHSPEC_D11AC_SB_UUL      0x0600
+#define  BRCMU_CHSPEC_D11AC_SB_UUU      0x0700
+#define  BRCMU_CHSPEC_D11AC_SB_LL       BRCMU_CHSPEC_D11AC_SB_LLL
+#define  BRCMU_CHSPEC_D11AC_SB_LU       BRCMU_CHSPEC_D11AC_SB_LLU
+#define  BRCMU_CHSPEC_D11AC_SB_UL       BRCMU_CHSPEC_D11AC_SB_LUL
+#define  BRCMU_CHSPEC_D11AC_SB_UU       BRCMU_CHSPEC_D11AC_SB_LUU
+#define  BRCMU_CHSPEC_D11AC_SB_L        BRCMU_CHSPEC_D11AC_SB_LLL
+#define  BRCMU_CHSPEC_D11AC_SB_U        BRCMU_CHSPEC_D11AC_SB_LLU
+#define BRCMU_CHSPEC_D11AC_BW_MASK      0x3800
+#define BRCMU_CHSPEC_D11AC_BW_SHIFT     11
+#define  BRCMU_CHSPEC_D11AC_BW_5        0x0000
+#define  BRCMU_CHSPEC_D11AC_BW_10       0x0800
+#define  BRCMU_CHSPEC_D11AC_BW_20       0x1000
+#define  BRCMU_CHSPEC_D11AC_BW_40       0x1800
+#define  BRCMU_CHSPEC_D11AC_BW_80       0x2000
+#define  BRCMU_CHSPEC_D11AC_BW_160      0x2800
+#define  BRCMU_CHSPEC_D11AC_BW_8080     0x3000
+#define BRCMU_CHSPEC_D11AC_BND_MASK     0xc000
+#define BRCMU_CHSPEC_D11AC_BND_SHIFT    14
+#define  BRCMU_CHSPEC_D11AC_BND_2G      0x0000
+#define  BRCMU_CHSPEC_D11AC_BND_3G      0x4000
+#define  BRCMU_CHSPEC_D11AC_BND_4G      0x8000
+#define  BRCMU_CHSPEC_D11AC_BND_5G      0xc000
+
+#define BRCMU_CHAN_BAND_2G              0
+#define BRCMU_CHAN_BAND_5G              1
+
+enum brcmu_chan_bw {
+        BRCMU_CHAN_BW_20,
+        BRCMU_CHAN_BW_40,
+        BRCMU_CHAN_BW_80,
+        BRCMU_CHAN_BW_80P80,
+        BRCMU_CHAN_BW_160,
+};
+
+enum brcmu_chan_sb {
+        BRCMU_CHAN_SB_NONE = 0,
+        BRCMU_CHAN_SB_L,
+        BRCMU_CHAN_SB_U,
+        BRCMU_CHAN_SB_LL,
+        BRCMU_CHAN_SB_LU,
+        BRCMU_CHAN_SB_UL,
+        BRCMU_CHAN_SB_UU,
+        BRCMU_CHAN_SB_LLL,
+        BRCMU_CHAN_SB_LLU,
+        BRCMU_CHAN_SB_LUL,
+        BRCMU_CHAN_SB_LUU,
+        BRCMU_CHAN_SB_ULL,
+        BRCMU_CHAN_SB_ULU,
+        BRCMU_CHAN_SB_UUL,
+        BRCMU_CHAN_SB_UUU,
+};
+
+struct brcmu_chan {
+        u16 chspec;
+        u8 chnum;
+        u8 band;
+        enum brcmu_chan_bw bw;
+        enum brcmu_chan_sb sb;
+};
+
+struct brcmu_d11inf {
+        u8 io_type;
+
+        void (*encchspec)(struct brcmu_chan *ch);
+        void (*decchspec)(struct brcmu_chan *ch);
+};
+
+extern void brcmu_d11_attach(struct brcmu_d11inf *d11inf);
+
+#endif  /* _BRCMU_CHANNELS_H_ */
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
index 477b92ad3d62..898cacb8d01d 100644
--- a/drivers/net/wireless/brcm80211/include/brcmu_utils.h
+++ b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
@@ -120,6 +120,10 @@ extern struct sk_buff *brcmu_pktq_penq_head(struct pktq *pq, int prec,
                                       struct sk_buff *p);
 extern struct sk_buff *brcmu_pktq_pdeq(struct pktq *pq, int prec);
 extern struct sk_buff *brcmu_pktq_pdeq_tail(struct pktq *pq, int prec);
+extern struct sk_buff *brcmu_pktq_pdeq_match(struct pktq *pq, int prec,
+                                             bool (*match_fn)(struct sk_buff *p,
+                                                              void *arg),
+                                             void *arg);
 
 /* packet primitives */
 extern struct sk_buff *brcmu_pkt_buf_get_skb(uint len);
@@ -173,6 +177,29 @@ extern void brcmu_pktq_flush(struct pktq *pq, bool dir,
 /* ip address */
 struct ipv4_addr;
 
+/*
+ * bitfield macros using masking and shift
+ *
+ * remark: the mask parameter should be a shifted mask.
+ */
+static inline void brcmu_maskset32(u32 *var, u32 mask, u8 shift, u32 value)
+{
+        value = (value << shift) & mask;
+        *var = (*var & ~mask) | value;
+}
+static inline u32 brcmu_maskget32(u32 var, u32 mask, u8 shift)
+{
+        return (var & mask) >> shift;
+}
+static inline void brcmu_maskset16(u16 *var, u16 mask, u8 shift, u16 value)
+{
+        value = (value << shift) & mask;
+        *var = (*var & ~mask) | value;
+}
+static inline u16 brcmu_maskget16(u16 var, u16 mask, u8 shift)
+{
+        return (var & mask) >> shift;
+}
 
 /* externs */
 /* format/print */
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
index c11a290a1edf..0505cc065e0d 100644
--- a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
+++ b/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
@@ -32,8 +32,9 @@
 #define CH_20MHZ_APART                  4
 #define CH_10MHZ_APART                  2
 #define CH_5MHZ_APART                   1 /* 2G band channels are 5 Mhz apart */
+#define CH_MIN_2G_CHANNEL               1
 #define CH_MAX_2G_CHANNEL               14      /* Max channel in 2G band */
-#define BRCM_MAX_2G_CHANNEL     CH_MAX_2G_CHANNEL       /* legacy define */
+#define CH_MIN_5G_CHANNEL               34
 
 /* bandstate array indices */
 #define BAND_2G_INDEX           0       /* wlc->bandstate[x] index */
@@ -60,6 +61,7 @@
 #define WL_CHANSPEC_BW_10               0x0400
 #define WL_CHANSPEC_BW_20               0x0800
 #define WL_CHANSPEC_BW_40               0x0C00
+#define WL_CHANSPEC_BW_80               0x2000
 
 #define WL_CHANSPEC_BAND_MASK           0xf000
 #define WL_CHANSPEC_BAND_SHIFT          12
@@ -67,6 +69,25 @@
 #define WL_CHANSPEC_BAND_2G             0x2000
 #define INVCHANSPEC                     255
 
+#define WL_CHAN_VALID_HW                (1 << 0) /* valid with current HW */
+#define WL_CHAN_VALID_SW                (1 << 1) /* valid with country sett. */
+#define WL_CHAN_BAND_5G                 (1 << 2) /* 5GHz-band channel */
+#define WL_CHAN_RADAR                   (1 << 3) /* radar sensitive  channel */
+#define WL_CHAN_INACTIVE                (1 << 4) /* inactive due to radar */
+#define WL_CHAN_PASSIVE                 (1 << 5) /* channel in passive mode */
+#define WL_CHAN_RESTRICTED              (1 << 6) /* restricted use channel */
+
+/* values for band specific 40MHz capabilities  */
+#define WLC_N_BW_20ALL                  0
+#define WLC_N_BW_40ALL                  1
+#define WLC_N_BW_20IN2G_40IN5G          2
+
+/* band types */
+#define WLC_BAND_AUTO                   0       /* auto-select */
+#define WLC_BAND_5G                     1       /* 5 Ghz */
+#define WLC_BAND_2G                     2       /* 2.4 Ghz */
+#define WLC_BAND_ALL                    3       /* all bands */
+
 #define CHSPEC_CHANNEL(chspec)  ((u8)((chspec) & WL_CHANSPEC_CHAN_MASK))
 #define CHSPEC_BAND(chspec)     ((chspec) & WL_CHANSPEC_BAND_MASK)
 
@@ -79,10 +100,11 @@
 #define CHSPEC_IS20(chspec) \
         (((chspec) & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_20)
 
-#ifndef CHSPEC_IS40
 #define CHSPEC_IS40(chspec) \
         (((chspec) & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_40)
-#endif
+
+#define CHSPEC_IS80(chspec) \
+        (((chspec) & WL_CHANSPEC_BW_MASK) == WL_CHANSPEC_BW_80)
 
 #define CHSPEC_IS5G(chspec) \
         (((chspec) & WL_CHANSPEC_BAND_MASK) == WL_CHANSPEC_BAND_5G)
diff --git a/drivers/net/wireless/brcm80211/include/chipcommon.h b/drivers/net/wireless/brcm80211/include/chipcommon.h
index f96834a7c055..d242333b7559 100644
--- a/drivers/net/wireless/brcm80211/include/chipcommon.h
+++ b/drivers/net/wireless/brcm80211/include/chipcommon.h
@@ -205,7 +205,7 @@ struct chipcregs {
         u32 res_req_timer_sel;
         u32 res_req_timer;
         u32 res_req_mask;
-        u32 PAD;
+        u32 pmucapabilities_ext; /* 0x64c, pmurev >=15 */
         u32 chipcontrol_addr;   /* 0x650 */
         u32 chipcontrol_data;   /* 0x654 */
         u32 regcontrol_addr;
@@ -214,7 +214,11 @@ struct chipcregs {
         u32 pllcontrol_data;
         u32 pmustrapopt;        /* 0x668, corerev >= 28 */
         u32 pmu_xtalfreq;       /* 0x66C, pmurev >= 10 */
-        u32 PAD[100];
+        u32 retention_ctl;          /* 0x670, pmurev >= 15 */
+        u32 PAD[3];
+        u32 retention_grpidx;       /* 0x680 */
+        u32 retention_grpctl;       /* 0x684 */
+        u32 PAD[94];
         u16 sromotp[768];
 };
 
@@ -276,6 +280,12 @@ struct chipcregs {
 #define PCAP5_VC_SHIFT  22
 #define PCAP5_CC_MASK   0xf8000000
 #define PCAP5_CC_SHIFT  27
+/* pmucapabilites_ext PMU rev >= 15 */
+#define PCAPEXT_SR_SUPPORTED_MASK       (1 << 1)
+/* retention_ctl PMU rev >= 15 */
+#define PMU_RCTL_MACPHY_DISABLE_MASK        (1 << 26)
+#define PMU_RCTL_LOGIC_DISABLE_MASK         (1 << 27)
+
 
 /*
 * Maximum delay for the PMU state transition in us.
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index cb066f62879d..15920aaa5dd6 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -4167,17 +4167,11 @@ static ssize_t show_debug_level(struct device_driver *d, char *buf)
 static ssize_t store_debug_level(struct device_driver *d,
                                  const char *buf, size_t count)
 {
-        char *p = (char *)buf;
         u32 val;
+        int ret;
 
-        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
-                p++;
-                if (p[0] == 'x' || p[0] == 'X')
-                        p++;
-                val = simple_strtoul(p, &p, 16);
-        } else
-                val = simple_strtoul(p, &p, 10);
-        if (p == buf)
+        ret = kstrtou32(buf, 0, &val);
+        if (ret)
                 IPW_DEBUG_INFO(": %s is not in hex or decimal form.\n", buf);
         else
                 ipw2100_debug_level = val;
@@ -4238,27 +4232,15 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
 {
         struct ipw2100_priv *priv = dev_get_drvdata(d);
         struct net_device *dev = priv->net_dev;
-        char buffer[] = "00000000";
-        unsigned long len =
-            (sizeof(buffer) - 1) > count ? count : sizeof(buffer) - 1;
         unsigned long val;
-        char *p = buffer;
+        int ret;
 
         (void)dev;              /* kill unused-var warning for debug-only code */
 
         IPW_DEBUG_INFO("enter\n");
 
-        strncpy(buffer, buf, len);
-        buffer[len] = 0;
-
-        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
-                p++;
-                if (p[0] == 'x' || p[0] == 'X')
-                        p++;
-                val = simple_strtoul(p, &p, 16);
-        } else
-                val = simple_strtoul(p, &p, 10);
-        if (p == buffer) {
+        ret = kstrtoul(buf, 0, &val);
+        if (ret) {
                 IPW_DEBUG_INFO("%s: user supplied invalid value.\n", dev->name);
         } else {
                 priv->ieee->scan_age = val;
@@ -4266,7 +4248,7 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
         }
 
         IPW_DEBUG_INFO("exit\n");
-        return len;
+        return strnlen(buf, count);
 }
 
 static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age);
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index c353b5f19c8c..b37a582ccbe7 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3477,7 +3477,7 @@ static struct attribute_group il3945_attribute_group = {
         .attrs = il3945_sysfs_entries,
 };
 
-struct ieee80211_ops il3945_mac_ops = {
+static struct ieee80211_ops il3945_mac_ops __read_mostly = {
         .tx = il3945_mac_tx,
         .start = il3945_mac_start,
         .stop = il3945_mac_stop,
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index d4fd29ad90dc..c9f197d9ca1e 100644
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -347,7 +347,7 @@ il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)
 
         psta = (struct il3945_sta_priv *)sta->drv_priv;
         rs_sta = &psta->rs_sta;
-        sband = hw->wiphy->bands[conf->channel->band];
+        sband = hw->wiphy->bands[conf->chandef.chan->band];
 
         rs_sta->il = il;
 
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index e0b9d7fa5de0..dc1e6da9976a 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -2379,10 +2379,8 @@ il3945_hw_set_hw_params(struct il_priv *il)
         il->_3945.shared_virt =
             dma_alloc_coherent(&il->pci_dev->dev, sizeof(struct il3945_shared),
                                &il->_3945.shared_phys, GFP_KERNEL);
-        if (!il->_3945.shared_virt) {
-                IL_ERR("failed to allocate pci memory\n");
+        if (!il->_3945.shared_virt)
                 return -ENOMEM;
-        }
 
         il->hw_params.bcast_id = IL3945_BROADCAST_ID;
 
diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h
index 1d45075e0d5b..9a8703def0ba 100644
--- a/drivers/net/wireless/iwlegacy/3945.h
+++ b/drivers/net/wireless/iwlegacy/3945.h
@@ -150,10 +150,6 @@ struct il3945_frame {
         struct list_head list;
 };
 
-#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
-#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
-
 #define SUP_RATE_11A_MAX_NUM_CHANNELS  8
 #define SUP_RATE_11B_MAX_NUM_CHANNELS  4
 #define SUP_RATE_11G_MAX_NUM_CHANNELS  12
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 7941eb3a0166..b8f82e688c72 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -612,7 +612,7 @@ il4965_pass_packet_to_mac80211(struct il_priv *il, struct ieee80211_hdr *hdr,
 
 /* Called for N_RX (legacy ABG frames), or
  * N_RX_MPDU (HT high-throughput N frames). */
-void
+static void
 il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)
 {
         struct ieee80211_hdr *header;
@@ -744,7 +744,7 @@ il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)
 
 /* Cache phy data (Rx signal strength, etc) for HT frame (N_RX_PHY).
  * This will be used later in il_hdl_rx() for N_RX_MPDU. */
-void
+static void
 il4965_hdl_rx_phy(struct il_priv *il, struct il_rx_buf *rxb)
 {
         struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -1250,7 +1250,7 @@ il4965_dump_fh(struct il_priv *il, char **buf, bool display)
         return 0;
 }
 
-void
+static void
 il4965_hdl_missed_beacon(struct il_priv *il, struct il_rx_buf *rxb)
 {
         struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -1357,7 +1357,7 @@ il4965_accumulative_stats(struct il_priv *il, __le32 * stats)
 }
 #endif
 
-void
+static void
 il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)
 {
         const int recalib_seconds = 60;
@@ -1399,7 +1399,7 @@ il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)
                 il4965_temperature_calib(il);
 }
 
-void
+static void
 il4965_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb)
 {
         struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -1921,8 +1921,8 @@ drop_unlock:
 static inline int
 il4965_alloc_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr, size_t size)
 {
-        ptr->addr =
-            dma_alloc_coherent(&il->pci_dev->dev, size, &ptr->dma, GFP_KERNEL);
+        ptr->addr = dma_alloc_coherent(&il->pci_dev->dev, size, &ptr->dma,
+                                       GFP_KERNEL);
         if (!ptr->addr)
                 return -ENOMEM;
         ptr->size = size;
@@ -2050,7 +2050,7 @@ il4965_txq_ctx_reset(struct il_priv *il)
                 il_tx_queue_reset(il, txq_id);
 }
 
-void
+static void
 il4965_txq_ctx_unmap(struct il_priv *il)
 {
         int txq_id;
@@ -2258,7 +2258,7 @@ il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,
 
         spin_lock_irqsave(&il->sta_lock, flags);
         tid_data = &il->stations[sta_id].tid[tid];
-        *ssn = SEQ_TO_SN(tid_data->seq_number);
+        *ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
         tid_data->agg.txq_id = txq_id;
         il_set_swq_id(&il->txq[txq_id], il4965_get_ac_from_tid(tid), txq_id);
         spin_unlock_irqrestore(&il->sta_lock, flags);
@@ -2408,7 +2408,7 @@ il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id)
                 /* aggregated HW queue */
                 if (txq_id == tid_data->agg.txq_id &&
                     q->read_ptr == q->write_ptr) {
-                        u16 ssn = SEQ_TO_SN(tid_data->seq_number);
+                        u16 ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
                         int tx_fifo = il4965_get_fifo_from_tid(tid);
                         D_HT("HW queue empty: continue DELBA flow\n");
                         il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo);
@@ -2627,7 +2627,8 @@ il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr)
 static inline u32
 il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp)
 {
-        return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN;
+        return le32_to_cpup(&tx_resp->u.status +
+                            tx_resp->frame_count) & IEEE80211_MAX_SN;
 }
 
 static inline u32
@@ -2717,15 +2718,15 @@ il4965_tx_status_reply_tx(struct il_priv *il, struct il_ht_agg *agg,
                         hdr = (struct ieee80211_hdr *) skb->data;
 
                         sc = le16_to_cpu(hdr->seq_ctrl);
-                        if (idx != (SEQ_TO_SN(sc) & 0xff)) {
+                        if (idx != (IEEE80211_SEQ_TO_SN(sc) & 0xff)) {
                                 IL_ERR("BUG_ON idx doesn't match seq control"
                                        " idx=%d, seq_idx=%d, seq=%d\n", idx,
-                                       SEQ_TO_SN(sc), hdr->seq_ctrl);
+                                       IEEE80211_SEQ_TO_SN(sc), hdr->seq_ctrl);
                                 return -1;
                         }
 
                         D_TX_REPLY("AGG Frame i=%d idx %d seq=%d\n", i, idx,
-                                   SEQ_TO_SN(sc));
+                                   IEEE80211_SEQ_TO_SN(sc));
 
                         sh = idx - start;
                         if (sh > 64) {
@@ -2895,7 +2896,7 @@ il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,
  * Handles block-acknowledge notification from device, which reports success
  * of frames sent via aggregation.
  */
-void
+static void
 il4965_hdl_compressed_ba(struct il_priv *il, struct il_rx_buf *rxb)
 {
         struct il_rx_pkt *pkt = rxb_addr(rxb);
@@ -6056,7 +6057,7 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw,
         struct il_priv *il = hw->priv;
         const struct il_channel_info *ch_info;
         struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = ch_switch->channel;
+        struct ieee80211_channel *channel = ch_switch->chandef.chan;
         struct il_ht_config *ht_conf = &il->current_ht_config;
         u16 ch;
 
@@ -6093,23 +6094,21 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw,
         il->current_ht_config.smps = conf->smps_mode;
 
         /* Configure HT40 channels */
-        il->ht.enabled = conf_is_ht(conf);
-        if (il->ht.enabled) {
-                if (conf_is_ht40_minus(conf)) {
-                        il->ht.extension_chan_offset =
-                            IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-                        il->ht.is_40mhz = true;
-                } else if (conf_is_ht40_plus(conf)) {
-                        il->ht.extension_chan_offset =
-                            IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-                        il->ht.is_40mhz = true;
-                } else {
-                        il->ht.extension_chan_offset =
-                            IEEE80211_HT_PARAM_CHA_SEC_NONE;
-                        il->ht.is_40mhz = false;
-                }
-        } else
+        switch (cfg80211_get_chandef_type(&ch_switch->chandef)) {
+        case NL80211_CHAN_NO_HT:
+        case NL80211_CHAN_HT20:
                 il->ht.is_40mhz = false;
+                il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                break;
+        case NL80211_CHAN_HT40MINUS:
+                il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                il->ht.is_40mhz = true;
+                break;
+        case NL80211_CHAN_HT40PLUS:
+                il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                il->ht.is_40mhz = true;
+                break;
+        }
 
         if ((le16_to_cpu(il->staging.channel) != ch))
                 il->staging.flags = 0;
@@ -6316,7 +6315,7 @@ il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,
                scd_retry ? "BA" : "AC", txq_id, tx_fifo_id);
 }
 
-const struct ieee80211_ops il4965_mac_ops = {
+static const struct ieee80211_ops il4965_mac_ops = {
         .tx = il4965_mac_tx,
         .start = il4965_mac_start,
         .stop = il4965_mac_stop,
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index 6c7493c2d698..1fc0b227e120 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -2300,7 +2300,7 @@ il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)
 
         sta_priv = (struct il_station_priv *)sta->drv_priv;
         lq_sta = &sta_priv->lq_sta;
-        sband = hw->wiphy->bands[conf->channel->band];
+        sband = hw->wiphy->bands[conf->chandef.chan->band];
 
         lq_sta->lq.sta_id = sta_id;
 
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index 91eb2d07fdb8..777a578294bd 100644
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -1493,7 +1493,7 @@ il4965_hw_channel_switch(struct il_priv *il,
 
         cmd.band = band;
         cmd.expect_beacon = 0;
-        ch = ch_switch->channel->hw_value;
+        ch = ch_switch->chandef.chan->hw_value;
         cmd.channel = cpu_to_le16(ch);
         cmd.rxon_flags = il->staging.flags;
         cmd.rxon_filter_flags = il->staging.filter_flags;
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index e006ea831320..592d0aa634a8 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1122,7 +1122,7 @@ il_set_power(struct il_priv *il, struct il_powertable_cmd *cmd)
                                sizeof(struct il_powertable_cmd), cmd);
 }
 
-int
+static int
 il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, bool force)
 {
         int ret;
@@ -2566,15 +2566,13 @@ il_rx_queue_alloc(struct il_priv *il)
         INIT_LIST_HEAD(&rxq->rx_used);
 
         /* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */
-        rxq->bd =
-            dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
-                               GFP_KERNEL);
+        rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
+                                     GFP_KERNEL);
         if (!rxq->bd)
                 goto err_bd;
 
-        rxq->rb_stts =
-            dma_alloc_coherent(dev, sizeof(struct il_rb_status),
-                               &rxq->rb_stts_dma, GFP_KERNEL);
+        rxq->rb_stts = dma_alloc_coherent(dev, sizeof(struct il_rb_status),
+                                          &rxq->rb_stts_dma, GFP_KERNEL);
         if (!rxq->rb_stts)
                 goto err_rb;
 
@@ -2941,10 +2939,9 @@ il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)
          * shared with device */
         txq->tfds =
             dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, GFP_KERNEL);
-        if (!txq->tfds) {
-                IL_ERR("Fail to alloc TFDs\n");
+        if (!txq->tfds)
                 goto error;
-        }
+
         txq->q.id = id;
 
         return 0;
@@ -4704,8 +4701,7 @@ out:
 }
 EXPORT_SYMBOL(il_mac_change_interface);
 
-void
-il_mac_flush(struct ieee80211_hw *hw, bool drop)
+void il_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct il_priv *il = hw->priv;
         unsigned long timeout = jiffies + msecs_to_jiffies(500);
@@ -4891,7 +4887,7 @@ il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
 }
 EXPORT_SYMBOL(il_add_beacon_time);
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static int
 il_pci_suspend(struct device *device)
@@ -4942,7 +4938,7 @@ il_pci_resume(struct device *device)
 SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
 EXPORT_SYMBOL(il_pm_ops);
 
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
 static void
 il_update_qos(struct il_priv *il)
@@ -4975,7 +4971,7 @@ il_mac_config(struct ieee80211_hw *hw, u32 changed)
         struct il_priv *il = hw->priv;
         const struct il_channel_info *ch_info;
         struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
         struct il_ht_config *ht_conf = &il->current_ht_config;
         unsigned long flags = 0;
         int ret = 0;
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 96f2025d936e..f8246f2d88f9 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -541,10 +541,6 @@ struct il_frame {
         struct list_head list;
 };
 
-#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
-#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
-
 enum {
         CMD_SYNC = 0,
         CMD_SIZE_NORMAL = 0,
@@ -1724,7 +1720,7 @@ void il_mac_remove_interface(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif);
 int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                             enum nl80211_iftype newtype, bool newp2p);
-void il_mac_flush(struct ieee80211_hw *hw, bool drop);
+void il_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop);
 int il_alloc_txq_mem(struct il_priv *il);
 void il_free_txq_mem(struct il_priv *il);
 
@@ -2235,9 +2231,8 @@ il_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)
                 return -EINVAL;
         }
 
-        desc->v_addr =
-            dma_alloc_coherent(&pci_dev->dev, desc->len, &desc->p_addr,
-                               GFP_KERNEL);
+        desc->v_addr = dma_alloc_coherent(&pci_dev->dev, desc->len,
+                                          &desc->p_addr, GFP_KERNEL);
         return (desc->v_addr != NULL) ? 0 : -ENOMEM;
 }
 
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index ba319cba3f1e..56c2040a955b 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -6,7 +6,6 @@ config IWLWIFI
         select LEDS_CLASS
         select LEDS_TRIGGERS
         select MAC80211_LEDS
-        select IWLDVM
         ---help---
           Select to build the driver supporting the:
 
@@ -45,6 +44,7 @@ config IWLWIFI
 config IWLDVM
         tristate "Intel Wireless WiFi DVM Firmware support"
         depends on IWLWIFI
+        default IWLWIFI
         help
           This is the driver supporting the DVM firmware which is
           currently the only firmware available for existing devices.
@@ -58,6 +58,15 @@ config IWLMVM
 
           Say yes if you have such a device.
 
+# don't call it _MODULE -- will confuse Kconfig/fixdep/...
+config IWLWIFI_OPMODE_MODULAR
+        bool
+        default y if IWLDVM=m
+        default y if IWLMVM=m
+
+comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"
+        depends on IWLWIFI && IWLDVM=n && IWLMVM=n
+
 menu "Debugging Options"
         depends on IWLWIFI
 
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 6c7800044a04..3b5613ea458b 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -7,8 +7,7 @@ iwlwifi-objs		+= iwl-notif-wait.o
 iwlwifi-objs            += iwl-eeprom-read.o iwl-eeprom-parse.o
 iwlwifi-objs            += iwl-phy-db.o iwl-nvm-parse.o
 iwlwifi-objs            += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
-iwlwifi-objs            += pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o
-iwlwifi-objs            += pcie/7000.o
+iwlwifi-objs            += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o iwl-7000.o
 
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 41ec27cb6efe..48545ab00311 100644
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -73,6 +73,8 @@
 /* AUX (TX during scan dwell) queue */
 #define IWL_AUX_QUEUE           10
 
+#define IWL_INVALID_STATION     255
+
 /* device operations */
 extern struct iwl_lib_ops iwl1000_lib;
 extern struct iwl_lib_ops iwl2000_lib;
@@ -170,13 +172,13 @@ int iwl_calib_set(struct iwl_priv *priv,
                   const struct iwl_calib_hdr *cmd, int len);
 void iwl_calib_free_results(struct iwl_priv *priv);
 int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
-                            char **buf, bool display);
+                            char **buf);
 int iwlagn_hw_valid_rtc_data_addr(u32 addr);
 
 /* lib */
 int iwlagn_send_tx_power(struct iwl_priv *priv);
 void iwlagn_temperature(struct iwl_priv *priv);
-int iwlagn_txfifo_flush(struct iwl_priv *priv);
+int iwlagn_txfifo_flush(struct iwl_priv *priv, u32 scd_q_msk);
 void iwlagn_dev_txfifo_flush(struct iwl_priv *priv);
 int iwlagn_send_beacon_cmd(struct iwl_priv *priv);
 int iwl_send_statistics_request(struct iwl_priv *priv,
@@ -210,6 +212,8 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta, u16 tid, u8 buf_size);
 int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta, u16 tid);
+int iwlagn_tx_agg_flush(struct iwl_priv *priv, struct ieee80211_vif *vif,
+                        struct ieee80211_sta *sta, u16 tid);
 int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                                    struct iwl_rx_cmd_buffer *rxb,
                                    struct iwl_device_cmd *cmd);
diff --git a/drivers/net/wireless/iwlwifi/dvm/calib.c b/drivers/net/wireless/iwlwifi/dvm/calib.c
index 6468de8634b0..d6c4cf2ad7c5 100644
--- a/drivers/net/wireless/iwlwifi/dvm/calib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/dvm/calib.h b/drivers/net/wireless/iwlwifi/dvm/calib.h
index 65e920cab2b7..cfddde194940 100644
--- a/drivers/net/wireless/iwlwifi/dvm/calib.h
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index 84e2c0fcfef6..95ca026ecc9d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -1526,6 +1526,7 @@ struct iwl_compressed_ba_resp {
         __le16 scd_ssn;
         u8 txed;        /* number of frames sent */
         u8 txed_2_done; /* number of frames acked */
+        __le16 reserved1;
 } __packed;
 
 /*
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index 20806cae11b7..d5329489245a 100644
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -2237,15 +2237,13 @@ static ssize_t iwl_dbgfs_log_event_read(struct file *file,
                                          size_t count, loff_t *ppos)
 {
         struct iwl_priv *priv = file->private_data;
-        char *buf;
-        int pos = 0;
-        ssize_t ret = -ENOMEM;
+        char *buf = NULL;
+        ssize_t ret;
 
-        ret = pos = iwl_dump_nic_event_log(priv, true, &buf, true);
-        if (buf) {
-                ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-                kfree(buf);
-        }
+        ret = iwl_dump_nic_event_log(priv, true, &buf);
+        if (ret > 0)
+                ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
+        kfree(buf);
         return ret;
 }
 
@@ -2269,7 +2267,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
         if (sscanf(buf, "%d", &event_log_flag) != 1)
                 return -EFAULT;
         if (event_log_flag == 1)
-                iwl_dump_nic_event_log(priv, true, NULL, false);
+                iwl_dump_nic_event_log(priv, true, NULL);
 
         return count;
 }
@@ -2324,6 +2322,28 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
         return count;
 }
 
+static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
+                                          const char __user *user_buf,
+                                          size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = file->private_data;
+        bool restart_fw = iwlwifi_mod_params.restart_fw;
+        int ret;
+
+        iwlwifi_mod_params.restart_fw = true;
+
+        mutex_lock(&priv->mutex);
+
+        /* take the return value to make compiler happy - it will fail anyway */
+        ret = iwl_dvm_send_cmd_pdu(priv, REPLY_ERROR, CMD_SYNC, 0, NULL);
+
+        mutex_unlock(&priv->mutex);
+
+        iwlwifi_mod_params.restart_fw = restart_fw;
+
+        return count;
+}
+
 DEBUGFS_READ_FILE_OPS(ucode_rx_stats);
 DEBUGFS_READ_FILE_OPS(ucode_tx_stats);
 DEBUGFS_READ_FILE_OPS(ucode_general_stats);
@@ -2343,6 +2363,7 @@ DEBUGFS_READ_FILE_OPS(bt_traffic);
 DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);
 DEBUGFS_READ_FILE_OPS(reply_tx_error);
 DEBUGFS_WRITE_FILE_OPS(echo_test);
+DEBUGFS_WRITE_FILE_OPS(fw_restart);
 #ifdef CONFIG_IWLWIFI_DEBUG
 DEBUGFS_READ_WRITE_FILE_OPS(log_event);
 #endif
@@ -2400,6 +2421,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
         DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(fw_restart, dir_debug, S_IWUSR);
 #ifdef CONFIG_IWLWIFI_DEBUG
         DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
index 15cca2ef9294..c48907c8ab43 100644
--- a/drivers/net/wireless/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -379,7 +379,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
         };
 
         cmd.band = priv->band == IEEE80211_BAND_2GHZ;
-        ch = ch_switch->channel->hw_value;
+        ch = ch_switch->chandef.chan->hw_value;
         IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
                       ctx->active.channel, ch);
         cmd.channel = cpu_to_le16(ch);
@@ -414,7 +414,8 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
         }
         IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
                       cmd.switch_time);
-        cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
+        cmd.expect_beacon =
+                ch_switch->chandef.chan->flags & IEEE80211_CHAN_RADAR;
 
         return iwl_dvm_send_cmd(priv, &hcmd);
 }
@@ -540,7 +541,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
         hcmd.data[0] = cmd;
 
         cmd->band = priv->band == IEEE80211_BAND_2GHZ;
-        ch = ch_switch->channel->hw_value;
+        ch = ch_switch->chandef.chan->hw_value;
         IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
                       ctx->active.channel, ch);
         cmd->channel = cpu_to_le16(ch);
@@ -575,7 +576,8 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
         }
         IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
                       cmd->switch_time);
-        cmd->expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
+        cmd->expect_beacon =
+                ch_switch->chandef.chan->flags & IEEE80211_CHAN_RADAR;
 
         err = iwl_dvm_send_cmd(priv, &hcmd);
         kfree(cmd);
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index 44ca0e57f9f7..54f553380aa8 100644
--- a/drivers/net/wireless/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -136,7 +136,7 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv,
  *  1. acquire mutex before calling
  *  2. make sure rf is on and not in exit state
  */
-int iwlagn_txfifo_flush(struct iwl_priv *priv)
+int iwlagn_txfifo_flush(struct iwl_priv *priv, u32 scd_q_msk)
 {
         struct iwl_txfifo_flush_cmd flush_cmd;
         struct iwl_host_cmd cmd = {
@@ -162,6 +162,9 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv)
         if (priv->nvm_data->sku_cap_11n_enable)
                 flush_cmd.queue_control |= IWL_AGG_TX_QUEUE_MSK;
 
+        if (scd_q_msk)
+                flush_cmd.queue_control = cpu_to_le32(scd_q_msk);
+
         IWL_DEBUG_INFO(priv, "queue control: 0x%x\n",
                        flush_cmd.queue_control);
         flush_cmd.flush_control = cpu_to_le16(IWL_DROP_ALL);
@@ -173,7 +176,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv)
 {
         mutex_lock(&priv->mutex);
         ieee80211_stop_queues(priv->hw);
-        if (iwlagn_txfifo_flush(priv)) {
+        if (iwlagn_txfifo_flush(priv, 0)) {
                 IWL_ERR(priv, "flush request fail\n");
                 goto done;
         }
@@ -1084,7 +1087,14 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan)
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         struct iwlagn_wowlan_kek_kck_material_cmd kek_kck_cmd;
         struct iwlagn_wowlan_tkip_params_cmd tkip_cmd = {};
-        struct iwlagn_d3_config_cmd d3_cfg_cmd = {};
+        struct iwlagn_d3_config_cmd d3_cfg_cmd = {
+                /*
+                 * Program the minimum sleep time to 10 seconds, as many
+                 * platforms have issues processing a wakeup signal while
+                 * still being in the process of suspending.
+                 */
+                .min_sleep_time = cpu_to_le32(10 * 1000 * 1000),
+        };
         struct wowlan_key_data key_data = {
                 .ctx = ctx,
                 .bssid = ctx->active.bssid_addr,
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 323e4a33fcac..cab23af0be9e 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -777,9 +777,12 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                 IWL_DEBUG_HT(priv, "start Tx\n");
                 ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);
                 break;
-        case IEEE80211_AMPDU_TX_STOP_CONT:
         case IEEE80211_AMPDU_TX_STOP_FLUSH:
         case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
+                IWL_DEBUG_HT(priv, "Flush Tx\n");
+                ret = iwlagn_tx_agg_flush(priv, vif, sta, tid);
+                break;
+        case IEEE80211_AMPDU_TX_STOP_CONT:
                 IWL_DEBUG_HT(priv, "stop Tx\n");
                 ret = iwlagn_tx_agg_stop(priv, vif, sta, tid);
                 if ((ret == 0) && (priv->agg_tids_count > 0)) {
@@ -967,7 +970,7 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = ch_switch->channel;
+        struct ieee80211_channel *channel = ch_switch->chandef.chan;
         struct iwl_ht_config *ht_conf = &priv->current_ht_config;
         /*
          * MULTI-FIXME
@@ -1005,11 +1008,21 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
         priv->current_ht_config.smps = conf->smps_mode;
 
         /* Configure HT40 channels */
-        ctx->ht.enabled = conf_is_ht(conf);
-        if (ctx->ht.enabled)
-                iwlagn_config_ht40(conf, ctx);
-        else
+        switch (cfg80211_get_chandef_type(&ch_switch->chandef)) {
+        case NL80211_CHAN_NO_HT:
+        case NL80211_CHAN_HT20:
                 ctx->ht.is_40mhz = false;
+                ctx->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                break;
+        case NL80211_CHAN_HT40MINUS:
+                ctx->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                ctx->ht.is_40mhz = true;
+                break;
+        case NL80211_CHAN_HT40PLUS:
+                ctx->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                ctx->ht.is_40mhz = true;
+                break;
+        }
 
         if ((le16_to_cpu(ctx->staging.channel) != ch))
                 ctx->staging.flags = 0;
@@ -1100,7 +1113,7 @@ static void iwlagn_configure_filter(struct ieee80211_hw *hw,
                         FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 }
 
-static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
+static void iwlagn_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1122,7 +1135,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
          */
         if (drop) {
                 IWL_DEBUG_MAC80211(priv, "send flush command\n");
-                if (iwlagn_txfifo_flush(priv)) {
+                if (iwlagn_txfifo_flush(priv, 0)) {
                         IWL_ERR(priv, "flush request fail\n");
                         goto done;
                 }
@@ -1137,7 +1150,8 @@ done:
 static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif,
                                      struct ieee80211_channel *channel,
-                                     int duration)
+                                     int duration,
+                                     enum ieee80211_roc_type type)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_PAN];
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index b9e3517652d6..74d7572e7091 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1795,7 +1795,7 @@ static int iwl_print_last_event_logs(struct iwl_priv *priv, u32 capacity,
 #define DEFAULT_DUMP_EVENT_LOG_ENTRIES (20)
 
 int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
-                            char **buf, bool display)
+                            char **buf)
 {
         u32 base;       /* SRAM byte address of event log header */
         u32 capacity;   /* event log capacity in # entries */
@@ -1866,7 +1866,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                 size);
 
 #ifdef CONFIG_IWLWIFI_DEBUG
-        if (display) {
+        if (buf) {
                 if (full_log)
                         bufsz = capacity * 48;
                 else
@@ -1962,7 +1962,7 @@ static void iwl_nic_error(struct iwl_op_mode *op_mode)
                 priv->fw->fw_version);
 
         iwl_dump_nic_error_log(priv);
-        iwl_dump_nic_event_log(priv, false, NULL, false);
+        iwl_dump_nic_event_log(priv, false, NULL);
 
         iwlagn_fw_error(priv, false);
 }
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index abe304267261..907bd6e50aad 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -2831,7 +2831,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
 
         sta_priv = (struct iwl_station_priv *) sta->drv_priv;
         lq_sta = &sta_priv->lq_sta;
-        sband = hw->wiphy->bands[conf->channel->band];
+        sband = hw->wiphy->bands[conf->chandef.chan->band];
 
 
         lq_sta->lq.sta_id = sta_id;
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index a82b6b39d4ff..707446fa00bd 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -78,8 +78,9 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
                 ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
 #endif
 
-        ctx->staging.channel = cpu_to_le16(priv->hw->conf.channel->hw_value);
-        priv->band = priv->hw->conf.channel->band;
+        ctx->staging.channel =
+                cpu_to_le16(priv->hw->conf.chandef.chan->hw_value);
+        priv->band = priv->hw->conf.chandef.chan->band;
 
         iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
 
@@ -951,7 +952,7 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv,
                 unsigned long basic = ctx->vif->bss_conf.basic_rates;
                 int i;
 
-                sband = priv->hw->wiphy->bands[priv->hw->conf.channel->band];
+                sband = priv->hw->wiphy->bands[priv->hw->conf.chandef.chan->band];
 
                 for_each_set_bit(i, &basic, BITS_PER_LONG) {
                         int hw = sband->bitrates[i].hw_value;
@@ -1159,7 +1160,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 }
 
 void iwlagn_config_ht40(struct ieee80211_conf *conf,
-        struct iwl_rxon_context *ctx)
+                        struct iwl_rxon_context *ctx)
 {
         if (conf_is_ht40_minus(conf)) {
                 ctx->ht.extension_chan_offset =
@@ -1181,7 +1182,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_rxon_context *ctx;
         struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
         int ret = 0;
 
         IWL_DEBUG_MAC80211(priv, "enter: changed %#x\n", changed);
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index 3a4aa5239c45..d69b55866714 100644
--- a/drivers/net/wireless/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c
index b775769f8322..db183b44e038 100644
--- a/drivers/net/wireless/iwlwifi/dvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/dvm/sta.c
@@ -695,6 +695,7 @@ void iwl_clear_ucode_stations(struct iwl_priv *priv,
 void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 {
         struct iwl_addsta_cmd sta_cmd;
+        static const struct iwl_link_quality_cmd zero_lq = {};
         struct iwl_link_quality_cmd lq;
         int i;
         bool found = false;
@@ -733,7 +734,9 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                                 else
                                         memcpy(&lq, priv->stations[i].lq,
                                                sizeof(struct iwl_link_quality_cmd));
-                                send_lq = true;
+
+                                if (!memcmp(&lq, &zero_lq, sizeof(lq)))
+                                        send_lq = true;
                         }
                         spin_unlock_bh(&priv->sta_lock);
                         ret = iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
diff --git a/drivers/net/wireless/iwlwifi/dvm/testmode.c b/drivers/net/wireless/iwlwifi/dvm/testmode.c
index dc6f965a123a..b89b9d9b9969 100644
--- a/drivers/net/wireless/iwlwifi/dvm/testmode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/testmode.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index d1a670d7b10c..a900aaf47790 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -418,7 +418,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
                                 " Tx flags = 0x%08x, agg.state = %d",
                                 info->flags, tid_data->agg.state);
                         IWL_ERR(priv, "sta_id = %d, tid = %d seq_num = %d",
-                                sta_id, tid, SEQ_TO_SN(tid_data->seq_number));
+                                sta_id, tid,
+                                IEEE80211_SEQ_TO_SN(tid_data->seq_number));
                         goto drop_unlock_sta;
                 }
 
@@ -569,7 +570,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                 return 0;
         }
 
-        tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);
+        tid_data->agg.ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
 
         /* There are still packets for this RA / TID in the HW */
         if (!test_bit(txq_id, priv->agg_q_alloc)) {
@@ -651,7 +652,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
 
         spin_lock_bh(&priv->sta_lock);
         tid_data = &priv->tid_data[sta_id][tid];
-        tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);
+        tid_data->agg.ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
         tid_data->agg.txq_id = txq_id;
 
         *ssn = tid_data->agg.ssn;
@@ -673,6 +674,51 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
         return ret;
 }
 
+int iwlagn_tx_agg_flush(struct iwl_priv *priv, struct ieee80211_vif *vif,
+                        struct ieee80211_sta *sta, u16 tid)
+{
+        struct iwl_tid_data *tid_data;
+        enum iwl_agg_state agg_state;
+        int sta_id, txq_id;
+        sta_id = iwl_sta_id(sta);
+
+        /*
+         * First set the agg state to OFF to avoid calling
+         * ieee80211_stop_tx_ba_cb in iwlagn_check_ratid_empty.
+         */
+        spin_lock_bh(&priv->sta_lock);
+
+        tid_data = &priv->tid_data[sta_id][tid];
+        txq_id = tid_data->agg.txq_id;
+        agg_state = tid_data->agg.state;
+        IWL_DEBUG_TX_QUEUES(priv, "Flush AGG: sta %d tid %d q %d state %d\n",
+                            sta_id, tid, txq_id, tid_data->agg.state);
+
+        tid_data->agg.state = IWL_AGG_OFF;
+
+        spin_unlock_bh(&priv->sta_lock);
+
+        if (iwlagn_txfifo_flush(priv, BIT(txq_id)))
+                IWL_ERR(priv, "Couldn't flush the AGG queue\n");
+
+        if (test_bit(txq_id, priv->agg_q_alloc)) {
+                /*
+                 * If the transport didn't know that we wanted to start
+                 * agreggation, don't tell it that we want to stop them.
+                 * This can happen when we don't get the addBA response on
+                 * time, or we hadn't time to drain the AC queues.
+                 */
+                if (agg_state == IWL_AGG_ON)
+                        iwl_trans_txq_disable(priv->trans, txq_id);
+                else
+                        IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
+                                            agg_state);
+                iwlagn_dealloc_agg_txq(priv, txq_id);
+        }
+
+        return 0;
+}
+
 int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta, u16 tid, u8 buf_size)
 {
@@ -911,7 +957,7 @@ static void iwlagn_count_agg_tx_err_status(struct iwl_priv *priv, u16 status)
 static inline u32 iwlagn_get_scd_ssn(struct iwlagn_tx_resp *tx_resp)
 {
         return le32_to_cpup((__le32 *)&tx_resp->status +
-                            tx_resp->frame_count) & MAX_SN;
+                            tx_resp->frame_count) & IEEE80211_MAX_SN;
 }
 
 static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,
@@ -1148,7 +1194,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 
         if (tx_resp->frame_count == 1) {
                 u16 next_reclaimed = le16_to_cpu(tx_resp->seq_ctl);
-                next_reclaimed = SEQ_TO_SN(next_reclaimed + 0x10);
+                next_reclaimed = IEEE80211_SEQ_TO_SN(next_reclaimed + 0x10);
 
                 if (is_agg) {
                         /* If this is an aggregation queue, we can rely on the
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index 1a4ac9236a44..0a1cdc5e856b 100644
--- a/drivers/net/wireless/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/pcie/1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index ff3389757281..c080ae3070b2 100644
--- a/drivers/net/wireless/iwlwifi/pcie/1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -29,7 +29,6 @@
 #include "iwl-config.h"
 #include "iwl-csr.h"
 #include "iwl-agn-hw.h"
-#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL1000_UCODE_API_MAX 5
diff --git a/drivers/net/wireless/iwlwifi/pcie/2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index e7de33128b16..a6ddd2f9fba0 100644
--- a/drivers/net/wireless/iwlwifi/pcie/2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -28,7 +28,6 @@
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-agn-hw.h"
-#include "cfg.h"
 #include "dvm/commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
diff --git a/drivers/net/wireless/iwlwifi/pcie/5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 5096f7c96ab6..403f3f224bf6 100644
--- a/drivers/net/wireless/iwlwifi/pcie/5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -29,7 +29,6 @@
 #include "iwl-config.h"
 #include "iwl-agn-hw.h"
 #include "iwl-csr.h"
-#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5
diff --git a/drivers/net/wireless/iwlwifi/pcie/6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 801ff49796dd..b5ab8d1bcac0 100644
--- a/drivers/net/wireless/iwlwifi/pcie/6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -28,7 +28,6 @@
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-agn-hw.h"
-#include "cfg.h"
 #include "dvm/commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
diff --git a/drivers/net/wireless/iwlwifi/pcie/7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 6e35b2b72332..50263e87fe15 100644
--- a/drivers/net/wireless/iwlwifi/pcie/7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -1,34 +1,70 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
  *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  *****************************************************************************/
 
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-agn-hw.h"
-#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL7260_UCODE_API_MAX   6
@@ -70,7 +106,6 @@ static const struct iwl_base_params iwl7000_base_params = {
 };
 
 static const struct iwl_ht_params iwl7000_ht_params = {
-        .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
         .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index e9975c54c276..6d73f943cefa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 743b48343358..c38aa8f77554 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -275,4 +275,51 @@ struct iwl_cfg {
         const bool temp_offset_v2;
 };
 
+/*
+ * This list declares the config structures for all devices.
+ */
+extern const struct iwl_cfg iwl5300_agn_cfg;
+extern const struct iwl_cfg iwl5100_agn_cfg;
+extern const struct iwl_cfg iwl5350_agn_cfg;
+extern const struct iwl_cfg iwl5100_bgn_cfg;
+extern const struct iwl_cfg iwl5100_abg_cfg;
+extern const struct iwl_cfg iwl5150_agn_cfg;
+extern const struct iwl_cfg iwl5150_abg_cfg;
+extern const struct iwl_cfg iwl6005_2agn_cfg;
+extern const struct iwl_cfg iwl6005_2abg_cfg;
+extern const struct iwl_cfg iwl6005_2bg_cfg;
+extern const struct iwl_cfg iwl6005_2agn_sff_cfg;
+extern const struct iwl_cfg iwl6005_2agn_d_cfg;
+extern const struct iwl_cfg iwl6005_2agn_mow1_cfg;
+extern const struct iwl_cfg iwl6005_2agn_mow2_cfg;
+extern const struct iwl_cfg iwl1030_bgn_cfg;
+extern const struct iwl_cfg iwl1030_bg_cfg;
+extern const struct iwl_cfg iwl6030_2agn_cfg;
+extern const struct iwl_cfg iwl6030_2abg_cfg;
+extern const struct iwl_cfg iwl6030_2bgn_cfg;
+extern const struct iwl_cfg iwl6030_2bg_cfg;
+extern const struct iwl_cfg iwl6000i_2agn_cfg;
+extern const struct iwl_cfg iwl6000i_2abg_cfg;
+extern const struct iwl_cfg iwl6000i_2bg_cfg;
+extern const struct iwl_cfg iwl6000_3agn_cfg;
+extern const struct iwl_cfg iwl6050_2agn_cfg;
+extern const struct iwl_cfg iwl6050_2abg_cfg;
+extern const struct iwl_cfg iwl6150_bgn_cfg;
+extern const struct iwl_cfg iwl6150_bg_cfg;
+extern const struct iwl_cfg iwl1000_bgn_cfg;
+extern const struct iwl_cfg iwl1000_bg_cfg;
+extern const struct iwl_cfg iwl100_bgn_cfg;
+extern const struct iwl_cfg iwl100_bg_cfg;
+extern const struct iwl_cfg iwl130_bgn_cfg;
+extern const struct iwl_cfg iwl130_bg_cfg;
+extern const struct iwl_cfg iwl2000_2bgn_cfg;
+extern const struct iwl_cfg iwl2000_2bgn_d_cfg;
+extern const struct iwl_cfg iwl2030_2bgn_cfg;
+extern const struct iwl_cfg iwl6035_2agn_cfg;
+extern const struct iwl_cfg iwl105_bgn_cfg;
+extern const struct iwl_cfg iwl105_bgn_d_cfg;
+extern const struct iwl_cfg iwl135_bgn_cfg;
+extern const struct iwl_cfg iwl7260_2ac_cfg;
+extern const struct iwl_cfg iwl3160_ac_cfg;
+
 #endif /* __IWL_CONFIG_H__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index df3463a38704..20e845d4da04 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.c b/drivers/net/wireless/iwlwifi/iwl-debug.c
index 87535a67de76..8a44f594528d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -66,6 +66,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/export.h>
+#include "iwl-drv.h"
 #include "iwl-debug.h"
 #include "iwl-devtrace.h"
 
@@ -85,11 +86,11 @@ void __iwl_ ##fn(struct device *dev, const char *fmt, ...)	\
 }
 
 __iwl_fn(warn)
-EXPORT_SYMBOL_GPL(__iwl_warn);
+IWL_EXPORT_SYMBOL(__iwl_warn);
 __iwl_fn(info)
-EXPORT_SYMBOL_GPL(__iwl_info);
+IWL_EXPORT_SYMBOL(__iwl_info);
 __iwl_fn(crit)
-EXPORT_SYMBOL_GPL(__iwl_crit);
+IWL_EXPORT_SYMBOL(__iwl_crit);
 
 void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
                 const char *fmt, ...)
@@ -110,7 +111,7 @@ void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
         trace_iwlwifi_err(&vaf);
         va_end(args);
 }
-EXPORT_SYMBOL_GPL(__iwl_err);
+IWL_EXPORT_SYMBOL(__iwl_err);
 
 #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
 void __iwl_dbg(struct device *dev,
@@ -133,5 +134,5 @@ void __iwl_dbg(struct device *dev,
         trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
         va_end(args);
 }
-EXPORT_SYMBOL_GPL(__iwl_dbg);
+IWL_EXPORT_SYMBOL(__iwl_dbg);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 81aa91fab5aa..4491c1c72cc7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -298,7 +298,7 @@ TRACE_EVENT(iwlwifi_dbg,
                                        MAX_MSG_LEN, vaf->fmt,
                                        *vaf->va) >= MAX_MSG_LEN);
         ),
-        TP_printk("%s", (char *)__get_dynamic_array(msg))
+        TP_printk("%s", __get_str(msg))
 );
 
 #undef TRACE_SYSTEM
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index fbfd2d137117..39aad9893e0b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -912,8 +912,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
                 }
         }
 
-        IWL_INFO(drv, "loaded firmware version %s", drv->fw.fw_version);
-
         /*
          * In mvm uCode there is no difference between data and instructions
          * sections.
@@ -970,6 +968,9 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
         else
                 op = &iwlwifi_opmode_table[DVM_OP_MODE];
 
+        IWL_INFO(drv, "loaded firmware version %s op_mode %s\n",
+                 drv->fw.fw_version, op->name);
+
         /* add this device to the list of devices using this op_mode */
         list_add_tail(&drv->list, &op->drv);
 
@@ -997,8 +998,13 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
          * else from proceeding if the module fails to load
          * or hangs loading.
          */
-        if (load_module)
-                request_module("%s", op->name);
+        if (load_module) {
+                err = request_module("%s", op->name);
+                if (err)
+                        IWL_ERR(drv,
+                                "failed to load module %s (error %d), is dynamic loading enabled?\n",
+                                op->name, err);
+        }
         return;
 
  try_again:
@@ -1102,7 +1108,7 @@ void iwl_drv_stop(struct iwl_drv *drv)
 
 /* shared module parameters */
 struct iwl_mod_params iwlwifi_mod_params = {
-        .restart_fw = 1,
+        .restart_fw = true,
         .plcp_check = true,
         .bt_coex_active = true,
         .power_level = IWL_POWER_INDEX_1,
@@ -1111,7 +1117,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
         .wd_disable = true,
         /* the rest are 0 by default */
 };
-EXPORT_SYMBOL_GPL(iwlwifi_mod_params);
+IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
 
 int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops)
 {
@@ -1135,7 +1141,7 @@ int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops)
         mutex_unlock(&iwlwifi_opmode_table_mtx);
         return -EIO;
 }
-EXPORT_SYMBOL_GPL(iwl_opmode_register);
+IWL_EXPORT_SYMBOL(iwl_opmode_register);
 
 void iwl_opmode_deregister(const char *name)
 {
@@ -1157,7 +1163,7 @@ void iwl_opmode_deregister(const char *name)
         }
         mutex_unlock(&iwlwifi_opmode_table_mtx);
 }
-EXPORT_SYMBOL_GPL(iwl_opmode_deregister);
+IWL_EXPORT_SYMBOL(iwl_opmode_deregister);
 
 static int __init iwl_drv_init(void)
 {
@@ -1207,8 +1213,8 @@ MODULE_PARM_DESC(11n_disable,
 module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,
                    int, S_IRUGO);
 MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)");
-module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, int, S_IRUGO);
-MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
+module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, bool, S_IRUGO);
+MODULE_PARM_DESC(fw_restart, "restart firmware in case of error (default true)");
 
 module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling,
                    int, S_IRUGO);
@@ -1266,7 +1272,3 @@ module_param_named(auto_agg, iwlwifi_mod_params.auto_agg,
                 bool, S_IRUGO);
 MODULE_PARM_DESC(auto_agg,
                  "enable agg w/o check traffic load (default: enable)");
-
-module_param_named(5ghz_disable, iwlwifi_mod_params.disable_5ghz,
-                bool, S_IRUGO);
-MODULE_PARM_DESC(5ghz_disable, "disable 5GHz band (default: 0 [enabled])");
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h
index 594a5c71b272..7d1450916308 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -63,6 +63,8 @@
 #ifndef __iwl_drv_h__
 #define __iwl_drv_h__
 
+#include <linux/module.h>
+
 /* for all modules */
 #define DRV_NAME        "iwlwifi"
 #define IWLWIFI_VERSION "in-tree:"
@@ -123,4 +125,17 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
  */
 void iwl_drv_stop(struct iwl_drv *drv);
 
+/*
+ * exported symbol management
+ *
+ * The driver can be split into multiple modules, in which case some symbols
+ * must be exported for the sub-modules. However, if it's not split and
+ * everything is built-in, then we can avoid that.
+ */
+#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
+#define IWL_EXPORT_SYMBOL(sym)  EXPORT_SYMBOL_GPL(sym)
+#else
+#define IWL_EXPORT_SYMBOL(sym)
+#endif
+
 #endif /* __iwl_drv_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index 034f2ff4f43d..600c9fdd7f71 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -62,6 +62,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include "iwl-drv.h"
 #include "iwl-modparams.h"
 #include "iwl-eeprom-parse.h"
 
@@ -749,7 +750,7 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
         }
 
         ht_info->ht_supported = true;
-        ht_info->cap = 0;
+        ht_info->cap = IEEE80211_HT_CAP_DSSSCCK40;
 
         if (iwlwifi_mod_params.amsdu_size_8K)
                 ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
@@ -909,7 +910,7 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
         kfree(data);
         return NULL;
 }
-EXPORT_SYMBOL_GPL(iwl_parse_eeprom_data);
+IWL_EXPORT_SYMBOL(iwl_parse_eeprom_data);
 
 /* helper functions */
 int iwl_nvm_check_version(struct iwl_nvm_data *data,
@@ -928,4 +929,4 @@ int iwl_nvm_check_version(struct iwl_nvm_data *data,
                 data->calib_version,  trans->cfg->nvm_calib_ver);
         return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(iwl_nvm_check_version);
+IWL_EXPORT_SYMBOL(iwl_nvm_check_version);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
index 683fe6a8c58f..37f115390b19 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
index ef4806f27cf8..e5f2e362ab0b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -63,6 +63,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 
+#include "iwl-drv.h"
 #include "iwl-debug.h"
 #include "iwl-eeprom-read.h"
 #include "iwl-io.h"
@@ -460,4 +461,4 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(iwl_read_eeprom);
+IWL_EXPORT_SYMBOL(iwl_read_eeprom);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
index b2588c5cbf93..8e941f8bd7d6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index f5592fb3b1ed..484d318245fb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index 90873eca35f7..8b6c6fd95ed0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index b545178e46e3..c4c446d41eb0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -73,12 +73,14 @@
  *      treats good CRC threshold as a boolean
  * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
  * @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.
+ * @IWL_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS
  */
 enum iwl_ucode_tlv_flag {
         IWL_UCODE_TLV_FLAGS_PAN         = BIT(0),
         IWL_UCODE_TLV_FLAGS_NEWSCAN     = BIT(1),
         IWL_UCODE_TLV_FLAGS_MFP         = BIT(2),
         IWL_UCODE_TLV_FLAGS_P2P         = BIT(3),
+        IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4),
 };
 
 /* The default calibrate table size if not specified by firmware file */
@@ -152,6 +154,19 @@ struct iwl_tlv_calib_ctrl {
         __le32 event_trigger;
 } __packed;
 
+enum iwl_fw_phy_cfg {
+        FW_PHY_CFG_RADIO_TYPE_POS = 0,
+        FW_PHY_CFG_RADIO_TYPE = 0x3 << FW_PHY_CFG_RADIO_TYPE_POS,
+        FW_PHY_CFG_RADIO_STEP_POS = 2,
+        FW_PHY_CFG_RADIO_STEP = 0x3 << FW_PHY_CFG_RADIO_STEP_POS,
+        FW_PHY_CFG_RADIO_DASH_POS = 4,
+        FW_PHY_CFG_RADIO_DASH = 0x3 << FW_PHY_CFG_RADIO_DASH_POS,
+        FW_PHY_CFG_TX_CHAIN_POS = 16,
+        FW_PHY_CFG_TX_CHAIN = 0xf << FW_PHY_CFG_TX_CHAIN_POS,
+        FW_PHY_CFG_RX_CHAIN_POS = 20,
+        FW_PHY_CFG_RX_CHAIN = 0xf << FW_PHY_CFG_RX_CHAIN_POS,
+};
+
 /**
  * struct iwl_fw - variables associated with the firmware
  *
@@ -188,4 +203,16 @@ struct iwl_fw {
         bool mvm_fw;
 };
 
+static inline u8 iwl_fw_valid_tx_ant(const struct iwl_fw *fw)
+{
+        return (fw->phy_config & FW_PHY_CFG_TX_CHAIN) >>
+                FW_PHY_CFG_TX_CHAIN_POS;
+}
+
+static inline u8 iwl_fw_valid_rx_ant(const struct iwl_fw *fw)
+{
+        return (fw->phy_config & FW_PHY_CFG_RX_CHAIN) >>
+                FW_PHY_CFG_RX_CHAIN_POS;
+}
+
 #endif  /* __iwl_fw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 276410d82de4..305c81f2c2b4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -29,6 +29,7 @@
 #include <linux/device.h>
 #include <linux/export.h>
 
+#include "iwl-drv.h"
 #include "iwl-io.h"
 #include "iwl-csr.h"
 #include "iwl-debug.h"
@@ -49,7 +50,7 @@ int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
 
         return -ETIMEDOUT;
 }
-EXPORT_SYMBOL_GPL(iwl_poll_bit);
+IWL_EXPORT_SYMBOL(iwl_poll_bit);
 
 u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 {
@@ -62,7 +63,7 @@ u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 
         return value;
 }
-EXPORT_SYMBOL_GPL(iwl_read_direct32);
+IWL_EXPORT_SYMBOL(iwl_read_direct32);
 
 void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
 {
@@ -73,7 +74,7 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
                 iwl_trans_release_nic_access(trans, &flags);
         }
 }
-EXPORT_SYMBOL_GPL(iwl_write_direct32);
+IWL_EXPORT_SYMBOL(iwl_write_direct32);
 
 int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
                         int timeout)
@@ -89,7 +90,7 @@ int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
 
         return -ETIMEDOUT;
 }
-EXPORT_SYMBOL_GPL(iwl_poll_direct_bit);
+IWL_EXPORT_SYMBOL(iwl_poll_direct_bit);
 
 static inline u32 __iwl_read_prph(struct iwl_trans *trans, u32 ofs)
 {
@@ -115,7 +116,7 @@ u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs)
         }
         return val;
 }
-EXPORT_SYMBOL_GPL(iwl_read_prph);
+IWL_EXPORT_SYMBOL(iwl_read_prph);
 
 void iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val)
 {
@@ -126,7 +127,7 @@ void iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val)
                 iwl_trans_release_nic_access(trans, &flags);
         }
 }
-EXPORT_SYMBOL_GPL(iwl_write_prph);
+IWL_EXPORT_SYMBOL(iwl_write_prph);
 
 void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
 {
@@ -138,7 +139,7 @@ void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
                 iwl_trans_release_nic_access(trans, &flags);
         }
 }
-EXPORT_SYMBOL_GPL(iwl_set_bits_prph);
+IWL_EXPORT_SYMBOL(iwl_set_bits_prph);
 
 void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
                             u32 bits, u32 mask)
@@ -151,7 +152,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
                 iwl_trans_release_nic_access(trans, &flags);
         }
 }
-EXPORT_SYMBOL_GPL(iwl_set_bits_mask_prph);
+IWL_EXPORT_SYMBOL(iwl_set_bits_mask_prph);
 
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
 {
@@ -164,4 +165,4 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
                 iwl_trans_release_nic_access(trans, &flags);
         }
 }
-EXPORT_SYMBOL_GPL(iwl_clear_bits_prph);
+IWL_EXPORT_SYMBOL(iwl_clear_bits_prph);
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h
index 2c2a729092f5..d6f6c37c09fd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -103,13 +103,12 @@ enum iwl_power_level {
  * @ant_coupling: antenna coupling in dB, default = 0
  * @bt_ch_announce: BT channel inhibition, default = enable
  * @auto_agg: enable agg. without check, default = true
- * @disable_5ghz: disable 5GHz capability, default = false
  */
 struct iwl_mod_params {
         int sw_crypto;
         unsigned int disable_11n;
         int amsdu_size_8K;
-        int restart_fw;
+        bool restart_fw;
         bool plcp_check;
         int  wd_disable;
         bool bt_coex_active;
@@ -120,7 +119,6 @@ struct iwl_mod_params {
         int ant_coupling;
         bool bt_ch_announce;
         bool auto_agg;
-        bool disable_5ghz;
 };
 
 #endif /* #__iwl_modparams_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index c3affbc62cdf..940b8a9d5285 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -63,6 +63,7 @@
 #include <linux/sched.h>
 #include <linux/export.h>
 
+#include "iwl-drv.h"
 #include "iwl-notif-wait.h"
 
 
@@ -72,7 +73,7 @@ void iwl_notification_wait_init(struct iwl_notif_wait_data *notif_wait)
         INIT_LIST_HEAD(&notif_wait->notif_waits);
         init_waitqueue_head(&notif_wait->notif_waitq);
 }
-EXPORT_SYMBOL_GPL(iwl_notification_wait_init);
+IWL_EXPORT_SYMBOL(iwl_notification_wait_init);
 
 void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
                                   struct iwl_rx_packet *pkt)
@@ -117,7 +118,7 @@ void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
         if (triggered)
                 wake_up_all(&notif_wait->notif_waitq);
 }
-EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);
+IWL_EXPORT_SYMBOL(iwl_notification_wait_notify);
 
 void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 {
@@ -130,7 +131,7 @@ void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 
         wake_up_all(&notif_wait->notif_waitq);
 }
-EXPORT_SYMBOL_GPL(iwl_abort_notification_waits);
+IWL_EXPORT_SYMBOL(iwl_abort_notification_waits);
 
 void
 iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
@@ -154,7 +155,7 @@ iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
         list_add(&wait_entry->list, &notif_wait->notif_waits);
         spin_unlock_bh(&notif_wait->notif_wait_lock);
 }
-EXPORT_SYMBOL_GPL(iwl_init_notification_wait);
+IWL_EXPORT_SYMBOL(iwl_init_notification_wait);
 
 int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
                           struct iwl_notification_wait *wait_entry,
@@ -178,7 +179,7 @@ int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
                 return -ETIMEDOUT;
         return 0;
 }
-EXPORT_SYMBOL_GPL(iwl_wait_notification);
+IWL_EXPORT_SYMBOL(iwl_wait_notification);
 
 void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
                              struct iwl_notification_wait *wait_entry)
@@ -187,4 +188,4 @@ void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
         list_del(&wait_entry->list);
         spin_unlock_bh(&notif_wait->notif_wait_lock);
 }
-EXPORT_SYMBOL_GPL(iwl_remove_notification);
+IWL_EXPORT_SYMBOL(iwl_remove_notification);
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h b/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
index c2ce764463a3..2e2f1c8c99f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index a70213bdb83c..6199a0a597a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -62,6 +62,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include "iwl-drv.h"
 #include "iwl-modparams.h"
 #include "iwl-nvm-parse.h"
 
@@ -149,6 +150,8 @@ static struct ieee80211_rate iwl_cfg80211_rates[] = {
  * @NVM_CHANNEL_DFS: dynamic freq selection candidate
  * @NVM_CHANNEL_WIDE: 20 MHz channel okay (?)
  * @NVM_CHANNEL_40MHZ: 40 MHz channel okay (?)
+ * @NVM_CHANNEL_80MHZ: 80 MHz channel okay (?)
+ * @NVM_CHANNEL_160MHZ: 160 MHz channel okay (?)
  */
 enum iwl_nvm_channel_flags {
         NVM_CHANNEL_VALID = BIT(0),
@@ -158,6 +161,8 @@ enum iwl_nvm_channel_flags {
         NVM_CHANNEL_DFS = BIT(7),
         NVM_CHANNEL_WIDE = BIT(8),
         NVM_CHANNEL_40MHZ = BIT(9),
+        NVM_CHANNEL_80MHZ = BIT(10),
+        NVM_CHANNEL_160MHZ = BIT(11),
 };
 
 #define CHECK_AND_PRINT_I(x)    \
@@ -210,6 +215,10 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                         else
                                 channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
                 }
+                if (!(ch_flags & NVM_CHANNEL_80MHZ))
+                        channel->flags |= IEEE80211_CHAN_NO_80MHZ;
+                if (!(ch_flags & NVM_CHANNEL_160MHZ))
+                        channel->flags |= IEEE80211_CHAN_NO_160MHZ;
 
                 if (!(ch_flags & NVM_CHANNEL_IBSS))
                         channel->flags |= IEEE80211_CHAN_NO_IBSS;
@@ -245,6 +254,43 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
         return n_channels;
 }
 
+static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,
+                                  struct iwl_nvm_data *data,
+                                  struct ieee80211_sta_vht_cap *vht_cap)
+{
+        /* For now, assume new devices with NVM are VHT capable */
+
+        vht_cap->vht_supported = true;
+
+        vht_cap->cap = IEEE80211_VHT_CAP_SHORT_GI_80 |
+                       IEEE80211_VHT_CAP_RXSTBC_1 |
+                       IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
+                       7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;
+
+        if (iwlwifi_mod_params.amsdu_size_8K)
+                vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;
+
+        vht_cap->vht_mcs.rx_mcs_map =
+                cpu_to_le16(IEEE80211_VHT_MCS_SUPPORT_0_9 << 0 |
+                            IEEE80211_VHT_MCS_SUPPORT_0_9 << 2 |
+                            IEEE80211_VHT_MCS_NOT_SUPPORTED << 4 |
+                            IEEE80211_VHT_MCS_NOT_SUPPORTED << 6 |
+                            IEEE80211_VHT_MCS_NOT_SUPPORTED << 8 |
+                            IEEE80211_VHT_MCS_NOT_SUPPORTED << 10 |
+                            IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |
+                            IEEE80211_VHT_MCS_NOT_SUPPORTED << 14);
+
+        if (data->valid_rx_ant == 1 || cfg->rx_with_siso_diversity) {
+                vht_cap->cap |= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |
+                                IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;
+                /* this works because NOT_SUPPORTED == 3 */
+                vht_cap->vht_mcs.rx_mcs_map |=
+                        cpu_to_le16(IEEE80211_VHT_MCS_NOT_SUPPORTED << 2);
+        }
+
+        vht_cap->vht_mcs.tx_mcs_map = vht_cap->vht_mcs.rx_mcs_map;
+}
+
 static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
                             struct iwl_nvm_data *data, const __le16 *nvm_sw)
 {
@@ -268,6 +314,7 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
         n_used += iwl_init_sband_channels(data, sband, n_channels,
                                           IEEE80211_BAND_5GHZ);
         iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ);
+        iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap);
 
         if (n_channels != n_used)
                 IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n",
@@ -343,4 +390,4 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
 
         return data;
 }
-EXPORT_SYMBOL_GPL(iwl_parse_nvm_data);
+IWL_EXPORT_SYMBOL(iwl_parse_nvm_data);
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
index b2692bd287fa..e57fb989661e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index 4a680019e117..98c7aa7346da 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
index 3392011a8768..25745daa0d5d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -65,6 +65,7 @@
 #include <linux/string.h>
 #include <linux/export.h>
 
+#include "iwl-drv.h"
 #include "iwl-phy-db.h"
 #include "iwl-debug.h"
 #include "iwl-op-mode.h"
@@ -149,7 +150,7 @@ struct iwl_phy_db *iwl_phy_db_init(struct iwl_trans *trans)
         /* TODO: add default values of the phy db. */
         return phy_db;
 }
-EXPORT_SYMBOL(iwl_phy_db_init);
+IWL_EXPORT_SYMBOL(iwl_phy_db_init);
 
 /*
  * get phy db section: returns a pointer to a phy db section specified by
@@ -215,7 +216,7 @@ void iwl_phy_db_free(struct iwl_phy_db *phy_db)
 
         kfree(phy_db);
 }
-EXPORT_SYMBOL(iwl_phy_db_free);
+IWL_EXPORT_SYMBOL(iwl_phy_db_free);
 
 int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt,
                            gfp_t alloc_ctx)
@@ -260,7 +261,7 @@ int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt,
 
         return 0;
 }
-EXPORT_SYMBOL(iwl_phy_db_set_section);
+IWL_EXPORT_SYMBOL(iwl_phy_db_set_section);
 
 static int is_valid_channel(u16 ch_id)
 {
@@ -495,4 +496,4 @@ int iwl_send_phy_db_data(struct iwl_phy_db *phy_db)
                        "Finished sending phy db non channel data\n");
         return 0;
 }
-EXPORT_SYMBOL(iwl_send_phy_db_data);
+IWL_EXPORT_SYMBOL(iwl_send_phy_db_data);
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
index d0e43d96ab38..ce983af79644 100644
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.h
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index f76e9cad7757..386f2a7c87cb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-test.c b/drivers/net/wireless/iwlwifi/iwl-test.c
index ce0c67b425ee..5cfd55b86ed3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-test.c
+++ b/drivers/net/wireless/iwlwifi/iwl-test.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -64,6 +64,7 @@
 #include <linux/export.h>
 #include <net/netlink.h>
 
+#include "iwl-drv.h"
 #include "iwl-io.h"
 #include "iwl-fh.h"
 #include "iwl-prph.h"
@@ -271,7 +272,7 @@ static int iwl_test_fw_cmd(struct iwl_test *tst, struct nlattr **tb)
 
         reply_len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
         skb = iwl_test_alloc_reply(tst, reply_len + 20);
-        reply_buf = kmalloc(reply_len, GFP_KERNEL);
+        reply_buf = kmemdup(&pkt->hdr, reply_len, GFP_KERNEL);
         if (!skb || !reply_buf) {
                 kfree_skb(skb);
                 kfree(reply_buf);
@@ -279,7 +280,6 @@ static int iwl_test_fw_cmd(struct iwl_test *tst, struct nlattr **tb)
         }
 
         /* The reply is in a page, that we cannot send to user space. */
-        memcpy(reply_buf, &(pkt->hdr), reply_len);
         iwl_free_resp(&cmd);
 
         if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
@@ -653,7 +653,7 @@ int iwl_test_parse(struct iwl_test *tst, struct nlattr **tb,
         }
         return 0;
 }
-EXPORT_SYMBOL_GPL(iwl_test_parse);
+IWL_EXPORT_SYMBOL(iwl_test_parse);
 
 /*
  * Handle test commands.
@@ -715,7 +715,7 @@ int iwl_test_handle_cmd(struct iwl_test *tst, struct nlattr **tb)
         }
         return result;
 }
-EXPORT_SYMBOL_GPL(iwl_test_handle_cmd);
+IWL_EXPORT_SYMBOL(iwl_test_handle_cmd);
 
 static int iwl_test_trace_dump(struct iwl_test *tst, struct sk_buff *skb,
                                struct netlink_callback *cb)
@@ -803,7 +803,7 @@ int iwl_test_dump(struct iwl_test *tst, u32 cmd, struct sk_buff *skb,
         }
         return result;
 }
-EXPORT_SYMBOL_GPL(iwl_test_dump);
+IWL_EXPORT_SYMBOL(iwl_test_dump);
 
 /*
  * Multicast a spontaneous messages from the device to the user space.
@@ -849,4 +849,4 @@ void iwl_test_rx(struct iwl_test *tst, struct iwl_rx_cmd_buffer *rxb)
         if (tst->notify)
                 iwl_test_send_rx(tst, rxb);
 }
-EXPORT_SYMBOL_GPL(iwl_test_rx);
+IWL_EXPORT_SYMBOL(iwl_test_rx);
diff --git a/drivers/net/wireless/iwlwifi/iwl-test.h b/drivers/net/wireless/iwlwifi/iwl-test.h
index 7fbf4d717caa..8fbd21704840 100644
--- a/drivers/net/wireless/iwlwifi/iwl-test.h
+++ b/drivers/net/wireless/iwlwifi/iwl-test.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/iwl-testmode.h
index a963f45c6849..98f48a9afc98 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 0cac2b7af78b..7a13790b5bfe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -114,9 +114,6 @@
  * completely agnostic to these differences.
  * The transport does provide helper functionnality (i.e. SYNC / ASYNC mode),
  */
-#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
-#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
 #define SEQ_TO_QUEUE(s) (((s) >> 8) & 0x1f)
 #define QUEUE_TO_SEQ(q) (((q) & 0x1f) << 8)
 #define SEQ_TO_INDEX(s) ((s) & 0xff)
@@ -308,7 +305,6 @@ static inline void iwl_free_rxb(struct iwl_rx_cmd_buffer *r)
  * currently supports
  */
 #define IWL_MAX_HW_QUEUES               32
-#define IWL_INVALID_STATION     255
 #define IWL_MAX_TID_COUNT       8
 #define IWL_FRAME_LIMIT 64
 
@@ -685,7 +681,7 @@ static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,
 static inline void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue,
                                            int fifo)
 {
-        iwl_trans_txq_enable(trans, queue, fifo, IWL_INVALID_STATION,
+        iwl_trans_txq_enable(trans, queue, fifo, -1,
                              IWL_MAX_TID_COUNT, IWL_FRAME_LIMIT, 0);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/Makefile b/drivers/net/wireless/iwlwifi/mvm/Makefile
index 807b250ec396..2acc44b40986 100644
--- a/drivers/net/wireless/iwlwifi/mvm/Makefile
+++ b/drivers/net/wireless/iwlwifi/mvm/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_IWLMVM)   += iwlmvm.o
 iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o
 iwlmvm-y += utils.o rx.o tx.o binding.o quota.o sta.o
 iwlmvm-y += scan.o time-event.o rs.o
-iwlmvm-y += power.o
+iwlmvm-y += power.o bt-coex.o
 iwlmvm-y += led.o
 iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o
 iwlmvm-$(CONFIG_PM_SLEEP) += d3.o
diff --git a/drivers/net/wireless/iwlwifi/mvm/binding.c b/drivers/net/wireless/iwlwifi/mvm/binding.c
index 73d24aacb90a..93fd1457954b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/binding.c
+++ b/drivers/net/wireless/iwlwifi/mvm/binding.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
new file mode 100644
index 000000000000..810bfa5f6de0
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -0,0 +1,589 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#include <net/mac80211.h>
+
+#include "fw-api-bt-coex.h"
+#include "iwl-modparams.h"
+#include "mvm.h"
+#include "iwl-debug.h"
+
+#define EVENT_PRIO_ANT(_evt, _prio, _shrd_ant)                  \
+        [(_evt)] = (((_prio) << BT_COEX_PRIO_TBL_PRIO_POS) |    \
+                   ((_shrd_ant) << BT_COEX_PRIO_TBL_SHRD_ANT_POS))
+
+static const u8 iwl_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_INIT_CALIB1,
+                       BT_COEX_PRIO_TBL_PRIO_BYPASS, 0),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_INIT_CALIB2,
+                       BT_COEX_PRIO_TBL_PRIO_BYPASS, 1),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_LOW1,
+                       BT_COEX_PRIO_TBL_PRIO_LOW, 0),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_LOW2,
+                       BT_COEX_PRIO_TBL_PRIO_LOW, 1),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_HIGH1,
+                       BT_COEX_PRIO_TBL_PRIO_HIGH, 0),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_HIGH2,
+                       BT_COEX_PRIO_TBL_PRIO_HIGH, 1),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_DTIM,
+                       BT_COEX_PRIO_TBL_DISABLED, 0),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_SCAN52,
+                       BT_COEX_PRIO_TBL_PRIO_COEX_OFF, 0),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_SCAN24,
+                       BT_COEX_PRIO_TBL_PRIO_COEX_ON, 0),
+        EVENT_PRIO_ANT(BT_COEX_PRIO_TBL_EVT_IDLE,
+                       BT_COEX_PRIO_TBL_PRIO_COEX_IDLE, 0),
+        0, 0, 0, 0, 0, 0,
+};
+
+#undef EVENT_PRIO_ANT
+
+/* BT Antenna Coupling Threshold (dB) */
+#define IWL_BT_ANTENNA_COUPLING_THRESHOLD       (35)
+#define IWL_BT_LOAD_FORCE_SISO_THRESHOLD        (3)
+
+#define BT_ENABLE_REDUCED_TXPOWER_THRESHOLD     (-62)
+#define BT_DISABLE_REDUCED_TXPOWER_THRESHOLD    (-65)
+#define BT_REDUCED_TX_POWER_BIT                 BIT(7)
+
+static inline bool is_loose_coex(void)
+{
+        return iwlwifi_mod_params.ant_coupling >
+                IWL_BT_ANTENNA_COUPLING_THRESHOLD;
+}
+
+int iwl_send_bt_prio_tbl(struct iwl_mvm *mvm)
+{
+        return iwl_mvm_send_cmd_pdu(mvm, BT_COEX_PRIO_TABLE, CMD_SYNC,
+                                    sizeof(struct iwl_bt_coex_prio_tbl_cmd),
+                                    &iwl_bt_prio_tbl);
+}
+
+static int iwl_send_bt_env(struct iwl_mvm *mvm, u8 action, u8 type)
+{
+        struct iwl_bt_coex_prot_env_cmd env_cmd;
+        int ret;
+
+        env_cmd.action = action;
+        env_cmd.type = type;
+        ret = iwl_mvm_send_cmd_pdu(mvm, BT_COEX_PROT_ENV, CMD_SYNC,
+                                   sizeof(env_cmd), &env_cmd);
+        if (ret)
+                IWL_ERR(mvm, "failed to send BT env command\n");
+        return ret;
+}
+
+enum iwl_bt_kill_msk {
+        BT_KILL_MSK_DEFAULT,
+        BT_KILL_MSK_SCO_HID_A2DP,
+        BT_KILL_MSK_REDUCED_TXPOW,
+        BT_KILL_MSK_MAX,
+};
+
+static const u32 iwl_bt_ack_kill_msk[BT_KILL_MSK_MAX] = {
+        [BT_KILL_MSK_DEFAULT] = 0xffff0000,
+        [BT_KILL_MSK_SCO_HID_A2DP] = 0xffffffff,
+        [BT_KILL_MSK_REDUCED_TXPOW] = 0,
+};
+
+static const u32 iwl_bt_cts_kill_msk[BT_KILL_MSK_MAX] = {
+        [BT_KILL_MSK_DEFAULT] = 0xffff0000,
+        [BT_KILL_MSK_SCO_HID_A2DP] = 0xffffffff,
+        [BT_KILL_MSK_REDUCED_TXPOW] = 0,
+};
+
+#define IWL_BT_DEFAULT_BOOST (0xf0f0f0f0)
+
+/* Tight Coex */
+static const __le32 iwl_tight_lookup[BT_COEX_LUT_SIZE] = {
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaeaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xcc00ff28),
+        cpu_to_le32(0x0000aaaa),
+        cpu_to_le32(0xcc00aaaa),
+        cpu_to_le32(0x0000aaaa),
+        cpu_to_le32(0xc0004000),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0xf0005000),
+        cpu_to_le32(0xf0005000),
+};
+
+/* Loose Coex */
+static const __le32 iwl_loose_lookup[BT_COEX_LUT_SIZE] = {
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaeaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xcc00ff28),
+        cpu_to_le32(0x0000aaaa),
+        cpu_to_le32(0xcc00aaaa),
+        cpu_to_le32(0x0000aaaa),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0xf0005000),
+        cpu_to_le32(0xf0005000),
+};
+
+/* Full concurrency */
+static const __le32 iwl_concurrent_lookup[BT_COEX_LUT_SIZE] = {
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0x00000000),
+};
+
+int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
+{
+        struct iwl_bt_coex_cmd cmd = {
+                .max_kill = 5,
+                .bt3_time_t7_value = 1,
+                .bt3_prio_sample_time = 2,
+                .bt3_timer_t2_value = 0xc,
+        };
+        int ret;
+
+        cmd.flags = iwlwifi_mod_params.bt_coex_active ?
+                        BT_COEX_NW : BT_COEX_DISABLE;
+        cmd.flags |= BT_CH_PRIMARY_EN | BT_SYNC_2_BT_DISABLE;
+
+        cmd.valid_bit_msk = cpu_to_le16(BT_VALID_ENABLE |
+                                        BT_VALID_BT_PRIO_BOOST |
+                                        BT_VALID_MAX_KILL |
+                                        BT_VALID_3W_TMRS |
+                                        BT_VALID_KILL_ACK |
+                                        BT_VALID_KILL_CTS |
+                                        BT_VALID_REDUCED_TX_POWER |
+                                        BT_VALID_LUT);
+
+        if (is_loose_coex())
+                memcpy(&cmd.decision_lut, iwl_loose_lookup,
+                       sizeof(iwl_tight_lookup));
+        else
+                memcpy(&cmd.decision_lut, iwl_tight_lookup,
+                       sizeof(iwl_tight_lookup));
+
+        cmd.bt_prio_boost = cpu_to_le32(IWL_BT_DEFAULT_BOOST);
+        cmd.kill_ack_msk =
+                cpu_to_le32(iwl_bt_ack_kill_msk[BT_KILL_MSK_DEFAULT]);
+        cmd.kill_cts_msk =
+                cpu_to_le32(iwl_bt_cts_kill_msk[BT_KILL_MSK_DEFAULT]);
+
+        memset(&mvm->last_bt_notif, 0, sizeof(mvm->last_bt_notif));
+
+        /* go to CALIB state in internal BT-Coex state machine */
+        ret = iwl_send_bt_env(mvm, BT_COEX_ENV_OPEN,
+                              BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
+        if (ret)
+                return ret;
+
+        ret  = iwl_send_bt_env(mvm, BT_COEX_ENV_CLOSE,
+                               BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
+        if (ret)
+                return ret;
+
+        return iwl_mvm_send_cmd_pdu(mvm, BT_CONFIG, CMD_SYNC,
+                                    sizeof(cmd), &cmd);
+}
+
+static int iwl_mvm_bt_udpate_ctrl_kill_msk(struct iwl_mvm *mvm,
+                                           bool reduced_tx_power)
+{
+        enum iwl_bt_kill_msk bt_kill_msk;
+        struct iwl_bt_coex_cmd cmd = {};
+        struct iwl_bt_coex_profile_notif *notif = &mvm->last_bt_notif;
+
+        lockdep_assert_held(&mvm->mutex);
+
+        if (reduced_tx_power) {
+                /* Reduced Tx power has precedence on the type of the profile */
+                bt_kill_msk = BT_KILL_MSK_REDUCED_TXPOW;
+        } else {
+                /* Low latency BT profile is active: give higher prio to BT */
+                if (BT_MBOX_MSG(notif, 3, SCO_STATE)  ||
+                    BT_MBOX_MSG(notif, 3, A2DP_STATE) ||
+                    BT_MBOX_MSG(notif, 3, SNIFF_STATE))
+                        bt_kill_msk = BT_KILL_MSK_SCO_HID_A2DP;
+                else
+                        bt_kill_msk = BT_KILL_MSK_DEFAULT;
+        }
+
+        IWL_DEBUG_COEX(mvm,
+                       "Update kill_msk: %d - SCO %sactive A2DP %sactive SNIFF %sactive\n",
+                       bt_kill_msk,
+                       BT_MBOX_MSG(notif, 3, SCO_STATE) ? "" : "in",
+                       BT_MBOX_MSG(notif, 3, A2DP_STATE) ? "" : "in",
+                       BT_MBOX_MSG(notif, 3, SNIFF_STATE) ? "" : "in");
+
+        /* Don't send HCMD if there is no update */
+        if (bt_kill_msk == mvm->bt_kill_msk)
+                return 0;
+
+        mvm->bt_kill_msk = bt_kill_msk;
+        cmd.kill_ack_msk = cpu_to_le32(iwl_bt_ack_kill_msk[bt_kill_msk]);
+        cmd.kill_cts_msk = cpu_to_le32(iwl_bt_cts_kill_msk[bt_kill_msk]);
+        cmd.valid_bit_msk = cpu_to_le16(BT_VALID_KILL_ACK | BT_VALID_KILL_CTS);
+
+        IWL_DEBUG_COEX(mvm, "bt_kill_msk = %d\n", bt_kill_msk);
+        return iwl_mvm_send_cmd_pdu(mvm, BT_CONFIG, CMD_SYNC,
+                                    sizeof(cmd), &cmd);
+}
+
+static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
+                                       bool enable)
+{
+        struct iwl_bt_coex_cmd cmd = {
+                .valid_bit_msk = cpu_to_le16(BT_VALID_REDUCED_TX_POWER),
+                .bt_reduced_tx_power = sta_id,
+        };
+        struct ieee80211_sta *sta;
+        struct iwl_mvm_sta *mvmsta;
+
+        /* This can happen if the station has been removed right now */
+        if (sta_id == IWL_MVM_STATION_COUNT)
+                return 0;
+
+        sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[sta_id],
+                                        lockdep_is_held(&mvm->mutex));
+        mvmsta = (void *)sta->drv_priv;
+
+        /* nothing to do */
+        if (mvmsta->bt_reduced_txpower == enable)
+                return 0;
+
+        if (enable)
+                cmd.bt_reduced_tx_power |= BT_REDUCED_TX_POWER_BIT;
+
+        IWL_DEBUG_COEX(mvm, "%sable reduced Tx Power for sta %d\n",
+                       enable ? "en" : "dis", sta_id);
+
+        mvmsta->bt_reduced_txpower = enable;
+
+        /* Send ASYNC since this can be sent from an atomic context */
+        return iwl_mvm_send_cmd_pdu(mvm, BT_CONFIG, CMD_ASYNC,
+                                    sizeof(cmd), &cmd);
+}
+
+struct iwl_bt_iterator_data {
+        struct iwl_bt_coex_profile_notif *notif;
+        struct iwl_mvm *mvm;
+        u32 num_bss_ifaces;
+        bool reduced_tx_power;
+};
+
+static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
+                                      struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_bt_iterator_data *data = _data;
+        struct iwl_mvm *mvm = data->mvm;
+        struct ieee80211_chanctx_conf *chanctx_conf;
+        enum ieee80211_smps_mode smps_mode;
+        enum ieee80211_band band;
+        int ave_rssi;
+
+        if (vif->type != NL80211_IFTYPE_STATION)
+                return;
+
+        rcu_read_lock();
+        chanctx_conf = rcu_dereference(vif->chanctx_conf);
+        if (chanctx_conf && chanctx_conf->def.chan)
+                band = chanctx_conf->def.chan->band;
+        else
+                band = -1;
+        rcu_read_unlock();
+
+        smps_mode = IEEE80211_SMPS_AUTOMATIC;
+
+        if (band != IEEE80211_BAND_2GHZ) {
+                ieee80211_request_smps(vif, smps_mode);
+                return;
+        }
+
+        if (data->notif->bt_status)
+                smps_mode = IEEE80211_SMPS_DYNAMIC;
+
+        if (data->notif->bt_traffic_load >= IWL_BT_LOAD_FORCE_SISO_THRESHOLD)
+                smps_mode = IEEE80211_SMPS_STATIC;
+
+        IWL_DEBUG_COEX(data->mvm,
+                       "mac %d: bt_status %d traffic_load %d smps_req %d\n",
+                       mvmvif->id,  data->notif->bt_status,
+                       data->notif->bt_traffic_load, smps_mode);
+
+        ieee80211_request_smps(vif, smps_mode);
+
+        /* don't reduce the Tx power if in loose scheme */
+        if (is_loose_coex())
+                return;
+
+        data->num_bss_ifaces++;
+
+        /* reduced Txpower only if there are open BT connections, so ...*/
+        if (!BT_MBOX_MSG(data->notif, 3, OPEN_CON_2)) {
+                /* ... cancel reduced Tx power ... */
+                if (iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, false))
+                        IWL_ERR(mvm, "Couldn't send BT_CONFIG cmd\n");
+                data->reduced_tx_power = false;
+
+                /* ... and there is no need to get reports on RSSI any more. */
+                ieee80211_disable_rssi_reports(vif);
+                return;
+        }
+
+        ave_rssi = ieee80211_ave_rssi(vif);
+
+        /* if the RSSI isn't valid, fake it is very low */
+        if (!ave_rssi)
+                ave_rssi = -100;
+        if (ave_rssi > BT_ENABLE_REDUCED_TXPOWER_THRESHOLD) {
+                if (iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, true))
+                        IWL_ERR(mvm, "Couldn't send BT_CONFIG cmd\n");
+
+                /*
+                 * bt_kill_msk can be BT_KILL_MSK_REDUCED_TXPOW only if all the
+                 * BSS / P2P clients have rssi above threshold.
+                 * We set the bt_kill_msk to BT_KILL_MSK_REDUCED_TXPOW before
+                 * the iteration, if one interface's rssi isn't good enough,
+                 * bt_kill_msk will be set to default values.
+                 */
+        } else if (ave_rssi < BT_DISABLE_REDUCED_TXPOWER_THRESHOLD) {
+                if (iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, false))
+                        IWL_ERR(mvm, "Couldn't send BT_CONFIG cmd\n");
+
+                /*
+                 * One interface hasn't rssi above threshold, bt_kill_msk must
+                 * be set to default values.
+                 */
+                data->reduced_tx_power = false;
+        }
+
+        /* Begin to monitor the RSSI: it may influence the reduced Tx power */
+        ieee80211_enable_rssi_reports(vif, BT_DISABLE_REDUCED_TXPOWER_THRESHOLD,
+                                      BT_ENABLE_REDUCED_TXPOWER_THRESHOLD);
+}
+
+static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)
+{
+        struct iwl_bt_iterator_data data = {
+                .mvm = mvm,
+                .notif = &mvm->last_bt_notif,
+                .reduced_tx_power = true,
+        };
+
+        ieee80211_iterate_active_interfaces_atomic(
+                                        mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
+                                        iwl_mvm_bt_notif_iterator, &data);
+
+        /*
+         * If there are no BSS / P2P client interfaces, reduced Tx Power is
+         * irrelevant since it is based on the RSSI coming from the beacon.
+         * Use BT_KILL_MSK_DEFAULT in that case.
+         */
+        data.reduced_tx_power = data.reduced_tx_power && data.num_bss_ifaces;
+
+        if (iwl_mvm_bt_udpate_ctrl_kill_msk(mvm, data.reduced_tx_power))
+                IWL_ERR(mvm, "Failed to update the ctrl_kill_msk\n");
+}
+
+/* upon association, the fw will send in BT Coex notification */
+int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
+                             struct iwl_rx_cmd_buffer *rxb,
+                             struct iwl_device_cmd *dev_cmd)
+{
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+        struct iwl_bt_coex_profile_notif *notif = (void *)pkt->data;
+
+
+        IWL_DEBUG_COEX(mvm, "BT Coex Notification received\n");
+        IWL_DEBUG_COEX(mvm, "\tBT %salive\n", notif->bt_status ? "" : "not ");
+        IWL_DEBUG_COEX(mvm, "\tBT open conn %d\n", notif->bt_open_conn);
+        IWL_DEBUG_COEX(mvm, "\tBT traffic load %d\n", notif->bt_traffic_load);
+        IWL_DEBUG_COEX(mvm, "\tBT agg traffic load %d\n",
+                       notif->bt_agg_traffic_load);
+        IWL_DEBUG_COEX(mvm, "\tBT ci compliance %d\n", notif->bt_ci_compliance);
+
+        /* remember this notification for future use: rssi fluctuations */
+        memcpy(&mvm->last_bt_notif, notif, sizeof(mvm->last_bt_notif));
+
+        iwl_mvm_bt_coex_notif_handle(mvm);
+
+        /*
+         * This is an async handler for a notification, returning anything other
+         * than 0 doesn't make sense even if HCMD failed.
+         */
+        return 0;
+}
+
+static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
+                                   struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;
+        struct iwl_bt_iterator_data *data = _data;
+        struct iwl_mvm *mvm = data->mvm;
+
+        struct ieee80211_sta *sta;
+        struct iwl_mvm_sta *mvmsta;
+
+        if (vif->type != NL80211_IFTYPE_STATION ||
+            mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)
+                return;
+
+        sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[mvmvif->ap_sta_id],
+                                        lockdep_is_held(&mvm->mutex));
+        mvmsta = (void *)sta->drv_priv;
+
+        /*
+         * This interface doesn't support reduced Tx power (because of low
+         * RSSI probably), then set bt_kill_msk to default values.
+         */
+        if (!mvmsta->bt_reduced_txpower)
+                data->reduced_tx_power = false;
+        /* else - possibly leave it to BT_KILL_MSK_REDUCED_TXPOW */
+}
+
+void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                           enum ieee80211_rssi_event rssi_event)
+{
+        struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;
+        struct iwl_bt_iterator_data data = {
+                .mvm = mvm,
+                .reduced_tx_power = true,
+        };
+        int ret;
+
+        mutex_lock(&mvm->mutex);
+
+        /* Rssi update while not associated ?! */
+        if (WARN_ON_ONCE(mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT))
+                goto out_unlock;
+
+        /* No open connection - reports should be disabled */
+        if (!BT_MBOX_MSG(&mvm->last_bt_notif, 3, OPEN_CON_2))
+                goto out_unlock;
+
+        IWL_DEBUG_COEX(mvm, "RSSI for %pM is now %s\n", vif->bss_conf.bssid,
+                       rssi_event == RSSI_EVENT_HIGH ? "HIGH" : "LOW");
+
+        /*
+         * Check if rssi is good enough for reduced Tx power, but not in loose
+         * scheme.
+         */
+        if (rssi_event == RSSI_EVENT_LOW || is_loose_coex())
+                ret = iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id,
+                                                  false);
+        else
+                ret = iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, true);
+
+        if (ret)
+                IWL_ERR(mvm, "couldn't send BT_CONFIG HCMD upon RSSI event\n");
+
+        ieee80211_iterate_active_interfaces_atomic(
+                mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
+                iwl_mvm_bt_rssi_iterator, &data);
+
+        /*
+         * If there are no BSS / P2P client interfaces, reduced Tx Power is
+         * irrelevant since it is based on the RSSI coming from the beacon.
+         * Use BT_KILL_MSK_DEFAULT in that case.
+         */
+        data.reduced_tx_power = data.reduced_tx_power && data.num_bss_ifaces;
+
+        if (iwl_mvm_bt_udpate_ctrl_kill_msk(mvm, data.reduced_tx_power))
+                IWL_ERR(mvm, "Failed to update the ctrl_kill_msk\n");
+
+ out_unlock:
+        mutex_unlock(&mvm->mutex);
+}
+
+void iwl_mvm_bt_coex_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+{
+        struct ieee80211_chanctx_conf *chanctx_conf;
+        enum ieee80211_band band;
+
+        rcu_read_lock();
+        chanctx_conf = rcu_dereference(vif->chanctx_conf);
+        if (chanctx_conf && chanctx_conf->def.chan)
+                band = chanctx_conf->def.chan->band;
+        else
+                band = -1;
+        rcu_read_unlock();
+
+        /* if we are in 2GHz we will get a notification from the fw */
+        if (band == IEEE80211_BAND_2GHZ)
+                return;
+
+        /* else, we can remove all the constraints */
+        memset(&mvm->last_bt_notif, 0, sizeof(mvm->last_bt_notif));
+
+        iwl_mvm_bt_coex_notif_handle(mvm);
+}
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 994c8c263dc0..16bbdcc8627a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -62,8 +62,10 @@
  *****************************************************************************/
 
 #include <linux/etherdevice.h>
+#include <linux/ip.h>
 #include <net/cfg80211.h>
 #include <net/ipv6.h>
+#include <net/tcp.h>
 #include "iwl-modparams.h"
 #include "fw-api.h"
 #include "mvm.h"
@@ -402,6 +404,233 @@ static int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,
                                     sizeof(cmd), &cmd);
 }
 
+enum iwl_mvm_tcp_packet_type {
+        MVM_TCP_TX_SYN,
+        MVM_TCP_RX_SYNACK,
+        MVM_TCP_TX_DATA,
+        MVM_TCP_RX_ACK,
+        MVM_TCP_RX_WAKE,
+        MVM_TCP_TX_FIN,
+};
+
+static __le16 pseudo_hdr_check(int len, __be32 saddr, __be32 daddr)
+{
+        __sum16 check = tcp_v4_check(len, saddr, daddr, 0);
+        return cpu_to_le16(be16_to_cpu((__force __be16)check));
+}
+
+static void iwl_mvm_build_tcp_packet(struct iwl_mvm *mvm,
+                                     struct ieee80211_vif *vif,
+                                     struct cfg80211_wowlan_tcp *tcp,
+                                     void *_pkt, u8 *mask,
+                                     __le16 *pseudo_hdr_csum,
+                                     enum iwl_mvm_tcp_packet_type ptype)
+{
+        struct {
+                struct ethhdr eth;
+                struct iphdr ip;
+                struct tcphdr tcp;
+                u8 data[];
+        } __packed *pkt = _pkt;
+        u16 ip_tot_len = sizeof(struct iphdr) + sizeof(struct tcphdr);
+        int i;
+
+        pkt->eth.h_proto = cpu_to_be16(ETH_P_IP),
+        pkt->ip.version = 4;
+        pkt->ip.ihl = 5;
+        pkt->ip.protocol = IPPROTO_TCP;
+
+        switch (ptype) {
+        case MVM_TCP_TX_SYN:
+        case MVM_TCP_TX_DATA:
+        case MVM_TCP_TX_FIN:
+                memcpy(pkt->eth.h_dest, tcp->dst_mac, ETH_ALEN);
+                memcpy(pkt->eth.h_source, vif->addr, ETH_ALEN);
+                pkt->ip.ttl = 128;
+                pkt->ip.saddr = tcp->src;
+                pkt->ip.daddr = tcp->dst;
+                pkt->tcp.source = cpu_to_be16(tcp->src_port);
+                pkt->tcp.dest = cpu_to_be16(tcp->dst_port);
+                /* overwritten for TX SYN later */
+                pkt->tcp.doff = sizeof(struct tcphdr) / 4;
+                pkt->tcp.window = cpu_to_be16(65000);
+                break;
+        case MVM_TCP_RX_SYNACK:
+        case MVM_TCP_RX_ACK:
+        case MVM_TCP_RX_WAKE:
+                memcpy(pkt->eth.h_dest, vif->addr, ETH_ALEN);
+                memcpy(pkt->eth.h_source, tcp->dst_mac, ETH_ALEN);
+                pkt->ip.saddr = tcp->dst;
+                pkt->ip.daddr = tcp->src;
+                pkt->tcp.source = cpu_to_be16(tcp->dst_port);
+                pkt->tcp.dest = cpu_to_be16(tcp->src_port);
+                break;
+        default:
+                WARN_ON(1);
+                return;
+        }
+
+        switch (ptype) {
+        case MVM_TCP_TX_SYN:
+                /* firmware assumes 8 option bytes - 8 NOPs for now */
+                memset(pkt->data, 0x01, 8);
+                ip_tot_len += 8;
+                pkt->tcp.doff = (sizeof(struct tcphdr) + 8) / 4;
+                pkt->tcp.syn = 1;
+                break;
+        case MVM_TCP_TX_DATA:
+                ip_tot_len += tcp->payload_len;
+                memcpy(pkt->data, tcp->payload, tcp->payload_len);
+                pkt->tcp.psh = 1;
+                pkt->tcp.ack = 1;
+                break;
+        case MVM_TCP_TX_FIN:
+                pkt->tcp.fin = 1;
+                pkt->tcp.ack = 1;
+                break;
+        case MVM_TCP_RX_SYNACK:
+                pkt->tcp.syn = 1;
+                pkt->tcp.ack = 1;
+                break;
+        case MVM_TCP_RX_ACK:
+                pkt->tcp.ack = 1;
+                break;
+        case MVM_TCP_RX_WAKE:
+                ip_tot_len += tcp->wake_len;
+                pkt->tcp.psh = 1;
+                pkt->tcp.ack = 1;
+                memcpy(pkt->data, tcp->wake_data, tcp->wake_len);
+                break;
+        }
+
+        switch (ptype) {
+        case MVM_TCP_TX_SYN:
+        case MVM_TCP_TX_DATA:
+        case MVM_TCP_TX_FIN:
+                pkt->ip.tot_len = cpu_to_be16(ip_tot_len);
+                pkt->ip.check = ip_fast_csum(&pkt->ip, pkt->ip.ihl);
+                break;
+        case MVM_TCP_RX_WAKE:
+                for (i = 0; i < DIV_ROUND_UP(tcp->wake_len, 8); i++) {
+                        u8 tmp = tcp->wake_mask[i];
+                        mask[i + 6] |= tmp << 6;
+                        if (i + 1 < DIV_ROUND_UP(tcp->wake_len, 8))
+                                mask[i + 7] = tmp >> 2;
+                }
+                /* fall through for ethernet/IP/TCP headers mask */
+        case MVM_TCP_RX_SYNACK:
+        case MVM_TCP_RX_ACK:
+                mask[0] = 0xff; /* match ethernet */
+                /*
+                 * match ethernet, ip.version, ip.ihl
+                 * the ip.ihl half byte is really masked out by firmware
+                 */
+                mask[1] = 0x7f;
+                mask[2] = 0x80; /* match ip.protocol */
+                mask[3] = 0xfc; /* match ip.saddr, ip.daddr */
+                mask[4] = 0x3f; /* match ip.daddr, tcp.source, tcp.dest */
+                mask[5] = 0x80; /* match tcp flags */
+                /* leave rest (0 or set for MVM_TCP_RX_WAKE) */
+                break;
+        };
+
+        *pseudo_hdr_csum = pseudo_hdr_check(ip_tot_len - sizeof(struct iphdr),
+                                            pkt->ip.saddr, pkt->ip.daddr);
+}
+
+static int iwl_mvm_send_remote_wake_cfg(struct iwl_mvm *mvm,
+                                        struct ieee80211_vif *vif,
+                                        struct cfg80211_wowlan_tcp *tcp)
+{
+        struct iwl_wowlan_remote_wake_config *cfg;
+        struct iwl_host_cmd cmd = {
+                .id = REMOTE_WAKE_CONFIG_CMD,
+                .len = { sizeof(*cfg), },
+                .dataflags = { IWL_HCMD_DFL_NOCOPY, },
+                .flags = CMD_SYNC,
+        };
+        int ret;
+
+        if (!tcp)
+                return 0;
+
+        cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
+        if (!cfg)
+                return -ENOMEM;
+        cmd.data[0] = cfg;
+
+        cfg->max_syn_retries = 10;
+        cfg->max_data_retries = 10;
+        cfg->tcp_syn_ack_timeout = 1; /* seconds */
+        cfg->tcp_ack_timeout = 1; /* seconds */
+
+        /* SYN (TX) */
+        iwl_mvm_build_tcp_packet(
+                mvm, vif, tcp, cfg->syn_tx.data, NULL,
+                &cfg->syn_tx.info.tcp_pseudo_header_checksum,
+                MVM_TCP_TX_SYN);
+        cfg->syn_tx.info.tcp_payload_length = 0;
+
+        /* SYN/ACK (RX) */
+        iwl_mvm_build_tcp_packet(
+                mvm, vif, tcp, cfg->synack_rx.data, cfg->synack_rx.rx_mask,
+                &cfg->synack_rx.info.tcp_pseudo_header_checksum,
+                MVM_TCP_RX_SYNACK);
+        cfg->synack_rx.info.tcp_payload_length = 0;
+
+        /* KEEPALIVE/ACK (TX) */
+        iwl_mvm_build_tcp_packet(
+                mvm, vif, tcp, cfg->keepalive_tx.data, NULL,
+                &cfg->keepalive_tx.info.tcp_pseudo_header_checksum,
+                MVM_TCP_TX_DATA);
+        cfg->keepalive_tx.info.tcp_payload_length =
+                cpu_to_le16(tcp->payload_len);
+        cfg->sequence_number_offset = tcp->payload_seq.offset;
+        /* length must be 0..4, the field is little endian */
+        cfg->sequence_number_length = tcp->payload_seq.len;
+        cfg->initial_sequence_number = cpu_to_le32(tcp->payload_seq.start);
+        cfg->keepalive_interval = cpu_to_le16(tcp->data_interval);
+        if (tcp->payload_tok.len) {
+                cfg->token_offset = tcp->payload_tok.offset;
+                cfg->token_length = tcp->payload_tok.len;
+                cfg->num_tokens =
+                        cpu_to_le16(tcp->tokens_size % tcp->payload_tok.len);
+                memcpy(cfg->tokens, tcp->payload_tok.token_stream,
+                       tcp->tokens_size);
+        } else {
+                /* set tokens to max value to almost never run out */
+                cfg->num_tokens = cpu_to_le16(65535);
+        }
+
+        /* ACK (RX) */
+        iwl_mvm_build_tcp_packet(
+                mvm, vif, tcp, cfg->keepalive_ack_rx.data,
+                cfg->keepalive_ack_rx.rx_mask,
+                &cfg->keepalive_ack_rx.info.tcp_pseudo_header_checksum,
+                MVM_TCP_RX_ACK);
+        cfg->keepalive_ack_rx.info.tcp_payload_length = 0;
+
+        /* WAKEUP (RX) */
+        iwl_mvm_build_tcp_packet(
+                mvm, vif, tcp, cfg->wake_rx.data, cfg->wake_rx.rx_mask,
+                &cfg->wake_rx.info.tcp_pseudo_header_checksum,
+                MVM_TCP_RX_WAKE);
+        cfg->wake_rx.info.tcp_payload_length =
+                cpu_to_le16(tcp->wake_len);
+
+        /* FIN */
+        iwl_mvm_build_tcp_packet(
+                mvm, vif, tcp, cfg->fin_tx.data, NULL,
+                &cfg->fin_tx.info.tcp_pseudo_header_checksum,
+                MVM_TCP_TX_FIN);
+        cfg->fin_tx.info.tcp_payload_length = 0;
+
+        ret = iwl_mvm_send_cmd(mvm, &cmd);
+        kfree(cfg);
+
+        return ret;
+}
+
 struct iwl_d3_iter_data {
         struct iwl_mvm *mvm;
         struct ieee80211_vif *vif;
@@ -540,7 +769,14 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
         struct iwl_wowlan_config_cmd wowlan_config_cmd = {};
         struct iwl_wowlan_kek_kck_material_cmd kek_kck_cmd = {};
         struct iwl_wowlan_tkip_params_cmd tkip_cmd = {};
-        struct iwl_d3_manager_config d3_cfg_cmd = {};
+        struct iwl_d3_manager_config d3_cfg_cmd = {
+                /*
+                 * Program the minimum sleep time to 10 seconds, as many
+                 * platforms have issues processing a wakeup signal while
+                 * still being in the process of suspending.
+                 */
+                .min_sleep_time = cpu_to_le32(10 * 1000 * 1000),
+        };
         struct wowlan_key_data key_data = {
                 .use_rsc_tsc = false,
                 .tkip = &tkip_cmd,
@@ -637,9 +873,21 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
                         cpu_to_le32(IWL_WOWLAN_WAKEUP_PATTERN_MATCH);
 
         if (wowlan->rfkill_release)
-                d3_cfg_cmd.wakeup_flags |=
+                wowlan_config_cmd.wakeup_filter |=
                         cpu_to_le32(IWL_WOWLAN_WAKEUP_RF_KILL_DEASSERT);
 
+        if (wowlan->tcp) {
+                /*
+                 * Set the "link change" (really "link lost") flag as well
+                 * since that implies losing the TCP connection.
+                 */
+                wowlan_config_cmd.wakeup_filter |=
+                        cpu_to_le32(IWL_WOWLAN_WAKEUP_REMOTE_LINK_LOSS |
+                                    IWL_WOWLAN_WAKEUP_REMOTE_SIGNATURE_TABLE |
+                                    IWL_WOWLAN_WAKEUP_REMOTE_WAKEUP_PACKET |
+                                    IWL_WOWLAN_WAKEUP_LINK_CHANGE);
+        }
+
         iwl_mvm_cancel_scan(mvm);
 
         iwl_trans_stop_device(mvm->trans);
@@ -755,6 +1003,10 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
         if (ret)
                 goto out;
 
+        ret = iwl_mvm_send_remote_wake_cfg(mvm, vif, wowlan->tcp);
+        if (ret)
+                goto out;
+
         /* must be last -- this switches firmware state */
         ret = iwl_mvm_send_cmd_pdu(mvm, D3_CONFIG_CMD, CMD_SYNC,
                                    sizeof(d3_cfg_cmd), &d3_cfg_cmd);
@@ -874,6 +1126,15 @@ static void iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,
         if (reasons & IWL_WOWLAN_WAKEUP_BY_FOUR_WAY_HANDSHAKE)
                 wakeup.four_way_handshake = true;
 
+        if (reasons & IWL_WOWLAN_WAKEUP_BY_REM_WAKE_LINK_LOSS)
+                wakeup.tcp_connlost = true;
+
+        if (reasons & IWL_WOWLAN_WAKEUP_BY_REM_WAKE_SIGNATURE_TABLE)
+                wakeup.tcp_nomoretokens = true;
+
+        if (reasons & IWL_WOWLAN_WAKEUP_BY_REM_WAKE_WAKEUP_PACKET)
+                wakeup.tcp_match = true;
+
         if (status->wake_packet_bufsize) {
                 int pktsize = le32_to_cpu(status->wake_packet_bufsize);
                 int pktlen = le32_to_cpu(status->wake_packet_length);
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index c1bdb5582126..2053dccefcd6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -69,12 +69,6 @@ struct iwl_dbgfs_mvm_ctx {
         struct ieee80211_vif *vif;
 };
 
-static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t iwl_dbgfs_tx_flush_write(struct file *file,
                                         const char __user *user_buf,
                                         size_t count, loff_t *ppos)
@@ -306,10 +300,191 @@ static ssize_t iwl_dbgfs_power_down_d3_allow_write(struct file *file,
         return count;
 }
 
+static ssize_t iwl_dbgfs_mac_params_read(struct file *file,
+                                         char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+        struct ieee80211_vif *vif = file->private_data;
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_mvm *mvm = mvmvif->dbgfs_data;
+        u8 ap_sta_id;
+        struct ieee80211_chanctx_conf *chanctx_conf;
+        char buf[512];
+        int bufsz = sizeof(buf);
+        int pos = 0;
+        int i;
+
+        mutex_lock(&mvm->mutex);
+
+        ap_sta_id = mvmvif->ap_sta_id;
+
+        pos += scnprintf(buf+pos, bufsz-pos, "mac id/color: %d / %d\n",
+                         mvmvif->id, mvmvif->color);
+        pos += scnprintf(buf+pos, bufsz-pos, "bssid: %pM\n",
+                         vif->bss_conf.bssid);
+        pos += scnprintf(buf+pos, bufsz-pos, "QoS:\n");
+        for (i = 0; i < ARRAY_SIZE(mvmvif->queue_params); i++) {
+                pos += scnprintf(buf+pos, bufsz-pos,
+                                 "\t%d: txop:%d - cw_min:%d - cw_max = %d - aifs = %d upasd = %d\n",
+                                 i, mvmvif->queue_params[i].txop,
+                                 mvmvif->queue_params[i].cw_min,
+                                 mvmvif->queue_params[i].cw_max,
+                                 mvmvif->queue_params[i].aifs,
+                                 mvmvif->queue_params[i].uapsd);
+        }
+
+        if (vif->type == NL80211_IFTYPE_STATION &&
+            ap_sta_id != IWL_MVM_STATION_COUNT) {
+                struct ieee80211_sta *sta;
+                struct iwl_mvm_sta *mvm_sta;
+
+                sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[ap_sta_id],
+                                                lockdep_is_held(&mvm->mutex));
+                mvm_sta = (void *)sta->drv_priv;
+                pos += scnprintf(buf+pos, bufsz-pos,
+                                 "ap_sta_id %d - reduced Tx power %d\n",
+                                 ap_sta_id, mvm_sta->bt_reduced_txpower);
+        }
+
+        rcu_read_lock();
+        chanctx_conf = rcu_dereference(vif->chanctx_conf);
+        if (chanctx_conf) {
+                pos += scnprintf(buf+pos, bufsz-pos,
+                                 "idle rx chains %d, active rx chains: %d\n",
+                                 chanctx_conf->rx_chains_static,
+                                 chanctx_conf->rx_chains_dynamic);
+        }
+        rcu_read_unlock();
+
+        mutex_unlock(&mvm->mutex);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+#define BT_MBOX_MSG(_notif, _num, _field)                                    \
+        ((le32_to_cpu((_notif)->mbox_msg[(_num)]) & BT_MBOX##_num##_##_field)\
+        >> BT_MBOX##_num##_##_field##_POS)
+
+
+#define BT_MBOX_PRINT(_num, _field, _end)                                   \
+                        pos += scnprintf(buf + pos, bufsz - pos,            \
+                                         "\t%s: %d%s",                      \
+                                         #_field,                           \
+                                         BT_MBOX_MSG(notif, _num, _field),  \
+                                         true ? "\n" : ", ");
+
+static ssize_t iwl_dbgfs_bt_notif_read(struct file *file, char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
+        struct iwl_mvm *mvm = file->private_data;
+        struct iwl_bt_coex_profile_notif *notif = &mvm->last_bt_notif;
+        char *buf;
+        int ret, pos = 0, bufsz = sizeof(char) * 1024;
+
+        buf = kmalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        mutex_lock(&mvm->mutex);
+
+        pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw0:\n");
+
+        BT_MBOX_PRINT(0, LE_SLAVE_LAT, false);
+        BT_MBOX_PRINT(0, LE_PROF1, false);
+        BT_MBOX_PRINT(0, LE_PROF2, false);
+        BT_MBOX_PRINT(0, LE_PROF_OTHER, false);
+        BT_MBOX_PRINT(0, CHL_SEQ_N, false);
+        BT_MBOX_PRINT(0, INBAND_S, false);
+        BT_MBOX_PRINT(0, LE_MIN_RSSI, false);
+        BT_MBOX_PRINT(0, LE_SCAN, false);
+        BT_MBOX_PRINT(0, LE_ADV, false);
+        BT_MBOX_PRINT(0, LE_MAX_TX_POWER, false);
+        BT_MBOX_PRINT(0, OPEN_CON_1, true);
+
+        pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw1:\n");
+
+        BT_MBOX_PRINT(1, BR_MAX_TX_POWER, false);
+        BT_MBOX_PRINT(1, IP_SR, false);
+        BT_MBOX_PRINT(1, LE_MSTR, false);
+        BT_MBOX_PRINT(1, AGGR_TRFC_LD, false);
+        BT_MBOX_PRINT(1, MSG_TYPE, false);
+        BT_MBOX_PRINT(1, SSN, true);
+
+        pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw2:\n");
+
+        BT_MBOX_PRINT(2, SNIFF_ACT, false);
+        BT_MBOX_PRINT(2, PAG, false);
+        BT_MBOX_PRINT(2, INQUIRY, false);
+        BT_MBOX_PRINT(2, CONN, false);
+        BT_MBOX_PRINT(2, SNIFF_INTERVAL, false);
+        BT_MBOX_PRINT(2, DISC, false);
+        BT_MBOX_PRINT(2, SCO_TX_ACT, false);
+        BT_MBOX_PRINT(2, SCO_RX_ACT, false);
+        BT_MBOX_PRINT(2, ESCO_RE_TX, false);
+        BT_MBOX_PRINT(2, SCO_DURATION, true);
+
+        pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw3:\n");
+
+        BT_MBOX_PRINT(3, SCO_STATE, false);
+        BT_MBOX_PRINT(3, SNIFF_STATE, false);
+        BT_MBOX_PRINT(3, A2DP_STATE, false);
+        BT_MBOX_PRINT(3, ACL_STATE, false);
+        BT_MBOX_PRINT(3, MSTR_STATE, false);
+        BT_MBOX_PRINT(3, OBX_STATE, false);
+        BT_MBOX_PRINT(3, OPEN_CON_2, false);
+        BT_MBOX_PRINT(3, TRAFFIC_LOAD, false);
+        BT_MBOX_PRINT(3, CHL_SEQN_LSB, false);
+        BT_MBOX_PRINT(3, INBAND_P, false);
+        BT_MBOX_PRINT(3, MSG_TYPE_2, false);
+        BT_MBOX_PRINT(3, SSN_2, false);
+        BT_MBOX_PRINT(3, UPDATE_REQUEST, true);
+
+        pos += scnprintf(buf+pos, bufsz-pos, "bt_status = %d\n",
+                                         notif->bt_status);
+        pos += scnprintf(buf+pos, bufsz-pos, "bt_open_conn = %d\n",
+                                         notif->bt_open_conn);
+        pos += scnprintf(buf+pos, bufsz-pos, "bt_traffic_load = %d\n",
+                                         notif->bt_traffic_load);
+        pos += scnprintf(buf+pos, bufsz-pos, "bt_agg_traffic_load = %d\n",
+                                         notif->bt_agg_traffic_load);
+        pos += scnprintf(buf+pos, bufsz-pos, "bt_ci_compliance = %d\n",
+                                         notif->bt_ci_compliance);
+
+        mutex_unlock(&mvm->mutex);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+
+        return ret;
+}
+#undef BT_MBOX_PRINT
+
+static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
+                                          const char __user *user_buf,
+                                          size_t count, loff_t *ppos)
+{
+        struct iwl_mvm *mvm = file->private_data;
+        bool restart_fw = iwlwifi_mod_params.restart_fw;
+        int ret;
+
+        iwlwifi_mod_params.restart_fw = true;
+
+        mutex_lock(&mvm->mutex);
+
+        /* take the return value to make compiler happy - it will fail anyway */
+        ret = iwl_mvm_send_cmd_pdu(mvm, REPLY_ERROR, CMD_SYNC, 0, NULL);
+
+        mutex_unlock(&mvm->mutex);
+
+        iwlwifi_mod_params.restart_fw = restart_fw;
+
+        return count;
+}
+
 #define MVM_DEBUGFS_READ_FILE_OPS(name)                                 \
 static const struct file_operations iwl_dbgfs_##name##_ops = {  \
         .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 }
 
@@ -317,14 +492,14 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {	\
 static const struct file_operations iwl_dbgfs_##name##_ops = {  \
         .write = iwl_dbgfs_##name##_write,                              \
         .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
 #define MVM_DEBUGFS_WRITE_FILE_OPS(name)                                \
 static const struct file_operations iwl_dbgfs_##name##_ops = {  \
         .write = iwl_dbgfs_##name##_write,                              \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -345,8 +520,13 @@ MVM_DEBUGFS_WRITE_FILE_OPS(tx_flush);
 MVM_DEBUGFS_WRITE_FILE_OPS(sta_drain);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(sram);
 MVM_DEBUGFS_READ_FILE_OPS(stations);
+MVM_DEBUGFS_READ_FILE_OPS(bt_notif);
 MVM_DEBUGFS_WRITE_FILE_OPS(power_down_allow);
 MVM_DEBUGFS_WRITE_FILE_OPS(power_down_d3_allow);
+MVM_DEBUGFS_WRITE_FILE_OPS(fw_restart);
+
+/* Interface specific debugfs entries */
+MVM_DEBUGFS_READ_FILE_OPS(mac_params);
 
 int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
 {
@@ -358,8 +538,10 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
         MVM_DEBUGFS_ADD_FILE(sta_drain, mvm->debugfs_dir, S_IWUSR);
         MVM_DEBUGFS_ADD_FILE(sram, mvm->debugfs_dir, S_IWUSR | S_IRUSR);
         MVM_DEBUGFS_ADD_FILE(stations, dbgfs_dir, S_IRUSR);
+        MVM_DEBUGFS_ADD_FILE(bt_notif, dbgfs_dir, S_IRUSR);
         MVM_DEBUGFS_ADD_FILE(power_down_allow, mvm->debugfs_dir, S_IWUSR);
         MVM_DEBUGFS_ADD_FILE(power_down_d3_allow, mvm->debugfs_dir, S_IWUSR);
+        MVM_DEBUGFS_ADD_FILE(fw_restart, mvm->debugfs_dir, S_IWUSR);
 
         /*
          * Create a symlink with mac80211. It will be removed when mac80211
@@ -376,3 +558,58 @@ err:
         IWL_ERR(mvm, "Can't create the mvm debugfs directory\n");
         return -ENOMEM;
 }
+
+void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+{
+        struct dentry *dbgfs_dir = vif->debugfs_dir;
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        char buf[100];
+
+        if (!dbgfs_dir)
+                return;
+
+        mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
+        mvmvif->dbgfs_data = mvm;
+
+        if (!mvmvif->dbgfs_dir) {
+                IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",
+                        dbgfs_dir->d_name.name);
+                return;
+        }
+
+        MVM_DEBUGFS_ADD_FILE_VIF(mac_params, mvmvif->dbgfs_dir,
+                                 S_IRUSR);
+
+        /*
+         * Create symlink for convenience pointing to interface specific
+         * debugfs entries for the driver. For example, under
+         * /sys/kernel/debug/iwlwifi/0000\:02\:00.0/iwlmvm/
+         * find
+         * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
+         */
+        snprintf(buf, 100, "../../../%s/%s/%s/%s",
+                 dbgfs_dir->d_parent->d_parent->d_name.name,
+                 dbgfs_dir->d_parent->d_name.name,
+                 dbgfs_dir->d_name.name,
+                 mvmvif->dbgfs_dir->d_name.name);
+
+        mvmvif->dbgfs_slink = debugfs_create_symlink(dbgfs_dir->d_name.name,
+                                                     mvm->debugfs_dir, buf);
+        if (!mvmvif->dbgfs_slink)
+                IWL_ERR(mvm, "Can't create debugfs symbolic link under %s\n",
+                        dbgfs_dir->d_name.name);
+        return;
+err:
+        IWL_ERR(mvm, "Can't create debugfs entity\n");
+}
+
+void iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+
+        debugfs_remove(mvmvif->dbgfs_slink);
+        mvmvif->dbgfs_slink = NULL;
+
+        debugfs_remove_recursive(mvmvif->dbgfs_dir);
+        mvmvif->dbgfs_dir = NULL;
+}
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
new file mode 100644
index 000000000000..05c61d6f384e
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
@@ -0,0 +1,319 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#ifndef __fw_api_bt_coex_h__
+#define __fw_api_bt_coex_h__
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+
+#define BITS(nb) (BIT(nb) - 1)
+
+/**
+ * enum iwl_bt_coex_flags - flags for BT_COEX command
+ * @BT_CH_PRIMARY_EN:
+ * @BT_CH_SECONDARY_EN:
+ * @BT_NOTIF_COEX_OFF:
+ * @BT_COEX_MODE_POS:
+ * @BT_COEX_MODE_MSK:
+ * @BT_COEX_DISABLE:
+ * @BT_COEX_2W:
+ * @BT_COEX_3W:
+ * @BT_COEX_NW:
+ * @BT_USE_DEFAULTS:
+ * @BT_SYNC_2_BT_DISABLE:
+ * @BT_COEX_CORUNNING_TBL_EN:
+ */
+enum iwl_bt_coex_flags {
+        BT_CH_PRIMARY_EN                = BIT(0),
+        BT_CH_SECONDARY_EN              = BIT(1),
+        BT_NOTIF_COEX_OFF               = BIT(2),
+        BT_COEX_MODE_POS                = 3,
+        BT_COEX_MODE_MSK                = BITS(3) << BT_COEX_MODE_POS,
+        BT_COEX_DISABLE                 = 0x0 << BT_COEX_MODE_POS,
+        BT_COEX_2W                      = 0x1 << BT_COEX_MODE_POS,
+        BT_COEX_3W                      = 0x2 << BT_COEX_MODE_POS,
+        BT_COEX_NW                      = 0x3 << BT_COEX_MODE_POS,
+        BT_USE_DEFAULTS                 = BIT(6),
+        BT_SYNC_2_BT_DISABLE            = BIT(7),
+        /*
+         * For future use - when the flags will be enlarged
+         * BT_COEX_CORUNNING_TBL_EN     = BIT(8),
+         */
+};
+
+/*
+ * indicates what has changed in the BT_COEX command.
+ */
+enum iwl_bt_coex_valid_bit_msk {
+        BT_VALID_ENABLE                 = BIT(0),
+        BT_VALID_BT_PRIO_BOOST          = BIT(1),
+        BT_VALID_MAX_KILL               = BIT(2),
+        BT_VALID_3W_TMRS                = BIT(3),
+        BT_VALID_KILL_ACK               = BIT(4),
+        BT_VALID_KILL_CTS               = BIT(5),
+        BT_VALID_REDUCED_TX_POWER       = BIT(6),
+        BT_VALID_LUT                    = BIT(7),
+        BT_VALID_WIFI_RX_SW_PRIO_BOOST  = BIT(8),
+        BT_VALID_WIFI_TX_SW_PRIO_BOOST  = BIT(9),
+        BT_VALID_MULTI_PRIO_LUT         = BIT(10),
+        BT_VALID_TRM_KICK_FILTER        = BIT(11),
+        BT_VALID_CORUN_LUT_20           = BIT(12),
+        BT_VALID_CORUN_LUT_40           = BIT(13),
+        BT_VALID_ANT_ISOLATION          = BIT(14),
+        BT_VALID_ANT_ISOLATION_THRS     = BIT(15),
+        /*
+         * For future use - when the valid flags will be enlarged
+         * BT_VALID_TXTX_DELTA_FREQ_THRS        = BIT(16),
+         * BT_VALID_TXRX_MAX_FREQ_0     = BIT(17),
+         */
+};
+
+/**
+ * enum iwl_bt_reduced_tx_power - allows to reduce txpower for WiFi frames.
+ * @BT_REDUCED_TX_POWER_CTL: reduce Tx power for control frames
+ * @BT_REDUCED_TX_POWER_DATA: reduce Tx power for data frames
+ *
+ * This mechanism allows to have BT and WiFi run concurrently. Since WiFi
+ * reduces its Tx power, it can work along with BT, hence reducing the amount
+ * of WiFi frames being killed by BT.
+ */
+enum iwl_bt_reduced_tx_power {
+        BT_REDUCED_TX_POWER_CTL         = BIT(0),
+        BT_REDUCED_TX_POWER_DATA        = BIT(1),
+};
+
+#define BT_COEX_LUT_SIZE (12)
+
+/**
+ * struct iwl_bt_coex_cmd - bt coex configuration command
+ * @flags:&enum iwl_bt_coex_flags
+ * @lead_time:
+ * @max_kill:
+ * @bt3_time_t7_value:
+ * @kill_ack_msk:
+ * @kill_cts_msk:
+ * @bt3_prio_sample_time:
+ * @bt3_timer_t2_value:
+ * @bt4_reaction_time:
+ * @decision_lut[12]:
+ * @bt_reduced_tx_power: enum %iwl_bt_reduced_tx_power
+ * @valid_bit_msk: enum %iwl_bt_coex_valid_bit_msk
+ * @bt_prio_boost: values for PTA boost register
+ * @wifi_tx_prio_boost: SW boost of wifi tx priority
+ * @wifi_rx_prio_boost: SW boost of wifi rx priority
+ *
+ * The structure is used for the BT_COEX command.
+ */
+struct iwl_bt_coex_cmd {
+        u8 flags;
+        u8 lead_time;
+        u8 max_kill;
+        u8 bt3_time_t7_value;
+        __le32 kill_ack_msk;
+        __le32 kill_cts_msk;
+        u8 bt3_prio_sample_time;
+        u8 bt3_timer_t2_value;
+        __le16 bt4_reaction_time;
+        __le32 decision_lut[BT_COEX_LUT_SIZE];
+        u8 bt_reduced_tx_power;
+        u8 reserved;
+        __le16 valid_bit_msk;
+        __le32 bt_prio_boost;
+        u8 reserved2;
+        u8 wifi_tx_prio_boost;
+        __le16 wifi_rx_prio_boost;
+} __packed; /* BT_COEX_CMD_API_S_VER_3 */
+
+#define BT_MBOX(n_dw, _msg, _pos, _nbits)       \
+        BT_MBOX##n_dw##_##_msg##_POS = (_pos),  \
+        BT_MBOX##n_dw##_##_msg = BITS(_nbits) << BT_MBOX##n_dw##_##_msg##_POS
+
+enum iwl_bt_mxbox_dw0 {
+        BT_MBOX(0, LE_SLAVE_LAT, 0, 3),
+        BT_MBOX(0, LE_PROF1, 3, 1),
+        BT_MBOX(0, LE_PROF2, 4, 1),
+        BT_MBOX(0, LE_PROF_OTHER, 5, 1),
+        BT_MBOX(0, CHL_SEQ_N, 8, 4),
+        BT_MBOX(0, INBAND_S, 13, 1),
+        BT_MBOX(0, LE_MIN_RSSI, 16, 4),
+        BT_MBOX(0, LE_SCAN, 20, 1),
+        BT_MBOX(0, LE_ADV, 21, 1),
+        BT_MBOX(0, LE_MAX_TX_POWER, 24, 4),
+        BT_MBOX(0, OPEN_CON_1, 28, 2),
+};
+
+enum iwl_bt_mxbox_dw1 {
+        BT_MBOX(1, BR_MAX_TX_POWER, 0, 4),
+        BT_MBOX(1, IP_SR, 4, 1),
+        BT_MBOX(1, LE_MSTR, 5, 1),
+        BT_MBOX(1, AGGR_TRFC_LD, 8, 6),
+        BT_MBOX(1, MSG_TYPE, 16, 3),
+        BT_MBOX(1, SSN, 19, 2),
+};
+
+enum iwl_bt_mxbox_dw2 {
+        BT_MBOX(2, SNIFF_ACT, 0, 3),
+        BT_MBOX(2, PAG, 3, 1),
+        BT_MBOX(2, INQUIRY, 4, 1),
+        BT_MBOX(2, CONN, 5, 1),
+        BT_MBOX(2, SNIFF_INTERVAL, 8, 5),
+        BT_MBOX(2, DISC, 13, 1),
+        BT_MBOX(2, SCO_TX_ACT, 16, 2),
+        BT_MBOX(2, SCO_RX_ACT, 18, 2),
+        BT_MBOX(2, ESCO_RE_TX, 20, 2),
+        BT_MBOX(2, SCO_DURATION, 24, 6),
+};
+
+enum iwl_bt_mxbox_dw3 {
+        BT_MBOX(3, SCO_STATE, 0, 1),
+        BT_MBOX(3, SNIFF_STATE, 1, 1),
+        BT_MBOX(3, A2DP_STATE, 2, 1),
+        BT_MBOX(3, ACL_STATE, 3, 1),
+        BT_MBOX(3, MSTR_STATE, 4, 1),
+        BT_MBOX(3, OBX_STATE, 5, 1),
+        BT_MBOX(3, OPEN_CON_2, 8, 2),
+        BT_MBOX(3, TRAFFIC_LOAD, 10, 2),
+        BT_MBOX(3, CHL_SEQN_LSB, 12, 1),
+        BT_MBOX(3, INBAND_P, 13, 1),
+        BT_MBOX(3, MSG_TYPE_2, 16, 3),
+        BT_MBOX(3, SSN_2, 19, 2),
+        BT_MBOX(3, UPDATE_REQUEST, 21, 1),
+};
+
+#define BT_MBOX_MSG(_notif, _num, _field)                                    \
+        ((le32_to_cpu((_notif)->mbox_msg[(_num)]) & BT_MBOX##_num##_##_field)\
+        >> BT_MBOX##_num##_##_field##_POS)
+
+/**
+ * struct iwl_bt_coex_profile_notif - notification about BT coex
+ * @mbox_msg: message from BT to WiFi
+ * @:bt_status: 0 - off, 1 - on
+ * @:bt_open_conn: number of BT connections open
+ * @:bt_traffic_load: load of BT traffic
+ * @:bt_agg_traffic_load: aggregated load of BT traffic
+ * @:bt_ci_compliance: 0 - no CI compliance, 1 - CI compliant
+ */
+struct iwl_bt_coex_profile_notif {
+        __le32 mbox_msg[4];
+        u8 bt_status;
+        u8 bt_open_conn;
+        u8 bt_traffic_load;
+        u8 bt_agg_traffic_load;
+        u8 bt_ci_compliance;
+        u8 reserved[3];
+} __packed; /* BT_COEX_PROFILE_NTFY_API_S_VER_2 */
+
+enum iwl_bt_coex_prio_table_event {
+        BT_COEX_PRIO_TBL_EVT_INIT_CALIB1                = 0,
+        BT_COEX_PRIO_TBL_EVT_INIT_CALIB2                = 1,
+        BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_LOW1        = 2,
+        BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_LOW2        = 3,
+        BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_HIGH1       = 4,
+        BT_COEX_PRIO_TBL_EVT_PERIODIC_CALIB_HIGH2       = 5,
+        BT_COEX_PRIO_TBL_EVT_DTIM                       = 6,
+        BT_COEX_PRIO_TBL_EVT_SCAN52                     = 7,
+        BT_COEX_PRIO_TBL_EVT_SCAN24                     = 8,
+        BT_COEX_PRIO_TBL_EVT_IDLE                       = 9,
+        BT_COEX_PRIO_TBL_EVT_MAX                        = 16,
+}; /* BT_COEX_PRIO_TABLE_EVENTS_API_E_VER_1 */
+
+enum iwl_bt_coex_prio_table_prio {
+        BT_COEX_PRIO_TBL_DISABLED       = 0,
+        BT_COEX_PRIO_TBL_PRIO_LOW       = 1,
+        BT_COEX_PRIO_TBL_PRIO_HIGH      = 2,
+        BT_COEX_PRIO_TBL_PRIO_BYPASS    = 3,
+        BT_COEX_PRIO_TBL_PRIO_COEX_OFF  = 4,
+        BT_COEX_PRIO_TBL_PRIO_COEX_ON   = 5,
+        BT_COEX_PRIO_TBL_PRIO_COEX_IDLE = 6,
+        BT_COEX_PRIO_TBL_MAX            = 8,
+}; /* BT_COEX_PRIO_TABLE_PRIORITIES_API_E_VER_1 */
+
+#define BT_COEX_PRIO_TBL_SHRD_ANT_POS     (0)
+#define BT_COEX_PRIO_TBL_PRIO_POS         (1)
+#define BT_COEX_PRIO_TBL_RESERVED_POS     (4)
+
+/**
+ * struct iwl_bt_coex_prio_tbl_cmd - priority table for BT coex
+ * @prio_tbl:
+ */
+struct iwl_bt_coex_prio_tbl_cmd {
+        u8 prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX];
+} __packed;
+
+enum iwl_bt_coex_env_action {
+        BT_COEX_ENV_CLOSE        = 0,
+        BT_COEX_ENV_OPEN         = 1,
+}; /* BT_COEX_PROT_ENV_ACTION_API_E_VER_1 */
+
+/**
+ * struct iwl_bt_coex_prot_env_cmd - BT Protection Envelope
+ * @action: enum %iwl_bt_coex_env_action
+ * @type: enum %iwl_bt_coex_prio_table_event
+ */
+struct iwl_bt_coex_prot_env_cmd {
+        u8 action; /* 0 = closed, 1 = open */
+        u8 type; /* 0 .. 15 */
+        u8 reserved[2];
+} __packed;
+
+#endif /* __fw_api_bt_coex_h__ */
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
index cf6f9a02fb74..51e015d1dfb2 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -258,7 +258,7 @@ enum iwl_wowlan_wakeup_reason {
         IWL_WOWLAN_WAKEUP_BY_FOUR_WAY_HANDSHAKE                 = BIT(8),
         IWL_WOWLAN_WAKEUP_BY_REM_WAKE_LINK_LOSS                 = BIT(9),
         IWL_WOWLAN_WAKEUP_BY_REM_WAKE_SIGNATURE_TABLE           = BIT(10),
-        IWL_WOWLAN_WAKEUP_BY_REM_WAKE_TCP_EXTERNAL              = BIT(11),
+        /* BIT(11) reserved */
         IWL_WOWLAN_WAKEUP_BY_REM_WAKE_WAKEUP_PACKET             = BIT(12),
 }; /* WOWLAN_WAKE_UP_REASON_API_E_VER_2 */
 
@@ -277,6 +277,55 @@ struct iwl_wowlan_status {
         u8 wake_packet[]; /* can be truncated from _length to _bufsize */
 } __packed; /* WOWLAN_STATUSES_API_S_VER_4 */
 
+#define IWL_WOWLAN_TCP_MAX_PACKET_LEN           64
+#define IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN   128
+#define IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS       2048
+
+struct iwl_tcp_packet_info {
+        __le16 tcp_pseudo_header_checksum;
+        __le16 tcp_payload_length;
+} __packed; /* TCP_PACKET_INFO_API_S_VER_2 */
+
+struct iwl_tcp_packet {
+        struct iwl_tcp_packet_info info;
+        u8 rx_mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];
+        u8 data[IWL_WOWLAN_TCP_MAX_PACKET_LEN];
+} __packed; /* TCP_PROTOCOL_PACKET_API_S_VER_1 */
+
+struct iwl_remote_wake_packet {
+        struct iwl_tcp_packet_info info;
+        u8 rx_mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];
+        u8 data[IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN];
+} __packed; /* TCP_PROTOCOL_PACKET_API_S_VER_1 */
+
+struct iwl_wowlan_remote_wake_config {
+        __le32 connection_max_time; /* unused */
+        /* TCP_PROTOCOL_CONFIG_API_S_VER_1 */
+        u8 max_syn_retries;
+        u8 max_data_retries;
+        u8 tcp_syn_ack_timeout;
+        u8 tcp_ack_timeout;
+
+        struct iwl_tcp_packet syn_tx;
+        struct iwl_tcp_packet synack_rx;
+        struct iwl_tcp_packet keepalive_ack_rx;
+        struct iwl_tcp_packet fin_tx;
+
+        struct iwl_remote_wake_packet keepalive_tx;
+        struct iwl_remote_wake_packet wake_rx;
+
+        /* REMOTE_WAKE_OFFSET_INFO_API_S_VER_1 */
+        u8 sequence_number_offset;
+        u8 sequence_number_length;
+        u8 token_offset;
+        u8 token_length;
+        /* REMOTE_WAKE_PROTOCOL_PARAMS_API_S_VER_1 */
+        __le32 initial_sequence_number;
+        __le16 keepalive_interval;
+        __le16 num_tokens;
+        u8 tokens[IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS];
+} __packed; /* REMOTE_WAKE_CONFIG_API_S_VER_2 */
+
 /* TODO: NetDetect API */
 
 #endif /* __fw_api_d3_h__ */
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
index ae39b7dfda7b..d68640ea41d4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
index be36b7604b7f..81fe45f46be7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -68,73 +68,53 @@
 
 /**
  * enum iwl_scan_flags - masks for power table command flags
+ * @POWER_FLAGS_POWER_SAVE_ENA_MSK: '1' Allow to save power by turning off
+ *              receiver and transmitter. '0' - does not allow.
  * @POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK: '0' Driver disables power management,
  *              '1' Driver enables PM (use rest of parameters)
- * @POWER_FLAGS_SLEEP_OVER_DTIM_MSK: '0' PM have to walk up every DTIM,
+ * @POWER_FLAGS_SKIP_OVER_DTIM_MSK: '0' PM have to walk up every DTIM,
  *              '1' PM could sleep over DTIM till listen Interval.
- * @POWER_FLAGS_LPRX_ENA_MSK: Low Power RX enable.
- * @POWER_FLAGS_SNOOZE_ENA_MSK: Enable snoozing only if uAPSD is enabled and all
- *              access categories are both delivery and trigger enabled.
- * @POWER_FLAGS_BT_SCO_ENA: Enable BT SCO coex only if uAPSD and
- *              PBW Snoozing enabled
  * @POWER_FLAGS_ADVANCE_PM_ENA_MSK: Advanced PM (uAPSD) enable mask
+ * @POWER_FLAGS_LPRX_ENA_MSK: Low Power RX enable.
 */
 enum iwl_power_flags {
-        POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK    = BIT(0),
-        POWER_FLAGS_SLEEP_OVER_DTIM_MSK         = BIT(1),
-        POWER_FLAGS_LPRX_ENA_MSK                = BIT(2),
-        POWER_FLAGS_SNOOZE_ENA_MSK              = BIT(3),
-        POWER_FLAGS_BT_SCO_ENA                  = BIT(4),
-        POWER_FLAGS_ADVANCE_PM_ENA_MSK          = BIT(5)
+        POWER_FLAGS_POWER_SAVE_ENA_MSK          = BIT(0),
+        POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK    = BIT(1),
+        POWER_FLAGS_SKIP_OVER_DTIM_MSK          = BIT(2),
+        POWER_FLAGS_ADVANCE_PM_ENA_MSK          = BIT(9),
+        POWER_FLAGS_LPRX_ENA_MSK                = BIT(11),
 };
 
+#define IWL_POWER_VEC_SIZE 5
+
 /**
  * struct iwl_powertable_cmd - Power Table Command
  * POWER_TABLE_CMD = 0x77 (command, has simple generic response)
  *
- * @id_and_color:       MAC contex identifier
- * @action:             Action on context - no action, add new,
- *                      modify existent, remove
  * @flags:              Power table command flags from POWER_FLAGS_*
  * @keep_alive_seconds: Keep alive period in seconds. Default - 25 sec.
- *                      Minimum allowed:- 3 * DTIM
+ *                      Minimum allowed:- 3 * DTIM. Keep alive period must be
+ *                      set regardless of power scheme or current power state.
+ *                      FW use this value also when PM is disabled.
  * @rx_data_timeout:    Minimum time (usec) from last Rx packet for AM to
  *                      PSM transition - legacy PM
  * @tx_data_timeout:    Minimum time (usec) from last Tx packet for AM to
  *                      PSM transition - legacy PM
- * @rx_data_timeout_uapsd: Minimum time (usec) from last Rx packet for AM to
- *                      PSM transition - uAPSD
- * @tx_data_timeout_uapsd: Minimum time (usec) from last Tx packet for AM to
- *                      PSM transition - uAPSD
+ * @sleep_interval:     not in use
+ * @keep_alive_beacons: not in use
  * @lprx_rssi_threshold: Signal strength up to which LP RX can be enabled.
  *                      Default: 80dbm
- * @num_skip_dtim:      Number of DTIMs to skip if Skip over DTIM flag is set
- * @snooze_interval:    TBD
- * @snooze_window:      TBD
- * @snooze_step:        TBD
- * @qndp_tid:           TBD
- * @uapsd_ac_flags:     TBD
- * @uapsd_max_sp:       TBD
  */
 struct iwl_powertable_cmd {
-        /* COMMON_INDEX_HDR_API_S_VER_1 */
-        __le32 id_and_color;
-        __le32 action;
+        /* PM_POWER_TABLE_CMD_API_S_VER_5 */
         __le16 flags;
-        u8 reserved;
-        __le16 keep_alive_seconds;
+        u8 keep_alive_seconds;
+        u8 debug_flags;
         __le32 rx_data_timeout;
         __le32 tx_data_timeout;
-        __le32 rx_data_timeout_uapsd;
-        __le32 tx_data_timeout_uapsd;
-        u8 lprx_rssi_threshold;
-        u8 num_skip_dtim;
-        __le16 snooze_interval;
-        __le16 snooze_window;
-        u8 snooze_step;
-        u8 qndp_tid;
-        u8 uapsd_ac_flags;
-        u8 uapsd_max_sp;
+        __le32 sleep_interval[IWL_POWER_VEC_SIZE];
+        __le32 keep_alive_beacons;
+        __le32 lprx_rssi_threshold;
 } __packed;
 
 #endif
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
index aa3474d08231..fdd33bc0a594 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
index 670ac8f95e26..b60d14151721 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
index 0acb53dda22d..a30691a8a85b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
index 2677914bf0a6..007a93b25bd7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -537,6 +537,12 @@ struct iwl_mac_beacon_cmd {
         struct ieee80211_hdr frame[0];
 } __packed;
 
+struct iwl_beacon_notif {
+        struct iwl_mvm_tx_resp beacon_notify_hdr;
+        __le64 tsf;
+        __le32 ibss_mgr_status;
+} __packed;
+
 /**
  * enum iwl_dump_control - dump (flush) control flags
  * @DUMP_TX_FIFO_FLUSH: Dump MSDUs until the the FIFO is empty
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index 2adb61f103f4..191dcae8ba47 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -70,6 +70,7 @@
 #include "fw-api-mac.h"
 #include "fw-api-power.h"
 #include "fw-api-d3.h"
+#include "fw-api-bt-coex.h"
 
 /* queue and FIFO numbers by usage */
 enum {
@@ -150,8 +151,10 @@ enum {
 
         SET_CALIB_DEFAULT_CMD = 0x8e,
 
+        BEACON_NOTIFICATION = 0x90,
         BEACON_TEMPLATE_CMD = 0x91,
         TX_ANT_CONFIGURATION_CMD = 0x98,
+        BT_CONFIG = 0x9b,
         STATISTICS_NOTIFICATION = 0x9d,
 
         /* RF-KILL commands and notifications */
@@ -162,6 +165,11 @@ enum {
         REPLY_RX_MPDU_CMD = 0xc1,
         BA_NOTIF = 0xc5,
 
+        /* BT Coex */
+        BT_COEX_PRIO_TABLE = 0xcc,
+        BT_COEX_PROT_ENV = 0xcd,
+        BT_PROFILE_NOTIFICATION = 0xce,
+
         REPLY_DEBUG_CMD = 0xf0,
         DEBUG_LOG_MSG = 0xf7,
 
@@ -271,38 +279,7 @@ enum {
         NVM_ACCESS_TARGET_EEPROM = 2,
 };
 
-/**
- * struct iwl_nvm_access_cmd_ver1 - Request the device to send the NVM.
- * @op_code: 0 - read, 1 - write.
- * @target: NVM_ACCESS_TARGET_*. should be 0 for read.
- * @cache_refresh: 0 - None, 1- NVM.
- * @offset: offset in the nvm data.
- * @length: of the chunk.
- * @data: empty on read, the NVM chunk on write
- */
-struct iwl_nvm_access_cmd_ver1 {
-        u8 op_code;
-        u8 target;
-        u8 cache_refresh;
-        u8 reserved;
-        __le16 offset;
-        __le16 length;
-        u8 data[];
-} __packed; /* NVM_ACCESS_CMD_API_S_VER_1 */
-
-/**
- * struct iwl_nvm_access_resp_ver1 - response to NVM_ACCESS_CMD
- * @offset: the offset in the nvm data
- * @length: of the chunk
- * @data: the nvm chunk on when NVM_ACCESS_CMD was read, nothing on write
- */
-struct iwl_nvm_access_resp_ver1 {
-        __le16 offset;
-        __le16 length;
-        u8 data[];
-} __packed; /* NVM_ACCESS_CMD_RESP_API_S_VER_1 */
-
-/* Section types for NVM_ACCESS_CMD version 2 */
+/* Section types for NVM_ACCESS_CMD */
 enum {
         NVM_SECTION_TYPE_HW = 0,
         NVM_SECTION_TYPE_SW,
@@ -323,7 +300,7 @@ enum {
  * @length: in bytes, to read/write
  * @data: if write operation, the data to write. On read its empty
  */
-struct iwl_nvm_access_cmd_ver2 {
+struct iwl_nvm_access_cmd {
         u8 op_code;
         u8 target;
         __le16 type;
@@ -340,7 +317,7 @@ struct iwl_nvm_access_cmd_ver2 {
  * @status: 0 for success, fail otherwise
  * @data: if read operation, the data returned. Empty on write.
  */
-struct iwl_nvm_access_resp_ver2 {
+struct iwl_nvm_access_resp {
         __le16 offset;
         __le16 length;
         __le16 type;
@@ -503,15 +480,34 @@ enum {
         TE_DEP_TSF              = 2,
         TE_EVENT_SOCIOPATHIC    = 4,
 }; /* MAC_EVENT_DEPENDENCY_POLICY_API_E_VER_2 */
-
-/* When to send Time Event notifications and to whom (internal = FW) */
+/*
+ * Supported Time event notifications configuration.
+ * A notification (both event and fragment) includes a status indicating weather
+ * the FW was able to schedule the event or not. For fragment start/end
+ * notification the status is always success. There is no start/end fragment
+ * notification for monolithic events.
+ *
+ * @TE_NOTIF_NONE: no notifications
+ * @TE_NOTIF_HOST_EVENT_START: request/receive notification on event start
+ * @TE_NOTIF_HOST_EVENT_END:request/receive notification on event end
+ * @TE_NOTIF_INTERNAL_EVENT_START: internal FW use
+ * @TE_NOTIF_INTERNAL_EVENT_END: internal FW use.
+ * @TE_NOTIF_HOST_FRAG_START: request/receive notification on frag start
+ * @TE_NOTIF_HOST_FRAG_END:request/receive notification on frag end
+ * @TE_NOTIF_INTERNAL_FRAG_START: internal FW use.
+ * @TE_NOTIF_INTERNAL_FRAG_END: internal FW use.
+ */
 enum {
         TE_NOTIF_NONE = 0,
-        TE_NOTIF_HOST_START = 0x1,
-        TE_NOTIF_HOST_END = 0x2,
-        TE_NOTIF_INTERNAL_START = 0x4,
-        TE_NOTIF_INTERNAL_END = 0x8
-}; /* MAC_EVENT_ACTION_API_E_VER_1 */
+        TE_NOTIF_HOST_EVENT_START = 0x1,
+        TE_NOTIF_HOST_EVENT_END = 0x2,
+        TE_NOTIF_INTERNAL_EVENT_START = 0x4,
+        TE_NOTIF_INTERNAL_EVENT_END = 0x8,
+        TE_NOTIF_HOST_FRAG_START = 0x10,
+        TE_NOTIF_HOST_FRAG_END = 0x20,
+        TE_NOTIF_INTERNAL_FRAG_START = 0x40,
+        TE_NOTIF_INTERNAL_FRAG_END = 0x80
+}; /* MAC_EVENT_ACTION_API_E_VER_2 */
 
 /*
  * @TE_FRAG_NONE: fragmentation of the time event is NOT allowed.
@@ -794,6 +790,7 @@ struct iwl_phy_context_cmd {
  * @byte_count: frame's byte-count
  * @frame_time: frame's time on the air, based on byte count and frame rate
  *      calculation
+ * @mac_active_msk: what MACs were active when the frame was received
  *
  * Before each Rx, the device sends this data. It contains PHY information
  * about the reception of the packet.
@@ -811,7 +808,7 @@ struct iwl_rx_phy_info {
         __le32 non_cfg_phy[IWL_RX_INFO_PHY_CNT];
         __le32 rate_n_flags;
         __le32 byte_count;
-        __le16 reserved2;
+        __le16 mac_active_msk;
         __le16 frame_time;
 } __packed;
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index 500f818dba04..e18c92dd60ec 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -114,7 +114,7 @@ static int iwl_send_tx_ant_cfg(struct iwl_mvm *mvm, u8 valid_tx_ant)
                 .valid = cpu_to_le32(valid_tx_ant),
         };
 
-        IWL_DEBUG_HC(mvm, "select valid tx ant: %u\n", valid_tx_ant);
+        IWL_DEBUG_FW(mvm, "select valid tx ant: %u\n", valid_tx_ant);
         return iwl_mvm_send_cmd_pdu(mvm, TX_ANT_CONFIGURATION_CMD, CMD_SYNC,
                                     sizeof(tx_ant_cmd), &tx_ant_cmd);
 }
@@ -134,9 +134,10 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
         alive_data->scd_base_addr = le32_to_cpu(palive->scd_base_ptr);
 
         alive_data->valid = le16_to_cpu(palive->status) == IWL_ALIVE_STATUS_OK;
-        IWL_DEBUG_FW(mvm, "Alive ucode status 0x%04x revision 0x%01X 0x%01X\n",
+        IWL_DEBUG_FW(mvm,
+                     "Alive ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
                      le16_to_cpu(palive->status), palive->ver_type,
-                     palive->ver_subtype);
+                     palive->ver_subtype, palive->flags);
 
         return true;
 }
@@ -309,6 +310,10 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
                 goto error;
         }
 
+        ret = iwl_send_bt_prio_tbl(mvm);
+        if (ret)
+                goto error;
+
         if (read_nvm) {
                 /* Read nvm */
                 ret = iwl_nvm_init(mvm);
@@ -322,16 +327,14 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
         WARN_ON(ret);
 
         /* Send TX valid antennas before triggering calibrations */
-        ret = iwl_send_tx_ant_cfg(mvm, mvm->nvm_data->valid_tx_ant);
+        ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));
         if (ret)
                 goto error;
 
-        /* WkP doesn't have all calibrations, need to set default values */
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
-                ret = iwl_set_default_calibrations(mvm);
-                if (ret)
-                        goto error;
-        }
+        /* need to set default values */
+        ret = iwl_set_default_calibrations(mvm);
+        if (ret)
+                goto error;
 
         /*
          * Send phy configurations command to init uCode
@@ -410,7 +413,15 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
                 goto error;
         }
 
-        ret = iwl_send_tx_ant_cfg(mvm, mvm->nvm_data->valid_tx_ant);
+        ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));
+        if (ret)
+                goto error;
+
+        ret = iwl_send_bt_prio_tbl(mvm);
+        if (ret)
+                goto error;
+
+        ret = iwl_send_bt_init_conf(mvm);
         if (ret)
                 goto error;
 
@@ -456,7 +467,7 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm)
                 goto error;
         }
 
-        ret = iwl_send_tx_ant_cfg(mvm, mvm->nvm_data->valid_tx_ant);
+        ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));
         if (ret)
                 goto error;
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/led.c b/drivers/net/wireless/iwlwifi/mvm/led.c
index 011906e73a05..2269a9e5cc67 100644
--- a/drivers/net/wireless/iwlwifi/mvm/led.c
+++ b/drivers/net/wireless/iwlwifi/mvm/led.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index 341dbc0237ea..e6eca4d66f6c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -196,7 +196,7 @@ u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm,
         u32 qmask, ac;
 
         if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
-                return BIT(IWL_OFFCHANNEL_QUEUE);
+                return BIT(IWL_MVM_OFFCHANNEL_QUEUE);
 
         qmask = (vif->cab_queue != IEEE80211_INVAL_HW_QUEUE) ?
                 BIT(vif->cab_queue) : 0;
@@ -553,9 +553,9 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
         if (vif->bss_conf.qos)
                 cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);
 
+        /* Don't use cts to self as the fw doesn't support it currently. */
         if (vif->bss_conf.use_cts_prot)
-                cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT |
-                                                     MAC_PROT_FLG_SELF_CTS_EN);
+                cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);
 
         /*
          * I think that we should enable these 2 flags regardless the HT PROT
@@ -651,6 +651,13 @@ static int iwl_mvm_mac_ctxt_cmd_station(struct iwl_mvm *mvm,
         /* Fill the common data for all mac context types */
         iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);
 
+        /* Allow beacons to pass through as long as we are not associated,or we
+         * do not have dtim period information */
+        if (!vif->bss_conf.assoc || !vif->bss_conf.dtim_period)
+                cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_BEACON);
+        else
+                cmd.filter_flags &= ~cpu_to_le32(MAC_FILTER_IN_BEACON);
+
         /* Fill the data specific for station mode */
         iwl_mvm_mac_ctxt_cmd_fill_sta(mvm, vif, &cmd.sta);
 
@@ -662,6 +669,7 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_client(struct iwl_mvm *mvm,
                                            u32 action)
 {
         struct iwl_mac_ctx_cmd cmd = {};
+        struct ieee80211_p2p_noa_attr *noa = &vif->bss_conf.p2p_noa_attr;
 
         WARN_ON(vif->type != NL80211_IFTYPE_STATION || !vif->p2p);
 
@@ -671,7 +679,8 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_client(struct iwl_mvm *mvm,
         /* Fill the data specific for station mode */
         iwl_mvm_mac_ctxt_cmd_fill_sta(mvm, vif, &cmd.p2p_sta.sta);
 
-        cmd.p2p_sta.ctwin = cpu_to_le32(vif->bss_conf.p2p_ctwindow);
+        cmd.p2p_sta.ctwin = cpu_to_le32(noa->oppps_ctwindow &
+                                        IEEE80211_P2P_OPPPS_CTWINDOW_MASK);
 
         return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
 }
@@ -685,7 +694,12 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,
         WARN_ON(vif->type != NL80211_IFTYPE_MONITOR);
 
         iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);
-        /* No other data to be filled */
+
+        cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROMISC |
+                                       MAC_FILTER_IN_CONTROL_AND_MGMT |
+                                       MAC_FILTER_IN_BEACON |
+                                       MAC_FILTER_IN_PROBE_REQUEST);
+
         return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
 }
 
@@ -714,7 +728,9 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_device(struct iwl_mvm *mvm,
         iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);
 
         cmd.protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);
-        cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROMISC);
+
+        /* Override the filter flags to accept only probe requests */
+        cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);
 
         /*
          * This flag should be set to true when the P2P Device is
@@ -789,7 +805,7 @@ static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
                                              TX_CMD_FLG_TSF);
 
         mvm->mgmt_last_antenna_idx =
-                iwl_mvm_next_antenna(mvm, mvm->nvm_data->valid_tx_ant,
+                iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw),
                                      mvm->mgmt_last_antenna_idx);
 
         beacon_cmd.tx.rate_n_flags =
@@ -846,10 +862,10 @@ int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
  */
 static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,
                                          struct ieee80211_vif *vif,
-                                         struct iwl_mac_data_ap *ctxt_ap)
+                                         struct iwl_mac_data_ap *ctxt_ap,
+                                         bool add)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-        u32 curr_dev_time;
 
         ctxt_ap->bi = cpu_to_le32(vif->bss_conf.beacon_int);
         ctxt_ap->bi_reciprocal =
@@ -861,10 +877,19 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,
                                                vif->bss_conf.dtim_period));
 
         ctxt_ap->mcast_qid = cpu_to_le32(vif->cab_queue);
-        curr_dev_time = iwl_read_prph(mvm->trans, DEVICE_SYSTEM_TIME_REG);
-        ctxt_ap->beacon_time = cpu_to_le32(curr_dev_time);
 
-        ctxt_ap->beacon_tsf = cpu_to_le64(curr_dev_time);
+        /*
+         * Only read the system time when the MAC is being added, when we
+         * just modify the MAC then we should keep the time -- the firmware
+         * can otherwise have a "jumping" TBTT.
+         */
+        if (add)
+                mvmvif->ap_beacon_time =
+                        iwl_read_prph(mvm->trans, DEVICE_SYSTEM_TIME_REG);
+
+        ctxt_ap->beacon_time = cpu_to_le32(mvmvif->ap_beacon_time);
+
+        ctxt_ap->beacon_tsf = 0; /* unused */
 
         /* TODO: Assume that the beacon id == mac context id */
         ctxt_ap->beacon_template = cpu_to_le32(mvmvif->id);
@@ -881,8 +906,12 @@ static int iwl_mvm_mac_ctxt_cmd_ap(struct iwl_mvm *mvm,
         /* Fill the common data for all mac context types */
         iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);
 
+        /* Also enable probe requests to pass */
+        cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);
+
         /* Fill the data specific for ap mode */
-        iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.ap);
+        iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.ap,
+                                     action == FW_CTXT_ACTION_ADD);
 
         return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
 }
@@ -892,6 +921,7 @@ static int iwl_mvm_mac_ctxt_cmd_go(struct iwl_mvm *mvm,
                                    u32 action)
 {
         struct iwl_mac_ctx_cmd cmd = {};
+        struct ieee80211_p2p_noa_attr *noa = &vif->bss_conf.p2p_noa_attr;
 
         WARN_ON(vif->type != NL80211_IFTYPE_AP || !vif->p2p);
 
@@ -899,10 +929,14 @@ static int iwl_mvm_mac_ctxt_cmd_go(struct iwl_mvm *mvm,
         iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);
 
         /* Fill the data specific for GO mode */
-        iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.go.ap);
+        iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.go.ap,
+                                     action == FW_CTXT_ACTION_ADD);
 
-        cmd.go.ctwin = cpu_to_le32(vif->bss_conf.p2p_ctwindow);
-        cmd.go.opp_ps_enabled = cpu_to_le32(!!vif->bss_conf.p2p_oppps);
+        cmd.go.ctwin = cpu_to_le32(noa->oppps_ctwindow &
+                                        IEEE80211_P2P_OPPPS_CTWINDOW_MASK);
+        cmd.go.opp_ps_enabled =
+                        cpu_to_le32(!!(noa->oppps_ctwindow &
+                                        IEEE80211_P2P_OPPPS_ENABLE_BIT));
 
         return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
 }
@@ -990,3 +1024,22 @@ int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         mvmvif->uploaded = false;
         return 0;
 }
+
+int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
+                            struct iwl_rx_cmd_buffer *rxb,
+                            struct iwl_device_cmd *cmd)
+{
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+        struct iwl_beacon_notif *beacon = (void *)pkt->data;
+        u16 status __maybe_unused =
+                le16_to_cpu(beacon->beacon_notify_hdr.status.status);
+        u32 rate __maybe_unused =
+                le32_to_cpu(beacon->beacon_notify_hdr.initial_rate);
+
+        IWL_DEBUG_RX(mvm, "beacon status %#x retries:%d tsf:0x%16llX rate:%d\n",
+                     status & TX_STATUS_MSK,
+                     beacon->beacon_notify_hdr.failure_frame,
+                     le64_to_cpu(beacon->tsf),
+                     rate);
+        return 0;
+}
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 7e169b085afe..dd158ec571fb 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -65,7 +65,9 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/ip.h>
 #include <net/mac80211.h>
+#include <net/tcp.h>
 
 #include "iwl-op-mode.h"
 #include "iwl-io.h"
@@ -102,10 +104,33 @@ static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
         },
 };
 
+#ifdef CONFIG_PM_SLEEP
+static const struct nl80211_wowlan_tcp_data_token_feature
+iwl_mvm_wowlan_tcp_token_feature = {
+        .min_len = 0,
+        .max_len = 255,
+        .bufsize = IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS,
+};
+
+static const struct wiphy_wowlan_tcp_support iwl_mvm_wowlan_tcp_support = {
+        .tok = &iwl_mvm_wowlan_tcp_token_feature,
+        .data_payload_max = IWL_WOWLAN_TCP_MAX_PACKET_LEN -
+                            sizeof(struct ethhdr) -
+                            sizeof(struct iphdr) -
+                            sizeof(struct tcphdr),
+        .data_interval_max = 65535, /* __le16 in API */
+        .wake_payload_max = IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN -
+                            sizeof(struct ethhdr) -
+                            sizeof(struct iphdr) -
+                            sizeof(struct tcphdr),
+        .seq = true,
+};
+#endif
+
 int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 {
         struct ieee80211_hw *hw = mvm->hw;
-        int num_mac, ret;
+        int num_mac, ret, i;
 
         /* Tell mac80211 our characteristics */
         hw->flags = IEEE80211_HW_SIGNAL_DBM |
@@ -118,8 +143,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                     IEEE80211_HW_AMPDU_AGGREGATION |
                     IEEE80211_HW_TIMING_BEACON_ONLY;
 
-        hw->queues = IWL_FIRST_AMPDU_QUEUE;
-        hw->offchannel_tx_hw_queue = IWL_OFFCHANNEL_QUEUE;
+        hw->queues = IWL_MVM_FIRST_AGG_QUEUE;
+        hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;
         hw->rate_control_algorithm = "iwl-mvm-rs";
 
         /*
@@ -149,18 +174,22 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
         hw->wiphy->n_iface_combinations =
                 ARRAY_SIZE(iwl_mvm_iface_combinations);
 
-        hw->wiphy->max_remain_on_channel_duration = 500;
+        hw->wiphy->max_remain_on_channel_duration = 10000;
         hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
 
         /* Extract MAC address */
         memcpy(mvm->addresses[0].addr, mvm->nvm_data->hw_addr, ETH_ALEN);
         hw->wiphy->addresses = mvm->addresses;
         hw->wiphy->n_addresses = 1;
-        num_mac = mvm->nvm_data->n_hw_addrs;
-        if (num_mac > 1) {
-                memcpy(mvm->addresses[1].addr, mvm->addresses[0].addr,
+
+        /* Extract additional MAC addresses if available */
+        num_mac = (mvm->nvm_data->n_hw_addrs > 1) ?
+                min(IWL_MVM_MAX_ADDRESSES, mvm->nvm_data->n_hw_addrs) : 1;
+
+        for (i = 1; i < num_mac; i++) {
+                memcpy(mvm->addresses[i].addr, mvm->addresses[i-1].addr,
                        ETH_ALEN);
-                mvm->addresses[1].addr[5]++;
+                mvm->addresses[i].addr[5]++;
                 hw->wiphy->n_addresses++;
         }
 
@@ -178,7 +207,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 
         hw->wiphy->hw_version = mvm->trans->hw_id;
 
-        if (iwlwifi_mod_params.power_save)
+        if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)
                 hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
         else
                 hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
@@ -206,6 +235,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                 hw->wiphy->wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS;
                 hw->wiphy->wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN;
                 hw->wiphy->wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN;
+                hw->wiphy->wowlan.tcp = &iwl_mvm_wowlan_tcp_support;
         }
 #endif
 
@@ -227,7 +257,7 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,
                 goto drop;
         }
 
-        if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_OFFCHANNEL_QUEUE &&
+        if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_MVM_OFFCHANNEL_QUEUE &&
             !test_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status))
                 goto drop;
 
@@ -273,12 +303,18 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,
                 ret = iwl_mvm_sta_rx_agg(mvm, sta, tid, 0, false);
                 break;
         case IEEE80211_AMPDU_TX_START:
+                if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG) {
+                        ret = -EINVAL;
+                        break;
+                }
                 ret = iwl_mvm_sta_tx_agg_start(mvm, vif, sta, tid, ssn);
                 break;
         case IEEE80211_AMPDU_TX_STOP_CONT:
+                ret = iwl_mvm_sta_tx_agg_stop(mvm, vif, sta, tid);
+                break;
         case IEEE80211_AMPDU_TX_STOP_FLUSH:
         case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
-                ret = iwl_mvm_sta_tx_agg_stop(mvm, vif, sta, tid);
+                ret = iwl_mvm_sta_tx_agg_flush(mvm, vif, sta, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 ret = iwl_mvm_sta_tx_agg_oper(mvm, vif, sta, tid, buf_size);
@@ -466,11 +502,15 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
         /*
          * TODO: remove this temporary code.
          * Currently MVM FW supports power management only on single MAC.
-         * Iterate and disable PM on all active interfaces.
+         * If new interface added, disable PM on existing interface.
+         * P2P device is a special case, since it is handled by FW similary to
+         * scan. If P2P deviced is added, PM remains enabled on existing
+         * interface.
          * Note: the method below does not count the new interface being added
          * at this moment.
          */
-        mvm->vif_count++;
+        if (vif->type != NL80211_IFTYPE_P2P_DEVICE)
+                mvm->vif_count++;
         if (mvm->vif_count > 1) {
                 IWL_DEBUG_MAC80211(mvm,
                                    "Disable power on existing interfaces\n");
@@ -526,6 +566,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
                 mvm->p2p_device_vif = vif;
         }
 
+        iwl_mvm_vif_dbgfs_register(mvm, vif);
         goto out_unlock;
 
  out_unbind:
@@ -539,10 +580,11 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
         /*
          * TODO: remove this temporary code.
          * Currently MVM FW supports power management only on single MAC.
-         * Check if only one additional interface remains after rereasing
+         * Check if only one additional interface remains after releasing
          * current one. Update power mode on the remaining interface.
          */
-        mvm->vif_count--;
+        if (vif->type != NL80211_IFTYPE_P2P_DEVICE)
+                mvm->vif_count--;
         IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n",
                            mvm->vif_count);
         if (mvm->vif_count == 1) {
@@ -604,6 +646,8 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
+        iwl_mvm_vif_dbgfs_clean(mvm, vif);
+
         /*
          * For AP/GO interface, the tear down of the resources allocated to the
          * interface is be handled as part of the stop_ap flow.
@@ -627,7 +671,7 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,
          * Check if only one additional interface remains after removing
          * current one. Update power mode on the remaining interface.
          */
-        if (mvm->vif_count)
+        if (mvm->vif_count && vif->type != NL80211_IFTYPE_P2P_DEVICE)
                 mvm->vif_count--;
         IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n",
                            mvm->vif_count);
@@ -677,6 +721,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
                                 IWL_ERR(mvm, "failed to update quotas\n");
                                 return;
                         }
+                        iwl_mvm_bt_coex_vif_assoc(mvm, vif);
                 } else if (mvmvif->ap_sta_id != IWL_MVM_STATION_COUNT) {
                         /* remove AP station now that the MAC is unassoc */
                         ret = iwl_mvm_rm_sta_id(mvm, vif, mvmvif->ap_sta_id);
@@ -895,7 +940,7 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,
                  */
                 break;
         case STA_NOTIFY_AWAKE:
-                if (WARN_ON(mvmsta->sta_id == IWL_INVALID_STATION))
+                if (WARN_ON(mvmsta->sta_id == IWL_MVM_STATION_COUNT))
                         break;
                 iwl_mvm_sta_modify_ps_wake(mvm, sta);
                 break;
@@ -1051,6 +1096,13 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,
 
         switch (cmd) {
         case SET_KEY:
+                if (vif->type == NL80211_IFTYPE_AP && !sta) {
+                        /* GTK on AP interface is a TX-only key, return 0 */
+                        ret = 0;
+                        key->hw_key_idx = STA_KEY_IDX_INVALID;
+                        break;
+                }
+
                 IWL_DEBUG_MAC80211(mvm, "set hwcrypto key\n");
                 ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, false);
                 if (ret) {
@@ -1059,11 +1111,17 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,
                          * can't add key for RX, but we don't need it
                          * in the device for TX so still return 0
                          */
+                        key->hw_key_idx = STA_KEY_IDX_INVALID;
                         ret = 0;
                 }
 
                 break;
         case DISABLE_KEY:
+                if (key->hw_key_idx == STA_KEY_IDX_INVALID) {
+                        ret = 0;
+                        break;
+                }
+
                 IWL_DEBUG_MAC80211(mvm, "disable hwcrypto key\n");
                 ret = iwl_mvm_remove_sta_key(mvm, vif, sta, key);
                 break;
@@ -1090,7 +1148,8 @@ static void iwl_mvm_mac_update_tkip_key(struct ieee80211_hw *hw,
 static int iwl_mvm_roc(struct ieee80211_hw *hw,
                        struct ieee80211_vif *vif,
                        struct ieee80211_channel *channel,
-                       int duration)
+                       int duration,
+                       enum ieee80211_roc_type type)
 {
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
         struct cfg80211_chan_def chandef;
@@ -1101,8 +1160,8 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,
                 return -EINVAL;
         }
 
-        IWL_DEBUG_MAC80211(mvm, "enter (%d, %d)\n", channel->hw_value,
-                           duration);
+        IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel->hw_value,
+                           duration, type);
 
         mutex_lock(&mvm->mutex);
 
@@ -1111,7 +1170,7 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,
                                        &chandef, 1, 1);
 
         /* Schedule the time events */
-        ret = iwl_mvm_start_p2p_roc(mvm, vif, duration);
+        ret = iwl_mvm_start_p2p_roc(mvm, vif, duration, type);
 
         mutex_unlock(&mvm->mutex);
         IWL_DEBUG_MAC80211(mvm, "leave\n");
@@ -1215,6 +1274,7 @@ static int iwl_mvm_assign_vif_chanctx(struct ieee80211_hw *hw,
          * will handle quota settings.
          */
         if (vif->type == NL80211_IFTYPE_MONITOR) {
+                mvmvif->monitor_active = true;
                 ret = iwl_mvm_update_quotas(mvm, vif);
                 if (ret)
                         goto out_remove_binding;
@@ -1245,15 +1305,16 @@ static void iwl_mvm_unassign_vif_chanctx(struct ieee80211_hw *hw,
         if (vif->type == NL80211_IFTYPE_AP)
                 goto out_unlock;
 
-        iwl_mvm_binding_remove_vif(mvm, vif);
         switch (vif->type) {
         case NL80211_IFTYPE_MONITOR:
-                iwl_mvm_update_quotas(mvm, vif);
+                mvmvif->monitor_active = false;
+                iwl_mvm_update_quotas(mvm, NULL);
                 break;
         default:
                 break;
         }
 
+        iwl_mvm_binding_remove_vif(mvm, vif);
 out_unlock:
         mvmvif->phy_ctxt = NULL;
         mutex_unlock(&mvm->mutex);
@@ -1274,6 +1335,15 @@ static int iwl_mvm_set_tim(struct ieee80211_hw *hw,
         return iwl_mvm_mac_ctxt_beacon_changed(mvm, mvm_sta->vif);
 }
 
+static void iwl_mvm_mac_rssi_callback(struct ieee80211_hw *hw,
+                                      struct ieee80211_vif *vif,
+                                      enum ieee80211_rssi_event rssi_event)
+{
+        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+
+        iwl_mvm_bt_rssi_event(mvm, vif, rssi_event);
+}
+
 struct ieee80211_ops iwl_mvm_hw_ops = {
         .tx = iwl_mvm_mac_tx,
         .ampdu_action = iwl_mvm_mac_ampdu_action,
@@ -1297,6 +1367,7 @@ struct ieee80211_ops iwl_mvm_hw_ops = {
         .update_tkip_key = iwl_mvm_mac_update_tkip_key,
         .remain_on_channel = iwl_mvm_roc,
         .cancel_remain_on_channel = iwl_mvm_cancel_roc,
+        .rssi_callback = iwl_mvm_mac_rssi_callback,
 
         .add_chanctx = iwl_mvm_add_chanctx,
         .remove_chanctx = iwl_mvm_remove_chanctx,
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index bdae700c769e..8269bc562951 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -79,7 +79,7 @@
 #include "fw-api.h"
 
 #define IWL_INVALID_MAC80211_QUEUE      0xff
-#define IWL_MVM_MAX_ADDRESSES           2
+#define IWL_MVM_MAX_ADDRESSES           5
 /* RSSI offset for WkP */
 #define IWL_RSSI_OFFSET 50
 
@@ -90,10 +90,6 @@ enum iwl_mvm_tx_fifo {
         IWL_MVM_TX_FIFO_VO,
 };
 
-/* Placeholder */
-#define IWL_OFFCHANNEL_QUEUE 8
-#define IWL_FIRST_AMPDU_QUEUE 11
-
 extern struct ieee80211_ops iwl_mvm_hw_ops;
 /**
  * struct iwl_mvm_mod_params - module parameters for iwlmvm
@@ -161,6 +157,8 @@ enum iwl_power_scheme {
  * @uploaded: indicates the MAC context has been added to the device
  * @ap_active: indicates that ap context is configured, and that the interface
  *  should get quota etc.
+ * @monitor_active: indicates that monitor context is configured, and that the
+ * interface should get quota etc.
  * @queue_params: QoS params for this MAC
  * @bcast_sta: station used for broadcast packets. Used by the following
  *  vifs: P2P_DEVICE, GO and AP.
@@ -173,6 +171,9 @@ struct iwl_mvm_vif {
 
         bool uploaded;
         bool ap_active;
+        bool monitor_active;
+
+        u32 ap_beacon_time;
 
         enum iwl_tsf_id tsf_id;
 
@@ -211,6 +212,7 @@ struct iwl_mvm_vif {
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         struct dentry *dbgfs_dir;
+        struct dentry *dbgfs_slink;
         void *dbgfs_data;
 #endif
 };
@@ -279,10 +281,7 @@ struct iwl_mvm {
         atomic_t queue_stop_count[IWL_MAX_HW_QUEUES];
 
         struct iwl_nvm_data *nvm_data;
-        /* eeprom blob for debugfs/testmode */
-        u8 *eeprom_blob;
-        size_t eeprom_blob_size;
-        /* NVM sections for 7000 family */
+        /* NVM sections */
         struct iwl_nvm_section nvm_sections[NVM_NUM_OF_SECTIONS];
 
         /* EEPROM MAC addresses */
@@ -323,6 +322,13 @@ struct iwl_mvm {
          * can hold 16 keys at most. Reflect this fact.
          */
         unsigned long fw_key_table[BITS_TO_LONGS(STA_KEY_MAX_NUM)];
+
+        /*
+         * This counter of created interfaces is referenced only in conjunction
+         * with FW limitation related to power management. Currently PM is
+         * supported only on a single interface.
+         * IMPORTANT: this variable counts all interfaces except P2P device.
+         */
         u8 vif_count;
 
         struct led_classdev led;
@@ -332,6 +338,10 @@ struct iwl_mvm {
 #ifdef CONFIG_PM_SLEEP
         int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
 #endif
+
+        /* BT-Coex */
+        u8 bt_kill_msk;
+        struct iwl_bt_coex_profile_notif last_bt_notif;
 };
 
 /* Extract MVM priv from op_mode and _hw */
@@ -445,6 +455,9 @@ u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm,
                                 struct ieee80211_vif *vif);
 int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
                                     struct ieee80211_vif *vif);
+int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
+                            struct iwl_rx_cmd_buffer *rxb,
+                            struct iwl_device_cmd *cmd);
 
 /* Bindings */
 int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
@@ -466,16 +479,22 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm);
 /* MVM debugfs */
 #ifdef CONFIG_IWLWIFI_DEBUGFS
 int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir);
-int iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                               struct dentry *dbgfs_dir);
-void iwl_power_get_params(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                          struct iwl_powertable_cmd *cmd);
+void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+void iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 #else
 static inline int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm,
                                          struct dentry *dbgfs_dir)
 {
         return 0;
 }
+static inline void
+iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+{
+}
+static inline void
+iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+{
+}
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
 /* rate scaling */
@@ -485,6 +504,8 @@ int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq,
 /* power managment */
 int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 int iwl_mvm_power_disable(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             struct iwl_powertable_cmd *cmd);
 
 int iwl_mvm_leds_init(struct iwl_mvm *mvm);
 void iwl_mvm_leds_exit(struct iwl_mvm *mvm);
@@ -502,4 +523,14 @@ void iwl_mvm_ipv6_addr_change(struct ieee80211_hw *hw,
 void iwl_mvm_set_default_unicast_key(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif, int idx);
 
+/* BT Coex */
+int iwl_send_bt_prio_tbl(struct iwl_mvm *mvm);
+int iwl_send_bt_init_conf(struct iwl_mvm *mvm);
+int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
+                             struct iwl_rx_cmd_buffer *rxb,
+                             struct iwl_device_cmd *cmd);
+void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                           enum ieee80211_rssi_event rssi_event);
+void iwl_mvm_bt_coex_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+
 #endif /* __IWL_MVM_H__ */
diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 20016bcbdeab..b8ec02f89acc 100644
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -74,26 +74,11 @@ static const int nvm_to_read[] = {
         NVM_SECTION_TYPE_PRODUCTION,
 };
 
-/* used to simplify the shared operations on NCM_ACCESS_CMD versions */
-union iwl_nvm_access_cmd {
-        struct iwl_nvm_access_cmd_ver1 ver1;
-        struct iwl_nvm_access_cmd_ver2 ver2;
-};
-union iwl_nvm_access_resp {
-        struct iwl_nvm_access_resp_ver1 ver1;
-        struct iwl_nvm_access_resp_ver2 ver2;
-};
-
-static inline void iwl_nvm_fill_read_ver1(struct iwl_nvm_access_cmd_ver1 *cmd,
-                                          u16 offset, u16 length)
-{
-        cmd->offset = cpu_to_le16(offset);
-        cmd->length = cpu_to_le16(length);
-        cmd->cache_refresh = 1;
-}
+/* Default NVM size to read */
+#define IWL_NVM_DEFAULT_CHUNK_SIZE (2*1024);
 
-static inline void iwl_nvm_fill_read_ver2(struct iwl_nvm_access_cmd_ver2 *cmd,
-                                          u16 offset, u16 length, u16 section)
+static inline void iwl_nvm_fill_read(struct iwl_nvm_access_cmd *cmd,
+                                     u16 offset, u16 length, u16 section)
 {
         cmd->offset = cpu_to_le16(offset);
         cmd->length = cpu_to_le16(length);
@@ -103,8 +88,8 @@ static inline void iwl_nvm_fill_read_ver2(struct iwl_nvm_access_cmd_ver2 *cmd,
 static int iwl_nvm_read_chunk(struct iwl_mvm *mvm, u16 section,
                               u16 offset, u16 length, u8 *data)
 {
-        union iwl_nvm_access_cmd nvm_access_cmd;
-        union iwl_nvm_access_resp *nvm_resp;
+        struct iwl_nvm_access_cmd nvm_access_cmd = {};
+        struct iwl_nvm_access_resp *nvm_resp;
         struct iwl_rx_packet *pkt;
         struct iwl_host_cmd cmd = {
                 .id = NVM_ACCESS_CMD,
@@ -114,18 +99,8 @@ static int iwl_nvm_read_chunk(struct iwl_mvm *mvm, u16 section,
         int ret, bytes_read, offset_read;
         u8 *resp_data;
 
-        memset(&nvm_access_cmd, 0, sizeof(nvm_access_cmd));
-
-        /* TODO: not sure family should be the decider, maybe FW version? */
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
-                iwl_nvm_fill_read_ver2(&(nvm_access_cmd.ver2),
-                                       offset, length, section);
-                cmd.len[0] = sizeof(struct iwl_nvm_access_cmd_ver2);
-        } else {
-                iwl_nvm_fill_read_ver1(&(nvm_access_cmd.ver1),
-                                       offset, length);
-                cmd.len[0] = sizeof(struct iwl_nvm_access_cmd_ver1);
-        }
+        iwl_nvm_fill_read(&nvm_access_cmd, offset, length, section);
+        cmd.len[0] = sizeof(struct iwl_nvm_access_cmd);
 
         ret = iwl_mvm_send_cmd(mvm, &cmd);
         if (ret)
@@ -141,17 +116,10 @@ static int iwl_nvm_read_chunk(struct iwl_mvm *mvm, u16 section,
 
         /* Extract NVM response */
         nvm_resp = (void *)pkt->data;
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
-                ret = le16_to_cpu(nvm_resp->ver2.status);
-                bytes_read = le16_to_cpu(nvm_resp->ver2.length);
-                offset_read = le16_to_cpu(nvm_resp->ver2.offset);
-                resp_data = nvm_resp->ver2.data;
-        } else {
-                ret = le16_to_cpu(nvm_resp->ver1.length) <= 0;
-                bytes_read = le16_to_cpu(nvm_resp->ver1.length);
-                offset_read = le16_to_cpu(nvm_resp->ver1.offset);
-                resp_data = nvm_resp->ver1.data;
-        }
+        ret = le16_to_cpu(nvm_resp->status);
+        bytes_read = le16_to_cpu(nvm_resp->length);
+        offset_read = le16_to_cpu(nvm_resp->offset);
+        resp_data = nvm_resp->data;
         if (ret) {
                 IWL_ERR(mvm,
                         "NVM access command failed with status %d (device: %s)\n",
@@ -191,17 +159,10 @@ static int iwl_nvm_read_section(struct iwl_mvm *mvm, u16 section,
 {
         u16 length, offset = 0;
         int ret;
-        bool old_eeprom = mvm->cfg->device_family != IWL_DEVICE_FAMILY_7000;
 
-        length = (iwlwifi_mod_params.amsdu_size_8K ? (8 * 1024) : (4 * 1024))
-                - sizeof(union iwl_nvm_access_cmd)
-                - sizeof(struct iwl_rx_packet);
-        /*
-         * if length is greater than EEPROM size, truncate it because uCode
-         * doesn't check it by itself, and exit the loop when reached.
-         */
-        if (old_eeprom && length > mvm->cfg->base_params->eeprom_size)
-                length = mvm->cfg->base_params->eeprom_size;
+        /* Set nvm section read length */
+        length = IWL_NVM_DEFAULT_CHUNK_SIZE;
+
         ret = length;
 
         /* Read the NVM until exhausted (reading less than requested) */
@@ -214,8 +175,6 @@ static int iwl_nvm_read_section(struct iwl_mvm *mvm, u16 section,
                         return ret;
                 }
                 offset += ret;
-                if (old_eeprom && offset == mvm->cfg->base_params->eeprom_size)
-                        break;
         }
 
         IWL_INFO(mvm, "NVM section %d read completed\n", section);
@@ -249,63 +208,31 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
         int ret, i, section;
         u8 *nvm_buffer, *temp;
 
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
-                /* TODO: find correct NVM max size for a section */
-                nvm_buffer = kmalloc(mvm->cfg->base_params->eeprom_size,
-                                     GFP_KERNEL);
-                if (!nvm_buffer)
-                        return -ENOMEM;
-                for (i = 0; i < ARRAY_SIZE(nvm_to_read); i++) {
-                        section = nvm_to_read[i];
-                        /* we override the constness for initial read */
-                        ret = iwl_nvm_read_section(mvm, section, nvm_buffer);
-                        if (ret < 0)
-                                break;
-                        temp = kmemdup(nvm_buffer, ret, GFP_KERNEL);
-                        if (!temp) {
-                                ret = -ENOMEM;
-                                break;
-                        }
-                        mvm->nvm_sections[section].data = temp;
-                        mvm->nvm_sections[section].length = ret;
-                }
-                kfree(nvm_buffer);
+        /* TODO: find correct NVM max size for a section */
+        nvm_buffer = kmalloc(mvm->cfg->base_params->eeprom_size,
+                             GFP_KERNEL);
+        if (!nvm_buffer)
+                return -ENOMEM;
+        for (i = 0; i < ARRAY_SIZE(nvm_to_read); i++) {
+                section = nvm_to_read[i];
+                /* we override the constness for initial read */
+                ret = iwl_nvm_read_section(mvm, section, nvm_buffer);
                 if (ret < 0)
-                        return ret;
-        } else {
-                /* allocate eeprom */
-                mvm->eeprom_blob_size = mvm->cfg->base_params->eeprom_size;
-                IWL_DEBUG_EEPROM(mvm->trans->dev, "NVM size = %zd\n",
-                                 mvm->eeprom_blob_size);
-                mvm->eeprom_blob = kzalloc(mvm->eeprom_blob_size, GFP_KERNEL);
-                if (!mvm->eeprom_blob)
-                        return -ENOMEM;
-
-                ret = iwl_nvm_read_section(mvm, 0, mvm->eeprom_blob);
-                if (ret != mvm->eeprom_blob_size) {
-                        IWL_ERR(mvm, "Read partial NVM %d/%zd\n",
-                                ret, mvm->eeprom_blob_size);
-                        kfree(mvm->eeprom_blob);
-                        mvm->eeprom_blob = NULL;
-                        return -EINVAL;
+                        break;
+                temp = kmemdup(nvm_buffer, ret, GFP_KERNEL);
+                if (!temp) {
+                        ret = -ENOMEM;
+                        break;
                 }
+                mvm->nvm_sections[section].data = temp;
+                mvm->nvm_sections[section].length = ret;
         }
+        kfree(nvm_buffer);
+        if (ret < 0)
+                return ret;
 
         ret = 0;
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000)
-                mvm->nvm_data = iwl_parse_nvm_sections(mvm);
-        else
-                mvm->nvm_data =
-                        iwl_parse_eeprom_data(mvm->trans->dev,
-                                              mvm->cfg,
-                                              mvm->eeprom_blob,
-                                              mvm->eeprom_blob_size);
-
-        if (!mvm->nvm_data) {
-                kfree(mvm->eeprom_blob);
-                mvm->eeprom_blob = NULL;
-                ret = -ENOMEM;
-        }
+        mvm->nvm_data = iwl_parse_nvm_sections(mvm);
 
         return ret;
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index d0f9c1e0475e..fe031d304d1e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -143,21 +143,12 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)
         u8 radio_cfg_type, radio_cfg_step, radio_cfg_dash;
         u32 reg_val = 0;
 
-        /*
-         * We can't upload the correct value to the INIT image
-         * as we don't have nvm_data by that time.
-         *
-         * TODO: Figure out what we should do here
-         */
-        if (mvm->nvm_data) {
-                radio_cfg_type = mvm->nvm_data->radio_cfg_type;
-                radio_cfg_step = mvm->nvm_data->radio_cfg_step;
-                radio_cfg_dash = mvm->nvm_data->radio_cfg_dash;
-        } else {
-                radio_cfg_type = 0;
-                radio_cfg_step = 0;
-                radio_cfg_dash = 0;
-        }
+        radio_cfg_type = (mvm->fw->phy_config & FW_PHY_CFG_RADIO_TYPE) >>
+                          FW_PHY_CFG_RADIO_TYPE_POS;
+        radio_cfg_step = (mvm->fw->phy_config & FW_PHY_CFG_RADIO_STEP) >>
+                          FW_PHY_CFG_RADIO_STEP_POS;
+        radio_cfg_dash = (mvm->fw->phy_config & FW_PHY_CFG_RADIO_DASH) >>
+                          FW_PHY_CFG_RADIO_DASH_POS;
 
         /* SKU control */
         reg_val |= CSR_HW_REV_STEP(mvm->trans->hw_rev) <<
@@ -175,7 +166,6 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)
 
         /* silicon bits */
         reg_val |= CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI;
-        reg_val |= CSR_HW_IF_CONFIG_REG_BIT_MAC_SI;
 
         iwl_trans_set_bits_mask(mvm->trans, CSR_HW_IF_CONFIG_REG,
                                 CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |
@@ -230,6 +220,9 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
         RX_HANDLER(SCAN_REQUEST_CMD, iwl_mvm_rx_scan_response, false),
         RX_HANDLER(SCAN_COMPLETE_NOTIFICATION, iwl_mvm_rx_scan_complete, false),
 
+        RX_HANDLER(BT_PROFILE_NOTIFICATION, iwl_mvm_rx_bt_coex_notif, true),
+        RX_HANDLER(BEACON_NOTIFICATION, iwl_mvm_rx_beacon_notif, false),
+
         RX_HANDLER(RADIO_VERSION_NOTIFICATION, iwl_mvm_rx_radio_ver, false),
         RX_HANDLER(CARD_STATE_NOTIFICATION, iwl_mvm_rx_card_state_notif, false),
 
@@ -274,6 +267,7 @@ static const char *iwl_mvm_cmd_strings[REPLY_MAX] = {
         CMD(WEP_KEY),
         CMD(REPLY_RX_PHY_CMD),
         CMD(REPLY_RX_MPDU_CMD),
+        CMD(BEACON_NOTIFICATION),
         CMD(BEACON_TEMPLATE_CMD),
         CMD(STATISTICS_NOTIFICATION),
         CMD(TX_ANT_CONFIGURATION_CMD),
@@ -293,6 +287,11 @@ static const char *iwl_mvm_cmd_strings[REPLY_MAX] = {
         CMD(NET_DETECT_PROFILES_CMD),
         CMD(NET_DETECT_HOTSPOTS_CMD),
         CMD(NET_DETECT_HOTSPOTS_QUERY_CMD),
+        CMD(CARD_STATE_NOTIFICATION),
+        CMD(BT_COEX_PRIO_TABLE),
+        CMD(BT_COEX_PROT_ENV),
+        CMD(BT_PROFILE_NOTIFICATION),
+        CMD(BT_CONFIG),
 };
 #undef CMD
 
@@ -312,16 +311,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         };
         int err, scan_size;
 
-        switch (cfg->device_family) {
-        case IWL_DEVICE_FAMILY_6030:
-        case IWL_DEVICE_FAMILY_6005:
-        case IWL_DEVICE_FAMILY_7000:
-                break;
-        default:
-                IWL_ERR(trans, "Trying to load mvm on an unsupported device\n");
-                return NULL;
-        }
-
         /********************************
          * 1. Allocating and configuring HW data
          ********************************/
@@ -363,8 +352,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);
         trans_cfg.rx_buf_size_8k = iwlwifi_mod_params.amsdu_size_8K;
 
-        /* TODO: this should really be a TLV */
-        if (cfg->device_family == IWL_DEVICE_FAMILY_7000)
+        if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_DW_BC_TABLE)
                 trans_cfg.bc_table_dword = true;
 
         if (!iwlwifi_mod_params.wd_disable)
@@ -438,7 +426,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
  out_free:
         iwl_phy_db_free(mvm->phy_db);
         kfree(mvm->scan_cmd);
-        kfree(mvm->eeprom_blob);
         iwl_trans_stop_hw(trans, true);
         ieee80211_free_hw(mvm->hw);
         return NULL;
@@ -460,7 +447,6 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
         iwl_phy_db_free(mvm->phy_db);
         mvm->phy_db = NULL;
 
-        kfree(mvm->eeprom_blob);
         iwl_free_nvm_data(mvm->nvm_data);
         for (i = 0; i < NVM_NUM_OF_SECTIONS; i++)
                 kfree(mvm->nvm_sections[i].data);
diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index b428448f8ddf..a28a1d1f23eb 100644
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -142,7 +142,7 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
                                       struct cfg80211_chan_def *chandef,
                                       u8 chains_static, u8 chains_dynamic)
 {
-        u8 valid_rx_chains, active_cnt, idle_cnt;
+        u8 active_cnt, idle_cnt;
 
         /* Set the channel info data */
         cmd->ci.band = (chandef->chan->band == IEEE80211_BAND_2GHZ ?
@@ -153,22 +153,16 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
         cmd->ci.ctrl_pos = iwl_mvm_get_ctrl_pos(chandef);
 
         /* Set rx the chains */
-
-        /* TODO:
-         * Need to add on chain noise calibration limitations, and
-         * BT coex considerations.
-         */
-        valid_rx_chains = mvm->nvm_data->valid_rx_ant;
         idle_cnt = chains_static;
         active_cnt = chains_dynamic;
 
-        cmd->rxchain_info = cpu_to_le32(valid_rx_chains <<
+        cmd->rxchain_info = cpu_to_le32(iwl_fw_valid_rx_ant(mvm->fw) <<
                                         PHY_RX_CHAIN_VALID_POS);
         cmd->rxchain_info |= cpu_to_le32(idle_cnt << PHY_RX_CHAIN_CNT_POS);
         cmd->rxchain_info |= cpu_to_le32(active_cnt <<
                                          PHY_RX_CHAIN_MIMO_CNT_POS);
 
-        cmd->txchain_info = cpu_to_le32(mvm->nvm_data->valid_tx_ant);
+        cmd->txchain_info = cpu_to_le32(iwl_fw_valid_tx_ant(mvm->fw));
 }
 
 /*
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index 5a92a4978795..ed77e437aac4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -75,23 +75,48 @@
 
 #define POWER_KEEP_ALIVE_PERIOD_SEC    25
 
-static void iwl_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                                struct iwl_powertable_cmd *cmd)
+static void iwl_mvm_power_log(struct iwl_mvm *mvm,
+                              struct iwl_powertable_cmd *cmd)
+{
+        IWL_DEBUG_POWER(mvm,
+                        "Sending power table command for power level %d, flags = 0x%X\n",
+                        iwlmvm_mod_params.power_scheme,
+                        le16_to_cpu(cmd->flags));
+        IWL_DEBUG_POWER(mvm, "Keep alive = %u sec\n", cmd->keep_alive_seconds);
+
+        if (cmd->flags & cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK)) {
+                IWL_DEBUG_POWER(mvm, "Rx timeout = %u usec\n",
+                                le32_to_cpu(cmd->rx_data_timeout));
+                IWL_DEBUG_POWER(mvm, "Tx timeout = %u usec\n",
+                                le32_to_cpu(cmd->tx_data_timeout));
+                IWL_DEBUG_POWER(mvm, "LP RX RSSI threshold = %u\n",
+                                cmd->lprx_rssi_threshold);
+        }
+}
+
+void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             struct iwl_powertable_cmd *cmd)
 {
         struct ieee80211_hw *hw = mvm->hw;
-        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct ieee80211_chanctx_conf *chanctx_conf;
         struct ieee80211_channel *chan;
         int dtimper, dtimper_msec;
         int keep_alive;
         bool radar_detect = false;
 
-        cmd->id_and_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,
-                                                            mvmvif->color));
-        cmd->action = cpu_to_le32(FW_CTXT_ACTION_MODIFY);
+        /*
+         * Regardless of power management state the driver must set
+         * keep alive period. FW will use it for sending keep alive NDPs
+         * immediately after association.
+         */
+        cmd->keep_alive_seconds = POWER_KEEP_ALIVE_PERIOD_SEC;
 
-        if ((!vif->bss_conf.ps) ||
-            (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM))
+        if (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM)
+                return;
+
+        cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);
+
+        if (!vif->bss_conf.ps)
                 return;
 
         cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK);
@@ -110,63 +135,29 @@ static void iwl_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
         /* Check skip over DTIM conditions */
         if (!radar_detect && (dtimper <= 10) &&
-            (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_LP)) {
-                cmd->flags |= cpu_to_le16(POWER_FLAGS_SLEEP_OVER_DTIM_MSK);
-                cmd->num_skip_dtim = 2;
-        }
+            (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_LP))
+                cmd->flags |= cpu_to_le16(POWER_FLAGS_SKIP_OVER_DTIM_MSK);
 
         /* Check that keep alive period is at least 3 * DTIM */
         dtimper_msec = dtimper * vif->bss_conf.beacon_int;
         keep_alive = max_t(int, 3 * dtimper_msec,
-                           MSEC_PER_SEC * POWER_KEEP_ALIVE_PERIOD_SEC);
+                           MSEC_PER_SEC * cmd->keep_alive_seconds);
         keep_alive = DIV_ROUND_UP(keep_alive, MSEC_PER_SEC);
+        cmd->keep_alive_seconds = keep_alive;
 
-        cmd->keep_alive_seconds = cpu_to_le16(keep_alive);
-
-        if (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_LP) {
-                /* TODO: Also for D3 (device sleep / WoWLAN) */
-                cmd->rx_data_timeout = cpu_to_le32(10);
-                cmd->tx_data_timeout = cpu_to_le32(10);
-        } else {
-                cmd->rx_data_timeout = cpu_to_le32(50);
-                cmd->tx_data_timeout = cpu_to_le32(50);
-        }
+        cmd->rx_data_timeout = cpu_to_le32(100 * USEC_PER_MSEC);
+        cmd->tx_data_timeout = cpu_to_le32(100 * USEC_PER_MSEC);
 }
 
 int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 {
         struct iwl_powertable_cmd cmd = {};
 
-        if (!iwlwifi_mod_params.power_save) {
-                IWL_DEBUG_POWER(mvm, "Power management is not allowed\n");
-                return 0;
-        }
-
         if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)
                 return 0;
 
-        iwl_power_build_cmd(mvm, vif, &cmd);
-
-        IWL_DEBUG_POWER(mvm,
-                        "Sending power table command on mac id 0x%X for power level %d, flags = 0x%X\n",
-                        cmd.id_and_color, iwlmvm_mod_params.power_scheme,
-                        le16_to_cpu(cmd.flags));
-
-        if (cmd.flags & cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK)) {
-                IWL_DEBUG_POWER(mvm, "Keep alive = %u sec\n",
-                                le16_to_cpu(cmd.keep_alive_seconds));
-                IWL_DEBUG_POWER(mvm, "Rx timeout = %u usec\n",
-                                le32_to_cpu(cmd.rx_data_timeout));
-                IWL_DEBUG_POWER(mvm, "Tx timeout = %u usec\n",
-                                le32_to_cpu(cmd.tx_data_timeout));
-                IWL_DEBUG_POWER(mvm, "Rx timeout (uAPSD) = %u usec\n",
-                                le32_to_cpu(cmd.rx_data_timeout_uapsd));
-                IWL_DEBUG_POWER(mvm, "Tx timeout = %u usec\n",
-                                le32_to_cpu(cmd.tx_data_timeout_uapsd));
-                IWL_DEBUG_POWER(mvm, "LP RX RSSI threshold = %u\n",
-                                cmd.lprx_rssi_threshold);
-                IWL_DEBUG_POWER(mvm, "DTIMs to skip = %u\n", cmd.num_skip_dtim);
-        }
+        iwl_mvm_power_build_cmd(mvm, vif, &cmd);
+        iwl_mvm_power_log(mvm, &cmd);
 
         return iwl_mvm_send_cmd_pdu(mvm, POWER_TABLE_CMD, CMD_SYNC,
                                     sizeof(cmd), &cmd);
@@ -175,33 +166,15 @@ int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 int iwl_mvm_power_disable(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 {
         struct iwl_powertable_cmd cmd = {};
-        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-
-        if (!iwlwifi_mod_params.power_save) {
-                IWL_DEBUG_POWER(mvm, "Power management is not allowed\n");
-                return 0;
-        }
 
         if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)
                 return 0;
 
-        cmd.id_and_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,
-                                                            mvmvif->color));
-        cmd.action = cpu_to_le32(FW_CTXT_ACTION_MODIFY);
+        if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)
+                cmd.flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);
 
-        IWL_DEBUG_POWER(mvm,
-                        "Sending power table command on mac id 0x%X for power level %d, flags = 0x%X\n",
-                        cmd.id_and_color, iwlmvm_mod_params.power_scheme,
-                        le16_to_cpu(cmd.flags));
+        iwl_mvm_power_log(mvm, &cmd);
 
         return iwl_mvm_send_cmd_pdu(mvm, POWER_TABLE_CMD, CMD_ASYNC,
                                     sizeof(cmd), &cmd);
 }
-
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-void iwl_power_get_params(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                          struct iwl_powertable_cmd *cmd)
-{
-        iwl_power_build_cmd(mvm, vif, cmd);
-}
-#endif /* CONFIG_IWLWIFI_DEBUGFS */
diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/iwlwifi/mvm/quota.c
index 925628468146..a1e3e923ea3e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/quota.c
+++ b/drivers/net/wireless/iwlwifi/mvm/quota.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -114,7 +114,8 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,
                         data->n_interfaces[id]++;
                 break;
         case NL80211_IFTYPE_MONITOR:
-                data->n_interfaces[id]++;
+                if (mvmvif->monitor_active)
+                        data->n_interfaces[id]++;
                 break;
         case NL80211_IFTYPE_P2P_DEVICE:
                 break;
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 56b636d9ab30..55334d542e26 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -680,12 +680,14 @@ static int rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,
  */
 static bool rs_use_green(struct ieee80211_sta *sta)
 {
-        struct iwl_mvm_sta *sta_priv = (void *)sta->drv_priv;
-
-        bool use_green = !(sta_priv->vif->bss_conf.ht_operation_mode &
-                                IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
-
-        return (sta->ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD) && use_green;
+        /*
+         * There's a bug somewhere in this code that causes the
+         * scaling to get stuck because GF+SGI can't be combined
+         * in SISO rates. Until we find that bug, disable GF, it
+         * has only limited benefit and we still interoperate with
+         * GF APs since we can always receive GF transmissions.
+         */
+        return false;
 }
 
 /**
@@ -791,7 +793,7 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
 
                 if (num_of_ant(tbl->ant_type) > 1)
                         tbl->ant_type =
-                            first_antenna(mvm->nvm_data->valid_tx_ant);
+                            first_antenna(iwl_fw_valid_tx_ant(mvm->fw));
 
                 tbl->is_ht40 = 0;
                 tbl->is_SGI = 0;
@@ -1233,7 +1235,7 @@ static int rs_switch_to_mimo2(struct iwl_mvm *mvm,
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
-        if (num_of_ant(mvm->nvm_data->valid_tx_ant) < 2)
+        if (num_of_ant(iwl_fw_valid_tx_ant(mvm->fw)) < 2)
                 return -1;
 
         IWL_DEBUG_RATE(mvm, "LQ: try to switch to MIMO2\n");
@@ -1285,7 +1287,7 @@ static int rs_switch_to_mimo3(struct iwl_mvm *mvm,
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
-        if (num_of_ant(mvm->nvm_data->valid_tx_ant) < 3)
+        if (num_of_ant(iwl_fw_valid_tx_ant(mvm->fw)) < 3)
                 return -1;
 
         IWL_DEBUG_RATE(mvm, "LQ: try to switch to MIMO3\n");
@@ -1379,7 +1381,7 @@ static int rs_move_legacy_other(struct iwl_mvm *mvm,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+        u8 valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
         u8 tx_chains_num = num_of_ant(valid_tx_ant);
         int ret;
         u8 update_search_tbl_counter = 0;
@@ -1512,7 +1514,7 @@ static int rs_move_siso_to_other(struct iwl_mvm *mvm,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+        u8 valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
         u8 tx_chains_num = num_of_ant(valid_tx_ant);
         u8 update_search_tbl_counter = 0;
         int ret;
@@ -1647,7 +1649,7 @@ static int rs_move_mimo2_to_other(struct iwl_mvm *mvm,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+        u8 valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
         u8 tx_chains_num = num_of_ant(valid_tx_ant);
         u8 update_search_tbl_counter = 0;
         int ret;
@@ -1784,7 +1786,7 @@ static int rs_move_mimo3_to_other(struct iwl_mvm *mvm,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+        u8 valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
         u8 tx_chains_num = num_of_ant(valid_tx_ant);
         int ret;
         u8 update_search_tbl_counter = 0;
@@ -2447,7 +2449,7 @@ static void rs_initialize_lq(struct iwl_mvm *mvm,
 
         i = lq_sta->last_txrate_idx;
 
-        valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+        valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
 
         if (!lq_sta->search_better_tbl)
                 active_tbl = lq_sta->active_tbl;
@@ -2637,15 +2639,15 @@ void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 
         /* These values will be overridden later */
         lq_sta->lq.single_stream_ant_msk =
-                first_antenna(mvm->nvm_data->valid_tx_ant);
+                first_antenna(iwl_fw_valid_tx_ant(mvm->fw));
         lq_sta->lq.dual_stream_ant_msk =
-                mvm->nvm_data->valid_tx_ant &
-                ~first_antenna(mvm->nvm_data->valid_tx_ant);
+                iwl_fw_valid_tx_ant(mvm->fw) &
+                ~first_antenna(iwl_fw_valid_tx_ant(mvm->fw));
         if (!lq_sta->lq.dual_stream_ant_msk) {
                 lq_sta->lq.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(mvm->nvm_data->valid_tx_ant) == 2) {
+        } else if (num_of_ant(iwl_fw_valid_tx_ant(mvm->fw)) == 2) {
                 lq_sta->lq.dual_stream_ant_msk =
-                        mvm->nvm_data->valid_tx_ant;
+                        iwl_fw_valid_tx_ant(mvm->fw);
         }
 
         /* as default allow aggregation for all tids */
@@ -2706,7 +2708,7 @@ static void rs_fill_link_cmd(struct iwl_mvm *mvm,
         index++;
         repeat_rate--;
         if (mvm)
-                valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+                valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
 
         /* Fill rest of rate table */
         while (index < LINK_QUAL_MAX_RETRY_NUM) {
@@ -2811,7 +2813,7 @@ static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
         u8 ant_sel_tx;
 
         mvm = lq_sta->drv;
-        valid_tx_ant = mvm->nvm_data->valid_tx_ant;
+        valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
         if (lq_sta->dbg_fixed_rate) {
                 ant_sel_tx =
                   ((lq_sta->dbg_fixed_rate & RATE_MCS_ANT_ABC_MSK)
@@ -2882,9 +2884,9 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
         desc += sprintf(buff+desc, "fixed rate 0x%X\n",
                         lq_sta->dbg_fixed_rate);
         desc += sprintf(buff+desc, "valid_tx_ant %s%s%s\n",
-            (mvm->nvm_data->valid_tx_ant & ANT_A) ? "ANT_A," : "",
-            (mvm->nvm_data->valid_tx_ant & ANT_B) ? "ANT_B," : "",
-            (mvm->nvm_data->valid_tx_ant & ANT_C) ? "ANT_C" : "");
+            (iwl_fw_valid_tx_ant(mvm->fw) & ANT_A) ? "ANT_A," : "",
+            (iwl_fw_valid_tx_ant(mvm->fw) & ANT_B) ? "ANT_B," : "",
+            (iwl_fw_valid_tx_ant(mvm->fw) & ANT_C) ? "ANT_C" : "");
         desc += sprintf(buff+desc, "lq type %s\n",
            (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
         if (is_Ht(tbl->lq_type)) {
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index b0b190d0ec23..4dfc21a3e83e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 9b21b92aa8d1..2157b0f8ced5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -74,7 +74,7 @@
 static inline __le16 iwl_mvm_scan_rx_chain(struct iwl_mvm *mvm)
 {
         u16 rx_chain;
-        u8 rx_ant = mvm->nvm_data->valid_rx_ant;
+        u8 rx_ant = iwl_fw_valid_rx_ant(mvm->fw);
 
         rx_chain = rx_ant << PHY_RX_CHAIN_VALID_POS;
         rx_chain |= rx_ant << PHY_RX_CHAIN_FORCE_MIMO_SEL_POS;
@@ -115,7 +115,7 @@ iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum ieee80211_band band,
         u32 tx_ant;
 
         mvm->scan_last_antenna_idx =
-                iwl_mvm_next_antenna(mvm, mvm->nvm_data->valid_tx_ant,
+                iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw),
                                      mvm->scan_last_antenna_idx);
         tx_ant = BIT(mvm->scan_last_antenna_idx) << RATE_MCS_ANT_POS;
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index 274f44e2ef60..0fd96e4da461 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -101,8 +101,55 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
         }
         add_sta_cmd.add_modify = update ? 1 : 0;
 
-        /* STA_FLG_FAT_EN_MSK ? */
-        /* STA_FLG_MIMO_EN_MSK ? */
+        add_sta_cmd.station_flags_msk |= cpu_to_le32(STA_FLG_FAT_EN_MSK |
+                                                     STA_FLG_MIMO_EN_MSK);
+
+        switch (sta->bandwidth) {
+        case IEEE80211_STA_RX_BW_160:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_160MHZ);
+                /* fall through */
+        case IEEE80211_STA_RX_BW_80:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_80MHZ);
+                /* fall through */
+        case IEEE80211_STA_RX_BW_40:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_40MHZ);
+                /* fall through */
+        case IEEE80211_STA_RX_BW_20:
+                if (sta->ht_cap.ht_supported)
+                        add_sta_cmd.station_flags |=
+                                cpu_to_le32(STA_FLG_FAT_EN_20MHZ);
+                break;
+        }
+
+        switch (sta->rx_nss) {
+        case 1:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_MIMO_EN_SISO);
+                break;
+        case 2:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_MIMO_EN_MIMO2);
+                break;
+        case 3 ... 8:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_MIMO_EN_MIMO3);
+                break;
+        }
+
+        switch (sta->smps_mode) {
+        case IEEE80211_SMPS_AUTOMATIC:
+        case IEEE80211_SMPS_NUM_MODES:
+                WARN_ON(1);
+                break;
+        case IEEE80211_SMPS_STATIC:
+                /* override NSS */
+                add_sta_cmd.station_flags &= ~cpu_to_le32(STA_FLG_MIMO_EN_MSK);
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_MIMO_EN_SISO);
+                break;
+        case IEEE80211_SMPS_DYNAMIC:
+                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_RTS_MIMO_PROT);
+                break;
+        case IEEE80211_SMPS_OFF:
+                /* nothing */
+                break;
+        }
 
         if (sta->ht_cap.ht_supported) {
                 add_sta_cmd.station_flags_msk |=
@@ -340,6 +387,9 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,
 
         if (vif->type == NL80211_IFTYPE_STATION &&
             mvmvif->ap_sta_id == mvm_sta->sta_id) {
+                /* flush its queues here since we are freeing mvm_sta */
+                ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, true);
+
                 /*
                  * Put a non-NULL since the fw station isn't removed.
                  * It will be removed after the MAC will be set as
@@ -348,9 +398,6 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,
                 rcu_assign_pointer(mvm->fw_id_to_mac_id[mvm_sta->sta_id],
                                    ERR_PTR(-EINVAL));
 
-                /* flush its queues here since we are freeing mvm_sta */
-                ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, true);
-
                 /* if we are associated - we can't remove the AP STA now */
                 if (vif->bss_conf.assoc)
                         return ret;
@@ -686,7 +733,7 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
         spin_lock_bh(&mvmsta->lock);
         tid_data = &mvmsta->tid_data[tid];
-        tid_data->ssn = SEQ_TO_SN(tid_data->seq_number);
+        tid_data->ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
         tid_data->txq_id = txq_id;
         *ssn = tid_data->ssn;
 
@@ -789,7 +836,7 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
         switch (tid_data->state) {
         case IWL_AGG_ON:
-                tid_data->ssn = SEQ_TO_SN(tid_data->seq_number);
+                tid_data->ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
 
                 IWL_DEBUG_TX_QUEUES(mvm,
                                     "ssn = %d, next_recl = %d\n",
@@ -834,6 +881,34 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         return err;
 }
 
+int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_sta *sta, u16 tid)
+{
+        struct iwl_mvm_sta *mvmsta = (void *)sta->drv_priv;
+        struct iwl_mvm_tid_data *tid_data = &mvmsta->tid_data[tid];
+        u16 txq_id;
+
+        /*
+         * First set the agg state to OFF to avoid calling
+         * ieee80211_stop_tx_ba_cb in iwl_mvm_check_ratid_empty.
+         */
+        spin_lock_bh(&mvmsta->lock);
+        txq_id = tid_data->txq_id;
+        IWL_DEBUG_TX_QUEUES(mvm, "Flush AGG: sta %d tid %d q %d state %d\n",
+                            mvmsta->sta_id, tid, txq_id, tid_data->state);
+        tid_data->state = IWL_AGG_OFF;
+        spin_unlock_bh(&mvmsta->lock);
+
+        if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), true))
+                IWL_ERR(mvm, "Couldn't flush the AGG queue\n");
+
+        iwl_trans_txq_disable(mvm->trans, tid_data->txq_id);
+        mvm->queue_to_mac80211[tid_data->txq_id] =
+                                IWL_INVALID_MAC80211_QUEUE;
+
+        return 0;
+}
+
 static int iwl_mvm_set_fw_key_idx(struct iwl_mvm *mvm)
 {
         int i;
@@ -870,7 +945,7 @@ static u8 iwl_mvm_get_key_sta_id(struct ieee80211_vif *vif,
             mvmvif->ap_sta_id != IWL_MVM_STATION_COUNT)
                 return mvmvif->ap_sta_id;
 
-        return IWL_INVALID_STATION;
+        return IWL_MVM_STATION_COUNT;
 }
 
 static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
@@ -1018,7 +1093,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
 
         /* Get the station id from the mvm local station table */
         sta_id = iwl_mvm_get_key_sta_id(vif, sta);
-        if (sta_id == IWL_INVALID_STATION) {
+        if (sta_id == IWL_MVM_STATION_COUNT) {
                 IWL_ERR(mvm, "Failed to find station id\n");
                 return -EINVAL;
         }
@@ -1113,7 +1188,7 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm,
                 return -ENOENT;
         }
 
-        if (sta_id == IWL_INVALID_STATION) {
+        if (sta_id == IWL_MVM_STATION_COUNT) {
                 IWL_DEBUG_WEP(mvm, "station non-existent, early return.\n");
                 return 0;
         }
@@ -1179,7 +1254,7 @@ void iwl_mvm_update_tkip_key(struct iwl_mvm *mvm,
         struct iwl_mvm_sta *mvm_sta;
         u8 sta_id = iwl_mvm_get_key_sta_id(vif, sta);
 
-        if (WARN_ON_ONCE(sta_id == IWL_INVALID_STATION))
+        if (WARN_ON_ONCE(sta_id == IWL_MVM_STATION_COUNT))
                 return;
 
         rcu_read_lock();
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h
index 896f88ac8145..12abd2d71835 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -271,6 +271,7 @@ struct iwl_mvm_tid_data {
  * @tid_disable_agg: bitmap: if bit(tid) is set, the fw won't send ampdus for
  *      tid.
  * @max_agg_bufsize: the maximal size of the AGG buffer for this station
+ * @bt_reduced_txpower: is reduced tx power enabled for this station
  * @lock: lock to protect the whole struct. Since %tid_data is access from Tx
  * and from Tx response flow, it needs a spinlock.
  * @pending_frames: number of frames for this STA on the shared Tx queues.
@@ -287,6 +288,7 @@ struct iwl_mvm_sta {
         u32 mac_id_n_color;
         u16 tid_disable_agg;
         u8 max_agg_bufsize;
+        bool bt_reduced_txpower;
         spinlock_t lock;
         atomic_t pending_frames;
         struct iwl_mvm_tid_data tid_data[IWL_MAX_TID_COUNT];
@@ -348,6 +350,8 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta, u16 tid, u8 buf_size);
 int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                             struct ieee80211_sta *sta, u16 tid);
+int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_sta *sta, u16 tid);
 
 int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm);
 int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta,
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index e437e02c7149..ad9bbca99213 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -76,14 +76,12 @@
 #define TU_TO_JIFFIES(_tu)      (usecs_to_jiffies((_tu) * 1024))
 #define MSEC_TO_TU(_msec)       (_msec*1000/1024)
 
-/* For ROC use a TE type which has priority high enough to be scheduled when
- * there is a concurrent BSS or GO/AP. Currently, use a TE type that has
- * priority similar to the TE priority used for action scans by the FW.
- * TODO: This needs to be changed, based on the reason for the ROC, i.e., use
- * TE_P2P_DEVICE_DISCOVERABLE for remain on channel without mgmt skb, and use
- * TE_P2P_DEVICE_ACTION_SCAN
+/*
+ * For the high priority TE use a time event type that has similar priority to
+ * the FW's action scan priority.
  */
-#define IWL_MVM_ROC_TE_TYPE TE_P2P_DEVICE_ACTION_SCAN
+#define IWL_MVM_ROC_TE_TYPE_NORMAL TE_P2P_DEVICE_DISCOVERABLE
+#define IWL_MVM_ROC_TE_TYPE_MGMT_TX TE_P2P_CLIENT_ASSOC
 
 void iwl_mvm_te_clear_data(struct iwl_mvm *mvm,
                            struct iwl_mvm_time_event_data *te_data)
@@ -116,7 +114,7 @@ void iwl_mvm_roc_done_wk(struct work_struct *wk)
          * issue as it will have to complete before the next command is
          * executed, and a new time event means a new command.
          */
-        iwl_mvm_flush_tx_path(mvm, BIT(IWL_OFFCHANNEL_QUEUE), false);
+        iwl_mvm_flush_tx_path(mvm, BIT(IWL_MVM_OFFCHANNEL_QUEUE), false);
 }
 
 static void iwl_mvm_roc_finished(struct iwl_mvm *mvm)
@@ -168,7 +166,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
         WARN_ONCE(!le32_to_cpu(notif->status),
                   "Failed to schedule time event\n");
 
-        if (le32_to_cpu(notif->action) == TE_NOTIF_HOST_END) {
+        if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_END) {
                 IWL_DEBUG_TE(mvm,
                              "TE ended - current time %lu, estimated end %lu\n",
                              jiffies, te_data->end_jiffies);
@@ -191,7 +189,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
                 }
 
                 iwl_mvm_te_clear_data(mvm, te_data);
-        } else if (le32_to_cpu(notif->action) == TE_NOTIF_HOST_START) {
+        } else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
                 te_data->running = true;
                 te_data->end_jiffies = jiffies +
                         TU_TO_JIFFIES(te_data->duration);
@@ -370,7 +368,8 @@ void iwl_mvm_protect_session(struct iwl_mvm *mvm,
         time_cmd.interval_reciprocal = cpu_to_le32(iwl_mvm_reciprocal(1));
         time_cmd.duration = cpu_to_le32(duration);
         time_cmd.repeat = cpu_to_le32(1);
-        time_cmd.notify = cpu_to_le32(TE_NOTIF_HOST_START | TE_NOTIF_HOST_END);
+        time_cmd.notify = cpu_to_le32(TE_NOTIF_HOST_EVENT_START |
+                                      TE_NOTIF_HOST_EVENT_END);
 
         iwl_mvm_time_event_send_add(mvm, vif, te_data, &time_cmd);
 }
@@ -438,7 +437,7 @@ void iwl_mvm_stop_session_protection(struct iwl_mvm *mvm,
 }
 
 int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                          int duration)
+                          int duration, enum ieee80211_roc_type type)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct iwl_mvm_time_event_data *te_data = &mvmvif->time_event_data;
@@ -459,27 +458,36 @@ int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         time_cmd.action = cpu_to_le32(FW_CTXT_ACTION_ADD);
         time_cmd.id_and_color =
                 cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color));
-        time_cmd.id = cpu_to_le32(IWL_MVM_ROC_TE_TYPE);
+
+        switch (type) {
+        case IEEE80211_ROC_TYPE_NORMAL:
+                time_cmd.id = cpu_to_le32(IWL_MVM_ROC_TE_TYPE_NORMAL);
+                break;
+        case IEEE80211_ROC_TYPE_MGMT_TX:
+                time_cmd.id = cpu_to_le32(IWL_MVM_ROC_TE_TYPE_MGMT_TX);
+                break;
+        default:
+                WARN_ONCE(1, "Got an invalid ROC type\n");
+                return -EINVAL;
+        }
 
         time_cmd.apply_time = cpu_to_le32(0);
         time_cmd.dep_policy = cpu_to_le32(TE_INDEPENDENT);
         time_cmd.is_present = cpu_to_le32(1);
-
         time_cmd.interval = cpu_to_le32(1);
 
         /*
-         * IWL_MVM_ROC_TE_TYPE can have lower priority than other events
+         * The P2P Device TEs can have lower priority than other events
          * that are being scheduled by the driver/fw, and thus it might not be
-         * scheduled. To improve the chances of it being scheduled, allow it to
-         * be fragmented.
-         * In addition, for the same reasons, allow to delay the scheduling of
-         * the time event.
+         * scheduled. To improve the chances of it being scheduled, allow them
+         * to be fragmented, and in addition allow them to be delayed.
          */
         time_cmd.max_frags = cpu_to_le32(MSEC_TO_TU(duration)/20);
         time_cmd.max_delay = cpu_to_le32(MSEC_TO_TU(duration/2));
         time_cmd.duration = cpu_to_le32(MSEC_TO_TU(duration));
         time_cmd.repeat = cpu_to_le32(1);
-        time_cmd.notify = cpu_to_le32(TE_NOTIF_HOST_START | TE_NOTIF_HOST_END);
+        time_cmd.notify = cpu_to_le32(TE_NOTIF_HOST_EVENT_START |
+                                      TE_NOTIF_HOST_EVENT_END);
 
         return iwl_mvm_time_event_send_add(mvm, vif, te_data, &time_cmd);
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.h b/drivers/net/wireless/iwlwifi/mvm/time-event.h
index 64fb57a5ab43..f86c51065ed3 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.h
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.h
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -162,6 +162,7 @@ int iwl_mvm_rx_time_event_notif(struct iwl_mvm *mvm,
  * that the vif type is NL80211_IFTYPE_P2P_DEVICE
  * @duration: the requested duration in millisecond for the fw to be on the
  * channel that is bound to the vif.
+ * @type: the remain on channel request type
  *
  * This function can be used to issue a remain on channel session,
  * which means that the fw will stay in the channel for the request %duration
@@ -172,7 +173,7 @@ int iwl_mvm_rx_time_event_notif(struct iwl_mvm *mvm,
  * another notification to the driver.
  */
 int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                          int duration);
+                          int duration, enum ieee80211_roc_type type);
 
 /**
  * iwl_mvm_stop_p2p_roc - stop remain on channel for p2p device functionlity
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 6645efe5c03e..479074303bd7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -205,7 +205,7 @@ static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm,
         rate_plcp = iwl_mvm_mac80211_idx_to_hwrate(rate_idx);
 
         mvm->mgmt_last_antenna_idx =
-                iwl_mvm_next_antenna(mvm, mvm->nvm_data->valid_tx_ant,
+                iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw),
                                      mvm->mgmt_last_antenna_idx);
         rate_flags = BIT(mvm->mgmt_last_antenna_idx) << RATE_MCS_ANT_POS;
 
@@ -365,7 +365,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
         if (WARN_ON_ONCE(!mvmsta))
                 return -1;
 
-        if (WARN_ON_ONCE(mvmsta->sta_id == IWL_INVALID_STATION))
+        if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_STATION_COUNT))
                 return -1;
 
         dev_cmd = iwl_mvm_set_tx_params(mvm, skb, sta, mvmsta->sta_id);
@@ -417,7 +417,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
         spin_unlock(&mvmsta->lock);
 
         if (mvmsta->vif->type == NL80211_IFTYPE_AP &&
-            txq_id < IWL_FIRST_AMPDU_QUEUE)
+            txq_id < IWL_MVM_FIRST_AGG_QUEUE)
                 atomic_inc(&mvmsta->pending_frames);
 
         return 0;
@@ -606,7 +606,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                                              info);
 
                 /* Single frame failure in an AMPDU queue => send BAR */
-                if (txq_id >= IWL_FIRST_AMPDU_QUEUE &&
+                if (txq_id >= IWL_MVM_FIRST_AGG_QUEUE &&
                     !(info->flags & IEEE80211_TX_STAT_ACK))
                         info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
 
@@ -619,7 +619,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                 ieee80211_tx_status_ni(mvm->hw, skb);
         }
 
-        if (txq_id >= IWL_FIRST_AMPDU_QUEUE) {
+        if (txq_id >= IWL_MVM_FIRST_AGG_QUEUE) {
                 /* If this is an aggregation queue, we use the ssn since:
                  * ssn = wifi seq_num % 256.
                  * The seq_ctl is the sequence control of the packet to which
@@ -637,14 +637,16 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                 next_reclaimed = ssn;
         } else {
                 /* The next packet to be reclaimed is the one after this one */
-                next_reclaimed = SEQ_TO_SN(seq_ctl + 0x10);
+                next_reclaimed = IEEE80211_SEQ_TO_SN(seq_ctl + 0x10);
         }
 
         IWL_DEBUG_TX_REPLY(mvm,
-                           "TXQ %d status %s (0x%08x)\n\t\t\t\tinitial_rate 0x%x "
-                            "retries %d, idx=%d ssn=%d next_reclaimed=0x%x seq_ctl=0x%x\n",
-                           txq_id, iwl_mvm_get_tx_fail_reason(status),
-                           status, le32_to_cpu(tx_resp->initial_rate),
+                           "TXQ %d status %s (0x%08x)\n",
+                           txq_id, iwl_mvm_get_tx_fail_reason(status), status);
+
+        IWL_DEBUG_TX_REPLY(mvm,
+                           "\t\t\t\tinitial_rate 0x%x retries %d, idx=%d ssn=%d next_reclaimed=0x%x seq_ctl=0x%x\n",
+                           le32_to_cpu(tx_resp->initial_rate),
                            tx_resp->failure_frame, SEQ_TO_INDEX(sequence),
                            ssn, next_reclaimed, seq_ctl);
 
@@ -681,7 +683,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
          * If there are no pending frames for this STA, notify mac80211 that
          * this station can go to sleep in its STA table.
          */
-        if (txq_id < IWL_FIRST_AMPDU_QUEUE && mvmsta &&
+        if (txq_id < IWL_MVM_FIRST_AGG_QUEUE && mvmsta &&
             !WARN_ON(skb_freed > 1) &&
             mvmsta->vif->type == NL80211_IFTYPE_AP &&
             atomic_sub_and_test(skb_freed, &mvmsta->pending_frames)) {
@@ -750,7 +752,7 @@ static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm,
         u16 sequence = le16_to_cpu(pkt->hdr.sequence);
         struct ieee80211_sta *sta;
 
-        if (WARN_ON_ONCE(SEQ_TO_QUEUE(sequence) < IWL_FIRST_AMPDU_QUEUE))
+        if (WARN_ON_ONCE(SEQ_TO_QUEUE(sequence) < IWL_MVM_FIRST_AGG_QUEUE))
                 return;
 
         if (WARN_ON_ONCE(tid == IWL_TID_NON_QOS))
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 000e842c2edd..687b34e387ac 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -253,8 +253,9 @@ int iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
 u8 first_antenna(u8 mask)
 {
         BUILD_BUG_ON(ANT_A != BIT(0)); /* using ffs is wrong if not */
-        WARN_ON_ONCE(!mask); /* ffs will return 0 if mask is zeroed */
-        return (u8)(BIT(ffs(mask)));
+        if (WARN_ON_ONCE(!mask)) /* ffs will return 0 if mask is zeroed */
+                return BIT(0);
+        return BIT(ffs(mask) - 1);
 }
 
 /*
@@ -462,7 +463,7 @@ int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq,
                 .data = { lq, },
         };
 
-        if (WARN_ON(lq->sta_id == IWL_INVALID_STATION))
+        if (WARN_ON(lq->sta_id == IWL_MVM_STATION_COUNT))
                 return -EINVAL;
 
         if (WARN_ON(init && (cmd.flags & CMD_ASYNC)))
diff --git a/drivers/net/wireless/iwlwifi/pcie/cfg.h b/drivers/net/wireless/iwlwifi/pcie/cfg.h
deleted file mode 100644
index c6f8e83c3551..000000000000
--- a/drivers/net/wireless/iwlwifi/pcie/cfg.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-#ifndef __iwl_pci_h__
-#define __iwl_pci_h__
-
-
-/*
- * This file declares the config structures for all devices.
- */
-
-extern const struct iwl_cfg iwl5300_agn_cfg;
-extern const struct iwl_cfg iwl5100_agn_cfg;
-extern const struct iwl_cfg iwl5350_agn_cfg;
-extern const struct iwl_cfg iwl5100_bgn_cfg;
-extern const struct iwl_cfg iwl5100_abg_cfg;
-extern const struct iwl_cfg iwl5150_agn_cfg;
-extern const struct iwl_cfg iwl5150_abg_cfg;
-extern const struct iwl_cfg iwl6005_2agn_cfg;
-extern const struct iwl_cfg iwl6005_2abg_cfg;
-extern const struct iwl_cfg iwl6005_2bg_cfg;
-extern const struct iwl_cfg iwl6005_2agn_sff_cfg;
-extern const struct iwl_cfg iwl6005_2agn_d_cfg;
-extern const struct iwl_cfg iwl6005_2agn_mow1_cfg;
-extern const struct iwl_cfg iwl6005_2agn_mow2_cfg;
-extern const struct iwl_cfg iwl1030_bgn_cfg;
-extern const struct iwl_cfg iwl1030_bg_cfg;
-extern const struct iwl_cfg iwl6030_2agn_cfg;
-extern const struct iwl_cfg iwl6030_2abg_cfg;
-extern const struct iwl_cfg iwl6030_2bgn_cfg;
-extern const struct iwl_cfg iwl6030_2bg_cfg;
-extern const struct iwl_cfg iwl6000i_2agn_cfg;
-extern const struct iwl_cfg iwl6000i_2abg_cfg;
-extern const struct iwl_cfg iwl6000i_2bg_cfg;
-extern const struct iwl_cfg iwl6000_3agn_cfg;
-extern const struct iwl_cfg iwl6050_2agn_cfg;
-extern const struct iwl_cfg iwl6050_2abg_cfg;
-extern const struct iwl_cfg iwl6150_bgn_cfg;
-extern const struct iwl_cfg iwl6150_bg_cfg;
-extern const struct iwl_cfg iwl1000_bgn_cfg;
-extern const struct iwl_cfg iwl1000_bg_cfg;
-extern const struct iwl_cfg iwl100_bgn_cfg;
-extern const struct iwl_cfg iwl100_bg_cfg;
-extern const struct iwl_cfg iwl130_bgn_cfg;
-extern const struct iwl_cfg iwl130_bg_cfg;
-extern const struct iwl_cfg iwl2000_2bgn_cfg;
-extern const struct iwl_cfg iwl2000_2bgn_d_cfg;
-extern const struct iwl_cfg iwl2030_2bgn_cfg;
-extern const struct iwl_cfg iwl6035_2agn_cfg;
-extern const struct iwl_cfg iwl105_bgn_cfg;
-extern const struct iwl_cfg iwl105_bgn_d_cfg;
-extern const struct iwl_cfg iwl135_bgn_cfg;
-extern const struct iwl_cfg iwl7260_2ac_cfg;
-extern const struct iwl_cfg iwl3160_ac_cfg;
-
-#endif /* __iwl_pci_h__ */
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 7bc0fb9128dd..8cb53ec2b77b 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -69,8 +69,6 @@
 
 #include "iwl-trans.h"
 #include "iwl-drv.h"
-
-#include "cfg.h"
 #include "internal.h"
 
 #define IWL_PCI_DEVICE(dev, subdev, cfg) \
@@ -243,6 +241,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
         {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},
         {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},
         {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)},
 
 /* 105 Series */
         {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},
@@ -257,6 +256,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
 
 /* 7000 Series */
         {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_ac_cfg)},
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 12c4f31ca8fb..50ba0a468f94 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -728,7 +728,8 @@ static u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs)
 
 static u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg)
 {
-        iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
+        iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_RADDR,
+                               ((reg & 0x000FFFFF) | (3 << 24)));
         return iwl_trans_pcie_read32(trans, HBUS_TARG_PRPH_RDAT);
 }
 
@@ -736,7 +737,7 @@ static void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr,
                                       u32 val)
 {
         iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WADDR,
-                               ((addr & 0x0000FFFF) | (3 << 24)));
+                               ((addr & 0x000FFFFF) | (3 << 24)));
         iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WDAT, val);
 }
 
@@ -1383,28 +1384,11 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
         return ret;
 }
 
-static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
-                                          const char __user *user_buf,
-                                          size_t count, loff_t *ppos)
-{
-        struct iwl_trans *trans = file->private_data;
-
-        if (!trans->op_mode)
-                return -EAGAIN;
-
-        local_bh_disable();
-        iwl_op_mode_nic_error(trans->op_mode);
-        local_bh_enable();
-
-        return count;
-}
-
 DEBUGFS_READ_WRITE_FILE_OPS(interrupt);
 DEBUGFS_READ_FILE_OPS(fh_reg);
 DEBUGFS_READ_FILE_OPS(rx_queue);
 DEBUGFS_READ_FILE_OPS(tx_queue);
 DEBUGFS_WRITE_FILE_OPS(csr);
-DEBUGFS_WRITE_FILE_OPS(fw_restart);
 
 /*
  * Create the debugfs files and directories
@@ -1418,7 +1402,6 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
         DEBUGFS_ADD_FILE(interrupt, dir, S_IWUSR | S_IRUSR);
         DEBUGFS_ADD_FILE(csr, dir, S_IWUSR);
         DEBUGFS_ADD_FILE(fh_reg, dir, S_IRUSR);
-        DEBUGFS_ADD_FILE(fw_restart, dir, S_IWUSR);
         return 0;
 
 err:
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index cb5c6792e3a8..c5e30294c5ac 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -501,10 +501,8 @@ static int iwl_pcie_txq_alloc(struct iwl_trans *trans,
          * shared with device */
         txq->tfds = dma_alloc_coherent(trans->dev, tfd_sz,
                                        &txq->q.dma_addr, GFP_KERNEL);
-        if (!txq->tfds) {
-                IWL_ERR(trans, "dma_alloc_coherent(%zd) failed\n", tfd_sz);
+        if (!txq->tfds)
                 goto error;
-        }
 
         BUILD_BUG_ON(IWL_HCMD_SCRATCHBUF_SIZE != sizeof(*txq->scratchbufs));
         BUILD_BUG_ON(offsetof(struct iwl_pcie_txq_scratch_buf, scratch) !=
@@ -1063,7 +1061,7 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
                 iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
 
         /* If this queue is mapped to a certain station: it is an AGG queue */
-        if (sta_id != IWL_INVALID_STATION) {
+        if (sta_id >= 0) {
                 u16 ra_tid = BUILD_RAxTID(sta_id, tid);
 
                 /* Map receiver-address / traffic-ID to this queue */
@@ -1566,8 +1564,11 @@ int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         if (test_bit(STATUS_FW_ERROR, &trans_pcie->status))
                 return -EIO;
 
-        if (test_bit(STATUS_RFKILL, &trans_pcie->status))
+        if (test_bit(STATUS_RFKILL, &trans_pcie->status)) {
+                IWL_DEBUG_RF_KILL(trans, "Dropping CMD 0x%x: RF KILL\n",
+                                  cmd->id);
                 return -ERFKILL;
+        }
 
         if (cmd->flags & CMD_ASYNC)
                 return iwl_pcie_send_hcmd_async(trans, cmd);
@@ -1609,7 +1610,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
          * Check here that the packets are in the right place on the ring.
          */
 #ifdef CONFIG_IWLWIFI_DEBUG
-        wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+        wifi_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
         WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) &&
                   ((wifi_seq & 0xff) != q->write_ptr),
                   "Q: %d WiFi Seq %d tfdNum %d",
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 7001856241e6..088de9d25c39 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -412,9 +412,9 @@ static int lbtf_op_config(struct ieee80211_hw *hw, u32 changed)
         struct ieee80211_conf *conf = &hw->conf;
         lbtf_deb_enter(LBTF_DEB_MACOPS);
 
-        if (conf->channel->center_freq != priv->cur_freq) {
-                priv->cur_freq = conf->channel->center_freq;
-                lbtf_set_channel(priv, conf->channel->hw_value);
+        if (conf->chandef.chan->center_freq != priv->cur_freq) {
+                priv->cur_freq = conf->chandef.chan->center_freq;
+                lbtf_set_channel(priv, conf->chandef.chan->hw_value);
         }
         lbtf_deb_leave(LBTF_DEB_MACOPS);
         return 0;
@@ -537,7 +537,7 @@ static int lbtf_op_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = SURVEY_INFO_NOISE_DBM;
         survey->noise = priv->noise;
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index cffdf4fbf161..b878a32e7a98 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -25,6 +25,7 @@
 #include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
+#include <linux/platform_device.h>
 #include <linux/debugfs.h>
 #include <linux/module.h>
 #include <linux/ktime.h>
@@ -52,6 +53,10 @@ static bool paged_rx = false;
 module_param(paged_rx, bool, 0644);
 MODULE_PARM_DESC(paged_rx, "Use paged SKBs for RX instead of linear ones");
 
+static bool rctbl = false;
+module_param(rctbl, bool, 0444);
+MODULE_PARM_DESC(rctbl, "Handle rate control table");
+
 /**
  * enum hwsim_regtest - the type of regulatory tests we offer
  *
@@ -717,9 +722,17 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
         rx_status.flag |= RX_FLAG_MACTIME_START;
         rx_status.freq = chan->center_freq;
         rx_status.band = chan->band;
-        rx_status.rate_idx = info->control.rates[0].idx;
-        if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)
-                rx_status.flag |= RX_FLAG_HT;
+        if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {
+                rx_status.rate_idx =
+                        ieee80211_rate_get_vht_mcs(&info->control.rates[0]);
+                rx_status.vht_nss =
+                        ieee80211_rate_get_vht_nss(&info->control.rates[0]);
+                rx_status.flag |= RX_FLAG_VHT;
+        } else {
+                rx_status.rate_idx = info->control.rates[0].idx;
+                if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)
+                        rx_status.flag |= RX_FLAG_HT;
+        }
         if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
                 rx_status.flag |= RX_FLAG_40MHZ;
         if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI)
@@ -886,8 +899,12 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
         if (control->sta)
                 hwsim_check_sta_magic(control->sta);
 
-        txi->rate_driver_data[0] = channel;
+        if (rctbl)
+                ieee80211_get_tx_rates(txi->control.vif, control->sta, skb,
+                                       txi->control.rates,
+                                       ARRAY_SIZE(txi->control.rates));
 
+        txi->rate_driver_data[0] = channel;
         mac80211_hwsim_monitor_rx(hw, skb, channel);
 
         /* wmediumd mode check */
@@ -964,6 +981,12 @@ static int mac80211_hwsim_change_interface(struct ieee80211_hw *hw,
                     newtype, vif->addr);
         hwsim_check_magic(vif);
 
+        /*
+         * interface may change from non-AP to AP in
+         * which case this needs to be set up again
+         */
+        vif->cab_queue = 0;
+
         return 0;
 }
 
@@ -983,6 +1006,13 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
 {
         u32 _pid = ACCESS_ONCE(wmediumd_portid);
 
+        if (rctbl) {
+                struct ieee80211_tx_info *txi = IEEE80211_SKB_CB(skb);
+                ieee80211_get_tx_rates(txi->control.vif, NULL, skb,
+                                       txi->control.rates,
+                                       ARRAY_SIZE(txi->control.rates));
+        }
+
         mac80211_hwsim_monitor_rx(hw, skb, chan);
 
         if (_pid)
@@ -1013,6 +1043,11 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
         if (skb == NULL)
                 return;
         info = IEEE80211_SKB_CB(skb);
+        if (rctbl)
+                ieee80211_get_tx_rates(vif, NULL, skb,
+                                       info->control.rates,
+                                       ARRAY_SIZE(info->control.rates));
+
         txrate = ieee80211_get_tx_rate(hw, info);
 
         mgmt = (struct ieee80211_mgmt *) skb->data;
@@ -1056,11 +1091,13 @@ out:
         return HRTIMER_NORESTART;
 }
 
-static const char *hwsim_chantypes[] = {
-        [NL80211_CHAN_NO_HT] = "noht",
-        [NL80211_CHAN_HT20] = "ht20",
-        [NL80211_CHAN_HT40MINUS] = "ht40-",
-        [NL80211_CHAN_HT40PLUS] = "ht40+",
+static const char * const hwsim_chanwidths[] = {
+        [NL80211_CHAN_WIDTH_20_NOHT] = "noht",
+        [NL80211_CHAN_WIDTH_20] = "ht20",
+        [NL80211_CHAN_WIDTH_40] = "ht40",
+        [NL80211_CHAN_WIDTH_80] = "vht80",
+        [NL80211_CHAN_WIDTH_80P80] = "vht80p80",
+        [NL80211_CHAN_WIDTH_160] = "vht160",
 };
 
 static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
@@ -1074,18 +1111,28 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
                 [IEEE80211_SMPS_DYNAMIC] = "dynamic",
         };
 
-        wiphy_debug(hw->wiphy,
-                    "%s (freq=%d/%s idle=%d ps=%d smps=%s)\n",
-                    __func__,
-                    conf->channel ? conf->channel->center_freq : 0,
-                    hwsim_chantypes[conf->channel_type],
-                    !!(conf->flags & IEEE80211_CONF_IDLE),
-                    !!(conf->flags & IEEE80211_CONF_PS),
-                    smps_modes[conf->smps_mode]);
+        if (conf->chandef.chan)
+                wiphy_debug(hw->wiphy,
+                            "%s (freq=%d(%d - %d)/%s idle=%d ps=%d smps=%s)\n",
+                            __func__,
+                            conf->chandef.chan->center_freq,
+                            conf->chandef.center_freq1,
+                            conf->chandef.center_freq2,
+                            hwsim_chanwidths[conf->chandef.width],
+                            !!(conf->flags & IEEE80211_CONF_IDLE),
+                            !!(conf->flags & IEEE80211_CONF_PS),
+                            smps_modes[conf->smps_mode]);
+        else
+                wiphy_debug(hw->wiphy,
+                            "%s (freq=0 idle=%d ps=%d smps=%s)\n",
+                            __func__,
+                            !!(conf->flags & IEEE80211_CONF_IDLE),
+                            !!(conf->flags & IEEE80211_CONF_PS),
+                            smps_modes[conf->smps_mode]);
 
         data->idle = !!(conf->flags & IEEE80211_CONF_IDLE);
 
-        data->channel = conf->channel;
+        data->channel = conf->chandef.chan;
 
         WARN_ON(data->channel && channels > 1);
 
@@ -1271,7 +1318,7 @@ static int mac80211_hwsim_get_survey(
                 return -ENOENT;
 
         /* Current channel */
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
 
         /*
          * Magically conjured noise level --- this is only ok for simulated hardware.
@@ -1389,7 +1436,7 @@ static int mac80211_hwsim_ampdu_action(struct ieee80211_hw *hw,
         return 0;
 }
 
-static void mac80211_hwsim_flush(struct ieee80211_hw *hw, bool drop)
+static void mac80211_hwsim_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         /* Not implemented, queues only on kernel side */
 }
@@ -1535,7 +1582,8 @@ static void hw_roc_done(struct work_struct *work)
 static int mac80211_hwsim_roc(struct ieee80211_hw *hw,
                               struct ieee80211_vif *vif,
                               struct ieee80211_channel *chan,
-                              int duration)
+                              int duration,
+                              enum ieee80211_roc_type type)
 {
         struct mac80211_hwsim_data *hwsim = hw->priv;
 
@@ -1668,6 +1716,7 @@ static void mac80211_hwsim_free(void)
                 debugfs_remove(data->debugfs_ps);
                 debugfs_remove(data->debugfs);
                 ieee80211_unregister_hw(data->hw);
+                device_release_driver(data->dev);
                 device_unregister(data->dev);
                 ieee80211_free_hw(data->hw);
         }
@@ -1676,7 +1725,9 @@ static void mac80211_hwsim_free(void)
 
 
 static struct device_driver mac80211_hwsim_driver = {
-        .name = "mac80211_hwsim"
+        .name = "mac80211_hwsim",
+        .bus = &platform_bus_type,
+        .owner = THIS_MODULE,
 };
 
 static const struct net_device_ops hwsim_netdev_ops = {
@@ -2168,9 +2219,15 @@ static int __init init_mac80211_hwsim(void)
         spin_lock_init(&hwsim_radio_lock);
         INIT_LIST_HEAD(&hwsim_radios);
 
+        err = driver_register(&mac80211_hwsim_driver);
+        if (err)
+                return err;
+
         hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
-        if (IS_ERR(hwsim_class))
-                return PTR_ERR(hwsim_class);
+        if (IS_ERR(hwsim_class)) {
+                err = PTR_ERR(hwsim_class);
+                goto failed_unregister_driver;
+        }
 
         memset(addr, 0, ETH_ALEN);
         addr[0] = 0x02;
@@ -2192,12 +2249,20 @@ static int __init init_mac80211_hwsim(void)
                                           "hwsim%d", i);
                 if (IS_ERR(data->dev)) {
                         printk(KERN_DEBUG
-                               "mac80211_hwsim: device_create "
-                               "failed (%ld)\n", PTR_ERR(data->dev));
+                               "mac80211_hwsim: device_create failed (%ld)\n",
+                               PTR_ERR(data->dev));
                         err = -ENOMEM;
                         goto failed_drvdata;
                 }
                 data->dev->driver = &mac80211_hwsim_driver;
+                err = device_bind_driver(data->dev);
+                if (err != 0) {
+                        printk(KERN_DEBUG
+                               "mac80211_hwsim: device_bind_driver failed (%d)\n",
+                               err);
+                        goto failed_hw;
+                }
+
                 skb_queue_head_init(&data->pending);
 
                 SET_IEEE80211_DEV(hw, data->dev);
@@ -2240,6 +2305,8 @@ static int __init init_mac80211_hwsim(void)
                             IEEE80211_HW_AMPDU_AGGREGATION |
                             IEEE80211_HW_WANT_MONITOR_VIF |
                             IEEE80211_HW_QUEUE_CONTROL;
+                if (rctbl)
+                        hw->flags |= IEEE80211_HW_SUPPORTS_RC_TABLE;
 
                 hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |
                                     WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
@@ -2291,9 +2358,6 @@ static int __init init_mac80211_hwsim(void)
 
                         hw->wiphy->bands[band] = sband;
 
-                        if (channels == 1)
-                                continue;
-
                         sband->vht_cap.vht_supported = true;
                         sband->vht_cap.cap =
                                 IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
@@ -2499,6 +2563,8 @@ failed_drvdata:
         ieee80211_free_hw(hw);
 failed:
         mac80211_hwsim_free();
+failed_unregister_driver:
+        driver_unregister(&mac80211_hwsim_driver);
         return err;
 }
 module_init(init_mac80211_hwsim);
@@ -2511,5 +2577,6 @@ static void __exit exit_mac80211_hwsim(void)
 
         mac80211_hwsim_free();
         unregister_netdev(hwsim_mon);
+        driver_unregister(&mac80211_hwsim_driver);
 }
 module_exit(exit_mac80211_hwsim);
diff --git a/drivers/net/wireless/mwifiex/11ac.c b/drivers/net/wireless/mwifiex/11ac.c
index cf43b3c29250..5e0eec4d71c7 100644
--- a/drivers/net/wireless/mwifiex/11ac.c
+++ b/drivers/net/wireless/mwifiex/11ac.c
@@ -200,7 +200,7 @@ int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv,
 
         /* VHT Operation IE */
         if (bss_desc->bcn_vht_oper) {
-                if (priv->bss_mode == HostCmd_BSS_MODE_IBSS) {
+                if (priv->bss_mode == NL80211_IFTYPE_STATION) {
                         vht_op = (struct mwifiex_ie_types_vht_oper *)*buffer;
                         memset(vht_op, 0, sizeof(*vht_op));
                         vht_op->header.type =
@@ -259,3 +259,44 @@ int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv,
 
         return ret_len;
 }
+
+int mwifiex_cmd_11ac_cfg(struct mwifiex_private *priv,
+                         struct host_cmd_ds_command *cmd, u16 cmd_action,
+                         struct mwifiex_11ac_vht_cfg *cfg)
+{
+        struct host_cmd_11ac_vht_cfg *vhtcfg = &cmd->params.vht_cfg;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_11AC_CFG);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_11ac_vht_cfg) +
+                                S_DS_GEN);
+        vhtcfg->action = cpu_to_le16(cmd_action);
+        vhtcfg->band_config = cfg->band_config;
+        vhtcfg->misc_config = cfg->misc_config;
+        vhtcfg->cap_info = cpu_to_le32(cfg->cap_info);
+        vhtcfg->mcs_tx_set = cpu_to_le32(cfg->mcs_tx_set);
+        vhtcfg->mcs_rx_set = cpu_to_le32(cfg->mcs_rx_set);
+
+        return 0;
+}
+
+/* This function initializes the BlockACK setup information for given
+ * mwifiex_private structure for 11ac enabled networks.
+ */
+void mwifiex_set_11ac_ba_params(struct mwifiex_private *priv)
+{
+        priv->add_ba_param.timeout = MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT;
+
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
+                priv->add_ba_param.tx_win_size =
+                                           MWIFIEX_11AC_UAP_AMPDU_DEF_TXWINSIZE;
+                priv->add_ba_param.rx_win_size =
+                                           MWIFIEX_11AC_UAP_AMPDU_DEF_RXWINSIZE;
+        } else {
+                priv->add_ba_param.tx_win_size =
+                                           MWIFIEX_11AC_STA_AMPDU_DEF_TXWINSIZE;
+                priv->add_ba_param.rx_win_size =
+                                           MWIFIEX_11AC_STA_AMPDU_DEF_RXWINSIZE;
+        }
+
+        return;
+}
diff --git a/drivers/net/wireless/mwifiex/11ac.h b/drivers/net/wireless/mwifiex/11ac.h
index 80fd1ba46200..7c2c69b5b3eb 100644
--- a/drivers/net/wireless/mwifiex/11ac.h
+++ b/drivers/net/wireless/mwifiex/11ac.h
@@ -20,7 +20,24 @@
 #ifndef _MWIFIEX_11AC_H_
 #define _MWIFIEX_11AC_H_
 
+#define VHT_CFG_2GHZ BIT(0)
+#define VHT_CFG_5GHZ BIT(1)
+
+enum vht_cfg_misc_config {
+        VHT_CAP_TX_OPERATION = 1,
+        VHT_CAP_ASSOCIATION,
+        VHT_CAP_UAP_ONLY
+};
+
+#define DEFAULT_VHT_MCS_SET 0xfffa
+#define DISABLE_VHT_MCS_SET 0xffff
+
+#define VHT_BW_80_160_80P80 BIT(2)
+
 int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv,
                                 struct mwifiex_bssdescriptor *bss_desc,
                                 u8 **buffer);
+int mwifiex_cmd_11ac_cfg(struct mwifiex_private *priv,
+                         struct host_cmd_ds_command *cmd, u16 cmd_action,
+                         struct mwifiex_11ac_vht_cfg *cfg);
 #endif /* _MWIFIEX_11AC_H_ */
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index 45f19716687e..41e9d25a2d8e 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -679,3 +679,25 @@ void mwifiex_del_tx_ba_stream_tbl_by_ra(struct mwifiex_private *priv, u8 *ra)
 
         return;
 }
+
+/* This function initializes the BlockACK setup information for given
+ * mwifiex_private structure.
+ */
+void mwifiex_set_ba_params(struct mwifiex_private *priv)
+{
+        priv->add_ba_param.timeout = MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT;
+
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
+                priv->add_ba_param.tx_win_size =
+                                                MWIFIEX_UAP_AMPDU_DEF_TXWINSIZE;
+                priv->add_ba_param.rx_win_size =
+                                                MWIFIEX_UAP_AMPDU_DEF_RXWINSIZE;
+        } else {
+                priv->add_ba_param.tx_win_size =
+                                                MWIFIEX_STA_AMPDU_DEF_TXWINSIZE;
+                priv->add_ba_param.rx_win_size =
+                                                MWIFIEX_STA_AMPDU_DEF_RXWINSIZE;
+        }
+
+        return;
+}
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index af8fe6352eed..a78e0651409c 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -296,19 +296,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
                 break;
         }
         if (ret != -EBUSY) {
-                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
-                if (mwifiex_is_ralist_valid(priv, pra_list, ptrindex)) {
-                        priv->wmm.packets_out[ptrindex]++;
-                        priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = pra_list;
-                }
-                /* Now bss_prio_cur pointer points to next node */
-                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
-                        list_first_entry(
-                                &adapter->bss_prio_tbl[priv->bss_priority]
-                                .bss_prio_cur->list,
-                                struct mwifiex_bss_prio_node, list);
-                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
-                                       ra_list_flags);
+                mwifiex_rotate_priolists(priv, pra_list, ptrindex);
         }
 
         return 0;
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index 5e796f847088..ada809f576fe 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -447,7 +447,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
         end_win = ((start_win + win_size) - 1) & (MAX_TID_VALUE - 1);
         del_timer(&tbl->timer_context.timer);
         mod_timer(&tbl->timer_context.timer,
-                  jiffies + (MIN_FLUSH_TIMER_MS * win_size * HZ) / 1000);
+                  jiffies + msecs_to_jiffies(MIN_FLUSH_TIMER_MS * win_size));
 
         /*
          * If seq_num is less then starting win then ignore and drop the
diff --git a/drivers/net/wireless/mwifiex/Makefile b/drivers/net/wireless/mwifiex/Makefile
index 97b245cbafd8..ecf28464367f 100644
--- a/drivers/net/wireless/mwifiex/Makefile
+++ b/drivers/net/wireless/mwifiex/Makefile
@@ -39,6 +39,7 @@ mwifiex-y += sta_tx.o
 mwifiex-y += sta_rx.o
 mwifiex-y += uap_txrx.o
 mwifiex-y += cfg80211.o
+mwifiex-y += ethtool.o
 mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o
 obj-$(CONFIG_MWIFIEX) += mwifiex.o
 
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 8aaf56ade4d9..a0cb0770d319 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1374,6 +1374,18 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
         }
 
         mwifiex_set_ht_params(priv, bss_cfg, params);
+
+        if (priv->adapter->is_hw_11ac_capable) {
+                mwifiex_set_vht_params(priv, bss_cfg, params);
+                mwifiex_set_vht_width(priv, params->chandef.width,
+                                      priv->ap_11ac_enabled);
+        }
+
+        if (priv->ap_11ac_enabled)
+                mwifiex_set_11ac_ba_params(priv);
+        else
+                mwifiex_set_ba_params(priv);
+
         mwifiex_set_wmm_params(priv, bss_cfg, params);
 
         if (params->inactivity_timeout > 0) {
@@ -1654,17 +1666,13 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
                          struct cfg80211_connect_params *sme)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
-        int ret = 0;
-
-        if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
-                wiphy_err(wiphy, "received infra assoc request "
-                                "when station is in ibss mode\n");
-                goto done;
-        }
+        int ret;
 
-        if (priv->bss_mode == NL80211_IFTYPE_AP) {
-                wiphy_err(wiphy, "skip association request for AP interface\n");
-                goto done;
+        if (priv->bss_mode != NL80211_IFTYPE_STATION) {
+                wiphy_err(wiphy,
+                          "%s: reject infra assoc request in non-STA mode\n",
+                          dev->name);
+                return -EINVAL;
         }
 
         wiphy_dbg(wiphy, "info: Trying to associate to %s and bssid %pM\n",
@@ -1672,7 +1680,6 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 
         ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,
                                      priv->bss_mode, sme->channel, sme, 0);
-done:
         if (!ret) {
                 cfg80211_connect_result(priv->netdev, priv->cfg_bssid, NULL, 0,
                                         NULL, 0, WLAN_STATUS_SUCCESS,
@@ -1933,66 +1940,10 @@ static void mwifiex_setup_vht_caps(struct ieee80211_sta_vht_cap *vht_info,
                                    struct mwifiex_private *priv)
 {
         struct mwifiex_adapter *adapter = priv->adapter;
-        u32 vht_cap = 0, cap = adapter->hw_dot_11ac_dev_cap;
 
         vht_info->vht_supported = true;
 
-        switch (GET_VHTCAP_MAXMPDULEN(cap)) {
-        case 0x00:
-                vht_cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;
-                break;
-        case 0x01:
-                vht_cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;
-                break;
-        case 0x10:
-                vht_cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;
-            break;
-        default:
-            dev_err(adapter->dev, "unsupported MAX MPDU len\n");
-            break;
-        }
-
-        if (ISSUPP_11ACVHTHTCVHT(cap))
-                vht_cap |= IEEE80211_VHT_CAP_HTC_VHT;
-
-        if (ISSUPP_11ACVHTTXOPPS(cap))
-                vht_cap |= IEEE80211_VHT_CAP_VHT_TXOP_PS;
-
-        if (ISSUPP_11ACMURXBEAMFORMEE(cap))
-                vht_cap |= IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE;
-
-        if (ISSUPP_11ACMUTXBEAMFORMEE(cap))
-                vht_cap |= IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
-
-        if (ISSUPP_11ACSUBEAMFORMER(cap))
-                vht_cap |= IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE;
-
-        if (ISSUPP_11ACSUBEAMFORMEE(cap))
-                vht_cap |= IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
-
-        if (ISSUPP_11ACRXSTBC(cap))
-                vht_cap |= IEEE80211_VHT_CAP_RXSTBC_1;
-
-        if (ISSUPP_11ACTXSTBC(cap))
-                vht_cap |= IEEE80211_VHT_CAP_TXSTBC;
-
-        if (ISSUPP_11ACSGI160(cap))
-                vht_cap |= IEEE80211_VHT_CAP_SHORT_GI_160;
-
-        if (ISSUPP_11ACSGI80(cap))
-                vht_cap |= IEEE80211_VHT_CAP_SHORT_GI_80;
-
-        if (ISSUPP_11ACLDPC(cap))
-                vht_cap |= IEEE80211_VHT_CAP_RXLDPC;
-
-        if (ISSUPP_11ACBW8080(cap))
-                vht_cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;
-
-        if (ISSUPP_11ACBW160(cap))
-                vht_cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
-
-        vht_info->cap = vht_cap;
-
+        vht_info->cap = adapter->hw_dot_11ac_dev_cap;
         /* Update MCS support for VHT */
         vht_info->vht_mcs.rx_mcs_map = cpu_to_le16(
                                 adapter->hw_dot_11ac_mcs_support & 0xFFFF);
@@ -2180,10 +2131,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 
                 /* At start-up, wpa_supplicant tries to change the interface
                  * to NL80211_IFTYPE_STATION if it is not managed mode.
-                 * So, we initialize it to STA mode.
                  */
-                wdev->iftype = NL80211_IFTYPE_STATION;
-                priv->bss_mode = NL80211_IFTYPE_STATION;
+                wdev->iftype = NL80211_IFTYPE_P2P_CLIENT;
+                priv->bss_mode = NL80211_IFTYPE_P2P_CLIENT;
 
                 /* Setting bss_type to P2P tells firmware that this interface
                  * is receiving P2P peers found during find phase and doing
@@ -2197,6 +2147,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 priv->bss_started = 0;
                 priv->bss_num = 0;
 
+                if (mwifiex_cfg80211_init_p2p_client(priv))
+                        return ERR_PTR(-EFAULT);
+
                 break;
         default:
                 wiphy_err(wiphy, "type not supported\n");
@@ -2236,6 +2189,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
         dev->watchdog_timeo = MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT;
         dev->hard_header_len += MWIFIEX_MIN_DATA_HEADER_LEN;
+        dev->ethtool_ops = &mwifiex_ethtool_ops;
 
         mdev_priv = netdev_priv(dev);
         *((unsigned long *) mdev_priv) = (unsigned long) priv;
@@ -2294,6 +2248,152 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 }
 EXPORT_SYMBOL_GPL(mwifiex_del_virtual_intf);
 
+#ifdef CONFIG_PM
+static bool
+mwifiex_is_pattern_supported(struct cfg80211_wowlan_trig_pkt_pattern *pat,
+                             s8 *byte_seq)
+{
+        int j, k, valid_byte_cnt = 0;
+        bool dont_care_byte = false;
+
+        for (j = 0; j < DIV_ROUND_UP(pat->pattern_len, 8); j++) {
+                for (k = 0; k < 8; k++) {
+                        if (pat->mask[j] & 1 << k) {
+                                memcpy(byte_seq + valid_byte_cnt,
+                                       &pat->pattern[j * 8 + k], 1);
+                                valid_byte_cnt++;
+                                if (dont_care_byte)
+                                        return false;
+                        } else {
+                                if (valid_byte_cnt)
+                                        dont_care_byte = true;
+                        }
+
+                        if (valid_byte_cnt > MAX_BYTESEQ)
+                                return false;
+                }
+        }
+
+        byte_seq[MAX_BYTESEQ] = valid_byte_cnt;
+
+        return true;
+}
+
+static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
+                                    struct cfg80211_wowlan *wowlan)
+{
+        struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
+        struct mwifiex_ds_mef_cfg mef_cfg;
+        struct mwifiex_mef_entry *mef_entry;
+        int i, filt_num = 0, ret;
+        bool first_pat = true;
+        u8 byte_seq[MAX_BYTESEQ + 1];
+        const u8 ipv4_mc_mac[] = {0x33, 0x33};
+        const u8 ipv6_mc_mac[] = {0x01, 0x00, 0x5e};
+        struct mwifiex_private *priv =
+                        mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
+
+        if (!wowlan) {
+                dev_warn(adapter->dev, "None of the WOWLAN triggers enabled\n");
+                return 0;
+        }
+
+        if (!priv->media_connected) {
+                dev_warn(adapter->dev,
+                         "Can not configure WOWLAN in disconnected state\n");
+                return 0;
+        }
+
+        mef_entry = kzalloc(sizeof(*mef_entry), GFP_KERNEL);
+        if (!mef_entry)
+                return -ENOMEM;
+
+        memset(&mef_cfg, 0, sizeof(mef_cfg));
+        mef_cfg.num_entries = 1;
+        mef_cfg.mef_entry = mef_entry;
+        mef_entry->mode = MEF_MODE_HOST_SLEEP;
+        mef_entry->action = MEF_ACTION_ALLOW_AND_WAKEUP_HOST;
+
+        for (i = 0; i < wowlan->n_patterns; i++) {
+                memset(byte_seq, 0, sizeof(byte_seq));
+                if (!mwifiex_is_pattern_supported(&wowlan->patterns[i],
+                                                  byte_seq)) {
+                        wiphy_err(wiphy, "Pattern not supported\n");
+                        kfree(mef_entry);
+                        return -EOPNOTSUPP;
+                }
+
+                if (!wowlan->patterns[i].pkt_offset) {
+                        if (!(byte_seq[0] & 0x01) &&
+                            (byte_seq[MAX_BYTESEQ] == 1)) {
+                                mef_cfg.criteria |= MWIFIEX_CRITERIA_UNICAST;
+                                continue;
+                        } else if (is_broadcast_ether_addr(byte_seq)) {
+                                mef_cfg.criteria |= MWIFIEX_CRITERIA_BROADCAST;
+                                continue;
+                        } else if ((!memcmp(byte_seq, ipv4_mc_mac, 2) &&
+                                    (byte_seq[MAX_BYTESEQ] == 2)) ||
+                                   (!memcmp(byte_seq, ipv6_mc_mac, 3) &&
+                                    (byte_seq[MAX_BYTESEQ] == 3))) {
+                                mef_cfg.criteria |= MWIFIEX_CRITERIA_MULTICAST;
+                                continue;
+                        }
+                }
+
+                mef_entry->filter[filt_num].repeat = 1;
+                mef_entry->filter[filt_num].offset =
+                                                wowlan->patterns[i].pkt_offset;
+                memcpy(mef_entry->filter[filt_num].byte_seq, byte_seq,
+                       sizeof(byte_seq));
+                mef_entry->filter[filt_num].filt_type = TYPE_EQ;
+
+                if (first_pat)
+                        first_pat = false;
+                else
+                        mef_entry->filter[filt_num].filt_action = TYPE_AND;
+
+                filt_num++;
+        }
+
+        if (wowlan->magic_pkt) {
+                mef_cfg.criteria |= MWIFIEX_CRITERIA_UNICAST;
+                mef_entry->filter[filt_num].repeat = 16;
+                memcpy(mef_entry->filter[filt_num].byte_seq, priv->curr_addr,
+                       ETH_ALEN);
+                mef_entry->filter[filt_num].byte_seq[MAX_BYTESEQ] = ETH_ALEN;
+                mef_entry->filter[filt_num].offset = 14;
+                mef_entry->filter[filt_num].filt_type = TYPE_EQ;
+                if (filt_num)
+                        mef_entry->filter[filt_num].filt_action = TYPE_OR;
+        }
+
+        if (!mef_cfg.criteria)
+                mef_cfg.criteria = MWIFIEX_CRITERIA_BROADCAST |
+                                   MWIFIEX_CRITERIA_UNICAST |
+                                   MWIFIEX_CRITERIA_MULTICAST;
+
+        ret =  mwifiex_send_cmd_sync(priv, HostCmd_CMD_MEF_CFG,
+                                     HostCmd_ACT_GEN_SET, 0,
+                                     &mef_cfg);
+
+        kfree(mef_entry);
+        return ret;
+}
+
+static int mwifiex_cfg80211_resume(struct wiphy *wiphy)
+{
+        return 0;
+}
+
+static void mwifiex_cfg80211_set_wakeup(struct wiphy *wiphy,
+                                       bool enabled)
+{
+        struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
+
+        device_set_wakeup_enable(adapter->dev, enabled);
+}
+#endif
+
 /* station cfg80211 operations */
 static struct cfg80211_ops mwifiex_cfg80211_ops = {
         .add_virtual_intf = mwifiex_add_virtual_intf,
@@ -2322,6 +2422,11 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
         .change_beacon = mwifiex_cfg80211_change_beacon,
         .set_cqm_rssi_config = mwifiex_cfg80211_set_cqm_rssi_config,
         .set_antenna = mwifiex_cfg80211_set_antenna,
+#ifdef CONFIG_PM
+        .suspend = mwifiex_cfg80211_suspend,
+        .resume = mwifiex_cfg80211_resume,
+        .set_wakeup = mwifiex_cfg80211_set_wakeup,
+#endif
 };
 
 /*
@@ -2380,6 +2485,14 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
 
         wiphy_apply_custom_regulatory(wiphy, &mwifiex_world_regdom_custom);
 
+#ifdef CONFIG_PM
+        wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT;
+        wiphy->wowlan.n_patterns = MWIFIEX_MAX_FILTERS;
+        wiphy->wowlan.pattern_min_len = 1;
+        wiphy->wowlan.pattern_max_len = MWIFIEX_MAX_PATTERN_LEN;
+        wiphy->wowlan.max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN;
+#endif
+
         wiphy->probe_resp_offload = NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
                                     NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
                                     NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P;
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index b5c8b962ce12..74db0d24a579 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -153,7 +153,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
                         " or cmd size is 0, not sending\n");
                 if (cmd_node->wait_q_enabled)
                         adapter->cmd_wait_q.status = -1;
-                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                mwifiex_recycle_cmd_node(adapter, cmd_node);
                 return -1;
         }
 
@@ -167,7 +167,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
                         "DNLD_CMD: FW in reset state, ignore cmd %#x\n",
                         cmd_code);
                 mwifiex_complete_cmd(adapter, cmd_node);
-                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                mwifiex_recycle_cmd_node(adapter, cmd_node);
                 return -1;
         }
 
@@ -228,7 +228,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
                         adapter->cmd_sent = false;
                 if (cmd_node->wait_q_enabled)
                         adapter->cmd_wait_q.status = -1;
-                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
 
                 spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
                 adapter->curr_cmd = NULL;
@@ -250,7 +250,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
 
         /* Setup the timer after transmit command */
         mod_timer(&adapter->cmd_timer,
-                  jiffies + (MWIFIEX_TIMER_10S * HZ) / 1000);
+                  jiffies + msecs_to_jiffies(MWIFIEX_TIMER_10S));
 
         return 0;
 }
@@ -632,6 +632,20 @@ mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,
         spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags);
 }
 
+/* This function reuses a command node. */
+void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,
+                              struct cmd_ctrl_node *cmd_node)
+{
+        struct host_cmd_ds_command *host_cmd = (void *)cmd_node->cmd_skb->data;
+
+        mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+
+        atomic_dec(&adapter->cmd_pending);
+        dev_dbg(adapter->dev, "cmd: FREE_CMD: cmd=%#x, cmd_pending=%d\n",
+                le16_to_cpu(host_cmd->command),
+                atomic_read(&adapter->cmd_pending));
+}
+
 /*
  * This function queues a command to the command pending queue.
  *
@@ -673,7 +687,9 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
                 list_add(&cmd_node->list, &adapter->cmd_pending_q);
         spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
 
-        dev_dbg(adapter->dev, "cmd: QUEUE_CMD: cmd=%#x is queued\n", command);
+        atomic_inc(&adapter->cmd_pending);
+        dev_dbg(adapter->dev, "cmd: QUEUE_CMD: cmd=%#x, cmd_pending=%d\n",
+                command, atomic_read(&adapter->cmd_pending));
 }
 
 /*
@@ -783,7 +799,7 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
         if (adapter->curr_cmd->cmd_flag & CMD_F_CANCELED) {
                 dev_err(adapter->dev, "CMD_RESP: %#x been canceled\n",
                         le16_to_cpu(resp->command));
-                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
                 spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
                 adapter->curr_cmd = NULL;
                 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
@@ -833,7 +849,7 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
                 if (adapter->curr_cmd->wait_q_enabled)
                         adapter->cmd_wait_q.status = -1;
 
-                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
                 spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
                 adapter->curr_cmd = NULL;
                 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
@@ -865,8 +881,7 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
                 if (adapter->curr_cmd->wait_q_enabled)
                         adapter->cmd_wait_q.status = ret;
 
-                /* Clean up and put current command back to cmd_free_q */
-                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
 
                 spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
                 adapter->curr_cmd = NULL;
@@ -993,7 +1008,7 @@ mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter)
                         mwifiex_complete_cmd(adapter, cmd_node);
                         cmd_node->wait_q_enabled = false;
                 }
-                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                mwifiex_recycle_cmd_node(adapter, cmd_node);
                 spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
         }
         spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
@@ -1040,7 +1055,7 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
                 cmd_node = adapter->curr_cmd;
                 cmd_node->wait_q_enabled = false;
                 cmd_node->cmd_flag |= CMD_F_CANCELED;
-                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                mwifiex_recycle_cmd_node(adapter, cmd_node);
                 mwifiex_complete_cmd(adapter, adapter->curr_cmd);
                 adapter->curr_cmd = NULL;
                 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
@@ -1149,7 +1164,7 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
                         phs_cfg->params.hs_config.gpio,
                         phs_cfg->params.hs_config.gap);
         }
-        if (conditions != HOST_SLEEP_CFG_CANCEL) {
+        if (conditions != HS_CFG_CANCEL) {
                 adapter->is_hs_configured = true;
                 if (adapter->iface_type == MWIFIEX_USB ||
                     adapter->iface_type == MWIFIEX_PCIE)
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index e8a569aaa2e8..94cc09d48444 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -41,8 +41,15 @@
 #define MWIFIEX_MAX_TX_BASTREAM_SUPPORTED       2
 #define MWIFIEX_MAX_RX_BASTREAM_SUPPORTED       16
 
-#define MWIFIEX_AMPDU_DEF_TXWINSIZE        32
-#define MWIFIEX_AMPDU_DEF_RXWINSIZE        16
+#define MWIFIEX_STA_AMPDU_DEF_TXWINSIZE        16
+#define MWIFIEX_STA_AMPDU_DEF_RXWINSIZE        32
+#define MWIFIEX_UAP_AMPDU_DEF_TXWINSIZE        32
+#define MWIFIEX_UAP_AMPDU_DEF_RXWINSIZE        16
+#define MWIFIEX_11AC_STA_AMPDU_DEF_TXWINSIZE   32
+#define MWIFIEX_11AC_STA_AMPDU_DEF_RXWINSIZE   48
+#define MWIFIEX_11AC_UAP_AMPDU_DEF_TXWINSIZE   48
+#define MWIFIEX_11AC_UAP_AMPDU_DEF_RXWINSIZE   32
+
 #define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT  0xffff
 
 #define MWIFIEX_RATE_BITMAP_MCS0   32
diff --git a/drivers/net/wireless/mwifiex/ethtool.c b/drivers/net/wireless/mwifiex/ethtool.c
new file mode 100644
index 000000000000..bfb39908b2c6
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/ethtool.c
@@ -0,0 +1,70 @@
+/*
+ * Marvell Wireless LAN device driver: ethtool
+ *
+ * Copyright (C) 2013, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "main.h"
+
+static void mwifiex_ethtool_get_wol(struct net_device *dev,
+                                    struct ethtool_wolinfo *wol)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        u32 conditions = le32_to_cpu(priv->adapter->hs_cfg.conditions);
+
+        wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;
+
+        if (conditions == HS_CFG_COND_DEF)
+                return;
+
+        if (conditions & HS_CFG_COND_UNICAST_DATA)
+                wol->wolopts |= WAKE_UCAST;
+        if (conditions & HS_CFG_COND_MULTICAST_DATA)
+                wol->wolopts |= WAKE_MCAST;
+        if (conditions & HS_CFG_COND_BROADCAST_DATA)
+                wol->wolopts |= WAKE_BCAST;
+        if (conditions & HS_CFG_COND_MAC_EVENT)
+                wol->wolopts |= WAKE_PHY;
+}
+
+static int mwifiex_ethtool_set_wol(struct net_device *dev,
+                                   struct ethtool_wolinfo *wol)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        u32 conditions = 0;
+
+        if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))
+                return -EOPNOTSUPP;
+
+        if (wol->wolopts & WAKE_UCAST)
+                conditions |= HS_CFG_COND_UNICAST_DATA;
+        if (wol->wolopts & WAKE_MCAST)
+                conditions |= HS_CFG_COND_MULTICAST_DATA;
+        if (wol->wolopts & WAKE_BCAST)
+                conditions |= HS_CFG_COND_BROADCAST_DATA;
+        if (wol->wolopts & WAKE_PHY)
+                conditions |= HS_CFG_COND_MAC_EVENT;
+        if (wol->wolopts == 0)
+                conditions |= HS_CFG_COND_DEF;
+        priv->adapter->hs_cfg.conditions = cpu_to_le32(conditions);
+
+        return 0;
+}
+
+const struct ethtool_ops mwifiex_ethtool_ops = {
+        .get_wol = mwifiex_ethtool_get_wol,
+        .set_wol = mwifiex_ethtool_set_wol,
+};
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 25acb0682c56..1f7578d553ec 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -230,40 +230,12 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 
 #define ISSUPP_11ACENABLED(fw_cap_info) (fw_cap_info & (BIT(13)|BIT(14)))
 
-#define GET_VHTCAP_MAXMPDULEN(vht_cap_info) (vht_cap_info & 0x3)
 #define GET_VHTCAP_CHWDSET(vht_cap_info)    ((vht_cap_info >> 2) & 0x3)
 #define GET_VHTNSSMCS(mcs_mapset, nss) ((mcs_mapset >> (2 * (nss - 1))) & 0x3)
 #define SET_VHTNSSMCS(mcs_mapset, nss, value) (mcs_mapset |= (value & 0x3) << \
                                               (2 * (nss - 1)))
 #define NO_NSS_SUPPORT          0x3
 
-/* HW_SPEC: HTC-VHT supported */
-#define ISSUPP_11ACVHTHTCVHT(Dot11acDevCap) (Dot11acDevCap & BIT(22))
-/* HW_SPEC: VHT TXOP PS support */
-#define ISSUPP_11ACVHTTXOPPS(Dot11acDevCap) (Dot11acDevCap & BIT(21))
-/* HW_SPEC: MU RX beamformee support */
-#define ISSUPP_11ACMURXBEAMFORMEE(Dot11acDevCap) (Dot11acDevCap & BIT(20))
-/* HW_SPEC: MU TX beamformee support */
-#define ISSUPP_11ACMUTXBEAMFORMEE(Dot11acDevCap) (Dot11acDevCap & BIT(19))
-/* HW_SPEC: SU Beamformee support */
-#define ISSUPP_11ACSUBEAMFORMEE(Dot11acDevCap) (Dot11acDevCap & BIT(10))
-/* HW_SPEC: SU Beamformer support */
-#define ISSUPP_11ACSUBEAMFORMER(Dot11acDevCap) (Dot11acDevCap & BIT(9))
-/* HW_SPEC: Rx STBC support */
-#define ISSUPP_11ACRXSTBC(Dot11acDevCap) (Dot11acDevCap & BIT(8))
-/* HW_SPEC: Tx STBC support */
-#define ISSUPP_11ACTXSTBC(Dot11acDevCap) (Dot11acDevCap & BIT(7))
-/* HW_SPEC: Short GI support for 160MHz BW */
-#define ISSUPP_11ACSGI160(Dot11acDevCap) (Dot11acDevCap & BIT(6))
-/* HW_SPEC: Short GI support for 80MHz BW */
-#define ISSUPP_11ACSGI80(Dot11acDevCap) (Dot11acDevCap & BIT(5))
-/* HW_SPEC: LDPC coding support */
-#define ISSUPP_11ACLDPC(Dot11acDevCap) (Dot11acDevCap & BIT(4))
-/* HW_SPEC: Channel BW 20/40/80/160/80+80 MHz support */
-#define ISSUPP_11ACBW8080(Dot11acDevCap) (Dot11acDevCap & BIT(3))
-/* HW_SPEC: Channel BW 20/40/80/160 MHz support */
-#define ISSUPP_11ACBW160(Dot11acDevCap) (Dot11acDevCap & BIT(2))
-
 #define GET_DEVTXMCSMAP(dev_mcs_map)      (dev_mcs_map >> 16)
 #define GET_DEVRXMCSMAP(dev_mcs_map)      (dev_mcs_map & 0xFFFF)
 
@@ -300,6 +272,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_802_11_TX_RATE_QUERY              0x007f
 #define HostCmd_CMD_802_11_IBSS_COALESCING_STATUS     0x0083
 #define HostCmd_CMD_VERSION_EXT                       0x0097
+#define HostCmd_CMD_MEF_CFG                           0x009a
 #define HostCmd_CMD_RSSI_INFO                         0x00a4
 #define HostCmd_CMD_FUNC_INIT                         0x00a9
 #define HostCmd_CMD_FUNC_SHUTDOWN                     0x00aa
@@ -322,6 +295,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_PCIE_DESC_DETAILS                 0x00fa
 #define HostCmd_CMD_MGMT_FRAME_REG                    0x010c
 #define HostCmd_CMD_REMAIN_ON_CHAN                    0x010d
+#define HostCmd_CMD_11AC_CFG                          0x0112
 
 #define PROTOCOL_NO_SECURITY        0x01
 #define PROTOCOL_STATIC_WEP         0x02
@@ -376,10 +350,14 @@ enum P2P_MODES {
 #define HostCmd_SCAN_RADIO_TYPE_BG          0
 #define HostCmd_SCAN_RADIO_TYPE_A           1
 
-#define HOST_SLEEP_CFG_CANCEL           0xffffffff
-#define HOST_SLEEP_CFG_COND_DEF         0x00000000
-#define HOST_SLEEP_CFG_GPIO_DEF         0xff
-#define HOST_SLEEP_CFG_GAP_DEF          0
+#define HS_CFG_CANCEL                   0xffffffff
+#define HS_CFG_COND_DEF                 0x00000000
+#define HS_CFG_GPIO_DEF                 0xff
+#define HS_CFG_GAP_DEF                  0
+#define HS_CFG_COND_BROADCAST_DATA      0x00000001
+#define HS_CFG_COND_UNICAST_DATA        0x00000002
+#define HS_CFG_COND_MAC_EVENT           0x00000004
+#define HS_CFG_COND_MULTICAST_DATA      0x00000008
 
 #define MWIFIEX_TIMEOUT_FOR_AP_RESP             0xfffc
 #define MWIFIEX_STATUS_CODE_AUTH_TIMEOUT        2
@@ -469,6 +447,23 @@ enum P2P_MODES {
 #define EVENT_GET_BSS_TYPE(event_cause)         \
         (((event_cause) >> 24) & 0x00ff)
 
+#define MWIFIEX_MAX_PATTERN_LEN         20
+#define MWIFIEX_MAX_OFFSET_LEN          50
+#define STACK_NBYTES                    100
+#define TYPE_DNUM                       1
+#define TYPE_BYTESEQ                    2
+#define MAX_OPERAND                     0x40
+#define TYPE_EQ                         (MAX_OPERAND+1)
+#define TYPE_EQ_DNUM                    (MAX_OPERAND+2)
+#define TYPE_EQ_BIT                     (MAX_OPERAND+3)
+#define TYPE_AND                        (MAX_OPERAND+4)
+#define TYPE_OR                         (MAX_OPERAND+5)
+#define MEF_MODE_HOST_SLEEP                     1
+#define MEF_ACTION_ALLOW_AND_WAKEUP_HOST        3
+#define MWIFIEX_CRITERIA_BROADCAST      BIT(0)
+#define MWIFIEX_CRITERIA_UNICAST        BIT(1)
+#define MWIFIEX_CRITERIA_MULTICAST      BIT(3)
+
 struct mwifiex_ie_types_header {
         __le16 type;
         __le16 len;
@@ -1369,6 +1364,15 @@ struct host_cmd_ds_sys_config {
         u8 tlv[0];
 };
 
+struct host_cmd_11ac_vht_cfg {
+        __le16 action;
+        u8 band_config;
+        u8 misc_config;
+        __le32 cap_info;
+        __le32 mcs_tx_set;
+        __le32 mcs_rx_set;
+} __packed;
+
 struct host_cmd_tlv_akmp {
         struct host_cmd_tlv tlv;
         __le16 key_mgmt;
@@ -1499,6 +1503,19 @@ struct host_cmd_ds_802_11_ibss_status {
         __le16 use_g_rate_protect;
 } __packed;
 
+struct mwifiex_fw_mef_entry {
+        u8 mode;
+        u8 action;
+        __le16 exprsize;
+        u8 expr[0];
+} __packed;
+
+struct host_cmd_ds_mef_cfg {
+        __le32 criteria;
+        __le16 num_entries;
+        struct mwifiex_fw_mef_entry mef_entry[0];
+} __packed;
+
 #define CONNECTION_TYPE_INFRA   0
 #define CONNECTION_TYPE_ADHOC   1
 #define CONNECTION_TYPE_AP      2
@@ -1603,6 +1620,7 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_remain_on_chan roc_cfg;
                 struct host_cmd_ds_p2p_mode_cfg mode_cfg;
                 struct host_cmd_ds_802_11_ibss_status ibss_coalescing;
+                struct host_cmd_ds_mef_cfg mef_cfg;
                 struct host_cmd_ds_mac_reg_access mac_reg;
                 struct host_cmd_ds_bbp_reg_access bbp_reg;
                 struct host_cmd_ds_rf_reg_access rf_reg;
@@ -1612,6 +1630,7 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_802_11_eeprom_access eeprom;
                 struct host_cmd_ds_802_11_subsc_evt subsc_evt;
                 struct host_cmd_ds_sys_config uap_sys_config;
+                struct host_cmd_11ac_vht_cfg vht_cfg;
         } params;
 } __packed;
 
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 0ff4c37ab42a..9f44fda19db9 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -44,8 +44,6 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
 
         bss_prio->priv = priv;
         INIT_LIST_HEAD(&bss_prio->list);
-        if (!tbl[priv->bss_priority].bss_prio_cur)
-                tbl[priv->bss_priority].bss_prio_cur = bss_prio;
 
         spin_lock_irqsave(&tbl[priv->bss_priority].bss_prio_lock, flags);
         list_add_tail(&bss_prio->list, &tbl[priv->bss_priority].bss_prio_head);
@@ -318,9 +316,9 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
         adapter->curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
 
         adapter->is_hs_configured = false;
-        adapter->hs_cfg.conditions = cpu_to_le32(HOST_SLEEP_CFG_COND_DEF);
-        adapter->hs_cfg.gpio = HOST_SLEEP_CFG_GPIO_DEF;
-        adapter->hs_cfg.gap = HOST_SLEEP_CFG_GAP_DEF;
+        adapter->hs_cfg.conditions = cpu_to_le32(HS_CFG_COND_DEF);
+        adapter->hs_cfg.gpio = HS_CFG_GPIO_DEF;
+        adapter->hs_cfg.gap = HS_CFG_GAP_DEF;
         adapter->hs_activated = false;
 
         memset(adapter->event_body, 0, sizeof(adapter->event_body));
@@ -525,7 +523,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
 
         for (i = 0; i < adapter->priv_num; ++i) {
                 INIT_LIST_HEAD(&adapter->bss_prio_tbl[i].bss_prio_head);
-                adapter->bss_prio_tbl[i].bss_prio_cur = NULL;
                 spin_lock_init(&adapter->bss_prio_tbl[i].bss_prio_lock);
         }
 
@@ -533,10 +530,8 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
                 if (!adapter->priv[i])
                         continue;
                 priv = adapter->priv[i];
-                for (j = 0; j < MAX_NUM_TID; ++j) {
+                for (j = 0; j < MAX_NUM_TID; ++j)
                         INIT_LIST_HEAD(&priv->wmm.tid_tbl_ptr[j].ra_list);
-                        spin_lock_init(&priv->wmm.tid_tbl_ptr[j].tid_tbl_lock);
-                }
                 INIT_LIST_HEAD(&priv->tx_ba_stream_tbl_ptr);
                 INIT_LIST_HEAD(&priv->rx_reorder_tbl_ptr);
                 INIT_LIST_HEAD(&priv->sta_list);
@@ -627,42 +622,36 @@ static void mwifiex_delete_bss_prio_tbl(struct mwifiex_private *priv)
 {
         int i;
         struct mwifiex_adapter *adapter = priv->adapter;
-        struct mwifiex_bss_prio_node *bssprio_node, *tmp_node, **cur;
+        struct mwifiex_bss_prio_node *bssprio_node, *tmp_node;
         struct list_head *head;
         spinlock_t *lock; /* bss priority lock */
         unsigned long flags;
 
         for (i = 0; i < adapter->priv_num; ++i) {
                 head = &adapter->bss_prio_tbl[i].bss_prio_head;
-                cur = &adapter->bss_prio_tbl[i].bss_prio_cur;
                 lock = &adapter->bss_prio_tbl[i].bss_prio_lock;
                 dev_dbg(adapter->dev, "info: delete BSS priority table,"
                                 " bss_type = %d, bss_num = %d, i = %d,"
-                                " head = %p, cur = %p\n",
-                              priv->bss_type, priv->bss_num, i, head, *cur);
-                if (*cur) {
+                                " head = %p\n",
+                              priv->bss_type, priv->bss_num, i, head);
+
+                {
                         spin_lock_irqsave(lock, flags);
                         if (list_empty(head)) {
                                 spin_unlock_irqrestore(lock, flags);
                                 continue;
                         }
-                        bssprio_node = list_first_entry(head,
-                                        struct mwifiex_bss_prio_node, list);
-                        spin_unlock_irqrestore(lock, flags);
-
                         list_for_each_entry_safe(bssprio_node, tmp_node, head,
                                                  list) {
                                 if (bssprio_node->priv == priv) {
                                         dev_dbg(adapter->dev, "info: Delete "
                                                 "node %p, next = %p\n",
                                                 bssprio_node, tmp_node);
-                                        spin_lock_irqsave(lock, flags);
                                         list_del(&bssprio_node->list);
-                                        spin_unlock_irqrestore(lock, flags);
                                         kfree(bssprio_node);
                                 }
                         }
-                        *cur = (struct mwifiex_bss_prio_node *)head;
+                        spin_unlock_irqrestore(lock, flags);
                 }
         }
 }
@@ -713,7 +702,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
         if (adapter->curr_cmd) {
                 dev_warn(adapter->dev, "curr_cmd is still in processing\n");
                 del_timer(&adapter->cmd_timer);
-                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
                 adapter->curr_cmd = NULL;
         }
 
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index d85e6eb1f58a..7f27e45680b5 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -272,6 +272,14 @@ struct mwifiex_ds_pm_cfg {
         } param;
 };
 
+struct mwifiex_11ac_vht_cfg {
+        u8 band_config;
+        u8 misc_config;
+        u32 cap_info;
+        u32 mcs_tx_set;
+        u32 mcs_rx_set;
+};
+
 struct mwifiex_ds_11n_tx_cfg {
         u16 tx_htcap;
         u16 tx_htinfo;
@@ -354,6 +362,29 @@ struct mwifiex_ds_misc_subsc_evt {
         struct subsc_evt_cfg bcn_h_rssi_cfg;
 };
 
+#define MAX_BYTESEQ             6       /* non-adjustable */
+#define MWIFIEX_MAX_FILTERS     10
+
+struct mwifiex_mef_filter {
+        u16 repeat;
+        u16 offset;
+        s8 byte_seq[MAX_BYTESEQ + 1];
+        u8 filt_type;
+        u8 filt_action;
+};
+
+struct mwifiex_mef_entry {
+        u8 mode;
+        u8 action;
+        struct mwifiex_mef_filter filter[MWIFIEX_MAX_FILTERS];
+};
+
+struct mwifiex_ds_mef_cfg {
+        u32 criteria;
+        u16 num_entries;
+        struct mwifiex_mef_entry *mef_entry;
+};
+
 #define MWIFIEX_MAX_VSIE_LEN       (256)
 #define MWIFIEX_MAX_VSIE_NUM       (8)
 #define MWIFIEX_VSIE_MASK_CLEAR    0x00
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 2fe0ceba4400..6bcb66e6e97c 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -1295,6 +1295,14 @@ int mwifiex_associate(struct mwifiex_private *priv,
             (bss_desc->bss_mode != NL80211_IFTYPE_STATION))
                 return -1;
 
+        if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) &&
+            !bss_desc->disable_11n && !bss_desc->disable_11ac &&
+            (priv->adapter->config_bands & BAND_GAC ||
+             priv->adapter->config_bands & BAND_AAC))
+                mwifiex_set_11ac_ba_params(priv);
+        else
+                mwifiex_set_ba_params(priv);
+
         memcpy(&current_bssid,
                &priv->curr_bss_params.bss_descriptor.mac_address,
                sizeof(current_bssid));
@@ -1323,6 +1331,13 @@ mwifiex_adhoc_start(struct mwifiex_private *priv,
         dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %d\n",
                 priv->curr_bss_params.band);
 
+        if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) &&
+            (priv->adapter->config_bands & BAND_GAC ||
+             priv->adapter->config_bands & BAND_AAC))
+                mwifiex_set_11ac_ba_params(priv);
+        else
+                mwifiex_set_ba_params(priv);
+
         return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_AD_HOC_START,
                                     HostCmd_ACT_GEN_SET, 0, adhoc_ssid);
 }
@@ -1356,6 +1371,14 @@ int mwifiex_adhoc_join(struct mwifiex_private *priv,
                 return -1;
         }
 
+        if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) &&
+            !bss_desc->disable_11n && !bss_desc->disable_11ac &&
+            (priv->adapter->config_bands & BAND_GAC ||
+             priv->adapter->config_bands & BAND_AAC))
+                mwifiex_set_11ac_ba_params(priv);
+        else
+                mwifiex_set_ba_params(priv);
+
         dev_dbg(priv->adapter->dev, "info: curr_bss_params.channel = %d\n",
                 priv->curr_bss_params.bss_descriptor.channel);
         dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %c\n",
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 9c802ede9c3b..121443a0f2a1 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -588,10 +588,19 @@ mwifiex_tx_timeout(struct net_device *dev)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
-        dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_type-num = %d-%d\n",
-                jiffies, priv->bss_type, priv->bss_num);
-        mwifiex_set_trans_start(dev);
         priv->num_tx_timeout++;
+        priv->tx_timeout_cnt++;
+        dev_err(priv->adapter->dev,
+                "%lu : Tx timeout(#%d), bss_type-num = %d-%d\n",
+                jiffies, priv->tx_timeout_cnt, priv->bss_type, priv->bss_num);
+        mwifiex_set_trans_start(dev);
+
+        if (priv->tx_timeout_cnt > TX_TIMEOUT_THRESHOLD &&
+            priv->adapter->if_ops.card_reset) {
+                dev_err(priv->adapter->dev,
+                        "tx_timeout_cnt exceeds threshold. Triggering card reset!\n");
+                priv->adapter->if_ops.card_reset(priv->adapter);
+        }
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 7035ade9af74..4ef67fca06d3 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -130,6 +130,9 @@ enum {
 #define MWIFIEX_USB_TYPE_DATA                   0xBEADC0DE
 #define MWIFIEX_USB_TYPE_EVENT                  0xBEEFFACE
 
+/* Threshold for tx_timeout_cnt before we trigger a card reset */
+#define TX_TIMEOUT_THRESHOLD    6
+
 struct mwifiex_dbg {
         u32 num_cmd_host_to_card_failure;
         u32 num_cmd_sleep_cfm_host_to_card_failure;
@@ -210,15 +213,11 @@ struct mwifiex_ra_list_tbl {
 
 struct mwifiex_tid_tbl {
         struct list_head ra_list;
-        /* spin lock for tid table */
-        spinlock_t tid_tbl_lock;
-        struct mwifiex_ra_list_tbl *ra_list_curr;
 };
 
 #define WMM_HIGHEST_PRIORITY            7
 #define HIGH_PRIO_TID                           7
 #define LOW_PRIO_TID                            0
-#define NO_PKT_PRIO_TID                         (-1)
 
 struct mwifiex_wmm_desc {
         struct mwifiex_tid_tbl tid_tbl_ptr[MAX_NUM_TID];
@@ -394,6 +393,8 @@ struct mwifiex_private {
         u8 curr_addr[ETH_ALEN];
         u8 media_connected;
         u32 num_tx_timeout;
+        /* track consecutive timeout */
+        u8 tx_timeout_cnt;
         struct net_device *netdev;
         struct net_device_stats stats;
         u16 curr_pkt_filter;
@@ -793,6 +794,8 @@ void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter);
 
 void mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,
                                   struct cmd_ctrl_node *cmd_node);
+void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,
+                              struct cmd_ctrl_node *cmd_node);
 
 void mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
                                      struct cmd_ctrl_node *cmd_node,
@@ -907,12 +910,20 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
 void mwifiex_set_ht_params(struct mwifiex_private *priv,
                            struct mwifiex_uap_bss_param *bss_cfg,
                            struct cfg80211_ap_settings *params);
+void mwifiex_set_vht_params(struct mwifiex_private *priv,
+                            struct mwifiex_uap_bss_param *bss_cfg,
+                            struct cfg80211_ap_settings *params);
 void mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg,
                            struct cfg80211_ap_settings *params);
+void mwifiex_set_vht_width(struct mwifiex_private *priv,
+                           enum nl80211_chan_width width,
+                           bool ap_11ac_disable);
 void
 mwifiex_set_wmm_params(struct mwifiex_private *priv,
                        struct mwifiex_uap_bss_param *bss_cfg,
                        struct cfg80211_ap_settings *params);
+void mwifiex_set_ba_params(struct mwifiex_private *priv);
+void mwifiex_set_11ac_ba_params(struct mwifiex_private *priv);
 
 /*
  * This function checks if the queuing is RA based or not.
@@ -1098,11 +1109,15 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev);
 
 void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config);
 
+int mwifiex_add_wowlan_magic_pkt_filter(struct mwifiex_adapter *adapter);
+
 int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
                          struct cfg80211_beacon_data *data);
 int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);
 u8 *mwifiex_11d_code_2_region(u8 code);
 
+extern const struct ethtool_ops mwifiex_ethtool_ops;
+
 #ifdef CONFIG_DEBUG_FS
 void mwifiex_debugfs_init(void);
 void mwifiex_debugfs_remove(void);
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index feb204613397..20c9c4c7b0b2 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -36,8 +36,6 @@ static u8 user_rmmod;
 static struct mwifiex_if_ops pcie_ops;
 
 static struct semaphore add_remove_card_sem;
-static int mwifiex_pcie_enable_host_int(struct mwifiex_adapter *adapter);
-static int mwifiex_pcie_resume(struct pci_dev *pdev);
 
 static int
 mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
@@ -78,6 +76,82 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter)
         return false;
 }
 
+#ifdef CONFIG_PM
+/*
+ * Kernel needs to suspend all functions separately. Therefore all
+ * registered functions must have drivers with suspend and resume
+ * methods. Failing that the kernel simply removes the whole card.
+ *
+ * If already not suspended, this function allocates and sends a host
+ * sleep activate request to the firmware and turns off the traffic.
+ */
+static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct mwifiex_adapter *adapter;
+        struct pcie_service_card *card;
+        int hs_actived;
+
+        if (pdev) {
+                card = (struct pcie_service_card *) pci_get_drvdata(pdev);
+                if (!card || !card->adapter) {
+                        pr_err("Card or adapter structure is not valid\n");
+                        return 0;
+                }
+        } else {
+                pr_err("PCIE device is not specified\n");
+                return 0;
+        }
+
+        adapter = card->adapter;
+
+        hs_actived = mwifiex_enable_hs(adapter);
+
+        /* Indicate device suspended */
+        adapter->is_suspended = true;
+
+        return 0;
+}
+
+/*
+ * Kernel needs to suspend all functions separately. Therefore all
+ * registered functions must have drivers with suspend and resume
+ * methods. Failing that the kernel simply removes the whole card.
+ *
+ * If already not resumed, this function turns on the traffic and
+ * sends a host sleep cancel request to the firmware.
+ */
+static int mwifiex_pcie_resume(struct pci_dev *pdev)
+{
+        struct mwifiex_adapter *adapter;
+        struct pcie_service_card *card;
+
+        if (pdev) {
+                card = (struct pcie_service_card *) pci_get_drvdata(pdev);
+                if (!card || !card->adapter) {
+                        pr_err("Card or adapter structure is not valid\n");
+                        return 0;
+                }
+        } else {
+                pr_err("PCIE device is not specified\n");
+                return 0;
+        }
+
+        adapter = card->adapter;
+
+        if (!adapter->is_suspended) {
+                dev_warn(adapter->dev, "Device already resumed\n");
+                return 0;
+        }
+
+        adapter->is_suspended = false;
+
+        mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
+                          MWIFIEX_ASYNC_CMD);
+
+        return 0;
+}
+#endif
+
 /*
  * This function probes an mwifiex device and registers it. It allocates
  * the card structure, enables PCIE function number and initiates the
@@ -159,80 +233,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
         kfree(card);
 }
 
-/*
- * Kernel needs to suspend all functions separately. Therefore all
- * registered functions must have drivers with suspend and resume
- * methods. Failing that the kernel simply removes the whole card.
- *
- * If already not suspended, this function allocates and sends a host
- * sleep activate request to the firmware and turns off the traffic.
- */
-static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct mwifiex_adapter *adapter;
-        struct pcie_service_card *card;
-        int hs_actived;
-
-        if (pdev) {
-                card = (struct pcie_service_card *) pci_get_drvdata(pdev);
-                if (!card || !card->adapter) {
-                        pr_err("Card or adapter structure is not valid\n");
-                        return 0;
-                }
-        } else {
-                pr_err("PCIE device is not specified\n");
-                return 0;
-        }
-
-        adapter = card->adapter;
-
-        hs_actived = mwifiex_enable_hs(adapter);
-
-        /* Indicate device suspended */
-        adapter->is_suspended = true;
-
-        return 0;
-}
-
-/*
- * Kernel needs to suspend all functions separately. Therefore all
- * registered functions must have drivers with suspend and resume
- * methods. Failing that the kernel simply removes the whole card.
- *
- * If already not resumed, this function turns on the traffic and
- * sends a host sleep cancel request to the firmware.
- */
-static int mwifiex_pcie_resume(struct pci_dev *pdev)
-{
-        struct mwifiex_adapter *adapter;
-        struct pcie_service_card *card;
-
-        if (pdev) {
-                card = (struct pcie_service_card *) pci_get_drvdata(pdev);
-                if (!card || !card->adapter) {
-                        pr_err("Card or adapter structure is not valid\n");
-                        return 0;
-                }
-        } else {
-                pr_err("PCIE device is not specified\n");
-                return 0;
-        }
-
-        adapter = card->adapter;
-
-        if (!adapter->is_suspended) {
-                dev_warn(adapter->dev, "Device already resumed\n");
-                return 0;
-        }
-
-        adapter->is_suspended = false;
-
-        mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
-                          MWIFIEX_ASYNC_CMD);
-
-        return 0;
-}
-
 static DEFINE_PCI_DEVICE_TABLE(mwifiex_ids) = {
         {
                 PCIE_VENDOR_ID_MARVELL, PCIE_DEVICE_ID_MARVELL_88W8766P,
@@ -287,18 +287,13 @@ static int mwifiex_read_reg(struct mwifiex_adapter *adapter, int reg, u32 *data)
 }
 
 /*
- * This function wakes up the card.
- *
- * A host power up command is written to the card configuration
- * register to wake up the card.
+ * This function adds delay loop to ensure FW is awake before proceeding.
  */
-static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
+static void mwifiex_pcie_dev_wakeup_delay(struct mwifiex_adapter *adapter)
 {
         int i = 0;
-        struct pcie_service_card *card = adapter->card;
-        const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
 
-        while (reg->sleep_cookie && mwifiex_pcie_ok_to_access_hw(adapter)) {
+        while (mwifiex_pcie_ok_to_access_hw(adapter)) {
                 i++;
                 usleep_range(10, 20);
                 /* 50ms max wait */
@@ -306,16 +301,32 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
                         break;
         }
 
+        return;
+}
+
+/* This function wakes up the card by reading fw_status register. */
+static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
+{
+        u32 fw_status;
+        struct pcie_service_card *card = adapter->card;
+        const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
+
         dev_dbg(adapter->dev, "event: Wakeup device...\n");
 
-        /* Enable interrupts or any chip access will wakeup device */
-        if (mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK, HOST_INTR_MASK)) {
-                dev_warn(adapter->dev, "Enable host interrupt failed\n");
+        if (reg->sleep_cookie)
+                mwifiex_pcie_dev_wakeup_delay(adapter);
+
+        /* Reading fw_status register will wakeup device */
+        if (mwifiex_read_reg(adapter, reg->fw_status, &fw_status)) {
+                dev_warn(adapter->dev, "Reading fw_status register failed\n");
                 return -1;
         }
 
-        dev_dbg(adapter->dev, "PCIE wakeup: Setting PS_STATE_AWAKE\n");
-        adapter->ps_state = PS_STATE_AWAKE;
+        if (reg->sleep_cookie) {
+                mwifiex_pcie_dev_wakeup_delay(adapter);
+                dev_dbg(adapter->dev, "PCIE wakeup: Setting PS_STATE_AWAKE\n");
+                adapter->ps_state = PS_STATE_AWAKE;
+        }
 
         return 0;
 }
@@ -561,7 +572,7 @@ static void mwifiex_cleanup_rxq_ring(struct mwifiex_adapter *adapter)
                         if (card->rx_buf_list[i]) {
                                 skb = card->rx_buf_list[i];
                                 pci_unmap_single(card->dev, desc2->paddr,
-                                                 skb->len, PCI_DMA_TODEVICE);
+                                                 skb->len, PCI_DMA_FROMDEVICE);
                                 dev_kfree_skb_any(skb);
                         }
                         memset(desc2, 0, sizeof(*desc2));
@@ -570,7 +581,7 @@ static void mwifiex_cleanup_rxq_ring(struct mwifiex_adapter *adapter)
                         if (card->rx_buf_list[i]) {
                                 skb = card->rx_buf_list[i];
                                 pci_unmap_single(card->dev, desc->paddr,
-                                                 skb->len, PCI_DMA_TODEVICE);
+                                                 skb->len, PCI_DMA_FROMDEVICE);
                                 dev_kfree_skb_any(skb);
                         }
                         memset(desc, 0, sizeof(*desc));
@@ -850,9 +861,8 @@ static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter)
 
         if (card && card->cmd_buf) {
                 MWIFIEX_SKB_PACB(card->cmd_buf, &buf_pa);
-                pci_unmap_single(card->dev, buf_pa, MWIFIEX_SIZE_OF_CMD_BUFFER,
+                pci_unmap_single(card->dev, buf_pa, card->cmd_buf->len,
                                  PCI_DMA_TODEVICE);
-                dev_kfree_skb_any(card->cmd_buf);
         }
         return 0;
 }
@@ -1030,8 +1040,8 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,
         u32 wrindx, num_tx_buffs, rx_val;
         int ret;
         dma_addr_t buf_pa;
-        struct mwifiex_pcie_buf_desc *desc;
-        struct mwifiex_pfu_buf_desc *desc2;
+        struct mwifiex_pcie_buf_desc *desc = NULL;
+        struct mwifiex_pfu_buf_desc *desc2 = NULL;
         __le16 *tmp;
 
         if (!(skb->data && skb->len)) {
@@ -1562,7 +1572,7 @@ static int mwifiex_pcie_cmdrsp_complete(struct mwifiex_adapter *adapter,
         skb_tmp = card->cmd_buf;
         if (skb_tmp) {
                 MWIFIEX_SKB_PACB(skb_tmp, &buf_pa);
-                pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                pci_unmap_single(card->dev, buf_pa, skb_tmp->len,
                                  PCI_DMA_FROMDEVICE);
                 card->cmd_buf = NULL;
         }
@@ -1984,12 +1994,13 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter)
                                 }
                         }
                 } else if (!adapter->pps_uapsd_mode &&
-                           adapter->ps_state == PS_STATE_SLEEP) {
+                           adapter->ps_state == PS_STATE_SLEEP &&
+                           mwifiex_pcie_ok_to_access_hw(adapter)) {
                                 /* Potentially for PCIe we could get other
                                  * interrupts like shared. Don't change power
                                  * state until cookie is set */
-                                if (mwifiex_pcie_ok_to_access_hw(adapter))
-                                        adapter->ps_state = PS_STATE_AWAKE;
+                                adapter->ps_state = PS_STATE_AWAKE;
+                                adapter->pm_wakeup_fw_try = false;
                 }
         }
 }
@@ -2112,7 +2123,8 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
         }
         dev_dbg(adapter->dev, "info: cmd_sent=%d data_sent=%d\n",
                 adapter->cmd_sent, adapter->data_sent);
-        mwifiex_pcie_enable_host_int(adapter);
+        if (adapter->ps_state != PS_STATE_SLEEP)
+                mwifiex_pcie_enable_host_int(adapter);
 
         return 0;
 }
@@ -2281,9 +2293,9 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter *adapter)
         if (pdev) {
                 pci_iounmap(pdev, card->pci_mmap);
                 pci_iounmap(pdev, card->pci_mmap1);
-
-                pci_release_regions(pdev);
                 pci_disable_device(pdev);
+                pci_release_region(pdev, 2);
+                pci_release_region(pdev, 0);
                 pci_set_drvdata(pdev, NULL);
         }
 }
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index e7f6deaf715e..9cf5d8f07df8 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1500,43 +1500,22 @@ static int mwifiex_update_curr_bss_params(struct mwifiex_private *priv,
         if (ret)
                 goto done;
 
-        /* Update current bss descriptor parameters */
         spin_lock_irqsave(&priv->curr_bcn_buf_lock, flags);
-        priv->curr_bss_params.bss_descriptor.bcn_wpa_ie = NULL;
-        priv->curr_bss_params.bss_descriptor.wpa_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_rsn_ie = NULL;
-        priv->curr_bss_params.bss_descriptor.rsn_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_wapi_ie = NULL;
-        priv->curr_bss_params.bss_descriptor.wapi_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_ht_cap = NULL;
-        priv->curr_bss_params.bss_descriptor.ht_cap_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_ht_oper = NULL;
-        priv->curr_bss_params.bss_descriptor.ht_info_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_bss_co_2040 = NULL;
-        priv->curr_bss_params.bss_descriptor.bss_co_2040_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_ext_cap = NULL;
-        priv->curr_bss_params.bss_descriptor.ext_cap_offset = 0;
-        priv->curr_bss_params.bss_descriptor.beacon_buf = NULL;
-        priv->curr_bss_params.bss_descriptor.beacon_buf_size = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_vht_cap = NULL;
-        priv->curr_bss_params.bss_descriptor.vht_cap_offset = 0;
-        priv->curr_bss_params.bss_descriptor.bcn_vht_oper = NULL;
-        priv->curr_bss_params.bss_descriptor.vht_info_offset = 0;
-        priv->curr_bss_params.bss_descriptor.oper_mode = NULL;
-        priv->curr_bss_params.bss_descriptor.oper_mode_offset = 0;
-
-        /* Disable 11ac by default. Enable it only where there
-         * exist VHT_CAP IE in AP beacon
-         */
-        priv->curr_bss_params.bss_descriptor.disable_11ac = true;
-
         /* Make a copy of current BSSID descriptor */
         memcpy(&priv->curr_bss_params.bss_descriptor, bss_desc,
                sizeof(priv->curr_bss_params.bss_descriptor));
+
+        /* The contents of beacon_ie will be copied to its own buffer
+         * in mwifiex_save_curr_bcn()
+         */
         mwifiex_save_curr_bcn(priv);
         spin_unlock_irqrestore(&priv->curr_bcn_buf_lock, flags);
 
 done:
+        /* beacon_ie buffer was allocated in function
+         * mwifiex_fill_new_bss_desc(). Free it now.
+         */
+        kfree(bss_desc->beacon_buf);
         kfree(bss_desc);
         return 0;
 }
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index c55c5bb93134..b193e25977d2 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -24,6 +24,7 @@
 #include "main.h"
 #include "wmm.h"
 #include "11n.h"
+#include "11ac.h"
 
 /*
  * This function prepares command to set/get RSSI information.
@@ -334,7 +335,7 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
         cmd->command = cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH);
 
         if (!hs_activate &&
-            (hscfg_param->conditions != cpu_to_le32(HOST_SLEEP_CFG_CANCEL)) &&
+            (hscfg_param->conditions != cpu_to_le32(HS_CFG_CANCEL)) &&
             ((adapter->arp_filter_size > 0) &&
              (adapter->arp_filter_size <= ARP_FILTER_MAX_BUF_SIZE))) {
                 dev_dbg(adapter->dev,
@@ -1059,6 +1060,80 @@ mwifiex_cmd_802_11_subsc_evt(struct mwifiex_private *priv,
         return 0;
 }
 
+static int
+mwifiex_cmd_append_rpn_expression(struct mwifiex_private *priv,
+                                  struct mwifiex_mef_entry *mef_entry,
+                                  u8 **buffer)
+{
+        struct mwifiex_mef_filter *filter = mef_entry->filter;
+        int i, byte_len;
+        u8 *stack_ptr = *buffer;
+
+        for (i = 0; i < MWIFIEX_MAX_FILTERS; i++) {
+                filter = &mef_entry->filter[i];
+                if (!filter->filt_type)
+                        break;
+                *(__le32 *)stack_ptr = cpu_to_le32((u32)filter->repeat);
+                stack_ptr += 4;
+                *stack_ptr = TYPE_DNUM;
+                stack_ptr += 1;
+
+                byte_len = filter->byte_seq[MAX_BYTESEQ];
+                memcpy(stack_ptr, filter->byte_seq, byte_len);
+                stack_ptr += byte_len;
+                *stack_ptr = byte_len;
+                stack_ptr += 1;
+                *stack_ptr = TYPE_BYTESEQ;
+                stack_ptr += 1;
+
+                *(__le32 *)stack_ptr = cpu_to_le32((u32)filter->offset);
+                stack_ptr += 4;
+                *stack_ptr = TYPE_DNUM;
+                stack_ptr += 1;
+
+                *stack_ptr = filter->filt_type;
+                stack_ptr += 1;
+
+                if (filter->filt_action) {
+                        *stack_ptr = filter->filt_action;
+                        stack_ptr += 1;
+                }
+
+                if (stack_ptr - *buffer > STACK_NBYTES)
+                        return -1;
+        }
+
+        *buffer = stack_ptr;
+        return 0;
+}
+
+static int
+mwifiex_cmd_mef_cfg(struct mwifiex_private *priv,
+                    struct host_cmd_ds_command *cmd,
+                    struct mwifiex_ds_mef_cfg *mef)
+{
+        struct host_cmd_ds_mef_cfg *mef_cfg = &cmd->params.mef_cfg;
+        u8 *pos = (u8 *)mef_cfg;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_MEF_CFG);
+
+        mef_cfg->criteria = cpu_to_le32(mef->criteria);
+        mef_cfg->num_entries = cpu_to_le16(mef->num_entries);
+        pos += sizeof(*mef_cfg);
+        mef_cfg->mef_entry->mode = mef->mef_entry->mode;
+        mef_cfg->mef_entry->action = mef->mef_entry->action;
+        pos += sizeof(*(mef_cfg->mef_entry));
+
+        if (mwifiex_cmd_append_rpn_expression(priv, mef->mef_entry, &pos))
+                return -1;
+
+        mef_cfg->mef_entry->exprsize =
+                        cpu_to_le16(pos - mef_cfg->mef_entry->expr);
+        cmd->size = cpu_to_le16((u16) (pos - (u8 *)mef_cfg) + S_DS_GEN);
+
+        return 0;
+}
+
 /*
  * This function prepares the commands before sending them to the firmware.
  *
@@ -1184,6 +1259,9 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
                       cpu_to_le16(sizeof(struct host_cmd_ds_remain_on_chan) +
                                   S_DS_GEN);
                 break;
+        case HostCmd_CMD_11AC_CFG:
+                ret = mwifiex_cmd_11ac_cfg(priv, cmd_ptr, cmd_action, data_buf);
+                break;
         case HostCmd_CMD_P2P_MODE_CFG:
                 cmd_ptr->command = cpu_to_le16(cmd_no);
                 cmd_ptr->params.mode_cfg.action = cpu_to_le16(cmd_action);
@@ -1273,6 +1351,9 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
         case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:
                 ret = mwifiex_cmd_802_11_subsc_evt(priv, cmd_ptr, data_buf);
                 break;
+        case HostCmd_CMD_MEF_CFG:
+                ret = mwifiex_cmd_mef_cfg(priv, cmd_ptr, data_buf);
+                break;
         default:
                 dev_err(priv->adapter->dev,
                         "PREP_CMD: unknown cmd- %#x\n", cmd_no);
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index 4669f8d9389f..9f990e14966e 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -95,7 +95,7 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
                 break;
         }
         /* Handling errors here */
-        mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+        mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
 
         spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
         adapter->curr_cmd = NULL;
@@ -907,6 +907,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
         case HostCmd_CMD_REMAIN_ON_CHAN:
                 ret = mwifiex_ret_remain_on_chan(priv, resp, data_buf);
                 break;
+        case HostCmd_CMD_11AC_CFG:
+                break;
         case HostCmd_CMD_P2P_MODE_CFG:
                 ret = mwifiex_ret_p2p_mode_cfg(priv, resp, data_buf);
                 break;
@@ -976,6 +978,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
         case HostCmd_CMD_UAP_BSS_STOP:
                 priv->bss_started = 0;
                 break;
+        case HostCmd_CMD_MEF_CFG:
+                break;
         default:
                 dev_err(adapter->dev, "CMD_RESP: unknown cmd response %#x\n",
                         resp->command);
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 13100f8de3db..311d0b26b81c 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -59,9 +59,6 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter,
 {
         int status;
 
-        dev_dbg(adapter->dev, "cmd pending\n");
-        atomic_inc(&adapter->cmd_pending);
-
         /* Wait for completion */
         status = wait_event_interruptible(adapter->cmd_wait_q.wait,
                                           *(cmd_queued->condition));
@@ -143,12 +140,13 @@ int mwifiex_request_set_multicast_list(struct mwifiex_private *priv,
 /*
  * This function fills bss descriptor structure using provided
  * information.
+ * beacon_ie buffer is allocated in this function. It is caller's
+ * responsibility to free the memory.
  */
 int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
                               struct cfg80211_bss *bss,
                               struct mwifiex_bssdescriptor *bss_desc)
 {
-        int ret;
         u8 *beacon_ie;
         size_t beacon_ie_len;
         struct mwifiex_bss_priv *bss_priv = (void *)bss->priv;
@@ -168,6 +166,7 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
 
         memcpy(bss_desc->mac_address, bss->bssid, ETH_ALEN);
         bss_desc->rssi = bss->signal;
+        /* The caller of this function will free beacon_ie */
         bss_desc->beacon_buf = beacon_ie;
         bss_desc->beacon_buf_size = beacon_ie_len;
         bss_desc->beacon_period = bss->beacon_interval;
@@ -185,10 +184,12 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
         else
                 bss_desc->bss_mode = NL80211_IFTYPE_STATION;
 
-        ret = mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc);
+        /* Disable 11ac by default. Enable it only where there
+         * exist VHT_CAP IE in AP beacon
+         */
+        bss_desc->disable_11ac = true;
 
-        kfree(beacon_ie);
-        return ret;
+        return mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc);
 }
 
 static int mwifiex_process_country_ie(struct mwifiex_private *priv,
@@ -352,6 +353,11 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
         }
 
 done:
+        /* beacon_ie buffer was allocated in function
+         * mwifiex_fill_new_bss_desc(). Free it now.
+         */
+        if (bss_desc)
+                kfree(bss_desc->beacon_buf);
         kfree(bss_desc);
         return ret;
 }
@@ -382,7 +388,7 @@ static int mwifiex_set_hs_params(struct mwifiex_private *priv, u16 action,
                         break;
                 }
                 if (hs_cfg->is_invoke_hostcmd) {
-                        if (hs_cfg->conditions == HOST_SLEEP_CFG_CANCEL) {
+                        if (hs_cfg->conditions == HS_CFG_CANCEL) {
                                 if (!adapter->is_hs_configured)
                                         /* Already cancelled */
                                         break;
@@ -397,8 +403,8 @@ static int mwifiex_set_hs_params(struct mwifiex_private *priv, u16 action,
                                 adapter->hs_cfg.gpio = (u8)hs_cfg->gpio;
                                 if (hs_cfg->gap)
                                         adapter->hs_cfg.gap = (u8)hs_cfg->gap;
-                        } else if (adapter->hs_cfg.conditions
-                                   == cpu_to_le32(HOST_SLEEP_CFG_CANCEL)) {
+                        } else if (adapter->hs_cfg.conditions ==
+                                   cpu_to_le32(HS_CFG_CANCEL)) {
                                 /* Return failure if no parameters for HS
                                    enable */
                                 status = -1;
@@ -414,7 +420,7 @@ static int mwifiex_set_hs_params(struct mwifiex_private *priv, u16 action,
                                                 HostCmd_CMD_802_11_HS_CFG_ENH,
                                                 HostCmd_ACT_GEN_SET, 0,
                                                 &adapter->hs_cfg);
-                        if (hs_cfg->conditions == HOST_SLEEP_CFG_CANCEL)
+                        if (hs_cfg->conditions == HS_CFG_CANCEL)
                                 /* Restore previous condition */
                                 adapter->hs_cfg.conditions =
                                                 cpu_to_le32(prev_cond);
@@ -448,7 +454,7 @@ int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type)
 {
         struct mwifiex_ds_hs_cfg hscfg;
 
-        hscfg.conditions = HOST_SLEEP_CFG_CANCEL;
+        hscfg.conditions = HS_CFG_CANCEL;
         hscfg.is_invoke_hostcmd = true;
 
         return mwifiex_set_hs_params(priv, HostCmd_ACT_GEN_SET,
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index 296faec14365..8f923d0d2ba6 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -169,6 +169,8 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
         if (!status) {
                 priv->stats.tx_packets++;
                 priv->stats.tx_bytes += skb->len;
+                if (priv->tx_timeout_cnt)
+                        priv->tx_timeout_cnt = 0;
         } else {
                 priv->stats.tx_errors++;
         }
diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index 6e76a15a8950..b04b1db29100 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -18,6 +18,7 @@
  */
 
 #include "main.h"
+#include "11ac.h"
 
 /* This function parses security related parameters from cfg80211_ap_settings
  * and sets into FW understandable bss_config structure.
@@ -177,6 +178,60 @@ mwifiex_set_ht_params(struct mwifiex_private *priv,
         return;
 }
 
+/* This function updates 11ac related parameters from IE
+ * and sets them into bss_config structure.
+ */
+void mwifiex_set_vht_params(struct mwifiex_private *priv,
+                            struct mwifiex_uap_bss_param *bss_cfg,
+                            struct cfg80211_ap_settings *params)
+{
+        const u8 *vht_ie;
+
+        vht_ie = cfg80211_find_ie(WLAN_EID_VHT_CAPABILITY, params->beacon.tail,
+                                  params->beacon.tail_len);
+        if (vht_ie) {
+                memcpy(&bss_cfg->vht_cap, vht_ie + 2,
+                       sizeof(struct ieee80211_vht_cap));
+                priv->ap_11ac_enabled = 1;
+        } else {
+                priv->ap_11ac_enabled = 0;
+        }
+
+        return;
+}
+
+/* Enable VHT only when cfg80211_ap_settings has VHT IE.
+ * Otherwise disable VHT.
+ */
+void mwifiex_set_vht_width(struct mwifiex_private *priv,
+                           enum nl80211_chan_width width,
+                           bool ap_11ac_enable)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_11ac_vht_cfg vht_cfg;
+
+        vht_cfg.band_config = VHT_CFG_5GHZ;
+        vht_cfg.cap_info = adapter->hw_dot_11ac_dev_cap;
+
+        if (!ap_11ac_enable) {
+                vht_cfg.mcs_tx_set = DISABLE_VHT_MCS_SET;
+                vht_cfg.mcs_rx_set = DISABLE_VHT_MCS_SET;
+        } else {
+                vht_cfg.mcs_tx_set = DEFAULT_VHT_MCS_SET;
+                vht_cfg.mcs_rx_set = DEFAULT_VHT_MCS_SET;
+        }
+
+        vht_cfg.misc_config  = VHT_CAP_UAP_ONLY;
+
+        if (ap_11ac_enable && width >= NL80211_CHAN_WIDTH_80)
+                vht_cfg.misc_config |= VHT_BW_80_160_80P80;
+
+        mwifiex_send_cmd_sync(priv, HostCmd_CMD_11AC_CFG,
+                              HostCmd_ACT_GEN_SET, 0, &vht_cfg);
+
+        return;
+}
+
 /* This function finds supported rates IE from beacon parameter and sets
  * these rates into bss_config structure.
  */
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 21553976b550..e57ac0dd3ab5 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -195,7 +195,7 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb)
         skb->protocol = eth_type_trans(skb, priv->netdev);
         skb->ip_summed = CHECKSUM_NONE;
 
-        /* This is required only in case of 11n and USB as we alloc
+        /* This is required only in case of 11n and USB/PCIE as we alloc
          * a buffer of 4K only if its 11N (to be able to receive 4K
          * AMSDU packets). In case of SD we allocate buffers based
          * on the size of packet and hence this is not needed.
@@ -212,7 +212,8 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb)
          * fragments. Currently we fail the Filesndl-ht.scr script
          * for UDP, hence this fix
          */
-        if ((priv->adapter->iface_type == MWIFIEX_USB) &&
+        if ((priv->adapter->iface_type == MWIFIEX_USB ||
+             priv->adapter->iface_type == MWIFIEX_PCIE) &&
             (skb->truesize > MWIFIEX_RX_DATA_BUF_SIZE))
                 skb->truesize += (skb->len - MWIFIEX_RX_DATA_BUF_SIZE);
 
@@ -238,7 +239,6 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb)
 int mwifiex_complete_cmd(struct mwifiex_adapter *adapter,
                          struct cmd_ctrl_node *cmd_node)
 {
-        atomic_dec(&adapter->cmd_pending);
         dev_dbg(adapter->dev, "cmd completed: status=%d\n",
                 adapter->cmd_wait_q.status);
 
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 32adc878041d..4be3d33ceae8 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -191,9 +191,6 @@ mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra)
                 }
                 list_add_tail(&ra_list->list,
                               &priv->wmm.tid_tbl_ptr[i].ra_list);
-
-                if (!priv->wmm.tid_tbl_ptr[i].ra_list_curr)
-                        priv->wmm.tid_tbl_ptr[i].ra_list_curr = ra_list;
         }
 }
 
@@ -424,7 +421,6 @@ mwifiex_wmm_init(struct mwifiex_adapter *adapter)
                         priv->aggr_prio_tbl[i].amsdu = tos_to_tid_inv[i];
                         priv->aggr_prio_tbl[i].ampdu_ap = tos_to_tid_inv[i];
                         priv->aggr_prio_tbl[i].ampdu_user = tos_to_tid_inv[i];
-                        priv->wmm.tid_tbl_ptr[i].ra_list_curr = NULL;
                 }
 
                 priv->aggr_prio_tbl[6].amsdu
@@ -436,10 +432,7 @@ mwifiex_wmm_init(struct mwifiex_adapter *adapter)
                                         = priv->aggr_prio_tbl[7].ampdu_user
                                         = BA_STREAM_NOT_ALLOWED;
 
-                priv->add_ba_param.timeout = MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT;
-                priv->add_ba_param.tx_win_size = MWIFIEX_AMPDU_DEF_TXWINSIZE;
-                priv->add_ba_param.rx_win_size = MWIFIEX_AMPDU_DEF_RXWINSIZE;
-
+                mwifiex_set_ba_params(priv);
                 mwifiex_reset_11n_rx_seq_num(priv);
 
                 atomic_set(&priv->wmm.tx_pkts_queued, 0);
@@ -533,8 +526,6 @@ static void mwifiex_wmm_delete_all_ralist(struct mwifiex_private *priv)
                 }
 
                 INIT_LIST_HEAD(&priv->wmm.tid_tbl_ptr[i].ra_list);
-
-                priv->wmm.tid_tbl_ptr[i].ra_list_curr = NULL;
         }
 }
 
@@ -688,13 +679,13 @@ mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
         ra_list->total_pkts_size += skb->len;
         ra_list->pkt_count++;
 
-        atomic_inc(&priv->wmm.tx_pkts_queued);
-
         if (atomic_read(&priv->wmm.highest_queued_prio) <
                                                 tos_to_tid_inv[tid_down])
                 atomic_set(&priv->wmm.highest_queued_prio,
                            tos_to_tid_inv[tid_down]);
 
+        atomic_inc(&priv->wmm.tx_pkts_queued);
+
         spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
 }
 
@@ -886,128 +877,65 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter,
                                      struct mwifiex_private **priv, int *tid)
 {
         struct mwifiex_private *priv_tmp;
-        struct mwifiex_ra_list_tbl *ptr, *head;
-        struct mwifiex_bss_prio_node *bssprio_node, *bssprio_head;
+        struct mwifiex_ra_list_tbl *ptr;
         struct mwifiex_tid_tbl *tid_ptr;
         atomic_t *hqp;
-        int is_list_empty;
-        unsigned long flags;
+        unsigned long flags_bss, flags_ra;
         int i, j;
 
+        /* check the BSS with highest priority first */
         for (j = adapter->priv_num - 1; j >= 0; --j) {
                 spin_lock_irqsave(&adapter->bss_prio_tbl[j].bss_prio_lock,
-                                  flags);
-                is_list_empty = list_empty(&adapter->bss_prio_tbl[j]
-                                           .bss_prio_head);
-                spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
-                                       flags);
-                if (is_list_empty)
-                        continue;
+                                  flags_bss);
 
-                if (adapter->bss_prio_tbl[j].bss_prio_cur ==
-                    (struct mwifiex_bss_prio_node *)
-                    &adapter->bss_prio_tbl[j].bss_prio_head) {
-                        adapter->bss_prio_tbl[j].bss_prio_cur =
-                                list_first_entry(&adapter->bss_prio_tbl[j]
-                                                 .bss_prio_head,
-                                                 struct mwifiex_bss_prio_node,
-                                                 list);
-                }
+                /* iterate over BSS with the equal priority */
+                list_for_each_entry(adapter->bss_prio_tbl[j].bss_prio_cur,
+                                    &adapter->bss_prio_tbl[j].bss_prio_head,
+                                    list) {
 
-                bssprio_node = adapter->bss_prio_tbl[j].bss_prio_cur;
-                bssprio_head = bssprio_node;
+                        priv_tmp = adapter->bss_prio_tbl[j].bss_prio_cur->priv;
 
-                do {
-                        priv_tmp = bssprio_node->priv;
-                        hqp = &priv_tmp->wmm.highest_queued_prio;
+                        if (atomic_read(&priv_tmp->wmm.tx_pkts_queued) == 0)
+                                continue;
 
+                        /* iterate over the WMM queues of the BSS */
+                        hqp = &priv_tmp->wmm.highest_queued_prio;
                         for (i = atomic_read(hqp); i >= LOW_PRIO_TID; --i) {
 
+                                spin_lock_irqsave(&priv_tmp->wmm.
+                                                  ra_list_spinlock, flags_ra);
+
                                 tid_ptr = &(priv_tmp)->wmm.
                                         tid_tbl_ptr[tos_to_tid[i]];
 
-                                /* For non-STA ra_list_curr may be NULL */
-                                if (!tid_ptr->ra_list_curr)
-                                        continue;
-
-                                spin_lock_irqsave(&tid_ptr->tid_tbl_lock,
-                                                  flags);
-                                is_list_empty =
-                                        list_empty(&adapter->bss_prio_tbl[j]
-                                                   .bss_prio_head);
-                                spin_unlock_irqrestore(&tid_ptr->tid_tbl_lock,
-                                                       flags);
-                                if (is_list_empty)
-                                        continue;
-
-                                /*
-                                 * Always choose the next ra we transmitted
-                                 * last time, this way we pick the ra's in
-                                 * round robin fashion.
-                                 */
-                                ptr = list_first_entry(
-                                                &tid_ptr->ra_list_curr->list,
-                                                struct mwifiex_ra_list_tbl,
-                                                list);
-
-                                head = ptr;
-                                if (ptr == (struct mwifiex_ra_list_tbl *)
-                                                &tid_ptr->ra_list) {
-                                        /* Get next ra */
-                                        ptr = list_first_entry(&ptr->list,
-                                            struct mwifiex_ra_list_tbl, list);
-                                        head = ptr;
-                                }
-
-                                do {
-                                        is_list_empty =
-                                                skb_queue_empty(&ptr->skb_head);
+                                /* iterate over receiver addresses */
+                                list_for_each_entry(ptr, &tid_ptr->ra_list,
+                                                    list) {
 
-                                        if (!is_list_empty)
+                                        if (!skb_queue_empty(&ptr->skb_head))
+                                                /* holds both locks */
                                                 goto found;
+                                }
 
-                                        /* Get next ra */
-                                        ptr = list_first_entry(&ptr->list,
-                                                 struct mwifiex_ra_list_tbl,
-                                                 list);
-                                        if (ptr ==
-                                            (struct mwifiex_ra_list_tbl *)
-                                            &tid_ptr->ra_list)
-                                                ptr = list_first_entry(
-                                                    &ptr->list,
-                                                    struct mwifiex_ra_list_tbl,
-                                                    list);
-                                } while (ptr != head);
+                                spin_unlock_irqrestore(&priv_tmp->wmm.
+                                                       ra_list_spinlock,
+                                                       flags_ra);
                         }
+                }
 
-                        /* No packet at any TID for this priv. Mark as such
-                         * to skip checking TIDs for this priv (until pkt is
-                         * added).
-                         */
-                        atomic_set(hqp, NO_PKT_PRIO_TID);
-
-                        /* Get next bss priority node */
-                        bssprio_node = list_first_entry(&bssprio_node->list,
-                                                struct mwifiex_bss_prio_node,
-                                                list);
-
-                        if (bssprio_node ==
-                            (struct mwifiex_bss_prio_node *)
-                            &adapter->bss_prio_tbl[j].bss_prio_head)
-                                /* Get next bss priority node */
-                                bssprio_node = list_first_entry(
-                                                &bssprio_node->list,
-                                                struct mwifiex_bss_prio_node,
-                                                list);
-                } while (bssprio_node != bssprio_head);
+                spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
+                                       flags_bss);
         }
+
         return NULL;
 
 found:
-        spin_lock_irqsave(&priv_tmp->wmm.ra_list_spinlock, flags);
+        /* holds bss_prio_lock / ra_list_spinlock */
         if (atomic_read(hqp) > i)
                 atomic_set(hqp, i);
-        spin_unlock_irqrestore(&priv_tmp->wmm.ra_list_spinlock, flags);
+        spin_unlock_irqrestore(&priv_tmp->wmm.ra_list_spinlock, flags_ra);
+        spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
+                               flags_bss);
 
         *priv = priv_tmp;
         *tid = tos_to_tid[i];
@@ -1015,6 +943,42 @@ found:
         return ptr;
 }
 
+/* This functions rotates ra and bss lists so packets are picked round robin.
+ *
+ * After a packet is successfully transmitted, rotate the ra list, so the ra
+ * next to the one transmitted, will come first in the list. This way we pick
+ * the ra' in a round robin fashion. Same applies to bss nodes of equal
+ * priority.
+ *
+ * Function also increments wmm.packets_out counter.
+ */
+void mwifiex_rotate_priolists(struct mwifiex_private *priv,
+                                 struct mwifiex_ra_list_tbl *ra,
+                                 int tid)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bss_prio_tbl *tbl = adapter->bss_prio_tbl;
+        struct mwifiex_tid_tbl *tid_ptr = &priv->wmm.tid_tbl_ptr[tid];
+        unsigned long flags;
+
+        spin_lock_irqsave(&tbl[priv->bss_priority].bss_prio_lock, flags);
+        /*
+         * dirty trick: we remove 'head' temporarily and reinsert it after
+         * curr bss node. imagine list to stay fixed while head is moved
+         */
+        list_move(&tbl[priv->bss_priority].bss_prio_head,
+                  &tbl[priv->bss_priority].bss_prio_cur->list);
+        spin_unlock_irqrestore(&tbl[priv->bss_priority].bss_prio_lock, flags);
+
+        spin_lock_irqsave(&priv->wmm.ra_list_spinlock, flags);
+        if (mwifiex_is_ralist_valid(priv, ra, tid)) {
+                priv->wmm.packets_out[tid]++;
+                /* same as above */
+                list_move(&tid_ptr->ra_list, &ra->list);
+        }
+        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
+}
+
 /*
  * This function checks if 11n aggregation is possible.
  */
@@ -1101,20 +1065,8 @@ mwifiex_send_single_packet(struct mwifiex_private *priv,
                 spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
                                        ra_list_flags);
         } else {
-                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
-                if (mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
-                        priv->wmm.packets_out[ptr_index]++;
-                        priv->wmm.tid_tbl_ptr[ptr_index].ra_list_curr = ptr;
-                }
-                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
-                        list_first_entry(
-                                &adapter->bss_prio_tbl[priv->bss_priority]
-                                .bss_prio_cur->list,
-                                struct mwifiex_bss_prio_node,
-                                list);
+                mwifiex_rotate_priolists(priv, ptr, ptr_index);
                 atomic_dec(&priv->wmm.tx_pkts_queued);
-                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
-                                       ra_list_flags);
         }
 }
 
@@ -1218,20 +1170,8 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv,
                 break;
         }
         if (ret != -EBUSY) {
-                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
-                if (mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
-                        priv->wmm.packets_out[ptr_index]++;
-                        priv->wmm.tid_tbl_ptr[ptr_index].ra_list_curr = ptr;
-                }
-                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
-                        list_first_entry(
-                                &adapter->bss_prio_tbl[priv->bss_priority]
-                                .bss_prio_cur->list,
-                                struct mwifiex_bss_prio_node,
-                                list);
+                mwifiex_rotate_priolists(priv, ptr, ptr_index);
                 atomic_dec(&priv->wmm.tx_pkts_queued);
-                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
-                                       ra_list_flags);
         }
 }
 
diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/mwifiex/wmm.h
index b92f39d8963b..644d6e0c51cc 100644
--- a/drivers/net/wireless/mwifiex/wmm.h
+++ b/drivers/net/wireless/mwifiex/wmm.h
@@ -85,6 +85,9 @@ mwifiex_wmm_is_ra_list_empty(struct list_head *ra_list_hhead)
 void mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
                                         struct sk_buff *skb);
 void mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra);
+void mwifiex_rotate_priolists(struct mwifiex_private *priv,
+                              struct mwifiex_ra_list_tbl *ra,
+                              int tid);
 
 int mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter);
 void mwifiex_wmm_process_tx(struct mwifiex_adapter *adapter);
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 091d9a64080a..6820fce4016b 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -193,10 +193,10 @@ struct mwl8k_priv {
         struct rxd_ops *rxd_ops;
         struct ieee80211_supported_band band_24;
         struct ieee80211_channel channels_24[14];
-        struct ieee80211_rate rates_24[14];
+        struct ieee80211_rate rates_24[13];
         struct ieee80211_supported_band band_50;
         struct ieee80211_channel channels_50[4];
-        struct ieee80211_rate rates_50[9];
+        struct ieee80211_rate rates_50[8];
         u32 ap_macids_supported;
         u32 sta_macids_supported;
 
@@ -232,6 +232,7 @@ struct mwl8k_priv {
         u16 num_mcaddrs;
         u8 hw_rev;
         u32 fw_rev;
+        u32 caps;
 
         /*
          * Running count of TX packets in flight, to avoid
@@ -284,6 +285,7 @@ struct mwl8k_priv {
         unsigned fw_state;
         char *fw_pref;
         char *fw_alt;
+        bool is_8764;
         struct completion firmware_loading_complete;
 
         /* bitmap of running BSSes */
@@ -364,7 +366,6 @@ static const struct ieee80211_rate mwl8k_rates_24[] = {
         { .bitrate = 360, .hw_value = 72, },
         { .bitrate = 480, .hw_value = 96, },
         { .bitrate = 540, .hw_value = 108, },
-        { .bitrate = 720, .hw_value = 144, },
 };
 
 static const struct ieee80211_channel mwl8k_channels_50[] = {
@@ -383,7 +384,6 @@ static const struct ieee80211_rate mwl8k_rates_50[] = {
         { .bitrate = 360, .hw_value = 72, },
         { .bitrate = 480, .hw_value = 96, },
         { .bitrate = 540, .hw_value = 108, },
-        { .bitrate = 720, .hw_value = 144, },
 };
 
 /* Set or get info from Firmware */
@@ -600,13 +600,18 @@ mwl8k_send_fw_load_cmd(struct mwl8k_priv *priv, void *data, int length)
         loops = 1000;
         do {
                 u32 int_code;
-
-                int_code = ioread32(regs + MWL8K_HIU_INT_CODE);
-                if (int_code == MWL8K_INT_CODE_CMD_FINISHED) {
-                        iowrite32(0, regs + MWL8K_HIU_INT_CODE);
-                        break;
+                if (priv->is_8764) {
+                        int_code = ioread32(regs +
+                                            MWL8K_HIU_H2A_INTERRUPT_STATUS);
+                        if (int_code == 0)
+                                break;
+                } else {
+                        int_code = ioread32(regs + MWL8K_HIU_INT_CODE);
+                        if (int_code == MWL8K_INT_CODE_CMD_FINISHED) {
+                                iowrite32(0, regs + MWL8K_HIU_INT_CODE);
+                                break;
+                        }
                 }
-
                 cond_resched();
                 udelay(1);
         } while (--loops);
@@ -724,7 +729,7 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
         int rc;
         int loops;
 
-        if (!memcmp(fw->data, "\x01\x00\x00\x00", 4)) {
+        if (!memcmp(fw->data, "\x01\x00\x00\x00", 4) && !priv->is_8764) {
                 const struct firmware *helper = priv->fw_helper;
 
                 if (helper == NULL) {
@@ -743,7 +748,10 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
 
                 rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);
         } else {
-                rc = mwl8k_load_fw_image(priv, fw->data, fw->size);
+                if (priv->is_8764)
+                        rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);
+                else
+                        rc = mwl8k_load_fw_image(priv, fw->data, fw->size);
         }
 
         if (rc) {
@@ -908,9 +916,9 @@ static void mwl8k_encapsulate_tx_frame(struct mwl8k_priv *priv,
 }
 
 /*
- * Packet reception for 88w8366 AP firmware.
+ * Packet reception for 88w8366/88w8764 AP firmware.
  */
-struct mwl8k_rxd_8366_ap {
+struct mwl8k_rxd_ap {
         __le16 pkt_len;
         __u8 sq2;
         __u8 rate;
@@ -928,30 +936,30 @@ struct mwl8k_rxd_8366_ap {
         __u8 rx_ctrl;
 } __packed;
 
-#define MWL8K_8366_AP_RATE_INFO_MCS_FORMAT      0x80
-#define MWL8K_8366_AP_RATE_INFO_40MHZ           0x40
-#define MWL8K_8366_AP_RATE_INFO_RATEID(x)       ((x) & 0x3f)
+#define MWL8K_AP_RATE_INFO_MCS_FORMAT           0x80
+#define MWL8K_AP_RATE_INFO_40MHZ                0x40
+#define MWL8K_AP_RATE_INFO_RATEID(x)            ((x) & 0x3f)
 
-#define MWL8K_8366_AP_RX_CTRL_OWNED_BY_HOST     0x80
+#define MWL8K_AP_RX_CTRL_OWNED_BY_HOST          0x80
 
-/* 8366 AP rx_status bits */
-#define MWL8K_8366_AP_RXSTAT_DECRYPT_ERR_MASK           0x80
-#define MWL8K_8366_AP_RXSTAT_GENERAL_DECRYPT_ERR        0xFF
-#define MWL8K_8366_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR       0x02
-#define MWL8K_8366_AP_RXSTAT_WEP_DECRYPT_ICV_ERR        0x04
-#define MWL8K_8366_AP_RXSTAT_TKIP_DECRYPT_ICV_ERR       0x08
+/* 8366/8764 AP rx_status bits */
+#define MWL8K_AP_RXSTAT_DECRYPT_ERR_MASK                0x80
+#define MWL8K_AP_RXSTAT_GENERAL_DECRYPT_ERR             0xFF
+#define MWL8K_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR            0x02
+#define MWL8K_AP_RXSTAT_WEP_DECRYPT_ICV_ERR             0x04
+#define MWL8K_AP_RXSTAT_TKIP_DECRYPT_ICV_ERR            0x08
 
-static void mwl8k_rxd_8366_ap_init(void *_rxd, dma_addr_t next_dma_addr)
+static void mwl8k_rxd_ap_init(void *_rxd, dma_addr_t next_dma_addr)
 {
-        struct mwl8k_rxd_8366_ap *rxd = _rxd;
+        struct mwl8k_rxd_ap *rxd = _rxd;
 
         rxd->next_rxd_phys_addr = cpu_to_le32(next_dma_addr);
-        rxd->rx_ctrl = MWL8K_8366_AP_RX_CTRL_OWNED_BY_HOST;
+        rxd->rx_ctrl = MWL8K_AP_RX_CTRL_OWNED_BY_HOST;
 }
 
-static void mwl8k_rxd_8366_ap_refill(void *_rxd, dma_addr_t addr, int len)
+static void mwl8k_rxd_ap_refill(void *_rxd, dma_addr_t addr, int len)
 {
-        struct mwl8k_rxd_8366_ap *rxd = _rxd;
+        struct mwl8k_rxd_ap *rxd = _rxd;
 
         rxd->pkt_len = cpu_to_le16(len);
         rxd->pkt_phys_addr = cpu_to_le32(addr);
@@ -960,12 +968,12 @@ static void mwl8k_rxd_8366_ap_refill(void *_rxd, dma_addr_t addr, int len)
 }
 
 static int
-mwl8k_rxd_8366_ap_process(void *_rxd, struct ieee80211_rx_status *status,
-                          __le16 *qos, s8 *noise)
+mwl8k_rxd_ap_process(void *_rxd, struct ieee80211_rx_status *status,
+                     __le16 *qos, s8 *noise)
 {
-        struct mwl8k_rxd_8366_ap *rxd = _rxd;
+        struct mwl8k_rxd_ap *rxd = _rxd;
 
-        if (!(rxd->rx_ctrl & MWL8K_8366_AP_RX_CTRL_OWNED_BY_HOST))
+        if (!(rxd->rx_ctrl & MWL8K_AP_RX_CTRL_OWNED_BY_HOST))
                 return -1;
         rmb();
 
@@ -974,11 +982,11 @@ mwl8k_rxd_8366_ap_process(void *_rxd, struct ieee80211_rx_status *status,
         status->signal = -rxd->rssi;
         *noise = -rxd->noise_floor;
 
-        if (rxd->rate & MWL8K_8366_AP_RATE_INFO_MCS_FORMAT) {
+        if (rxd->rate & MWL8K_AP_RATE_INFO_MCS_FORMAT) {
                 status->flag |= RX_FLAG_HT;
-                if (rxd->rate & MWL8K_8366_AP_RATE_INFO_40MHZ)
+                if (rxd->rate & MWL8K_AP_RATE_INFO_40MHZ)
                         status->flag |= RX_FLAG_40MHZ;
-                status->rate_idx = MWL8K_8366_AP_RATE_INFO_RATEID(rxd->rate);
+                status->rate_idx = MWL8K_AP_RATE_INFO_RATEID(rxd->rate);
         } else {
                 int i;
 
@@ -1002,19 +1010,19 @@ mwl8k_rxd_8366_ap_process(void *_rxd, struct ieee80211_rx_status *status,
 
         *qos = rxd->qos_control;
 
-        if ((rxd->rx_status != MWL8K_8366_AP_RXSTAT_GENERAL_DECRYPT_ERR) &&
-            (rxd->rx_status & MWL8K_8366_AP_RXSTAT_DECRYPT_ERR_MASK) &&
-            (rxd->rx_status & MWL8K_8366_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR))
+        if ((rxd->rx_status != MWL8K_AP_RXSTAT_GENERAL_DECRYPT_ERR) &&
+            (rxd->rx_status & MWL8K_AP_RXSTAT_DECRYPT_ERR_MASK) &&
+            (rxd->rx_status & MWL8K_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR))
                 status->flag |= RX_FLAG_MMIC_ERROR;
 
         return le16_to_cpu(rxd->pkt_len);
 }
 
-static struct rxd_ops rxd_8366_ap_ops = {
-        .rxd_size       = sizeof(struct mwl8k_rxd_8366_ap),
-        .rxd_init       = mwl8k_rxd_8366_ap_init,
-        .rxd_refill     = mwl8k_rxd_8366_ap_refill,
-        .rxd_process    = mwl8k_rxd_8366_ap_process,
+static struct rxd_ops rxd_ap_ops = {
+        .rxd_size       = sizeof(struct mwl8k_rxd_ap),
+        .rxd_init       = mwl8k_rxd_ap_init,
+        .rxd_refill     = mwl8k_rxd_ap_refill,
+        .rxd_process    = mwl8k_rxd_ap_process,
 };
 
 /*
@@ -2401,6 +2409,9 @@ mwl8k_set_caps(struct ieee80211_hw *hw, u32 caps)
 {
         struct mwl8k_priv *priv = hw->priv;
 
+        if (priv->caps)
+                return;
+
         if ((caps & MWL8K_CAP_2GHZ4) || !(caps & MWL8K_CAP_BAND_MASK)) {
                 mwl8k_setup_2ghz_band(hw);
                 if (caps & MWL8K_CAP_MIMO)
@@ -2412,6 +2423,8 @@ mwl8k_set_caps(struct ieee80211_hw *hw, u32 caps)
                 if (caps & MWL8K_CAP_MIMO)
                         mwl8k_set_ht_caps(hw, &priv->band_50, caps);
         }
+
+        priv->caps = caps;
 }
 
 static int mwl8k_cmd_get_hw_spec_sta(struct ieee80211_hw *hw)
@@ -2837,7 +2850,9 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,
                                      struct ieee80211_conf *conf,
                                      unsigned short pwr)
 {
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&conf->chandef);
         struct mwl8k_cmd_tx_power *cmd;
         int rc;
         int i;
@@ -2857,14 +2872,14 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,
 
         cmd->channel = cpu_to_le16(channel->hw_value);
 
-        if (conf->channel_type == NL80211_CHAN_NO_HT ||
-            conf->channel_type == NL80211_CHAN_HT20) {
+        if (channel_type == NL80211_CHAN_NO_HT ||
+            channel_type == NL80211_CHAN_HT20) {
                 cmd->bw = cpu_to_le16(0x2);
         } else {
                 cmd->bw = cpu_to_le16(0x4);
-                if (conf->channel_type == NL80211_CHAN_HT40MINUS)
+                if (channel_type == NL80211_CHAN_HT40MINUS)
                         cmd->sub_ch = cpu_to_le16(0x3);
-                else if (conf->channel_type == NL80211_CHAN_HT40PLUS)
+                else if (channel_type == NL80211_CHAN_HT40PLUS)
                         cmd->sub_ch = cpu_to_le16(0x1);
         }
 
@@ -3008,7 +3023,9 @@ struct mwl8k_cmd_set_rf_channel {
 static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
                                     struct ieee80211_conf *conf)
 {
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&conf->chandef);
         struct mwl8k_cmd_set_rf_channel *cmd;
         int rc;
 
@@ -3026,12 +3043,12 @@ static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
         else if (channel->band == IEEE80211_BAND_5GHZ)
                 cmd->channel_flags |= cpu_to_le32(0x00000004);
 
-        if (conf->channel_type == NL80211_CHAN_NO_HT ||
-            conf->channel_type == NL80211_CHAN_HT20)
+        if (channel_type == NL80211_CHAN_NO_HT ||
+            channel_type == NL80211_CHAN_HT20)
                 cmd->channel_flags |= cpu_to_le32(0x00000080);
-        else if (conf->channel_type == NL80211_CHAN_HT40MINUS)
+        else if (channel_type == NL80211_CHAN_HT40MINUS)
                 cmd->channel_flags |= cpu_to_le32(0x000001900);
-        else if (conf->channel_type == NL80211_CHAN_HT40PLUS)
+        else if (channel_type == NL80211_CHAN_HT40PLUS)
                 cmd->channel_flags |= cpu_to_le32(0x000000900);
 
         rc = mwl8k_post_cmd(hw, &cmd->header);
@@ -3064,11 +3081,11 @@ static void legacy_rate_mask_to_array(u8 *rates, u32 mask)
         int j;
 
         /*
-         * Clear nonstandard rates 4 and 13.
+         * Clear nonstandard rate 4.
          */
         mask &= 0x1fef;
 
-        for (i = 0, j = 0; i < 14; i++) {
+        for (i = 0, j = 0; i < 13; i++) {
                 if (mask & (1 << i))
                         rates[j++] = mwl8k_rates_24[i].hw_value;
         }
@@ -3950,7 +3967,7 @@ static int mwl8k_cmd_set_new_stn_add(struct ieee80211_hw *hw,
         memcpy(cmd->mac_addr, sta->addr, ETH_ALEN);
         cmd->stn_id = cpu_to_le16(sta->aid);
         cmd->action = cpu_to_le16(MWL8K_STA_ACTION_ADD);
-        if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+        if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                 rates = sta->supp_rates[IEEE80211_BAND_2GHZ];
         else
                 rates = sta->supp_rates[IEEE80211_BAND_5GHZ] << 5;
@@ -4385,7 +4402,7 @@ static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,
         p->ht_caps = cpu_to_le16(sta->ht_cap.cap);
         p->extended_ht_caps = (sta->ht_cap.ampdu_factor & 3) |
                 ((sta->ht_cap.ampdu_density & 7) << 2);
-        if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+        if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                 rates = sta->supp_rates[IEEE80211_BAND_2GHZ];
         else
                 rates = sta->supp_rates[IEEE80211_BAND_5GHZ] << 5;
@@ -4792,16 +4809,14 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
         struct mwl8k_priv *priv = hw->priv;
         int rc;
 
-        if (conf->flags & IEEE80211_CONF_IDLE) {
-                mwl8k_cmd_radio_disable(hw);
-                return 0;
-        }
-
         rc = mwl8k_fw_lock(hw);
         if (rc)
                 return rc;
 
-        rc = mwl8k_cmd_radio_enable(hw);
+        if (conf->flags & IEEE80211_CONF_IDLE)
+                rc = mwl8k_cmd_radio_disable(hw);
+        else
+                rc = mwl8k_cmd_radio_enable(hw);
         if (rc)
                 goto out;
 
@@ -4868,7 +4883,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         goto out;
                 }
 
-                if (hw->conf.channel->band == IEEE80211_BAND_2GHZ) {
+                if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ) {
                         ap_legacy_rates = ap->supp_rates[IEEE80211_BAND_2GHZ];
                 } else {
                         ap_legacy_rates =
@@ -4900,7 +4915,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         if (idx)
                                 idx--;
 
-                        if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+                        if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                                 rate = mwl8k_rates_24[idx].hw_value;
                         else
                                 rate = mwl8k_rates_50[idx].hw_value;
@@ -4973,7 +4988,7 @@ mwl8k_bss_info_changed_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 if (idx)
                         idx--;
 
-                if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+                if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                         rate = mwl8k_rates_24[idx].hw_value;
                 else
                         rate = mwl8k_rates_50[idx].hw_value;
@@ -5246,7 +5261,7 @@ static int mwl8k_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = SURVEY_INFO_NOISE_DBM;
         survey->noise = priv->noise;
 
@@ -5429,12 +5444,17 @@ enum {
         MWL8363 = 0,
         MWL8687,
         MWL8366,
+        MWL8764,
 };
 
 #define MWL8K_8366_AP_FW_API 3
 #define _MWL8K_8366_AP_FW(api) "mwl8k/fmimage_8366_ap-" #api ".fw"
 #define MWL8K_8366_AP_FW(api) _MWL8K_8366_AP_FW(api)
 
+#define MWL8K_8764_AP_FW_API 1
+#define _MWL8K_8764_AP_FW(api) "mwl8k/fmimage_8764_ap-" #api ".fw"
+#define MWL8K_8764_AP_FW(api) _MWL8K_8764_AP_FW(api)
+
 static struct mwl8k_device_info mwl8k_info_tbl[] = {
         [MWL8363] = {
                 .part_name      = "88w8363",
@@ -5452,7 +5472,13 @@ static struct mwl8k_device_info mwl8k_info_tbl[] = {
                 .fw_image_sta   = "mwl8k/fmimage_8366.fw",
                 .fw_image_ap    = MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API),
                 .fw_api_ap      = MWL8K_8366_AP_FW_API,
-                .ap_rxd_ops     = &rxd_8366_ap_ops,
+                .ap_rxd_ops     = &rxd_ap_ops,
+        },
+        [MWL8764] = {
+                .part_name      = "88w8764",
+                .fw_image_ap    = MWL8K_8764_AP_FW(MWL8K_8764_AP_FW_API),
+                .fw_api_ap      = MWL8K_8764_AP_FW_API,
+                .ap_rxd_ops     = &rxd_ap_ops,
         },
 };
 
@@ -5474,6 +5500,7 @@ static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
         { PCI_VDEVICE(MARVELL, 0x2a41), .driver_data = MWL8366, },
         { PCI_VDEVICE(MARVELL, 0x2a42), .driver_data = MWL8366, },
         { PCI_VDEVICE(MARVELL, 0x2a43), .driver_data = MWL8366, },
+        { PCI_VDEVICE(MARVELL, 0x2b36), .driver_data = MWL8764, },
         { },
 };
 MODULE_DEVICE_TABLE(pci, mwl8k_pci_id_table);
@@ -5995,6 +6022,8 @@ static int mwl8k_probe(struct pci_dev *pdev,
         priv->pdev = pdev;
         priv->device_info = &mwl8k_info_tbl[id->driver_data];
 
+        if (id->driver_data == MWL8764)
+                priv->is_8764 = true;
 
         priv->sram = pci_iomap(pdev, 0, 0x10000);
         if (priv->sram == NULL) {
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 7744f42de1ea..1f9cb55c3360 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1584,7 +1584,7 @@ static int ezusb_probe(struct usb_interface *interface,
         struct ezusb_priv *upriv = NULL;
         struct usb_interface_descriptor *iface_desc;
         struct usb_endpoint_descriptor *ep;
-        const struct firmware *fw_entry;
+        const struct firmware *fw_entry = NULL;
         int retval = 0;
         int i;
 
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 9ba85106eec0..b3879fbf5368 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -402,7 +402,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
         struct p54_rssi_db_entry *rssi_data;
         unsigned int i;
         void *entry;
-        __le16 freq = cpu_to_le16(priv->hw->conf.channel->center_freq);
+        __le16 freq = cpu_to_le16(priv->hw->conf.chandef.chan->center_freq);
 
         skb = p54_alloc_skb(priv, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*head) +
                             2 + sizeof(*iq_autocal) + sizeof(*body) +
@@ -532,7 +532,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
 err:
         wiphy_err(priv->hw->wiphy, "frequency change to channel %d failed.\n",
                   ieee80211_frequency_to_channel(
-                          priv->hw->conf.channel->center_freq));
+                          priv->hw->conf.chandef.chan->center_freq));
 
         dev_kfree_skb_any(skb);
         return -EINVAL;
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index aadda99989c0..067e6f2fd050 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -340,7 +340,7 @@ static int p54_config(struct ieee80211_hw *dev, u32 changed)
                  * TODO: Use the LM_SCAN_TRAP to determine the current
                  * operating channel.
                  */
-                priv->curchan = priv->hw->conf.channel;
+                priv->curchan = priv->hw->conf.chandef.chan;
                 p54_reset_stats(priv);
                 WARN_ON(p54_fetch_statistics(priv));
         }
@@ -480,7 +480,7 @@ static void p54_bss_info_changed(struct ieee80211_hw *dev,
                 p54_set_edcf(priv);
         }
         if (changed & BSS_CHANGED_BASIC_RATES) {
-                if (dev->conf.channel->band == IEEE80211_BAND_5GHZ)
+                if (dev->conf.chandef.chan->band == IEEE80211_BAND_5GHZ)
                         priv->basic_rate_mask = (info->basic_rates << 4);
                 else
                         priv->basic_rate_mask = info->basic_rates;
@@ -670,7 +670,7 @@ static unsigned int p54_flush_count(struct p54_common *priv)
         return total;
 }
 
-static void p54_flush(struct ieee80211_hw *dev, bool drop)
+static void p54_flush(struct ieee80211_hw *dev, u32 queues, bool drop)
 {
         struct p54_common *priv = dev->priv;
         unsigned int total, i;
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 4fd49a007b51..978e7eb26567 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -396,7 +396,7 @@ static int p54spi_rx(struct p54s_priv *priv)
 static irqreturn_t p54spi_interrupt(int irq, void *config)
 {
         struct spi_device *spi = config;
-        struct p54s_priv *priv = dev_get_drvdata(&spi->dev);
+        struct p54s_priv *priv = spi_get_drvdata(spi);
 
         ieee80211_queue_work(priv->hw, &priv->work);
 
@@ -609,7 +609,7 @@ static int p54spi_probe(struct spi_device *spi)
 
         priv = hw->priv;
         priv->hw = hw;
-        dev_set_drvdata(&spi->dev, priv);
+        spi_set_drvdata(spi, priv);
         priv->spi = spi;
 
         spi->bits_per_word = 16;
@@ -685,7 +685,7 @@ err_free:
 
 static int p54spi_remove(struct spi_device *spi)
 {
-        struct p54s_priv *priv = dev_get_drvdata(&spi->dev);
+        struct p54s_priv *priv = spi_get_drvdata(spi);
 
         p54_unregister_common(priv->hw);
 
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 12f0a34477f2..f95de0d16216 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -354,13 +354,13 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb)
         rx_status->signal = p54_rssi_to_dbm(priv, hdr->rssi);
         if (hdr->rate & 0x10)
                 rx_status->flag |= RX_FLAG_SHORTPRE;
-        if (priv->hw->conf.channel->band == IEEE80211_BAND_5GHZ)
+        if (priv->hw->conf.chandef.chan->band == IEEE80211_BAND_5GHZ)
                 rx_status->rate_idx = (rate < 4) ? 0 : rate - 4;
         else
                 rx_status->rate_idx = rate;
 
         rx_status->freq = freq;
-        rx_status->band =  priv->hw->conf.channel->band;
+        rx_status->band =  priv->hw->conf.chandef.chan->band;
         rx_status->antenna = hdr->antenna;
 
         tsf32 = le32_to_cpu(hdr->tsf32);
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 3109c0db66e1..ebada812b3a5 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -144,7 +144,7 @@ static int psm;
 static char *essid;
 
 /* Default to encapsulation unless translation requested */
-static int translate = 1;
+static bool translate = 1;
 
 static int country = USA;
 
@@ -178,7 +178,7 @@ module_param(hop_dwell, int, 0);
 module_param(beacon_period, int, 0);
 module_param(psm, int, 0);
 module_param(essid, charp, 0);
-module_param(translate, int, 0);
+module_param(translate, bool, 0);
 module_param(country, int, 0);
 module_param(sniffer, int, 0);
 module_param(bc, int, 0);
@@ -953,7 +953,7 @@ static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx,
                            unsigned char *data, int len)
 {
         __be16 proto = ((struct ethhdr *)data)->h_proto;
-        if (ntohs(proto) >= 1536) { /* DIX II ethernet frame */
+        if (ntohs(proto) >= ETH_P_802_3_MIN) { /* DIX II ethernet frame */
                 pr_debug("ray_cs translate_frame DIX II\n");
                 /* Copy LLC header to card buffer */
                 memcpy_toio(&ptx->var, eth2_llc, sizeof(eth2_llc));
@@ -1353,7 +1353,7 @@ static int ray_get_range(struct net_device *dev, struct iw_request_info *info,
 static int ray_set_framing(struct net_device *dev, struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra)
 {
-        translate = *(extra);   /* Set framing mode */
+        translate = !!*(extra); /* Set framing mode */
 
         return 0;
 }
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 525fd7521dff..8169a85c4498 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2,7 +2,7 @@
  * Driver for RNDIS based wireless USB devices.
  *
  * Copyright (C) 2007 by Bjorge Dijkstra <bjd@jooz.net>
- * Copyright (C) 2008-2009 by Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
+ * Copyright (C) 2008-2009 by Jussi Kivilinna <jussi.kivilinna@iki.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2839,8 +2839,7 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
         } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
                 cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
 
-        if (info != NULL)
-                kfree(info);
+        kfree(info);
 
         priv->connected = true;
         memcpy(priv->bssid, bssid, ETH_ALEN);
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 76cd47eb901e..9b915d3a44be 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -173,6 +173,13 @@ config RT2800USB_RT53XX
          rt2800usb driver.
          Supported chips: RT5370
 
+config RT2800USB_RT55XX
+       bool "rt2800usb - Include support for rt55xx devices (EXPERIMENTAL)"
+       ---help---
+         This adds support for rt55xx wireless chipset family to the
+         rt2800usb driver.
+         Supported chips: RT5572
+
 config RT2800USB_UNKNOWN
         bool "rt2800usb - Include support for unknown (USB) devices"
         default n
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index dcfb54e0c516..f7143733d7e9 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -41,7 +41,7 @@
 /*
  * Register access.
  * All access to the CSR registers will go through the methods
- * rt2x00pci_register_read and rt2x00pci_register_write.
+ * rt2x00mmio_register_read and rt2x00mmio_register_write.
  * BBP and RF register require indirect register access,
  * and use the CSR registers BBPCSR and RFCSR to achieve this.
  * These indirect registers work with busy bits,
@@ -52,9 +52,9 @@
  * and we will print an error.
  */
 #define WAIT_FOR_BBP(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), BBPCSR, BBPCSR_BUSY, (__reg))
+        rt2x00mmio_regbusy_read((__dev), BBPCSR, BBPCSR_BUSY, (__reg))
 #define WAIT_FOR_RF(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), RFCSR, RFCSR_BUSY, (__reg))
+        rt2x00mmio_regbusy_read((__dev), RFCSR, RFCSR_BUSY, (__reg))
 
 static void rt2400pci_bbp_write(struct rt2x00_dev *rt2x00dev,
                                 const unsigned int word, const u8 value)
@@ -74,7 +74,7 @@ static void rt2400pci_bbp_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBPCSR_BUSY, 1);
                 rt2x00_set_field32(&reg, BBPCSR_WRITE_CONTROL, 1);
 
-                rt2x00pci_register_write(rt2x00dev, BBPCSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, BBPCSR, reg);
         }
 
         mutex_unlock(&rt2x00dev->csr_mutex);
@@ -101,7 +101,7 @@ static void rt2400pci_bbp_read(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBPCSR_BUSY, 1);
                 rt2x00_set_field32(&reg, BBPCSR_WRITE_CONTROL, 0);
 
-                rt2x00pci_register_write(rt2x00dev, BBPCSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, BBPCSR, reg);
 
                 WAIT_FOR_BBP(rt2x00dev, &reg);
         }
@@ -129,7 +129,7 @@ static void rt2400pci_rf_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, RFCSR_IF_SELECT, 0);
                 rt2x00_set_field32(&reg, RFCSR_BUSY, 1);
 
-                rt2x00pci_register_write(rt2x00dev, RFCSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, RFCSR, reg);
                 rt2x00_rf_write(rt2x00dev, word, value);
         }
 
@@ -141,7 +141,7 @@ static void rt2400pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
         struct rt2x00_dev *rt2x00dev = eeprom->data;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR21, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR21, &reg);
 
         eeprom->reg_data_in = !!rt2x00_get_field32(reg, CSR21_EEPROM_DATA_IN);
         eeprom->reg_data_out = !!rt2x00_get_field32(reg, CSR21_EEPROM_DATA_OUT);
@@ -163,15 +163,15 @@ static void rt2400pci_eepromregister_write(struct eeprom_93cx6 *eeprom)
         rt2x00_set_field32(&reg, CSR21_EEPROM_CHIP_SELECT,
                            !!eeprom->reg_chip_select);
 
-        rt2x00pci_register_write(rt2x00dev, CSR21, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR21, reg);
 }
 
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
 static const struct rt2x00debug rt2400pci_rt2x00debug = {
         .owner  = THIS_MODULE,
         .csr    = {
-                .read           = rt2x00pci_register_read,
-                .write          = rt2x00pci_register_write,
+                .read           = rt2x00mmio_register_read,
+                .write          = rt2x00mmio_register_write,
                 .flags          = RT2X00DEBUGFS_OFFSET,
                 .word_base      = CSR_REG_BASE,
                 .word_size      = sizeof(u32),
@@ -205,7 +205,7 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, GPIOCSR, &reg);
         return rt2x00_get_field32(reg, GPIOCSR_VAL0);
 }
 
@@ -218,14 +218,14 @@ static void rt2400pci_brightness_set(struct led_classdev *led_cdev,
         unsigned int enabled = brightness != LED_OFF;
         u32 reg;
 
-        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00mmio_register_read(led->rt2x00dev, LEDCSR, &reg);
 
         if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
                 rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
         else if (led->type == LED_TYPE_ACTIVITY)
                 rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);
 
-        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+        rt2x00mmio_register_write(led->rt2x00dev, LEDCSR, reg);
 }
 
 static int rt2400pci_blink_set(struct led_classdev *led_cdev,
@@ -236,10 +236,10 @@ static int rt2400pci_blink_set(struct led_classdev *led_cdev,
             container_of(led_cdev, struct rt2x00_led, led_dev);
         u32 reg;
 
-        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00mmio_register_read(led->rt2x00dev, LEDCSR, &reg);
         rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);
         rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);
-        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+        rt2x00mmio_register_write(led->rt2x00dev, LEDCSR, reg);
 
         return 0;
 }
@@ -269,7 +269,7 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev,
          * Note that the version error will always be dropped
          * since there is no filter for it at this time.
          */
-        rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR0, &reg);
         rt2x00_set_field32(&reg, RXCSR0_DROP_CRC,
                            !(filter_flags & FIF_FCSFAIL));
         rt2x00_set_field32(&reg, RXCSR0_DROP_PHYSICAL,
@@ -282,7 +282,7 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev,
                            !(filter_flags & FIF_PROMISC_IN_BSS) &&
                            !rt2x00dev->intf_ap_count);
         rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
-        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
 }
 
 static void rt2400pci_config_intf(struct rt2x00_dev *rt2x00dev,
@@ -298,25 +298,26 @@ static void rt2400pci_config_intf(struct rt2x00_dev *rt2x00dev,
                  * Enable beacon config
                  */
                 bcn_preload = PREAMBLE + GET_DURATION(IEEE80211_HEADER, 20);
-                rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
+                rt2x00mmio_register_read(rt2x00dev, BCNCSR1, &reg);
                 rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, bcn_preload);
-                rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+                rt2x00mmio_register_write(rt2x00dev, BCNCSR1, reg);
 
                 /*
                  * Enable synchronisation.
                  */
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
                 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
-                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
         }
 
         if (flags & CONFIG_UPDATE_MAC)
-                rt2x00pci_register_multiwrite(rt2x00dev, CSR3,
-                                              conf->mac, sizeof(conf->mac));
+                rt2x00mmio_register_multiwrite(rt2x00dev, CSR3,
+                                               conf->mac, sizeof(conf->mac));
 
         if (flags & CONFIG_UPDATE_BSSID)
-                rt2x00pci_register_multiwrite(rt2x00dev, CSR5,
-                                              conf->bssid, sizeof(conf->bssid));
+                rt2x00mmio_register_multiwrite(rt2x00dev, CSR5,
+                                               conf->bssid,
+                                               sizeof(conf->bssid));
 }
 
 static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev,
@@ -332,68 +333,68 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev,
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                 preamble_mask = erp->short_preamble << 3;
 
-                rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR1, &reg);
                 rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT, 0x1ff);
                 rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME, 0x13a);
                 rt2x00_set_field32(&reg, TXCSR1_TSF_OFFSET, IEEE80211_HEADER);
                 rt2x00_set_field32(&reg, TXCSR1_AUTORESPONDER, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR1, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR2, &reg);
                 rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00);
                 rt2x00_set_field32(&reg, ARCSR2_SERVICE, 0x04);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 10));
-                rt2x00pci_register_write(rt2x00dev, ARCSR2, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR2, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR3, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR3, &reg);
                 rt2x00_set_field32(&reg, ARCSR3_SIGNAL, 0x01 | preamble_mask);
                 rt2x00_set_field32(&reg, ARCSR3_SERVICE, 0x04);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 20));
-                rt2x00pci_register_write(rt2x00dev, ARCSR3, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR3, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR4, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR4, &reg);
                 rt2x00_set_field32(&reg, ARCSR4_SIGNAL, 0x02 | preamble_mask);
                 rt2x00_set_field32(&reg, ARCSR4_SERVICE, 0x04);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 55));
-                rt2x00pci_register_write(rt2x00dev, ARCSR4, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR4, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR5, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR5, &reg);
                 rt2x00_set_field32(&reg, ARCSR5_SIGNAL, 0x03 | preamble_mask);
                 rt2x00_set_field32(&reg, ARCSR5_SERVICE, 0x84);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 110));
-                rt2x00pci_register_write(rt2x00dev, ARCSR5, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR5, reg);
         }
 
         if (changed & BSS_CHANGED_BASIC_RATES)
-                rt2x00pci_register_write(rt2x00dev, ARCSR1, erp->basic_rates);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR1, erp->basic_rates);
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
-                rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR11, &reg);
                 rt2x00_set_field32(&reg, CSR11_SLOT_TIME, erp->slot_time);
-                rt2x00pci_register_write(rt2x00dev, CSR11, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR11, reg);
 
-                rt2x00pci_register_read(rt2x00dev, CSR18, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR18, &reg);
                 rt2x00_set_field32(&reg, CSR18_SIFS, erp->sifs);
                 rt2x00_set_field32(&reg, CSR18_PIFS, erp->pifs);
-                rt2x00pci_register_write(rt2x00dev, CSR18, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR18, reg);
 
-                rt2x00pci_register_read(rt2x00dev, CSR19, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR19, &reg);
                 rt2x00_set_field32(&reg, CSR19_DIFS, erp->difs);
                 rt2x00_set_field32(&reg, CSR19_EIFS, erp->eifs);
-                rt2x00pci_register_write(rt2x00dev, CSR19, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR19, reg);
         }
 
         if (changed & BSS_CHANGED_BEACON_INT) {
-                rt2x00pci_register_read(rt2x00dev, CSR12, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR12, &reg);
                 rt2x00_set_field32(&reg, CSR12_BEACON_INTERVAL,
                                    erp->beacon_int * 16);
                 rt2x00_set_field32(&reg, CSR12_CFP_MAX_DURATION,
                                    erp->beacon_int * 16);
-                rt2x00pci_register_write(rt2x00dev, CSR12, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR12, reg);
         }
 }
 
@@ -497,7 +498,7 @@ static void rt2400pci_config_channel(struct rt2x00_dev *rt2x00dev,
         /*
          * Clear false CRC during channel switch.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT0, &rf->rf1);
+        rt2x00mmio_register_read(rt2x00dev, CNT0, &rf->rf1);
 }
 
 static void rt2400pci_config_txpower(struct rt2x00_dev *rt2x00dev, int txpower)
@@ -510,12 +511,12 @@ static void rt2400pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR11, &reg);
         rt2x00_set_field32(&reg, CSR11_LONG_RETRY,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, CSR11_SHORT_RETRY,
                            libconf->conf->short_frame_max_tx_count);
-        rt2x00pci_register_write(rt2x00dev, CSR11, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR11, reg);
 }
 
 static void rt2400pci_config_ps(struct rt2x00_dev *rt2x00dev,
@@ -527,7 +528,7 @@ static void rt2400pci_config_ps(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         if (state == STATE_SLEEP) {
-                rt2x00pci_register_read(rt2x00dev, CSR20, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR20, &reg);
                 rt2x00_set_field32(&reg, CSR20_DELAY_AFTER_TBCN,
                                    (rt2x00dev->beacon_int - 20) * 16);
                 rt2x00_set_field32(&reg, CSR20_TBCN_BEFORE_WAKEUP,
@@ -535,14 +536,14 @@ static void rt2400pci_config_ps(struct rt2x00_dev *rt2x00dev,
 
                 /* We must first disable autowake before it can be enabled */
                 rt2x00_set_field32(&reg, CSR20_AUTOWAKE, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR20, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR20, reg);
 
                 rt2x00_set_field32(&reg, CSR20_AUTOWAKE, 1);
-                rt2x00pci_register_write(rt2x00dev, CSR20, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR20, reg);
         } else {
-                rt2x00pci_register_read(rt2x00dev, CSR20, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR20, &reg);
                 rt2x00_set_field32(&reg, CSR20_AUTOWAKE, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR20, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR20, reg);
         }
 
         rt2x00dev->ops->lib->set_device_state(rt2x00dev, state);
@@ -568,10 +569,10 @@ static void rt2400pci_config_cw(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR11, &reg);
         rt2x00_set_field32(&reg, CSR11_CWMIN, cw_min);
         rt2x00_set_field32(&reg, CSR11_CWMAX, cw_max);
-        rt2x00pci_register_write(rt2x00dev, CSR11, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR11, reg);
 }
 
 /*
@@ -586,7 +587,7 @@ static void rt2400pci_link_stats(struct rt2x00_dev *rt2x00dev,
         /*
          * Update FCS error count from register.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT0, &reg);
         qual->rx_failed = rt2x00_get_field32(reg, CNT0_FCS_ERROR);
 
         /*
@@ -641,16 +642,16 @@ static void rt2400pci_start_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, RXCSR0, &reg);
                 rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX, 0);
-                rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
                 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
                 rt2x00_set_field32(&reg, CSR14_TBCN, 1);
                 rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
-                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
                 break;
         default:
                 break;
@@ -664,19 +665,19 @@ static void rt2400pci_kick_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_AC_VO:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         case QID_AC_VI:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_KICK_TX, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         case QID_ATIM:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         default:
                 break;
@@ -692,21 +693,21 @@ static void rt2400pci_stop_queue(struct data_queue *queue)
         case QID_AC_VO:
         case QID_AC_VI:
         case QID_ATIM:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, RXCSR0, &reg);
                 rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX, 1);
-                rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
                 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
                 rt2x00_set_field32(&reg, CSR14_TBCN, 0);
                 rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 
                 /*
                  * Wait for possibly running tbtt tasklets.
@@ -723,7 +724,7 @@ static void rt2400pci_stop_queue(struct data_queue *queue)
  */
 static bool rt2400pci_get_entry_state(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word;
 
         if (entry->queue->qid == QID_RX) {
@@ -740,7 +741,7 @@ static bool rt2400pci_get_entry_state(struct queue_entry *entry)
 
 static void rt2400pci_clear_entry(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
         u32 word;
 
@@ -766,53 +767,53 @@ static void rt2400pci_clear_entry(struct queue_entry *entry)
 
 static int rt2400pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         u32 reg;
 
         /*
          * Initialize registers.
          */
-        rt2x00pci_register_read(rt2x00dev, TXCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR2, &reg);
         rt2x00_set_field32(&reg, TXCSR2_TXD_SIZE, rt2x00dev->tx[0].desc_size);
         rt2x00_set_field32(&reg, TXCSR2_NUM_TXD, rt2x00dev->tx[1].limit);
         rt2x00_set_field32(&reg, TXCSR2_NUM_ATIM, rt2x00dev->atim->limit);
         rt2x00_set_field32(&reg, TXCSR2_NUM_PRIO, rt2x00dev->tx[0].limit);
-        rt2x00pci_register_write(rt2x00dev, TXCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR2, reg);
 
         entry_priv = rt2x00dev->tx[1].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR3, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR3, &reg);
         rt2x00_set_field32(&reg, TXCSR3_TX_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR3, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR3, reg);
 
         entry_priv = rt2x00dev->tx[0].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR5, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR5, &reg);
         rt2x00_set_field32(&reg, TXCSR5_PRIO_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR5, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR5, reg);
 
         entry_priv = rt2x00dev->atim->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR4, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR4, &reg);
         rt2x00_set_field32(&reg, TXCSR4_ATIM_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR4, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR4, reg);
 
         entry_priv = rt2x00dev->bcn->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR6, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR6, &reg);
         rt2x00_set_field32(&reg, TXCSR6_BEACON_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR6, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR6, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RXCSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR1, &reg);
         rt2x00_set_field32(&reg, RXCSR1_RXD_SIZE, rt2x00dev->rx->desc_size);
         rt2x00_set_field32(&reg, RXCSR1_NUM_RXD, rt2x00dev->rx->limit);
-        rt2x00pci_register_write(rt2x00dev, RXCSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR1, reg);
 
         entry_priv = rt2x00dev->rx->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, RXCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR2, &reg);
         rt2x00_set_field32(&reg, RXCSR2_RX_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, RXCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR2, reg);
 
         return 0;
 }
@@ -821,23 +822,23 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2x00pci_register_write(rt2x00dev, PSCSR0, 0x00020002);
-        rt2x00pci_register_write(rt2x00dev, PSCSR1, 0x00000002);
-        rt2x00pci_register_write(rt2x00dev, PSCSR2, 0x00023f20);
-        rt2x00pci_register_write(rt2x00dev, PSCSR3, 0x00000002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR0, 0x00020002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR1, 0x00000002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR2, 0x00023f20);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR3, 0x00000002);
 
-        rt2x00pci_register_read(rt2x00dev, TIMECSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TIMECSR, &reg);
         rt2x00_set_field32(&reg, TIMECSR_US_COUNT, 33);
         rt2x00_set_field32(&reg, TIMECSR_US_64_COUNT, 63);
         rt2x00_set_field32(&reg, TIMECSR_BEACON_EXPECT, 0);
-        rt2x00pci_register_write(rt2x00dev, TIMECSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, TIMECSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR9, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR9, &reg);
         rt2x00_set_field32(&reg, CSR9_MAX_FRAME_UNIT,
                            (rt2x00dev->rx->data_size / 128));
-        rt2x00pci_register_write(rt2x00dev, CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR9, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
         rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
         rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);
         rt2x00_set_field32(&reg, CSR14_TBCN, 0);
@@ -846,63 +847,63 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
         rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);
         rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 
-        rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000);
+        rt2x00mmio_register_write(rt2x00dev, CNT3, 0x3f080000);
 
-        rt2x00pci_register_read(rt2x00dev, ARCSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, ARCSR0, &reg);
         rt2x00_set_field32(&reg, ARCSR0_AR_BBP_DATA0, 133);
         rt2x00_set_field32(&reg, ARCSR0_AR_BBP_ID0, 134);
         rt2x00_set_field32(&reg, ARCSR0_AR_BBP_DATA1, 136);
         rt2x00_set_field32(&reg, ARCSR0_AR_BBP_ID1, 135);
-        rt2x00pci_register_write(rt2x00dev, ARCSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, ARCSR0, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RXCSR3, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR3, &reg);
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID0, 3); /* Tx power.*/
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID0_VALID, 1);
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID1, 32); /* Signal */
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID1_VALID, 1);
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID2, 36); /* Rssi */
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID2_VALID, 1);
-        rt2x00pci_register_write(rt2x00dev, RXCSR3, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR3, reg);
 
-        rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0x3f3b3100);
+        rt2x00mmio_register_write(rt2x00dev, PWRCSR0, 0x3f3b3100);
 
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_AWAKE))
                 return -EBUSY;
 
-        rt2x00pci_register_write(rt2x00dev, MACCSR0, 0x00217223);
-        rt2x00pci_register_write(rt2x00dev, MACCSR1, 0x00235518);
+        rt2x00mmio_register_write(rt2x00dev, MACCSR0, 0x00217223);
+        rt2x00mmio_register_write(rt2x00dev, MACCSR1, 0x00235518);
 
-        rt2x00pci_register_read(rt2x00dev, MACCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MACCSR2, &reg);
         rt2x00_set_field32(&reg, MACCSR2_DELAY, 64);
-        rt2x00pci_register_write(rt2x00dev, MACCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, MACCSR2, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RALINKCSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RALINKCSR, &reg);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_DATA0, 17);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_ID0, 154);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_DATA1, 0);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_ID1, 154);
-        rt2x00pci_register_write(rt2x00dev, RALINKCSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, RALINKCSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR1, &reg);
         rt2x00_set_field32(&reg, CSR1_SOFT_RESET, 1);
         rt2x00_set_field32(&reg, CSR1_BBP_RESET, 0);
         rt2x00_set_field32(&reg, CSR1_HOST_READY, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR1, &reg);
         rt2x00_set_field32(&reg, CSR1_SOFT_RESET, 0);
         rt2x00_set_field32(&reg, CSR1_HOST_READY, 1);
-        rt2x00pci_register_write(rt2x00dev, CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR1, reg);
 
         /*
          * We must clear the FCS and FIFO error count.
          * These registers are cleared on read,
          * so we may pass a useless variable to store the value.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT0, &reg);
-        rt2x00pci_register_read(rt2x00dev, CNT4, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT4, &reg);
 
         return 0;
 }
@@ -919,7 +920,7 @@ static int rt2400pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
         return -EACCES;
 }
 
@@ -976,8 +977,8 @@ static void rt2400pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          * should clear the register to assure a clean state.
          */
         if (state == STATE_RADIO_IRQ_ON) {
-                rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
-                rt2x00pci_register_write(rt2x00dev, CSR7, reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR7, &reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR7, reg);
         }
 
         /*
@@ -986,13 +987,13 @@ static void rt2400pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
 
-        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
         rt2x00_set_field32(&reg, CSR8_TBCN_EXPIRE, mask);
         rt2x00_set_field32(&reg, CSR8_TXDONE_TXRING, mask);
         rt2x00_set_field32(&reg, CSR8_TXDONE_ATIMRING, mask);
         rt2x00_set_field32(&reg, CSR8_TXDONE_PRIORING, mask);
         rt2x00_set_field32(&reg, CSR8_RXDONE, mask);
-        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
         spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
 
@@ -1025,7 +1026,7 @@ static void rt2400pci_disable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Disable power
          */
-        rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);
+        rt2x00mmio_register_write(rt2x00dev, PWRCSR0, 0);
 }
 
 static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
@@ -1039,12 +1040,12 @@ static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
 
         put_to_sleep = (state != STATE_AWAKE);
 
-        rt2x00pci_register_read(rt2x00dev, PWRCSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, PWRCSR1, &reg);
         rt2x00_set_field32(&reg, PWRCSR1_SET_STATE, 1);
         rt2x00_set_field32(&reg, PWRCSR1_BBP_DESIRE_STATE, state);
         rt2x00_set_field32(&reg, PWRCSR1_RF_DESIRE_STATE, state);
         rt2x00_set_field32(&reg, PWRCSR1_PUT_TO_SLEEP, put_to_sleep);
-        rt2x00pci_register_write(rt2x00dev, PWRCSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, PWRCSR1, reg);
 
         /*
          * Device is not guaranteed to be in the requested state yet.
@@ -1052,12 +1053,12 @@ static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
          * device has entered the correct state.
          */
         for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2x00pci_register_read(rt2x00dev, PWRCSR1, &reg2);
+                rt2x00mmio_register_read(rt2x00dev, PWRCSR1, &reg2);
                 bbp_state = rt2x00_get_field32(reg2, PWRCSR1_BBP_CURR_STATE);
                 rf_state = rt2x00_get_field32(reg2, PWRCSR1_RF_CURR_STATE);
                 if (bbp_state == state && rf_state == state)
                         return 0;
-                rt2x00pci_register_write(rt2x00dev, PWRCSR1, reg);
+                rt2x00mmio_register_write(rt2x00dev, PWRCSR1, reg);
                 msleep(10);
         }
 
@@ -1092,8 +1093,8 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -1105,7 +1106,7 @@ static void rt2400pci_write_tx_desc(struct queue_entry *entry,
                                     struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         __le32 *txd = entry_priv->desc;
         u32 word;
 
@@ -1182,12 +1183,12 @@ static void rt2400pci_write_beacon(struct queue_entry *entry,
          * Disable beaconing while we are reloading the beacon data,
          * otherwise we might be sending out invalid data.
          */
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 
         if (rt2x00queue_map_txskb(entry)) {
-                ERROR(rt2x00dev, "Fail to map beacon, aborting\n");
+                rt2x00_err(rt2x00dev, "Fail to map beacon, aborting\n");
                 goto out;
         }
         /*
@@ -1208,7 +1209,7 @@ out:
          * Enable beaconing again.
          */
         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 }
 
 /*
@@ -1218,7 +1219,7 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry,
                                   struct rxdone_entry_desc *rxdesc)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word0;
         u32 word2;
         u32 word3;
@@ -1276,7 +1277,7 @@ static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev,
                              const enum data_queue_qid queue_idx)
 {
         struct data_queue *queue = rt2x00queue_get_tx_queue(rt2x00dev, queue_idx);
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         struct queue_entry *entry;
         struct txdone_entry_desc txdesc;
         u32 word;
@@ -1322,9 +1323,9 @@ static inline void rt2400pci_enable_interrupt(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irq(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
         rt2x00_set_field32(&reg, irq_field, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
         spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
@@ -1347,11 +1348,11 @@ static void rt2400pci_txstatus_tasklet(unsigned long data)
         if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) {
                 spin_lock_irq(&rt2x00dev->irqmask_lock);
 
-                rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
                 rt2x00_set_field32(&reg, CSR8_TXDONE_TXRING, 0);
                 rt2x00_set_field32(&reg, CSR8_TXDONE_ATIMRING, 0);
                 rt2x00_set_field32(&reg, CSR8_TXDONE_PRIORING, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
                 spin_unlock_irq(&rt2x00dev->irqmask_lock);
         }
@@ -1368,7 +1369,7 @@ static void rt2400pci_tbtt_tasklet(unsigned long data)
 static void rt2400pci_rxdone_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-        if (rt2x00pci_rxdone(rt2x00dev))
+        if (rt2x00mmio_rxdone(rt2x00dev))
                 tasklet_schedule(&rt2x00dev->rxdone_tasklet);
         else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt2400pci_enable_interrupt(rt2x00dev, CSR8_RXDONE);
@@ -1383,8 +1384,8 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
          * Get the interrupt sources & saved to local variable.
          * Write register value back to clear pending interrupts.
          */
-        rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
-        rt2x00pci_register_write(rt2x00dev, CSR7, reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR7, &reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR7, reg);
 
         if (!reg)
                 return IRQ_NONE;
@@ -1421,9 +1422,9 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
          */
         spin_lock(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
         reg |= mask;
-        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
         spin_unlock(&rt2x00dev->irqmask_lock);
 
@@ -1442,7 +1443,7 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         u16 word;
         u8 *mac;
 
-        rt2x00pci_register_read(rt2x00dev, CSR21, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR21, &reg);
 
         eeprom.data = rt2x00dev;
         eeprom.register_read = rt2400pci_eepromregister_read;
@@ -1463,12 +1464,12 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
                 eth_random_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
+                rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
         if (word == 0xffff) {
-                ERROR(rt2x00dev, "Invalid EEPROM data detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid EEPROM data detected\n");
                 return -EINVAL;
         }
 
@@ -1490,12 +1491,12 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * Identify RF chipset.
          */
         value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);
-        rt2x00pci_register_read(rt2x00dev, CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR0, &reg);
         rt2x00_set_chip(rt2x00dev, RT2460, value,
                         rt2x00_get_field32(reg, CSR0_REVISION));
 
         if (!rt2x00_rf(rt2x00dev, RF2420) && !rt2x00_rf(rt2x00dev, RF2421)) {
-                ERROR(rt2x00dev, "Invalid RF chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");
                 return -ENODEV;
         }
 
@@ -1635,9 +1636,9 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev)
          * Enable rfkill polling by setting GPIO direction of the
          * rfkill switch GPIO pin correctly.
          */
-        rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, GPIOCSR, &reg);
         rt2x00_set_field32(&reg, GPIOCSR_DIR0, 1);
-        rt2x00pci_register_write(rt2x00dev, GPIOCSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, GPIOCSR, reg);
 
         /*
          * Initialize hw specifications.
@@ -1697,9 +1698,9 @@ static u64 rt2400pci_get_tsf(struct ieee80211_hw *hw,
         u64 tsf;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR17, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR17, &reg);
         tsf = (u64) rt2x00_get_field32(reg, CSR17_HIGH_TSFTIMER) << 32;
-        rt2x00pci_register_read(rt2x00dev, CSR16, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR16, &reg);
         tsf |= rt2x00_get_field32(reg, CSR16_LOW_TSFTIMER);
 
         return tsf;
@@ -1710,7 +1711,7 @@ static int rt2400pci_tx_last_beacon(struct ieee80211_hw *hw)
         struct rt2x00_dev *rt2x00dev = hw->priv;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR15, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR15, &reg);
         return rt2x00_get_field32(reg, CSR15_BEACON_SENT);
 }
 
@@ -1743,8 +1744,8 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
         .tbtt_tasklet           = rt2400pci_tbtt_tasklet,
         .rxdone_tasklet         = rt2400pci_rxdone_tasklet,
         .probe_hw               = rt2400pci_probe_hw,
-        .initialize             = rt2x00pci_initialize,
-        .uninitialize           = rt2x00pci_uninitialize,
+        .initialize             = rt2x00mmio_initialize,
+        .uninitialize           = rt2x00mmio_uninitialize,
         .get_entry_state        = rt2400pci_get_entry_state,
         .clear_entry            = rt2400pci_clear_entry,
         .set_device_state       = rt2400pci_set_device_state,
@@ -1755,7 +1756,7 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
         .start_queue            = rt2400pci_start_queue,
         .kick_queue             = rt2400pci_kick_queue,
         .stop_queue             = rt2400pci_stop_queue,
-        .flush_queue            = rt2x00pci_flush_queue,
+        .flush_queue            = rt2x00mmio_flush_queue,
         .write_tx_desc          = rt2400pci_write_tx_desc,
         .write_beacon           = rt2400pci_write_beacon,
         .fill_rxdone            = rt2400pci_fill_rxdone,
@@ -1770,28 +1771,28 @@ static const struct data_queue_desc rt2400pci_queue_rx = {
         .entry_num              = 24,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = RXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2400pci_queue_tx = {
         .entry_num              = 24,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2400pci_queue_bcn = {
         .entry_num              = 1,
         .data_size              = MGMT_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2400pci_queue_atim = {
         .entry_num              = 8,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct rt2x00_ops rt2400pci_ops = {
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index e1d2dc9ed28a..77e45b223d15 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -41,7 +41,7 @@
 /*
  * Register access.
  * All access to the CSR registers will go through the methods
- * rt2x00pci_register_read and rt2x00pci_register_write.
+ * rt2x00mmio_register_read and rt2x00mmio_register_write.
  * BBP and RF register require indirect register access,
  * and use the CSR registers BBPCSR and RFCSR to achieve this.
  * These indirect registers work with busy bits,
@@ -52,9 +52,9 @@
  * and we will print an error.
  */
 #define WAIT_FOR_BBP(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), BBPCSR, BBPCSR_BUSY, (__reg))
+        rt2x00mmio_regbusy_read((__dev), BBPCSR, BBPCSR_BUSY, (__reg))
 #define WAIT_FOR_RF(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), RFCSR, RFCSR_BUSY, (__reg))
+        rt2x00mmio_regbusy_read((__dev), RFCSR, RFCSR_BUSY, (__reg))
 
 static void rt2500pci_bbp_write(struct rt2x00_dev *rt2x00dev,
                                 const unsigned int word, const u8 value)
@@ -74,7 +74,7 @@ static void rt2500pci_bbp_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBPCSR_BUSY, 1);
                 rt2x00_set_field32(&reg, BBPCSR_WRITE_CONTROL, 1);
 
-                rt2x00pci_register_write(rt2x00dev, BBPCSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, BBPCSR, reg);
         }
 
         mutex_unlock(&rt2x00dev->csr_mutex);
@@ -101,7 +101,7 @@ static void rt2500pci_bbp_read(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBPCSR_BUSY, 1);
                 rt2x00_set_field32(&reg, BBPCSR_WRITE_CONTROL, 0);
 
-                rt2x00pci_register_write(rt2x00dev, BBPCSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, BBPCSR, reg);
 
                 WAIT_FOR_BBP(rt2x00dev, &reg);
         }
@@ -129,7 +129,7 @@ static void rt2500pci_rf_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, RFCSR_IF_SELECT, 0);
                 rt2x00_set_field32(&reg, RFCSR_BUSY, 1);
 
-                rt2x00pci_register_write(rt2x00dev, RFCSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, RFCSR, reg);
                 rt2x00_rf_write(rt2x00dev, word, value);
         }
 
@@ -141,7 +141,7 @@ static void rt2500pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
         struct rt2x00_dev *rt2x00dev = eeprom->data;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR21, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR21, &reg);
 
         eeprom->reg_data_in = !!rt2x00_get_field32(reg, CSR21_EEPROM_DATA_IN);
         eeprom->reg_data_out = !!rt2x00_get_field32(reg, CSR21_EEPROM_DATA_OUT);
@@ -163,15 +163,15 @@ static void rt2500pci_eepromregister_write(struct eeprom_93cx6 *eeprom)
         rt2x00_set_field32(&reg, CSR21_EEPROM_CHIP_SELECT,
                            !!eeprom->reg_chip_select);
 
-        rt2x00pci_register_write(rt2x00dev, CSR21, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR21, reg);
 }
 
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
 static const struct rt2x00debug rt2500pci_rt2x00debug = {
         .owner  = THIS_MODULE,
         .csr    = {
-                .read           = rt2x00pci_register_read,
-                .write          = rt2x00pci_register_write,
+                .read           = rt2x00mmio_register_read,
+                .write          = rt2x00mmio_register_write,
                 .flags          = RT2X00DEBUGFS_OFFSET,
                 .word_base      = CSR_REG_BASE,
                 .word_size      = sizeof(u32),
@@ -205,7 +205,7 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, GPIOCSR, &reg);
         return rt2x00_get_field32(reg, GPIOCSR_VAL0);
 }
 
@@ -218,14 +218,14 @@ static void rt2500pci_brightness_set(struct led_classdev *led_cdev,
         unsigned int enabled = brightness != LED_OFF;
         u32 reg;
 
-        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00mmio_register_read(led->rt2x00dev, LEDCSR, &reg);
 
         if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
                 rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
         else if (led->type == LED_TYPE_ACTIVITY)
                 rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);
 
-        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+        rt2x00mmio_register_write(led->rt2x00dev, LEDCSR, reg);
 }
 
 static int rt2500pci_blink_set(struct led_classdev *led_cdev,
@@ -236,10 +236,10 @@ static int rt2500pci_blink_set(struct led_classdev *led_cdev,
             container_of(led_cdev, struct rt2x00_led, led_dev);
         u32 reg;
 
-        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00mmio_register_read(led->rt2x00dev, LEDCSR, &reg);
         rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);
         rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);
-        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+        rt2x00mmio_register_write(led->rt2x00dev, LEDCSR, reg);
 
         return 0;
 }
@@ -270,7 +270,7 @@ static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev,
          * and broadcast frames will always be accepted since
          * there is no filter for it at this time.
          */
-        rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR0, &reg);
         rt2x00_set_field32(&reg, RXCSR0_DROP_CRC,
                            !(filter_flags & FIF_FCSFAIL));
         rt2x00_set_field32(&reg, RXCSR0_DROP_PHYSICAL,
@@ -286,7 +286,7 @@ static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, RXCSR0_DROP_MCAST,
                            !(filter_flags & FIF_ALLMULTI));
         rt2x00_set_field32(&reg, RXCSR0_DROP_BCAST, 0);
-        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
 }
 
 static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev,
@@ -303,25 +303,25 @@ static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev,
                  * Enable beacon config
                  */
                 bcn_preload = PREAMBLE + GET_DURATION(IEEE80211_HEADER, 20);
-                rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
+                rt2x00mmio_register_read(rt2x00dev, BCNCSR1, &reg);
                 rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, bcn_preload);
                 rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN, queue->cw_min);
-                rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+                rt2x00mmio_register_write(rt2x00dev, BCNCSR1, reg);
 
                 /*
                  * Enable synchronisation.
                  */
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
                 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
-                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
         }
 
         if (flags & CONFIG_UPDATE_MAC)
-                rt2x00pci_register_multiwrite(rt2x00dev, CSR3,
+                rt2x00mmio_register_multiwrite(rt2x00dev, CSR3,
                                               conf->mac, sizeof(conf->mac));
 
         if (flags & CONFIG_UPDATE_BSSID)
-                rt2x00pci_register_multiwrite(rt2x00dev, CSR5,
+                rt2x00mmio_register_multiwrite(rt2x00dev, CSR5,
                                               conf->bssid, sizeof(conf->bssid));
 }
 
@@ -338,68 +338,68 @@ static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev,
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                 preamble_mask = erp->short_preamble << 3;
 
-                rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR1, &reg);
                 rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT, 0x162);
                 rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME, 0xa2);
                 rt2x00_set_field32(&reg, TXCSR1_TSF_OFFSET, IEEE80211_HEADER);
                 rt2x00_set_field32(&reg, TXCSR1_AUTORESPONDER, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR1, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR2, &reg);
                 rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00);
                 rt2x00_set_field32(&reg, ARCSR2_SERVICE, 0x04);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 10));
-                rt2x00pci_register_write(rt2x00dev, ARCSR2, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR2, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR3, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR3, &reg);
                 rt2x00_set_field32(&reg, ARCSR3_SIGNAL, 0x01 | preamble_mask);
                 rt2x00_set_field32(&reg, ARCSR3_SERVICE, 0x04);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 20));
-                rt2x00pci_register_write(rt2x00dev, ARCSR3, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR3, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR4, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR4, &reg);
                 rt2x00_set_field32(&reg, ARCSR4_SIGNAL, 0x02 | preamble_mask);
                 rt2x00_set_field32(&reg, ARCSR4_SERVICE, 0x04);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 55));
-                rt2x00pci_register_write(rt2x00dev, ARCSR4, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR4, reg);
 
-                rt2x00pci_register_read(rt2x00dev, ARCSR5, &reg);
+                rt2x00mmio_register_read(rt2x00dev, ARCSR5, &reg);
                 rt2x00_set_field32(&reg, ARCSR5_SIGNAL, 0x03 | preamble_mask);
                 rt2x00_set_field32(&reg, ARCSR5_SERVICE, 0x84);
                 rt2x00_set_field32(&reg, ARCSR2_LENGTH,
                                    GET_DURATION(ACK_SIZE, 110));
-                rt2x00pci_register_write(rt2x00dev, ARCSR5, reg);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR5, reg);
         }
 
         if (changed & BSS_CHANGED_BASIC_RATES)
-                rt2x00pci_register_write(rt2x00dev, ARCSR1, erp->basic_rates);
+                rt2x00mmio_register_write(rt2x00dev, ARCSR1, erp->basic_rates);
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
-                rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR11, &reg);
                 rt2x00_set_field32(&reg, CSR11_SLOT_TIME, erp->slot_time);
-                rt2x00pci_register_write(rt2x00dev, CSR11, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR11, reg);
 
-                rt2x00pci_register_read(rt2x00dev, CSR18, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR18, &reg);
                 rt2x00_set_field32(&reg, CSR18_SIFS, erp->sifs);
                 rt2x00_set_field32(&reg, CSR18_PIFS, erp->pifs);
-                rt2x00pci_register_write(rt2x00dev, CSR18, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR18, reg);
 
-                rt2x00pci_register_read(rt2x00dev, CSR19, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR19, &reg);
                 rt2x00_set_field32(&reg, CSR19_DIFS, erp->difs);
                 rt2x00_set_field32(&reg, CSR19_EIFS, erp->eifs);
-                rt2x00pci_register_write(rt2x00dev, CSR19, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR19, reg);
         }
 
         if (changed & BSS_CHANGED_BEACON_INT) {
-                rt2x00pci_register_read(rt2x00dev, CSR12, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR12, &reg);
                 rt2x00_set_field32(&reg, CSR12_BEACON_INTERVAL,
                                    erp->beacon_int * 16);
                 rt2x00_set_field32(&reg, CSR12_CFP_MAX_DURATION,
                                    erp->beacon_int * 16);
-                rt2x00pci_register_write(rt2x00dev, CSR12, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR12, reg);
         }
 
 }
@@ -418,7 +418,7 @@ static void rt2500pci_config_ant(struct rt2x00_dev *rt2x00dev,
         BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
                ant->tx == ANTENNA_SW_DIVERSITY);
 
-        rt2x00pci_register_read(rt2x00dev, BBPCSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, BBPCSR1, &reg);
         rt2500pci_bbp_read(rt2x00dev, 14, &r14);
         rt2500pci_bbp_read(rt2x00dev, 2, &r2);
 
@@ -470,7 +470,7 @@ static void rt2500pci_config_ant(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBPCSR1_OFDM_FLIP, 0);
         }
 
-        rt2x00pci_register_write(rt2x00dev, BBPCSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, BBPCSR1, reg);
         rt2500pci_bbp_write(rt2x00dev, 14, r14);
         rt2500pci_bbp_write(rt2x00dev, 2, r2);
 }
@@ -541,7 +541,7 @@ static void rt2500pci_config_channel(struct rt2x00_dev *rt2x00dev,
         /*
          * Clear false CRC during channel switch.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT0, &rf->rf1);
+        rt2x00mmio_register_read(rt2x00dev, CNT0, &rf->rf1);
 }
 
 static void rt2500pci_config_txpower(struct rt2x00_dev *rt2x00dev,
@@ -559,12 +559,12 @@ static void rt2500pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR11, &reg);
         rt2x00_set_field32(&reg, CSR11_LONG_RETRY,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, CSR11_SHORT_RETRY,
                            libconf->conf->short_frame_max_tx_count);
-        rt2x00pci_register_write(rt2x00dev, CSR11, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR11, reg);
 }
 
 static void rt2500pci_config_ps(struct rt2x00_dev *rt2x00dev,
@@ -576,7 +576,7 @@ static void rt2500pci_config_ps(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         if (state == STATE_SLEEP) {
-                rt2x00pci_register_read(rt2x00dev, CSR20, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR20, &reg);
                 rt2x00_set_field32(&reg, CSR20_DELAY_AFTER_TBCN,
                                    (rt2x00dev->beacon_int - 20) * 16);
                 rt2x00_set_field32(&reg, CSR20_TBCN_BEFORE_WAKEUP,
@@ -584,14 +584,14 @@ static void rt2500pci_config_ps(struct rt2x00_dev *rt2x00dev,
 
                 /* We must first disable autowake before it can be enabled */
                 rt2x00_set_field32(&reg, CSR20_AUTOWAKE, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR20, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR20, reg);
 
                 rt2x00_set_field32(&reg, CSR20_AUTOWAKE, 1);
-                rt2x00pci_register_write(rt2x00dev, CSR20, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR20, reg);
         } else {
-                rt2x00pci_register_read(rt2x00dev, CSR20, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR20, &reg);
                 rt2x00_set_field32(&reg, CSR20_AUTOWAKE, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR20, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR20, reg);
         }
 
         rt2x00dev->ops->lib->set_device_state(rt2x00dev, state);
@@ -625,13 +625,13 @@ static void rt2500pci_link_stats(struct rt2x00_dev *rt2x00dev,
         /*
          * Update FCS error count from register.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT0, &reg);
         qual->rx_failed = rt2x00_get_field32(reg, CNT0_FCS_ERROR);
 
         /*
          * Update False CCA count from register.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT3, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT3, &reg);
         qual->false_cca = rt2x00_get_field32(reg, CNT3_FALSE_CCA);
 }
 
@@ -731,16 +731,16 @@ static void rt2500pci_start_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, RXCSR0, &reg);
                 rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX, 0);
-                rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
                 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
                 rt2x00_set_field32(&reg, CSR14_TBCN, 1);
                 rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
-                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
                 break;
         default:
                 break;
@@ -754,19 +754,19 @@ static void rt2500pci_kick_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_AC_VO:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         case QID_AC_VI:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_KICK_TX, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         case QID_ATIM:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         default:
                 break;
@@ -782,21 +782,21 @@ static void rt2500pci_stop_queue(struct data_queue *queue)
         case QID_AC_VO:
         case QID_AC_VI:
         case QID_ATIM:
-                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXCSR0, &reg);
                 rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);
-                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXCSR0, reg);
                 break;
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, RXCSR0, &reg);
                 rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX, 1);
-                rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
                 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
                 rt2x00_set_field32(&reg, CSR14_TBCN, 0);
                 rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 
                 /*
                  * Wait for possibly running tbtt tasklets.
@@ -813,7 +813,7 @@ static void rt2500pci_stop_queue(struct data_queue *queue)
  */
 static bool rt2500pci_get_entry_state(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word;
 
         if (entry->queue->qid == QID_RX) {
@@ -830,7 +830,7 @@ static bool rt2500pci_get_entry_state(struct queue_entry *entry)
 
 static void rt2500pci_clear_entry(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
         u32 word;
 
@@ -852,53 +852,53 @@ static void rt2500pci_clear_entry(struct queue_entry *entry)
 
 static int rt2500pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         u32 reg;
 
         /*
          * Initialize registers.
          */
-        rt2x00pci_register_read(rt2x00dev, TXCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR2, &reg);
         rt2x00_set_field32(&reg, TXCSR2_TXD_SIZE, rt2x00dev->tx[0].desc_size);
         rt2x00_set_field32(&reg, TXCSR2_NUM_TXD, rt2x00dev->tx[1].limit);
         rt2x00_set_field32(&reg, TXCSR2_NUM_ATIM, rt2x00dev->atim->limit);
         rt2x00_set_field32(&reg, TXCSR2_NUM_PRIO, rt2x00dev->tx[0].limit);
-        rt2x00pci_register_write(rt2x00dev, TXCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR2, reg);
 
         entry_priv = rt2x00dev->tx[1].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR3, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR3, &reg);
         rt2x00_set_field32(&reg, TXCSR3_TX_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR3, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR3, reg);
 
         entry_priv = rt2x00dev->tx[0].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR5, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR5, &reg);
         rt2x00_set_field32(&reg, TXCSR5_PRIO_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR5, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR5, reg);
 
         entry_priv = rt2x00dev->atim->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR4, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR4, &reg);
         rt2x00_set_field32(&reg, TXCSR4_ATIM_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR4, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR4, reg);
 
         entry_priv = rt2x00dev->bcn->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, TXCSR6, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR6, &reg);
         rt2x00_set_field32(&reg, TXCSR6_BEACON_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TXCSR6, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR6, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RXCSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR1, &reg);
         rt2x00_set_field32(&reg, RXCSR1_RXD_SIZE, rt2x00dev->rx->desc_size);
         rt2x00_set_field32(&reg, RXCSR1_NUM_RXD, rt2x00dev->rx->limit);
-        rt2x00pci_register_write(rt2x00dev, RXCSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR1, reg);
 
         entry_priv = rt2x00dev->rx->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, RXCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR2, &reg);
         rt2x00_set_field32(&reg, RXCSR2_RX_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, RXCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR2, reg);
 
         return 0;
 }
@@ -907,30 +907,30 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2x00pci_register_write(rt2x00dev, PSCSR0, 0x00020002);
-        rt2x00pci_register_write(rt2x00dev, PSCSR1, 0x00000002);
-        rt2x00pci_register_write(rt2x00dev, PSCSR2, 0x00020002);
-        rt2x00pci_register_write(rt2x00dev, PSCSR3, 0x00000002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR0, 0x00020002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR1, 0x00000002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR2, 0x00020002);
+        rt2x00mmio_register_write(rt2x00dev, PSCSR3, 0x00000002);
 
-        rt2x00pci_register_read(rt2x00dev, TIMECSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TIMECSR, &reg);
         rt2x00_set_field32(&reg, TIMECSR_US_COUNT, 33);
         rt2x00_set_field32(&reg, TIMECSR_US_64_COUNT, 63);
         rt2x00_set_field32(&reg, TIMECSR_BEACON_EXPECT, 0);
-        rt2x00pci_register_write(rt2x00dev, TIMECSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, TIMECSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR9, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR9, &reg);
         rt2x00_set_field32(&reg, CSR9_MAX_FRAME_UNIT,
                            rt2x00dev->rx->data_size / 128);
-        rt2x00pci_register_write(rt2x00dev, CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR9, reg);
 
         /*
          * Always use CWmin and CWmax set in descriptor.
          */
-        rt2x00pci_register_read(rt2x00dev, CSR11, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR11, &reg);
         rt2x00_set_field32(&reg, CSR11_CW_SELECT, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR11, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR11, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
         rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
         rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);
         rt2x00_set_field32(&reg, CSR14_TBCN, 0);
@@ -939,11 +939,11 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
         rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);
         rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 
-        rt2x00pci_register_write(rt2x00dev, CNT3, 0);
+        rt2x00mmio_register_write(rt2x00dev, CNT3, 0);
 
-        rt2x00pci_register_read(rt2x00dev, TXCSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXCSR8, &reg);
         rt2x00_set_field32(&reg, TXCSR8_BBP_ID0, 10);
         rt2x00_set_field32(&reg, TXCSR8_BBP_ID0_VALID, 1);
         rt2x00_set_field32(&reg, TXCSR8_BBP_ID1, 11);
@@ -952,30 +952,30 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, TXCSR8_BBP_ID2_VALID, 1);
         rt2x00_set_field32(&reg, TXCSR8_BBP_ID3, 12);
         rt2x00_set_field32(&reg, TXCSR8_BBP_ID3_VALID, 1);
-        rt2x00pci_register_write(rt2x00dev, TXCSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXCSR8, reg);
 
-        rt2x00pci_register_read(rt2x00dev, ARTCSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, ARTCSR0, &reg);
         rt2x00_set_field32(&reg, ARTCSR0_ACK_CTS_1MBS, 112);
         rt2x00_set_field32(&reg, ARTCSR0_ACK_CTS_2MBS, 56);
         rt2x00_set_field32(&reg, ARTCSR0_ACK_CTS_5_5MBS, 20);
         rt2x00_set_field32(&reg, ARTCSR0_ACK_CTS_11MBS, 10);
-        rt2x00pci_register_write(rt2x00dev, ARTCSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, ARTCSR0, reg);
 
-        rt2x00pci_register_read(rt2x00dev, ARTCSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, ARTCSR1, &reg);
         rt2x00_set_field32(&reg, ARTCSR1_ACK_CTS_6MBS, 45);
         rt2x00_set_field32(&reg, ARTCSR1_ACK_CTS_9MBS, 37);
         rt2x00_set_field32(&reg, ARTCSR1_ACK_CTS_12MBS, 33);
         rt2x00_set_field32(&reg, ARTCSR1_ACK_CTS_18MBS, 29);
-        rt2x00pci_register_write(rt2x00dev, ARTCSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, ARTCSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, ARTCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, ARTCSR2, &reg);
         rt2x00_set_field32(&reg, ARTCSR2_ACK_CTS_24MBS, 29);
         rt2x00_set_field32(&reg, ARTCSR2_ACK_CTS_36MBS, 25);
         rt2x00_set_field32(&reg, ARTCSR2_ACK_CTS_48MBS, 25);
         rt2x00_set_field32(&reg, ARTCSR2_ACK_CTS_54MBS, 25);
-        rt2x00pci_register_write(rt2x00dev, ARTCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, ARTCSR2, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RXCSR3, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RXCSR3, &reg);
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID0, 47); /* CCK Signal */
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID0_VALID, 1);
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID1, 51); /* Rssi */
@@ -984,9 +984,9 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID2_VALID, 1);
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID3, 51); /* RSSI */
         rt2x00_set_field32(&reg, RXCSR3_BBP_ID3_VALID, 1);
-        rt2x00pci_register_write(rt2x00dev, RXCSR3, reg);
+        rt2x00mmio_register_write(rt2x00dev, RXCSR3, reg);
 
-        rt2x00pci_register_read(rt2x00dev, PCICSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, PCICSR, &reg);
         rt2x00_set_field32(&reg, PCICSR_BIG_ENDIAN, 0);
         rt2x00_set_field32(&reg, PCICSR_RX_TRESHOLD, 0);
         rt2x00_set_field32(&reg, PCICSR_TX_TRESHOLD, 3);
@@ -994,54 +994,54 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, PCICSR_ENABLE_CLK, 1);
         rt2x00_set_field32(&reg, PCICSR_READ_MULTIPLE, 1);
         rt2x00_set_field32(&reg, PCICSR_WRITE_INVALID, 1);
-        rt2x00pci_register_write(rt2x00dev, PCICSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, PCICSR, reg);
 
-        rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0x3f3b3100);
+        rt2x00mmio_register_write(rt2x00dev, PWRCSR0, 0x3f3b3100);
 
-        rt2x00pci_register_write(rt2x00dev, GPIOCSR, 0x0000ff00);
-        rt2x00pci_register_write(rt2x00dev, TESTCSR, 0x000000f0);
+        rt2x00mmio_register_write(rt2x00dev, GPIOCSR, 0x0000ff00);
+        rt2x00mmio_register_write(rt2x00dev, TESTCSR, 0x000000f0);
 
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_AWAKE))
                 return -EBUSY;
 
-        rt2x00pci_register_write(rt2x00dev, MACCSR0, 0x00213223);
-        rt2x00pci_register_write(rt2x00dev, MACCSR1, 0x00235518);
+        rt2x00mmio_register_write(rt2x00dev, MACCSR0, 0x00213223);
+        rt2x00mmio_register_write(rt2x00dev, MACCSR1, 0x00235518);
 
-        rt2x00pci_register_read(rt2x00dev, MACCSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MACCSR2, &reg);
         rt2x00_set_field32(&reg, MACCSR2_DELAY, 64);
-        rt2x00pci_register_write(rt2x00dev, MACCSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, MACCSR2, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RALINKCSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RALINKCSR, &reg);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_DATA0, 17);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_ID0, 26);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_VALID0, 1);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_DATA1, 0);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_ID1, 26);
         rt2x00_set_field32(&reg, RALINKCSR_AR_BBP_VALID1, 1);
-        rt2x00pci_register_write(rt2x00dev, RALINKCSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, RALINKCSR, reg);
 
-        rt2x00pci_register_write(rt2x00dev, BBPCSR1, 0x82188200);
+        rt2x00mmio_register_write(rt2x00dev, BBPCSR1, 0x82188200);
 
-        rt2x00pci_register_write(rt2x00dev, TXACKCSR0, 0x00000020);
+        rt2x00mmio_register_write(rt2x00dev, TXACKCSR0, 0x00000020);
 
-        rt2x00pci_register_read(rt2x00dev, CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR1, &reg);
         rt2x00_set_field32(&reg, CSR1_SOFT_RESET, 1);
         rt2x00_set_field32(&reg, CSR1_BBP_RESET, 0);
         rt2x00_set_field32(&reg, CSR1_HOST_READY, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR1, &reg);
         rt2x00_set_field32(&reg, CSR1_SOFT_RESET, 0);
         rt2x00_set_field32(&reg, CSR1_HOST_READY, 1);
-        rt2x00pci_register_write(rt2x00dev, CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR1, reg);
 
         /*
          * We must clear the FCS and FIFO error count.
          * These registers are cleared on read,
          * so we may pass a useless variable to store the value.
          */
-        rt2x00pci_register_read(rt2x00dev, CNT0, &reg);
-        rt2x00pci_register_read(rt2x00dev, CNT4, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CNT4, &reg);
 
         return 0;
 }
@@ -1058,7 +1058,7 @@ static int rt2500pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
         return -EACCES;
 }
 
@@ -1131,8 +1131,8 @@ static void rt2500pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          * should clear the register to assure a clean state.
          */
         if (state == STATE_RADIO_IRQ_ON) {
-                rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
-                rt2x00pci_register_write(rt2x00dev, CSR7, reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR7, &reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR7, reg);
         }
 
         /*
@@ -1141,13 +1141,13 @@ static void rt2500pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
 
-        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
         rt2x00_set_field32(&reg, CSR8_TBCN_EXPIRE, mask);
         rt2x00_set_field32(&reg, CSR8_TXDONE_TXRING, mask);
         rt2x00_set_field32(&reg, CSR8_TXDONE_ATIMRING, mask);
         rt2x00_set_field32(&reg, CSR8_TXDONE_PRIORING, mask);
         rt2x00_set_field32(&reg, CSR8_RXDONE, mask);
-        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
         spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
 
@@ -1179,7 +1179,7 @@ static void rt2500pci_disable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Disable power
          */
-        rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);
+        rt2x00mmio_register_write(rt2x00dev, PWRCSR0, 0);
 }
 
 static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev,
@@ -1193,12 +1193,12 @@ static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev,
 
         put_to_sleep = (state != STATE_AWAKE);
 
-        rt2x00pci_register_read(rt2x00dev, PWRCSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, PWRCSR1, &reg);
         rt2x00_set_field32(&reg, PWRCSR1_SET_STATE, 1);
         rt2x00_set_field32(&reg, PWRCSR1_BBP_DESIRE_STATE, state);
         rt2x00_set_field32(&reg, PWRCSR1_RF_DESIRE_STATE, state);
         rt2x00_set_field32(&reg, PWRCSR1_PUT_TO_SLEEP, put_to_sleep);
-        rt2x00pci_register_write(rt2x00dev, PWRCSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, PWRCSR1, reg);
 
         /*
          * Device is not guaranteed to be in the requested state yet.
@@ -1206,12 +1206,12 @@ static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev,
          * device has entered the correct state.
          */
         for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2x00pci_register_read(rt2x00dev, PWRCSR1, &reg2);
+                rt2x00mmio_register_read(rt2x00dev, PWRCSR1, &reg2);
                 bbp_state = rt2x00_get_field32(reg2, PWRCSR1_BBP_CURR_STATE);
                 rf_state = rt2x00_get_field32(reg2, PWRCSR1_RF_CURR_STATE);
                 if (bbp_state == state && rf_state == state)
                         return 0;
-                rt2x00pci_register_write(rt2x00dev, PWRCSR1, reg);
+                rt2x00mmio_register_write(rt2x00dev, PWRCSR1, reg);
                 msleep(10);
         }
 
@@ -1246,8 +1246,8 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -1259,7 +1259,7 @@ static void rt2500pci_write_tx_desc(struct queue_entry *entry,
                                     struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         __le32 *txd = entry_priv->desc;
         u32 word;
 
@@ -1335,12 +1335,12 @@ static void rt2500pci_write_beacon(struct queue_entry *entry,
          * Disable beaconing while we are reloading the beacon data,
          * otherwise we might be sending out invalid data.
          */
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR14, &reg);
         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 
         if (rt2x00queue_map_txskb(entry)) {
-                ERROR(rt2x00dev, "Fail to map beacon, aborting\n");
+                rt2x00_err(rt2x00dev, "Fail to map beacon, aborting\n");
                 goto out;
         }
 
@@ -1358,7 +1358,7 @@ out:
          * Enable beaconing again.
          */
         rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR14, reg);
 }
 
 /*
@@ -1367,7 +1367,7 @@ out:
 static void rt2500pci_fill_rxdone(struct queue_entry *entry,
                                   struct rxdone_entry_desc *rxdesc)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word0;
         u32 word2;
 
@@ -1405,7 +1405,7 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev,
                              const enum data_queue_qid queue_idx)
 {
         struct data_queue *queue = rt2x00queue_get_tx_queue(rt2x00dev, queue_idx);
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         struct queue_entry *entry;
         struct txdone_entry_desc txdesc;
         u32 word;
@@ -1451,9 +1451,9 @@ static inline void rt2500pci_enable_interrupt(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irq(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
         rt2x00_set_field32(&reg, irq_field, 0);
-        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
         spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
@@ -1476,11 +1476,11 @@ static void rt2500pci_txstatus_tasklet(unsigned long data)
         if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) {
                 spin_lock_irq(&rt2x00dev->irqmask_lock);
 
-                rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+                rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
                 rt2x00_set_field32(&reg, CSR8_TXDONE_TXRING, 0);
                 rt2x00_set_field32(&reg, CSR8_TXDONE_ATIMRING, 0);
                 rt2x00_set_field32(&reg, CSR8_TXDONE_PRIORING, 0);
-                rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+                rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
                 spin_unlock_irq(&rt2x00dev->irqmask_lock);
         }
@@ -1497,7 +1497,7 @@ static void rt2500pci_tbtt_tasklet(unsigned long data)
 static void rt2500pci_rxdone_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-        if (rt2x00pci_rxdone(rt2x00dev))
+        if (rt2x00mmio_rxdone(rt2x00dev))
                 tasklet_schedule(&rt2x00dev->rxdone_tasklet);
         else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt2500pci_enable_interrupt(rt2x00dev, CSR8_RXDONE);
@@ -1512,8 +1512,8 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
          * Get the interrupt sources & saved to local variable.
          * Write register value back to clear pending interrupts.
          */
-        rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
-        rt2x00pci_register_write(rt2x00dev, CSR7, reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR7, &reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR7, reg);
 
         if (!reg)
                 return IRQ_NONE;
@@ -1550,9 +1550,9 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
          */
         spin_lock(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR8, &reg);
         reg |= mask;
-        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, CSR8, reg);
 
         spin_unlock(&rt2x00dev->irqmask_lock);
 
@@ -1569,7 +1569,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         u16 word;
         u8 *mac;
 
-        rt2x00pci_register_read(rt2x00dev, CSR21, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR21, &reg);
 
         eeprom.data = rt2x00dev;
         eeprom.register_read = rt2500pci_eepromregister_read;
@@ -1590,7 +1590,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
                 eth_random_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
+                rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
@@ -1606,7 +1606,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2522);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
-                EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
@@ -1615,7 +1615,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_NIC_DYN_BBP_TUNE, 0);
                 rt2x00_set_field16(&word, EEPROM_NIC_CCK_TX_POWER, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);
-                EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_CALIBRATE_OFFSET, &word);
@@ -1623,7 +1623,8 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_CALIBRATE_OFFSET_RSSI,
                                    DEFAULT_RSSI_OFFSET);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_CALIBRATE_OFFSET, word);
-                EEPROM(rt2x00dev, "Calibrate offset: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Calibrate offset: 0x%04x\n",
+                                  word);
         }
 
         return 0;
@@ -1644,7 +1645,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * Identify RF chipset.
          */
         value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);
-        rt2x00pci_register_read(rt2x00dev, CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR0, &reg);
         rt2x00_set_chip(rt2x00dev, RT2560, value,
                         rt2x00_get_field32(reg, CSR0_REVISION));
 
@@ -1654,7 +1655,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
             !rt2x00_rf(rt2x00dev, RF2525) &&
             !rt2x00_rf(rt2x00dev, RF2525E) &&
             !rt2x00_rf(rt2x00dev, RF5222)) {
-                ERROR(rt2x00dev, "Invalid RF chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");
                 return -ENODEV;
         }
 
@@ -1950,9 +1951,9 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)
          * Enable rfkill polling by setting GPIO direction of the
          * rfkill switch GPIO pin correctly.
          */
-        rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, GPIOCSR, &reg);
         rt2x00_set_field32(&reg, GPIOCSR_DIR0, 1);
-        rt2x00pci_register_write(rt2x00dev, GPIOCSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, GPIOCSR, reg);
 
         /*
          * Initialize hw specifications.
@@ -1986,9 +1987,9 @@ static u64 rt2500pci_get_tsf(struct ieee80211_hw *hw,
         u64 tsf;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR17, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR17, &reg);
         tsf = (u64) rt2x00_get_field32(reg, CSR17_HIGH_TSFTIMER) << 32;
-        rt2x00pci_register_read(rt2x00dev, CSR16, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR16, &reg);
         tsf |= rt2x00_get_field32(reg, CSR16_LOW_TSFTIMER);
 
         return tsf;
@@ -1999,7 +2000,7 @@ static int rt2500pci_tx_last_beacon(struct ieee80211_hw *hw)
         struct rt2x00_dev *rt2x00dev = hw->priv;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, CSR15, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CSR15, &reg);
         return rt2x00_get_field32(reg, CSR15_BEACON_SENT);
 }
 
@@ -2032,8 +2033,8 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .tbtt_tasklet           = rt2500pci_tbtt_tasklet,
         .rxdone_tasklet         = rt2500pci_rxdone_tasklet,
         .probe_hw               = rt2500pci_probe_hw,
-        .initialize             = rt2x00pci_initialize,
-        .uninitialize           = rt2x00pci_uninitialize,
+        .initialize             = rt2x00mmio_initialize,
+        .uninitialize           = rt2x00mmio_uninitialize,
         .get_entry_state        = rt2500pci_get_entry_state,
         .clear_entry            = rt2500pci_clear_entry,
         .set_device_state       = rt2500pci_set_device_state,
@@ -2044,7 +2045,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .start_queue            = rt2500pci_start_queue,
         .kick_queue             = rt2500pci_kick_queue,
         .stop_queue             = rt2500pci_stop_queue,
-        .flush_queue            = rt2x00pci_flush_queue,
+        .flush_queue            = rt2x00mmio_flush_queue,
         .write_tx_desc          = rt2500pci_write_tx_desc,
         .write_beacon           = rt2500pci_write_beacon,
         .fill_rxdone            = rt2500pci_fill_rxdone,
@@ -2059,28 +2060,28 @@ static const struct data_queue_desc rt2500pci_queue_rx = {
         .entry_num              = 32,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = RXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2500pci_queue_tx = {
         .entry_num              = 32,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2500pci_queue_bcn = {
         .entry_num              = 1,
         .data_size              = MGMT_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2500pci_queue_atim = {
         .entry_num              = 8,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct rt2x00_ops rt2500pci_ops = {
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 6b2e1e431dd2..a7f7b365eff4 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -134,8 +134,8 @@ static int rt2500usb_regbusy_read(struct rt2x00_dev *rt2x00dev,
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "Indirect register access failed: "
-              "offset=0x%.08x, value=0x%.08x\n", offset, *reg);
+        rt2x00_err(rt2x00dev, "Indirect register access failed: offset=0x%.08x, value=0x%.08x\n",
+                   offset, *reg);
         *reg = ~0;
 
         return 0;
@@ -916,7 +916,7 @@ static int rt2500usb_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
         return -EACCES;
 }
 
@@ -1069,8 +1069,8 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -1353,7 +1353,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
                 eth_random_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
+                rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
@@ -1369,7 +1369,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2522);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
-                EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
@@ -1378,7 +1378,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_NIC_DYN_BBP_TUNE, 0);
                 rt2x00_set_field16(&word, EEPROM_NIC_CCK_TX_POWER, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);
-                EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_CALIBRATE_OFFSET, &word);
@@ -1386,14 +1386,15 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_CALIBRATE_OFFSET_RSSI,
                                    DEFAULT_RSSI_OFFSET);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_CALIBRATE_OFFSET, word);
-                EEPROM(rt2x00dev, "Calibrate offset: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Calibrate offset: 0x%04x\n",
+                                  word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_THRESHOLD, 45);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE, word);
-                EEPROM(rt2x00dev, "BBPtune: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "BBPtune: 0x%04x\n", word);
         }
 
         /*
@@ -1408,7 +1409,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCUPPER, 0x40);
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
-                EEPROM(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);
         } else {
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
@@ -1419,7 +1420,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_LOW, 0x48);
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_HIGH, 0x41);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R17, word);
-                EEPROM(rt2x00dev, "BBPtune r17: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r17: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R24, &word);
@@ -1427,7 +1428,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R24_LOW, 0x40);
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R24_HIGH, 0x80);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R24, word);
-                EEPROM(rt2x00dev, "BBPtune r24: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r24: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R25, &word);
@@ -1435,7 +1436,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R25_LOW, 0x40);
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R25_HIGH, 0x50);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R25, word);
-                EEPROM(rt2x00dev, "BBPtune r25: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r25: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R61, &word);
@@ -1443,7 +1444,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R61_LOW, 0x60);
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R61_HIGH, 0x6d);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R61, word);
-                EEPROM(rt2x00dev, "BBPtune r61: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r61: 0x%04x\n", word);
         }
 
         return 0;
@@ -1468,7 +1469,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_chip(rt2x00dev, RT2570, value, reg);
 
         if (((reg & 0xfff0) != 0) || ((reg & 0x0000000f) == 0)) {
-                ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RT chipset detected\n");
                 return -ENODEV;
         }
 
@@ -1478,7 +1479,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
             !rt2x00_rf(rt2x00dev, RF2525) &&
             !rt2x00_rf(rt2x00dev, RF2525E) &&
             !rt2x00_rf(rt2x00dev, RF5222)) {
-                ERROR(rt2x00dev, "Invalid RF chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 4db1088a847f..a7630d5ec892 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -51,6 +51,7 @@
  * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390)
  * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)
  * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)
+ * RF5592 2.4G/5G 2T2R
  * RF5360 2.4G 1T1R
  * RF5370 2.4G 1T1R
  * RF5390 2.4G 1T1R
@@ -68,6 +69,7 @@
 #define RF3320                          0x000b
 #define RF3322                          0x000c
 #define RF3053                          0x000d
+#define RF5592                          0x000f
 #define RF3290                          0x3290
 #define RF5360                          0x5360
 #define RF5370                          0x5370
@@ -88,11 +90,8 @@
 #define REV_RT3390E                     0x0211
 #define REV_RT5390F                     0x0502
 #define REV_RT5390R                     0x1502
+#define REV_RT5592C                     0x0221
 
-/*
- * Signal information.
- * Default offset is required for RSSI <-> dBm conversion.
- */
 #define DEFAULT_RSSI_OFFSET             120
 
 /*
@@ -690,6 +689,12 @@
 #define GPIO_SWITCH_7                   FIELD32(0x00000080)
 
 /*
+ * FIXME: where the DEBUG_INDEX name come from?
+ */
+#define MAC_DEBUG_INDEX                 0x05e8
+#define MAC_DEBUG_INDEX_XTAL            FIELD32(0x80000000)
+
+/*
  * MAC Control/Status Registers(CSR).
  * Some values are set in TU, whereas 1 TU == 1024 us.
  */
@@ -1934,6 +1939,9 @@ struct mac_iveiv_entry {
 #define BBP4_BANDWIDTH                  FIELD8(0x18)
 #define BBP4_MAC_IF_CTRL                FIELD8(0x40)
 
+/* BBP27 */
+#define BBP27_RX_CHAIN_SEL              FIELD8(0x60)
+
 /*
  * BBP 47: Bandwidth
  */
@@ -1948,6 +1956,20 @@ struct mac_iveiv_entry {
 #define BBP49_UPDATE_FLAG               FIELD8(0x01)
 
 /*
+ * BBP 105:
+ * - bit0: detect SIG on primary channel only (on 40MHz bandwidth)
+ * - bit1: FEQ (Feed Forward Compensation) for independend streams
+ * - bit2: MLD (Maximum Likehood Detection) for 2 streams (reserved on single
+ *         stream)
+ * - bit4: channel estimation updates based on remodulation of
+ *         L-SIG and HT-SIG symbols
+ */
+#define BBP105_DETECT_SIG_ON_PRIMARY    FIELD8(0x01)
+#define BBP105_FEQ                      FIELD8(0x02)
+#define BBP105_MLD                      FIELD8(0x04)
+#define BBP105_SIG_REMODULATION         FIELD8(0x08)
+
+/*
  * BBP 109
  */
 #define BBP109_TX0_POWER                FIELD8(0x0f)
@@ -1967,6 +1989,11 @@ struct mac_iveiv_entry {
 #define BBP152_RX_DEFAULT_ANT           FIELD8(0x80)
 
 /*
+ * BBP 254: unknown
+ */
+#define BBP254_BIT7                     FIELD8(0x80)
+
+/*
  * RFCSR registers
  * The wordsize of the RFCSR is 8 bits.
  */
@@ -2022,9 +2049,18 @@ struct mac_iveiv_entry {
 #define RFCSR7_BITS67                   FIELD8(0xc0)
 
 /*
+ * RFCSR 9:
+ */
+#define RFCSR9_K                        FIELD8(0x0f)
+#define RFCSR9_N                        FIELD8(0x10)
+#define RFCSR9_UNKNOWN                  FIELD8(0x60)
+#define RFCSR9_MOD                      FIELD8(0x80)
+
+/*
  * RFCSR 11:
  */
 #define RFCSR11_R                       FIELD8(0x03)
+#define RFCSR11_MOD                     FIELD8(0xc0)
 
 /*
  * RFCSR 12:
@@ -2130,11 +2166,13 @@ struct mac_iveiv_entry {
  * RFCSR 49:
  */
 #define RFCSR49_TX                      FIELD8(0x3f)
+#define RFCSR49_EP                      FIELD8(0xc0)
 
 /*
  * RFCSR 50:
  */
 #define RFCSR50_TX                      FIELD8(0x3f)
+#define RFCSR50_EP                      FIELD8(0xc0)
 
 /*
  * RF registers
@@ -2497,6 +2535,61 @@ struct mac_iveiv_entry {
 #define EEPROM_BBP_REG_ID               FIELD16(0xff00)
 
 /*
+ * EEPROM IQ Calibration, unlike other entries those are byte addresses.
+ */
+
+#define EEPROM_IQ_GAIN_CAL_TX0_2G                       0x130
+#define EEPROM_IQ_PHASE_CAL_TX0_2G                      0x131
+#define EEPROM_IQ_GROUPDELAY_CAL_TX0_2G                 0x132
+#define EEPROM_IQ_GAIN_CAL_TX1_2G                       0x133
+#define EEPROM_IQ_PHASE_CAL_TX1_2G                      0x134
+#define EEPROM_IQ_GROUPDELAY_CAL_TX1_2G                 0x135
+#define EEPROM_IQ_GAIN_CAL_RX0_2G                       0x136
+#define EEPROM_IQ_PHASE_CAL_RX0_2G                      0x137
+#define EEPROM_IQ_GROUPDELAY_CAL_RX0_2G                 0x138
+#define EEPROM_IQ_GAIN_CAL_RX1_2G                       0x139
+#define EEPROM_IQ_PHASE_CAL_RX1_2G                      0x13A
+#define EEPROM_IQ_GROUPDELAY_CAL_RX1_2G                 0x13B
+#define EEPROM_RF_IQ_COMPENSATION_CONTROL               0x13C
+#define EEPROM_RF_IQ_IMBALANCE_COMPENSATION_CONTROL     0x13D
+#define EEPROM_IQ_GAIN_CAL_TX0_CH36_TO_CH64_5G          0x144
+#define EEPROM_IQ_PHASE_CAL_TX0_CH36_TO_CH64_5G         0x145
+#define EEPROM_IQ_GAIN_CAL_TX0_CH100_TO_CH138_5G        0X146
+#define EEPROM_IQ_PHASE_CAL_TX0_CH100_TO_CH138_5G       0x147
+#define EEPROM_IQ_GAIN_CAL_TX0_CH140_TO_CH165_5G        0x148
+#define EEPROM_IQ_PHASE_CAL_TX0_CH140_TO_CH165_5G       0x149
+#define EEPROM_IQ_GAIN_CAL_TX1_CH36_TO_CH64_5G          0x14A
+#define EEPROM_IQ_PHASE_CAL_TX1_CH36_TO_CH64_5G         0x14B
+#define EEPROM_IQ_GAIN_CAL_TX1_CH100_TO_CH138_5G        0X14C
+#define EEPROM_IQ_PHASE_CAL_TX1_CH100_TO_CH138_5G       0x14D
+#define EEPROM_IQ_GAIN_CAL_TX1_CH140_TO_CH165_5G        0x14E
+#define EEPROM_IQ_PHASE_CAL_TX1_CH140_TO_CH165_5G       0x14F
+#define EEPROM_IQ_GROUPDELAY_CAL_TX0_CH36_TO_CH64_5G    0x150
+#define EEPROM_IQ_GROUPDELAY_CAL_TX1_CH36_TO_CH64_5G    0x151
+#define EEPROM_IQ_GROUPDELAY_CAL_TX0_CH100_TO_CH138_5G  0x152
+#define EEPROM_IQ_GROUPDELAY_CAL_TX1_CH100_TO_CH138_5G  0x153
+#define EEPROM_IQ_GROUPDELAY_CAL_TX0_CH140_TO_CH165_5G  0x154
+#define EEPROM_IQ_GROUPDELAY_CAL_TX1_CH140_TO_CH165_5G  0x155
+#define EEPROM_IQ_GAIN_CAL_RX0_CH36_TO_CH64_5G          0x156
+#define EEPROM_IQ_PHASE_CAL_RX0_CH36_TO_CH64_5G         0x157
+#define EEPROM_IQ_GAIN_CAL_RX0_CH100_TO_CH138_5G        0X158
+#define EEPROM_IQ_PHASE_CAL_RX0_CH100_TO_CH138_5G       0x159
+#define EEPROM_IQ_GAIN_CAL_RX0_CH140_TO_CH165_5G        0x15A
+#define EEPROM_IQ_PHASE_CAL_RX0_CH140_TO_CH165_5G       0x15B
+#define EEPROM_IQ_GAIN_CAL_RX1_CH36_TO_CH64_5G          0x15C
+#define EEPROM_IQ_PHASE_CAL_RX1_CH36_TO_CH64_5G         0x15D
+#define EEPROM_IQ_GAIN_CAL_RX1_CH100_TO_CH138_5G        0X15E
+#define EEPROM_IQ_PHASE_CAL_RX1_CH100_TO_CH138_5G       0x15F
+#define EEPROM_IQ_GAIN_CAL_RX1_CH140_TO_CH165_5G        0x160
+#define EEPROM_IQ_PHASE_CAL_RX1_CH140_TO_CH165_5G       0x161
+#define EEPROM_IQ_GROUPDELAY_CAL_RX0_CH36_TO_CH64_5G    0x162
+#define EEPROM_IQ_GROUPDELAY_CAL_RX1_CH36_TO_CH64_5G    0x163
+#define EEPROM_IQ_GROUPDELAY_CAL_RX0_CH100_TO_CH138_5G  0x164
+#define EEPROM_IQ_GROUPDELAY_CAL_RX1_CH100_TO_CH138_5G  0x165
+#define EEPROM_IQ_GROUPDELAY_CAL_RX0_CH140_TO_CH165_5G  0x166
+#define EEPROM_IQ_GROUPDELAY_CAL_RX1_CH140_TO_CH165_5G  0x167
+
+/*
  * MCU mailbox commands.
  * MCU_SLEEP - go to power-save mode.
  *             arg1: 1: save as much power as possible, 0: save less power.
@@ -2535,6 +2628,8 @@ struct mac_iveiv_entry {
 #define TXWI_DESC_SIZE                  (4 * sizeof(__le32))
 #define RXWI_DESC_SIZE                  (4 * sizeof(__le32))
 
+#define TXWI_DESC_SIZE_5592             (5 * sizeof(__le32))
+#define RXWI_DESC_SIZE_5592             (6 * sizeof(__le32))
 /*
  * TX WI structure
  */
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index a658b4bc7da2..b52d70c75e1a 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
             rt2x00_rf(rt2x00dev, RF3022))
                 return true;
 
-        WARNING(rt2x00dev, "Unknown RF chipset on rt305x\n");
+        rt2x00_warn(rt2x00dev, "Unknown RF chipset on rt305x\n");
         return false;
 }
 
@@ -328,7 +328,7 @@ int rt2800_wait_csr_ready(struct rt2x00_dev *rt2x00dev)
                 msleep(1);
         }
 
-        ERROR(rt2x00dev, "Unstable hardware.\n");
+        rt2x00_err(rt2x00dev, "Unstable hardware\n");
         return -EBUSY;
 }
 EXPORT_SYMBOL_GPL(rt2800_wait_csr_ready);
@@ -351,7 +351,7 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev)
                 msleep(10);
         }
 
-        ERROR(rt2x00dev, "WPDMA TX/RX busy [0x%08x].\n", reg);
+        rt2x00_err(rt2x00dev, "WPDMA TX/RX busy [0x%08x]\n", reg);
         return -EACCES;
 }
 EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready);
@@ -512,7 +512,7 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         if (i == REGISTER_BUSY_COUNT) {
-                ERROR(rt2x00dev, "PBF system register not ready.\n");
+                rt2x00_err(rt2x00dev, "PBF system register not ready\n");
                 return -EBUSY;
         }
 
@@ -527,8 +527,10 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
          */
         rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-        if (rt2x00_is_usb(rt2x00dev))
+        if (rt2x00_is_usb(rt2x00dev)) {
                 rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
+                rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
+        }
         msleep(1);
 
         return 0;
@@ -540,6 +542,7 @@ void rt2800_write_tx_data(struct queue_entry *entry,
 {
         __le32 *txwi = rt2800_drv_get_txwi(entry);
         u32 word;
+        int i;
 
         /*
          * Initialize TX Info descriptor
@@ -582,14 +585,16 @@ void rt2800_write_tx_data(struct queue_entry *entry,
         rt2x00_desc_write(txwi, 1, word);
 
         /*
-         * Always write 0 to IV/EIV fields, hardware will insert the IV
-         * from the IVEIV register when TXD_W3_WIV is set to 0.
+         * Always write 0 to IV/EIV fields (word 2 and 3), hardware will insert
+         * the IV from the IVEIV register when TXD_W3_WIV is set to 0.
          * When TXD_W3_WIV is set to 1 it will use the IV data
          * from the descriptor. The TXWI_W1_WIRELESS_CLI_ID indicates which
          * crypto entry in the registers should be used to encrypt the frame.
+         *
+         * Nulify all remaining words as well, we don't know how to program them.
          */
-        _rt2x00_desc_write(txwi, 2, 0 /* skbdesc->iv[0] */);
-        _rt2x00_desc_write(txwi, 3, 0 /* skbdesc->iv[1] */);
+        for (i = 2; i < entry->queue->winfo_size / sizeof(__le32); i++)
+                _rt2x00_desc_write(txwi, i, 0);
 }
 EXPORT_SYMBOL_GPL(rt2800_write_tx_data);
 
@@ -674,11 +679,10 @@ void rt2800_process_rxwi(struct queue_entry *entry,
          * Convert descriptor AGC value to RSSI value.
          */
         rxdesc->rssi = rt2800_agc_to_rssi(entry->queue->rt2x00dev, word);
-
         /*
-         * Remove RXWI descriptor from start of buffer.
+         * Remove RXWI descriptor from start of the buffer.
          */
-        skb_pull(entry->skb, RXWI_DESC_SIZE);
+        skb_pull(entry->skb, entry->queue->winfo_size);
 }
 EXPORT_SYMBOL_GPL(rt2800_process_rxwi);
 
@@ -769,6 +773,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
         unsigned int beacon_base;
         unsigned int padding_len;
         u32 orig_reg, reg;
+        const int txwi_desc_size = entry->queue->winfo_size;
 
         /*
          * Disable beaconing while we are reloading the beacon data,
@@ -782,14 +787,14 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
         /*
          * Add space for the TXWI in front of the skb.
          */
-        memset(skb_push(entry->skb, TXWI_DESC_SIZE), 0, TXWI_DESC_SIZE);
+        memset(skb_push(entry->skb, txwi_desc_size), 0, txwi_desc_size);
 
         /*
          * Register descriptor details in skb frame descriptor.
          */
         skbdesc->flags |= SKBDESC_DESC_IN_SKB;
         skbdesc->desc = entry->skb->data;
-        skbdesc->desc_len = TXWI_DESC_SIZE;
+        skbdesc->desc_len = txwi_desc_size;
 
         /*
          * Add the TXWI for the beacon to the skb.
@@ -806,7 +811,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
          */
         padding_len = roundup(entry->skb->len, 4) - entry->skb->len;
         if (padding_len && skb_pad(entry->skb, padding_len)) {
-                ERROR(rt2x00dev, "Failure padding beacon, aborting\n");
+                rt2x00_err(rt2x00dev, "Failure padding beacon, aborting\n");
                 /* skb freed by skb_pad() on failure */
                 entry->skb = NULL;
                 rt2800_register_write(rt2x00dev, BCN_TIME_CFG, orig_reg);
@@ -835,13 +840,14 @@ static inline void rt2800_clear_beacon_register(struct rt2x00_dev *rt2x00dev,
                                                 unsigned int beacon_base)
 {
         int i;
+        const int txwi_desc_size = rt2x00dev->ops->bcn->winfo_size;
 
         /*
          * For the Beacon base registers we only need to clear
          * the whole TXWI which (when set to 0) will invalidate
          * the entire beacon.
          */
-        for (i = 0; i < TXWI_DESC_SIZE; i += sizeof(__le32))
+        for (i = 0; i < txwi_desc_size; i += sizeof(__le32))
                 rt2800_register_write(rt2x00dev, beacon_base + i, 0);
 }
 
@@ -1988,8 +1994,21 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev,
 }
 
 #define POWER_BOUND             0x27
+#define POWER_BOUND_5G          0x2b
 #define FREQ_OFFSET_BOUND       0x5f
 
+static void rt2800_adjust_freq_offset(struct rt2x00_dev *rt2x00dev)
+{
+        u8 rfcsr;
+
+        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
+        if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)
+                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
+        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+}
+
 static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
                                          struct ieee80211_conf *conf,
                                          struct rf_channel *rf,
@@ -2010,12 +2029,7 @@ static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
         rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
 
-        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-        if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)
-                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);
-        else
-                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
-        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+        rt2800_adjust_freq_offset(rt2x00dev);
 
         if (rf->channel <= 14) {
                 if (rf->channel == 6)
@@ -2056,13 +2070,7 @@ static void rt2800_config_channel_rf3322(struct rt2x00_dev *rt2x00dev,
         else
                 rt2800_rfcsr_write(rt2x00dev, 48, info->default_power2);
 
-        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-        if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)
-                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);
-        else
-                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
-
-        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+        rt2800_adjust_freq_offset(rt2x00dev);
 
         rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
         rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
@@ -2127,12 +2135,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
         rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
 
-        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-        if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)
-                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);
-        else
-                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
-        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+        rt2800_adjust_freq_offset(rt2x00dev);
 
         if (rf->channel <= 14) {
                 int idx = rf->channel-1;
@@ -2184,6 +2187,382 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
         }
 }
 
+static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev,
+                                         struct ieee80211_conf *conf,
+                                         struct rf_channel *rf,
+                                         struct channel_info *info)
+{
+        u8 rfcsr, ep_reg;
+        u32 reg;
+        int power_bound;
+
+        /* TODO */
+        const bool is_11b = false;
+        const bool is_type_ep = false;
+
+        rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
+        rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL,
+                           (rf->channel > 14 || conf_is_ht40(conf)) ? 5 : 0);
+        rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
+
+        /* Order of values on rf_channel entry: N, K, mod, R */
+        rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1 & 0xff);
+
+        rt2800_rfcsr_read(rt2x00dev,  9, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR9_K, rf->rf2 & 0xf);
+        rt2x00_set_field8(&rfcsr, RFCSR9_N, (rf->rf1 & 0x100) >> 8);
+        rt2x00_set_field8(&rfcsr, RFCSR9_MOD, ((rf->rf3 - 8) & 0x4) >> 2);
+        rt2800_rfcsr_write(rt2x00dev, 9, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 11, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf4 - 1);
+        rt2x00_set_field8(&rfcsr, RFCSR11_MOD, (rf->rf3 - 8) & 0x3);
+        rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
+
+        if (rf->channel <= 14) {
+                rt2800_rfcsr_write(rt2x00dev, 10, 0x90);
+                /* FIXME: RF11 owerwrite ? */
+                rt2800_rfcsr_write(rt2x00dev, 11, 0x4A);
+                rt2800_rfcsr_write(rt2x00dev, 12, 0x52);
+                rt2800_rfcsr_write(rt2x00dev, 13, 0x42);
+                rt2800_rfcsr_write(rt2x00dev, 22, 0x40);
+                rt2800_rfcsr_write(rt2x00dev, 24, 0x4A);
+                rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x42);
+                rt2800_rfcsr_write(rt2x00dev, 36, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
+                rt2800_rfcsr_write(rt2x00dev, 38, 0x89);
+                rt2800_rfcsr_write(rt2x00dev, 39, 0x1B);
+                rt2800_rfcsr_write(rt2x00dev, 40, 0x0D);
+                rt2800_rfcsr_write(rt2x00dev, 41, 0x9B);
+                rt2800_rfcsr_write(rt2x00dev, 42, 0xD5);
+                rt2800_rfcsr_write(rt2x00dev, 43, 0x72);
+                rt2800_rfcsr_write(rt2x00dev, 44, 0x0E);
+                rt2800_rfcsr_write(rt2x00dev, 45, 0xA2);
+                rt2800_rfcsr_write(rt2x00dev, 46, 0x6B);
+                rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 51, 0x3E);
+                rt2800_rfcsr_write(rt2x00dev, 52, 0x48);
+                rt2800_rfcsr_write(rt2x00dev, 54, 0x38);
+                rt2800_rfcsr_write(rt2x00dev, 56, 0xA1);
+                rt2800_rfcsr_write(rt2x00dev, 57, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 58, 0x39);
+                rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
+                rt2800_rfcsr_write(rt2x00dev, 61, 0x91);
+                rt2800_rfcsr_write(rt2x00dev, 62, 0x39);
+
+                /* TODO RF27 <- tssi */
+
+                rfcsr = rf->channel <= 10 ? 0x07 : 0x06;
+                rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);
+                rt2800_rfcsr_write(rt2x00dev, 59, rfcsr);
+
+                if (is_11b) {
+                        /* CCK */
+                        rt2800_rfcsr_write(rt2x00dev, 31, 0xF8);
+                        rt2800_rfcsr_write(rt2x00dev, 32, 0xC0);
+                        if (is_type_ep)
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x06);
+                        else
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x47);
+                } else {
+                        /* OFDM */
+                        if (is_type_ep)
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x03);
+                        else
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
+                }
+
+                power_bound = POWER_BOUND;
+                ep_reg = 0x2;
+        } else {
+                rt2800_rfcsr_write(rt2x00dev, 10, 0x97);
+                /* FIMXE: RF11 overwrite */
+                rt2800_rfcsr_write(rt2x00dev, 11, 0x40);
+                rt2800_rfcsr_write(rt2x00dev, 25, 0xBF);
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x42);
+                rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 37, 0x04);
+                rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
+                rt2800_rfcsr_write(rt2x00dev, 40, 0x42);
+                rt2800_rfcsr_write(rt2x00dev, 41, 0xBB);
+                rt2800_rfcsr_write(rt2x00dev, 42, 0xD7);
+                rt2800_rfcsr_write(rt2x00dev, 45, 0x41);
+                rt2800_rfcsr_write(rt2x00dev, 48, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 57, 0x77);
+                rt2800_rfcsr_write(rt2x00dev, 60, 0x05);
+                rt2800_rfcsr_write(rt2x00dev, 61, 0x01);
+
+                /* TODO RF27 <- tssi */
+
+                if (rf->channel >= 36 && rf->channel <= 64) {
+
+                        rt2800_rfcsr_write(rt2x00dev, 12, 0x2E);
+                        rt2800_rfcsr_write(rt2x00dev, 13, 0x22);
+                        rt2800_rfcsr_write(rt2x00dev, 22, 0x60);
+                        rt2800_rfcsr_write(rt2x00dev, 23, 0x7F);
+                        if (rf->channel <= 50)
+                                rt2800_rfcsr_write(rt2x00dev, 24, 0x09);
+                        else if (rf->channel >= 52)
+                                rt2800_rfcsr_write(rt2x00dev, 24, 0x07);
+                        rt2800_rfcsr_write(rt2x00dev, 39, 0x1C);
+                        rt2800_rfcsr_write(rt2x00dev, 43, 0x5B);
+                        rt2800_rfcsr_write(rt2x00dev, 44, 0X40);
+                        rt2800_rfcsr_write(rt2x00dev, 46, 0X00);
+                        rt2800_rfcsr_write(rt2x00dev, 51, 0xFE);
+                        rt2800_rfcsr_write(rt2x00dev, 52, 0x0C);
+                        rt2800_rfcsr_write(rt2x00dev, 54, 0xF8);
+                        if (rf->channel <= 50) {
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x06),
+                                rt2800_rfcsr_write(rt2x00dev, 56, 0xD3);
+                        } else if (rf->channel >= 52) {
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x04);
+                                rt2800_rfcsr_write(rt2x00dev, 56, 0xBB);
+                        }
+
+                        rt2800_rfcsr_write(rt2x00dev, 58, 0x15);
+                        rt2800_rfcsr_write(rt2x00dev, 59, 0x7F);
+                        rt2800_rfcsr_write(rt2x00dev, 62, 0x15);
+
+                } else if (rf->channel >= 100 && rf->channel <= 165) {
+
+                        rt2800_rfcsr_write(rt2x00dev, 12, 0x0E);
+                        rt2800_rfcsr_write(rt2x00dev, 13, 0x42);
+                        rt2800_rfcsr_write(rt2x00dev, 22, 0x40);
+                        if (rf->channel <= 153) {
+                                rt2800_rfcsr_write(rt2x00dev, 23, 0x3C);
+                                rt2800_rfcsr_write(rt2x00dev, 24, 0x06);
+                        } else if (rf->channel >= 155) {
+                                rt2800_rfcsr_write(rt2x00dev, 23, 0x38);
+                                rt2800_rfcsr_write(rt2x00dev, 24, 0x05);
+                        }
+                        if (rf->channel <= 138) {
+                                rt2800_rfcsr_write(rt2x00dev, 39, 0x1A);
+                                rt2800_rfcsr_write(rt2x00dev, 43, 0x3B);
+                                rt2800_rfcsr_write(rt2x00dev, 44, 0x20);
+                                rt2800_rfcsr_write(rt2x00dev, 46, 0x18);
+                        } else if (rf->channel >= 140) {
+                                rt2800_rfcsr_write(rt2x00dev, 39, 0x18);
+                                rt2800_rfcsr_write(rt2x00dev, 43, 0x1B);
+                                rt2800_rfcsr_write(rt2x00dev, 44, 0x10);
+                                rt2800_rfcsr_write(rt2x00dev, 46, 0X08);
+                        }
+                        if (rf->channel <= 124)
+                                rt2800_rfcsr_write(rt2x00dev, 51, 0xFC);
+                        else if (rf->channel >= 126)
+                                rt2800_rfcsr_write(rt2x00dev, 51, 0xEC);
+                        if (rf->channel <= 138)
+                                rt2800_rfcsr_write(rt2x00dev, 52, 0x06);
+                        else if (rf->channel >= 140)
+                                rt2800_rfcsr_write(rt2x00dev, 52, 0x06);
+                        rt2800_rfcsr_write(rt2x00dev, 54, 0xEB);
+                        if (rf->channel <= 138)
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x01);
+                        else if (rf->channel >= 140)
+                                rt2800_rfcsr_write(rt2x00dev, 55, 0x00);
+                        if (rf->channel <= 128)
+                                rt2800_rfcsr_write(rt2x00dev, 56, 0xBB);
+                        else if (rf->channel >= 130)
+                                rt2800_rfcsr_write(rt2x00dev, 56, 0xAB);
+                        if (rf->channel <= 116)
+                                rt2800_rfcsr_write(rt2x00dev, 58, 0x1D);
+                        else if (rf->channel >= 118)
+                                rt2800_rfcsr_write(rt2x00dev, 58, 0x15);
+                        if (rf->channel <= 138)
+                                rt2800_rfcsr_write(rt2x00dev, 59, 0x3F);
+                        else if (rf->channel >= 140)
+                                rt2800_rfcsr_write(rt2x00dev, 59, 0x7C);
+                        if (rf->channel <= 116)
+                                rt2800_rfcsr_write(rt2x00dev, 62, 0x1D);
+                        else if (rf->channel >= 118)
+                                rt2800_rfcsr_write(rt2x00dev, 62, 0x15);
+                }
+
+                power_bound = POWER_BOUND_5G;
+                ep_reg = 0x3;
+        }
+
+        rt2800_rfcsr_read(rt2x00dev, 49, &rfcsr);
+        if (info->default_power1 > power_bound)
+                rt2x00_set_field8(&rfcsr, RFCSR49_TX, power_bound);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
+        if (is_type_ep)
+                rt2x00_set_field8(&rfcsr, RFCSR49_EP, ep_reg);
+        rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
+        if (info->default_power1 > power_bound)
+                rt2x00_set_field8(&rfcsr, RFCSR50_TX, power_bound);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR50_TX, info->default_power2);
+        if (is_type_ep)
+                rt2x00_set_field8(&rfcsr, RFCSR50_EP, ep_reg);
+        rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
+        rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
+
+        rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD,
+                          rt2x00dev->default_ant.tx_chain_num >= 1);
+        rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD,
+                          rt2x00dev->default_ant.tx_chain_num == 2);
+        rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 0);
+
+        rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD,
+                          rt2x00dev->default_ant.rx_chain_num >= 1);
+        rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD,
+                          rt2x00dev->default_ant.rx_chain_num == 2);
+        rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 0);
+
+        rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0xe4);
+
+        if (conf_is_ht40(conf))
+                rt2800_rfcsr_write(rt2x00dev, 30, 0x16);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
+
+        if (!is_11b) {
+                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
+        }
+
+        /* TODO proper frequency adjustment */
+        rt2800_adjust_freq_offset(rt2x00dev);
+
+        /* TODO merge with others */
+        rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
+        rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
+
+        /* BBP settings */
+        rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
+        rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
+        rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
+
+        rt2800_bbp_write(rt2x00dev, 79, (rf->channel <= 14) ? 0x1C : 0x18);
+        rt2800_bbp_write(rt2x00dev, 80, (rf->channel <= 14) ? 0x0E : 0x08);
+        rt2800_bbp_write(rt2x00dev, 81, (rf->channel <= 14) ? 0x3A : 0x38);
+        rt2800_bbp_write(rt2x00dev, 82, (rf->channel <= 14) ? 0x62 : 0x92);
+
+        /* GLRT band configuration */
+        rt2800_bbp_write(rt2x00dev, 195, 128);
+        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0xE0 : 0xF0);
+        rt2800_bbp_write(rt2x00dev, 195, 129);
+        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x1F : 0x1E);
+        rt2800_bbp_write(rt2x00dev, 195, 130);
+        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x38 : 0x28);
+        rt2800_bbp_write(rt2x00dev, 195, 131);
+        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x32 : 0x20);
+        rt2800_bbp_write(rt2x00dev, 195, 133);
+        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x28 : 0x7F);
+        rt2800_bbp_write(rt2x00dev, 195, 124);
+        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F);
+}
+
+static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,
+                                           const unsigned int word,
+                                           const u8 value)
+{
+        u8 chain, reg;
+
+        for (chain = 0; chain < rt2x00dev->default_ant.rx_chain_num; chain++) {
+                rt2800_bbp_read(rt2x00dev, 27, &reg);
+                rt2x00_set_field8(&reg,  BBP27_RX_CHAIN_SEL, chain);
+                rt2800_bbp_write(rt2x00dev, 27, reg);
+
+                rt2800_bbp_write(rt2x00dev, word, value);
+        }
+}
+
+static void rt2800_iq_calibrate(struct rt2x00_dev *rt2x00dev, int channel)
+{
+        u8 cal;
+
+        /* TX0 IQ Gain */
+        rt2800_bbp_write(rt2x00dev, 158, 0x2c);
+        if (channel <= 14)
+                cal = rt2x00_eeprom_byte(rt2x00dev, EEPROM_IQ_GAIN_CAL_TX0_2G);
+        else if (channel >= 36 && channel <= 64)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_GAIN_CAL_TX0_CH36_TO_CH64_5G);
+        else if (channel >= 100 && channel <= 138)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_GAIN_CAL_TX0_CH100_TO_CH138_5G);
+        else if (channel >= 140 && channel <= 165)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_GAIN_CAL_TX0_CH140_TO_CH165_5G);
+        else
+                cal = 0;
+        rt2800_bbp_write(rt2x00dev, 159, cal);
+
+        /* TX0 IQ Phase */
+        rt2800_bbp_write(rt2x00dev, 158, 0x2d);
+        if (channel <= 14)
+                cal = rt2x00_eeprom_byte(rt2x00dev, EEPROM_IQ_PHASE_CAL_TX0_2G);
+        else if (channel >= 36 && channel <= 64)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_PHASE_CAL_TX0_CH36_TO_CH64_5G);
+        else if (channel >= 100 && channel <= 138)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_PHASE_CAL_TX0_CH100_TO_CH138_5G);
+        else if (channel >= 140 && channel <= 165)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_PHASE_CAL_TX0_CH140_TO_CH165_5G);
+        else
+                cal = 0;
+        rt2800_bbp_write(rt2x00dev, 159, cal);
+
+        /* TX1 IQ Gain */
+        rt2800_bbp_write(rt2x00dev, 158, 0x4a);
+        if (channel <= 14)
+                cal = rt2x00_eeprom_byte(rt2x00dev, EEPROM_IQ_GAIN_CAL_TX1_2G);
+        else if (channel >= 36 && channel <= 64)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_GAIN_CAL_TX1_CH36_TO_CH64_5G);
+        else if (channel >= 100 && channel <= 138)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_GAIN_CAL_TX1_CH100_TO_CH138_5G);
+        else if (channel >= 140 && channel <= 165)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_GAIN_CAL_TX1_CH140_TO_CH165_5G);
+        else
+                cal = 0;
+        rt2800_bbp_write(rt2x00dev, 159, cal);
+
+        /* TX1 IQ Phase */
+        rt2800_bbp_write(rt2x00dev, 158, 0x4b);
+        if (channel <= 14)
+                cal = rt2x00_eeprom_byte(rt2x00dev, EEPROM_IQ_PHASE_CAL_TX1_2G);
+        else if (channel >= 36 && channel <= 64)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_PHASE_CAL_TX1_CH36_TO_CH64_5G);
+        else if (channel >= 100 && channel <= 138)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_PHASE_CAL_TX1_CH100_TO_CH138_5G);
+        else if (channel >= 140 && channel <= 165)
+                cal = rt2x00_eeprom_byte(rt2x00dev,
+                                         EEPROM_IQ_PHASE_CAL_TX1_CH140_TO_CH165_5G);
+        else
+                cal = 0;
+        rt2800_bbp_write(rt2x00dev, 159, cal);
+
+        /* FIXME: possible RX0, RX1 callibration ? */
+
+        /* RF IQ compensation control */
+        rt2800_bbp_write(rt2x00dev, 158, 0x04);
+        cal = rt2x00_eeprom_byte(rt2x00dev, EEPROM_RF_IQ_COMPENSATION_CONTROL);
+        rt2800_bbp_write(rt2x00dev, 159, cal != 0xff ? cal : 0);
+
+        /* RF IQ imbalance compensation control */
+        rt2800_bbp_write(rt2x00dev, 158, 0x03);
+        cal = rt2x00_eeprom_byte(rt2x00dev,
+                                 EEPROM_RF_IQ_IMBALANCE_COMPENSATION_CONTROL);
+        rt2800_bbp_write(rt2x00dev, 159, cal != 0xff ? cal : 0);
+}
+
 static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
                                   struct ieee80211_conf *conf,
                                   struct rf_channel *rf,
@@ -2225,6 +2604,9 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         case RF5392:
                 rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);
                 break;
+        case RF5592:
+                rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);
+                break;
         default:
                 rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
         }
@@ -2326,6 +2708,17 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         if (rt2x00_rt(rt2x00dev, RT3572))
                 rt2800_rfcsr_write(rt2x00dev, 8, 0x80);
 
+        if (rt2x00_rt(rt2x00dev, RT5592)) {
+                rt2800_bbp_write(rt2x00dev, 195, 141);
+                rt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a);
+
+                /* AGC init */
+                reg = (rf->channel <= 14 ? 0x1c : 0x24) + 2 * rt2x00dev->lna_gain;
+                rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);
+
+                rt2800_iq_calibrate(rt2x00dev, rf->channel);
+        }
+
         rt2800_bbp_read(rt2x00dev, 4, &bbp);
         rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
         rt2800_bbp_write(rt2x00dev, 4, bbp);
@@ -2763,7 +3156,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
 
 void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev)
 {
-        rt2800_config_txpower(rt2x00dev, rt2x00dev->hw->conf.channel,
+        rt2800_config_txpower(rt2x00dev, rt2x00dev->hw->conf.chandef.chan,
                               rt2x00dev->tx_power);
 }
 EXPORT_SYMBOL_GPL(rt2800_gain_calibration);
@@ -2898,11 +3291,11 @@ void rt2800_config(struct rt2x00_dev *rt2x00dev,
         if (flags & IEEE80211_CONF_CHANGE_CHANNEL) {
                 rt2800_config_channel(rt2x00dev, libconf->conf,
                                       &libconf->rf, &libconf->channel);
-                rt2800_config_txpower(rt2x00dev, libconf->conf->channel,
+                rt2800_config_txpower(rt2x00dev, libconf->conf->chandef.chan,
                                       libconf->conf->power_level);
         }
         if (flags & IEEE80211_CONF_CHANGE_POWER)
-                rt2800_config_txpower(rt2x00dev, libconf->conf->channel,
+                rt2800_config_txpower(rt2x00dev, libconf->conf->chandef.chan,
                                       libconf->conf->power_level);
         if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
                 rt2800_config_retry_limit(rt2x00dev, libconf);
@@ -2938,13 +3331,16 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)
                     rt2x00_rt(rt2x00dev, RT3390) ||
                     rt2x00_rt(rt2x00dev, RT3572) ||
                     rt2x00_rt(rt2x00dev, RT5390) ||
-                    rt2x00_rt(rt2x00dev, RT5392))
+                    rt2x00_rt(rt2x00dev, RT5392) ||
+                    rt2x00_rt(rt2x00dev, RT5592))
                         vgc = 0x1c + (2 * rt2x00dev->lna_gain);
                 else
                         vgc = 0x2e + rt2x00dev->lna_gain;
         } else { /* 5GHZ band */
                 if (rt2x00_rt(rt2x00dev, RT3572))
                         vgc = 0x22 + (rt2x00dev->lna_gain * 5) / 3;
+                else if (rt2x00_rt(rt2x00dev, RT5592))
+                        vgc = 0x24 + (2 * rt2x00dev->lna_gain);
                 else {
                         if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
                                 vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
@@ -2960,7 +3356,11 @@ static inline void rt2800_set_vgc(struct rt2x00_dev *rt2x00dev,
                                   struct link_qual *qual, u8 vgc_level)
 {
         if (qual->vgc_level != vgc_level) {
-                rt2800_bbp_write(rt2x00dev, 66, vgc_level);
+                if (rt2x00_rt(rt2x00dev, RT5592)) {
+                        rt2800_bbp_write(rt2x00dev, 83, qual->rssi > -65 ? 0x4a : 0x7a);
+                        rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, vgc_level);
+                } else
+                        rt2800_bbp_write(rt2x00dev, 66, vgc_level);
                 qual->vgc_level = vgc_level;
                 qual->vgc_level_reg = vgc_level;
         }
@@ -2975,15 +3375,23 @@ EXPORT_SYMBOL_GPL(rt2800_reset_tuner);
 void rt2800_link_tuner(struct rt2x00_dev *rt2x00dev, struct link_qual *qual,
                        const u32 count)
 {
+        u8 vgc;
+
         if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860C))
                 return;
-
         /*
-         * When RSSI is better then -80 increase VGC level with 0x10
+         * When RSSI is better then -80 increase VGC level with 0x10, except
+         * for rt5592 chip.
          */
-        rt2800_set_vgc(rt2x00dev, qual,
-                       rt2800_get_default_vgc(rt2x00dev) +
-                       ((qual->rssi > -80) * 0x10));
+
+        vgc = rt2800_get_default_vgc(rt2x00dev);
+
+        if (rt2x00_rt(rt2x00dev, RT5592) && qual->rssi > -65)
+                vgc += 0x20;
+        else if (qual->rssi > -80)
+                vgc += 0x10;
+
+        rt2800_set_vgc(rt2x00dev, qual, vgc);
 }
 EXPORT_SYMBOL_GPL(rt2800_link_tuner);
 
@@ -3122,7 +3530,8 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
                 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
                 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
         } else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                   rt2x00_rt(rt2x00dev, RT5392)) {
+                   rt2x00_rt(rt2x00dev, RT5392) ||
+                   rt2x00_rt(rt2x00dev, RT5592)) {
                 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
                 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
                 rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
@@ -3302,7 +3711,8 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, TXOP_CTRL_CFG_EXT_CWMIN, 0);
         rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
 
-        rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, 0x00000002);
+        reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
+        rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
 
         rt2800_register_read(rt2x00dev, TX_RTS_CFG, &reg);
         rt2x00_set_field32(&reg, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 32);
@@ -3459,7 +3869,7 @@ static int rt2800_wait_bbp_rf_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP/RF register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP/RF register access failed, aborting\n");
         return -EACCES;
 }
 
@@ -3483,10 +3893,140 @@ static int rt2800_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
         return -EACCES;
 }
 
+static void rt2800_bbp4_mac_if_ctrl(struct rt2x00_dev *rt2x00dev)
+{
+        u8 value;
+
+        rt2800_bbp_read(rt2x00dev, 4, &value);
+        rt2x00_set_field8(&value, BBP4_MAC_IF_CTRL, 1);
+        rt2800_bbp_write(rt2x00dev, 4, value);
+}
+
+static void rt2800_init_freq_calibration(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_bbp_write(rt2x00dev, 142, 1);
+        rt2800_bbp_write(rt2x00dev, 143, 57);
+}
+
+static void rt2800_init_bbp_5592_glrt(struct rt2x00_dev *rt2x00dev)
+{
+        const u8 glrt_table[] = {
+                0xE0, 0x1F, 0X38, 0x32, 0x08, 0x28, 0x19, 0x0A, 0xFF, 0x00, /* 128 ~ 137 */
+                0x16, 0x10, 0x10, 0x0B, 0x36, 0x2C, 0x26, 0x24, 0x42, 0x36, /* 138 ~ 147 */
+                0x30, 0x2D, 0x4C, 0x46, 0x3D, 0x40, 0x3E, 0x42, 0x3D, 0x40, /* 148 ~ 157 */
+                0X3C, 0x34, 0x2C, 0x2F, 0x3C, 0x35, 0x2E, 0x2A, 0x49, 0x41, /* 158 ~ 167 */
+                0x36, 0x31, 0x30, 0x30, 0x0E, 0x0D, 0x28, 0x21, 0x1C, 0x16, /* 168 ~ 177 */
+                0x50, 0x4A, 0x43, 0x40, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, /* 178 ~ 187 */
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 188 ~ 197 */
+                0x00, 0x00, 0x7D, 0x14, 0x32, 0x2C, 0x36, 0x4C, 0x43, 0x2C, /* 198 ~ 207 */
+                0x2E, 0x36, 0x30, 0x6E,                                     /* 208 ~ 211 */
+        };
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(glrt_table); i++) {
+                rt2800_bbp_write(rt2x00dev, 195, 128 + i);
+                rt2800_bbp_write(rt2x00dev, 196, glrt_table[i]);
+        }
+};
+
+static void rt2800_init_bbp_early(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_bbp_write(rt2x00dev, 65, 0x2C);
+        rt2800_bbp_write(rt2x00dev, 66, 0x38);
+        rt2800_bbp_write(rt2x00dev, 68, 0x0B);
+        rt2800_bbp_write(rt2x00dev, 69, 0x12);
+        rt2800_bbp_write(rt2x00dev, 70, 0x0a);
+        rt2800_bbp_write(rt2x00dev, 73, 0x10);
+        rt2800_bbp_write(rt2x00dev, 81, 0x37);
+        rt2800_bbp_write(rt2x00dev, 82, 0x62);
+        rt2800_bbp_write(rt2x00dev, 83, 0x6A);
+        rt2800_bbp_write(rt2x00dev, 84, 0x99);
+        rt2800_bbp_write(rt2x00dev, 86, 0x00);
+        rt2800_bbp_write(rt2x00dev, 91, 0x04);
+        rt2800_bbp_write(rt2x00dev, 92, 0x00);
+        rt2800_bbp_write(rt2x00dev, 103, 0x00);
+        rt2800_bbp_write(rt2x00dev, 105, 0x05);
+        rt2800_bbp_write(rt2x00dev, 106, 0x35);
+}
+
+static void rt2800_init_bbp_5592(struct rt2x00_dev *rt2x00dev)
+{
+        int ant, div_mode;
+        u16 eeprom;
+        u8 value;
+
+        rt2800_init_bbp_early(rt2x00dev);
+
+        rt2800_bbp_read(rt2x00dev, 105, &value);
+        rt2x00_set_field8(&value, BBP105_MLD,
+                          rt2x00dev->default_ant.rx_chain_num == 2);
+        rt2800_bbp_write(rt2x00dev, 105, value);
+
+        rt2800_bbp4_mac_if_ctrl(rt2x00dev);
+
+        rt2800_bbp_write(rt2x00dev, 20, 0x06);
+        rt2800_bbp_write(rt2x00dev, 31, 0x08);
+        rt2800_bbp_write(rt2x00dev, 65, 0x2C);
+        rt2800_bbp_write(rt2x00dev, 68, 0xDD);
+        rt2800_bbp_write(rt2x00dev, 69, 0x1A);
+        rt2800_bbp_write(rt2x00dev, 70, 0x05);
+        rt2800_bbp_write(rt2x00dev, 73, 0x13);
+        rt2800_bbp_write(rt2x00dev, 74, 0x0F);
+        rt2800_bbp_write(rt2x00dev, 75, 0x4F);
+        rt2800_bbp_write(rt2x00dev, 76, 0x28);
+        rt2800_bbp_write(rt2x00dev, 77, 0x59);
+        rt2800_bbp_write(rt2x00dev, 84, 0x9A);
+        rt2800_bbp_write(rt2x00dev, 86, 0x38);
+        rt2800_bbp_write(rt2x00dev, 88, 0x90);
+        rt2800_bbp_write(rt2x00dev, 91, 0x04);
+        rt2800_bbp_write(rt2x00dev, 92, 0x02);
+        rt2800_bbp_write(rt2x00dev, 95, 0x9a);
+        rt2800_bbp_write(rt2x00dev, 98, 0x12);
+        rt2800_bbp_write(rt2x00dev, 103, 0xC0);
+        rt2800_bbp_write(rt2x00dev, 104, 0x92);
+        /* FIXME BBP105 owerwrite */
+        rt2800_bbp_write(rt2x00dev, 105, 0x3C);
+        rt2800_bbp_write(rt2x00dev, 106, 0x35);
+        rt2800_bbp_write(rt2x00dev, 128, 0x12);
+        rt2800_bbp_write(rt2x00dev, 134, 0xD0);
+        rt2800_bbp_write(rt2x00dev, 135, 0xF6);
+        rt2800_bbp_write(rt2x00dev, 137, 0x0F);
+
+        /* Initialize GLRT (Generalized Likehood Radio Test) */
+        rt2800_init_bbp_5592_glrt(rt2x00dev);
+
+        rt2800_bbp4_mac_if_ctrl(rt2x00dev);
+
+        rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
+        div_mode = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_ANT_DIVERSITY);
+        ant = (div_mode == 3) ? 1 : 0;
+        rt2800_bbp_read(rt2x00dev, 152, &value);
+        if (ant == 0) {
+                /* Main antenna */
+                rt2x00_set_field8(&value, BBP152_RX_DEFAULT_ANT, 1);
+        } else {
+                /* Auxiliary antenna */
+                rt2x00_set_field8(&value, BBP152_RX_DEFAULT_ANT, 0);
+        }
+        rt2800_bbp_write(rt2x00dev, 152, value);
+
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5592, REV_RT5592C)) {
+                rt2800_bbp_read(rt2x00dev, 254, &value);
+                rt2x00_set_field8(&value, BBP254_BIT7, 1);
+                rt2800_bbp_write(rt2x00dev, 254, value);
+        }
+
+        rt2800_init_freq_calibration(rt2x00dev);
+
+        rt2800_bbp_write(rt2x00dev, 84, 0x19);
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5592, REV_RT5592C))
+                rt2800_bbp_write(rt2x00dev, 103, 0xc0);
+}
+
 static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
 {
         unsigned int i;
@@ -3498,6 +4038,11 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                      rt2800_wait_bbp_ready(rt2x00dev)))
                 return -EACCES;
 
+        if (rt2x00_rt(rt2x00dev, RT5592)) {
+                rt2800_init_bbp_5592(rt2x00dev);
+                return 0;
+        }
+
         if (rt2x00_rt(rt2x00dev, RT3352)) {
                 rt2800_bbp_write(rt2x00dev, 3, 0x00);
                 rt2800_bbp_write(rt2x00dev, 4, 0x50);
@@ -3505,11 +4050,8 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
 
         if (rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT5390) ||
-            rt2x00_rt(rt2x00dev, RT5392)) {
-                rt2800_bbp_read(rt2x00dev, 4, &value);
-                rt2x00_set_field8(&value, BBP4_MAC_IF_CTRL, 1);
-                rt2800_bbp_write(rt2x00dev, 4, value);
-        }
+            rt2x00_rt(rt2x00dev, RT5392))
+                rt2800_bbp4_mac_if_ctrl(rt2x00dev);
 
         if (rt2800_is_305x_soc(rt2x00dev) ||
             rt2x00_rt(rt2x00dev, RT3290) ||
@@ -3783,9 +4325,7 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                         rt2x00_set_field8(&value, BBP152_RX_DEFAULT_ANT, 0);
                 rt2800_bbp_write(rt2x00dev, 152, value);
 
-                /* Init frequency calibration */
-                rt2800_bbp_write(rt2x00dev, 142, 1);
-                rt2800_bbp_write(rt2x00dev, 143, 57);
+                rt2800_init_freq_calibration(rt2x00dev);
         }
 
         for (i = 0; i < EEPROM_BBP_SIZE; i++) {
@@ -3801,8 +4341,17 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
         return 0;
 }
 
-static u8 rt2800_init_rx_filter(struct rt2x00_dev *rt2x00dev,
-                                bool bw40, u8 rfcsr24, u8 filter_target)
+static void rt2800_led_open_drain_enable(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+
+        rt2800_register_read(rt2x00dev, OPT_14_CSR, &reg);
+        rt2x00_set_field32(&reg, OPT_14_CSR_BIT0, 1);
+        rt2800_register_write(rt2x00dev, OPT_14_CSR, reg);
+}
+
+static u8 rt2800_init_rx_filter(struct rt2x00_dev *rt2x00dev, bool bw40,
+                                u8 filter_target)
 {
         unsigned int i;
         u8 bbp;
@@ -3810,6 +4359,7 @@ static u8 rt2800_init_rx_filter(struct rt2x00_dev *rt2x00dev,
         u8 passband;
         u8 stopband;
         u8 overtuned = 0;
+        u8 rfcsr24 = (bw40) ? 0x27 : 0x07;
 
         rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);
 
@@ -3865,8 +4415,169 @@ static u8 rt2800_init_rx_filter(struct rt2x00_dev *rt2x00dev,
         return rfcsr24;
 }
 
+static void rt2800_rf_init_calibration(struct rt2x00_dev *rt2x00dev,
+                                       const unsigned int rf_reg)
+{
+        u8 rfcsr;
+
+        rt2800_rfcsr_read(rt2x00dev, rf_reg, &rfcsr);
+        rt2x00_set_field8(&rfcsr, FIELD8(0x80), 1);
+        rt2800_rfcsr_write(rt2x00dev, rf_reg, rfcsr);
+        msleep(1);
+        rt2x00_set_field8(&rfcsr, FIELD8(0x80), 0);
+        rt2800_rfcsr_write(rt2x00dev, rf_reg, rfcsr);
+}
+
+static void rt2800_rx_filter_calibration(struct rt2x00_dev *rt2x00dev)
+{
+        struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
+        u8 filter_tgt_bw20;
+        u8 filter_tgt_bw40;
+        u8 rfcsr, bbp;
+
+        /*
+         * TODO: sync filter_tgt values with vendor driver
+         */
+        if (rt2x00_rt(rt2x00dev, RT3070)) {
+                filter_tgt_bw20 = 0x16;
+                filter_tgt_bw40 = 0x19;
+        } else {
+                filter_tgt_bw20 = 0x13;
+                filter_tgt_bw40 = 0x15;
+        }
+
+        drv_data->calibration_bw20 =
+                rt2800_init_rx_filter(rt2x00dev, false, filter_tgt_bw20);
+        drv_data->calibration_bw40 =
+                rt2800_init_rx_filter(rt2x00dev, true, filter_tgt_bw40);
+
+        /*
+         * Save BBP 25 & 26 values for later use in channel switching (for 3052)
+         */
+        rt2800_bbp_read(rt2x00dev, 25, &drv_data->bbp25);
+        rt2800_bbp_read(rt2x00dev, 26, &drv_data->bbp26);
+
+        /*
+         * Set back to initial state
+         */
+        rt2800_bbp_write(rt2x00dev, 24, 0);
+
+        rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 0);
+        rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
+
+        /*
+         * Set BBP back to BW20
+         */
+        rt2800_bbp_read(rt2x00dev, 4, &bbp);
+        rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 0);
+        rt2800_bbp_write(rt2x00dev, 4, bbp);
+}
+
+static void rt2800_normal_mode_setup_3xxx(struct rt2x00_dev *rt2x00dev)
+{
+        struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
+        u8 min_gain, rfcsr, bbp;
+        u16 eeprom;
+
+        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
+
+        rt2x00_set_field8(&rfcsr, RFCSR17_TX_LO1_EN, 0);
+        if (rt2x00_rt(rt2x00dev, RT3070) ||
+            rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
+            rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
+            rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {
+                if (!test_bit(CAPABILITY_EXTERNAL_LNA_BG, &rt2x00dev->cap_flags))
+                        rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);
+        }
+
+        min_gain = rt2x00_rt(rt2x00dev, RT3070) ? 1 : 2;
+        if (drv_data->txmixer_gain_24g >= min_gain) {
+                rt2x00_set_field8(&rfcsr, RFCSR17_TXMIXER_GAIN,
+                                  drv_data->txmixer_gain_24g);
+        }
+
+        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+
+        if (rt2x00_rt(rt2x00dev, RT3090)) {
+                /*  Turn off unused DAC1 and ADC1 to reduce power consumption */
+                rt2800_bbp_read(rt2x00dev, 138, &bbp);
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
+                if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
+                        rt2x00_set_field8(&bbp, BBP138_RX_ADC1, 0);
+                if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
+                        rt2x00_set_field8(&bbp, BBP138_TX_DAC1, 1);
+                rt2800_bbp_write(rt2x00dev, 138, bbp);
+        }
+
+        if (rt2x00_rt(rt2x00dev, RT3070)) {
+                rt2800_rfcsr_read(rt2x00dev, 27, &rfcsr);
+                if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F))
+                        rt2x00_set_field8(&rfcsr, RFCSR27_R1, 3);
+                else
+                        rt2x00_set_field8(&rfcsr, RFCSR27_R1, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR27_R2, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR27_R3, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR27_R4, 0);
+                rt2800_rfcsr_write(rt2x00dev, 27, rfcsr);
+        } else if (rt2x00_rt(rt2x00dev, RT3071) ||
+                   rt2x00_rt(rt2x00dev, RT3090) ||
+                   rt2x00_rt(rt2x00dev, RT3390)) {
+                rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
+                rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
+                rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
+                rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
+
+                rt2800_rfcsr_read(rt2x00dev, 15, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR15_TX_LO2_EN, 0);
+                rt2800_rfcsr_write(rt2x00dev, 15, rfcsr);
+
+                rt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR20_RX_LO1_EN, 0);
+                rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
+
+                rt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR21_RX_LO2_EN, 0);
+                rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
+        }
+}
+
+static void rt2800_normal_mode_setup_5xxx(struct rt2x00_dev *rt2x00dev)
+{
+        u8 reg;
+        u16 eeprom;
+
+        /*  Turn off unused DAC1 and ADC1 to reduce power consumption */
+        rt2800_bbp_read(rt2x00dev, 138, &reg);
+        rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
+        if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
+                rt2x00_set_field8(&reg, BBP138_RX_ADC1, 0);
+        if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
+                rt2x00_set_field8(&reg, BBP138_TX_DAC1, 1);
+        rt2800_bbp_write(rt2x00dev, 138, reg);
+
+        rt2800_rfcsr_read(rt2x00dev, 38, &reg);
+        rt2x00_set_field8(&reg, RFCSR38_RX_LO1_EN, 0);
+        rt2800_rfcsr_write(rt2x00dev, 38, reg);
+
+        rt2800_rfcsr_read(rt2x00dev, 39, &reg);
+        rt2x00_set_field8(&reg, RFCSR39_RX_LO2_EN, 0);
+        rt2800_rfcsr_write(rt2x00dev, 39, reg);
+
+        rt2800_bbp4_mac_if_ctrl(rt2x00dev);
+
+        rt2800_rfcsr_read(rt2x00dev, 30, &reg);
+        rt2x00_set_field8(&reg, RFCSR30_RX_VCM, 2);
+        rt2800_rfcsr_write(rt2x00dev, 30, reg);
+}
+
 static void rt2800_init_rfcsr_305x_soc(struct rt2x00_dev *rt2x00dev)
 {
+        rt2800_rf_init_calibration(rt2x00dev, 30);
+
         rt2800_rfcsr_write(rt2x00dev, 0, 0x50);
         rt2800_rfcsr_write(rt2x00dev, 1, 0x01);
         rt2800_rfcsr_write(rt2x00dev, 2, 0xf7);
@@ -3903,6 +4614,13 @@ static void rt2800_init_rfcsr_305x_soc(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_30xx(struct rt2x00_dev *rt2x00dev)
 {
+        u8 rfcsr;
+        u16 eeprom;
+        u32 reg;
+
+        /* XXX vendor driver do this only for 3070 */
+        rt2800_rf_init_calibration(rt2x00dev, 30);
+
         rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
         rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
         rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
@@ -3922,10 +4640,54 @@ static void rt2800_init_rfcsr_30xx(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
         rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
         rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
+
+        if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F)) {
+                rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
+                rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
+                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 3);
+                rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
+        } else if (rt2x00_rt(rt2x00dev, RT3071) ||
+                   rt2x00_rt(rt2x00dev, RT3090)) {
+                rt2800_rfcsr_write(rt2x00dev, 31, 0x14);
+
+                rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR6_R2, 1);
+                rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
+
+                rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
+                rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
+                if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
+                    rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E)) {
+                        rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
+                        if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_DAC_TEST))
+                                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 3);
+                        else
+                                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 0);
+                }
+                rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
+
+                rt2800_register_read(rt2x00dev, GPIO_SWITCH, &reg);
+                rt2x00_set_field32(&reg, GPIO_SWITCH_5, 0);
+                rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);
+        }
+
+        rt2800_rx_filter_calibration(rt2x00dev);
+
+        if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F) ||
+            rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
+            rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E))
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
+
+        rt2800_led_open_drain_enable(rt2x00dev);
+        rt2800_normal_mode_setup_3xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_3290(struct rt2x00_dev *rt2x00dev)
 {
+        u8 rfcsr;
+
+        rt2800_rf_init_calibration(rt2x00dev, 2);
+
         rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
         rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
         rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
@@ -3972,10 +4734,19 @@ static void rt2800_init_rfcsr_3290(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 59, 0x09);
         rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
         rt2800_rfcsr_write(rt2x00dev, 61, 0xc1);
+
+        rt2800_rfcsr_read(rt2x00dev, 29, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR29_RSSI_GAIN, 3);
+        rt2800_rfcsr_write(rt2x00dev, 29, rfcsr);
+
+        rt2800_led_open_drain_enable(rt2x00dev);
+        rt2800_normal_mode_setup_3xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
 {
+        rt2800_rf_init_calibration(rt2x00dev, 30);
+
         rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
         rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
         rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
@@ -4039,10 +4810,18 @@ static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
         rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
         rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
+
+        rt2800_rx_filter_calibration(rt2x00dev);
+        rt2800_led_open_drain_enable(rt2x00dev);
+        rt2800_normal_mode_setup_3xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev)
 {
+        u32 reg;
+
+        rt2800_rf_init_calibration(rt2x00dev, 30);
+
         rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
         rt2800_rfcsr_write(rt2x00dev, 1, 0xe1);
         rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
@@ -4075,10 +4854,27 @@ static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 29, 0x8f);
         rt2800_rfcsr_write(rt2x00dev, 30, 0x20);
         rt2800_rfcsr_write(rt2x00dev, 31, 0x0f);
+
+        rt2800_register_read(rt2x00dev, GPIO_SWITCH, &reg);
+        rt2x00_set_field32(&reg, GPIO_SWITCH_5, 0);
+        rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);
+
+        rt2800_rx_filter_calibration(rt2x00dev);
+
+        if (rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E))
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
+
+        rt2800_led_open_drain_enable(rt2x00dev);
+        rt2800_normal_mode_setup_3xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_3572(struct rt2x00_dev *rt2x00dev)
 {
+        u8 rfcsr;
+        u32 reg;
+
+        rt2800_rf_init_calibration(rt2x00dev, 30);
+
         rt2800_rfcsr_write(rt2x00dev, 0, 0x70);
         rt2800_rfcsr_write(rt2x00dev, 1, 0x81);
         rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
@@ -4110,10 +4906,30 @@ static void rt2800_init_rfcsr_3572(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 29, 0x9b);
         rt2800_rfcsr_write(rt2x00dev, 30, 0x09);
         rt2800_rfcsr_write(rt2x00dev, 31, 0x10);
+
+        rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR6_R2, 1);
+        rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
+
+        rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
+        rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 3);
+        rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
+        rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
+        msleep(1);
+        rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
+        rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 0);
+        rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
+        rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
+
+        rt2800_rx_filter_calibration(rt2x00dev);
+        rt2800_led_open_drain_enable(rt2x00dev);
+        rt2800_normal_mode_setup_3xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
 {
+        rt2800_rf_init_calibration(rt2x00dev, 2);
+
         rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
         rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
         rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
@@ -4194,10 +5010,16 @@ static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 61, 0xdd);
         rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
         rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
+
+        rt2800_normal_mode_setup_5xxx(rt2x00dev);
+
+        rt2800_led_open_drain_enable(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_5392(struct rt2x00_dev *rt2x00dev)
 {
+        rt2800_rf_init_calibration(rt2x00dev, 2);
+
         rt2800_rfcsr_write(rt2x00dev, 1, 0x17);
         rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
         rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
@@ -4257,53 +5079,61 @@ static void rt2800_init_rfcsr_5392(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 61, 0x91);
         rt2800_rfcsr_write(rt2x00dev, 62, 0x39);
         rt2800_rfcsr_write(rt2x00dev, 63, 0x07);
+
+        rt2800_normal_mode_setup_5xxx(rt2x00dev);
+
+        rt2800_led_open_drain_enable(rt2x00dev);
 }
 
-static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
+static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev)
 {
-        struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-        u8 rfcsr;
-        u8 bbp;
-        u32 reg;
-        u16 eeprom;
+        rt2800_rf_init_calibration(rt2x00dev, 30);
 
-        if (!rt2x00_rt(rt2x00dev, RT3070) &&
-            !rt2x00_rt(rt2x00dev, RT3071) &&
-            !rt2x00_rt(rt2x00dev, RT3090) &&
-            !rt2x00_rt(rt2x00dev, RT3290) &&
-            !rt2x00_rt(rt2x00dev, RT3352) &&
-            !rt2x00_rt(rt2x00dev, RT3390) &&
-            !rt2x00_rt(rt2x00dev, RT3572) &&
-            !rt2x00_rt(rt2x00dev, RT5390) &&
-            !rt2x00_rt(rt2x00dev, RT5392) &&
-            !rt2800_is_305x_soc(rt2x00dev))
-                return 0;
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x3F);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0xE4);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x4D);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0x8D);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 33, 0xC0);
+        rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
+        rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
+        rt2800_rfcsr_write(rt2x00dev, 47, 0x0C);
+        rt2800_rfcsr_write(rt2x00dev, 53, 0x22);
+        rt2800_rfcsr_write(rt2x00dev, 63, 0x07);
 
-        /*
-         * Init RF calibration.
-         */
+        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
+        msleep(1);
 
-        if (rt2x00_rt(rt2x00dev, RT3290) ||
-            rt2x00_rt(rt2x00dev, RT5390) ||
-            rt2x00_rt(rt2x00dev, RT5392)) {
-                rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
-                rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-                msleep(1);
-                rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 0);
-                rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-        } else {
-                rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
-                rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-                msleep(1);
-                rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 0);
-                rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-        }
+        rt2800_adjust_freq_offset(rt2x00dev);
+
+        /* Enable DC filter */
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5592, REV_RT5592C))
+                rt2800_bbp_write(rt2x00dev, 103, 0xc0);
+
+        rt2800_normal_mode_setup_5xxx(rt2x00dev);
+
+        if (rt2x00_rt_rev_lt(rt2x00dev, RT5592, REV_RT5592C))
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
 
+        rt2800_led_open_drain_enable(rt2x00dev);
+}
+
+static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
+{
         if (rt2800_is_305x_soc(rt2x00dev)) {
                 rt2800_init_rfcsr_305x_soc(rt2x00dev);
-                return 0;
+                return;
         }
 
         switch (rt2x00dev->chip.rt) {
@@ -4330,198 +5160,10 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         case RT5392:
                 rt2800_init_rfcsr_5392(rt2x00dev);
                 break;
+        case RT5592:
+                rt2800_init_rfcsr_5592(rt2x00dev);
+                break;
         }
-
-        if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F)) {
-                rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
-                rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
-                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 3);
-                rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
-        } else if (rt2x00_rt(rt2x00dev, RT3071) ||
-                   rt2x00_rt(rt2x00dev, RT3090)) {
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x14);
-
-                rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR6_R2, 1);
-                rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
-
-                rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
-                rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
-                if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
-                    rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E)) {
-                        rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-                        if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_DAC_TEST))
-                                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 3);
-                        else
-                                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 0);
-                }
-                rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
-
-                rt2800_register_read(rt2x00dev, GPIO_SWITCH, &reg);
-                rt2x00_set_field32(&reg, GPIO_SWITCH_5, 0);
-                rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);
-        } else if (rt2x00_rt(rt2x00dev, RT3390)) {
-                rt2800_register_read(rt2x00dev, GPIO_SWITCH, &reg);
-                rt2x00_set_field32(&reg, GPIO_SWITCH_5, 0);
-                rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);
-        } else if (rt2x00_rt(rt2x00dev, RT3572)) {
-                rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR6_R2, 1);
-                rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
-
-                rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
-                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 3);
-                rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
-                rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
-                msleep(1);
-                rt2800_register_read(rt2x00dev, LDO_CFG0, &reg);
-                rt2x00_set_field32(&reg, LDO_CFG0_LDO_CORE_VLEVEL, 0);
-                rt2x00_set_field32(&reg, LDO_CFG0_BGSEL, 1);
-                rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
-        }
-
-        /*
-         * Set RX Filter calibration for 20MHz and 40MHz
-         */
-        if (rt2x00_rt(rt2x00dev, RT3070)) {
-                drv_data->calibration_bw20 =
-                        rt2800_init_rx_filter(rt2x00dev, false, 0x07, 0x16);
-                drv_data->calibration_bw40 =
-                        rt2800_init_rx_filter(rt2x00dev, true, 0x27, 0x19);
-        } else if (rt2x00_rt(rt2x00dev, RT3071) ||
-                   rt2x00_rt(rt2x00dev, RT3090) ||
-                   rt2x00_rt(rt2x00dev, RT3352) ||
-                   rt2x00_rt(rt2x00dev, RT3390) ||
-                   rt2x00_rt(rt2x00dev, RT3572)) {
-                drv_data->calibration_bw20 =
-                        rt2800_init_rx_filter(rt2x00dev, false, 0x07, 0x13);
-                drv_data->calibration_bw40 =
-                        rt2800_init_rx_filter(rt2x00dev, true, 0x27, 0x15);
-        }
-
-        /*
-         * Save BBP 25 & 26 values for later use in channel switching
-         */
-        rt2800_bbp_read(rt2x00dev, 25, &drv_data->bbp25);
-        rt2800_bbp_read(rt2x00dev, 26, &drv_data->bbp26);
-
-        if (!rt2x00_rt(rt2x00dev, RT5390) &&
-            !rt2x00_rt(rt2x00dev, RT5392)) {
-                /*
-                 * Set back to initial state
-                 */
-                rt2800_bbp_write(rt2x00dev, 24, 0);
-
-                rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 0);
-                rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
-
-                /*
-                 * Set BBP back to BW20
-                 */
-                rt2800_bbp_read(rt2x00dev, 4, &bbp);
-                rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 0);
-                rt2800_bbp_write(rt2x00dev, 4, bbp);
-        }
-
-        if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F) ||
-            rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
-            rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
-            rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E))
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
-
-        rt2800_register_read(rt2x00dev, OPT_14_CSR, &reg);
-        rt2x00_set_field32(&reg, OPT_14_CSR_BIT0, 1);
-        rt2800_register_write(rt2x00dev, OPT_14_CSR, reg);
-
-        if (!rt2x00_rt(rt2x00dev, RT5390) &&
-            !rt2x00_rt(rt2x00dev, RT5392)) {
-                rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR17_TX_LO1_EN, 0);
-                if (rt2x00_rt(rt2x00dev, RT3070) ||
-                    rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
-                    rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
-                    rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {
-                        if (!test_bit(CAPABILITY_EXTERNAL_LNA_BG,
-                                      &rt2x00dev->cap_flags))
-                                rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);
-                }
-                rt2x00_set_field8(&rfcsr, RFCSR17_TXMIXER_GAIN,
-                                  drv_data->txmixer_gain_24g);
-                rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
-        }
-
-        if (rt2x00_rt(rt2x00dev, RT3090)) {
-                rt2800_bbp_read(rt2x00dev, 138, &bbp);
-
-                /*  Turn off unused DAC1 and ADC1 to reduce power consumption */
-                rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-                if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
-                        rt2x00_set_field8(&bbp, BBP138_RX_ADC1, 0);
-                if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
-                        rt2x00_set_field8(&bbp, BBP138_TX_DAC1, 1);
-
-                rt2800_bbp_write(rt2x00dev, 138, bbp);
-        }
-
-        if (rt2x00_rt(rt2x00dev, RT3071) ||
-            rt2x00_rt(rt2x00dev, RT3090) ||
-            rt2x00_rt(rt2x00dev, RT3390)) {
-                rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
-                rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 0);
-                rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);
-                rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
-                rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
-                rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
-
-                rt2800_rfcsr_read(rt2x00dev, 15, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR15_TX_LO2_EN, 0);
-                rt2800_rfcsr_write(rt2x00dev, 15, rfcsr);
-
-                rt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR20_RX_LO1_EN, 0);
-                rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
-
-                rt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR21_RX_LO2_EN, 0);
-                rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
-        }
-
-        if (rt2x00_rt(rt2x00dev, RT3070)) {
-                rt2800_rfcsr_read(rt2x00dev, 27, &rfcsr);
-                if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F))
-                        rt2x00_set_field8(&rfcsr, RFCSR27_R1, 3);
-                else
-                        rt2x00_set_field8(&rfcsr, RFCSR27_R1, 0);
-                rt2x00_set_field8(&rfcsr, RFCSR27_R2, 0);
-                rt2x00_set_field8(&rfcsr, RFCSR27_R3, 0);
-                rt2x00_set_field8(&rfcsr, RFCSR27_R4, 0);
-                rt2800_rfcsr_write(rt2x00dev, 27, rfcsr);
-        }
-
-        if (rt2x00_rt(rt2x00dev, RT3290)) {
-                rt2800_rfcsr_read(rt2x00dev, 29, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR29_RSSI_GAIN, 3);
-                rt2800_rfcsr_write(rt2x00dev, 29, rfcsr);
-        }
-
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-            rt2x00_rt(rt2x00dev, RT5392)) {
-                rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR38_RX_LO1_EN, 0);
-                rt2800_rfcsr_write(rt2x00dev, 38, rfcsr);
-
-                rt2800_rfcsr_read(rt2x00dev, 39, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR39_RX_LO2_EN, 0);
-                rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-
-                rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-                rt2x00_set_field8(&rfcsr, RFCSR30_RX_VCM, 2);
-                rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-        }
-
-        return 0;
 }
 
 int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
@@ -4533,15 +5175,24 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
          * Initialize all registers.
          */
         if (unlikely(rt2800_wait_wpdma_ready(rt2x00dev) ||
-                     rt2800_init_registers(rt2x00dev) ||
-                     rt2800_init_bbp(rt2x00dev) ||
-                     rt2800_init_rfcsr(rt2x00dev)))
+                     rt2800_init_registers(rt2x00dev)))
                 return -EIO;
 
         /*
          * Send signal to firmware during boot time.
          */
-        rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
+        rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
+        rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
+        if (rt2x00_is_usb(rt2x00dev)) {
+                rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
+                rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
+        }
+        msleep(1);
+
+        if (unlikely(rt2800_init_bbp(rt2x00dev)))
+                return -EIO;
+
+        rt2800_init_rfcsr(rt2x00dev);
 
         if (rt2x00_is_usb(rt2x00dev) &&
             (rt2x00_rt(rt2x00dev, RT3070) ||
@@ -4702,7 +5353,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
                 eth_random_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
+                rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &word);
@@ -4711,7 +5362,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_NIC_CONF0_TXPATH, 1);
                 rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
-                EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
         } else if (rt2x00_rt(rt2x00dev, RT2860) ||
                    rt2x00_rt(rt2x00dev, RT2872)) {
                 /*
@@ -4740,14 +5391,14 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_NIC_CONF1_BT_COEXIST, 0);
                 rt2x00_set_field16(&word, EEPROM_NIC_CONF1_DAC_TEST, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF1, word);
-                EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);
         if ((word & 0x00ff) == 0x00ff) {
                 rt2x00_set_field16(&word, EEPROM_FREQ_OFFSET, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
-                EEPROM(rt2x00dev, "Freq: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Freq: 0x%04x\n", word);
         }
         if ((word & 0xff00) == 0xff00) {
                 rt2x00_set_field16(&word, EEPROM_FREQ_LED_MODE,
@@ -4757,7 +5408,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_AG_CONF, 0x5555);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_ACT_CONF, 0x2221);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_POLARITY, 0xa9f8);
-                EEPROM(rt2x00dev, "Led Mode: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Led Mode: 0x%04x\n", word);
         }
 
         /*
@@ -4821,9 +5472,9 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
 
 static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
 {
-        u32 reg;
         u16 value;
         u16 eeprom;
+        u16 rf;
 
         /*
          * Read EEPROM word for configuration.
@@ -4835,41 +5486,14 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * RT28xx/RT30xx: defined in "EEPROM_NIC_CONF0_RF_TYPE" field
          * RT53xx: defined in "EEPROM_CHIP_ID" field
          */
-        if (rt2x00_rt(rt2x00dev, RT3290))
-                rt2800_register_read(rt2x00dev, MAC_CSR0_3290, &reg);
-        else
-                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-
-        if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT3290 ||
-            rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
-            rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
-                rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
         else
-                value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
+                rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
 
-        rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),
-                        value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
-
-        switch (rt2x00dev->chip.rt) {
-        case RT2860:
-        case RT2872:
-        case RT2883:
-        case RT3070:
-        case RT3071:
-        case RT3090:
-        case RT3290:
-        case RT3352:
-        case RT3390:
-        case RT3572:
-        case RT5390:
-        case RT5392:
-                break;
-        default:
-                ERROR(rt2x00dev, "Invalid RT chipset 0x%04x detected.\n", rt2x00dev->chip.rt);
-                return -ENODEV;
-        }
-
-        switch (rt2x00dev->chip.rf) {
+        switch (rf) {
         case RF2820:
         case RF2850:
         case RF2720:
@@ -4887,13 +5511,16 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RF5372:
         case RF5390:
         case RF5392:
+        case RF5592:
                 break;
         default:
-                ERROR(rt2x00dev, "Invalid RF chipset 0x%04x detected.\n",
-                      rt2x00dev->chip.rf);
+                rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
+                           rf);
                 return -ENODEV;
         }
 
+        rt2x00_set_rf(rt2x00dev, rf);
+
         /*
          * Identify default antenna configuration.
          */
@@ -5122,6 +5749,138 @@ static const struct rf_channel rf_vals_3x[] = {
         {173, 0x61, 0, 9},
 };
 
+static const struct rf_channel rf_vals_5592_xtal20[] = {
+        /* Channel, N, K, mod, R */
+        {1, 482, 4, 10, 3},
+        {2, 483, 4, 10, 3},
+        {3, 484, 4, 10, 3},
+        {4, 485, 4, 10, 3},
+        {5, 486, 4, 10, 3},
+        {6, 487, 4, 10, 3},
+        {7, 488, 4, 10, 3},
+        {8, 489, 4, 10, 3},
+        {9, 490, 4, 10, 3},
+        {10, 491, 4, 10, 3},
+        {11, 492, 4, 10, 3},
+        {12, 493, 4, 10, 3},
+        {13, 494, 4, 10, 3},
+        {14, 496, 8, 10, 3},
+        {36, 172, 8, 12, 1},
+        {38, 173, 0, 12, 1},
+        {40, 173, 4, 12, 1},
+        {42, 173, 8, 12, 1},
+        {44, 174, 0, 12, 1},
+        {46, 174, 4, 12, 1},
+        {48, 174, 8, 12, 1},
+        {50, 175, 0, 12, 1},
+        {52, 175, 4, 12, 1},
+        {54, 175, 8, 12, 1},
+        {56, 176, 0, 12, 1},
+        {58, 176, 4, 12, 1},
+        {60, 176, 8, 12, 1},
+        {62, 177, 0, 12, 1},
+        {64, 177, 4, 12, 1},
+        {100, 183, 4, 12, 1},
+        {102, 183, 8, 12, 1},
+        {104, 184, 0, 12, 1},
+        {106, 184, 4, 12, 1},
+        {108, 184, 8, 12, 1},
+        {110, 185, 0, 12, 1},
+        {112, 185, 4, 12, 1},
+        {114, 185, 8, 12, 1},
+        {116, 186, 0, 12, 1},
+        {118, 186, 4, 12, 1},
+        {120, 186, 8, 12, 1},
+        {122, 187, 0, 12, 1},
+        {124, 187, 4, 12, 1},
+        {126, 187, 8, 12, 1},
+        {128, 188, 0, 12, 1},
+        {130, 188, 4, 12, 1},
+        {132, 188, 8, 12, 1},
+        {134, 189, 0, 12, 1},
+        {136, 189, 4, 12, 1},
+        {138, 189, 8, 12, 1},
+        {140, 190, 0, 12, 1},
+        {149, 191, 6, 12, 1},
+        {151, 191, 10, 12, 1},
+        {153, 192, 2, 12, 1},
+        {155, 192, 6, 12, 1},
+        {157, 192, 10, 12, 1},
+        {159, 193, 2, 12, 1},
+        {161, 193, 6, 12, 1},
+        {165, 194, 2, 12, 1},
+        {184, 164, 0, 12, 1},
+        {188, 164, 4, 12, 1},
+        {192, 165, 8, 12, 1},
+        {196, 166, 0, 12, 1},
+};
+
+static const struct rf_channel rf_vals_5592_xtal40[] = {
+        /* Channel, N, K, mod, R */
+        {1, 241, 2, 10, 3},
+        {2, 241, 7, 10, 3},
+        {3, 242, 2, 10, 3},
+        {4, 242, 7, 10, 3},
+        {5, 243, 2, 10, 3},
+        {6, 243, 7, 10, 3},
+        {7, 244, 2, 10, 3},
+        {8, 244, 7, 10, 3},
+        {9, 245, 2, 10, 3},
+        {10, 245, 7, 10, 3},
+        {11, 246, 2, 10, 3},
+        {12, 246, 7, 10, 3},
+        {13, 247, 2, 10, 3},
+        {14, 248, 4, 10, 3},
+        {36, 86, 4, 12, 1},
+        {38, 86, 6, 12, 1},
+        {40, 86, 8, 12, 1},
+        {42, 86, 10, 12, 1},
+        {44, 87, 0, 12, 1},
+        {46, 87, 2, 12, 1},
+        {48, 87, 4, 12, 1},
+        {50, 87, 6, 12, 1},
+        {52, 87, 8, 12, 1},
+        {54, 87, 10, 12, 1},
+        {56, 88, 0, 12, 1},
+        {58, 88, 2, 12, 1},
+        {60, 88, 4, 12, 1},
+        {62, 88, 6, 12, 1},
+        {64, 88, 8, 12, 1},
+        {100, 91, 8, 12, 1},
+        {102, 91, 10, 12, 1},
+        {104, 92, 0, 12, 1},
+        {106, 92, 2, 12, 1},
+        {108, 92, 4, 12, 1},
+        {110, 92, 6, 12, 1},
+        {112, 92, 8, 12, 1},
+        {114, 92, 10, 12, 1},
+        {116, 93, 0, 12, 1},
+        {118, 93, 2, 12, 1},
+        {120, 93, 4, 12, 1},
+        {122, 93, 6, 12, 1},
+        {124, 93, 8, 12, 1},
+        {126, 93, 10, 12, 1},
+        {128, 94, 0, 12, 1},
+        {130, 94, 2, 12, 1},
+        {132, 94, 4, 12, 1},
+        {134, 94, 6, 12, 1},
+        {136, 94, 8, 12, 1},
+        {138, 94, 10, 12, 1},
+        {140, 95, 0, 12, 1},
+        {149, 95, 9, 12, 1},
+        {151, 95, 11, 12, 1},
+        {153, 96, 1, 12, 1},
+        {155, 96, 3, 12, 1},
+        {157, 96, 5, 12, 1},
+        {159, 96, 7, 12, 1},
+        {161, 96, 9, 12, 1},
+        {165, 97, 1, 12, 1},
+        {184, 82, 0, 12, 1},
+        {188, 82, 4, 12, 1},
+        {192, 82, 8, 12, 1},
+        {196, 83, 0, 12, 1},
+};
+
 static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 {
         struct hw_mode_spec *spec = &rt2x00dev->spec;
@@ -5130,6 +5889,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         char *default_power2;
         unsigned int i;
         u16 eeprom;
+        u32 reg;
 
         /*
          * Disable powersaving as default on PCI devices.
@@ -5211,8 +5971,22 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_3x);
                 spec->channels = rf_vals_3x;
+        } else if (rt2x00_rf(rt2x00dev, RF5592)) {
+                spec->supported_bands |= SUPPORT_BAND_5GHZ;
+
+                rt2800_register_read(rt2x00dev, MAC_DEBUG_INDEX, &reg);
+                if (rt2x00_get_field32(reg, MAC_DEBUG_INDEX_XTAL)) {
+                        spec->num_channels = ARRAY_SIZE(rf_vals_5592_xtal40);
+                        spec->channels = rf_vals_5592_xtal40;
+                } else {
+                        spec->num_channels = ARRAY_SIZE(rf_vals_5592_xtal20);
+                        spec->channels = rf_vals_5592_xtal20;
+                }
         }
 
+        if (WARN_ON_ONCE(!spec->channels))
+                return -ENODEV;
+
         /*
          * Initialize HT information.
          */
@@ -5300,11 +6074,55 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         return 0;
 }
 
+static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+        u32 rt;
+        u32 rev;
+
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                rt2800_register_read(rt2x00dev, MAC_CSR0_3290, &reg);
+        else
+                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
+
+        rt = rt2x00_get_field32(reg, MAC_CSR0_CHIPSET);
+        rev = rt2x00_get_field32(reg, MAC_CSR0_REVISION);
+
+        switch (rt) {
+        case RT2860:
+        case RT2872:
+        case RT2883:
+        case RT3070:
+        case RT3071:
+        case RT3090:
+        case RT3290:
+        case RT3352:
+        case RT3390:
+        case RT3572:
+        case RT5390:
+        case RT5392:
+        case RT5592:
+                break;
+        default:
+                rt2x00_err(rt2x00dev, "Invalid RT chipset 0x%04x, rev %04x detected\n",
+                           rt, rev);
+                return -ENODEV;
+        }
+
+        rt2x00_set_rt(rt2x00dev, rt, rev);
+
+        return 0;
+}
+
 int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
         u32 reg;
 
+        retval = rt2800_probe_rt(rt2x00dev);
+        if (retval)
+                return retval;
+
         /*
          * Allocate eeprom data.
          */
@@ -5546,7 +6364,8 @@ int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 break;
         default:
-                WARNING((struct rt2x00_dev *)hw->priv, "Unknown AMPDU action\n");
+                rt2x00_warn((struct rt2x00_dev *)hw->priv,
+                            "Unknown AMPDU action\n");
         }
 
         return ret;
@@ -5563,7 +6382,7 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
 
         rt2800_register_read(rt2x00dev, CH_IDLE_STA, &idle);
         rt2800_register_read(rt2x00dev, CH_BUSY_STA, &busy);
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index ba5a05625aaa..6f4a861af336 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -72,7 +72,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
                 return;
 
         for (i = 0; i < 200; i++) {
-                rt2x00pci_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg);
+                rt2x00mmio_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg);
 
                 if ((rt2x00_get_field32(reg, H2M_MAILBOX_CID_CMD0) == token) ||
                     (rt2x00_get_field32(reg, H2M_MAILBOX_CID_CMD1) == token) ||
@@ -84,10 +84,10 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
         }
 
         if (i == 200)
-                ERROR(rt2x00dev, "MCU request failed, no response from hardware\n");
+                rt2x00_err(rt2x00dev, "MCU request failed, no response from hardware\n");
 
-        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
-        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
+        rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
+        rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
 }
 
 #if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
@@ -116,7 +116,7 @@ static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
         struct rt2x00_dev *rt2x00dev = eeprom->data;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
 
         eeprom->reg_data_in = !!rt2x00_get_field32(reg, E2PROM_CSR_DATA_IN);
         eeprom->reg_data_out = !!rt2x00_get_field32(reg, E2PROM_CSR_DATA_OUT);
@@ -138,7 +138,7 @@ static void rt2800pci_eepromregister_write(struct eeprom_93cx6 *eeprom)
         rt2x00_set_field32(&reg, E2PROM_CSR_CHIP_SELECT,
                            !!eeprom->reg_chip_select);
 
-        rt2x00pci_register_write(rt2x00dev, E2PROM_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, E2PROM_CSR, reg);
 }
 
 static int rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
@@ -146,7 +146,7 @@ static int rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
         struct eeprom_93cx6 eeprom;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
 
         eeprom.data = rt2x00dev;
         eeprom.register_read = rt2800pci_eepromregister_read;
@@ -210,20 +210,20 @@ static void rt2800pci_start_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
                 rt2x00_set_field32(&reg, MAC_SYS_CTRL_ENABLE_RX, 1);
-                rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
+                rt2x00mmio_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);
-                rt2x00pci_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+                rt2x00mmio_register_write(rt2x00dev, BCN_TIME_CFG, reg);
 
-                rt2x00pci_register_read(rt2x00dev, INT_TIMER_EN, &reg);
+                rt2x00mmio_register_read(rt2x00dev, INT_TIMER_EN, &reg);
                 rt2x00_set_field32(&reg, INT_TIMER_EN_PRE_TBTT_TIMER, 1);
-                rt2x00pci_register_write(rt2x00dev, INT_TIMER_EN, reg);
+                rt2x00mmio_register_write(rt2x00dev, INT_TIMER_EN, reg);
                 break;
         default:
                 break;
@@ -241,13 +241,13 @@ static void rt2800pci_kick_queue(struct data_queue *queue)
         case QID_AC_BE:
         case QID_AC_BK:
                 entry = rt2x00queue_get_entry(queue, Q_INDEX);
-                rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX(queue->qid),
-                                         entry->entry_idx);
+                rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX(queue->qid),
+                                          entry->entry_idx);
                 break;
         case QID_MGMT:
                 entry = rt2x00queue_get_entry(queue, Q_INDEX);
-                rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX(5),
-                                         entry->entry_idx);
+                rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX(5),
+                                          entry->entry_idx);
                 break;
         default:
                 break;
@@ -261,20 +261,20 @@ static void rt2800pci_stop_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
                 rt2x00_set_field32(&reg, MAC_SYS_CTRL_ENABLE_RX, 0);
-                rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
+                rt2x00mmio_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 0);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 0);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 0);
-                rt2x00pci_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+                rt2x00mmio_register_write(rt2x00dev, BCN_TIME_CFG, reg);
 
-                rt2x00pci_register_read(rt2x00dev, INT_TIMER_EN, &reg);
+                rt2x00mmio_register_read(rt2x00dev, INT_TIMER_EN, &reg);
                 rt2x00_set_field32(&reg, INT_TIMER_EN_PRE_TBTT_TIMER, 0);
-                rt2x00pci_register_write(rt2x00dev, INT_TIMER_EN, reg);
+                rt2x00mmio_register_write(rt2x00dev, INT_TIMER_EN, reg);
 
                 /*
                  * Wait for current invocation to finish. The tasklet
@@ -314,19 +314,19 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
          */
         reg = 0;
         rt2x00_set_field32(&reg, PBF_SYS_CTRL_HOST_RAM_WRITE, 1);
-        rt2x00pci_register_write(rt2x00dev, PBF_SYS_CTRL, reg);
+        rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, reg);
 
         /*
          * Write firmware to device.
          */
-        rt2x00pci_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
-                                      data, len);
+        rt2x00mmio_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
+                                       data, len);
 
-        rt2x00pci_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000);
-        rt2x00pci_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00001);
+        rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000);
+        rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00001);
 
-        rt2x00pci_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
-        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
+        rt2x00mmio_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
+        rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
 
         return 0;
 }
@@ -336,7 +336,7 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
  */
 static bool rt2800pci_get_entry_state(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word;
 
         if (entry->queue->qid == QID_RX) {
@@ -352,7 +352,7 @@ static bool rt2800pci_get_entry_state(struct queue_entry *entry)
 
 static void rt2800pci_clear_entry(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         u32 word;
@@ -370,8 +370,8 @@ static void rt2800pci_clear_entry(struct queue_entry *entry)
                  * Set RX IDX in register to inform hardware that we have
                  * handled this entry and it is available for reuse again.
                  */
-                rt2x00pci_register_write(rt2x00dev, RX_CRX_IDX,
-                                      entry->entry_idx);
+                rt2x00mmio_register_write(rt2x00dev, RX_CRX_IDX,
+                                          entry->entry_idx);
         } else {
                 rt2x00_desc_read(entry_priv->desc, 1, &word);
                 rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 1);
@@ -381,60 +381,65 @@ static void rt2800pci_clear_entry(struct queue_entry *entry)
 
 static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
 
         /*
          * Initialize registers.
          */
         entry_priv = rt2x00dev->tx[0].entries[0].priv_data;
-        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR0, entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT0,
-                                 rt2x00dev->tx[0].limit);
-        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX0, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX0, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_BASE_PTR0,
+                                  entry_priv->desc_dma);
+        rt2x00mmio_register_write(rt2x00dev, TX_MAX_CNT0,
+                                  rt2x00dev->tx[0].limit);
+        rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX0, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_DTX_IDX0, 0);
 
         entry_priv = rt2x00dev->tx[1].entries[0].priv_data;
-        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR1, entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT1,
-                                 rt2x00dev->tx[1].limit);
-        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX1, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX1, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_BASE_PTR1,
+                                  entry_priv->desc_dma);
+        rt2x00mmio_register_write(rt2x00dev, TX_MAX_CNT1,
+                                  rt2x00dev->tx[1].limit);
+        rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX1, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_DTX_IDX1, 0);
 
         entry_priv = rt2x00dev->tx[2].entries[0].priv_data;
-        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR2, entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT2,
-                                 rt2x00dev->tx[2].limit);
-        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX2, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX2, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_BASE_PTR2,
+                                  entry_priv->desc_dma);
+        rt2x00mmio_register_write(rt2x00dev, TX_MAX_CNT2,
+                                  rt2x00dev->tx[2].limit);
+        rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX2, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_DTX_IDX2, 0);
 
         entry_priv = rt2x00dev->tx[3].entries[0].priv_data;
-        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR3, entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT3,
-                                 rt2x00dev->tx[3].limit);
-        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX3, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX3, 0);
-
-        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR4, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT4, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX4, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX4, 0);
-
-        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR5, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT5, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX5, 0);
-        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX5, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_BASE_PTR3,
+                                  entry_priv->desc_dma);
+        rt2x00mmio_register_write(rt2x00dev, TX_MAX_CNT3,
+                                  rt2x00dev->tx[3].limit);
+        rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX3, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_DTX_IDX3, 0);
+
+        rt2x00mmio_register_write(rt2x00dev, TX_BASE_PTR4, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_MAX_CNT4, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX4, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_DTX_IDX4, 0);
+
+        rt2x00mmio_register_write(rt2x00dev, TX_BASE_PTR5, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_MAX_CNT5, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX5, 0);
+        rt2x00mmio_register_write(rt2x00dev, TX_DTX_IDX5, 0);
 
         entry_priv = rt2x00dev->rx->entries[0].priv_data;
-        rt2x00pci_register_write(rt2x00dev, RX_BASE_PTR, entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, RX_MAX_CNT,
-                                 rt2x00dev->rx[0].limit);
-        rt2x00pci_register_write(rt2x00dev, RX_CRX_IDX,
-                                 rt2x00dev->rx[0].limit - 1);
-        rt2x00pci_register_write(rt2x00dev, RX_DRX_IDX, 0);
+        rt2x00mmio_register_write(rt2x00dev, RX_BASE_PTR,
+                                  entry_priv->desc_dma);
+        rt2x00mmio_register_write(rt2x00dev, RX_MAX_CNT,
+                                  rt2x00dev->rx[0].limit);
+        rt2x00mmio_register_write(rt2x00dev, RX_CRX_IDX,
+                                  rt2x00dev->rx[0].limit - 1);
+        rt2x00mmio_register_write(rt2x00dev, RX_DRX_IDX, 0);
 
         rt2800_disable_wpdma(rt2x00dev);
 
-        rt2x00pci_register_write(rt2x00dev, DELAY_INT_CFG, 0);
+        rt2x00mmio_register_write(rt2x00dev, DELAY_INT_CFG, 0);
 
         return 0;
 }
@@ -453,8 +458,8 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          * should clear the register to assure a clean state.
          */
         if (state == STATE_RADIO_IRQ_ON) {
-                rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-                rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
+                rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
+                rt2x00mmio_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
         }
 
         spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
@@ -466,7 +471,7 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, INT_MASK_CSR_TX_FIFO_STATUS, 1);
                 rt2x00_set_field32(&reg, INT_MASK_CSR_AUTO_WAKEUP, 1);
         }
-        rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_MASK_CSR, reg);
         spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
 
         if (state == STATE_RADIO_IRQ_OFF) {
@@ -488,7 +493,7 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev)
         /*
          * Reset DMA indexes
          */
-        rt2x00pci_register_read(rt2x00dev, WPDMA_RST_IDX, &reg);
+        rt2x00mmio_register_read(rt2x00dev, WPDMA_RST_IDX, &reg);
         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, 1);
         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, 1);
         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX2, 1);
@@ -496,29 +501,29 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX4, 1);
         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX5, 1);
         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DRX_IDX0, 1);
-        rt2x00pci_register_write(rt2x00dev, WPDMA_RST_IDX, reg);
+        rt2x00mmio_register_write(rt2x00dev, WPDMA_RST_IDX, reg);
 
-        rt2x00pci_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
-        rt2x00pci_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
+        rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
+        rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
 
         if (rt2x00_is_pcie(rt2x00dev) &&
             (rt2x00_rt(rt2x00dev, RT3572) ||
              rt2x00_rt(rt2x00dev, RT5390) ||
              rt2x00_rt(rt2x00dev, RT5392))) {
-                rt2x00pci_register_read(rt2x00dev, AUX_CTRL, &reg);
+                rt2x00mmio_register_read(rt2x00dev, AUX_CTRL, &reg);
                 rt2x00_set_field32(&reg, AUX_CTRL_FORCE_PCIE_CLK, 1);
                 rt2x00_set_field32(&reg, AUX_CTRL_WAKE_PCIE_EN, 1);
-                rt2x00pci_register_write(rt2x00dev, AUX_CTRL, reg);
+                rt2x00mmio_register_write(rt2x00dev, AUX_CTRL, reg);
         }
 
-        rt2x00pci_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
+        rt2x00mmio_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
 
         reg = 0;
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
-        rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
 
-        rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000);
+        rt2x00mmio_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000);
 
         return 0;
 }
@@ -538,8 +543,8 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
                 return retval;
 
         /* After resume MCU_BOOT_SIGNAL will trash these. */
-        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
-        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
+        rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
+        rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
 
         rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_RADIO_OFF, 0xff, 0x02);
         rt2800pci_mcu_status(rt2x00dev, TOKEN_RADIO_OFF);
@@ -554,8 +559,8 @@ static void rt2800pci_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         if (rt2x00_is_soc(rt2x00dev)) {
                 rt2800_disable_radio(rt2x00dev);
-                rt2x00pci_register_write(rt2x00dev, PWR_PIN_CFG, 0);
-                rt2x00pci_register_write(rt2x00dev, TX_PIN_CFG, 0);
+                rt2x00mmio_register_write(rt2x00dev, PWR_PIN_CFG, 0);
+                rt2x00mmio_register_write(rt2x00dev, TX_PIN_CFG, 0);
         }
 }
 
@@ -567,10 +572,10 @@ static int rt2800pci_set_state(struct rt2x00_dev *rt2x00dev,
                                    0, 0x02);
                 rt2800pci_mcu_status(rt2x00dev, TOKEN_WAKEUP);
         } else if (state == STATE_SLEEP) {
-                rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_STATUS,
-                                         0xffffffff);
-                rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID,
-                                         0xffffffff);
+                rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS,
+                                          0xffffffff);
+                rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID,
+                                          0xffffffff);
                 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_SLEEP,
                                    0xff, 0x01);
         }
@@ -611,8 +616,8 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -629,7 +634,7 @@ static void rt2800pci_write_tx_desc(struct queue_entry *entry,
                                     struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         __le32 *txd = entry_priv->desc;
         u32 word;
 
@@ -683,7 +688,7 @@ static void rt2800pci_write_tx_desc(struct queue_entry *entry,
 static void rt2800pci_fill_rxdone(struct queue_entry *entry,
                                   struct rxdone_entry_desc *rxdesc)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         __le32 *rxd = entry_priv->desc;
         u32 word;
 
@@ -743,10 +748,90 @@ static void rt2800pci_wakeup(struct rt2x00_dev *rt2x00dev)
         rt2800_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
 }
 
+static bool rt2800pci_txdone_entry_check(struct queue_entry *entry, u32 status)
+{
+        __le32 *txwi;
+        u32 word;
+        int wcid, tx_wcid;
+
+        wcid = rt2x00_get_field32(status, TX_STA_FIFO_WCID);
+
+        txwi = rt2800_drv_get_txwi(entry);
+        rt2x00_desc_read(txwi, 1, &word);
+        tx_wcid = rt2x00_get_field32(word, TXWI_W1_WIRELESS_CLI_ID);
+
+        return (tx_wcid == wcid);
+}
+
+static bool rt2800pci_txdone_find_entry(struct queue_entry *entry, void *data)
+{
+        u32 status = *(u32 *)data;
+
+        /*
+         * rt2800pci hardware might reorder frames when exchanging traffic
+         * with multiple BA enabled STAs.
+         *
+         * For example, a tx queue
+         *    [ STA1 | STA2 | STA1 | STA2 ]
+         * can result in tx status reports
+         *    [ STA1 | STA1 | STA2 | STA2 ]
+         * when the hw decides to aggregate the frames for STA1 into one AMPDU.
+         *
+         * To mitigate this effect, associate the tx status to the first frame
+         * in the tx queue with a matching wcid.
+         */
+        if (rt2800pci_txdone_entry_check(entry, status) &&
+            !test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) {
+                /*
+                 * Got a matching frame, associate the tx status with
+                 * the frame
+                 */
+                entry->status = status;
+                set_bit(ENTRY_DATA_STATUS_SET, &entry->flags);
+                return true;
+        }
+
+        /* Check the next frame */
+        return false;
+}
+
+static bool rt2800pci_txdone_match_first(struct queue_entry *entry, void *data)
+{
+        u32 status = *(u32 *)data;
+
+        /*
+         * Find the first frame without tx status and assign this status to it
+         * regardless if it matches or not.
+         */
+        if (!test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) {
+                /*
+                 * Got a matching frame, associate the tx status with
+                 * the frame
+                 */
+                entry->status = status;
+                set_bit(ENTRY_DATA_STATUS_SET, &entry->flags);
+                return true;
+        }
+
+        /* Check the next frame */
+        return false;
+}
+static bool rt2800pci_txdone_release_entries(struct queue_entry *entry,
+                                             void *data)
+{
+        if (test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) {
+                rt2800_txdone_entry(entry, entry->status,
+                                    rt2800pci_get_txwi(entry));
+                return false;
+        }
+
+        /* No more frames to release */
+        return true;
+}
+
 static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
 {
         struct data_queue *queue;
-        struct queue_entry *entry;
         u32 status;
         u8 qid;
         int max_tx_done = 16;
@@ -758,8 +843,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
                          * Unknown queue, this shouldn't happen. Just drop
                          * this tx status.
                          */
-                        WARNING(rt2x00dev, "Got TX status report with "
-                                           "unexpected pid %u, dropping\n", qid);
+                        rt2x00_warn(rt2x00dev, "Got TX status report with unexpected pid %u, dropping\n",
+                                    qid);
                         break;
                 }
 
@@ -769,8 +854,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
                          * The queue is NULL, this shouldn't happen. Stop
                          * processing here and drop the tx status
                          */
-                        WARNING(rt2x00dev, "Got TX status for an unavailable "
-                                           "queue %u, dropping\n", qid);
+                        rt2x00_warn(rt2x00dev, "Got TX status for an unavailable queue %u, dropping\n",
+                                    qid);
                         break;
                 }
 
@@ -779,13 +864,37 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
                          * The queue is empty. Stop processing here
                          * and drop the tx status.
                          */
-                        WARNING(rt2x00dev, "Got TX status for an empty "
-                                           "queue %u, dropping\n", qid);
+                        rt2x00_warn(rt2x00dev, "Got TX status for an empty queue %u, dropping\n",
+                                    qid);
                         break;
                 }
 
-                entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
-                rt2800_txdone_entry(entry, status, rt2800pci_get_txwi(entry));
+                /*
+                 * Let's associate this tx status with the first
+                 * matching frame.
+                 */
+                if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
+                                                Q_INDEX, &status,
+                                                rt2800pci_txdone_find_entry)) {
+                        /*
+                         * We cannot match the tx status to any frame, so just
+                         * use the first one.
+                         */
+                        if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
+                                                        Q_INDEX, &status,
+                                                        rt2800pci_txdone_match_first)) {
+                                rt2x00_warn(rt2x00dev, "No frame found for TX status on queue %u, dropping\n",
+                                            qid);
+                                break;
+                        }
+                }
+
+                /*
+                 * Release all frames with a valid tx status.
+                 */
+                rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
+                                           Q_INDEX, NULL,
+                                           rt2800pci_txdone_release_entries);
 
                 if (--max_tx_done == 0)
                         break;
@@ -804,9 +913,9 @@ static inline void rt2800pci_enable_interrupt(struct rt2x00_dev *rt2x00dev,
          * access needs locking.
          */
         spin_lock_irq(&rt2x00dev->irqmask_lock);
-        rt2x00pci_register_read(rt2x00dev, INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_MASK_CSR, &reg);
         rt2x00_set_field32(&reg, irq_field, 1);
-        rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_MASK_CSR, reg);
         spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
 
@@ -847,15 +956,15 @@ static void rt2800pci_tbtt_tasklet(unsigned long data)
                  * interval every 64 beacons by 64us to mitigate this effect.
                  */
                 if (drv_data->tbtt_tick == (BCN_TBTT_OFFSET - 2)) {
-                        rt2x00pci_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
+                        rt2x00mmio_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
                         rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_INTERVAL,
                                            (rt2x00dev->beacon_int * 16) - 1);
-                        rt2x00pci_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+                        rt2x00mmio_register_write(rt2x00dev, BCN_TIME_CFG, reg);
                 } else if (drv_data->tbtt_tick == (BCN_TBTT_OFFSET - 1)) {
-                        rt2x00pci_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
+                        rt2x00mmio_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
                         rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_INTERVAL,
                                            (rt2x00dev->beacon_int * 16));
-                        rt2x00pci_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+                        rt2x00mmio_register_write(rt2x00dev, BCN_TIME_CFG, reg);
                 }
                 drv_data->tbtt_tick++;
                 drv_data->tbtt_tick %= BCN_TBTT_OFFSET;
@@ -868,7 +977,7 @@ static void rt2800pci_tbtt_tasklet(unsigned long data)
 static void rt2800pci_rxdone_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-        if (rt2x00pci_rxdone(rt2x00dev))
+        if (rt2x00mmio_rxdone(rt2x00dev))
                 tasklet_schedule(&rt2x00dev->rxdone_tasklet);
         else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RX_DONE);
@@ -906,14 +1015,13 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
          * need to lock the kfifo.
          */
         for (i = 0; i < rt2x00dev->ops->tx->entry_num; i++) {
-                rt2x00pci_register_read(rt2x00dev, TX_STA_FIFO, &status);
+                rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status);
 
                 if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
                         break;
 
                 if (!kfifo_put(&rt2x00dev->txstatus_fifo, &status)) {
-                        WARNING(rt2x00dev, "TX status FIFO overrun,"
-                                "drop tx status report.\n");
+                        rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n");
                         break;
                 }
         }
@@ -928,8 +1036,8 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
         u32 reg, mask;
 
         /* Read status and ACK all interrupts */
-        rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-        rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
 
         if (!reg)
                 return IRQ_NONE;
@@ -969,9 +1077,9 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
          * the tasklet will reenable the appropriate interrupts.
          */
         spin_lock(&rt2x00dev->irqmask_lock);
-        rt2x00pci_register_read(rt2x00dev, INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_MASK_CSR, &reg);
         reg &= mask;
-        rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_MASK_CSR, reg);
         spin_unlock(&rt2x00dev->irqmask_lock);
 
         return IRQ_HANDLED;
@@ -1022,13 +1130,13 @@ static const struct ieee80211_ops rt2800pci_mac80211_ops = {
 };
 
 static const struct rt2800_ops rt2800pci_rt2800_ops = {
-        .register_read          = rt2x00pci_register_read,
-        .register_read_lock     = rt2x00pci_register_read, /* same for PCI */
-        .register_write         = rt2x00pci_register_write,
-        .register_write_lock    = rt2x00pci_register_write, /* same for PCI */
-        .register_multiread     = rt2x00pci_register_multiread,
-        .register_multiwrite    = rt2x00pci_register_multiwrite,
-        .regbusy_read           = rt2x00pci_regbusy_read,
+        .register_read          = rt2x00mmio_register_read,
+        .register_read_lock     = rt2x00mmio_register_read, /* same for PCI */
+        .register_write         = rt2x00mmio_register_write,
+        .register_write_lock    = rt2x00mmio_register_write, /* same for PCI */
+        .register_multiread     = rt2x00mmio_register_multiread,
+        .register_multiwrite    = rt2x00mmio_register_multiwrite,
+        .regbusy_read           = rt2x00mmio_regbusy_read,
         .read_eeprom            = rt2800pci_read_eeprom,
         .hwcrypt_disabled       = rt2800pci_hwcrypt_disabled,
         .drv_write_firmware     = rt2800pci_write_firmware,
@@ -1047,8 +1155,8 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
         .get_firmware_name      = rt2800pci_get_firmware_name,
         .check_firmware         = rt2800_check_firmware,
         .load_firmware          = rt2800_load_firmware,
-        .initialize             = rt2x00pci_initialize,
-        .uninitialize           = rt2x00pci_uninitialize,
+        .initialize             = rt2x00mmio_initialize,
+        .uninitialize           = rt2x00mmio_uninitialize,
         .get_entry_state        = rt2800pci_get_entry_state,
         .clear_entry            = rt2800pci_clear_entry,
         .set_device_state       = rt2800pci_set_device_state,
@@ -1061,7 +1169,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
         .start_queue            = rt2800pci_start_queue,
         .kick_queue             = rt2800pci_kick_queue,
         .stop_queue             = rt2800pci_stop_queue,
-        .flush_queue            = rt2x00pci_flush_queue,
+        .flush_queue            = rt2x00mmio_flush_queue,
         .write_tx_desc          = rt2800pci_write_tx_desc,
         .write_tx_data          = rt2800_write_tx_data,
         .write_beacon           = rt2800_write_beacon,
@@ -1082,21 +1190,24 @@ static const struct data_queue_desc rt2800pci_queue_rx = {
         .entry_num              = 128,
         .data_size              = AGGREGATION_SIZE,
         .desc_size              = RXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .winfo_size             = RXWI_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2800pci_queue_tx = {
         .entry_num              = 64,
         .data_size              = AGGREGATION_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .winfo_size             = TXWI_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt2800pci_queue_bcn = {
         .entry_num              = 8,
         .data_size              = 0, /* No DMA required for beacons */
-        .desc_size              = TXWI_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .desc_size              = TXD_DESC_SIZE,
+        .winfo_size             = TXWI_DESC_SIZE,
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct rt2x00_ops rt2800pci_ops = {
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 098613ed93fb..ac854d75bd6c 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -128,9 +128,9 @@ static inline bool rt2800usb_entry_txstatus_timeout(struct queue_entry *entry)
 
         tout = time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
         if (unlikely(tout))
-                WARNING(entry->queue->rt2x00dev,
-                        "TX status timeout for entry %d in queue %d\n",
-                        entry->entry_idx, entry->queue->qid);
+                rt2x00_warn(entry->queue->rt2x00dev,
+                            "TX status timeout for entry %d in queue %d\n",
+                            entry->entry_idx, entry->queue->qid);
         return tout;
 
 }
@@ -154,7 +154,8 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
         bool valid;
 
         if (urb_status) {
-                WARNING(rt2x00dev, "TX status read failed %d\n", urb_status);
+                rt2x00_warn(rt2x00dev, "TX status read failed %d\n",
+                            urb_status);
 
                 goto stop_reading;
         }
@@ -162,7 +163,7 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
         valid = rt2x00_get_field32(tx_status, TX_STA_FIFO_VALID);
         if (valid) {
                 if (!kfifo_put(&rt2x00dev->txstatus_fifo, &tx_status))
-                        WARNING(rt2x00dev, "TX status FIFO overrun\n");
+                        rt2x00_warn(rt2x00dev, "TX status FIFO overrun\n");
 
                 queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
 
@@ -269,7 +270,7 @@ static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev,
                                              0, USB_MODE_FIRMWARE,
                                              REGISTER_TIMEOUT_FIRMWARE);
         if (status < 0) {
-                ERROR(rt2x00dev, "Failed to write Firmware to device.\n");
+                rt2x00_err(rt2x00dev, "Failed to write Firmware to device\n");
                 return status;
         }
 
@@ -392,8 +393,8 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -408,8 +409,7 @@ static void rt2800usb_watchdog(struct rt2x00_dev *rt2x00dev)
 
         rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, &reg);
         if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX0Q)) {
-                WARNING(rt2x00dev, "TX HW queue 0 timed out,"
-                        " invoke forced kick\n");
+                rt2x00_warn(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n");
 
                 rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40012);
 
@@ -424,8 +424,7 @@ static void rt2800usb_watchdog(struct rt2x00_dev *rt2x00dev)
 
         rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, &reg);
         if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX1Q)) {
-                WARNING(rt2x00dev, "TX HW queue 1 timed out,"
-                        " invoke forced kick\n");
+                rt2x00_warn(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n");
 
                 rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf4000a);
 
@@ -485,7 +484,7 @@ static void rt2800usb_write_tx_desc(struct queue_entry *entry,
          */
         skbdesc->flags |= SKBDESC_DESC_IN_SKB;
         skbdesc->desc = txi;
-        skbdesc->desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
+        skbdesc->desc_len = TXINFO_DESC_SIZE + entry->queue->winfo_size;
 }
 
 /*
@@ -540,9 +539,9 @@ rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)
         tx_pid  = rt2x00_get_field32(word, TXWI_W1_PACKETID);
 
         if (wcid != tx_wcid || ack != tx_ack || (!is_agg && pid != tx_pid)) {
-                DEBUG(entry->queue->rt2x00dev,
-                      "TX status report missed for queue %d entry %d\n",
-                      entry->queue->qid, entry->entry_idx);
+                rt2x00_dbg(entry->queue->rt2x00dev,
+                           "TX status report missed for queue %d entry %d\n",
+                           entry->queue->qid, entry->entry_idx);
                 return TXDONE_UNKNOWN;
         }
 
@@ -566,8 +565,8 @@ static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev)
                 queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);
 
                 if (unlikely(rt2x00queue_empty(queue))) {
-                        WARNING(rt2x00dev, "Got TX status for an empty "
-                                           "queue %u, dropping\n", qid);
+                        rt2x00_warn(rt2x00dev, "Got TX status for an empty queue %u, dropping\n",
+                                    qid);
                         break;
                 }
 
@@ -575,8 +574,8 @@ static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev)
 
                 if (unlikely(test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) ||
                              !test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))) {
-                        WARNING(rt2x00dev, "Data pending for entry %u "
-                                           "in queue %u\n", entry->entry_idx, qid);
+                        rt2x00_warn(rt2x00dev, "Data pending for entry %u in queue %u\n",
+                                    entry->entry_idx, qid);
                         break;
                 }
 
@@ -677,8 +676,8 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
          */
         if (unlikely(rx_pkt_len == 0 ||
                         rx_pkt_len > entry->queue->data_size)) {
-                ERROR(entry->queue->rt2x00dev,
-                        "Bad frame size %d, forcing to 0\n", rx_pkt_len);
+                rt2x00_err(entry->queue->rt2x00dev,
+                           "Bad frame size %d, forcing to 0\n", rx_pkt_len);
                 return;
         }
 
@@ -853,21 +852,24 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
 static const struct data_queue_desc rt2800usb_queue_rx = {
         .entry_num              = 128,
         .data_size              = AGGREGATION_SIZE,
-        .desc_size              = RXINFO_DESC_SIZE + RXWI_DESC_SIZE,
+        .desc_size              = RXINFO_DESC_SIZE,
+        .winfo_size             = RXWI_DESC_SIZE,
         .priv_size              = sizeof(struct queue_entry_priv_usb),
 };
 
 static const struct data_queue_desc rt2800usb_queue_tx = {
         .entry_num              = 16,
         .data_size              = AGGREGATION_SIZE,
-        .desc_size              = TXINFO_DESC_SIZE + TXWI_DESC_SIZE,
+        .desc_size              = TXINFO_DESC_SIZE,
+        .winfo_size             = TXWI_DESC_SIZE,
         .priv_size              = sizeof(struct queue_entry_priv_usb),
 };
 
 static const struct data_queue_desc rt2800usb_queue_bcn = {
         .entry_num              = 8,
         .data_size              = MGMT_FRAME_SIZE,
-        .desc_size              = TXINFO_DESC_SIZE + TXWI_DESC_SIZE,
+        .desc_size              = TXINFO_DESC_SIZE,
+        .winfo_size             = TXWI_DESC_SIZE,
         .priv_size              = sizeof(struct queue_entry_priv_usb),
 };
 
@@ -890,6 +892,50 @@ static const struct rt2x00_ops rt2800usb_ops = {
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
+static const struct data_queue_desc rt2800usb_queue_rx_5592 = {
+        .entry_num              = 128,
+        .data_size              = AGGREGATION_SIZE,
+        .desc_size              = RXINFO_DESC_SIZE,
+        .winfo_size             = RXWI_DESC_SIZE_5592,
+        .priv_size              = sizeof(struct queue_entry_priv_usb),
+};
+
+static const struct data_queue_desc rt2800usb_queue_tx_5592 = {
+        .entry_num              = 16,
+        .data_size              = AGGREGATION_SIZE,
+        .desc_size              = TXINFO_DESC_SIZE,
+        .winfo_size             = TXWI_DESC_SIZE_5592,
+        .priv_size              = sizeof(struct queue_entry_priv_usb),
+};
+
+static const struct data_queue_desc rt2800usb_queue_bcn_5592 = {
+        .entry_num              = 8,
+        .data_size              = MGMT_FRAME_SIZE,
+        .desc_size              = TXINFO_DESC_SIZE,
+        .winfo_size             = TXWI_DESC_SIZE_5592,
+        .priv_size              = sizeof(struct queue_entry_priv_usb),
+};
+
+
+static const struct rt2x00_ops rt2800usb_ops_5592 = {
+        .name                   = KBUILD_MODNAME,
+        .drv_data_size          = sizeof(struct rt2800_drv_data),
+        .max_ap_intf            = 8,
+        .eeprom_size            = EEPROM_SIZE,
+        .rf_size                = RF_SIZE,
+        .tx_queues              = NUM_TX_QUEUES,
+        .extra_tx_headroom      = TXINFO_DESC_SIZE + TXWI_DESC_SIZE_5592,
+        .rx                     = &rt2800usb_queue_rx_5592,
+        .tx                     = &rt2800usb_queue_tx_5592,
+        .bcn                    = &rt2800usb_queue_bcn_5592,
+        .lib                    = &rt2800usb_rt2x00_ops,
+        .drv                    = &rt2800usb_rt2800_ops,
+        .hw                     = &rt2800usb_mac80211_ops,
+#ifdef CONFIG_RT2X00_LIB_DEBUGFS
+        .debugfs                = &rt2800_rt2x00debug,
+#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
+};
+
 /*
  * rt2800usb module information.
  */
@@ -1200,6 +1246,18 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x148f, 0x5370) },
         { USB_DEVICE(0x148f, 0x5372) },
 #endif
+#ifdef CONFIG_RT2800USB_RT55XX
+        /* Arcadyan */
+        { USB_DEVICE(0x043e, 0x7a32), .driver_info = 5592 },
+        /* AVM GmbH */
+        { USB_DEVICE(0x057c, 0x8501), .driver_info = 5592 },
+        /* D-Link DWA-160-B2 */
+        { USB_DEVICE(0x2001, 0x3c1a), .driver_info = 5592 },
+        /* Proware */
+        { USB_DEVICE(0x043e, 0x7a13), .driver_info = 5592 },
+        /* Ralink */
+        { USB_DEVICE(0x148f, 0x5572), .driver_info = 5592 },
+#endif
 #ifdef CONFIG_RT2800USB_UNKNOWN
         /*
          * Unclear what kind of devices these are (they aren't supported by the
@@ -1303,6 +1361,9 @@ MODULE_LICENSE("GPL");
 static int rt2800usb_probe(struct usb_interface *usb_intf,
                            const struct usb_device_id *id)
 {
+        if (id->driver_info == 5592)
+                return rt2x00usb_probe(usb_intf, &rt2800usb_ops_5592);
+
         return rt2x00usb_probe(usb_intf, &rt2800usb_ops);
 }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 086abb403a4f..7510723a8c37 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -54,47 +54,36 @@
 #define DRV_VERSION     "2.3.0"
 #define DRV_PROJECT     "http://rt2x00.serialmonkey.com"
 
-/*
- * Debug definitions.
+/* Debug definitions.
  * Debug output has to be enabled during compile time.
  */
-#define DEBUG_PRINTK_MSG(__dev, __kernlvl, __lvl, __msg, __args...)     \
-        printk(__kernlvl "%s -> %s: %s - " __msg,                       \
-               wiphy_name((__dev)->hw->wiphy), __func__, __lvl, ##__args)
-
-#define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...)  \
-        printk(__kernlvl "%s -> %s: %s - " __msg,               \
-               KBUILD_MODNAME, __func__, __lvl, ##__args)
-
 #ifdef CONFIG_RT2X00_DEBUG
-#define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \
-        DEBUG_PRINTK_MSG(__dev, __kernlvl, __lvl, __msg, ##__args)
-#else
-#define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \
-        do { } while (0)
+#define DEBUG
 #endif /* CONFIG_RT2X00_DEBUG */
 
-/*
- * Various debug levels.
- * The debug levels PANIC and ERROR both indicate serious problems,
- * for this reason they should never be ignored.
- * The special ERROR_PROBE message is for messages that are generated
- * when the rt2x00_dev is not yet initialized.
+/* Utility printing macros
+ * rt2x00_probe_err is for messages when rt2x00_dev is uninitialized
  */
-#define PANIC(__dev, __msg, __args...) \
-        DEBUG_PRINTK_MSG(__dev, KERN_CRIT, "Panic", __msg, ##__args)
-#define ERROR(__dev, __msg, __args...)  \
-        DEBUG_PRINTK_MSG(__dev, KERN_ERR, "Error", __msg, ##__args)
-#define ERROR_PROBE(__msg, __args...) \
-        DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
-#define WARNING(__dev, __msg, __args...) \
-        DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
-#define INFO(__dev, __msg, __args...) \
-        DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
-#define DEBUG(__dev, __msg, __args...) \
-        DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
-#define EEPROM(__dev, __msg, __args...) \
-        DEBUG_PRINTK(__dev, KERN_DEBUG, "EEPROM recovery", __msg, ##__args)
+#define rt2x00_probe_err(fmt, ...)                                      \
+        printk(KERN_ERR KBUILD_MODNAME ": %s: Error - " fmt,            \
+               __func__, ##__VA_ARGS__)
+#define rt2x00_err(dev, fmt, ...)                                       \
+        wiphy_err((dev)->hw->wiphy, "%s: Error - " fmt,                 \
+                  __func__, ##__VA_ARGS__)
+#define rt2x00_warn(dev, fmt, ...)                                      \
+        wiphy_warn((dev)->hw->wiphy, "%s: Warning - " fmt,              \
+                   __func__, ##__VA_ARGS__)
+#define rt2x00_info(dev, fmt, ...)                                      \
+        wiphy_info((dev)->hw->wiphy, "%s: Info - " fmt,                 \
+                   __func__, ##__VA_ARGS__)
+
+/* Various debug levels */
+#define rt2x00_dbg(dev, fmt, ...)                                       \
+        wiphy_dbg((dev)->hw->wiphy, "%s: Debug - " fmt,                 \
+                  __func__, ##__VA_ARGS__)
+#define rt2x00_eeprom_dbg(dev, fmt, ...)                                \
+        wiphy_dbg((dev)->hw->wiphy, "%s: EEPROM recovery - " fmt,       \
+                  __func__, ##__VA_ARGS__)
 
 /*
  * Duration calculations
@@ -193,6 +182,7 @@ struct rt2x00_chip {
 #define RT3883          0x3883  /* WSOC */
 #define RT5390          0x5390  /* 2.4GHz */
 #define RT5392          0x5392  /* 2.4GHz */
+#define RT5592          0x5592
 
         u16 rf;
         u16 rev;
@@ -1064,8 +1054,7 @@ static inline void rt2x00_rf_write(struct rt2x00_dev *rt2x00dev,
 }
 
 /*
- *  Generic EEPROM access.
- * The EEPROM is being accessed by word index.
+ * Generic EEPROM access. The EEPROM is being accessed by word or byte index.
  */
 static inline void *rt2x00_eeprom_addr(struct rt2x00_dev *rt2x00dev,
                                        const unsigned int word)
@@ -1085,6 +1074,12 @@ static inline void rt2x00_eeprom_write(struct rt2x00_dev *rt2x00dev,
         rt2x00dev->eeprom[word] = cpu_to_le16(data);
 }
 
+static inline u8 rt2x00_eeprom_byte(struct rt2x00_dev *rt2x00dev,
+                                    const unsigned int byte)
+{
+        return *(((u8 *)rt2x00dev->eeprom) + byte);
+}
+
 /*
  * Chipset handlers
  */
@@ -1095,9 +1090,27 @@ static inline void rt2x00_set_chip(struct rt2x00_dev *rt2x00dev,
         rt2x00dev->chip.rf = rf;
         rt2x00dev->chip.rev = rev;
 
-        INFO(rt2x00dev,
-             "Chipset detected - rt: %04x, rf: %04x, rev: %04x.\n",
-             rt2x00dev->chip.rt, rt2x00dev->chip.rf, rt2x00dev->chip.rev);
+        rt2x00_info(rt2x00dev, "Chipset detected - rt: %04x, rf: %04x, rev: %04x\n",
+                    rt2x00dev->chip.rt, rt2x00dev->chip.rf,
+                    rt2x00dev->chip.rev);
+}
+
+static inline void rt2x00_set_rt(struct rt2x00_dev *rt2x00dev,
+                                 const u16 rt, const u16 rev)
+{
+        rt2x00dev->chip.rt = rt;
+        rt2x00dev->chip.rev = rev;
+
+        rt2x00_info(rt2x00dev, "RT chipset %04x, rev %04x detected\n",
+                    rt2x00dev->chip.rt, rt2x00dev->chip.rev);
+}
+
+static inline void rt2x00_set_rf(struct rt2x00_dev *rt2x00dev, const u16 rf)
+{
+        rt2x00dev->chip.rf = rf;
+
+        rt2x00_info(rt2x00dev, "RF chipset %04x detected\n",
+                    rt2x00dev->chip.rf);
 }
 
 static inline bool rt2x00_rt(struct rt2x00_dev *rt2x00dev, const u16 rt)
@@ -1360,7 +1373,7 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
                       struct ieee80211_vif *vif, u16 queue,
                       const struct ieee80211_tx_queue_params *params);
 void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw);
-void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop);
+void rt2x00mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop);
 int rt2x00mac_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);
 int rt2x00mac_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);
 void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 49a63e973934..8cb43f8f3efc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -184,7 +184,7 @@ static u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,
         /*
          * Initialize center channel to current channel.
          */
-        center_channel = spec->channels[conf->channel->hw_value].channel;
+        center_channel = spec->channels[conf->chandef.chan->hw_value].channel;
 
         /*
          * Adjust center channel to HT40+ and HT40- operation.
@@ -199,7 +199,7 @@ static u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,
                         return i;
 
         WARN_ON(1);
-        return conf->channel->hw_value;
+        return conf->chandef.chan->hw_value;
 }
 
 void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
@@ -227,7 +227,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
                         hw_value = rt2x00ht_center_channel(rt2x00dev, conf);
                 } else {
                         clear_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);
-                        hw_value = conf->channel->hw_value;
+                        hw_value = conf->chandef.chan->hw_value;
                 }
 
                 memcpy(&libconf.rf,
@@ -279,8 +279,8 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
         else
                 clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);
 
-        rt2x00dev->curr_band = conf->channel->band;
-        rt2x00dev->curr_freq = conf->channel->center_freq;
+        rt2x00dev->curr_band = conf->chandef.chan->band;
+        rt2x00dev->curr_freq = conf->chandef.chan->center_freq;
         rt2x00dev->tx_power = conf->power_level;
         rt2x00dev->short_retry = conf->short_frame_max_tx_count;
         rt2x00dev->long_retry = conf->long_frame_max_tx_count;
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index 3bb8cafbac59..fe7a7f63a9ed 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -174,7 +174,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
         do_gettimeofday(&timestamp);
 
         if (skb_queue_len(&intf->frame_dump_skbqueue) > 20) {
-                DEBUG(rt2x00dev, "txrx dump queue length exceeded.\n");
+                rt2x00_dbg(rt2x00dev, "txrx dump queue length exceeded\n");
                 return;
         }
 
@@ -185,7 +185,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
         skbcopy = alloc_skb(sizeof(*dump_hdr) + skbdesc->desc_len + data_len,
                             GFP_ATOMIC);
         if (!skbcopy) {
-                DEBUG(rt2x00dev, "Failed to copy skb for dump.\n");
+                rt2x00_dbg(rt2x00dev, "Failed to copy skb for dump\n");
                 return;
         }
 
@@ -657,7 +657,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
 
         intf = kzalloc(sizeof(struct rt2x00debug_intf), GFP_KERNEL);
         if (!intf) {
-                ERROR(rt2x00dev, "Failed to allocate debug handler.\n");
+                rt2x00_err(rt2x00dev, "Failed to allocate debug handler\n");
                 return;
         }
 
@@ -760,7 +760,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
 
 exit:
         rt2x00debug_deregister(rt2x00dev);
-        ERROR(rt2x00dev, "Failed to register debug handler.\n");
+        rt2x00_err(rt2x00dev, "Failed to register debug handler\n");
 }
 
 void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 189744db65e0..90dc14336980 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -171,7 +171,7 @@ static void rt2x00lib_autowakeup(struct work_struct *work)
                 return;
 
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_AWAKE))
-                ERROR(rt2x00dev, "Device failed to wakeup.\n");
+                rt2x00_err(rt2x00dev, "Device failed to wakeup\n");
         clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);
 }
 
@@ -673,9 +673,8 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
                 break;
         }
 
-        WARNING(rt2x00dev, "Frame received with unrecognized signal, "
-                "mode=0x%.4x, signal=0x%.4x, type=%d.\n",
-                rxdesc->rate_mode, signal, type);
+        rt2x00_warn(rt2x00dev, "Frame received with unrecognized signal, mode=0x%.4x, signal=0x%.4x, type=%d\n",
+                    rxdesc->rate_mode, signal, type);
         return 0;
 }
 
@@ -720,8 +719,8 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
          */
         if (unlikely(rxdesc.size == 0 ||
                      rxdesc.size > entry->queue->data_size)) {
-                ERROR(rt2x00dev, "Wrong frame size %d max %d.\n",
-                        rxdesc.size, entry->queue->data_size);
+                rt2x00_err(rt2x00dev, "Wrong frame size %d max %d\n",
+                           rxdesc.size, entry->queue->data_size);
                 dev_kfree_skb(entry->skb);
                 goto renew_skb;
         }
@@ -1006,7 +1005,7 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
 
  exit_free_channels:
         kfree(channels);
-        ERROR(rt2x00dev, "Allocation ieee80211 modes failed.\n");
+        rt2x00_err(rt2x00dev, "Allocation ieee80211 modes failed\n");
         return -ENOMEM;
 }
 
@@ -1337,7 +1336,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
          */
         retval = rt2x00dev->ops->lib->probe_hw(rt2x00dev);
         if (retval) {
-                ERROR(rt2x00dev, "Failed to allocate device.\n");
+                rt2x00_err(rt2x00dev, "Failed to allocate device\n");
                 goto exit;
         }
 
@@ -1353,7 +1352,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
          */
         retval = rt2x00lib_probe_hw(rt2x00dev);
         if (retval) {
-                ERROR(rt2x00dev, "Failed to initialize hw.\n");
+                rt2x00_err(rt2x00dev, "Failed to initialize hw\n");
                 goto exit;
         }
 
@@ -1451,7 +1450,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
 #ifdef CONFIG_PM
 int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
 {
-        DEBUG(rt2x00dev, "Going to sleep.\n");
+        rt2x00_dbg(rt2x00dev, "Going to sleep\n");
 
         /*
          * Prevent mac80211 from accessing driver while suspended.
@@ -1482,8 +1481,7 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
          * device is as good as disabled.
          */
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP))
-                WARNING(rt2x00dev, "Device failed to enter sleep state, "
-                        "continue suspending.\n");
+                rt2x00_warn(rt2x00dev, "Device failed to enter sleep state, continue suspending\n");
 
         return 0;
 }
@@ -1491,7 +1489,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
 
 int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 {
-        DEBUG(rt2x00dev, "Waking up.\n");
+        rt2x00_dbg(rt2x00dev, "Waking up\n");
 
         /*
          * Restore/enable extra components.
diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c
index f316aad30612..1b4254b4272d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00firmware.c
+++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c
@@ -42,28 +42,28 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
          */
         fw_name = rt2x00dev->ops->lib->get_firmware_name(rt2x00dev);
         if (!fw_name) {
-                ERROR(rt2x00dev,
-                      "Invalid firmware filename.\n"
-                      "Please file bug report to %s.\n", DRV_PROJECT);
+                rt2x00_err(rt2x00dev,
+                           "Invalid firmware filename\n"
+                           "Please file bug report to %s\n", DRV_PROJECT);
                 return -EINVAL;
         }
 
-        INFO(rt2x00dev, "Loading firmware file '%s'.\n", fw_name);
+        rt2x00_info(rt2x00dev, "Loading firmware file '%s'\n", fw_name);
 
         retval = request_firmware(&fw, fw_name, device);
         if (retval) {
-                ERROR(rt2x00dev, "Failed to request Firmware.\n");
+                rt2x00_err(rt2x00dev, "Failed to request Firmware\n");
                 return retval;
         }
 
         if (!fw || !fw->size || !fw->data) {
-                ERROR(rt2x00dev, "Failed to read Firmware.\n");
+                rt2x00_err(rt2x00dev, "Failed to read Firmware\n");
                 release_firmware(fw);
                 return -ENOENT;
         }
 
-        INFO(rt2x00dev, "Firmware detected - version: %d.%d.\n",
-             fw->data[fw->size - 4], fw->data[fw->size - 3]);
+        rt2x00_info(rt2x00dev, "Firmware detected - version: %d.%d\n",
+                    fw->data[fw->size - 4], fw->data[fw->size - 3]);
         snprintf(rt2x00dev->hw->wiphy->fw_version,
                         sizeof(rt2x00dev->hw->wiphy->fw_version), "%d.%d",
                         fw->data[fw->size - 4], fw->data[fw->size - 3]);
@@ -73,15 +73,14 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
         case FW_OK:
                 break;
         case FW_BAD_CRC:
-                ERROR(rt2x00dev, "Firmware checksum error.\n");
+                rt2x00_err(rt2x00dev, "Firmware checksum error\n");
                 goto exit;
         case FW_BAD_LENGTH:
-                ERROR(rt2x00dev,
-                      "Invalid firmware file length (len=%zu)\n", fw->size);
+                rt2x00_err(rt2x00dev, "Invalid firmware file length (len=%zu)\n",
+                           fw->size);
                 goto exit;
         case FW_BAD_VERSION:
-                ERROR(rt2x00dev,
-                      "Current firmware does not support detected chipset.\n");
+                rt2x00_err(rt2x00dev, "Current firmware does not support detected chipset\n");
                 goto exit;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.c b/drivers/net/wireless/rt2x00/rt2x00leds.c
index 8679d781a264..997a6c89e66e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00leds.c
+++ b/drivers/net/wireless/rt2x00/rt2x00leds.c
@@ -113,7 +113,7 @@ static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev,
 
         retval = led_classdev_register(device, &led->led_dev);
         if (retval) {
-                ERROR(rt2x00dev, "Failed to register led handler.\n");
+                rt2x00_err(rt2x00dev, "Failed to register led handler\n");
                 return retval;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 20c6eccce5aa..f883802f3505 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -46,7 +46,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
 
         skb = dev_alloc_skb(data_length + rt2x00dev->hw->extra_tx_headroom);
         if (unlikely(!skb)) {
-                WARNING(rt2x00dev, "Failed to create RTS/CTS frame.\n");
+                rt2x00_warn(rt2x00dev, "Failed to create RTS/CTS frame\n");
                 return -ENOMEM;
         }
 
@@ -93,7 +93,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
         retval = rt2x00queue_write_tx_frame(queue, skb, true);
         if (retval) {
                 dev_kfree_skb_any(skb);
-                WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");
+                rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
         }
 
         return retval;
@@ -126,9 +126,9 @@ void rt2x00mac_tx(struct ieee80211_hw *hw,
 
         queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);
         if (unlikely(!queue)) {
-                ERROR(rt2x00dev,
-                      "Attempt to send packet over invalid queue %d.\n"
-                      "Please file bug report to %s.\n", qid, DRV_PROJECT);
+                rt2x00_err(rt2x00dev,
+                           "Attempt to send packet over invalid queue %d\n"
+                           "Please file bug report to %s\n", qid, DRV_PROJECT);
                 goto exit_free_skb;
         }
 
@@ -731,9 +731,10 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
         queue->aifs = params->aifs;
         queue->txop = params->txop;
 
-        DEBUG(rt2x00dev,
-              "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
-              queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
+        rt2x00_dbg(rt2x00dev,
+                   "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d\n",
+                   queue_idx, queue->cw_min, queue->cw_max, queue->aifs,
+                   queue->txop);
 
         return 0;
 }
@@ -748,7 +749,7 @@ void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);
 
-void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop)
+void rt2x00mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct data_queue *queue;
diff --git a/drivers/net/wireless/rt2x00/rt2x00mmio.c b/drivers/net/wireless/rt2x00/rt2x00mmio.c
index d84a680ba0c9..64b06c6abe58 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mmio.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mmio.c
@@ -34,10 +34,10 @@
 /*
  * Register access.
  */
-int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
-                           const unsigned int offset,
-                           const struct rt2x00_field32 field,
-                           u32 *reg)
+int rt2x00mmio_regbusy_read(struct rt2x00_dev *rt2x00dev,
+                            const unsigned int offset,
+                            const struct rt2x00_field32 field,
+                            u32 *reg)
 {
         unsigned int i;
 
@@ -45,7 +45,7 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
                 return 0;
 
         for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2x00pci_register_read(rt2x00dev, offset, reg);
+                rt2x00mmio_register_read(rt2x00dev, offset, reg);
                 if (!rt2x00_get_field32(*reg, field))
                         return 1;
                 udelay(REGISTER_BUSY_DELAY);
@@ -57,13 +57,13 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read);
+EXPORT_SYMBOL_GPL(rt2x00mmio_regbusy_read);
 
-bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
+bool rt2x00mmio_rxdone(struct rt2x00_dev *rt2x00dev)
 {
         struct data_queue *queue = rt2x00dev->rx;
         struct queue_entry *entry;
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         struct skb_frame_desc *skbdesc;
         int max_rx = 16;
 
@@ -96,24 +96,24 @@ bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 
         return !max_rx;
 }
-EXPORT_SYMBOL_GPL(rt2x00pci_rxdone);
+EXPORT_SYMBOL_GPL(rt2x00mmio_rxdone);
 
-void rt2x00pci_flush_queue(struct data_queue *queue, bool drop)
+void rt2x00mmio_flush_queue(struct data_queue *queue, bool drop)
 {
         unsigned int i;
 
         for (i = 0; !rt2x00queue_empty(queue) && i < 10; i++)
                 msleep(10);
 }
-EXPORT_SYMBOL_GPL(rt2x00pci_flush_queue);
+EXPORT_SYMBOL_GPL(rt2x00mmio_flush_queue);
 
 /*
  * Device initialization handlers.
  */
-static int rt2x00pci_alloc_queue_dma(struct rt2x00_dev *rt2x00dev,
-                                     struct data_queue *queue)
+static int rt2x00mmio_alloc_queue_dma(struct rt2x00_dev *rt2x00dev,
+                                      struct data_queue *queue)
 {
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         void *addr;
         dma_addr_t dma;
         unsigned int i;
@@ -141,10 +141,10 @@ static int rt2x00pci_alloc_queue_dma(struct rt2x00_dev *rt2x00dev,
         return 0;
 }
 
-static void rt2x00pci_free_queue_dma(struct rt2x00_dev *rt2x00dev,
-                                     struct data_queue *queue)
+static void rt2x00mmio_free_queue_dma(struct rt2x00_dev *rt2x00dev,
+                                      struct data_queue *queue)
 {
-        struct queue_entry_priv_pci *entry_priv =
+        struct queue_entry_priv_mmio *entry_priv =
             queue->entries[0].priv_data;
 
         if (entry_priv->desc)
@@ -154,7 +154,7 @@ static void rt2x00pci_free_queue_dma(struct rt2x00_dev *rt2x00dev,
         entry_priv->desc = NULL;
 }
 
-int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
+int rt2x00mmio_initialize(struct rt2x00_dev *rt2x00dev)
 {
         struct data_queue *queue;
         int status;
@@ -163,7 +163,7 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
          * Allocate DMA
          */
         queue_for_each(rt2x00dev, queue) {
-                status = rt2x00pci_alloc_queue_dma(rt2x00dev, queue);
+                status = rt2x00mmio_alloc_queue_dma(rt2x00dev, queue);
                 if (status)
                         goto exit;
         }
@@ -175,8 +175,8 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
                              rt2x00dev->ops->lib->irq_handler,
                              IRQF_SHARED, rt2x00dev->name, rt2x00dev);
         if (status) {
-                ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",
-                      rt2x00dev->irq, status);
+                rt2x00_err(rt2x00dev, "IRQ %d allocation failed (error %d)\n",
+                           rt2x00dev->irq, status);
                 goto exit;
         }
 
@@ -184,13 +184,13 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
 
 exit:
         queue_for_each(rt2x00dev, queue)
-                rt2x00pci_free_queue_dma(rt2x00dev, queue);
+                rt2x00mmio_free_queue_dma(rt2x00dev, queue);
 
         return status;
 }
-EXPORT_SYMBOL_GPL(rt2x00pci_initialize);
+EXPORT_SYMBOL_GPL(rt2x00mmio_initialize);
 
-void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev)
+void rt2x00mmio_uninitialize(struct rt2x00_dev *rt2x00dev)
 {
         struct data_queue *queue;
 
@@ -203,9 +203,9 @@ void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev)
          * Free DMA
          */
         queue_for_each(rt2x00dev, queue)
-                rt2x00pci_free_queue_dma(rt2x00dev, queue);
+                rt2x00mmio_free_queue_dma(rt2x00dev, queue);
 }
-EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
+EXPORT_SYMBOL_GPL(rt2x00mmio_uninitialize);
 
 /*
  * rt2x00mmio module information.
diff --git a/drivers/net/wireless/rt2x00/rt2x00mmio.h b/drivers/net/wireless/rt2x00/rt2x00mmio.h
index 4ecaf60175bf..cda3dbcf7ead 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mmio.h
+++ b/drivers/net/wireless/rt2x00/rt2x00mmio.h
@@ -31,37 +31,37 @@
 /*
  * Register access.
  */
-static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev,
-                                           const unsigned int offset,
-                                           u32 *value)
+static inline void rt2x00mmio_register_read(struct rt2x00_dev *rt2x00dev,
+                                            const unsigned int offset,
+                                            u32 *value)
 {
         *value = readl(rt2x00dev->csr.base + offset);
 }
 
-static inline void rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev,
-                                                const unsigned int offset,
-                                                void *value, const u32 length)
+static inline void rt2x00mmio_register_multiread(struct rt2x00_dev *rt2x00dev,
+                                                 const unsigned int offset,
+                                                 void *value, const u32 length)
 {
         memcpy_fromio(value, rt2x00dev->csr.base + offset, length);
 }
 
-static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
-                                            const unsigned int offset,
-                                            u32 value)
+static inline void rt2x00mmio_register_write(struct rt2x00_dev *rt2x00dev,
+                                             const unsigned int offset,
+                                             u32 value)
 {
         writel(value, rt2x00dev->csr.base + offset);
 }
 
-static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
-                                                 const unsigned int offset,
-                                                 const void *value,
-                                                 const u32 length)
+static inline void rt2x00mmio_register_multiwrite(struct rt2x00_dev *rt2x00dev,
+                                                  const unsigned int offset,
+                                                  const void *value,
+                                                  const u32 length)
 {
         __iowrite32_copy(rt2x00dev->csr.base + offset, value, length >> 2);
 }
 
 /**
- * rt2x00pci_regbusy_read - Read from register with busy check
+ * rt2x00mmio_regbusy_read - Read from register with busy check
  * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
  * @offset: Register offset
  * @field: Field to check if register is busy
@@ -73,47 +73,47 @@ static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
  * is not read after a certain timeout, this function will return
  * FALSE.
  */
-int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
-                           const unsigned int offset,
-                           const struct rt2x00_field32 field,
-                           u32 *reg);
+int rt2x00mmio_regbusy_read(struct rt2x00_dev *rt2x00dev,
+                            const unsigned int offset,
+                            const struct rt2x00_field32 field,
+                            u32 *reg);
 
 /**
- * struct queue_entry_priv_pci: Per entry PCI specific information
+ * struct queue_entry_priv_mmio: Per entry PCI specific information
  *
  * @desc: Pointer to device descriptor
  * @desc_dma: DMA pointer to &desc.
  * @data: Pointer to device's entry memory.
  * @data_dma: DMA pointer to &data.
  */
-struct queue_entry_priv_pci {
+struct queue_entry_priv_mmio {
         __le32 *desc;
         dma_addr_t desc_dma;
 };
 
 /**
- * rt2x00pci_rxdone - Handle RX done events
+ * rt2x00mmio_rxdone - Handle RX done events
  * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
  *
  * Returns true if there are still rx frames pending and false if all
  * pending rx frames were processed.
  */
-bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
+bool rt2x00mmio_rxdone(struct rt2x00_dev *rt2x00dev);
 
 /**
- * rt2x00pci_flush_queue - Flush data queue
+ * rt2x00mmio_flush_queue - Flush data queue
  * @queue: Data queue to stop
  * @drop: True to drop all pending frames.
  *
  * This will wait for a maximum of 100ms, waiting for the queues
  * to become empty.
  */
-void rt2x00pci_flush_queue(struct data_queue *queue, bool drop);
+void rt2x00mmio_flush_queue(struct data_queue *queue, bool drop);
 
 /*
  * Device initialization handlers.
  */
-int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev);
-void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev);
+int rt2x00mmio_initialize(struct rt2x00_dev *rt2x00dev);
+void rt2x00mmio_uninitialize(struct rt2x00_dev *rt2x00dev);
 
 #endif /* RT2X00MMIO_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index e87865e33113..dc49e525ae5e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -68,7 +68,7 @@ static int rt2x00pci_alloc_reg(struct rt2x00_dev *rt2x00dev)
         return 0;
 
 exit:
-        ERROR_PROBE("Failed to allocate registers.\n");
+        rt2x00_probe_err("Failed to allocate registers\n");
 
         rt2x00pci_free_reg(rt2x00dev);
 
@@ -84,30 +84,30 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
 
         retval = pci_enable_device(pci_dev);
         if (retval) {
-                ERROR_PROBE("Enable device failed.\n");
+                rt2x00_probe_err("Enable device failed\n");
                 return retval;
         }
 
         retval = pci_request_regions(pci_dev, pci_name(pci_dev));
         if (retval) {
-                ERROR_PROBE("PCI request regions failed.\n");
+                rt2x00_probe_err("PCI request regions failed\n");
                 goto exit_disable_device;
         }
 
         pci_set_master(pci_dev);
 
         if (pci_set_mwi(pci_dev))
-                ERROR_PROBE("MWI not available.\n");
+                rt2x00_probe_err("MWI not available\n");
 
         if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {
-                ERROR_PROBE("PCI DMA not supported.\n");
+                rt2x00_probe_err("PCI DMA not supported\n");
                 retval = -EIO;
                 goto exit_release_regions;
         }
 
         hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
         if (!hw) {
-                ERROR_PROBE("Failed to allocate hardware.\n");
+                rt2x00_probe_err("Failed to allocate hardware\n");
                 retval = -ENOMEM;
                 goto exit_release_regions;
         }
@@ -207,7 +207,7 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
 
         if (pci_set_power_state(pci_dev, PCI_D0) ||
             pci_enable_device(pci_dev)) {
-                ERROR(rt2x00dev, "Failed to resume device.\n");
+                rt2x00_err(rt2x00dev, "Failed to resume device\n");
                 return -EIO;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 4d91795dc6a2..2c12311467a9 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -35,7 +35,8 @@
 
 struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp)
 {
-        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct data_queue *queue = entry->queue;
+        struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
         struct sk_buff *skb;
         struct skb_frame_desc *skbdesc;
         unsigned int frame_size;
@@ -46,7 +47,7 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp)
          * The frame size includes descriptor size, because the
          * hardware directly receive the frame into the skbuffer.
          */
-        frame_size = entry->queue->data_size + entry->queue->desc_size;
+        frame_size = queue->data_size + queue->desc_size + queue->winfo_size;
 
         /*
          * The payload should be aligned to a 4-byte boundary,
@@ -531,10 +532,10 @@ static int rt2x00queue_write_tx_data(struct queue_entry *entry,
          */
         if (unlikely(rt2x00dev->ops->lib->get_entry_state &&
                      rt2x00dev->ops->lib->get_entry_state(entry))) {
-                ERROR(rt2x00dev,
-                      "Corrupt queue %d, accessing entry which is not ours.\n"
-                      "Please file bug report to %s.\n",
-                      entry->queue->qid, DRV_PROJECT);
+                rt2x00_err(rt2x00dev,
+                           "Corrupt queue %d, accessing entry which is not ours\n"
+                           "Please file bug report to %s\n",
+                           entry->queue->qid, DRV_PROJECT);
                 return -EINVAL;
         }
 
@@ -698,8 +699,8 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
         spin_lock(&queue->tx_lock);
 
         if (unlikely(rt2x00queue_full(queue))) {
-                ERROR(queue->rt2x00dev,
-                      "Dropping frame due to full tx queue %d.\n", queue->qid);
+                rt2x00_err(queue->rt2x00dev, "Dropping frame due to full tx queue %d\n",
+                           queue->qid);
                 ret = -ENOBUFS;
                 goto out;
         }
@@ -708,10 +709,10 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
 
         if (unlikely(test_and_set_bit(ENTRY_OWNER_DEVICE_DATA,
                                       &entry->flags))) {
-                ERROR(queue->rt2x00dev,
-                      "Arrived at non-free entry in the non-full queue %d.\n"
-                      "Please file bug report to %s.\n",
-                      queue->qid, DRV_PROJECT);
+                rt2x00_err(queue->rt2x00dev,
+                           "Arrived at non-free entry in the non-full queue %d\n"
+                           "Please file bug report to %s\n",
+                           queue->qid, DRV_PROJECT);
                 ret = -EINVAL;
                 goto out;
         }
@@ -832,7 +833,9 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
 bool rt2x00queue_for_each_entry(struct data_queue *queue,
                                 enum queue_index start,
                                 enum queue_index end,
-                                bool (*fn)(struct queue_entry *entry))
+                                void *data,
+                                bool (*fn)(struct queue_entry *entry,
+                                           void *data))
 {
         unsigned long irqflags;
         unsigned int index_start;
@@ -840,9 +843,9 @@ bool rt2x00queue_for_each_entry(struct data_queue *queue,
         unsigned int i;
 
         if (unlikely(start >= Q_INDEX_MAX || end >= Q_INDEX_MAX)) {
-                ERROR(queue->rt2x00dev,
-                      "Entry requested from invalid index range (%d - %d)\n",
-                      start, end);
+                rt2x00_err(queue->rt2x00dev,
+                           "Entry requested from invalid index range (%d - %d)\n",
+                           start, end);
                 return true;
         }
 
@@ -863,17 +866,17 @@ bool rt2x00queue_for_each_entry(struct data_queue *queue,
          */
         if (index_start < index_end) {
                 for (i = index_start; i < index_end; i++) {
-                        if (fn(&queue->entries[i]))
+                        if (fn(&queue->entries[i], data))
                                 return true;
                 }
         } else {
                 for (i = index_start; i < queue->limit; i++) {
-                        if (fn(&queue->entries[i]))
+                        if (fn(&queue->entries[i], data))
                                 return true;
                 }
 
                 for (i = 0; i < index_end; i++) {
-                        if (fn(&queue->entries[i]))
+                        if (fn(&queue->entries[i], data))
                                 return true;
                 }
         }
@@ -889,8 +892,8 @@ struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue,
         unsigned long irqflags;
 
         if (unlikely(index >= Q_INDEX_MAX)) {
-                ERROR(queue->rt2x00dev,
-                      "Entry requested from invalid index type (%d)\n", index);
+                rt2x00_err(queue->rt2x00dev, "Entry requested from invalid index type (%d)\n",
+                           index);
                 return NULL;
         }
 
@@ -910,8 +913,8 @@ void rt2x00queue_index_inc(struct queue_entry *entry, enum queue_index index)
         unsigned long irqflags;
 
         if (unlikely(index >= Q_INDEX_MAX)) {
-                ERROR(queue->rt2x00dev,
-                      "Index change on invalid index type (%d)\n", index);
+                rt2x00_err(queue->rt2x00dev,
+                           "Index change on invalid index type (%d)\n", index);
                 return;
         }
 
@@ -1071,7 +1074,8 @@ void rt2x00queue_flush_queue(struct data_queue *queue, bool drop)
          * The queue flush has failed...
          */
         if (unlikely(!rt2x00queue_empty(queue)))
-                WARNING(queue->rt2x00dev, "Queue %d failed to flush\n", queue->qid);
+                rt2x00_warn(queue->rt2x00dev, "Queue %d failed to flush\n",
+                            queue->qid);
 
         /*
          * Restore the queue to the previous status
@@ -1170,6 +1174,7 @@ static int rt2x00queue_alloc_entries(struct data_queue *queue,
         queue->threshold = DIV_ROUND_UP(qdesc->entry_num, 10);
         queue->data_size = qdesc->data_size;
         queue->desc_size = qdesc->desc_size;
+        queue->winfo_size = qdesc->winfo_size;
 
         /*
          * Allocate all queue entries.
@@ -1260,7 +1265,7 @@ int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev)
         return 0;
 
 exit:
-        ERROR(rt2x00dev, "Queue entries allocation failed.\n");
+        rt2x00_err(rt2x00dev, "Queue entries allocation failed\n");
 
         rt2x00queue_uninitialize(rt2x00dev);
 
@@ -1312,7 +1317,7 @@ int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev)
 
         queue = kcalloc(rt2x00dev->data_queues, sizeof(*queue), GFP_KERNEL);
         if (!queue) {
-                ERROR(rt2x00dev, "Queue allocation failed.\n");
+                rt2x00_err(rt2x00dev, "Queue allocation failed\n");
                 return -ENOMEM;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index 9b8c10a86dee..4a7b34e9261b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -359,6 +359,7 @@ enum queue_entry_flags {
         ENTRY_DATA_PENDING,
         ENTRY_DATA_IO_FAILED,
         ENTRY_DATA_STATUS_PENDING,
+        ENTRY_DATA_STATUS_SET,
 };
 
 /**
@@ -372,6 +373,7 @@ enum queue_entry_flags {
  * @entry_idx: The entry index number.
  * @priv_data: Private data belonging to this queue entry. The pointer
  *      points to data specific to a particular driver and queue type.
+ * @status: Device specific status
  */
 struct queue_entry {
         unsigned long flags;
@@ -383,6 +385,8 @@ struct queue_entry {
 
         unsigned int entry_idx;
 
+        u32 status;
+
         void *priv_data;
 };
 
@@ -475,7 +479,8 @@ struct data_queue {
         unsigned short cw_max;
 
         unsigned short data_size;
-        unsigned short desc_size;
+        unsigned char  desc_size;
+        unsigned char  winfo_size;
 
         unsigned short usb_endpoint;
         unsigned short usb_maxpacket;
@@ -495,7 +500,8 @@ struct data_queue {
 struct data_queue_desc {
         unsigned short entry_num;
         unsigned short data_size;
-        unsigned short desc_size;
+        unsigned char  desc_size;
+        unsigned char  winfo_size;
         unsigned short priv_size;
 };
 
@@ -584,6 +590,7 @@ struct data_queue_desc {
  * @queue: Pointer to @data_queue
  * @start: &enum queue_index Pointer to start index
  * @end: &enum queue_index Pointer to end index
+ * @data: Data to pass to the callback function
  * @fn: The function to call for each &struct queue_entry
  *
  * This will walk through all entries in the queue, in chronological
@@ -596,7 +603,9 @@ struct data_queue_desc {
 bool rt2x00queue_for_each_entry(struct data_queue *queue,
                                 enum queue_index start,
                                 enum queue_index end,
-                                bool (*fn)(struct queue_entry *entry));
+                                void *data,
+                                bool (*fn)(struct queue_entry *entry,
+                                           void *data));
 
 /**
  * rt2x00queue_empty - Check if the queue is empty.
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c
index 2aa5c38022f3..9271a5fce0a8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00soc.c
+++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
@@ -68,7 +68,7 @@ static int rt2x00soc_alloc_reg(struct rt2x00_dev *rt2x00dev)
         return 0;
 
 exit:
-        ERROR_PROBE("Failed to allocate registers.\n");
+        rt2x00_probe_err("Failed to allocate registers\n");
         rt2x00soc_free_reg(rt2x00dev);
 
         return -ENOMEM;
@@ -82,7 +82,7 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops)
 
         hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
         if (!hw) {
-                ERROR_PROBE("Failed to allocate hardware.\n");
+                rt2x00_probe_err("Failed to allocate hardware\n");
                 return -ENOMEM;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 40ea80725a96..88289873c0cf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -70,9 +70,9 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
                 }
         }
 
-        ERROR(rt2x00dev,
-              "Vendor Request 0x%02x failed for offset 0x%04x with error %d.\n",
-              request, offset, status);
+        rt2x00_err(rt2x00dev,
+                   "Vendor Request 0x%02x failed for offset 0x%04x with error %d\n",
+                   request, offset, status);
 
         return status;
 }
@@ -91,7 +91,7 @@ int rt2x00usb_vendor_req_buff_lock(struct rt2x00_dev *rt2x00dev,
          * Check for Cache availability.
          */
         if (unlikely(!rt2x00dev->csr.cache || buffer_length > CSR_CACHE_SIZE)) {
-                ERROR(rt2x00dev, "CSR cache not available.\n");
+                rt2x00_err(rt2x00dev, "CSR cache not available\n");
                 return -ENOMEM;
         }
 
@@ -157,8 +157,8 @@ int rt2x00usb_regbusy_read(struct rt2x00_dev *rt2x00dev,
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "Indirect register access failed: "
-              "offset=0x%.08x, value=0x%.08x\n", offset, *reg);
+        rt2x00_err(rt2x00dev, "Indirect register access failed: offset=0x%.08x, value=0x%.08x\n",
+                   offset, *reg);
         *reg = ~0;
 
         return 0;
@@ -285,7 +285,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
                 queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
 }
 
-static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry)
+static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void *data)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
@@ -307,7 +307,7 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry)
         status = skb_padto(entry->skb, length);
         if (unlikely(status)) {
                 /* TODO: report something more appropriate than IO_FAILED. */
-                WARNING(rt2x00dev, "TX SKB padding error, out of memory\n");
+                rt2x00_warn(rt2x00dev, "TX SKB padding error, out of memory\n");
                 set_bit(ENTRY_DATA_IO_FAILED, &entry->flags);
                 rt2x00lib_dmadone(entry);
 
@@ -390,7 +390,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         queue_work(rt2x00dev->workqueue, &rt2x00dev->rxdone_work);
 }
 
-static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry)
+static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry, void *data)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
@@ -427,12 +427,18 @@ void rt2x00usb_kick_queue(struct data_queue *queue)
         case QID_AC_BE:
         case QID_AC_BK:
                 if (!rt2x00queue_empty(queue))
-                        rt2x00queue_for_each_entry(queue, Q_INDEX_DONE, Q_INDEX,
+                        rt2x00queue_for_each_entry(queue,
+                                                   Q_INDEX_DONE,
+                                                   Q_INDEX,
+                                                   NULL,
                                                    rt2x00usb_kick_tx_entry);
                 break;
         case QID_RX:
                 if (!rt2x00queue_full(queue))
-                        rt2x00queue_for_each_entry(queue, Q_INDEX, Q_INDEX_DONE,
+                        rt2x00queue_for_each_entry(queue,
+                                                   Q_INDEX,
+                                                   Q_INDEX_DONE,
+                                                   NULL,
                                                    rt2x00usb_kick_rx_entry);
                 break;
         default:
@@ -441,7 +447,7 @@ void rt2x00usb_kick_queue(struct data_queue *queue)
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_kick_queue);
 
-static bool rt2x00usb_flush_entry(struct queue_entry *entry)
+static bool rt2x00usb_flush_entry(struct queue_entry *entry, void *data)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct queue_entry_priv_usb *entry_priv = entry->priv_data;
@@ -468,7 +474,7 @@ void rt2x00usb_flush_queue(struct data_queue *queue, bool drop)
         unsigned int i;
 
         if (drop)
-                rt2x00queue_for_each_entry(queue, Q_INDEX_DONE, Q_INDEX,
+                rt2x00queue_for_each_entry(queue, Q_INDEX_DONE, Q_INDEX, NULL,
                                            rt2x00usb_flush_entry);
 
         /*
@@ -514,8 +520,8 @@ EXPORT_SYMBOL_GPL(rt2x00usb_flush_queue);
 
 static void rt2x00usb_watchdog_tx_dma(struct data_queue *queue)
 {
-        WARNING(queue->rt2x00dev, "TX queue %d DMA timed out,"
-                " invoke forced forced reset\n", queue->qid);
+        rt2x00_warn(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced forced reset\n",
+                    queue->qid);
 
         rt2x00queue_flush_queue(queue, true);
 }
@@ -559,7 +565,7 @@ void rt2x00usb_clear_entry(struct queue_entry *entry)
         entry->flags = 0;
 
         if (entry->queue->qid == QID_RX)
-                rt2x00usb_kick_rx_entry(entry);
+                rt2x00usb_kick_rx_entry(entry, NULL);
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_clear_entry);
 
@@ -616,7 +622,7 @@ static int rt2x00usb_find_endpoints(struct rt2x00_dev *rt2x00dev)
          * At least 1 endpoint for RX and 1 endpoint for TX must be available.
          */
         if (!rt2x00dev->rx->usb_endpoint || !rt2x00dev->tx->usb_endpoint) {
-                ERROR(rt2x00dev, "Bulk-in/Bulk-out endpoints not found\n");
+                rt2x00_err(rt2x00dev, "Bulk-in/Bulk-out endpoints not found\n");
                 return -EPIPE;
         }
 
@@ -769,7 +775,7 @@ static int rt2x00usb_alloc_reg(struct rt2x00_dev *rt2x00dev)
         return 0;
 
 exit:
-        ERROR_PROBE("Failed to allocate registers.\n");
+        rt2x00_probe_err("Failed to allocate registers\n");
 
         rt2x00usb_free_reg(rt2x00dev);
 
@@ -789,7 +795,7 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
 
         hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
         if (!hw) {
-                ERROR_PROBE("Failed to allocate hardware.\n");
+                rt2x00_probe_err("Failed to allocate hardware\n");
                 retval = -ENOMEM;
                 goto exit_put_device;
         }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 9e3c8ff53e3f..0dc8180e251b 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -58,12 +58,12 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
  * and we will print an error.
  */
 #define WAIT_FOR_BBP(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), PHY_CSR3, PHY_CSR3_BUSY, (__reg))
+        rt2x00mmio_regbusy_read((__dev), PHY_CSR3, PHY_CSR3_BUSY, (__reg))
 #define WAIT_FOR_RF(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), PHY_CSR4, PHY_CSR4_BUSY, (__reg))
+        rt2x00mmio_regbusy_read((__dev), PHY_CSR4, PHY_CSR4_BUSY, (__reg))
 #define WAIT_FOR_MCU(__dev, __reg) \
-        rt2x00pci_regbusy_read((__dev), H2M_MAILBOX_CSR, \
-                               H2M_MAILBOX_CSR_OWNER, (__reg))
+        rt2x00mmio_regbusy_read((__dev), H2M_MAILBOX_CSR, \
+                                H2M_MAILBOX_CSR_OWNER, (__reg))
 
 static void rt61pci_bbp_write(struct rt2x00_dev *rt2x00dev,
                               const unsigned int word, const u8 value)
@@ -83,7 +83,7 @@ static void rt61pci_bbp_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, PHY_CSR3_BUSY, 1);
                 rt2x00_set_field32(&reg, PHY_CSR3_READ_CONTROL, 0);
 
-                rt2x00pci_register_write(rt2x00dev, PHY_CSR3, reg);
+                rt2x00mmio_register_write(rt2x00dev, PHY_CSR3, reg);
         }
 
         mutex_unlock(&rt2x00dev->csr_mutex);
@@ -110,7 +110,7 @@ static void rt61pci_bbp_read(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, PHY_CSR3_BUSY, 1);
                 rt2x00_set_field32(&reg, PHY_CSR3_READ_CONTROL, 1);
 
-                rt2x00pci_register_write(rt2x00dev, PHY_CSR3, reg);
+                rt2x00mmio_register_write(rt2x00dev, PHY_CSR3, reg);
 
                 WAIT_FOR_BBP(rt2x00dev, &reg);
         }
@@ -138,7 +138,7 @@ static void rt61pci_rf_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, PHY_CSR4_IF_SELECT, 0);
                 rt2x00_set_field32(&reg, PHY_CSR4_BUSY, 1);
 
-                rt2x00pci_register_write(rt2x00dev, PHY_CSR4, reg);
+                rt2x00mmio_register_write(rt2x00dev, PHY_CSR4, reg);
                 rt2x00_rf_write(rt2x00dev, word, value);
         }
 
@@ -162,12 +162,12 @@ static void rt61pci_mcu_request(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, H2M_MAILBOX_CSR_CMD_TOKEN, token);
                 rt2x00_set_field32(&reg, H2M_MAILBOX_CSR_ARG0, arg0);
                 rt2x00_set_field32(&reg, H2M_MAILBOX_CSR_ARG1, arg1);
-                rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CSR, reg);
 
-                rt2x00pci_register_read(rt2x00dev, HOST_CMD_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, HOST_CMD_CSR, &reg);
                 rt2x00_set_field32(&reg, HOST_CMD_CSR_HOST_COMMAND, command);
                 rt2x00_set_field32(&reg, HOST_CMD_CSR_INTERRUPT_MCU, 1);
-                rt2x00pci_register_write(rt2x00dev, HOST_CMD_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, HOST_CMD_CSR, reg);
         }
 
         mutex_unlock(&rt2x00dev->csr_mutex);
@@ -179,7 +179,7 @@ static void rt61pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
         struct rt2x00_dev *rt2x00dev = eeprom->data;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
 
         eeprom->reg_data_in = !!rt2x00_get_field32(reg, E2PROM_CSR_DATA_IN);
         eeprom->reg_data_out = !!rt2x00_get_field32(reg, E2PROM_CSR_DATA_OUT);
@@ -201,15 +201,15 @@ static void rt61pci_eepromregister_write(struct eeprom_93cx6 *eeprom)
         rt2x00_set_field32(&reg, E2PROM_CSR_CHIP_SELECT,
                            !!eeprom->reg_chip_select);
 
-        rt2x00pci_register_write(rt2x00dev, E2PROM_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, E2PROM_CSR, reg);
 }
 
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
 static const struct rt2x00debug rt61pci_rt2x00debug = {
         .owner  = THIS_MODULE,
         .csr    = {
-                .read           = rt2x00pci_register_read,
-                .write          = rt2x00pci_register_write,
+                .read           = rt2x00mmio_register_read,
+                .write          = rt2x00mmio_register_write,
                 .flags          = RT2X00DEBUGFS_OFFSET,
                 .word_base      = CSR_REG_BASE,
                 .word_size      = sizeof(u32),
@@ -243,7 +243,7 @@ static int rt61pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR13, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR13, &reg);
         return rt2x00_get_field32(reg, MAC_CSR13_VAL5);
 }
 
@@ -294,10 +294,10 @@ static int rt61pci_blink_set(struct led_classdev *led_cdev,
             container_of(led_cdev, struct rt2x00_led, led_dev);
         u32 reg;
 
-        rt2x00pci_register_read(led->rt2x00dev, MAC_CSR14, &reg);
+        rt2x00mmio_register_read(led->rt2x00dev, MAC_CSR14, &reg);
         rt2x00_set_field32(&reg, MAC_CSR14_ON_PERIOD, *delay_on);
         rt2x00_set_field32(&reg, MAC_CSR14_OFF_PERIOD, *delay_off);
-        rt2x00pci_register_write(led->rt2x00dev, MAC_CSR14, reg);
+        rt2x00mmio_register_write(led->rt2x00dev, MAC_CSR14, reg);
 
         return 0;
 }
@@ -339,7 +339,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
                  */
                 mask = (0xf << crypto->bssidx);
 
-                rt2x00pci_register_read(rt2x00dev, SEC_CSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, SEC_CSR0, &reg);
                 reg &= mask;
 
                 if (reg && reg == mask)
@@ -358,8 +358,8 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
                        sizeof(key_entry.rx_mic));
 
                 reg = SHARED_KEY_ENTRY(key->hw_key_idx);
-                rt2x00pci_register_multiwrite(rt2x00dev, reg,
-                                              &key_entry, sizeof(key_entry));
+                rt2x00mmio_register_multiwrite(rt2x00dev, reg,
+                                               &key_entry, sizeof(key_entry));
 
                 /*
                  * The cipher types are stored over 2 registers.
@@ -372,16 +372,16 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
                         field.bit_offset = (3 * key->hw_key_idx);
                         field.bit_mask = 0x7 << field.bit_offset;
 
-                        rt2x00pci_register_read(rt2x00dev, SEC_CSR1, &reg);
+                        rt2x00mmio_register_read(rt2x00dev, SEC_CSR1, &reg);
                         rt2x00_set_field32(&reg, field, crypto->cipher);
-                        rt2x00pci_register_write(rt2x00dev, SEC_CSR1, reg);
+                        rt2x00mmio_register_write(rt2x00dev, SEC_CSR1, reg);
                 } else {
                         field.bit_offset = (3 * (key->hw_key_idx - 8));
                         field.bit_mask = 0x7 << field.bit_offset;
 
-                        rt2x00pci_register_read(rt2x00dev, SEC_CSR5, &reg);
+                        rt2x00mmio_register_read(rt2x00dev, SEC_CSR5, &reg);
                         rt2x00_set_field32(&reg, field, crypto->cipher);
-                        rt2x00pci_register_write(rt2x00dev, SEC_CSR5, reg);
+                        rt2x00mmio_register_write(rt2x00dev, SEC_CSR5, reg);
                 }
 
                 /*
@@ -404,12 +404,12 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
          */
         mask = 1 << key->hw_key_idx;
 
-        rt2x00pci_register_read(rt2x00dev, SEC_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, SEC_CSR0, &reg);
         if (crypto->cmd == SET_KEY)
                 reg |= mask;
         else if (crypto->cmd == DISABLE_KEY)
                 reg &= ~mask;
-        rt2x00pci_register_write(rt2x00dev, SEC_CSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, SEC_CSR0, reg);
 
         return 0;
 }
@@ -433,10 +433,10 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
                  * When both registers are full, we drop the key.
                  * Otherwise, we use the first invalid entry.
                  */
-                rt2x00pci_register_read(rt2x00dev, SEC_CSR2, &reg);
+                rt2x00mmio_register_read(rt2x00dev, SEC_CSR2, &reg);
                 if (reg && reg == ~0) {
                         key->hw_key_idx = 32;
-                        rt2x00pci_register_read(rt2x00dev, SEC_CSR3, &reg);
+                        rt2x00mmio_register_read(rt2x00dev, SEC_CSR3, &reg);
                         if (reg && reg == ~0)
                                 return -ENOSPC;
                 }
@@ -458,21 +458,21 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
                 addr_entry.cipher = crypto->cipher;
 
                 reg = PAIRWISE_KEY_ENTRY(key->hw_key_idx);
-                rt2x00pci_register_multiwrite(rt2x00dev, reg,
-                                              &key_entry, sizeof(key_entry));
+                rt2x00mmio_register_multiwrite(rt2x00dev, reg,
+                                               &key_entry, sizeof(key_entry));
 
                 reg = PAIRWISE_TA_ENTRY(key->hw_key_idx);
-                rt2x00pci_register_multiwrite(rt2x00dev, reg,
-                                              &addr_entry, sizeof(addr_entry));
+                rt2x00mmio_register_multiwrite(rt2x00dev, reg,
+                                               &addr_entry, sizeof(addr_entry));
 
                 /*
                  * Enable pairwise lookup table for given BSS idx.
                  * Without this, received frames will not be decrypted
                  * by the hardware.
                  */
-                rt2x00pci_register_read(rt2x00dev, SEC_CSR4, &reg);
+                rt2x00mmio_register_read(rt2x00dev, SEC_CSR4, &reg);
                 reg |= (1 << crypto->bssidx);
-                rt2x00pci_register_write(rt2x00dev, SEC_CSR4, reg);
+                rt2x00mmio_register_write(rt2x00dev, SEC_CSR4, reg);
 
                 /*
                  * The driver does not support the IV/EIV generation
@@ -495,21 +495,21 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
         if (key->hw_key_idx < 32) {
                 mask = 1 << key->hw_key_idx;
 
-                rt2x00pci_register_read(rt2x00dev, SEC_CSR2, &reg);
+                rt2x00mmio_register_read(rt2x00dev, SEC_CSR2, &reg);
                 if (crypto->cmd == SET_KEY)
                         reg |= mask;
                 else if (crypto->cmd == DISABLE_KEY)
                         reg &= ~mask;
-                rt2x00pci_register_write(rt2x00dev, SEC_CSR2, reg);
+                rt2x00mmio_register_write(rt2x00dev, SEC_CSR2, reg);
         } else {
                 mask = 1 << (key->hw_key_idx - 32);
 
-                rt2x00pci_register_read(rt2x00dev, SEC_CSR3, &reg);
+                rt2x00mmio_register_read(rt2x00dev, SEC_CSR3, &reg);
                 if (crypto->cmd == SET_KEY)
                         reg |= mask;
                 else if (crypto->cmd == DISABLE_KEY)
                         reg &= ~mask;
-                rt2x00pci_register_write(rt2x00dev, SEC_CSR3, reg);
+                rt2x00mmio_register_write(rt2x00dev, SEC_CSR3, reg);
         }
 
         return 0;
@@ -526,7 +526,7 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,
          * and broadcast frames will always be accepted since
          * there is no filter for it at this time.
          */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR0, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC,
                            !(filter_flags & FIF_FCSFAIL));
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
@@ -544,7 +544,7 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BROADCAST, 0);
         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS,
                            !(filter_flags & FIF_CONTROL));
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR0, reg);
 }
 
 static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
@@ -558,9 +558,9 @@ static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
                 /*
                  * Enable synchronisation.
                  */
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
         }
 
         if (flags & CONFIG_UPDATE_MAC) {
@@ -568,8 +568,8 @@ static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
                 conf->mac[1] = cpu_to_le32(reg);
 
-                rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR2,
-                                              conf->mac, sizeof(conf->mac));
+                rt2x00mmio_register_multiwrite(rt2x00dev, MAC_CSR2,
+                                               conf->mac, sizeof(conf->mac));
         }
 
         if (flags & CONFIG_UPDATE_BSSID) {
@@ -577,8 +577,9 @@ static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, MAC_CSR5_BSS_ID_MASK, 3);
                 conf->bssid[1] = cpu_to_le32(reg);
 
-                rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR4,
-                                              conf->bssid, sizeof(conf->bssid));
+                rt2x00mmio_register_multiwrite(rt2x00dev, MAC_CSR4,
+                                               conf->bssid,
+                                               sizeof(conf->bssid));
         }
 }
 
@@ -588,40 +589,40 @@ static void rt61pci_config_erp(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR0, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, 0x32);
         rt2x00_set_field32(&reg, TXRX_CSR0_TSF_OFFSET, IEEE80211_HEADER);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR0, reg);
 
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR4, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR4, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_ENABLE, 1);
                 rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE,
                                    !!erp->short_preamble);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR4, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR4, reg);
         }
 
         if (changed & BSS_CHANGED_BASIC_RATES)
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR5,
-                                         erp->basic_rates);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR5,
+                                          erp->basic_rates);
 
         if (changed & BSS_CHANGED_BEACON_INT) {
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL,
                                    erp->beacon_int * 16);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
         }
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
-                rt2x00pci_register_read(rt2x00dev, MAC_CSR9, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_CSR9, &reg);
                 rt2x00_set_field32(&reg, MAC_CSR9_SLOT_TIME, erp->slot_time);
-                rt2x00pci_register_write(rt2x00dev, MAC_CSR9, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_CSR9, reg);
 
-                rt2x00pci_register_read(rt2x00dev, MAC_CSR8, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_CSR8, &reg);
                 rt2x00_set_field32(&reg, MAC_CSR8_SIFS, erp->sifs);
                 rt2x00_set_field32(&reg, MAC_CSR8_SIFS_AFTER_RX_OFDM, 3);
                 rt2x00_set_field32(&reg, MAC_CSR8_EIFS, erp->eifs);
-                rt2x00pci_register_write(rt2x00dev, MAC_CSR8, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_CSR8, reg);
         }
 }
 
@@ -714,7 +715,7 @@ static void rt61pci_config_antenna_2529_rx(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR13, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR13, &reg);
 
         rt2x00_set_field32(&reg, MAC_CSR13_DIR4, 0);
         rt2x00_set_field32(&reg, MAC_CSR13_VAL4, p1);
@@ -722,7 +723,7 @@ static void rt61pci_config_antenna_2529_rx(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, MAC_CSR13_DIR3, 0);
         rt2x00_set_field32(&reg, MAC_CSR13_VAL3, !p2);
 
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR13, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR13, reg);
 }
 
 static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev,
@@ -821,14 +822,14 @@ static void rt61pci_config_ant(struct rt2x00_dev *rt2x00dev,
         for (i = 0; i < ARRAY_SIZE(antenna_sel_a); i++)
                 rt61pci_bbp_write(rt2x00dev, sel[i].word, sel[i].value[lna]);
 
-        rt2x00pci_register_read(rt2x00dev, PHY_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, PHY_CSR0, &reg);
 
         rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_BG,
                            rt2x00dev->curr_band == IEEE80211_BAND_2GHZ);
         rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_A,
                            rt2x00dev->curr_band == IEEE80211_BAND_5GHZ);
 
-        rt2x00pci_register_write(rt2x00dev, PHY_CSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, PHY_CSR0, reg);
 
         if (rt2x00_rf(rt2x00dev, RF5225) || rt2x00_rf(rt2x00dev, RF5325))
                 rt61pci_config_antenna_5x(rt2x00dev, ant);
@@ -848,7 +849,7 @@ static void rt61pci_config_lna_gain(struct rt2x00_dev *rt2x00dev,
         u16 eeprom;
         short lna_gain = 0;
 
-        if (libconf->conf->channel->band == IEEE80211_BAND_2GHZ) {
+        if (libconf->conf->chandef.chan->band == IEEE80211_BAND_2GHZ) {
                 if (test_bit(CAPABILITY_EXTERNAL_LNA_BG, &rt2x00dev->cap_flags))
                         lna_gain += 14;
 
@@ -928,7 +929,7 @@ static void rt61pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR4, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR4, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_DOWN, 1);
         rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_STEP, 0);
         rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_FALLBACK_CCK, 0);
@@ -936,7 +937,7 @@ static void rt61pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, TXRX_CSR4_SHORT_RETRY_LIMIT,
                            libconf->conf->short_frame_max_tx_count);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR4, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR4, reg);
 }
 
 static void rt61pci_config_ps(struct rt2x00_dev *rt2x00dev,
@@ -948,7 +949,7 @@ static void rt61pci_config_ps(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         if (state == STATE_SLEEP) {
-                rt2x00pci_register_read(rt2x00dev, MAC_CSR11, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_CSR11, &reg);
                 rt2x00_set_field32(&reg, MAC_CSR11_DELAY_AFTER_TBCN,
                                    rt2x00dev->beacon_int - 10);
                 rt2x00_set_field32(&reg, MAC_CSR11_TBCN_BEFORE_WAKEUP,
@@ -957,27 +958,29 @@ static void rt61pci_config_ps(struct rt2x00_dev *rt2x00dev,
 
                 /* We must first disable autowake before it can be enabled */
                 rt2x00_set_field32(&reg, MAC_CSR11_AUTOWAKE, 0);
-                rt2x00pci_register_write(rt2x00dev, MAC_CSR11, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_CSR11, reg);
 
                 rt2x00_set_field32(&reg, MAC_CSR11_AUTOWAKE, 1);
-                rt2x00pci_register_write(rt2x00dev, MAC_CSR11, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_CSR11, reg);
 
-                rt2x00pci_register_write(rt2x00dev, SOFT_RESET_CSR, 0x00000005);
-                rt2x00pci_register_write(rt2x00dev, IO_CNTL_CSR, 0x0000001c);
-                rt2x00pci_register_write(rt2x00dev, PCI_USEC_CSR, 0x00000060);
+                rt2x00mmio_register_write(rt2x00dev, SOFT_RESET_CSR,
+                                          0x00000005);
+                rt2x00mmio_register_write(rt2x00dev, IO_CNTL_CSR, 0x0000001c);
+                rt2x00mmio_register_write(rt2x00dev, PCI_USEC_CSR, 0x00000060);
 
                 rt61pci_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 0);
         } else {
-                rt2x00pci_register_read(rt2x00dev, MAC_CSR11, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_CSR11, &reg);
                 rt2x00_set_field32(&reg, MAC_CSR11_DELAY_AFTER_TBCN, 0);
                 rt2x00_set_field32(&reg, MAC_CSR11_TBCN_BEFORE_WAKEUP, 0);
                 rt2x00_set_field32(&reg, MAC_CSR11_AUTOWAKE, 0);
                 rt2x00_set_field32(&reg, MAC_CSR11_WAKEUP_LATENCY, 0);
-                rt2x00pci_register_write(rt2x00dev, MAC_CSR11, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_CSR11, reg);
 
-                rt2x00pci_register_write(rt2x00dev, SOFT_RESET_CSR, 0x00000007);
-                rt2x00pci_register_write(rt2x00dev, IO_CNTL_CSR, 0x00000018);
-                rt2x00pci_register_write(rt2x00dev, PCI_USEC_CSR, 0x00000020);
+                rt2x00mmio_register_write(rt2x00dev, SOFT_RESET_CSR,
+                                          0x00000007);
+                rt2x00mmio_register_write(rt2x00dev, IO_CNTL_CSR, 0x00000018);
+                rt2x00mmio_register_write(rt2x00dev, PCI_USEC_CSR, 0x00000020);
 
                 rt61pci_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 0);
         }
@@ -1013,13 +1016,13 @@ static void rt61pci_link_stats(struct rt2x00_dev *rt2x00dev,
         /*
          * Update FCS error count from register.
          */
-        rt2x00pci_register_read(rt2x00dev, STA_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, STA_CSR0, &reg);
         qual->rx_failed = rt2x00_get_field32(reg, STA_CSR0_FCS_ERROR);
 
         /*
          * Update False CCA count from register.
          */
-        rt2x00pci_register_read(rt2x00dev, STA_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, STA_CSR1, &reg);
         qual->false_cca = rt2x00_get_field32(reg, STA_CSR1_FALSE_CCA_ERROR);
 }
 
@@ -1138,16 +1141,16 @@ static void rt61pci_start_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR0, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR0_DISABLE_RX, 0);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR0, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
                 rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
                 rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 1);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
                 break;
         default:
                 break;
@@ -1161,24 +1164,24 @@ static void rt61pci_kick_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_AC_VO:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_KICK_TX_AC0, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_AC_VI:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_KICK_TX_AC1, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_AC_BE:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_KICK_TX_AC2, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_AC_BK:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_KICK_TX_AC3, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         default:
                 break;
@@ -1192,36 +1195,36 @@ static void rt61pci_stop_queue(struct data_queue *queue)
 
         switch (queue->qid) {
         case QID_AC_VO:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC0, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_AC_VI:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC1, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_AC_BE:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC2, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_AC_BK:
-                rt2x00pci_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TX_CNTL_CSR, &reg);
                 rt2x00_set_field32(&reg, TX_CNTL_CSR_ABORT_TX_AC3, 1);
-                rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
+                rt2x00mmio_register_write(rt2x00dev, TX_CNTL_CSR, reg);
                 break;
         case QID_RX:
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR0, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR0_DISABLE_RX, 1);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR0, reg);
                 break;
         case QID_BEACON:
-                rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+                rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
                 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);
                 rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);
                 rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
 
                 /*
                  * Wait for possibly running tbtt tasklets.
@@ -1299,14 +1302,14 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev,
          * Wait for stable hardware.
          */
         for (i = 0; i < 100; i++) {
-                rt2x00pci_register_read(rt2x00dev, MAC_CSR0, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MAC_CSR0, &reg);
                 if (reg)
                         break;
                 msleep(1);
         }
 
         if (!reg) {
-                ERROR(rt2x00dev, "Unstable hardware.\n");
+                rt2x00_err(rt2x00dev, "Unstable hardware\n");
                 return -EBUSY;
         }
 
@@ -1315,10 +1318,10 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev,
          */
         reg = 0;
         rt2x00_set_field32(&reg, MCU_CNTL_CSR_RESET, 1);
-        rt2x00pci_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
-        rt2x00pci_register_write(rt2x00dev, M2H_CMD_DONE_CSR, 0xffffffff);
-        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-        rt2x00pci_register_write(rt2x00dev, HOST_CMD_CSR, 0);
+        rt2x00mmio_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, M2H_CMD_DONE_CSR, 0xffffffff);
+        rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
+        rt2x00mmio_register_write(rt2x00dev, HOST_CMD_CSR, 0);
 
         /*
          * Write firmware to device.
@@ -1326,26 +1329,26 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev,
         reg = 0;
         rt2x00_set_field32(&reg, MCU_CNTL_CSR_RESET, 1);
         rt2x00_set_field32(&reg, MCU_CNTL_CSR_SELECT_BANK, 1);
-        rt2x00pci_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
 
-        rt2x00pci_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
-                                      data, len);
+        rt2x00mmio_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
+                                       data, len);
 
         rt2x00_set_field32(&reg, MCU_CNTL_CSR_SELECT_BANK, 0);
-        rt2x00pci_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
 
         rt2x00_set_field32(&reg, MCU_CNTL_CSR_RESET, 0);
-        rt2x00pci_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, MCU_CNTL_CSR, reg);
 
         for (i = 0; i < 100; i++) {
-                rt2x00pci_register_read(rt2x00dev, MCU_CNTL_CSR, &reg);
+                rt2x00mmio_register_read(rt2x00dev, MCU_CNTL_CSR, &reg);
                 if (rt2x00_get_field32(reg, MCU_CNTL_CSR_READY))
                         break;
                 msleep(1);
         }
 
         if (i == 100) {
-                ERROR(rt2x00dev, "MCU Control register not ready.\n");
+                rt2x00_err(rt2x00dev, "MCU Control register not ready\n");
                 return -EBUSY;
         }
 
@@ -1360,16 +1363,16 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev,
         reg = 0;
         rt2x00_set_field32(&reg, MAC_CSR1_SOFT_RESET, 1);
         rt2x00_set_field32(&reg, MAC_CSR1_BBP_RESET, 1);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR1, &reg);
         rt2x00_set_field32(&reg, MAC_CSR1_SOFT_RESET, 0);
         rt2x00_set_field32(&reg, MAC_CSR1_BBP_RESET, 0);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR1, &reg);
         rt2x00_set_field32(&reg, MAC_CSR1_HOST_READY, 1);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR1, reg);
 
         return 0;
 }
@@ -1379,7 +1382,7 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev,
  */
 static bool rt61pci_get_entry_state(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word;
 
         if (entry->queue->qid == QID_RX) {
@@ -1396,7 +1399,7 @@ static bool rt61pci_get_entry_state(struct queue_entry *entry)
 
 static void rt61pci_clear_entry(struct queue_entry *entry)
 {
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
         u32 word;
 
@@ -1419,13 +1422,13 @@ static void rt61pci_clear_entry(struct queue_entry *entry)
 
 static int rt61pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         u32 reg;
 
         /*
          * Initialize registers.
          */
-        rt2x00pci_register_read(rt2x00dev, TX_RING_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TX_RING_CSR0, &reg);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC0_RING_SIZE,
                            rt2x00dev->tx[0].limit);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC1_RING_SIZE,
@@ -1434,67 +1437,67 @@ static int rt61pci_init_queues(struct rt2x00_dev *rt2x00dev)
                            rt2x00dev->tx[2].limit);
         rt2x00_set_field32(&reg, TX_RING_CSR0_AC3_RING_SIZE,
                            rt2x00dev->tx[3].limit);
-        rt2x00pci_register_write(rt2x00dev, TX_RING_CSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, TX_RING_CSR0, reg);
 
-        rt2x00pci_register_read(rt2x00dev, TX_RING_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TX_RING_CSR1, &reg);
         rt2x00_set_field32(&reg, TX_RING_CSR1_TXD_SIZE,
                            rt2x00dev->tx[0].desc_size / 4);
-        rt2x00pci_register_write(rt2x00dev, TX_RING_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, TX_RING_CSR1, reg);
 
         entry_priv = rt2x00dev->tx[0].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, AC0_BASE_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, AC0_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC0_BASE_CSR_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, AC0_BASE_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, AC0_BASE_CSR, reg);
 
         entry_priv = rt2x00dev->tx[1].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, AC1_BASE_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, AC1_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC1_BASE_CSR_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, AC1_BASE_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, AC1_BASE_CSR, reg);
 
         entry_priv = rt2x00dev->tx[2].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, AC2_BASE_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, AC2_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC2_BASE_CSR_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, AC2_BASE_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, AC2_BASE_CSR, reg);
 
         entry_priv = rt2x00dev->tx[3].entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, AC3_BASE_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, AC3_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, AC3_BASE_CSR_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, AC3_BASE_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, AC3_BASE_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RX_RING_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RX_RING_CSR, &reg);
         rt2x00_set_field32(&reg, RX_RING_CSR_RING_SIZE, rt2x00dev->rx->limit);
         rt2x00_set_field32(&reg, RX_RING_CSR_RXD_SIZE,
                            rt2x00dev->rx->desc_size / 4);
         rt2x00_set_field32(&reg, RX_RING_CSR_RXD_WRITEBACK_SIZE, 4);
-        rt2x00pci_register_write(rt2x00dev, RX_RING_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, RX_RING_CSR, reg);
 
         entry_priv = rt2x00dev->rx->entries[0].priv_data;
-        rt2x00pci_register_read(rt2x00dev, RX_BASE_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RX_BASE_CSR, &reg);
         rt2x00_set_field32(&reg, RX_BASE_CSR_RING_REGISTER,
                            entry_priv->desc_dma);
-        rt2x00pci_register_write(rt2x00dev, RX_BASE_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, RX_BASE_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, TX_DMA_DST_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TX_DMA_DST_CSR, &reg);
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC0, 2);
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC1, 2);
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC2, 2);
         rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC3, 2);
-        rt2x00pci_register_write(rt2x00dev, TX_DMA_DST_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, TX_DMA_DST_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, LOAD_TX_RING_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, LOAD_TX_RING_CSR, &reg);
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC0, 1);
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC1, 1);
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC2, 1);
         rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC3, 1);
-        rt2x00pci_register_write(rt2x00dev, LOAD_TX_RING_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, LOAD_TX_RING_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, RX_CNTL_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RX_CNTL_CSR, &reg);
         rt2x00_set_field32(&reg, RX_CNTL_CSR_LOAD_RXD, 1);
-        rt2x00pci_register_write(rt2x00dev, RX_CNTL_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, RX_CNTL_CSR, reg);
 
         return 0;
 }
@@ -1503,13 +1506,13 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR0, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR0_AUTO_TX_SEQ, 1);
         rt2x00_set_field32(&reg, TXRX_CSR0_DISABLE_RX, 0);
         rt2x00_set_field32(&reg, TXRX_CSR0_TX_WITHOUT_WAITING, 0);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR0, reg);
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR1, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR1_BBP_ID0, 47); /* CCK Signal */
         rt2x00_set_field32(&reg, TXRX_CSR1_BBP_ID0_VALID, 1);
         rt2x00_set_field32(&reg, TXRX_CSR1_BBP_ID1, 30); /* Rssi */
@@ -1518,12 +1521,12 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, TXRX_CSR1_BBP_ID2_VALID, 1);
         rt2x00_set_field32(&reg, TXRX_CSR1_BBP_ID3, 30); /* Rssi */
         rt2x00_set_field32(&reg, TXRX_CSR1_BBP_ID3_VALID, 1);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR1, reg);
 
         /*
          * CCK TXD BBP registers
          */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR2, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR2_BBP_ID0, 13);
         rt2x00_set_field32(&reg, TXRX_CSR2_BBP_ID0_VALID, 1);
         rt2x00_set_field32(&reg, TXRX_CSR2_BBP_ID1, 12);
@@ -1532,76 +1535,76 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, TXRX_CSR2_BBP_ID2_VALID, 1);
         rt2x00_set_field32(&reg, TXRX_CSR2_BBP_ID3, 10);
         rt2x00_set_field32(&reg, TXRX_CSR2_BBP_ID3_VALID, 1);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR2, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR2, reg);
 
         /*
          * OFDM TXD BBP registers
          */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR3, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR3, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR3_BBP_ID0, 7);
         rt2x00_set_field32(&reg, TXRX_CSR3_BBP_ID0_VALID, 1);
         rt2x00_set_field32(&reg, TXRX_CSR3_BBP_ID1, 6);
         rt2x00_set_field32(&reg, TXRX_CSR3_BBP_ID1_VALID, 1);
         rt2x00_set_field32(&reg, TXRX_CSR3_BBP_ID2, 5);
         rt2x00_set_field32(&reg, TXRX_CSR3_BBP_ID2_VALID, 1);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR3, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR3, reg);
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR7, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR7, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR7_ACK_CTS_6MBS, 59);
         rt2x00_set_field32(&reg, TXRX_CSR7_ACK_CTS_9MBS, 53);
         rt2x00_set_field32(&reg, TXRX_CSR7_ACK_CTS_12MBS, 49);
         rt2x00_set_field32(&reg, TXRX_CSR7_ACK_CTS_18MBS, 46);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR7, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR7, reg);
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR8, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR8, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_24MBS, 44);
         rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_36MBS, 42);
         rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_48MBS, 42);
         rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_54MBS, 42);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR8, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR8, reg);
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL, 0);
         rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);
         rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 0);
         rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);
         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
         rt2x00_set_field32(&reg, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
 
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f);
 
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR6, 0x00000fff);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR6, 0x00000fff);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR9, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR9, &reg);
         rt2x00_set_field32(&reg, MAC_CSR9_CW_SELECT, 0);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR9, reg);
 
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR10, 0x0000071c);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR10, 0x0000071c);
 
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_AWAKE))
                 return -EBUSY;
 
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR13, 0x0000e000);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR13, 0x0000e000);
 
         /*
          * Invalidate all Shared Keys (SEC_CSR0),
          * and clear the Shared key Cipher algorithms (SEC_CSR1 & SEC_CSR5)
          */
-        rt2x00pci_register_write(rt2x00dev, SEC_CSR0, 0x00000000);
-        rt2x00pci_register_write(rt2x00dev, SEC_CSR1, 0x00000000);
-        rt2x00pci_register_write(rt2x00dev, SEC_CSR5, 0x00000000);
+        rt2x00mmio_register_write(rt2x00dev, SEC_CSR0, 0x00000000);
+        rt2x00mmio_register_write(rt2x00dev, SEC_CSR1, 0x00000000);
+        rt2x00mmio_register_write(rt2x00dev, SEC_CSR5, 0x00000000);
 
-        rt2x00pci_register_write(rt2x00dev, PHY_CSR1, 0x000023b0);
-        rt2x00pci_register_write(rt2x00dev, PHY_CSR5, 0x060a100c);
-        rt2x00pci_register_write(rt2x00dev, PHY_CSR6, 0x00080606);
-        rt2x00pci_register_write(rt2x00dev, PHY_CSR7, 0x00000a08);
+        rt2x00mmio_register_write(rt2x00dev, PHY_CSR1, 0x000023b0);
+        rt2x00mmio_register_write(rt2x00dev, PHY_CSR5, 0x060a100c);
+        rt2x00mmio_register_write(rt2x00dev, PHY_CSR6, 0x00080606);
+        rt2x00mmio_register_write(rt2x00dev, PHY_CSR7, 0x00000a08);
 
-        rt2x00pci_register_write(rt2x00dev, PCI_CFG_CSR, 0x28ca4404);
+        rt2x00mmio_register_write(rt2x00dev, PCI_CFG_CSR, 0x28ca4404);
 
-        rt2x00pci_register_write(rt2x00dev, TEST_MODE_CSR, 0x00000200);
+        rt2x00mmio_register_write(rt2x00dev, TEST_MODE_CSR, 0x00000200);
 
-        rt2x00pci_register_write(rt2x00dev, M2H_CMD_DONE_CSR, 0xffffffff);
+        rt2x00mmio_register_write(rt2x00dev, M2H_CMD_DONE_CSR, 0xffffffff);
 
         /*
          * Clear all beacons
@@ -1609,36 +1612,36 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev)
          * the first byte since that byte contains the VALID and OWNER
          * bits which (when set to 0) will invalidate the entire beacon.
          */
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
-        rt2x00pci_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
+        rt2x00mmio_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
+        rt2x00mmio_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
+        rt2x00mmio_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
+        rt2x00mmio_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
 
         /*
          * We must clear the error counters.
          * These registers are cleared on read,
          * so we may pass a useless variable to store the value.
          */
-        rt2x00pci_register_read(rt2x00dev, STA_CSR0, &reg);
-        rt2x00pci_register_read(rt2x00dev, STA_CSR1, &reg);
-        rt2x00pci_register_read(rt2x00dev, STA_CSR2, &reg);
+        rt2x00mmio_register_read(rt2x00dev, STA_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, STA_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, STA_CSR2, &reg);
 
         /*
          * Reset MAC and BBP registers.
          */
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR1, &reg);
         rt2x00_set_field32(&reg, MAC_CSR1_SOFT_RESET, 1);
         rt2x00_set_field32(&reg, MAC_CSR1_BBP_RESET, 1);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR1, &reg);
         rt2x00_set_field32(&reg, MAC_CSR1_SOFT_RESET, 0);
         rt2x00_set_field32(&reg, MAC_CSR1_BBP_RESET, 0);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR1, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR1, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR1, &reg);
         rt2x00_set_field32(&reg, MAC_CSR1_HOST_READY, 1);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR1, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR1, reg);
 
         return 0;
 }
@@ -1655,7 +1658,7 @@ static int rt61pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
         return -EACCES;
 }
 
@@ -1722,11 +1725,11 @@ static void rt61pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          * should clear the register to assure a clean state.
          */
         if (state == STATE_RADIO_IRQ_ON) {
-                rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-                rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
+                rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
+                rt2x00mmio_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
 
-                rt2x00pci_register_read(rt2x00dev, MCU_INT_SOURCE_CSR, &reg);
-                rt2x00pci_register_write(rt2x00dev, MCU_INT_SOURCE_CSR, reg);
+                rt2x00mmio_register_read(rt2x00dev, MCU_INT_SOURCE_CSR, &reg);
+                rt2x00mmio_register_write(rt2x00dev, MCU_INT_SOURCE_CSR, reg);
         }
 
         /*
@@ -1735,15 +1738,15 @@ static void rt61pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
 
-        rt2x00pci_register_read(rt2x00dev, INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_MASK_CSR, &reg);
         rt2x00_set_field32(&reg, INT_MASK_CSR_TXDONE, mask);
         rt2x00_set_field32(&reg, INT_MASK_CSR_RXDONE, mask);
         rt2x00_set_field32(&reg, INT_MASK_CSR_BEACON_DONE, mask);
         rt2x00_set_field32(&reg, INT_MASK_CSR_ENABLE_MITIGATION, mask);
         rt2x00_set_field32(&reg, INT_MASK_CSR_MITIGATION_PERIOD, 0xff);
-        rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_MASK_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MCU_INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MCU_INT_MASK_CSR, &reg);
         rt2x00_set_field32(&reg, MCU_INT_MASK_CSR_0, mask);
         rt2x00_set_field32(&reg, MCU_INT_MASK_CSR_1, mask);
         rt2x00_set_field32(&reg, MCU_INT_MASK_CSR_2, mask);
@@ -1753,7 +1756,7 @@ static void rt61pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, MCU_INT_MASK_CSR_6, mask);
         rt2x00_set_field32(&reg, MCU_INT_MASK_CSR_7, mask);
         rt2x00_set_field32(&reg, MCU_INT_MASK_CSR_TWAKEUP, mask);
-        rt2x00pci_register_write(rt2x00dev, MCU_INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, MCU_INT_MASK_CSR, reg);
 
         spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
 
@@ -1783,9 +1786,9 @@ static int rt61pci_enable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Enable RX.
          */
-        rt2x00pci_register_read(rt2x00dev, RX_CNTL_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, RX_CNTL_CSR, &reg);
         rt2x00_set_field32(&reg, RX_CNTL_CSR_ENABLE_RX_DMA, 1);
-        rt2x00pci_register_write(rt2x00dev, RX_CNTL_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, RX_CNTL_CSR, reg);
 
         return 0;
 }
@@ -1795,7 +1798,7 @@ static void rt61pci_disable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Disable power
          */
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR10, 0x00001818);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR10, 0x00001818);
 }
 
 static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state)
@@ -1806,10 +1809,10 @@ static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state)
 
         put_to_sleep = (state != STATE_AWAKE);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR12, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR12, &reg);
         rt2x00_set_field32(&reg, MAC_CSR12_FORCE_WAKEUP, !put_to_sleep);
         rt2x00_set_field32(&reg, MAC_CSR12_PUT_TO_SLEEP, put_to_sleep);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR12, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR12, reg);
 
         /*
          * Device is not guaranteed to be in the requested state yet.
@@ -1817,11 +1820,11 @@ static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state)
          * device has entered the correct state.
          */
         for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2x00pci_register_read(rt2x00dev, MAC_CSR12, &reg2);
+                rt2x00mmio_register_read(rt2x00dev, MAC_CSR12, &reg2);
                 state = rt2x00_get_field32(reg2, MAC_CSR12_BBP_CURRENT_STATE);
                 if (state == !put_to_sleep)
                         return 0;
-                rt2x00pci_register_write(rt2x00dev, MAC_CSR12, reg);
+                rt2x00mmio_register_write(rt2x00dev, MAC_CSR12, reg);
                 msleep(10);
         }
 
@@ -1856,8 +1859,8 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -1869,7 +1872,7 @@ static void rt61pci_write_tx_desc(struct queue_entry *entry,
                                   struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         __le32 *txd = entry_priv->desc;
         u32 word;
 
@@ -1967,7 +1970,7 @@ static void rt61pci_write_beacon(struct queue_entry *entry,
                                  struct txentry_desc *txdesc)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         unsigned int beacon_base;
         unsigned int padding_len;
         u32 orig_reg, reg;
@@ -1976,10 +1979,10 @@ static void rt61pci_write_beacon(struct queue_entry *entry,
          * Disable beaconing while we are reloading the beacon data,
          * otherwise we might be sending out invalid data.
          */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
         orig_reg = reg;
         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
 
         /*
          * Write the TX descriptor for the beacon.
@@ -1996,19 +1999,19 @@ static void rt61pci_write_beacon(struct queue_entry *entry,
          */
         padding_len = roundup(entry->skb->len, 4) - entry->skb->len;
         if (padding_len && skb_pad(entry->skb, padding_len)) {
-                ERROR(rt2x00dev, "Failure padding beacon, aborting\n");
+                rt2x00_err(rt2x00dev, "Failure padding beacon, aborting\n");
                 /* skb freed by skb_pad() on failure */
                 entry->skb = NULL;
-                rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, orig_reg);
+                rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, orig_reg);
                 return;
         }
 
         beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
-        rt2x00pci_register_multiwrite(rt2x00dev, beacon_base,
-                                      entry_priv->desc, TXINFO_SIZE);
-        rt2x00pci_register_multiwrite(rt2x00dev, beacon_base + TXINFO_SIZE,
-                                      entry->skb->data,
-                                      entry->skb->len + padding_len);
+        rt2x00mmio_register_multiwrite(rt2x00dev, beacon_base,
+                                       entry_priv->desc, TXINFO_SIZE);
+        rt2x00mmio_register_multiwrite(rt2x00dev, beacon_base + TXINFO_SIZE,
+                                       entry->skb->data,
+                                       entry->skb->len + padding_len);
 
         /*
          * Enable beaconing again.
@@ -2016,10 +2019,10 @@ static void rt61pci_write_beacon(struct queue_entry *entry,
          * For Wi-Fi faily generated beacons between participating
          * stations. Set TBTT phase adaptive adjustment step to 8us.
          */
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR10, 0x00001008);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR10, 0x00001008);
 
         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 1);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
 
         /*
          * Clean up beacon skb.
@@ -2037,21 +2040,21 @@ static void rt61pci_clear_beacon(struct queue_entry *entry)
          * Disable beaconing while we are reloading the beacon data,
          * otherwise we might be sending out invalid data.
          */
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR9, &reg);
         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
 
         /*
          * Clear beacon.
          */
-        rt2x00pci_register_write(rt2x00dev,
-                                 HW_BEACON_OFFSET(entry->entry_idx), 0);
+        rt2x00mmio_register_write(rt2x00dev,
+                                  HW_BEACON_OFFSET(entry->entry_idx), 0);
 
         /*
          * Enable beaconing again.
          */
         rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 1);
-        rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
+        rt2x00mmio_register_write(rt2x00dev, TXRX_CSR9, reg);
 }
 
 /*
@@ -2089,7 +2092,7 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,
                                 struct rxdone_entry_desc *rxdesc)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
+        struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         u32 word0;
         u32 word1;
 
@@ -2155,7 +2158,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
         struct data_queue *queue;
         struct queue_entry *entry;
         struct queue_entry *entry_done;
-        struct queue_entry_priv_pci *entry_priv;
+        struct queue_entry_priv_mmio *entry_priv;
         struct txdone_entry_desc txdesc;
         u32 word;
         u32 reg;
@@ -2173,7 +2176,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
          * tx ring size for now.
          */
         for (i = 0; i < rt2x00dev->ops->tx->entry_num; i++) {
-                rt2x00pci_register_read(rt2x00dev, STA_CSR4, &reg);
+                rt2x00mmio_register_read(rt2x00dev, STA_CSR4, &reg);
                 if (!rt2x00_get_field32(reg, STA_CSR4_VALID))
                         break;
 
@@ -2207,9 +2210,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                         /* Catch up.
                          * Just report any entries we missed as failed.
                          */
-                        WARNING(rt2x00dev,
-                                "TX status report missed for entry %d\n",
-                                entry_done->entry_idx);
+                        rt2x00_warn(rt2x00dev, "TX status report missed for entry %d\n",
+                                    entry_done->entry_idx);
 
                         rt2x00lib_txdone_noinfo(entry_done, TXDONE_UNKNOWN);
                         entry_done = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
@@ -2260,9 +2262,9 @@ static inline void rt61pci_enable_interrupt(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irq(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_MASK_CSR, &reg);
         rt2x00_set_field32(&reg, irq_field, 0);
-        rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_MASK_CSR, reg);
 
         spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
@@ -2278,9 +2280,9 @@ static void rt61pci_enable_mcu_interrupt(struct rt2x00_dev *rt2x00dev,
          */
         spin_lock_irq(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, MCU_INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MCU_INT_MASK_CSR, &reg);
         rt2x00_set_field32(&reg, irq_field, 0);
-        rt2x00pci_register_write(rt2x00dev, MCU_INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, MCU_INT_MASK_CSR, reg);
 
         spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
@@ -2304,7 +2306,7 @@ static void rt61pci_tbtt_tasklet(unsigned long data)
 static void rt61pci_rxdone_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-        if (rt2x00pci_rxdone(rt2x00dev))
+        if (rt2x00mmio_rxdone(rt2x00dev))
                 tasklet_schedule(&rt2x00dev->rxdone_tasklet);
         else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt61pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RXDONE);
@@ -2314,8 +2316,8 @@ static void rt61pci_autowake_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
         rt61pci_wakeup(rt2x00dev);
-        rt2x00pci_register_write(rt2x00dev,
-                                 M2H_CMD_DONE_CSR, 0xffffffff);
+        rt2x00mmio_register_write(rt2x00dev,
+                                  M2H_CMD_DONE_CSR, 0xffffffff);
         if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt61pci_enable_mcu_interrupt(rt2x00dev, MCU_INT_MASK_CSR_TWAKEUP);
 }
@@ -2330,11 +2332,11 @@ static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance)
          * Get the interrupt sources & saved to local variable.
          * Write register value back to clear pending interrupts.
          */
-        rt2x00pci_register_read(rt2x00dev, MCU_INT_SOURCE_CSR, &reg_mcu);
-        rt2x00pci_register_write(rt2x00dev, MCU_INT_SOURCE_CSR, reg_mcu);
+        rt2x00mmio_register_read(rt2x00dev, MCU_INT_SOURCE_CSR, &reg_mcu);
+        rt2x00mmio_register_write(rt2x00dev, MCU_INT_SOURCE_CSR, reg_mcu);
 
-        rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-        rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
 
         if (!reg && !reg_mcu)
                 return IRQ_NONE;
@@ -2371,13 +2373,13 @@ static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance)
          */
         spin_lock(&rt2x00dev->irqmask_lock);
 
-        rt2x00pci_register_read(rt2x00dev, INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, INT_MASK_CSR, &reg);
         reg |= mask;
-        rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, INT_MASK_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, MCU_INT_MASK_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MCU_INT_MASK_CSR, &reg);
         reg |= mask_mcu;
-        rt2x00pci_register_write(rt2x00dev, MCU_INT_MASK_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, MCU_INT_MASK_CSR, reg);
 
         spin_unlock(&rt2x00dev->irqmask_lock);
 
@@ -2395,7 +2397,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         u8 *mac;
         s8 value;
 
-        rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
 
         eeprom.data = rt2x00dev;
         eeprom.register_read = rt61pci_eepromregister_read;
@@ -2416,7 +2418,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
                 eth_random_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
+                rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
@@ -2431,7 +2433,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF5225);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
-                EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
@@ -2444,7 +2446,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_NIC_CARDBUS_ACCEL, 0);
                 rt2x00_set_field16(&word, EEPROM_NIC_EXTERNAL_LNA_A, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);
-                EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_LED, &word);
@@ -2452,7 +2454,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_LED_LED_MODE,
                                    LED_MODE_DEFAULT);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED, word);
-                EEPROM(rt2x00dev, "Led: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Led: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);
@@ -2460,7 +2462,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_FREQ_OFFSET, 0);
                 rt2x00_set_field16(&word, EEPROM_FREQ_SEQ, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
-                EEPROM(rt2x00dev, "Freq: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Freq: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_BG, &word);
@@ -2468,7 +2470,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_BG_1, 0);
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_BG_2, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_OFFSET_BG, word);
-                EEPROM(rt2x00dev, "RSSI OFFSET BG: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "RSSI OFFSET BG: 0x%04x\n", word);
         } else {
                 value = rt2x00_get_field16(word, EEPROM_RSSI_OFFSET_BG_1);
                 if (value < -10 || value > 10)
@@ -2484,7 +2486,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_1, 0);
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_2, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_OFFSET_A, word);
-                EEPROM(rt2x00dev, "RSSI OFFSET A: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "RSSI OFFSET A: 0x%04x\n", word);
         } else {
                 value = rt2x00_get_field16(word, EEPROM_RSSI_OFFSET_A_1);
                 if (value < -10 || value > 10)
@@ -2513,7 +2515,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * Identify RF chipset.
          */
         value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR0, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR0, &reg);
         rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),
                         value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
 
@@ -2521,7 +2523,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
             !rt2x00_rf(rt2x00dev, RF5325) &&
             !rt2x00_rf(rt2x00dev, RF2527) &&
             !rt2x00_rf(rt2x00dev, RF2529)) {
-                ERROR(rt2x00dev, "Invalid RF chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");
                 return -ENODEV;
         }
 
@@ -2838,7 +2840,7 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         /*
          * Disable power saving.
          */
-        rt2x00pci_register_write(rt2x00dev, SOFT_RESET_CSR, 0x00000007);
+        rt2x00mmio_register_write(rt2x00dev, SOFT_RESET_CSR, 0x00000007);
 
         /*
          * Allocate eeprom data.
@@ -2855,9 +2857,9 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
          * Enable rfkill polling by setting GPIO direction of the
          * rfkill switch GPIO pin correctly.
          */
-        rt2x00pci_register_read(rt2x00dev, MAC_CSR13, &reg);
+        rt2x00mmio_register_read(rt2x00dev, MAC_CSR13, &reg);
         rt2x00_set_field32(&reg, MAC_CSR13_DIR5, 1);
-        rt2x00pci_register_write(rt2x00dev, MAC_CSR13, reg);
+        rt2x00mmio_register_write(rt2x00dev, MAC_CSR13, reg);
 
         /*
          * Initialize hw specifications.
@@ -2927,25 +2929,25 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw,
         field.bit_offset = (queue_idx & 1) * 16;
         field.bit_mask = 0xffff << field.bit_offset;
 
-        rt2x00pci_register_read(rt2x00dev, offset, &reg);
+        rt2x00mmio_register_read(rt2x00dev, offset, &reg);
         rt2x00_set_field32(&reg, field, queue->txop);
-        rt2x00pci_register_write(rt2x00dev, offset, reg);
+        rt2x00mmio_register_write(rt2x00dev, offset, reg);
 
         /* Update WMM registers */
         field.bit_offset = queue_idx * 4;
         field.bit_mask = 0xf << field.bit_offset;
 
-        rt2x00pci_register_read(rt2x00dev, AIFSN_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, AIFSN_CSR, &reg);
         rt2x00_set_field32(&reg, field, queue->aifs);
-        rt2x00pci_register_write(rt2x00dev, AIFSN_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, AIFSN_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CWMIN_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CWMIN_CSR, &reg);
         rt2x00_set_field32(&reg, field, queue->cw_min);
-        rt2x00pci_register_write(rt2x00dev, CWMIN_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, CWMIN_CSR, reg);
 
-        rt2x00pci_register_read(rt2x00dev, CWMAX_CSR, &reg);
+        rt2x00mmio_register_read(rt2x00dev, CWMAX_CSR, &reg);
         rt2x00_set_field32(&reg, field, queue->cw_max);
-        rt2x00pci_register_write(rt2x00dev, CWMAX_CSR, reg);
+        rt2x00mmio_register_write(rt2x00dev, CWMAX_CSR, reg);
 
         return 0;
 }
@@ -2956,9 +2958,9 @@ static u64 rt61pci_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         u64 tsf;
         u32 reg;
 
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR13, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR13, &reg);
         tsf = (u64) rt2x00_get_field32(reg, TXRX_CSR13_HIGH_TSFTIMER) << 32;
-        rt2x00pci_register_read(rt2x00dev, TXRX_CSR12, &reg);
+        rt2x00mmio_register_read(rt2x00dev, TXRX_CSR12, &reg);
         tsf |= rt2x00_get_field32(reg, TXRX_CSR12_LOW_TSFTIMER);
 
         return tsf;
@@ -2997,8 +2999,8 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .get_firmware_name      = rt61pci_get_firmware_name,
         .check_firmware         = rt61pci_check_firmware,
         .load_firmware          = rt61pci_load_firmware,
-        .initialize             = rt2x00pci_initialize,
-        .uninitialize           = rt2x00pci_uninitialize,
+        .initialize             = rt2x00mmio_initialize,
+        .uninitialize           = rt2x00mmio_uninitialize,
         .get_entry_state        = rt61pci_get_entry_state,
         .clear_entry            = rt61pci_clear_entry,
         .set_device_state       = rt61pci_set_device_state,
@@ -3009,7 +3011,7 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .start_queue            = rt61pci_start_queue,
         .kick_queue             = rt61pci_kick_queue,
         .stop_queue             = rt61pci_stop_queue,
-        .flush_queue            = rt2x00pci_flush_queue,
+        .flush_queue            = rt2x00mmio_flush_queue,
         .write_tx_desc          = rt61pci_write_tx_desc,
         .write_beacon           = rt61pci_write_beacon,
         .clear_beacon           = rt61pci_clear_beacon,
@@ -3027,21 +3029,21 @@ static const struct data_queue_desc rt61pci_queue_rx = {
         .entry_num              = 32,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = RXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt61pci_queue_tx = {
         .entry_num              = 32,
         .data_size              = DATA_FRAME_SIZE,
         .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct data_queue_desc rt61pci_queue_bcn = {
         .entry_num              = 4,
         .data_size              = 0, /* No DMA required for beacons */
         .desc_size              = TXINFO_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_pci),
+        .priv_size              = sizeof(struct queue_entry_priv_mmio),
 };
 
 static const struct rt2x00_ops rt61pci_ops = {
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 24eec66e9fd2..377e09bb0b81 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -739,7 +739,7 @@ static void rt73usb_config_lna_gain(struct rt2x00_dev *rt2x00dev,
         u16 eeprom;
         short lna_gain = 0;
 
-        if (libconf->conf->channel->band == IEEE80211_BAND_2GHZ) {
+        if (libconf->conf->chandef.chan->band == IEEE80211_BAND_2GHZ) {
                 if (test_bit(CAPABILITY_EXTERNAL_LNA_BG, &rt2x00dev->cap_flags))
                         lna_gain += 14;
 
@@ -1122,7 +1122,7 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         if (!reg) {
-                ERROR(rt2x00dev, "Unstable hardware.\n");
+                rt2x00_err(rt2x00dev, "Unstable hardware\n");
                 return -EBUSY;
         }
 
@@ -1139,7 +1139,7 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev,
                                              0, USB_MODE_FIRMWARE,
                                              REGISTER_TIMEOUT_FIRMWARE);
         if (status < 0) {
-                ERROR(rt2x00dev, "Failed to write Firmware to device.\n");
+                rt2x00_err(rt2x00dev, "Failed to write Firmware to device\n");
                 return status;
         }
 
@@ -1305,7 +1305,7 @@ static int rt73usb_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
                 udelay(REGISTER_BUSY_DELAY);
         }
 
-        ERROR(rt2x00dev, "BBP register access failed, aborting.\n");
+        rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
         return -EACCES;
 }
 
@@ -1443,8 +1443,8 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,
         }
 
         if (unlikely(retval))
-                ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",
-                      state, retval);
+                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
+                           state, retval);
 
         return retval;
 }
@@ -1567,7 +1567,7 @@ static void rt73usb_write_beacon(struct queue_entry *entry,
          */
         padding_len = roundup(entry->skb->len, 4) - entry->skb->len;
         if (padding_len && skb_pad(entry->skb, padding_len)) {
-                ERROR(rt2x00dev, "Failure padding beacon, aborting\n");
+                rt2x00_err(rt2x00dev, "Failure padding beacon, aborting\n");
                 /* skb freed by skb_pad() on failure */
                 entry->skb = NULL;
                 rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, orig_reg);
@@ -1771,7 +1771,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
                 eth_random_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
+                rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
@@ -1786,14 +1786,14 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF5226);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
-                EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_NIC_EXTERNAL_LNA, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);
-                EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_LED, &word);
@@ -1809,7 +1809,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_LED_LED_MODE,
                                    LED_MODE_DEFAULT);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED, word);
-                EEPROM(rt2x00dev, "Led: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Led: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);
@@ -1817,7 +1817,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_FREQ_OFFSET, 0);
                 rt2x00_set_field16(&word, EEPROM_FREQ_SEQ, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
-                EEPROM(rt2x00dev, "Freq: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "Freq: 0x%04x\n", word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_OFFSET_BG, &word);
@@ -1825,7 +1825,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_BG_1, 0);
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_BG_2, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_OFFSET_BG, word);
-                EEPROM(rt2x00dev, "RSSI OFFSET BG: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "RSSI OFFSET BG: 0x%04x\n", word);
         } else {
                 value = rt2x00_get_field16(word, EEPROM_RSSI_OFFSET_BG_1);
                 if (value < -10 || value > 10)
@@ -1841,7 +1841,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_1, 0);
                 rt2x00_set_field16(&word, EEPROM_RSSI_OFFSET_A_2, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_OFFSET_A, word);
-                EEPROM(rt2x00dev, "RSSI OFFSET A: 0x%04x\n", word);
+                rt2x00_eeprom_dbg(rt2x00dev, "RSSI OFFSET A: 0x%04x\n", word);
         } else {
                 value = rt2x00_get_field16(word, EEPROM_RSSI_OFFSET_A_1);
                 if (value < -10 || value > 10)
@@ -1875,7 +1875,7 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
                         value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
 
         if (!rt2x00_rt(rt2x00dev, RT2573) || (rt2x00_rev(rt2x00dev) == 0)) {
-                ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RT chipset detected\n");
                 return -ENODEV;
         }
 
@@ -1883,7 +1883,7 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
             !rt2x00_rf(rt2x00dev, RF2528) &&
             !rt2x00_rf(rt2x00dev, RF5225) &&
             !rt2x00_rf(rt2x00dev, RF2527)) {
-                ERROR(rt2x00dev, "Invalid RF chipset detected.\n");
+                rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 1b3c2843221d..91a04e2b8ece 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -147,8 +147,8 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
                                 signal = priv->rf->calc_rssi(agc, sq);
                         }
                         rx_status.signal = signal;
-                        rx_status.freq = dev->conf.channel->center_freq;
-                        rx_status.band = dev->conf.channel->band;
+                        rx_status.freq = dev->conf.chandef.chan->center_freq;
+                        rx_status.band = dev->conf.chandef.chan->band;
                         rx_status.mactime = le64_to_cpu(entry->tsft);
                         rx_status.flag |= RX_FLAG_MACTIME_START;
                         if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR)
diff --git a/drivers/net/wireless/rtl818x/rtl8180/grf5101.c b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
index 5ee7589dd546..077ff92cc139 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
@@ -82,7 +82,8 @@ static void grf5101_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
-        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        int channel =
+                ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);
         u32 txpw = priv->channels[channel - 1].hw_value & 0xFF;
         u32 chan = channel - 1;
 
diff --git a/drivers/net/wireless/rtl818x/rtl8180/max2820.c b/drivers/net/wireless/rtl818x/rtl8180/max2820.c
index 667b3363d437..4715000c94dd 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/max2820.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/max2820.c
@@ -95,7 +95,7 @@ static void max2820_rf_set_channel(struct ieee80211_hw *dev,
 {
         struct rtl8180_priv *priv = dev->priv;
         int channel = conf ?
-                ieee80211_frequency_to_channel(conf->channel->center_freq) : 1;
+                ieee80211_frequency_to_channel(conf->chandef.chan->center_freq) : 1;
         unsigned int chan_idx = channel - 1;
         u32 txpw = priv->channels[chan_idx].hw_value & 0xFF;
         u32 chan = max2820_chan[chan_idx];
diff --git a/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
index 7c4574ba9d75..cc2a5412c1f0 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
@@ -719,7 +719,8 @@ static void rtl8225_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
-        int chan = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        int chan =
+                ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);
 
         if (priv->rf->init == rtl8225_rf_init)
                 rtl8225_rf_set_tx_power(dev, chan);
diff --git a/drivers/net/wireless/rtl818x/rtl8180/sa2400.c b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
index 44771a6286af..b3ec40f6bd23 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
@@ -105,7 +105,8 @@ static void sa2400_rf_set_channel(struct ieee80211_hw *dev,
                                   struct ieee80211_conf *conf)
 {
         struct rtl8180_priv *priv = dev->priv;
-        int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        int channel =
+                ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);
         u32 txpw = priv->channels[channel - 1].hw_value & 0xFF;
         u32 chan = sa2400_chan[channel - 1];
 
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index 4574bd213705..f49220e234b0 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -379,8 +379,8 @@ static void rtl8187_rx_cb(struct urb *urb)
         rate = (flags >> 20) & 0xF;
         skb_trim(skb, flags & 0x0FFF);
         rx_status.rate_idx = rate;
-        rx_status.freq = dev->conf.channel->center_freq;
-        rx_status.band = dev->conf.channel->band;
+        rx_status.freq = dev->conf.chandef.chan->center_freq;
+        rx_status.band = dev->conf.chandef.chan->band;
         rx_status.flag |= RX_FLAG_MACTIME_START;
         if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR)
                 rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
diff --git a/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
index 908903f721f5..f0bf35fedbaf 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
@@ -905,7 +905,8 @@ static void rtl8225_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
         struct rtl8187_priv *priv = dev->priv;
-        int chan = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        int chan =
+                ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);
 
         if (priv->rf->init == rtl8225_rf_init)
                 rtl8225_rf_set_tx_power(dev, chan);
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index b6aa0c40658f..7253de3d8c66 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -55,6 +55,15 @@ config RTL8723AE
 
         If you choose to build it as a module, it will be called rtl8723ae
 
+config RTL8188EE
+        tristate "Realtek RTL8188EE Wireless Network Adapter"
+        depends on RTLWIFI && PCI
+        ---help---
+        This is the driver for Realtek RTL8188EE 802.11n PCIe
+        wireless network adapters.
+
+        If you choose to build it as a module, it will be called rtl8188ee
+
 config RTL8192CU
         tristate "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"
         depends on RTLWIFI && USB
diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile
index 3b1cbac741e3..ff02b874f8d8 100644
--- a/drivers/net/wireless/rtlwifi/Makefile
+++ b/drivers/net/wireless/rtlwifi/Makefile
@@ -26,5 +26,6 @@ obj-$(CONFIG_RTL8192CU)		+= rtl8192cu/
 obj-$(CONFIG_RTL8192SE)         += rtl8192se/
 obj-$(CONFIG_RTL8192DE)         += rtl8192de/
 obj-$(CONFIG_RTL8723AE)         += rtl8723ae/
+obj-$(CONFIG_RTL8188EE)         += rtl8188ee/
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 99c5cea3fe21..af59dd5718e1 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -54,7 +54,8 @@
  *5) frame process functions
  *6) IOT functions
  *7) sysfs functions
- *8) ...
+ *8) vif functions
+ *9) ...
  */
 
 /*********************************************************
@@ -198,34 +199,46 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
 
         ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
 
-        /*
-         *hw->wiphy->bands[IEEE80211_BAND_2GHZ]
+        /*hw->wiphy->bands[IEEE80211_BAND_2GHZ]
          *base on ant_num
          *rx_mask: RX mask
-         *if rx_ant =1 rx_mask[0]=0xff;==>MCS0-MCS7
-         *if rx_ant =2 rx_mask[1]=0xff;==>MCS8-MCS15
-         *if rx_ant >=3 rx_mask[2]=0xff;
-         *if BW_40 rx_mask[4]=0x01;
+         *if rx_ant = 1 rx_mask[0]= 0xff;==>MCS0-MCS7
+         *if rx_ant = 2 rx_mask[1]= 0xff;==>MCS8-MCS15
+         *if rx_ant >= 3 rx_mask[2]= 0xff;
+         *if BW_40 rx_mask[4]= 0x01;
          *highest supported RX rate
          */
-        if (get_rf_type(rtlphy) == RF_1T2R || get_rf_type(rtlphy) == RF_2T2R) {
+        if (rtlpriv->dm.supp_phymode_switch) {
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T2R or 2T2R\n");
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
+                         "Support phy mode switch\n");
 
                 ht_cap->mcs.rx_mask[0] = 0xFF;
                 ht_cap->mcs.rx_mask[1] = 0xFF;
                 ht_cap->mcs.rx_mask[4] = 0x01;
 
                 ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
-        } else if (get_rf_type(rtlphy) == RF_1T1R) {
-
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");
-
-                ht_cap->mcs.rx_mask[0] = 0xFF;
-                ht_cap->mcs.rx_mask[1] = 0x00;
-                ht_cap->mcs.rx_mask[4] = 0x01;
-
-                ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7);
+        } else {
+                if (get_rf_type(rtlphy) == RF_1T2R ||
+                    get_rf_type(rtlphy) == RF_2T2R) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                                 "1T2R or 2T2R\n");
+                        ht_cap->mcs.rx_mask[0] = 0xFF;
+                        ht_cap->mcs.rx_mask[1] = 0xFF;
+                        ht_cap->mcs.rx_mask[4] = 0x01;
+
+                        ht_cap->mcs.rx_highest =
+                                 cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
+                } else if (get_rf_type(rtlphy) == RF_1T1R) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");
+
+                        ht_cap->mcs.rx_mask[0] = 0xFF;
+                        ht_cap->mcs.rx_mask[1] = 0x00;
+                        ht_cap->mcs.rx_mask[4] = 0x01;
+
+                        ht_cap->mcs.rx_highest =
+                                 cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7);
+                }
         }
 }
 
@@ -311,6 +324,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
             IEEE80211_HW_AMPDU_AGGREGATION |
             IEEE80211_HW_CONNECTION_MONITOR |
             /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
+            IEEE80211_HW_CONNECTION_MONITOR |
+            IEEE80211_HW_MFP_CAPABLE |
             IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0;
 
         /* swlps or hwlps has been set in diff chip in init_sw_vars */
@@ -323,8 +338,12 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
         hw->wiphy->interface_modes =
             BIT(NL80211_IFTYPE_AP) |
             BIT(NL80211_IFTYPE_STATION) |
-            BIT(NL80211_IFTYPE_ADHOC);
+            BIT(NL80211_IFTYPE_ADHOC) |
+            BIT(NL80211_IFTYPE_MESH_POINT) |
+            BIT(NL80211_IFTYPE_P2P_CLIENT) |
+            BIT(NL80211_IFTYPE_P2P_GO);
 
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
         hw->wiphy->rts_threshold = 2347;
 
         hw->queues = AC_MAX;
@@ -354,9 +373,10 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         /* <1> timer */
-        init_timer(&rtlpriv->works.watchdog_timer);
         setup_timer(&rtlpriv->works.watchdog_timer,
                     rtl_watch_dog_timer_callback, (unsigned long)hw);
+        setup_timer(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,
+                    rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw);
 
         /* <2> work queue */
         rtlpriv->works.hw = hw;
@@ -369,6 +389,8 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
                           (void *)rtl_swlps_wq_callback);
         INIT_DELAYED_WORK(&rtlpriv->works.ps_rfon_wq,
                           (void *)rtl_swlps_rfon_wq_callback);
+        INIT_DELAYED_WORK(&rtlpriv->works.fwevt_wq,
+                          (void *)rtl_fwevt_wq_callback);
 
 }
 
@@ -382,6 +404,7 @@ void rtl_deinit_deferred_work(struct ieee80211_hw *hw)
         cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
         cancel_delayed_work(&rtlpriv->works.ps_work);
         cancel_delayed_work(&rtlpriv->works.ps_rfon_wq);
+        cancel_delayed_work(&rtlpriv->works.fwevt_wq);
 }
 
 void rtl_init_rfkill(struct ieee80211_hw *hw)
@@ -436,12 +459,6 @@ int rtl_init_core(struct ieee80211_hw *hw)
         if (rtl_regd_init(hw, rtl_reg_notifier)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "REGD init failed\n");
                 return 1;
-        } else {
-                /* CRDA regd hint must after init CRDA */
-                if (regulatory_hint(hw->wiphy, rtlpriv->regd.alpha2)) {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                 "regulatory_hint fail\n");
-                }
         }
 
         /* <4> locks */
@@ -449,15 +466,25 @@ int rtl_init_core(struct ieee80211_hw *hw)
         mutex_init(&rtlpriv->locks.ps_mutex);
         spin_lock_init(&rtlpriv->locks.ips_lock);
         spin_lock_init(&rtlpriv->locks.irq_th_lock);
+        spin_lock_init(&rtlpriv->locks.irq_pci_lock);
+        spin_lock_init(&rtlpriv->locks.tx_lock);
         spin_lock_init(&rtlpriv->locks.h2c_lock);
         spin_lock_init(&rtlpriv->locks.rf_ps_lock);
         spin_lock_init(&rtlpriv->locks.rf_lock);
         spin_lock_init(&rtlpriv->locks.waitq_lock);
+        spin_lock_init(&rtlpriv->locks.entry_list_lock);
+        spin_lock_init(&rtlpriv->locks.fw_ps_lock);
         spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);
+        spin_lock_init(&rtlpriv->locks.check_sendpkt_lock);
+        spin_lock_init(&rtlpriv->locks.fw_ps_lock);
+        spin_lock_init(&rtlpriv->locks.lps_lock);
+
+        /* <5> init list */
+        INIT_LIST_HEAD(&rtlpriv->entry_list);
 
         rtlmac->link_state = MAC80211_NOLINK;
 
-        /* <5> init deferred work */
+        /* <6> init deferred work */
         _rtl_init_deferred_work(hw);
 
         return 0;
@@ -523,7 +550,8 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw,
         if (mac->opmode == NL80211_IFTYPE_STATION)
                 bw_40 = mac->bw_40;
         else if (mac->opmode == NL80211_IFTYPE_AP ||
-                 mac->opmode == NL80211_IFTYPE_ADHOC)
+                 mac->opmode == NL80211_IFTYPE_ADHOC ||
+                 mac->opmode == NL80211_IFTYPE_MESH_POINT)
                 bw_40 = sta->bandwidth >= IEEE80211_STA_RX_BW_40;
 
         if (bw_40 && sgi_40)
@@ -578,23 +606,26 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
         if (!tcb_desc->disable_ratefallback || !tcb_desc->use_driver_rate) {
                 if (mac->opmode == NL80211_IFTYPE_STATION) {
                         tcb_desc->ratr_index = 0;
-                } else if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+                } else if (mac->opmode == NL80211_IFTYPE_ADHOC ||
+                           mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                         if (tcb_desc->multicast || tcb_desc->broadcast) {
                                 tcb_desc->hw_rate =
                                     rtlpriv->cfg->maps[RTL_RC_CCK_RATE2M];
                                 tcb_desc->use_driver_rate = 1;
+                                tcb_desc->ratr_index = RATR_INX_WIRELESS_MC;
                         } else {
-                                /* TODO */
+                                tcb_desc->ratr_index = ratr_index;
                         }
-                        tcb_desc->ratr_index = ratr_index;
                 } else if (mac->opmode == NL80211_IFTYPE_AP) {
                         tcb_desc->ratr_index = ratr_index;
                 }
         }
 
         if (rtlpriv->dm.useramask) {
-                /* TODO we will differentiate adhoc and station futrue  */
-                if (mac->opmode == NL80211_IFTYPE_STATION) {
+                tcb_desc->ratr_index = ratr_index;
+                /* TODO we will differentiate adhoc and station future  */
+                if (mac->opmode == NL80211_IFTYPE_STATION ||
+                    mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                         tcb_desc->mac_id = 0;
 
                         if (mac->mode == WIRELESS_MODE_N_24G)
@@ -608,7 +639,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                         else if (mac->mode & WIRELESS_MODE_A)
                                 tcb_desc->ratr_index = RATR_INX_WIRELESS_G;
                 } else if (mac->opmode == NL80211_IFTYPE_AP ||
-                        mac->opmode == NL80211_IFTYPE_ADHOC) {
+                           mac->opmode == NL80211_IFTYPE_ADHOC) {
                         if (NULL != sta) {
                                 if (sta->aid > 0)
                                         tcb_desc->mac_id = sta->aid + 1;
@@ -619,7 +650,6 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                         }
                 }
         }
-
 }
 
 static void _rtl_query_bandwidth_mode(struct ieee80211_hw *hw,
@@ -633,7 +663,8 @@ static void _rtl_query_bandwidth_mode(struct ieee80211_hw *hw,
         if (!sta)
                 return;
         if (mac->opmode == NL80211_IFTYPE_AP ||
-            mac->opmode == NL80211_IFTYPE_ADHOC) {
+            mac->opmode == NL80211_IFTYPE_ADHOC ||
+            mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                 if (sta->bandwidth == IEEE80211_STA_RX_BW_20)
                         return;
         } else if (mac->opmode == NL80211_IFTYPE_STATION) {
@@ -691,7 +722,7 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
         int rate_idx;
 
         if (false == isht) {
-                if (IEEE80211_BAND_2GHZ == hw->conf.channel->band) {
+                if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {
                         switch (desc_rate) {
                         case DESC92_RATE1M:
                                 rate_idx = 0;
@@ -834,8 +865,8 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)
         if (rtlpriv->dm.supp_phymode_switch &&
             mac->link_state < MAC80211_LINKED &&
             (ieee80211_is_auth(fc) || ieee80211_is_probe_req(fc))) {
-                if (rtlpriv->cfg->ops->check_switch_to_dmdp)
-                        rtlpriv->cfg->ops->check_switch_to_dmdp(hw);
+                if (rtlpriv->cfg->ops->chk_switch_dmdp)
+                        rtlpriv->cfg->ops->chk_switch_dmdp(hw);
         }
         if (ieee80211_is_auth(fc)) {
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
@@ -924,6 +955,56 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(rtl_get_tcb_desc);
 
+static bool addbareq_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_sta *sta = NULL;
+        struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
+        struct rtl_sta_info *sta_entry = NULL;
+        struct ieee80211_mgmt *mgmt = (void *)skb->data;
+        u16 capab = 0, tid = 0;
+        struct rtl_tid_data *tid_data;
+        struct sk_buff *skb_delba = NULL;
+        struct ieee80211_rx_status rx_status = { 0 };
+
+        rcu_read_lock();
+        sta = rtl_find_sta(hw, hdr->addr3);
+        if (sta == NULL) {
+                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_EMERG,
+                         "sta is NULL\n");
+                rcu_read_unlock();
+                return true;
+        }
+
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        if (!sta_entry) {
+                rcu_read_unlock();
+                return true;
+        }
+        capab = le16_to_cpu(mgmt->u.action.u.addba_req.capab);
+        tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
+        tid_data = &sta_entry->tids[tid];
+        if (tid_data->agg.rx_agg_state == RTL_RX_AGG_START) {
+                skb_delba = rtl_make_del_ba(hw, hdr->addr2, hdr->addr3, tid);
+                if (skb_delba) {
+                        rx_status.freq = hw->conf.chandef.chan->center_freq;
+                        rx_status.band = hw->conf.chandef.chan->band;
+                        rx_status.flag |= RX_FLAG_DECRYPTED;
+                        rx_status.flag |= RX_FLAG_MACTIME_END;
+                        rx_status.rate_idx = 0;
+                        rx_status.signal = 50 + 10;
+                        memcpy(IEEE80211_SKB_RXCB(skb_delba), &rx_status,
+                               sizeof(rx_status));
+                        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG,
+                                      "fake del\n", skb_delba->data,
+                                      skb_delba->len);
+                        ieee80211_rx_irqsafe(hw, skb_delba);
+                }
+        }
+        rcu_read_unlock();
+        return false;
+}
+
 bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -948,6 +1029,11 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
                                  "%s ACT_ADDBAREQ From :%pM\n",
                                  is_tx ? "Tx" : "Rx", hdr->addr2);
+                        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
+                                      skb->data, skb->len);
+                        if (!is_tx)
+                                if (addbareq_rx(hw, skb))
+                                        return true;
                         break;
                 case ACT_ADDBARSP:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
@@ -1003,8 +1089,9 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                                          is_tx ? "Tx" : "Rx");
 
                                 if (is_tx) {
+                                        rtlpriv->enter_ps = false;
                                         schedule_work(&rtlpriv->
-                                                      works.lps_leave_work);
+                                                      works.lps_change_work);
                                         ppsc->last_delaylps_stamp_jiffies =
                                             jiffies;
                                 }
@@ -1014,7 +1101,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                 }
         } else if (ETH_P_ARP == ether_type) {
                 if (is_tx) {
-                        schedule_work(&rtlpriv->works.lps_leave_work);
+                        rtlpriv->enter_ps = false;
+                        schedule_work(&rtlpriv->works.lps_change_work);
                         ppsc->last_delaylps_stamp_jiffies = jiffies;
                 }
 
@@ -1024,7 +1112,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                          "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");
 
                 if (is_tx) {
-                        schedule_work(&rtlpriv->works.lps_leave_work);
+                        rtlpriv->enter_ps = false;
+                        schedule_work(&rtlpriv->works.lps_change_work);
                         ppsc->last_delaylps_stamp_jiffies = jiffies;
                 }
 
@@ -1101,6 +1190,58 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw,
         return 0;
 }
 
+int rtl_rx_agg_start(struct ieee80211_hw *hw,
+                     struct ieee80211_sta *sta, u16 tid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_tid_data *tid_data;
+        struct rtl_sta_info *sta_entry = NULL;
+
+        if (sta == NULL)
+                return -EINVAL;
+
+        if (unlikely(tid >= MAX_TID_COUNT))
+                return -EINVAL;
+
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        if (!sta_entry)
+                return -ENXIO;
+        tid_data = &sta_entry->tids[tid];
+
+        RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,
+                 "on ra = %pM tid = %d seq:%d\n", sta->addr, tid,
+                 tid_data->seq_number);
+
+        tid_data->agg.rx_agg_state = RTL_RX_AGG_START;
+        return 0;
+}
+
+int rtl_rx_agg_stop(struct ieee80211_hw *hw,
+                    struct ieee80211_sta *sta, u16 tid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_sta_info *sta_entry = NULL;
+
+        if (sta == NULL)
+                return -EINVAL;
+
+        if (!sta->addr) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
+                return -EINVAL;
+        }
+
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
+                 "on ra = %pM tid = %d\n", sta->addr, tid);
+
+        if (unlikely(tid >= MAX_TID_COUNT))
+                return -EINVAL;
+
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        sta_entry->tids[tid].agg.rx_agg_state = RTL_RX_AGG_STOP;
+
+        return 0;
+}
+
 int rtl_tx_agg_oper(struct ieee80211_hw *hw,
                 struct ieee80211_sta *sta, u16 tid)
 {
@@ -1132,6 +1273,34 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,
  * wq & timer callback functions
  *
  *********************************************************/
+/* this function is used for roaming */
+void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+
+        if (rtlpriv->mac80211.opmode != NL80211_IFTYPE_STATION)
+                return;
+
+        if (rtlpriv->mac80211.link_state < MAC80211_LINKED)
+                return;
+
+        /* check if this really is a beacon */
+        if (!ieee80211_is_beacon(hdr->frame_control) &&
+            !ieee80211_is_probe_resp(hdr->frame_control))
+                return;
+
+        /* min. beacon length + FCS_LEN */
+        if (skb->len <= 40 + FCS_LEN)
+                return;
+
+        /* and only beacons from the associated BSSID, please */
+        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+                return;
+
+        rtlpriv->link_info.bcn_rx_inperiod++;
+}
+
 void rtl_watchdog_wq_callback(void *data)
 {
         struct rtl_works *rtlworks = container_of_dwork_rtl(data,
@@ -1142,6 +1311,8 @@ void rtl_watchdog_wq_callback(void *data)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         bool busytraffic = false;
+        bool tx_busy_traffic = false;
+        bool rx_busy_traffic = false;
         bool higher_busytraffic = false;
         bool higher_busyrxtraffic = false;
         u8 idx, tid;
@@ -1151,7 +1322,6 @@ void rtl_watchdog_wq_callback(void *data)
         u32 aver_tx_cnt_inperiod = 0;
         u32 aver_tidtx_inperiod[MAX_TID_COUNT] = {0};
         u32 tidtx_inp4eriod[MAX_TID_COUNT] = {0};
-        bool enter_ps = false;
 
         if (is_hal_stop(rtlhal))
                 return;
@@ -1191,8 +1361,13 @@ void rtl_watchdog_wq_callback(void *data)
                 aver_tx_cnt_inperiod = tx_cnt_inp4eriod / 4;
 
                 /* (2) check traffic busy */
-                if (aver_rx_cnt_inperiod > 100 || aver_tx_cnt_inperiod > 100)
+                if (aver_rx_cnt_inperiod > 100 || aver_tx_cnt_inperiod > 100) {
                         busytraffic = true;
+                        if (aver_rx_cnt_inperiod > aver_tx_cnt_inperiod)
+                                rx_busy_traffic = true;
+                        else
+                                tx_busy_traffic = false;
+                }
 
                 /* Higher Tx/Rx data. */
                 if (aver_rx_cnt_inperiod > 4000 ||
@@ -1228,15 +1403,12 @@ void rtl_watchdog_wq_callback(void *data)
                 if (((rtlpriv->link_info.num_rx_inperiod +
                       rtlpriv->link_info.num_tx_inperiod) > 8) ||
                     (rtlpriv->link_info.num_rx_inperiod > 2))
-                        enter_ps = false;
+                        rtlpriv->enter_ps = true;
                 else
-                        enter_ps = true;
+                        rtlpriv->enter_ps = false;
 
                 /* LeisurePS only work in infra mode. */
-                if (enter_ps)
-                        rtl_lps_enter(hw);
-                else
-                        rtl_lps_leave(hw);
+                schedule_work(&rtlpriv->works.lps_change_work);
         }
 
         rtlpriv->link_info.num_rx_inperiod = 0;
@@ -1246,10 +1418,37 @@ void rtl_watchdog_wq_callback(void *data)
 
         rtlpriv->link_info.busytraffic = busytraffic;
         rtlpriv->link_info.higher_busytraffic = higher_busytraffic;
+        rtlpriv->link_info.rx_busy_traffic = rx_busy_traffic;
+        rtlpriv->link_info.tx_busy_traffic = tx_busy_traffic;
         rtlpriv->link_info.higher_busyrxtraffic = higher_busyrxtraffic;
 
         /* <3> DM */
         rtlpriv->cfg->ops->dm_watchdog(hw);
+
+        /* <4> roaming */
+        if (mac->link_state == MAC80211_LINKED &&
+            mac->opmode == NL80211_IFTYPE_STATION) {
+                if ((rtlpriv->link_info.bcn_rx_inperiod +
+                     rtlpriv->link_info.num_rx_inperiod) == 0) {
+                        rtlpriv->link_info.roam_times++;
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
+                                 "AP off for %d s\n",
+                                 (rtlpriv->link_info.roam_times * 2));
+
+                        /* if we can't recv beacon for 6s, we should
+                         * reconnect this AP
+                         */
+                        if (rtlpriv->link_info.roam_times >= 3) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                         "AP off, try to reconnect now\n");
+                                rtlpriv->link_info.roam_times = 0;
+                                ieee80211_connection_loss(rtlpriv->mac80211.vif);
+                        }
+                } else {
+                        rtlpriv->link_info.roam_times = 0;
+                }
+        }
+        rtlpriv->link_info.bcn_rx_inperiod = 0;
 }
 
 void rtl_watch_dog_timer_callback(unsigned long data)
@@ -1264,6 +1463,28 @@ void rtl_watch_dog_timer_callback(unsigned long data)
                   jiffies + MSECS(RTL_WATCH_DOG_TIME));
 }
 
+void rtl_fwevt_wq_callback(void *data)
+{
+        struct rtl_works *rtlworks =
+                container_of_dwork_rtl(data, struct rtl_works, fwevt_wq);
+        struct ieee80211_hw *hw = rtlworks->hw;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->cfg->ops->c2h_command_handle(hw);
+}
+
+void rtl_easy_concurrent_retrytimer_callback(unsigned long data)
+{
+        struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_priv *buddy_priv = rtlpriv->buddy_priv;
+
+        if (buddy_priv == NULL)
+                return;
+
+        rtlpriv->cfg->ops->dualmac_easy_concurrent(hw);
+}
+
 /*********************************************************
  *
  * frame process functions
@@ -1334,14 +1555,16 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
 }
 
 int rtl_send_smps_action(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u8 *da, u8 *bssid,
+                struct ieee80211_sta *sta,
                 enum ieee80211_smps_mode smps)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        struct sk_buff *skb = rtl_make_smps_action(hw, smps, da, bssid);
+        struct sk_buff *skb = NULL;
         struct rtl_tcb_desc tcb_desc;
+        u8 bssid[ETH_ALEN] = {0};
+
         memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
 
         if (rtlpriv->mac80211.act_scanning)
@@ -1356,21 +1579,67 @@ int rtl_send_smps_action(struct ieee80211_hw *hw,
         if (!test_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status))
                 goto err_free;
 
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP)
+                memcpy(bssid, rtlpriv->efuse.dev_addr, ETH_ALEN);
+        else
+                memcpy(bssid, rtlpriv->mac80211.bssid, ETH_ALEN);
+
+        skb = rtl_make_smps_action(hw, smps, sta->addr, bssid);
         /* this is a type = mgmt * stype = action frame */
         if (skb) {
                 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
                 struct rtl_sta_info *sta_entry =
                         (struct rtl_sta_info *) sta->drv_priv;
                 sta_entry->mimo_ps = smps;
-                rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
 
                 info->control.rates[0].idx = 0;
-                info->band = hw->conf.channel->band;
+                info->band = hw->conf.chandef.chan->band;
                 rtlpriv->intf_ops->adapter_tx(hw, sta, skb, &tcb_desc);
         }
+        return 1;
+
 err_free:
         return 0;
 }
+EXPORT_SYMBOL(rtl_send_smps_action);
+
+/* There seem to be issues in mac80211 regarding when del ba frames can be
+ * received. As a work around, we make a fake del_ba if we receive a ba_req;
+ * however, rx_agg was opened to let mac80211 release some ba related
+ * resources. This del_ba is for tx only.
+ */
+struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
+                                u8 *sa, u8 *bssid, u16 tid)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *action_frame;
+        u16 params;
+
+        /* 27 = header + category + action + smps mode */
+        skb = dev_alloc_skb(34 + hw->extra_tx_headroom);
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, hw->extra_tx_headroom);
+        action_frame = (void *)skb_put(skb, 34);
+        memset(action_frame, 0, 34);
+        memcpy(action_frame->sa, sa, ETH_ALEN);
+        memcpy(action_frame->da, rtlefuse->dev_addr, ETH_ALEN);
+        memcpy(action_frame->bssid, bssid, ETH_ALEN);
+        action_frame->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                                  IEEE80211_STYPE_ACTION);
+        action_frame->u.action.category = WLAN_CATEGORY_BACK;
+        action_frame->u.action.u.delba.action_code = WLAN_ACTION_DELBA;
+        params = (u16)(1 << 11);        /* bit 11 initiator */
+        params |= (u16)(tid << 12);             /* bit 15:12 TID number */
+
+        action_frame->u.action.u.delba.params = cpu_to_le16(params);
+        action_frame->u.action.u.delba.reason_code =
+                cpu_to_le16(WLAN_REASON_QSTA_TIMEOUT);
+
+        return skb;
+}
 
 /*********************************************************
  *
@@ -1587,11 +1856,17 @@ MODULE_AUTHOR("Larry Finger	<Larry.FInger@lwfinger.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core");
 
+struct rtl_global_var global_var = {};
+
 static int __init rtl_core_module_init(void)
 {
         if (rtl_rate_control_register())
                 pr_err("Unable to register rtl_rc, use default RC !!\n");
 
+        /* init some global vars */
+        INIT_LIST_HEAD(&global_var.glb_priv_list);
+        spin_lock_init(&global_var.glb_list_lock);
+
         return 0;
 }
 
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index 5a8c80e259f7..8576bc34b032 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -113,6 +113,7 @@ void rtl_init_rx_config(struct ieee80211_hw *hw);
 void rtl_init_rfkill(struct ieee80211_hw *hw);
 void rtl_deinit_rfkill(struct ieee80211_hw *hw);
 
+void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);
 void rtl_watch_dog_timer_callback(unsigned long data);
 void rtl_deinit_deferred_work(struct ieee80211_hw *hw);
 
@@ -126,7 +127,12 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                     u16 tid);
 int rtl_tx_agg_oper(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                     u16 tid);
+int rtl_rx_agg_start(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
+                     u16 tid);
+int rtl_rx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
+                    u16 tid);
 void rtl_watchdog_wq_callback(void *data);
+void rtl_fwevt_wq_callback(void *data);
 
 void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                       struct ieee80211_tx_info *info,
@@ -134,14 +140,18 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                       struct sk_buff *skb, struct rtl_tcb_desc *tcb_desc);
 
 int rtl_send_smps_action(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u8 *da, u8 *bssid,
-                enum ieee80211_smps_mode smps);
+                         struct ieee80211_sta *sta,
+                         enum ieee80211_smps_mode smps);
 u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);
 void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);
 u8 rtl_tid_to_ac(u8 tid);
 extern struct attribute_group rtl_attribute_group;
+void rtl_easy_concurrent_retrytimer_callback(unsigned long data);
+extern struct rtl_global_var global_var;
 int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
                          bool isht, u8 desc_rate, bool first_ampdu);
 bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);
+struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
+                                u8 *sa, u8 *bssid, u16 tid);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index d3ce9fbef00e..ee84844be008 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -104,9 +104,12 @@ static void rtl_op_stop(struct ieee80211_hw *hw)
         if (is_hal_stop(rtlhal))
                 return;
 
+        /* here is must, because adhoc do stop and start,
+         * but stop with RFOFF may cause something wrong,
+         * like adhoc TP
+         */
         if (unlikely(ppsc->rfpwr_state == ERFOFF)) {
                 rtl_ips_nic_on(hw);
-                mdelay(1);
         }
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
@@ -167,7 +170,11 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
         rtl_ips_nic_on(hw);
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
-        switch (vif->type) {
+
+        switch (ieee80211_vif_type_p2p(vif)) {
+        case NL80211_IFTYPE_P2P_CLIENT:
+                mac->p2p = P2P_ROLE_CLIENT;
+                /*fall through*/
         case NL80211_IFTYPE_STATION:
                 if (mac->beacon_enabled == 1) {
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
@@ -192,6 +199,9 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                                 (u8 *) (&mac->basic_rates));
 
                 break;
+        case NL80211_IFTYPE_P2P_GO:
+                mac->p2p = P2P_ROLE_GO;
+                /*fall through*/
         case NL80211_IFTYPE_AP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                          "NL80211_IFTYPE_AP\n");
@@ -205,6 +215,19 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE,
                                 (u8 *) (&mac->basic_rates));
                 break;
+        case NL80211_IFTYPE_MESH_POINT:
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
+                         "NL80211_IFTYPE_MESH_POINT\n");
+
+                mac->link_state = MAC80211_LINKED;
+                rtlpriv->cfg->ops->set_bcn_reg(hw);
+                if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G)
+                        mac->basic_rates = 0xfff;
+                else
+                        mac->basic_rates = 0xff0;
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE,
+                                (u8 *)(&mac->basic_rates));
+                break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "operation mode %d is not supported!\n", vif->type);
@@ -212,6 +235,13 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 goto out;
         }
 
+        if (mac->p2p) {
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
+                         "p2p role %x\n", vif->type);
+                mac->basic_rates = 0xff0;/*disable cck rate for p2p*/
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE,
+                                (u8 *)(&mac->basic_rates));
+        }
         mac->vif = vif;
         mac->opmode = vif->type;
         rtlpriv->cfg->ops->set_network_type(hw, vif->type);
@@ -232,9 +262,9 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
         mutex_lock(&rtlpriv->locks.conf_mutex);
 
         /* Free beacon resources */
-        if ((mac->opmode == NL80211_IFTYPE_AP) ||
-            (mac->opmode == NL80211_IFTYPE_ADHOC) ||
-            (mac->opmode == NL80211_IFTYPE_MESH_POINT)) {
+        if ((vif->type == NL80211_IFTYPE_AP) ||
+            (vif->type == NL80211_IFTYPE_ADHOC) ||
+            (vif->type == NL80211_IFTYPE_MESH_POINT)) {
                 if (mac->beacon_enabled == 1) {
                         mac->beacon_enabled = 0;
                         rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
@@ -247,6 +277,7 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
          *Note: We assume NL80211_IFTYPE_UNSPECIFIED as
          *NO LINK for our hardware.
          */
+        mac->p2p = 0;
         mac->vif = NULL;
         mac->link_state = MAC80211_NOLINK;
         memset(mac->bssid, 0, 6);
@@ -256,6 +287,22 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
         mutex_unlock(&rtlpriv->locks.conf_mutex);
 }
 
+static int rtl_op_change_interface(struct ieee80211_hw *hw,
+                                      struct ieee80211_vif *vif,
+                                      enum nl80211_iftype new_type, bool p2p)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int ret;
+        rtl_op_remove_interface(hw, vif);
+
+        vif->type = new_type;
+        vif->p2p = p2p;
+        ret = rtl_op_add_interface(hw, vif);
+        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
+                 "p2p %x\n", p2p);
+        return ret;
+}
+
 static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -264,6 +311,9 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct ieee80211_conf *conf = &hw->conf;
 
+        if (mac->skip_scan)
+                return 1;
+
         mutex_lock(&rtlpriv->locks.conf_mutex);
         if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {  /*BIT(2)*/
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
@@ -320,9 +370,19 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-                struct ieee80211_channel *channel = hw->conf.channel;
+                struct ieee80211_channel *channel = hw->conf.chandef.chan;
                 u8 wide_chan = (u8) channel->hw_value;
 
+                if (mac->act_scanning)
+                        mac->n_channels++;
+
+                if (rtlpriv->dm.supp_phymode_switch &&
+                    mac->link_state < MAC80211_LINKED &&
+                    !mac->act_scanning) {
+                        if (rtlpriv->cfg->ops->chk_switch_dmdp)
+                                rtlpriv->cfg->ops->chk_switch_dmdp(hw);
+                }
+
                 /*
                  *because we should back channel to
                  *current_network.chan in in scanning,
@@ -332,7 +392,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                  *info for cisco1253 bw20, so we modify
                  *it here based on UPPER & LOWER
                  */
-                switch (hw->conf.channel_type) {
+                switch (cfg80211_get_chandef_type(&hw->conf.chandef)) {
                 case NL80211_CHAN_HT20:
                 case NL80211_CHAN_NO_HT:
                         /* SC */
@@ -373,13 +433,13 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                 if (wide_chan <= 0)
                         wide_chan = 1;
 
-                /* In scanning, before we go offchannel we may send a ps=1 null
-                 * to AP, and then we may send a ps = 0 null to AP quickly, but
-                 * first null may have caused AP to put lots of packet to hw tx
-                 * buffer. These packets must be tx'd before we go off channel
-                 * so we must delay more time to let AP flush these packets
-                 * before going offchannel, or dis-association or delete BA will
-                 * happen by AP
+                /* In scanning, before we go offchannel we may send a ps = 1
+                 * null to AP, and then we may send a ps = 0 null to AP quickly,
+                 * but first null may have caused AP to put lots of packet to
+                 * hw tx buffer. These packets must be tx'd before we go off
+                 * channel so we must delay more time to let AP flush these
+                 * packets before going offchannel, or dis-association or
+                 * delete BA will be caused by AP
                  */
                 if (rtlpriv->mac80211.offchan_delay) {
                         rtlpriv->mac80211.offchan_delay = false;
@@ -390,7 +450,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                 rtlpriv->cfg->ops->switch_channel(hw);
                 rtlpriv->cfg->ops->set_channel_access(hw);
                 rtlpriv->cfg->ops->set_bw_mode(hw,
-                                               hw->conf.channel_type);
+                                cfg80211_get_chandef_type(&hw->conf.chandef));
         }
 
         mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -441,7 +501,8 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
          * and nolink check bssid is set in set network_type */
         if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&
                 (mac->link_state >= MAC80211_LINKED)) {
-                if (mac->opmode != NL80211_IFTYPE_AP) {
+                if (mac->opmode != NL80211_IFTYPE_AP &&
+                    mac->opmode != NL80211_IFTYPE_MESH_POINT) {
                         if (*new_flags & FIF_BCN_PRBRESP_PROMISC) {
                                 rtlpriv->cfg->ops->set_chk_bssid(hw, false);
                         } else {
@@ -481,32 +542,43 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_sta_info *sta_entry;
 
         if (sta) {
                 sta_entry = (struct rtl_sta_info *) sta->drv_priv;
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_add_tail(&sta_entry->list, &rtlpriv->entry_list);
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
                 if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                         sta_entry->wireless_mode = WIRELESS_MODE_G;
                         if (sta->supp_rates[0] <= 0xf)
                                 sta_entry->wireless_mode = WIRELESS_MODE_B;
-                        if (sta->ht_cap.ht_supported)
+                        if (sta->ht_cap.ht_supported == true)
                                 sta_entry->wireless_mode = WIRELESS_MODE_N_24G;
+
+                        if (vif->type == NL80211_IFTYPE_ADHOC)
+                                sta_entry->wireless_mode = WIRELESS_MODE_G;
                 } else if (rtlhal->current_bandtype == BAND_ON_5G) {
                         sta_entry->wireless_mode = WIRELESS_MODE_A;
-                        if (sta->ht_cap.ht_supported)
+                        if (sta->ht_cap.ht_supported == true)
                                 sta_entry->wireless_mode = WIRELESS_MODE_N_24G;
-                }
 
-                /* I found some times mac80211 give wrong supp_rates for adhoc*/
-                if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
-                        sta_entry->wireless_mode = WIRELESS_MODE_G;
+                        if (vif->type == NL80211_IFTYPE_ADHOC)
+                                sta_entry->wireless_mode = WIRELESS_MODE_A;
+                }
+                /*disable cck rate for p2p*/
+                if (mac->p2p)
+                        sta->supp_rates[0] &= 0xfffffff0;
 
+                memcpy(sta_entry->mac_addr, sta->addr, ETH_ALEN);
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                          "Add sta addr is %pM\n", sta->addr);
                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
         }
         return 0;
 }
+
 static int rtl_op_sta_remove(struct ieee80211_hw *hw,
                                 struct ieee80211_vif *vif,
                                 struct ieee80211_sta *sta)
@@ -519,9 +591,14 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw,
                 sta_entry = (struct rtl_sta_info *) sta->drv_priv;
                 sta_entry->wireless_mode = 0;
                 sta_entry->ratr_index = 0;
+
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_del(&sta_entry->list);
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
         }
         return 0;
 }
+
 static int _rtl_get_hal_qnum(u16 queue)
 {
         int qnum;
@@ -547,8 +624,8 @@ static int _rtl_get_hal_qnum(u16 queue)
 }
 
 /*
- *for mac80211 VO=0, VI=1, BE=2, BK=3
- *for rtl819x  BE=0, BK=1, VI=2, VO=3
+ *for mac80211 VO = 0, VI = 1, BE = 2, BK = 3
+ *for rtl819x  BE = 0, BK = 1, VI = 2, VO = 3
  */
 static int rtl_op_conf_tx(struct ieee80211_hw *hw,
                    struct ieee80211_vif *vif, u16 queue,
@@ -630,6 +707,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
         /*TODO: reference to enum ieee80211_bss_change */
         if (changed & BSS_CHANGED_ASSOC) {
                 if (bss_conf->assoc) {
+                        struct ieee80211_sta *sta = NULL;
                         /* we should reset all sec info & cam
                          * before set cam after linked, we should not
                          * reset in disassoc, that will cause tkip->wep
@@ -647,23 +725,39 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
                         if (rtlpriv->cfg->ops->linked_set_reg)
                                 rtlpriv->cfg->ops->linked_set_reg(hw);
-                        if (mac->opmode == NL80211_IFTYPE_STATION && sta)
+                        rcu_read_lock();
+                        sta = ieee80211_find_sta(vif, (u8 *)bss_conf->bssid);
+
+                        if (vif->type == NL80211_IFTYPE_STATION && sta)
                                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
+                        RT_TRACE(rtlpriv, COMP_EASY_CONCURRENT, DBG_LOUD,
+                                 "send PS STATIC frame\n");
+                        if (rtlpriv->dm.supp_phymode_switch) {
+                                if (sta->ht_cap.ht_supported)
+                                        rtl_send_smps_action(hw, sta,
+                                                 IEEE80211_SMPS_STATIC);
+                        }
+                        rcu_read_unlock();
+
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                                  "BSS_CHANGED_ASSOC\n");
                 } else {
-                        if (mac->link_state == MAC80211_LINKED)
-                                rtl_lps_leave(hw);
+                        if (mac->link_state == MAC80211_LINKED) {
+                                rtlpriv->enter_ps = false;
+                                schedule_work(&rtlpriv->works.lps_change_work);
+                        }
 
+                        if (ppsc->p2p_ps_info.p2p_ps_mode > P2P_PS_NONE)
+                                rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
                         mac->link_state = MAC80211_NOLINK;
                         memset(mac->bssid, 0, 6);
-
-                        /* reset sec info */
-                        rtl_cam_reset_sec_info(hw);
-
-                        rtl_cam_reset_all_entry(hw);
                         mac->vendor = PEER_UNKNOWN;
 
+                        if (rtlpriv->dm.supp_phymode_switch) {
+                                if (rtlpriv->cfg->ops->chk_switch_dmdp)
+                                        rtlpriv->cfg->ops->chk_switch_dmdp(hw);
+                        }
+
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                                  "BSS_CHANGED_UN_ASSOC\n");
                 }
@@ -778,7 +872,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
 
                 if (changed & BSS_CHANGED_BASIC_RATES) {
-                        /* for 5G must << RATE_6M_INDEX=4,
+                        /* for 5G must << RATE_6M_INDEX = 4,
                          * because 5G have no cck rate*/
                         if (rtlhal->current_bandtype == BAND_ON_5G)
                                 basic_rates = sta->supp_rates[1] << 4;
@@ -815,6 +909,9 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 ppsc->report_linked = false;
                         }
                 }
+                if (rtlpriv->cfg->ops->bt_wifi_media_status_notify)
+                        rtlpriv->cfg->ops->bt_wifi_media_status_notify(hw,
+                                                         ppsc->report_linked);
         }
 
 out:
@@ -885,7 +982,6 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);
                 return rtl_tx_agg_stop(hw, sta, tid);
-                break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid);
@@ -894,11 +990,11 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_RX_START:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_RX_START:TID:%d\n", tid);
-                break;
+                return rtl_rx_agg_start(hw, sta, tid);
         case IEEE80211_AMPDU_RX_STOP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid);
-                break;
+                return rtl_rx_agg_stop(hw, sta, tid);
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "IEEE80211_AMPDU_ERR!!!!:\n");
@@ -912,12 +1008,20 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
-        mac->act_scanning = true;
-
         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");
+        mac->act_scanning = true;
+        if (rtlpriv->link_info.higher_busytraffic) {
+                mac->skip_scan = true;
+                return;
+        }
 
+        if (rtlpriv->dm.supp_phymode_switch) {
+                if (rtlpriv->cfg->ops->chk_switch_dmdp)
+                        rtlpriv->cfg->ops->chk_switch_dmdp(hw);
+        }
         if (mac->link_state == MAC80211_LINKED) {
-                rtl_lps_leave(hw);
+                rtlpriv->enter_ps = false;
+                schedule_work(&rtlpriv->works.lps_change_work);
                 mac->link_state = MAC80211_LINKED_SCANNING;
         } else {
                 rtl_ips_nic_on(hw);
@@ -937,6 +1041,16 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");
         mac->act_scanning = false;
+        mac->skip_scan = false;
+        if (rtlpriv->link_info.higher_busytraffic)
+                return;
+
+        /*p2p will use 1/6/11 to scan */
+        if (mac->n_channels == 3)
+                mac->p2p_in_use = true;
+        else
+                mac->p2p_in_use = false;
+        mac->n_channels = 0;
         /* Dual mac */
         rtlpriv->rtlhal.load_imrandiqk_setting_for2g = false;
 
@@ -970,6 +1084,11 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                          "not open hw encryption\n");
                 return -ENOSPC; /*User disabled HW-crypto */
         }
+        /* To support IBSS, use sw-crypto for GTK */
+        if (((vif->type == NL80211_IFTYPE_ADHOC) ||
+             (vif->type == NL80211_IFTYPE_MESH_POINT)) &&
+              !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+                return -ENOSPC;
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                  "%s hardware based encryption for keyidx: %d, mac: %pM\n",
                  cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
@@ -996,6 +1115,14 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 key_type = AESCCMP_ENCRYPTION;
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CCMP\n");
                 break;
+        case WLAN_CIPHER_SUITE_AES_CMAC:
+                /*HW doesn't support CMAC encryption, use software CMAC */
+                key_type = AESCMAC_ENCRYPTION;
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CMAC\n");
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                         "HW don't support CMAC encryption, use software CMAC\n");
+                err = -EOPNOTSUPP;
+                goto out_unlock;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "alg_err:%x!!!!\n",
                          key->cipher);
@@ -1017,13 +1144,14 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
          * 1) wep only: is just for wep enc, in this condition
          * rtlpriv->sec.pairwise_enc_algorithm == NO_ENCRYPTION
          * will be true & enable_hw_sec will be set when wep
-         * ke setting.
+         * key setting.
          * 2) wep(group) + AES(pairwise): some AP like cisco
          * may use it, in this condition enable_hw_sec will not
          * be set when wep key setting */
         /* we must reset sec_info after lingked before set key,
          * or some flag will be wrong*/
-        if (mac->opmode == NL80211_IFTYPE_AP) {
+        if (vif->type == NL80211_IFTYPE_AP ||
+            vif->type == NL80211_IFTYPE_MESH_POINT) {
                 if (!group_key || key_type == WEP40_ENCRYPTION ||
                         key_type == WEP104_ENCRYPTION) {
                         if (group_key)
@@ -1098,12 +1226,16 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 key->hw_key_idx = key_idx;
                 if (key_type == TKIP_ENCRYPTION)
                         key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+                /*use software CCMP encryption for management frames (MFP) */
+                if (key_type == AESCCMP_ENCRYPTION)
+                        key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;
                 break;
         case DISABLE_KEY:
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                          "disable key delete one entry\n");
                 /*set local buf about wep key. */
-                if (mac->opmode == NL80211_IFTYPE_AP) {
+                if (vif->type == NL80211_IFTYPE_AP ||
+                    vif->type == NL80211_IFTYPE_MESH_POINT) {
                         if (sta)
                                 rtl_cam_del_entry(hw, sta->addr);
                 }
@@ -1163,10 +1295,10 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)
 }
 
 /* this function is called by mac80211 to flush tx buffer
- * before switch channle or power save, or tx buffer packet
+ * before switch channel or power save, or tx buffer packet
  * maybe send after offchannel or rf sleep, this may cause
  * dis-association by AP */
-static void rtl_op_flush(struct ieee80211_hw *hw, bool drop)
+static void rtl_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -1180,6 +1312,7 @@ const struct ieee80211_ops rtl_ops = {
         .tx = rtl_op_tx,
         .add_interface = rtl_op_add_interface,
         .remove_interface = rtl_op_remove_interface,
+        .change_interface = rtl_op_change_interface,
         .config = rtl_op_config,
         .configure_filter = rtl_op_configure_filter,
         .sta_add = rtl_op_sta_add,
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index bdda9b2fffe1..7d52d3d7769f 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -41,7 +41,10 @@ void rtl_dbgp_flag_init(struct ieee80211_hw *hw)
             COMP_BEACON | COMP_RATE | COMP_RXDESC | COMP_DIG | COMP_TXAGC |
             COMP_POWER | COMP_POWER_TRACKING | COMP_BB_POWERSAVING | COMP_SWAS |
             COMP_RF | COMP_TURBO | COMP_RATR | COMP_CMD |
-            COMP_EFUSE | COMP_QOS | COMP_MAC80211 | COMP_REGD | COMP_CHAN;
+            COMP_EFUSE | COMP_QOS | COMP_MAC80211 | COMP_REGD | COMP_CHAN |
+            COMP_EASY_CONCURRENT | COMP_EFUSE | COMP_QOS | COMP_MAC80211 |
+            COMP_REGD | COMP_CHAN | COMP_BT_COEXIST;
+
 
         for (i = 0; i < DBGP_TYPE_MAX; i++)
                 rtlpriv->dbg.dbgp_type[i] = 0;
diff --git a/drivers/net/wireless/rtlwifi/debug.h b/drivers/net/wireless/rtlwifi/debug.h
index fd3269f47685..6d669364e3d9 100644
--- a/drivers/net/wireless/rtlwifi/debug.h
+++ b/drivers/net/wireless/rtlwifi/debug.h
@@ -115,11 +115,11 @@
 /* Define EEPROM and EFUSE  check module bit*/
 #define EEPROM_W                        BIT(0)
 #define EFUSE_PG                        BIT(1)
-#define EFUSE_READ_ALL          BIT(2)
+#define EFUSE_READ_ALL                  BIT(2)
 
 /* Define init check for module bit*/
 #define INIT_EEPROM                     BIT(0)
-#define INIT_TxPower            BIT(1)
+#define INIT_TXPOWER                    BIT(1)
 #define INIT_IQK                        BIT(2)
 #define INIT_RF                         BIT(3)
 
@@ -135,6 +135,15 @@
 #define PHY_TXPWR                       BIT(8)
 #define PHY_PWRDIFF                     BIT(9)
 
+/* Define Dynamic Mechanism check module bit --> FDM */
+#define WA_IOT                          BIT(0)
+#define DM_PWDB                         BIT(1)
+#define DM_MONITOR                      BIT(2)
+#define DM_DIG                          BIT(3)
+#define DM_EDCA_TURBO                   BIT(4)
+
+#define DM_PWDB                         BIT(1)
+
 enum dbgp_flag_e {
         FQOS = 0,
         FTX = 1,
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 8e2f9afb125a..9e3894178e77 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -35,8 +35,6 @@ static const u8 MAX_PGPKT_SIZE = 9;
 static const u8 PGPKT_DATA_SIZE = 8;
 static const int EFUSE_MAX_SIZE = 512;
 
-static const u8 EFUSE_OOB_PROTECT_BYTES = 15;
-
 static const struct efuse_map RTL8712_SDIO_EFUSE_TABLE[] = {
         {0, 0, 0, 2},
         {0, 1, 0, 2},
@@ -240,6 +238,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         u8 rtemp8[1];
         u16 efuse_addr = 0;
         u8 offset, wren;
+        u8 u1temp = 0;
         u16 i;
         u16 j;
         const u16 efuse_max_section =
@@ -285,10 +284,31 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         }
 
         while ((*rtemp8 != 0xFF) && (efuse_addr < efuse_len)) {
-                offset = ((*rtemp8 >> 4) & 0x0f);
+                /*  Check PG header for section num.  */
+                if ((*rtemp8 & 0x1F) == 0x0F) {/* extended header */
+                        u1temp = ((*rtemp8 & 0xE0) >> 5);
+                        read_efuse_byte(hw, efuse_addr, rtemp8);
 
-                if (offset < efuse_max_section) {
+                        if ((*rtemp8 & 0x0F) == 0x0F) {
+                                efuse_addr++;
+                                read_efuse_byte(hw, efuse_addr, rtemp8);
+
+                                if (*rtemp8 != 0xFF &&
+                                    (efuse_addr < efuse_len)) {
+                                        efuse_addr++;
+                                }
+                                continue;
+                        } else {
+                                offset = ((*rtemp8 & 0xF0) >> 1) | u1temp;
+                                wren = (*rtemp8 & 0x0F);
+                                efuse_addr++;
+                        }
+                } else {
+                        offset = ((*rtemp8 >> 4) & 0x0f);
                         wren = (*rtemp8 & 0x0f);
+                }
+
+                if (offset < efuse_max_section) {
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
                                 "offset-%d Worden=%x\n", offset, wren);
 
@@ -391,7 +411,8 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
         efuse_used = rtlefuse->efuse_usedbytes;
 
         if ((totalbytes + efuse_used) >=
-            (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))
+            (EFUSE_MAX_SIZE -
+             rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))
                 result = false;
 
         RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
@@ -932,8 +953,8 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         u8 badworden = 0x0F;
         static int repeat_times;
 
-        if (efuse_get_current_size(hw) >=
-            (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
+        if (efuse_get_current_size(hw) >= (EFUSE_MAX_SIZE -
+            rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
                         "efuse_pg_packet_write error\n");
                 return false;
@@ -949,8 +970,8 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
 
         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse Power ON\n");
 
-        while (continual && (efuse_addr <
-               (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) {
+        while (continual && (efuse_addr < (EFUSE_MAX_SIZE -
+               rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) {
 
                 if (write_state == PG_STATE_HEADER) {
                         badworden = 0x0F;
@@ -1003,7 +1024,8 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                 }
         }
 
-        if (efuse_addr >= (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
+        if (efuse_addr >= (EFUSE_MAX_SIZE -
+            rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
                          "efuse_addr(%#x) Out of size!!\n", efuse_addr);
         }
@@ -1102,8 +1124,11 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
         u8 tempval;
         u16 tmpV16;
 
-        if (pwrstate && (rtlhal->hw_type !=
-                HARDWARE_TYPE_RTL8192SE)) {
+        if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8188EE)
+                        rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_ACCESS],
+                                       0x69);
+
                 tmpV16 = rtl_read_word(rtlpriv,
                                        rtlpriv->cfg->maps[SYS_ISO_CTRL]);
                 if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
@@ -1153,6 +1178,10 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
                 }
 
         } else {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8188EE)
+                        rtl_write_byte(rtlpriv,
+                                       rtlpriv->cfg->maps[EFUSE_ACCESS], 0);
+
                 if (write) {
                         tempval = rtl_read_byte(rtlpriv,
                                                 rtlpriv->cfg->maps[EFUSE_TEST] +
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h
index 2bdea9a8699e..395a326acfb4 100644
--- a/drivers/net/wireless/rtlwifi/efuse.h
+++ b/drivers/net/wireless/rtlwifi/efuse.h
@@ -32,7 +32,6 @@
 
 #define EFUSE_IC_ID_OFFSET              506
 
-#define EFUSE_REAL_CONTENT_LEN          512
 #define EFUSE_MAP_LEN                   128
 #define EFUSE_MAX_WORD_UNIT             4
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 4261e8ecc4c3..999ffc12578b 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -59,7 +59,7 @@ static u8 _rtl_mac_to_hwqueue(struct ieee80211_hw *hw,
 
         if (unlikely(ieee80211_is_beacon(fc)))
                 return BEACON_QUEUE;
-        if (ieee80211_is_mgmt(fc))
+        if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
                 return MGNT_QUEUE;
         if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192SE)
                 if (ieee80211_is_nullfunc(fc))
@@ -271,9 +271,6 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        u8 pcibridge_busnum = pcipriv->ndis_adapter.pcibridge_busnum;
-        u8 pcibridge_devnum = pcipriv->ndis_adapter.pcibridge_devnum;
-        u8 pcibridge_funcnum = pcipriv->ndis_adapter.pcibridge_funcnum;
         u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor;
         u8 num4bytes = pcipriv->ndis_adapter.num4bytes;
         u16 aspmlevel;
@@ -302,8 +299,7 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
                               u_pcibridge_aspmsetting);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "PlatformEnableASPM():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n",
-                 pcibridge_busnum, pcibridge_devnum, pcibridge_funcnum,
+                 "PlatformEnableASPM(): Write reg[%x] = %x\n",
                  (pcipriv->ndis_adapter.pcibridge_pciehdr_offset + 0x10),
                  u_pcibridge_aspmsetting);
 
@@ -349,6 +345,49 @@ static bool rtl_pci_get_amd_l1_patch(struct ieee80211_hw *hw)
         return status;
 }
 
+static bool rtl_pci_check_buddy_priv(struct ieee80211_hw *hw,
+                                     struct rtl_priv **buddy_priv)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        bool find_buddy_priv = false;
+        struct rtl_priv *tpriv = NULL;
+        struct rtl_pci_priv *tpcipriv = NULL;
+
+        if (!list_empty(&rtlpriv->glb_var->glb_priv_list)) {
+                list_for_each_entry(tpriv, &rtlpriv->glb_var->glb_priv_list,
+                                    list) {
+                        if (tpriv) {
+                                tpcipriv = (struct rtl_pci_priv *)tpriv->priv;
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "pcipriv->ndis_adapter.funcnumber %x\n",
+                                        pcipriv->ndis_adapter.funcnumber);
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "tpcipriv->ndis_adapter.funcnumber %x\n",
+                                        tpcipriv->ndis_adapter.funcnumber);
+
+                                if ((pcipriv->ndis_adapter.busnumber ==
+                                     tpcipriv->ndis_adapter.busnumber) &&
+                                    (pcipriv->ndis_adapter.devnumber ==
+                                    tpcipriv->ndis_adapter.devnumber) &&
+                                    (pcipriv->ndis_adapter.funcnumber !=
+                                    tpcipriv->ndis_adapter.funcnumber)) {
+                                        find_buddy_priv = true;
+                                        break;
+                                }
+                        }
+                }
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "find_buddy_priv %d\n", find_buddy_priv);
+
+        if (find_buddy_priv)
+                *buddy_priv = tpriv;
+
+        return find_buddy_priv;
+}
+
 static void rtl_pci_get_linkcontrol_field(struct ieee80211_hw *hw)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
@@ -420,17 +459,14 @@ static void _rtl_pci_io_handler_init(struct device *dev,
 
 }
 
-static void _rtl_pci_io_handler_release(struct ieee80211_hw *hw)
-{
-}
-
 static bool _rtl_update_earlymode_info(struct ieee80211_hw *hw,
                 struct sk_buff *skb, struct rtl_tcb_desc *tcb_desc, u8 tid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        u8 additionlen = FCS_LEN;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct sk_buff *next_skb;
+        u8 additionlen = FCS_LEN;
 
         /* here open is 4, wep/tkip is 8, aes is 12*/
         if (info->control.hw_key)
@@ -455,7 +491,7 @@ static bool _rtl_update_earlymode_info(struct ieee80211_hw *hw,
                                       next_skb))
                         break;
 
-                if (tcb_desc->empkt_num >= 5)
+                if (tcb_desc->empkt_num >= rtlhal->max_earlymode_num)
                         break;
         }
         spin_unlock_bh(&rtlpriv->locks.waitq_lock);
@@ -471,11 +507,17 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct sk_buff *skb = NULL;
         struct ieee80211_tx_info *info = NULL;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         int tid;
 
         if (!rtlpriv->rtlhal.earlymode_enable)
                 return;
 
+        if (rtlpriv->dm.supp_phymode_switch &&
+            (rtlpriv->easy_concurrent_ctl.switch_in_process ||
+            (rtlpriv->buddy_priv &&
+            rtlpriv->buddy_priv->easy_concurrent_ctl.switch_in_process)))
+                return;
         /* we juse use em for BE/BK/VI/VO */
         for (tid = 7; tid >= 0; tid--) {
                 u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(tid)];
@@ -487,7 +529,8 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
 
                         spin_lock_bh(&rtlpriv->locks.waitq_lock);
                         if (!skb_queue_empty(&mac->skb_waitq[tid]) &&
-                           (ring->entries - skb_queue_len(&ring->queue) > 5)) {
+                            (ring->entries - skb_queue_len(&ring->queue) >
+                             rtlhal->max_earlymode_num)) {
                                 skb = skb_dequeue(&mac->skb_waitq[tid]);
                         } else {
                                 spin_unlock_bh(&rtlpriv->locks.waitq_lock);
@@ -525,9 +568,8 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                 u8 own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) entry, true,
                                                           HW_DESC_OWN);
 
-                /*
-                 *beacon packet will only use the first
-                 *descriptor defautly,and the own may not
+                /*beacon packet will only use the first
+                 *descriptor by defaut, and the own may not
                  *be cleared by the hardware
                  */
                 if (own)
@@ -558,8 +600,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                 }
 
                 /* for sw LPS, just after NULL skb send out, we can
-                 * sure AP kown we are sleeped, our we should not let
-                 * rf to sleep*/
+                 * sure AP knows we are sleeping, we should not let
+                 * rf sleep
+                 */
                 fc = rtl_get_fc(skb);
                 if (ieee80211_is_nullfunc(fc)) {
                         if (ieee80211_has_pm(fc)) {
@@ -569,6 +612,15 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                                 rtlpriv->psc.state_inap = false;
                         }
                 }
+                if (ieee80211_is_action(fc)) {
+                        struct ieee80211_mgmt *action_frame =
+                                (struct ieee80211_mgmt *)skb->data;
+                        if (action_frame->u.action.u.ht_smps.action ==
+                            WLAN_HT_ACTION_SMPS) {
+                                dev_kfree_skb(skb);
+                                goto tx_status_ok;
+                        }
+                }
 
                 /* update tid tx pkt num */
                 tid = rtl_get_tid(skb);
@@ -602,7 +654,8 @@ tx_status_ok:
         if (((rtlpriv->link_info.num_rx_inperiod +
                 rtlpriv->link_info.num_tx_inperiod) > 8) ||
                 (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                schedule_work(&rtlpriv->works.lps_leave_work);
+                rtlpriv->enter_ps = false;
+                schedule_work(&rtlpriv->works.lps_change_work);
         }
 }
 
@@ -637,6 +690,10 @@ static void _rtl_receive_one(struct ieee80211_hw *hw, struct sk_buff *skb,
                         rtlpriv->link_info.num_rx_inperiod++;
         }
 
+        /* static bcn for roaming */
+        rtl_beacon_statistic(hw, skb);
+        rtl_p2p_info(hw, (void *)skb->data, skb->len);
+
         /* for sw lps */
         rtl_swlps_beacon(hw, (void *)skb->data, skb->len);
         rtl_recognize_peer(hw, (void *)skb->data, skb->len);
@@ -727,9 +784,10 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 _rtl_receive_one(hw, skb, rx_status);
 
                 if (((rtlpriv->link_info.num_rx_inperiod +
-                        rtlpriv->link_info.num_tx_inperiod) > 8) ||
-                        (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                        schedule_work(&rtlpriv->works.lps_leave_work);
+                      rtlpriv->link_info.num_tx_inperiod) > 8) ||
+                      (rtlpriv->link_info.num_rx_inperiod > 2)) {
+                        rtlpriv->enter_ps = false;
+                        schedule_work(&rtlpriv->works.lps_change_work);
                 }
 
                 dev_kfree_skb_any(skb);
@@ -803,7 +861,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "beacon interrupt!\n");
         }
 
-        if (inta & rtlpriv->cfg->maps[RTL_IMR_BcnInt]) {
+        if (inta & rtlpriv->cfg->maps[RTL_IMR_BCNINT]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
                          "prepare beacon for interrupt!\n");
                 tasklet_schedule(&rtlpriv->works.irq_prepare_bcn_tasklet);
@@ -884,6 +942,16 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 _rtl_pci_rx_interrupt(hw);
         }
 
+        /*fw related*/
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8723AE) {
+                if (inta & rtlpriv->cfg->maps[RTL_IMR_C2HCMD]) {
+                        RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
+                                 "firmware interrupt!\n");
+                        queue_delayed_work(rtlpriv->works.rtl_wq,
+                                           &rtlpriv->works.fwevt_wq, 0);
+                }
+        }
+
         if (rtlpriv->rtlhal.earlymode_enable)
                 tasklet_schedule(&rtlpriv->works.irq_tasklet);
 
@@ -939,13 +1007,17 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         return;
 }
 
-static void rtl_lps_leave_work_callback(struct work_struct *work)
+static void rtl_lps_change_work_callback(struct work_struct *work)
 {
         struct rtl_works *rtlworks =
-            container_of(work, struct rtl_works, lps_leave_work);
+            container_of(work, struct rtl_works, lps_change_work);
         struct ieee80211_hw *hw = rtlworks->hw;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        rtl_lps_leave(hw);
+        if (rtlpriv->enter_ps)
+                rtl_lps_enter(hw);
+        else
+                rtl_lps_leave(hw);
 }
 
 static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)
@@ -1009,7 +1081,8 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw,
         tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet,
                      (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet,
                      (unsigned long)hw);
-        INIT_WORK(&rtlpriv->works.lps_leave_work, rtl_lps_leave_work_callback);
+        INIT_WORK(&rtlpriv->works.lps_change_work,
+                  rtl_lps_change_work_callback);
 }
 
 static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
@@ -1458,10 +1531,14 @@ static void rtl_pci_flush(struct ieee80211_hw *hw, bool drop)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u16 i = 0;
         int queue_id;
         struct rtl8192_tx_ring *ring;
 
+        if (mac->skip_scan)
+                return;
+
         for (queue_id = RTL_PCI_MAX_TX_QUEUE_COUNT - 1; queue_id >= 0;) {
                 u32 queue_len;
                 ring = &pcipriv->dev.tx_ring[queue_id];
@@ -1491,7 +1568,7 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw)
 
         synchronize_irq(rtlpci->pdev->irq);
         tasklet_kill(&rtlpriv->works.irq_tasklet);
-        cancel_work_sync(&rtlpriv->works.lps_leave_work);
+        cancel_work_sync(&rtlpriv->works.lps_change_work);
 
         flush_workqueue(rtlpriv->works.rtl_wq);
         destroy_workqueue(rtlpriv->works.rtl_wq);
@@ -1566,7 +1643,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         set_hal_stop(rtlhal);
 
         rtlpriv->cfg->ops->disable_interrupt(hw);
-        cancel_work_sync(&rtlpriv->works.lps_leave_work);
+        cancel_work_sync(&rtlpriv->works.lps_change_work);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
         while (ppsc->rfchange_inprogress) {
@@ -1673,6 +1750,10 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                          "8192D PCI-E is found - vid/did=%x/%x\n",
                          venderid, deviceid);
+        } else if (deviceid == RTL_PCI_8188EE_DID) {
+                rtlhal->hw_type = HARDWARE_TYPE_RTL8188EE;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Find adapter, Hardware type is 8188EE\n");
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Err: Unknown device - vid/did=%x/%x\n",
@@ -1704,6 +1785,9 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         pcipriv->ndis_adapter.devnumber = PCI_SLOT(pdev->devfn);
         pcipriv->ndis_adapter.funcnumber = PCI_FUNC(pdev->devfn);
 
+        /* some ARM have no bridge_pdev and will crash here
+         * so we should check if bridge_pdev is NULL
+         */
         if (bridge_pdev) {
                 /*find bridge info if available */
                 pcipriv->ndis_adapter.pcibridge_vendorid = bridge_pdev->vendor;
@@ -1758,6 +1842,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                  pcipriv->ndis_adapter.amd_l1_patch);
 
         rtl_pci_parse_configuration(pdev, hw);
+        list_add_tail(&rtlpriv->list, &rtlpriv->glb_var->glb_priv_list);
 
         return true;
 }
@@ -1804,6 +1889,7 @@ int rtl_pci_probe(struct pci_dev *pdev,
         pci_set_drvdata(pdev, hw);
 
         rtlpriv = hw->priv;
+        rtlpriv->hw = hw;
         pcipriv = (void *)rtlpriv->priv;
         pcipriv->dev.pdev = pdev;
         init_completion(&rtlpriv->firmware_loading_complete);
@@ -1812,6 +1898,7 @@ int rtl_pci_probe(struct pci_dev *pdev,
         rtlpriv->rtlhal.interface = INTF_PCI;
         rtlpriv->cfg = (struct rtl_hal_cfg *)(id->driver_data);
         rtlpriv->intf_ops = &rtl_pci_ops;
+        rtlpriv->glb_var = &global_var;
 
         /*
          *init dbgp flags before all
@@ -1916,7 +2003,6 @@ int rtl_pci_probe(struct pci_dev *pdev,
 
 fail3:
         rtl_deinit_core(hw);
-        _rtl_pci_io_handler_release(hw);
 
         if (rtlpriv->io.pci_mem_start != 0)
                 pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
@@ -1965,14 +2051,15 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
 
         rtl_pci_deinit(hw);
         rtl_deinit_core(hw);
-        _rtl_pci_io_handler_release(hw);
         rtlpriv->cfg->ops->deinit_sw_vars(hw);
 
         if (rtlpci->irq_alloc) {
+                synchronize_irq(rtlpci->pdev->irq);
                 free_irq(rtlpci->pdev->irq, hw);
                 rtlpci->irq_alloc = 0;
         }
 
+        list_del(&rtlpriv->list);
         if (rtlpriv->io.pci_mem_start != 0) {
                 pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
                 pci_release_regions(pdev);
@@ -2034,6 +2121,7 @@ struct rtl_intf_ops rtl_pci_ops = {
         .read_efuse_byte = read_efuse_byte,
         .adapter_start = rtl_pci_start,
         .adapter_stop = rtl_pci_stop,
+        .check_buddy_priv = rtl_pci_check_buddy_priv,
         .adapter_tx = rtl_pci_tx,
         .flush = rtl_pci_flush,
         .reset_trx_ring = rtl_pci_reset_trx_ring,
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 65b08f50022e..d3262ec45d23 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -94,6 +94,7 @@
 #define RTL_PCI_8192CU_DID      0x8191  /*8192ce */
 #define RTL_PCI_8192DE_DID      0x8193  /*8192de */
 #define RTL_PCI_8192DE_DID2     0x002B  /*92DE*/
+#define RTL_PCI_8188EE_DID      0x8179  /*8188ee*/
 
 /*8192 support 16 pages of IO registers*/
 #define RTL_MEM_MAPPED_IO_RANGE_8190PCI         0x1000
@@ -175,6 +176,7 @@ struct rtl_pci {
         /*irq */
         u8 irq_alloc;
         u32 irq_mask[2];
+        u32 sys_irq_mask;
 
         /*Bcn control register setting */
         u32 reg_bcn_ctrl_val;
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 13ad33e85577..884bceae38a9 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -180,6 +180,9 @@ void rtl_ips_nic_off_wq_callback(void *data)
                 return;
         }
 
+        if (mac->p2p_in_use)
+                return;
+
         if (mac->link_state > MAC80211_NOLINK)
                 return;
 
@@ -189,6 +192,9 @@ void rtl_ips_nic_off_wq_callback(void *data)
         if (rtlpriv->sec.being_setkey)
                 return;
 
+        if (rtlpriv->cfg->ops->bt_coex_off_before_lps)
+                rtlpriv->cfg->ops->bt_coex_off_before_lps(hw);
+
         if (ppsc->inactiveps) {
                 rtstate = ppsc->rfpwr_state;
 
@@ -231,6 +237,9 @@ void rtl_ips_nic_off(struct ieee80211_hw *hw)
                            &rtlpriv->works.ips_nic_off_wq, MSECS(100));
 }
 
+/* NOTICE: any opmode should exc nic_on, or disable without
+ * nic_on may something wrong, like adhoc TP
+ */
 void rtl_ips_nic_on(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -299,7 +308,7 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        u8 rpwm_val, fw_pwrmode;
+        bool enter_fwlps;
 
         if (mac->opmode == NL80211_IFTYPE_ADHOC)
                 return;
@@ -324,43 +333,31 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
          */
 
         if ((ppsc->fwctrl_lps) && ppsc->report_linked) {
-                bool fw_current_inps;
                 if (ppsc->dot11_psmode == EACTIVE) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                  "FW LPS leave ps_mode:%x\n",
                                  FW_PS_ACTIVE_MODE);
-
-                        rpwm_val = 0x0C;        /* RF on */
-                        fw_pwrmode = FW_PS_ACTIVE_MODE;
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                        &rpwm_val);
+                        enter_fwlps = false;
+                        ppsc->pwr_mode = FW_PS_ACTIVE_MODE;
+                        ppsc->smart_ps = 0;
                         rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_H2C_FW_PWRMODE,
-                                        &fw_pwrmode);
-                        fw_current_inps = false;
-
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_FW_PSMODE_STATUS,
-                                        (u8 *) (&fw_current_inps));
+                                                HW_VAR_FW_LPS_ACTION,
+                                                (u8 *)(&enter_fwlps));
+                        if (ppsc->p2p_ps_info.opp_ps)
+                                rtl_p2p_ps_cmd(hw, P2P_PS_ENABLE);
 
                 } else {
                         if (rtl_get_fwlps_doze(hw)) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                          "FW LPS enter ps_mode:%x\n",
                                          ppsc->fwctrl_psmode);
-
-                                rpwm_val = 0x02;        /* RF off */
-                                fw_current_inps = true;
+                                enter_fwlps = true;
+                                ppsc->pwr_mode = ppsc->fwctrl_psmode;
+                                ppsc->smart_ps = 2;
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                HW_VAR_FW_PSMODE_STATUS,
-                                                (u8 *) (&fw_current_inps));
-                                rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                HW_VAR_H2C_FW_PWRMODE,
-                                                &ppsc->fwctrl_psmode);
+                                                        HW_VAR_FW_LPS_ACTION,
+                                                        (u8 *)(&enter_fwlps));
 
-                                rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                HW_VAR_SET_RPWM,
-                                                &rpwm_val);
                         } else {
                                 /* Reset the power save related parameters. */
                                 ppsc->dot11_psmode = EACTIVE;
@@ -642,3 +639,286 @@ void rtl_swlps_wq_callback(void *data)
                 rtlpriv->psc.state = ps;
         }
 }
+
+static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
+                           unsigned int len)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_mgmt *mgmt = (void *)data;
+        struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info);
+        u8 *pos, *end, *ie;
+        u16 noa_len;
+        static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09};
+        u8 noa_num, index, i, noa_index = 0;
+        bool find_p2p_ie = false , find_p2p_ps_ie = false;
+        pos = (u8 *)mgmt->u.beacon.variable;
+        end = data + len;
+        ie = NULL;
+
+        while (pos + 1 < end) {
+                if (pos + 2 + pos[1] > end)
+                        return;
+
+                if (pos[0] == 221 && pos[1] > 4) {
+                        if (memcmp(&pos[2], p2p_oui_ie_type, 4) == 0) {
+                                ie = pos + 2+4;
+                                break;
+                        }
+                }
+                pos += 2 + pos[1];
+        }
+
+        if (ie == NULL)
+                return;
+        find_p2p_ie = true;
+        /*to find noa ie*/
+        while (ie + 1 < end) {
+                noa_len = READEF2BYTE(&ie[1]);
+                if (ie + 3 + ie[1] > end)
+                        return;
+
+                if (ie[0] == 12) {
+                        find_p2p_ps_ie = true;
+                        if ((noa_len - 2) % 13 != 0) {
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "P2P notice of absence: invalid length.%d\n",
+                                         noa_len);
+                                return;
+                        } else {
+                                noa_num = (noa_len - 2) / 13;
+                        }
+                        noa_index = ie[3];
+                        if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
+                            P2P_PS_NONE || noa_index != p2pinfo->noa_index) {
+                                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                                         "update NOA ie.\n");
+                                p2pinfo->noa_index = noa_index;
+                                p2pinfo->opp_ps = (ie[4] >> 7);
+                                p2pinfo->ctwindow = ie[4] & 0x7F;
+                                p2pinfo->noa_num = noa_num;
+                                index = 5;
+                                for (i = 0; i < noa_num; i++) {
+                                        p2pinfo->noa_count_type[i] =
+                                                 READEF1BYTE(ie+index);
+                                        index += 1;
+                                        p2pinfo->noa_duration[i] =
+                                                 READEF4BYTE(ie+index);
+                                        index += 4;
+                                        p2pinfo->noa_interval[i] =
+                                                 READEF4BYTE(ie+index);
+                                        index += 4;
+                                        p2pinfo->noa_start_time[i] =
+                                                 READEF4BYTE(ie+index);
+                                        index += 4;
+                                }
+
+                                if (p2pinfo->opp_ps == 1) {
+                                        p2pinfo->p2p_ps_mode = P2P_PS_CTWINDOW;
+                                        /* Driver should wait LPS entering
+                                         * CTWindow
+                                         */
+                                        if (rtlpriv->psc.fw_current_inpsmode)
+                                                rtl_p2p_ps_cmd(hw,
+                                                               P2P_PS_ENABLE);
+                                } else if (p2pinfo->noa_num > 0) {
+                                        p2pinfo->p2p_ps_mode = P2P_PS_NOA;
+                                        rtl_p2p_ps_cmd(hw, P2P_PS_ENABLE);
+                                } else if (p2pinfo->p2p_ps_mode > P2P_PS_NONE) {
+                                        rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
+                                }
+                        }
+                break;
+                }
+                ie += 3 + noa_len;
+        }
+
+        if (find_p2p_ie == true) {
+                if ((p2pinfo->p2p_ps_mode > P2P_PS_NONE) &&
+                    (find_p2p_ps_ie == false))
+                        rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
+        }
+}
+
+static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
+                              unsigned int len)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_mgmt *mgmt = (void *)data;
+        struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info);
+        u8 noa_num, index, i, noa_index = 0;
+        u8 *pos, *end, *ie;
+        u16 noa_len;
+        static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09};
+
+        pos = (u8 *)&mgmt->u.action.category;
+        end = data + len;
+        ie = NULL;
+
+        if (pos[0] == 0x7f) {
+                if (memcmp(&pos[1], p2p_oui_ie_type, 4) == 0)
+                        ie = pos + 3+4;
+        }
+
+        if (ie == NULL)
+                return;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "action frame find P2P IE.\n");
+        /*to find noa ie*/
+        while (ie + 1 < end) {
+                noa_len = READEF2BYTE(&ie[1]);
+                if (ie + 3 + ie[1] > end)
+                        return;
+
+                if (ie[0] == 12) {
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "find NOA IE.\n");
+                        RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_LOUD, "noa ie ",
+                                      ie, noa_len);
+                        if ((noa_len - 2) % 13 != 0) {
+                                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                                         "P2P notice of absence: invalid length.%d\n",
+                                         noa_len);
+                                return;
+                        } else {
+                                noa_num = (noa_len - 2) / 13;
+                        }
+                        noa_index = ie[3];
+                        if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
+                            P2P_PS_NONE || noa_index != p2pinfo->noa_index) {
+                                p2pinfo->noa_index = noa_index;
+                                p2pinfo->opp_ps = (ie[4] >> 7);
+                                p2pinfo->ctwindow = ie[4] & 0x7F;
+                                p2pinfo->noa_num = noa_num;
+                                index = 5;
+                                for (i = 0; i < noa_num; i++) {
+                                        p2pinfo->noa_count_type[i] =
+                                                         READEF1BYTE(ie+index);
+                                        index += 1;
+                                        p2pinfo->noa_duration[i] =
+                                                         READEF4BYTE(ie+index);
+                                        index += 4;
+                                        p2pinfo->noa_interval[i] =
+                                                         READEF4BYTE(ie+index);
+                                        index += 4;
+                                        p2pinfo->noa_start_time[i] =
+                                                         READEF4BYTE(ie+index);
+                                        index += 4;
+                                }
+
+                                if (p2pinfo->opp_ps == 1) {
+                                        p2pinfo->p2p_ps_mode = P2P_PS_CTWINDOW;
+                                        /* Driver should wait LPS entering
+                                         * CTWindow
+                                         */
+                                        if (rtlpriv->psc.fw_current_inpsmode)
+                                                rtl_p2p_ps_cmd(hw,
+                                                               P2P_PS_ENABLE);
+                                } else if (p2pinfo->noa_num > 0) {
+                                        p2pinfo->p2p_ps_mode = P2P_PS_NOA;
+                                        rtl_p2p_ps_cmd(hw, P2P_PS_ENABLE);
+                                } else if (p2pinfo->p2p_ps_mode > P2P_PS_NONE) {
+                                        rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
+                                }
+                        }
+                break;
+                }
+                ie += 3 + noa_len;
+        }
+}
+
+void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
+        struct rtl_p2p_ps_info  *p2pinfo = &(rtlpriv->psc.p2p_ps_info);
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, " p2p state %x\n", p2p_ps_state);
+        switch (p2p_ps_state) {
+        case P2P_PS_DISABLE:
+                p2pinfo->p2p_ps_state = p2p_ps_state;
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                 HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
+                                 (u8 *)(&p2p_ps_state));
+
+                p2pinfo->noa_index = 0;
+                p2pinfo->ctwindow = 0;
+                p2pinfo->opp_ps = 0;
+                p2pinfo->noa_num = 0;
+                p2pinfo->p2p_ps_mode = P2P_PS_NONE;
+                if (rtlps->fw_current_inpsmode == true) {
+                        if (rtlps->smart_ps == 0) {
+                                rtlps->smart_ps = 2;
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                         HW_VAR_H2C_FW_PWRMODE,
+                                         (u8 *)(&rtlps->pwr_mode));
+                        }
+                }
+                break;
+        case P2P_PS_ENABLE:
+                if (p2pinfo->p2p_ps_mode > P2P_PS_NONE) {
+                        p2pinfo->p2p_ps_state = p2p_ps_state;
+
+                        if (p2pinfo->ctwindow > 0) {
+                                if (rtlps->smart_ps != 0) {
+                                        rtlps->smart_ps = 0;
+                                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                 HW_VAR_H2C_FW_PWRMODE,
+                                                 (u8 *)(&rtlps->pwr_mode));
+                                }
+                        }
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                 HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
+                                 (u8 *)(&p2p_ps_state));
+                }
+                break;
+        case P2P_PS_SCAN:
+        case P2P_PS_SCAN_DONE:
+        case P2P_PS_ALLSTASLEEP:
+                if (p2pinfo->p2p_ps_mode > P2P_PS_NONE) {
+                        p2pinfo->p2p_ps_state = p2p_ps_state;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                 HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
+                                 (u8 *)(&p2p_ps_state));
+                }
+                break;
+        default:
+                break;
+        }
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                 "ctwindow %x oppps %x\n", p2pinfo->ctwindow, p2pinfo->opp_ps);
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                 "count %x duration %x index %x interval %x start time %x noa num %x\n",
+                 p2pinfo->noa_count_type[0], p2pinfo->noa_duration[0],
+                 p2pinfo->noa_index, p2pinfo->noa_interval[0],
+                 p2pinfo->noa_start_time[0], p2pinfo->noa_num);
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "end\n");
+}
+
+void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct ieee80211_hdr *hdr = (void *)data;
+
+        if (!mac->p2p)
+                return;
+        if (mac->link_state != MAC80211_LINKED)
+                return;
+        /* min. beacon length + FCS_LEN */
+        if (len <= 40 + FCS_LEN)
+                return;
+
+        /* and only beacons from the associated BSSID, please */
+        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+                return;
+
+        /* check if this really is a beacon */
+        if (!(ieee80211_is_beacon(hdr->frame_control) ||
+              ieee80211_is_probe_resp(hdr->frame_control) ||
+              ieee80211_is_action(hdr->frame_control)))
+                return;
+
+        if (ieee80211_is_action(hdr->frame_control))
+                rtl_p2p_action_ie(hw, data, len - FCS_LEN);
+        else
+                rtl_p2p_noa_ie(hw, data, len - FCS_LEN);
+}
diff --git a/drivers/net/wireless/rtlwifi/ps.h b/drivers/net/wireless/rtlwifi/ps.h
index 1357856998c2..4d682b753f50 100644
--- a/drivers/net/wireless/rtlwifi/ps.h
+++ b/drivers/net/wireless/rtlwifi/ps.h
@@ -47,5 +47,7 @@ void rtl_swlps_wq_callback(void *data);
 void rtl_swlps_rfon_wq_callback(void *data);
 void rtl_swlps_rf_awake(struct ieee80211_hw *hw);
 void rtl_swlps_rf_sleep(struct ieee80211_hw *hw);
+void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
+void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/rtlwifi/rtl8188ee/Makefile
new file mode 100644
index 000000000000..5b194e97f4b3
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/Makefile
@@ -0,0 +1,16 @@
+rtl8188ee-objs :=               \
+                dm.o            \
+                fw.o            \
+                hw.o            \
+                led.o           \
+                phy.o           \
+                pwrseq.o        \
+                pwrseqcmd.o     \
+                rf.o            \
+                sw.o            \
+                table.o         \
+                trx.o
+
+obj-$(CONFIG_RTL8188EE) += rtl8188ee.o
+
+ccflags-y += -Idrivers/net/wireless/rtlwifi -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
new file mode 100644
index 000000000000..c764fff9ebe6
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
@@ -0,0 +1,324 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92C_DEF_H__
+#define __RTL92C_DEF_H__
+
+#define HAL_RETRY_LIMIT_INFRA                           48
+#define HAL_RETRY_LIMIT_AP_ADHOC                        7
+
+#define RESET_DELAY_8185                                20
+
+#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
+#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
+
+#define NUM_OF_FIRMWARE_QUEUE                           10
+#define NUM_OF_PAGES_IN_FW                              0x100
+#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA                    0x0
+#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
+#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT                    0x02
+#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH                    0x02
+#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
+#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
+
+#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM                  0x026
+#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM                  0x048
+#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM                  0x048
+#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM                  0x026
+#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM                 0x00
+
+#define MAX_LINES_HWCONFIG_TXT                          1000
+#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
+
+#define SW_THREE_WIRE                                   0
+#define HW_THREE_WIRE                                   2
+
+#define BT_DEMO_BOARD                                   0
+#define BT_QA_BOARD                                     1
+#define BT_FPGA                                         2
+
+#define HAL_PRIME_CHNL_OFFSET_DONT_CARE                 0
+#define HAL_PRIME_CHNL_OFFSET_LOWER                     1
+#define HAL_PRIME_CHNL_OFFSET_UPPER                     2
+
+#define MAX_H2C_QUEUE_NUM                               10
+
+#define RX_MPDU_QUEUE                                   0
+#define RX_CMD_QUEUE                                    1
+#define RX_MAX_QUEUE                                    2
+#define AC2QUEUEID(_AC)                                 (_AC)
+
+#define C2H_RX_CMD_HDR_LEN                              8
+#define GET_C2H_CMD_CMD_LEN(__prxhdr)                   \
+        LE_BITS_TO_4BYTE((__prxhdr), 0, 16)
+#define GET_C2H_CMD_ELEMENT_ID(__prxhdr)                \
+        LE_BITS_TO_4BYTE((__prxhdr), 16, 8)
+#define GET_C2H_CMD_CMD_SEQ(__prxhdr)                   \
+        LE_BITS_TO_4BYTE((__prxhdr), 24, 7)
+#define GET_C2H_CMD_CONTINUE(__prxhdr)                  \
+        LE_BITS_TO_4BYTE((__prxhdr), 31, 1)
+#define GET_C2H_CMD_CONTENT(__prxhdr)                   \
+        ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)
+
+#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)    \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)
+#define GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)       \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)
+#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)   \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)
+#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)    \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)
+#define GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)     \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)
+#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr) \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)
+#define GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)       \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)
+#define GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)      \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)
+#define GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)       \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)
+
+#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
+
+
+/* [15:12] IC version(CUT): A-cut=0, B-cut=1, C-cut=2, D-cut=3
+ * [7] Manufacturer: TSMC=0, UMC=1
+ * [6:4] RF type: 1T1R=0, 1T2R=1, 2T2R=2
+ * [3] Chip type: TEST=0, NORMAL=1
+ * [2:0] IC type: 81xxC=0, 8723=1, 92D=2
+ */
+#define CHIP_8723                       BIT(0)
+#define CHIP_92D                        BIT(1)
+#define NORMAL_CHIP                     BIT(3)
+#define RF_TYPE_1T1R                    (~(BIT(4)|BIT(5)|BIT(6)))
+#define RF_TYPE_1T2R                    BIT(4)
+#define RF_TYPE_2T2R                    BIT(5)
+#define CHIP_VENDOR_UMC                 BIT(7)
+#define B_CUT_VERSION                   BIT(12)
+#define C_CUT_VERSION                   BIT(13)
+#define D_CUT_VERSION                   ((BIT(12)|BIT(13)))
+#define E_CUT_VERSION                   BIT(14)
+
+
+/* MASK */
+#define IC_TYPE_MASK                    (BIT(0)|BIT(1)|BIT(2))
+#define CHIP_TYPE_MASK                  BIT(3)
+#define RF_TYPE_MASK                    (BIT(4)|BIT(5)|BIT(6))
+#define MANUFACTUER_MASK                BIT(7)
+#define ROM_VERSION_MASK                (BIT(11)|BIT(10)|BIT(9)|BIT(8))
+#define CUT_VERSION_MASK                (BIT(15)|BIT(14)|BIT(13)|BIT(12))
+
+/* Get element */
+#define GET_CVID_IC_TYPE(version)       ((version) & IC_TYPE_MASK)
+#define GET_CVID_CHIP_TYPE(version)     ((version) & CHIP_TYPE_MASK)
+#define GET_CVID_RF_TYPE(version)       ((version) & RF_TYPE_MASK)
+#define GET_CVID_MANUFACTUER(version)   ((version) & MANUFACTUER_MASK)
+#define GET_CVID_ROM_VERSION(version)   ((version) & ROM_VERSION_MASK)
+#define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
+
+
+#define IS_81XXC(version)                                               \
+        ((GET_CVID_IC_TYPE(version) == 0) ? true : false)
+#define IS_8723_SERIES(version)                                         \
+        ((GET_CVID_IC_TYPE(version) == CHIP_8723) ? true : false)
+#define IS_92D(version)                                                 \
+        ((GET_CVID_IC_TYPE(version) == CHIP_92D) ? true : false)
+
+#define IS_NORMAL_CHIP(version)                                         \
+        ((GET_CVID_CHIP_TYPE(version)) ? true : false)
+#define IS_NORMAL_CHIP92D(version)                                      \
+        ((GET_CVID_CHIP_TYPE(version)) ? true : false)
+
+#define IS_1T1R(version)                                                \
+        ((GET_CVID_RF_TYPE(version)) ? false : true)
+#define IS_1T2R(version)                                                \
+        ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false)
+#define IS_2T2R(version)                                                \
+        ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false)
+#define IS_CHIP_VENDOR_UMC(version)                                     \
+        ((GET_CVID_MANUFACTUER(version)) ? true : false)
+
+#define IS_92C_SERIAL(version)                                          \
+        ((IS_81XXC(version) && IS_2T2R(version)) ? true : false)
+#define IS_81xxC_VENDOR_UMC_A_CUT(version)                              \
+        (IS_81XXC(version) ? ((IS_CHIP_VENDOR_UMC(version)) ?           \
+         ((GET_CVID_CUT_VERSION(version)) ? false : true) : false) : false)
+#define IS_81xxC_VENDOR_UMC_B_CUT(version)                              \
+        (IS_81XXC(version) ? (IS_CHIP_VENDOR_UMC(version) ?             \
+        ((GET_CVID_CUT_VERSION(version) == B_CUT_VERSION) ? true        \
+        : false) : false) : false)
+
+enum version_8188e {
+        VERSION_TEST_CHIP_88E = 0x00,
+        VERSION_NORMAL_CHIP_88E = 0x01,
+        VERSION_UNKNOWN = 0xFF,
+};
+
+enum rx_packet_type {
+        NORMAL_RX,
+        TX_REPORT1,
+        TX_REPORT2,
+        HIS_REPORT,
+};
+
+enum rtl819x_loopback_e {
+        RTL819X_NO_LOOPBACK = 0,
+        RTL819X_MAC_LOOPBACK = 1,
+        RTL819X_DMA_LOOPBACK = 2,
+        RTL819X_CCK_LOOPBACK = 3,
+};
+
+enum rf_optype {
+        RF_OP_BY_SW_3WIRE = 0,
+        RF_OP_BY_FW,
+        RF_OP_MAX
+};
+
+enum rf_power_state {
+        RF_ON,
+        RF_OFF,
+        RF_SLEEP,
+        RF_SHUT_DOWN,
+};
+
+enum power_save_mode {
+        POWER_SAVE_MODE_ACTIVE,
+        POWER_SAVE_MODE_SAVE,
+};
+
+enum power_polocy_config {
+        POWERCFG_MAX_POWER_SAVINGS,
+        POWERCFG_GLOBAL_POWER_SAVINGS,
+        POWERCFG_LOCAL_POWER_SAVINGS,
+        POWERCFG_LENOVO,
+};
+
+enum interface_select_pci {
+        INTF_SEL1_MINICARD,
+        INTF_SEL0_PCIE,
+        INTF_SEL2_RSV,
+        INTF_SEL3_RSV,
+};
+
+enum hal_fw_c2h_cmd_id {
+        HAL_FW_C2H_CMD_Read_MACREG,
+        HAL_FW_C2H_CMD_Read_BBREG,
+        HAL_FW_C2H_CMD_Read_RFREG,
+        HAL_FW_C2H_CMD_Read_EEPROM,
+        HAL_FW_C2H_CMD_Read_EFUSE,
+        HAL_FW_C2H_CMD_Read_CAM,
+        HAL_FW_C2H_CMD_Get_BasicRate,
+        HAL_FW_C2H_CMD_Get_DataRate,
+        HAL_FW_C2H_CMD_Survey,
+        HAL_FW_C2H_CMD_SurveyDone,
+        HAL_FW_C2H_CMD_JoinBss,
+        HAL_FW_C2H_CMD_AddSTA,
+        HAL_FW_C2H_CMD_DelSTA,
+        HAL_FW_C2H_CMD_AtimDone,
+        HAL_FW_C2H_CMD_TX_Report,
+        HAL_FW_C2H_CMD_CCX_Report,
+        HAL_FW_C2H_CMD_DTM_Report,
+        HAL_FW_C2H_CMD_TX_Rate_Statistics,
+        HAL_FW_C2H_CMD_C2HLBK,
+        HAL_FW_C2H_CMD_C2HDBG,
+        HAL_FW_C2H_CMD_C2HFEEDBACK,
+        HAL_FW_C2H_CMD_MAX
+};
+
+enum wake_on_wlan_mode {
+        ewowlandisable,
+        ewakeonmagicpacketonly,
+        ewakeonpatternmatchonly,
+        ewakeonbothtypepacket
+};
+
+enum rtl_desc_qsel {
+        QSLT_BK = 0x2,
+        QSLT_BE = 0x0,
+        QSLT_VI = 0x5,
+        QSLT_VO = 0x7,
+        QSLT_BEACON = 0x10,
+        QSLT_HIGH = 0x11,
+        QSLT_MGNT = 0x12,
+        QSLT_CMD = 0x13,
+};
+
+enum rtl_desc92c_rate {
+        DESC92C_RATE1M = 0x00,
+        DESC92C_RATE2M = 0x01,
+        DESC92C_RATE5_5M = 0x02,
+        DESC92C_RATE11M = 0x03,
+
+        DESC92C_RATE6M = 0x04,
+        DESC92C_RATE9M = 0x05,
+        DESC92C_RATE12M = 0x06,
+        DESC92C_RATE18M = 0x07,
+        DESC92C_RATE24M = 0x08,
+        DESC92C_RATE36M = 0x09,
+        DESC92C_RATE48M = 0x0a,
+        DESC92C_RATE54M = 0x0b,
+
+        DESC92C_RATEMCS0 = 0x0c,
+        DESC92C_RATEMCS1 = 0x0d,
+        DESC92C_RATEMCS2 = 0x0e,
+        DESC92C_RATEMCS3 = 0x0f,
+        DESC92C_RATEMCS4 = 0x10,
+        DESC92C_RATEMCS5 = 0x11,
+        DESC92C_RATEMCS6 = 0x12,
+        DESC92C_RATEMCS7 = 0x13,
+        DESC92C_RATEMCS8 = 0x14,
+        DESC92C_RATEMCS9 = 0x15,
+        DESC92C_RATEMCS10 = 0x16,
+        DESC92C_RATEMCS11 = 0x17,
+        DESC92C_RATEMCS12 = 0x18,
+        DESC92C_RATEMCS13 = 0x19,
+        DESC92C_RATEMCS14 = 0x1a,
+        DESC92C_RATEMCS15 = 0x1b,
+        DESC92C_RATEMCS15_SG = 0x1c,
+        DESC92C_RATEMCS32 = 0x20,
+};
+
+struct phy_sts_cck_8192s_t {
+        u8 adc_pwdb_X[4];
+        u8 sq_rpt;
+        u8 cck_agc_rpt;
+};
+
+struct h2c_cmd_8192c {
+        u8 element_id;
+        u32 cmd_len;
+        u8 *p_cmdbuffer;
+};
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
new file mode 100644
index 000000000000..21a5cf060677
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
@@ -0,0 +1,1794 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../base.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "trx.h"
+
+static const u32 ofdmswing_table[OFDM_TABLE_SIZE] = {
+        0x7f8001fe,             /* 0, +6.0dB */
+        0x788001e2,             /* 1, +5.5dB */
+        0x71c001c7,             /* 2, +5.0dB */
+        0x6b8001ae,             /* 3, +4.5dB */
+        0x65400195,             /* 4, +4.0dB */
+        0x5fc0017f,             /* 5, +3.5dB */
+        0x5a400169,             /* 6, +3.0dB */
+        0x55400155,             /* 7, +2.5dB */
+        0x50800142,             /* 8, +2.0dB */
+        0x4c000130,             /* 9, +1.5dB */
+        0x47c0011f,             /* 10, +1.0dB */
+        0x43c0010f,             /* 11, +0.5dB */
+        0x40000100,             /* 12, +0dB */
+        0x3c8000f2,             /* 13, -0.5dB */
+        0x390000e4,             /* 14, -1.0dB */
+        0x35c000d7,             /* 15, -1.5dB */
+        0x32c000cb,             /* 16, -2.0dB */
+        0x300000c0,             /* 17, -2.5dB */
+        0x2d4000b5,             /* 18, -3.0dB */
+        0x2ac000ab,             /* 19, -3.5dB */
+        0x288000a2,             /* 20, -4.0dB */
+        0x26000098,             /* 21, -4.5dB */
+        0x24000090,             /* 22, -5.0dB */
+        0x22000088,             /* 23, -5.5dB */
+        0x20000080,             /* 24, -6.0dB */
+        0x1e400079,             /* 25, -6.5dB */
+        0x1c800072,             /* 26, -7.0dB */
+        0x1b00006c,             /* 27. -7.5dB */
+        0x19800066,             /* 28, -8.0dB */
+        0x18000060,             /* 29, -8.5dB */
+        0x16c0005b,             /* 30, -9.0dB */
+        0x15800056,             /* 31, -9.5dB */
+        0x14400051,             /* 32, -10.0dB */
+        0x1300004c,             /* 33, -10.5dB */
+        0x12000048,             /* 34, -11.0dB */
+        0x11000044,             /* 35, -11.5dB */
+        0x10000040,             /* 36, -12.0dB */
+        0x0f00003c,             /* 37, -12.5dB */
+        0x0e400039,             /* 38, -13.0dB */
+        0x0d800036,             /* 39, -13.5dB */
+        0x0cc00033,             /* 40, -14.0dB */
+        0x0c000030,             /* 41, -14.5dB */
+        0x0b40002d,             /* 42, -15.0dB */
+};
+
+static const u8 cck_tbl_ch1_13[CCK_TABLE_SIZE][8] = {
+        {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04},       /* 0, +0dB */
+        {0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04},       /* 1, -0.5dB */
+        {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03},       /* 2, -1.0dB */
+        {0x2d, 0x2d, 0x27, 0x1f, 0x18, 0x0f, 0x08, 0x03},       /* 3, -1.5dB */
+        {0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03},       /* 4, -2.0dB */
+        {0x28, 0x28, 0x22, 0x1c, 0x15, 0x0d, 0x07, 0x03},       /* 5, -2.5dB */
+        {0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03},       /* 6, -3.0dB */
+        {0x24, 0x23, 0x1f, 0x19, 0x13, 0x0c, 0x06, 0x03},       /* 7, -3.5dB */
+        {0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02},       /* 8, -4.0dB */
+        {0x20, 0x20, 0x1b, 0x16, 0x11, 0x08, 0x05, 0x02},       /* 9, -4.5dB */
+        {0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02},       /* 10, -5.0dB */
+        {0x1d, 0x1c, 0x18, 0x14, 0x0f, 0x0a, 0x05, 0x02},       /* 11, -5.5dB */
+        {0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02},       /* 12, -6.0dB */
+        {0x1a, 0x19, 0x16, 0x12, 0x0d, 0x09, 0x04, 0x02},       /* 13, -6.5dB */
+        {0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02},       /* 14, -7.0dB */
+        {0x17, 0x16, 0x13, 0x10, 0x0c, 0x08, 0x04, 0x02},       /* 15, -7.5dB */
+        {0x16, 0x15, 0x12, 0x0f, 0x0b, 0x07, 0x04, 0x01},       /* 16, -8.0dB */
+        {0x14, 0x14, 0x11, 0x0e, 0x0b, 0x07, 0x03, 0x02},       /* 17, -8.5dB */
+        {0x13, 0x13, 0x10, 0x0d, 0x0a, 0x06, 0x03, 0x01},       /* 18, -9.0dB */
+        {0x12, 0x12, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01},       /* 19, -9.5dB */
+        {0x11, 0x11, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01},       /* 20, -10.0dB*/
+        {0x10, 0x10, 0x0e, 0x0b, 0x08, 0x05, 0x03, 0x01},       /* 21, -10.5dB*/
+        {0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01},       /* 22, -11.0dB*/
+        {0x0e, 0x0e, 0x0c, 0x0a, 0x08, 0x05, 0x02, 0x01},       /* 23, -11.5dB*/
+        {0x0d, 0x0d, 0x0c, 0x0a, 0x07, 0x05, 0x02, 0x01},       /* 24, -12.0dB*/
+        {0x0d, 0x0c, 0x0b, 0x09, 0x07, 0x04, 0x02, 0x01},       /* 25, -12.5dB*/
+        {0x0c, 0x0c, 0x0a, 0x09, 0x06, 0x04, 0x02, 0x01},       /* 26, -13.0dB*/
+        {0x0b, 0x0b, 0x0a, 0x08, 0x06, 0x04, 0x02, 0x01},       /* 27, -13.5dB*/
+        {0x0b, 0x0a, 0x09, 0x08, 0x06, 0x04, 0x02, 0x01},       /* 28, -14.0dB*/
+        {0x0a, 0x0a, 0x09, 0x07, 0x05, 0x03, 0x02, 0x01},       /* 29, -14.5dB*/
+        {0x0a, 0x09, 0x08, 0x07, 0x05, 0x03, 0x02, 0x01},       /* 30, -15.0dB*/
+        {0x09, 0x09, 0x08, 0x06, 0x05, 0x03, 0x01, 0x01},       /* 31, -15.5dB*/
+        {0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01}        /* 32, -16.0dB*/
+};
+
+static const u8 cck_tbl_ch14[CCK_TABLE_SIZE][8] = {
+        {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00},       /* 0, +0dB */
+        {0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00},       /* 1, -0.5dB */
+        {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00},       /* 2, -1.0dB */
+        {0x2d, 0x2d, 0x17, 0x17, 0x00, 0x00, 0x00, 0x00},       /* 3, -1.5dB */
+        {0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00},       /* 4, -2.0dB */
+        {0x28, 0x28, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00},       /* 5, -2.5dB */
+        {0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00},       /* 6, -3.0dB */
+        {0x24, 0x23, 0x1f, 0x12, 0x00, 0x00, 0x00, 0x00},       /* 7, -3.5dB */
+        {0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00},       /* 8, -4.0dB */
+        {0x20, 0x20, 0x1b, 0x10, 0x00, 0x00, 0x00, 0x00},       /* 9, -4.5dB */
+        {0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00},       /* 10, -5.0dB */
+        {0x1d, 0x1c, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},       /* 11, -5.5dB */
+        {0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00},       /* 12, -6.0dB */
+        {0x1a, 0x19, 0x16, 0x0d, 0x00, 0x00, 0x00, 0x00},       /* 13, -6.5dB */
+        {0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00},       /* 14, -7.0dB */
+        {0x17, 0x16, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x00},       /* 15, -7.5dB */
+        {0x16, 0x15, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00},       /* 16, -8.0dB */
+        {0x14, 0x14, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x00},       /* 17, -8.5dB */
+        {0x13, 0x13, 0x10, 0x0a, 0x00, 0x00, 0x00, 0x00},       /* 18, -9.0dB */
+        {0x12, 0x12, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00},       /* 19, -9.5dB */
+        {0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00},       /* 20, -10.0dB*/
+        {0x10, 0x10, 0x0e, 0x08, 0x00, 0x00, 0x00, 0x00},       /* 21, -10.5dB*/
+        {0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00},       /* 22, -11.0dB*/
+        {0x0e, 0x0e, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00},       /* 23, -11.5dB*/
+        {0x0d, 0x0d, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00},       /* 24, -12.0dB*/
+        {0x0d, 0x0c, 0x0b, 0x06, 0x00, 0x00, 0x00, 0x00},       /* 25, -12.5dB*/
+        {0x0c, 0x0c, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00},       /* 26, -13.0dB*/
+        {0x0b, 0x0b, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00},       /* 27, -13.5dB*/
+        {0x0b, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00},       /* 28, -14.0dB*/
+        {0x0a, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00},       /* 29, -14.5dB*/
+        {0x0a, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00},       /* 30, -15.0dB*/
+        {0x09, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00},       /* 31, -15.5dB*/
+        {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00}        /* 32, -16.0dB*/
+};
+
+#define CAL_SWING_OFF(_off, _dir, _size, _del)                          \
+        do {                                                            \
+                for (_off = 0; _off < _size; _off++) {                  \
+                        if (_del < thermal_threshold[_dir][_off]) {     \
+                                if (_off != 0)                          \
+                                        _off--;                         \
+                                break;                                  \
+                        }                                               \
+                }                                                       \
+                if (_off >= _size)                                      \
+                        _off = _size - 1;                               \
+        } while (0)
+
+static void rtl88e_set_iqk_matrix(struct ieee80211_hw *hw,
+                                  u8 ofdm_index, u8 rfpath,
+                                  long iqk_result_x, long iqk_result_y)
+{
+        long ele_a = 0, ele_d, ele_c = 0, value32;
+
+        ele_d = (ofdmswing_table[ofdm_index] & 0xFFC00000)>>22;
+
+        if (iqk_result_x != 0) {
+                if ((iqk_result_x & 0x00000200) != 0)
+                        iqk_result_x = iqk_result_x | 0xFFFFFC00;
+                ele_a = ((iqk_result_x * ele_d)>>8)&0x000003FF;
+
+                if ((iqk_result_y & 0x00000200) != 0)
+                        iqk_result_y = iqk_result_y | 0xFFFFFC00;
+                ele_c = ((iqk_result_y * ele_d)>>8)&0x000003FF;
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                        value32 = (ele_d << 22)|((ele_c & 0x3F)<<16) | ele_a;
+                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, MASKDWORD,
+                                      value32);
+                        value32 = (ele_c & 0x000003C0) >> 6;
+                        rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, value32);
+                        value32 = ((iqk_result_x * ele_d) >> 7) & 0x01;
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(24), value32);
+                        break;
+                case RF90_PATH_B:
+                        value32 = (ele_d << 22)|((ele_c & 0x3F)<<16) | ele_a;
+                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBAL,
+                                      MASKDWORD, value32);
+                        value32 = (ele_c & 0x000003C0) >> 6;
+                        rtl_set_bbreg(hw, ROFDM0_XDTXAFE, MASKH4BITS, value32);
+                        value32 = ((iqk_result_x * ele_d) >> 7) & 0x01;
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(28), value32);
+                        break;
+                default:
+                        break;
+                }
+        } else {
+                switch (rfpath) {
+                case RF90_PATH_A:
+                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, MASKDWORD,
+                                      ofdmswing_table[ofdm_index]);
+                        rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, 0x00);
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(24), 0x00);
+                        break;
+                case RF90_PATH_B:
+                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBAL, MASKDWORD,
+                                      ofdmswing_table[ofdm_index]);
+                        rtl_set_bbreg(hw, ROFDM0_XDTXAFE, MASKH4BITS, 0x00);
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(28), 0x00);
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+void rtl88e_dm_txpower_track_adjust(struct ieee80211_hw *hw,
+        u8 type, u8 *pdirection, u32 *poutwrite_val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        u8 pwr_val = 0;
+        u8 cck_base = rtldm->swing_idx_cck_base;
+        u8 cck_val = rtldm->swing_idx_cck;
+        u8 ofdm_base = rtldm->swing_idx_ofdm_base;
+        u8 ofdm_val = rtlpriv->dm.swing_idx_ofdm[RF90_PATH_A];
+
+        if (type == 0) {
+                if (ofdm_val <= ofdm_base) {
+                        *pdirection = 1;
+                        pwr_val = ofdm_base - ofdm_val;
+                } else {
+                        *pdirection = 2;
+                        pwr_val = ofdm_val - ofdm_base;
+                }
+        } else if (type == 1) {
+                if (cck_val <= cck_base) {
+                        *pdirection = 1;
+                        pwr_val = cck_base - cck_val;
+                } else {
+                        *pdirection = 2;
+                        pwr_val = cck_val - cck_base;
+                }
+        }
+
+        if (pwr_val >= TXPWRTRACK_MAX_IDX && (*pdirection == 1))
+                pwr_val = TXPWRTRACK_MAX_IDX;
+
+        *poutwrite_val = pwr_val | (pwr_val << 8) | (pwr_val << 16) |
+                         (pwr_val << 24);
+}
+
+
+static void rtl88e_chk_tx_track(struct ieee80211_hw *hw,
+                                enum pwr_track_control_method method,
+                                u8 rfpath, u8 index)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        int jj = rtldm->swing_idx_cck;
+        int i;
+
+        if (method == TXAGC) {
+                if (rtldm->swing_flag_ofdm == true ||
+                    rtldm->swing_flag_cck == true) {
+                        u8 chan = rtlphy->current_channel;
+                        rtl88e_phy_set_txpower_level(hw, chan);
+                        rtldm->swing_flag_ofdm = false;
+                        rtldm->swing_flag_cck = false;
+                }
+        } else if (method == BBSWING) {
+                if (!rtldm->cck_inch14) {
+                        for (i = 0; i < 8; i++)
+                                rtl_write_byte(rtlpriv, 0xa22 + i,
+                                               cck_tbl_ch1_13[jj][i]);
+                } else {
+                        for (i = 0; i < 8; i++)
+                                rtl_write_byte(rtlpriv, 0xa22 + i,
+                                               cck_tbl_ch14[jj][i]);
+                }
+
+                if (rfpath == RF90_PATH_A) {
+                        long x = rtlphy->iqk_matrix[index].value[0][0];
+                        long y = rtlphy->iqk_matrix[index].value[0][1];
+                        u8 indx = rtldm->swing_idx_ofdm[rfpath];
+                        rtl88e_set_iqk_matrix(hw, indx, rfpath, x, y);
+                } else if (rfpath == RF90_PATH_B) {
+                        u8 indx = rtldm->swing_idx_ofdm[rfpath];
+                        long x = rtlphy->iqk_matrix[indx].value[0][4];
+                        long y = rtlphy->iqk_matrix[indx].value[0][5];
+                        rtl88e_set_iqk_matrix(hw, indx, rfpath, x, y);
+                }
+        } else {
+                return;
+        }
+}
+
+static void rtl88e_dm_diginit(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+
+        dm_dig->dig_enable_flag = true;
+        dm_dig->cur_igvalue = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f);
+        dm_dig->pre_igvalue = 0;
+        dm_dig->cursta_cstate = DIG_STA_DISCONNECT;
+        dm_dig->presta_cstate = DIG_STA_DISCONNECT;
+        dm_dig->curmultista_cstate = DIG_MULTISTA_DISCONNECT;
+        dm_dig->rssi_lowthresh = DM_DIG_THRESH_LOW;
+        dm_dig->rssi_highthresh = DM_DIG_THRESH_HIGH;
+        dm_dig->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+        dm_dig->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+        dm_dig->rx_gain_max = DM_DIG_MAX;
+        dm_dig->rx_gain_min = DM_DIG_MIN;
+        dm_dig->back_val = DM_DIG_BACKOFF_DEFAULT;
+        dm_dig->back_range_max = DM_DIG_BACKOFF_MAX;
+        dm_dig->back_range_min = DM_DIG_BACKOFF_MIN;
+        dm_dig->pre_cck_cca_thres = 0xff;
+        dm_dig->cur_cck_cca_thres = 0x83;
+        dm_dig->forbidden_igi = DM_DIG_MIN;
+        dm_dig->large_fa_hit = 0;
+        dm_dig->recover_cnt = 0;
+        dm_dig->dig_min_0 = 0x25;
+        dm_dig->dig_min_1 = 0x25;
+        dm_dig->media_connect_0 = false;
+        dm_dig->media_connect_1 = false;
+        rtlpriv->dm.dm_initialgain_enable = true;
+}
+
+static u8 rtl88e_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        long rssi_val_min = 0;
+
+        if ((dm_dig->curmultista_cstate == DIG_MULTISTA_CONNECT) &&
+            (dm_dig->cursta_cstate == DIG_STA_CONNECT)) {
+                if (rtlpriv->dm.entry_min_undec_sm_pwdb != 0)
+                        rssi_val_min =
+                            (rtlpriv->dm.entry_min_undec_sm_pwdb >
+                            rtlpriv->dm.undec_sm_pwdb) ?
+                            rtlpriv->dm.undec_sm_pwdb :
+                            rtlpriv->dm.entry_min_undec_sm_pwdb;
+                else
+                        rssi_val_min = rtlpriv->dm.undec_sm_pwdb;
+        } else if (dm_dig->cursta_cstate == DIG_STA_CONNECT ||
+                   dm_dig->cursta_cstate == DIG_STA_BEFORE_CONNECT) {
+                rssi_val_min = rtlpriv->dm.undec_sm_pwdb;
+        } else if (dm_dig->curmultista_cstate ==
+                DIG_MULTISTA_CONNECT) {
+                rssi_val_min = rtlpriv->dm.entry_min_undec_sm_pwdb;
+        }
+        return (u8)rssi_val_min;
+}
+
+static void rtl88e_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
+{
+        u32 ret_value;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct false_alarm_statistics *alm_cnt = &(rtlpriv->falsealm_cnt);
+
+        rtl_set_bbreg(hw, ROFDM0_LSTF, BIT(31), 1);
+        rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 1);
+
+        ret_value = rtl_get_bbreg(hw, ROFDM0_FRAMESYNC, MASKDWORD);
+        alm_cnt->cnt_fast_fsync_fail = (ret_value&0xffff);
+        alm_cnt->cnt_sb_search_fail = ((ret_value&0xffff0000)>>16);
+
+        ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER1, MASKDWORD);
+        alm_cnt->cnt_ofdm_cca = (ret_value&0xffff);
+        alm_cnt->cnt_parity_fail = ((ret_value & 0xffff0000) >> 16);
+
+        ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER2, MASKDWORD);
+        alm_cnt->cnt_rate_illegal = (ret_value & 0xffff);
+        alm_cnt->cnt_crc8_fail = ((ret_value & 0xffff0000) >> 16);
+
+        ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER3, MASKDWORD);
+        alm_cnt->cnt_mcs_fail = (ret_value & 0xffff);
+        alm_cnt->cnt_ofdm_fail = alm_cnt->cnt_parity_fail +
+                                 alm_cnt->cnt_rate_illegal +
+                                 alm_cnt->cnt_crc8_fail +
+                                 alm_cnt->cnt_mcs_fail +
+                                 alm_cnt->cnt_fast_fsync_fail +
+                                 alm_cnt->cnt_sb_search_fail;
+
+        ret_value = rtl_get_bbreg(hw, REG_SC_CNT, MASKDWORD);
+        alm_cnt->cnt_bw_lsc = (ret_value & 0xffff);
+        alm_cnt->cnt_bw_usc = ((ret_value & 0xffff0000) >> 16);
+
+        rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(12), 1);
+        rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(14), 1);
+
+        ret_value = rtl_get_bbreg(hw, RCCK0_FACOUNTERLOWER, MASKBYTE0);
+        alm_cnt->cnt_cck_fail = ret_value;
+
+        ret_value = rtl_get_bbreg(hw, RCCK0_FACOUNTERUPPER, MASKBYTE3);
+        alm_cnt->cnt_cck_fail += (ret_value & 0xff) << 8;
+
+        ret_value = rtl_get_bbreg(hw, RCCK0_CCA_CNT, MASKDWORD);
+        alm_cnt->cnt_cck_cca = ((ret_value & 0xff) << 8) |
+                                ((ret_value&0xFF00)>>8);
+
+        alm_cnt->cnt_all = alm_cnt->cnt_fast_fsync_fail +
+                           alm_cnt->cnt_sb_search_fail +
+                           alm_cnt->cnt_parity_fail +
+                           alm_cnt->cnt_rate_illegal +
+                           alm_cnt->cnt_crc8_fail +
+                           alm_cnt->cnt_mcs_fail +
+                           alm_cnt->cnt_cck_fail;
+        alm_cnt->cnt_cca_all = alm_cnt->cnt_ofdm_cca + alm_cnt->cnt_cck_cca;
+
+        rtl_set_bbreg(hw, ROFDM0_TRSWISOLATION, BIT(31), 1);
+        rtl_set_bbreg(hw, ROFDM0_TRSWISOLATION, BIT(31), 0);
+        rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(27), 1);
+        rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(27), 0);
+        rtl_set_bbreg(hw, ROFDM0_LSTF, BIT(31), 0);
+        rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 0);
+        rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(13)|BIT(12), 0);
+        rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(13)|BIT(12), 2);
+        rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(15)|BIT(14), 0);
+        rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(15)|BIT(14), 2);
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, "
+                 "cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                 alm_cnt->cnt_parity_fail,
+                 alm_cnt->cnt_rate_illegal,
+                 alm_cnt->cnt_crc8_fail, alm_cnt->cnt_mcs_fail);
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
+                 "cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
+                 alm_cnt->cnt_ofdm_fail,
+                 alm_cnt->cnt_cck_fail, alm_cnt->cnt_all);
+}
+
+static void rtl88e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        u8 cur_cck_cca_thresh;
+
+        if (dm_dig->cursta_cstate == DIG_STA_CONNECT) {
+                dm_dig->rssi_val_min = rtl88e_dm_initial_gain_min_pwdb(hw);
+                if (dm_dig->rssi_val_min > 25) {
+                        cur_cck_cca_thresh = 0xcd;
+                } else if ((dm_dig->rssi_val_min <= 25) &&
+                           (dm_dig->rssi_val_min > 10)) {
+                        cur_cck_cca_thresh = 0x83;
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
+                                cur_cck_cca_thresh = 0x83;
+                        else
+                                cur_cck_cca_thresh = 0x40;
+                }
+
+        } else {
+                if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
+                        cur_cck_cca_thresh = 0x83;
+                else
+                        cur_cck_cca_thresh = 0x40;
+        }
+
+        if (dm_dig->cur_cck_cca_thres != cur_cck_cca_thresh)
+                rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, cur_cck_cca_thresh);
+
+        dm_dig->cur_cck_cca_thres = cur_cck_cca_thresh;
+        dm_dig->pre_cck_cca_thres = dm_dig->cur_cck_cca_thres;
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
+                 "CCK cca thresh hold =%x\n", dm_dig->cur_cck_cca_thres);
+}
+
+static void rtl88e_dm_dig(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 dig_min, dig_maxofmin;
+        bool bfirstconnect;
+        u8 dm_dig_max, dm_dig_min;
+        u8 current_igi = dm_dig->cur_igvalue;
+
+        if (rtlpriv->dm.dm_initialgain_enable == false)
+                return;
+        if (dm_dig->dig_enable_flag == false)
+                return;
+        if (mac->act_scanning == true)
+                return;
+
+        if (mac->link_state >= MAC80211_LINKED)
+                dm_dig->cursta_cstate = DIG_STA_CONNECT;
+        else
+                dm_dig->cursta_cstate = DIG_STA_DISCONNECT;
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP ||
+            rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
+                dm_dig->cursta_cstate = DIG_STA_DISCONNECT;
+
+        dm_dig_max = DM_DIG_MAX;
+        dm_dig_min = DM_DIG_MIN;
+        dig_maxofmin = DM_DIG_MAX_AP;
+        dig_min = dm_dig->dig_min_0;
+        bfirstconnect = ((mac->link_state >= MAC80211_LINKED) ? true : false) &&
+                         (dm_dig->media_connect_0 == false);
+
+        dm_dig->rssi_val_min =
+                rtl88e_dm_initial_gain_min_pwdb(hw);
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                if ((dm_dig->rssi_val_min + 20) > dm_dig_max)
+                        dm_dig->rx_gain_max = dm_dig_max;
+                else if ((dm_dig->rssi_val_min + 20) < dm_dig_min)
+                        dm_dig->rx_gain_max = dm_dig_min;
+                else
+                        dm_dig->rx_gain_max = dm_dig->rssi_val_min + 20;
+
+                if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) {
+                        dig_min  = dm_dig->antdiv_rssi_max;
+                } else {
+                        if (dm_dig->rssi_val_min < dm_dig_min)
+                                dig_min = dm_dig_min;
+                        else if (dm_dig->rssi_val_min < dig_maxofmin)
+                                dig_min = dig_maxofmin;
+                        else
+                                dig_min = dm_dig->rssi_val_min;
+                }
+        } else {
+                dm_dig->rx_gain_max = dm_dig_max;
+                dig_min = dm_dig_min;
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "no link\n");
+        }
+
+        if (rtlpriv->falsealm_cnt.cnt_all > 10000) {
+                dm_dig->large_fa_hit++;
+                if (dm_dig->forbidden_igi < current_igi) {
+                        dm_dig->forbidden_igi = current_igi;
+                        dm_dig->large_fa_hit = 1;
+                }
+
+                if (dm_dig->large_fa_hit >= 3) {
+                        if ((dm_dig->forbidden_igi + 1) > dm_dig->rx_gain_max)
+                                dm_dig->rx_gain_min = dm_dig->rx_gain_max;
+                        else
+                                dm_dig->rx_gain_min = dm_dig->forbidden_igi + 1;
+                        dm_dig->recover_cnt = 3600;
+                }
+        } else {
+                if (dm_dig->recover_cnt != 0) {
+                        dm_dig->recover_cnt--;
+                } else {
+                        if (dm_dig->large_fa_hit == 0) {
+                                if ((dm_dig->forbidden_igi - 1) < dig_min) {
+                                        dm_dig->forbidden_igi = dig_min;
+                                        dm_dig->rx_gain_min = dig_min;
+                                } else {
+                                        dm_dig->forbidden_igi--;
+                                        dm_dig->rx_gain_min =
+                                                 dm_dig->forbidden_igi + 1;
+                                }
+                        } else if (dm_dig->large_fa_hit == 3) {
+                                dm_dig->large_fa_hit = 0;
+                        }
+                }
+        }
+
+        if (dm_dig->cursta_cstate == DIG_STA_CONNECT) {
+                if (bfirstconnect) {
+                        current_igi = dm_dig->rssi_val_min;
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH2)
+                                current_igi += 2;
+                        else if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH1)
+                                current_igi++;
+                        else if (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH0)
+                                current_igi--;
+                }
+        } else {
+                if (rtlpriv->falsealm_cnt.cnt_all > 10000)
+                        current_igi += 2;
+                else if (rtlpriv->falsealm_cnt.cnt_all > 8000)
+                        current_igi++;
+                else if (rtlpriv->falsealm_cnt.cnt_all < 500)
+                        current_igi--;
+        }
+
+        if (current_igi > DM_DIG_FA_UPPER)
+                current_igi = DM_DIG_FA_UPPER;
+        else if (current_igi < DM_DIG_FA_LOWER)
+                current_igi = DM_DIG_FA_LOWER;
+
+        if (rtlpriv->falsealm_cnt.cnt_all > 10000)
+                current_igi = DM_DIG_FA_UPPER;
+
+        dm_dig->cur_igvalue = current_igi;
+        rtl88e_dm_write_dig(hw);
+        dm_dig->media_connect_0 = ((mac->link_state >= MAC80211_LINKED) ?
+                                    true : false);
+        dm_dig->dig_min_0 = dig_min;
+
+        rtl88e_dm_cck_packet_detection_thresh(hw);
+}
+
+static void rtl88e_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.dynamic_txpower_enable = false;
+
+        rtlpriv->dm.last_dtp_lvl = TXHIGHPWRLEVEL_NORMAL;
+        rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
+}
+
+static void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        long undec_sm_pwdb;
+
+        if (!rtlpriv->dm.dynamic_txpower_enable)
+                return;
+
+        if (rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) {
+                rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
+                return;
+        }
+
+        if ((mac->link_state < MAC80211_LINKED) &&
+            (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                         "Not connected\n");
+
+                rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
+
+                rtlpriv->dm.last_dtp_lvl = TXHIGHPWRLEVEL_NORMAL;
+                return;
+        }
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+                        undec_sm_pwdb =
+                            rtlpriv->dm.entry_min_undec_sm_pwdb;
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                 "AP Client PWDB = 0x%lx\n",
+                                  undec_sm_pwdb);
+                } else {
+                        undec_sm_pwdb =
+                            rtlpriv->dm.undec_sm_pwdb;
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                  undec_sm_pwdb);
+                }
+        } else {
+                undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;
+
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "AP Ext Port PWDB = 0x%lx\n", undec_sm_pwdb);
+        }
+
+        if (undec_sm_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
+                rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr = 0x0)\n");
+        } else if ((undec_sm_pwdb <
+                    (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
+                   (undec_sm_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL1)) {
+                rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr = 0x10)\n");
+        } else if (undec_sm_pwdb < (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
+                rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "TXHIGHPWRLEVEL_NORMAL\n");
+        }
+
+        if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                          rtlphy->current_channel);
+                rtl88e_phy_set_txpower_level(hw, rtlphy->current_channel);
+        }
+
+        rtlpriv->dm.last_dtp_lvl = rtlpriv->dm.dynamic_txhighpower_lvl;
+}
+
+void rtl88e_dm_write_dig(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "cur_igvalue = 0x%x, "
+                  "pre_igvalue = 0x%x, back_val = %d\n",
+                  dm_dig->cur_igvalue, dm_dig->pre_igvalue,
+                  dm_dig->back_val);
+
+        if (dm_dig->cur_igvalue > 0x3f)
+                dm_dig->cur_igvalue = 0x3f;
+        if (dm_dig->pre_igvalue != dm_dig->cur_igvalue) {
+                rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
+                              dm_dig->cur_igvalue);
+
+                dm_dig->pre_igvalue = dm_dig->cur_igvalue;
+        }
+}
+
+static void rtl88e_dm_pwdb_monitor(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_sta_info *drv_priv;
+        static u64 last_txok;
+        static u64 last_rx;
+        long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff;
+
+        if (rtlhal->oem_id == RT_CID_819x_HP) {
+                u64 cur_txok_cnt = 0;
+                u64 cur_rxok_cnt = 0;
+                cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok;
+                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rx;
+                last_txok = cur_txok_cnt;
+                last_rx = cur_rxok_cnt;
+
+                if (cur_rxok_cnt > (cur_txok_cnt * 6))
+                        rtl_write_dword(rtlpriv, REG_ARFR0, 0x8f015);
+                else
+                        rtl_write_dword(rtlpriv, REG_ARFR0, 0xff015);
+        }
+
+        /* AP & ADHOC & MESH */
+        spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+        list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
+                if (drv_priv->rssi_stat.undec_sm_pwdb < tmp_entry_min_pwdb)
+                        tmp_entry_min_pwdb = drv_priv->rssi_stat.undec_sm_pwdb;
+                if (drv_priv->rssi_stat.undec_sm_pwdb > tmp_entry_max_pwdb)
+                        tmp_entry_max_pwdb = drv_priv->rssi_stat.undec_sm_pwdb;
+        }
+        spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+
+        /* If associated entry is found */
+        if (tmp_entry_max_pwdb != 0) {
+                rtlpriv->dm.entry_max_undec_sm_pwdb = tmp_entry_max_pwdb;
+                RTPRINT(rtlpriv, FDM, DM_PWDB, "EntryMaxPWDB = 0x%lx(%ld)\n",
+                        tmp_entry_max_pwdb, tmp_entry_max_pwdb);
+        } else {
+                rtlpriv->dm.entry_max_undec_sm_pwdb = 0;
+        }
+        /* If associated entry is found */
+        if (tmp_entry_min_pwdb != 0xff) {
+                rtlpriv->dm.entry_min_undec_sm_pwdb = tmp_entry_min_pwdb;
+                RTPRINT(rtlpriv, FDM, DM_PWDB, "EntryMinPWDB = 0x%lx(%ld)\n",
+                        tmp_entry_min_pwdb, tmp_entry_min_pwdb);
+        } else {
+                rtlpriv->dm.entry_min_undec_sm_pwdb = 0;
+        }
+        /* Indicate Rx signal strength to FW. */
+        if (!rtlpriv->dm.useramask)
+                rtl_write_byte(rtlpriv, 0x4fe, rtlpriv->dm.undec_sm_pwdb);
+}
+
+void rtl88e_dm_init_edca_turbo(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.current_turbo_edca = false;
+        rtlpriv->dm.is_any_nonbepkts = false;
+        rtlpriv->dm.is_cur_rdlstate = false;
+}
+
+static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        static u64 last_txok_cnt;
+        static u64 last_rxok_cnt;
+        static u32 last_bt_edca_ul;
+        static u32 last_bt_edca_dl;
+        u64 cur_txok_cnt = 0;
+        u64 cur_rxok_cnt = 0;
+        u32 edca_be_ul = 0x5ea42b;
+        u32 edca_be_dl = 0x5ea42b;
+        bool change_edca = false;
+
+        if ((last_bt_edca_ul != rtlpcipriv->bt_coexist.bt_edca_ul) ||
+            (last_bt_edca_dl != rtlpcipriv->bt_coexist.bt_edca_dl)) {
+                rtlpriv->dm.current_turbo_edca = false;
+                last_bt_edca_ul = rtlpcipriv->bt_coexist.bt_edca_ul;
+                last_bt_edca_dl = rtlpcipriv->bt_coexist.bt_edca_dl;
+        }
+
+        if (rtlpcipriv->bt_coexist.bt_edca_ul != 0) {
+                edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_ul;
+                change_edca = true;
+        }
+
+        if (rtlpcipriv->bt_coexist.bt_edca_dl != 0) {
+                edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_dl;
+                change_edca = true;
+        }
+
+        if (mac->link_state != MAC80211_LINKED) {
+                rtlpriv->dm.current_turbo_edca = false;
+                return;
+        }
+
+        if ((!mac->ht_enable) && (!rtlpcipriv->bt_coexist.bt_coexistence)) {
+                if (!(edca_be_ul & 0xffff0000))
+                        edca_be_ul |= 0x005e0000;
+
+                if (!(edca_be_dl & 0xffff0000))
+                        edca_be_dl |= 0x005e0000;
+        }
+
+        if ((change_edca) || ((!rtlpriv->dm.is_any_nonbepkts) &&
+                              (!rtlpriv->dm.disable_framebursting))) {
+                cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
+                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
+
+                if (cur_rxok_cnt > 4 * cur_txok_cnt) {
+                        if (!rtlpriv->dm.is_cur_rdlstate ||
+                            !rtlpriv->dm.current_turbo_edca) {
+                                rtl_write_dword(rtlpriv,
+                                                REG_EDCA_BE_PARAM,
+                                                edca_be_dl);
+                                rtlpriv->dm.is_cur_rdlstate = true;
+                        }
+                } else {
+                        if (rtlpriv->dm.is_cur_rdlstate ||
+                            !rtlpriv->dm.current_turbo_edca) {
+                                rtl_write_dword(rtlpriv,
+                                                REG_EDCA_BE_PARAM,
+                                                edca_be_ul);
+                                rtlpriv->dm.is_cur_rdlstate = false;
+                        }
+                }
+                rtlpriv->dm.current_turbo_edca = true;
+        } else {
+                if (rtlpriv->dm.current_turbo_edca) {
+                        u8 tmp = AC0_BE;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_AC_PARAM,
+                                                      (u8 *)(&tmp));
+                        rtlpriv->dm.current_turbo_edca = false;
+                }
+        }
+
+        rtlpriv->dm.is_any_nonbepkts = false;
+        last_txok_cnt = rtlpriv->stats.txbytesunicast;
+        last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
+}
+
+static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
+                                                             *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 thermalvalue = 0, delta, delta_lck, delta_iqk, off;
+        u8 th_avg_cnt = 0;
+        u32 thermalvalue_avg = 0;
+        long  ele_d, temp_cck;
+        char ofdm_index[2], cck_index = 0, ofdm_old[2] = {0, 0}, cck_old = 0;
+        int i = 0;
+        bool is2t = false;
+
+        u8 ofdm_min_index = 6, rf = (is2t) ? 2 : 1;
+        u8 index_for_channel;
+        enum _dec_inc {dec, power_inc};
+
+        /* 0.1 the following TWO tables decide the final index of
+         * OFDM/CCK swing table
+         */
+        char del_tbl_idx[2][15] = {
+                {0, 0, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11},
+                {0, 0, -1, -2, -3, -4, -4, -4, -4, -5, -7, -8, -9, -9, -10}
+        };
+        u8 thermal_threshold[2][15] = {
+                {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 27},
+                {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 25, 25, 25}
+        };
+
+        /*Initilization (7 steps in total) */
+        rtlpriv->dm.txpower_trackinginit = true;
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "rtl88e_dm_txpower_tracking_callback_thermalmeter\n");
+
+        thermalvalue = (u8) rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0xfc00);
+        if (!thermalvalue)
+                return;
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
+                 thermalvalue, rtlpriv->dm.thermalvalue,
+                 rtlefuse->eeprom_thermalmeter);
+
+        /*1. Query OFDM Default Setting: Path A*/
+        ele_d = rtl_get_bbreg(hw, ROFDM0_XATXIQIMBAL, MASKDWORD) & MASKOFDM_D;
+        for (i = 0; i < OFDM_TABLE_LENGTH; i++) {
+                if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
+                        ofdm_old[0] = (u8) i;
+                        rtldm->swing_idx_ofdm_base = (u8)i;
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n",
+                                 ROFDM0_XATXIQIMBAL,
+                                 ele_d, ofdm_old[0]);
+                        break;
+                }
+        }
+
+        if (is2t) {
+                ele_d = rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBAL,
+                                      MASKDWORD) & MASKOFDM_D;
+                for (i = 0; i < OFDM_TABLE_LENGTH; i++) {
+                        if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
+                                ofdm_old[1] = (u8)i;
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
+                                         DBG_LOUD,
+                                         "Initial pathB ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n",
+                                         ROFDM0_XBTXIQIMBAL, ele_d,
+                                         ofdm_old[1]);
+                                break;
+                        }
+                }
+        }
+        /*2.Query CCK default setting From 0xa24*/
+        temp_cck = rtl_get_bbreg(hw, RCCK0_TXFILTER2, MASKDWORD) & MASKCCK;
+        for (i = 0; i < CCK_TABLE_LENGTH; i++) {
+                if (rtlpriv->dm.cck_inch14) {
+                        if (memcmp(&temp_cck, &cck_tbl_ch14[i][2], 4) == 0) {
+                                cck_old = (u8)i;
+                                rtldm->swing_idx_cck_base = (u8)i;
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch 14 %d\n",
+                                         RCCK0_TXFILTER2, temp_cck, cck_old,
+                                         rtlpriv->dm.cck_inch14);
+                                break;
+                        }
+                } else {
+                        if (memcmp(&temp_cck, &cck_tbl_ch1_13[i][2], 4) == 0) {
+                                cck_old = (u8)i;
+                                rtldm->swing_idx_cck_base = (u8)i;
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n",
+                                         RCCK0_TXFILTER2, temp_cck, cck_old,
+                                         rtlpriv->dm.cck_inch14);
+                                break;
+                        }
+                }
+        }
+
+        /*3 Initialize ThermalValues of RFCalibrateInfo*/
+        if (!rtldm->thermalvalue) {
+                rtlpriv->dm.thermalvalue = rtlefuse->eeprom_thermalmeter;
+                rtlpriv->dm.thermalvalue_lck = thermalvalue;
+                rtlpriv->dm.thermalvalue_iqk = thermalvalue;
+                for (i = 0; i < rf; i++)
+                        rtlpriv->dm.ofdm_index[i] = ofdm_old[i];
+                rtlpriv->dm.cck_index = cck_old;
+        }
+
+        /*4 Calculate average thermal meter*/
+        rtldm->thermalvalue_avg[rtldm->thermalvalue_avg_index] = thermalvalue;
+        rtldm->thermalvalue_avg_index++;
+        if (rtldm->thermalvalue_avg_index == AVG_THERMAL_NUM_88E)
+                rtldm->thermalvalue_avg_index = 0;
+
+        for (i = 0; i < AVG_THERMAL_NUM_88E; i++) {
+                if (rtldm->thermalvalue_avg[i]) {
+                        thermalvalue_avg += rtldm->thermalvalue_avg[i];
+                        th_avg_cnt++;
+                }
+        }
+
+        if (th_avg_cnt)
+                thermalvalue = (u8)(thermalvalue_avg / th_avg_cnt);
+
+        /* 5 Calculate delta, delta_LCK, delta_IQK.*/
+        if (rtlhal->reloadtxpowerindex) {
+                delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
+                    (thermalvalue - rtlefuse->eeprom_thermalmeter) :
+                    (rtlefuse->eeprom_thermalmeter - thermalvalue);
+                rtlhal->reloadtxpowerindex = false;
+                rtlpriv->dm.done_txpower = false;
+        } else if (rtlpriv->dm.done_txpower) {
+                delta = (thermalvalue > rtlpriv->dm.thermalvalue) ?
+                        (thermalvalue - rtlpriv->dm.thermalvalue) :
+                        (rtlpriv->dm.thermalvalue - thermalvalue);
+        } else {
+                delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
+                        (thermalvalue - rtlefuse->eeprom_thermalmeter) :
+                        (rtlefuse->eeprom_thermalmeter - thermalvalue);
+        }
+        delta_lck = (thermalvalue > rtlpriv->dm.thermalvalue_lck) ?
+                    (thermalvalue - rtlpriv->dm.thermalvalue_lck) :
+                    (rtlpriv->dm.thermalvalue_lck - thermalvalue);
+        delta_iqk = (thermalvalue > rtlpriv->dm.thermalvalue_iqk) ?
+                    (thermalvalue - rtlpriv->dm.thermalvalue_iqk) :
+                    (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
+                 "eeprom_thermalmeter 0x%x delta 0x%x "
+                 "delta_lck 0x%x delta_iqk 0x%x\n",
+                 thermalvalue, rtlpriv->dm.thermalvalue,
+                 rtlefuse->eeprom_thermalmeter, delta, delta_lck,
+                 delta_iqk);
+        /* 6 If necessary, do LCK.*/
+        if (delta_lck >= 8) {
+                rtlpriv->dm.thermalvalue_lck = thermalvalue;
+                rtl88e_phy_lc_calibrate(hw);
+        }
+
+        /* 7 If necessary, move the index of swing table to adjust Tx power. */
+        if (delta > 0 && rtlpriv->dm.txpower_track_control) {
+                delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
+                        (thermalvalue - rtlefuse->eeprom_thermalmeter) :
+                        (rtlefuse->eeprom_thermalmeter - thermalvalue);
+
+                /* 7.1 Get the final CCK_index and OFDM_index for each
+                 * swing table.
+                 */
+                if (thermalvalue > rtlefuse->eeprom_thermalmeter) {
+                        CAL_SWING_OFF(off, power_inc, IDX_MAP, delta);
+                        for (i = 0; i < rf; i++)
+                                ofdm_index[i] = rtldm->ofdm_index[i] +
+                                                del_tbl_idx[power_inc][off];
+                        cck_index = rtldm->cck_index +
+                                    del_tbl_idx[power_inc][off];
+                } else {
+                        CAL_SWING_OFF(off, dec, IDX_MAP, delta);
+                        for (i = 0; i < rf; i++)
+                                ofdm_index[i] = rtldm->ofdm_index[i] +
+                                                del_tbl_idx[dec][off];
+                        cck_index = rtldm->cck_index + del_tbl_idx[dec][off];
+                }
+
+                /* 7.2 Handle boundary conditions of index.*/
+                for (i = 0; i < rf; i++) {
+                        if (ofdm_index[i] > OFDM_TABLE_SIZE-1)
+                                ofdm_index[i] = OFDM_TABLE_SIZE-1;
+                        else if (rtldm->ofdm_index[i] < ofdm_min_index)
+                                ofdm_index[i] = ofdm_min_index;
+                }
+
+                if (cck_index > CCK_TABLE_SIZE - 1)
+                        cck_index = CCK_TABLE_SIZE - 1;
+                else if (cck_index < 0)
+                        cck_index = 0;
+
+                /*7.3Configure the Swing Table to adjust Tx Power.*/
+                if (rtlpriv->dm.txpower_track_control) {
+                        rtldm->done_txpower = true;
+                        rtldm->swing_idx_ofdm[RF90_PATH_A] =
+                                 (u8)ofdm_index[RF90_PATH_A];
+                        if (is2t)
+                                rtldm->swing_idx_ofdm[RF90_PATH_B] =
+                                         (u8)ofdm_index[RF90_PATH_B];
+                        rtldm->swing_idx_cck = cck_index;
+                        if (rtldm->swing_idx_ofdm_cur !=
+                            rtldm->swing_idx_ofdm[0]) {
+                                rtldm->swing_idx_ofdm_cur =
+                                         rtldm->swing_idx_ofdm[0];
+                                rtldm->swing_flag_ofdm = true;
+                        }
+
+                        if (rtldm->swing_idx_cck != rtldm->swing_idx_cck) {
+                                rtldm->swing_idx_cck_cur = rtldm->swing_idx_cck;
+                                rtldm->swing_flag_cck = true;
+                        }
+
+                        rtl88e_chk_tx_track(hw, TXAGC, 0, 0);
+
+                        if (is2t)
+                                rtl88e_chk_tx_track(hw, BBSWING,
+                                                    RF90_PATH_B,
+                                                    index_for_channel);
+                }
+        }
+
+        if (delta_iqk >= 8) {
+                rtlpriv->dm.thermalvalue_iqk = thermalvalue;
+                rtl88e_phy_iq_calibrate(hw, false);
+        }
+
+        if (rtldm->txpower_track_control)
+                rtldm->thermalvalue = thermalvalue;
+        rtldm->txpowercount = 0;
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "end\n");
+}
+
+static void rtl88e_dm_init_txpower_tracking(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.txpower_tracking = true;
+        rtlpriv->dm.txpower_trackinginit = false;
+        rtlpriv->dm.txpowercount = 0;
+        rtlpriv->dm.txpower_track_control = true;
+
+        rtlpriv->dm.swing_idx_ofdm[RF90_PATH_A] = 12;
+        rtlpriv->dm.swing_idx_ofdm_cur = 12;
+        rtlpriv->dm.swing_flag_ofdm = false;
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "  rtlpriv->dm.txpower_tracking = %d\n",
+                 rtlpriv->dm.txpower_tracking);
+}
+
+void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        static u8 tm_trigger;
+
+        if (!rtlpriv->dm.txpower_tracking)
+                return;
+
+        if (!tm_trigger) {
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17)|BIT(16),
+                              0x03);
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "Trigger 88E Thermal Meter!!\n");
+                tm_trigger = 1;
+                return;
+        } else {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "Schedule TxPowerTracking !!\n");
+                rtl88e_dm_txpower_tracking_callback_thermalmeter(hw);
+                tm_trigger = 0;
+        }
+}
+
+void rtl88e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rate_adaptive *p_ra = &(rtlpriv->ra);
+
+        p_ra->ratr_state = DM_RATR_STA_INIT;
+        p_ra->pre_ratr_state = DM_RATR_STA_INIT;
+
+        if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
+                rtlpriv->dm.useramask = true;
+        else
+                rtlpriv->dm.useramask = false;
+}
+
+static void rtl88e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rate_adaptive *p_ra = &(rtlpriv->ra);
+        struct ieee80211_sta *sta = NULL;
+        u32 low_rssi, hi_rssi;
+
+        if (is_hal_stop(rtlhal)) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         "driver is going to unload\n");
+                return;
+        }
+
+        if (!rtlpriv->dm.useramask) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         "driver does not control rate adaptive mask\n");
+                return;
+        }
+
+        if (mac->link_state == MAC80211_LINKED &&
+            mac->opmode == NL80211_IFTYPE_STATION) {
+                switch (p_ra->pre_ratr_state) {
+                case DM_RATR_STA_HIGH:
+                        hi_rssi = 50;
+                        low_rssi = 20;
+                        break;
+                case DM_RATR_STA_MIDDLE:
+                        hi_rssi = 55;
+                        low_rssi = 20;
+                        break;
+                case DM_RATR_STA_LOW:
+                        hi_rssi = 50;
+                        low_rssi = 25;
+                        break;
+                default:
+                        hi_rssi = 50;
+                        low_rssi = 20;
+                        break;
+                }
+
+                if (rtlpriv->dm.undec_sm_pwdb > (long)hi_rssi)
+                        p_ra->ratr_state = DM_RATR_STA_HIGH;
+                else if (rtlpriv->dm.undec_sm_pwdb > (long)low_rssi)
+                        p_ra->ratr_state = DM_RATR_STA_MIDDLE;
+                else
+                        p_ra->ratr_state = DM_RATR_STA_LOW;
+
+                if (p_ra->pre_ratr_state != p_ra->ratr_state) {
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI = %ld\n",
+                                 rtlpriv->dm.undec_sm_pwdb);
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "PreState = %d, CurState = %d\n",
+                                  p_ra->pre_ratr_state, p_ra->ratr_state);
+
+                        rcu_read_lock();
+                        sta = rtl_find_sta(hw, mac->bssid);
+                        if (sta)
+                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
+                                                   p_ra->ratr_state);
+                        rcu_read_unlock();
+
+                        p_ra->pre_ratr_state = p_ra->ratr_state;
+                }
+        }
+}
+
+static void rtl92c_dm_init_dynamic_bb_powersaving(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ps_t *dm_pstable = &rtlpriv->dm_pstable;
+
+        dm_pstable->pre_ccastate = CCA_MAX;
+        dm_pstable->cur_ccasate = CCA_MAX;
+        dm_pstable->pre_rfstate = RF_MAX;
+        dm_pstable->cur_rfstate = RF_MAX;
+        dm_pstable->rssi_val_min = 0;
+}
+
+static void rtl88e_dm_update_rx_idle_ant(struct ieee80211_hw *hw, u8 ant)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        u32 def_ant, opt_ant;
+
+        if (fat_tbl->rx_idle_ant != ant) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "need to update rx idle ant\n");
+                if (ant == MAIN_ANT) {
+                        def_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                                   MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
+                        opt_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                                   AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
+                } else {
+                        def_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                                   AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
+                        opt_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                                   MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
+                }
+
+                if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) {
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(5) |
+                                      BIT(4) | BIT(3), def_ant);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) |
+                                      BIT(7) | BIT(6), opt_ant);
+                        rtl_set_bbreg(hw, DM_REG_ANTSEL_CTRL_11N, BIT(14) |
+                                      BIT(13) | BIT(12), def_ant);
+                        rtl_set_bbreg(hw, DM_REG_RESP_TX_11N, BIT(6) | BIT(7),
+                                      def_ant);
+                } else if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV) {
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(5) |
+                                      BIT(4) | BIT(3), def_ant);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) |
+                                      BIT(7) | BIT(6), opt_ant);
+                }
+        }
+        fat_tbl->rx_idle_ant = ant;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RxIdleAnt %s\n",
+                 ((ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT")));
+}
+
+static void rtl88e_dm_update_tx_ant(struct ieee80211_hw *hw,
+        u8 ant, u32 mac_id)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        u8 target_ant;
+
+        if (ant == MAIN_ANT)
+                target_ant = MAIN_ANT_CG_TRX;
+        else
+                target_ant = AUX_ANT_CG_TRX;
+
+        fat_tbl->antsel_a[mac_id] = target_ant & BIT(0);
+        fat_tbl->antsel_b[mac_id] = (target_ant & BIT(1)) >> 1;
+        fat_tbl->antsel_c[mac_id] = (target_ant & BIT(2)) >> 2;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "txfrominfo target ant %s\n",
+                 ((ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT")));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "antsel_tr_mux = 3'b%d%d%d\n",
+                 fat_tbl->antsel_c[mac_id],
+                 fat_tbl->antsel_b[mac_id], fat_tbl->antsel_a[mac_id]);
+}
+
+static void rtl88e_dm_rx_hw_antena_div_init(struct ieee80211_hw *hw)
+{
+        u32  value32;
+        /*MAC Setting*/
+        value32 = rtl_get_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD);
+        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD, value32 |
+                     (BIT(23) | BIT(25)));
+        /*Pin Setting*/
+        rtl_set_bbreg(hw, DM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(10), 0);
+        rtl_set_bbreg(hw, DM_REG_LNA_SWITCH_11N, BIT(22), 1);
+        rtl_set_bbreg(hw, DM_REG_LNA_SWITCH_11N, BIT(31), 1);
+        /*OFDM Setting*/
+        rtl_set_bbreg(hw, DM_REG_ANTDIV_PARA1_11N, MASKDWORD, 0x000000a0);
+        /*CCK Setting*/
+        rtl_set_bbreg(hw, DM_REG_BB_PWR_SAV4_11N, BIT(7), 1);
+        rtl_set_bbreg(hw, DM_REG_CCK_ANTDIV_PARA2_11N, BIT(4), 1);
+        rtl88e_dm_update_rx_idle_ant(hw, MAIN_ANT);
+        rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKLWORD, 0x0201);
+}
+
+static void rtl88e_dm_trx_hw_antenna_div_init(struct ieee80211_hw *hw)
+{
+        u32  value32;
+
+        /*MAC Setting*/
+        value32 = rtl_get_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD);
+        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD, value32 |
+                     (BIT(23) | BIT(25)));
+        /*Pin Setting*/
+        rtl_set_bbreg(hw, DM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(10), 0);
+        rtl_set_bbreg(hw, DM_REG_LNA_SWITCH_11N, BIT(22), 0);
+        rtl_set_bbreg(hw, DM_REG_LNA_SWITCH_11N, BIT(31), 1);
+        /*OFDM Setting*/
+        rtl_set_bbreg(hw, DM_REG_ANTDIV_PARA1_11N, MASKDWORD, 0x000000a0);
+        /*CCK Setting*/
+        rtl_set_bbreg(hw, DM_REG_BB_PWR_SAV4_11N, BIT(7), 1);
+        rtl_set_bbreg(hw, DM_REG_CCK_ANTDIV_PARA2_11N, BIT(4), 1);
+        /*TX Setting*/
+        rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N, BIT(21), 0);
+        rtl88e_dm_update_rx_idle_ant(hw, MAIN_ANT);
+        rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKLWORD, 0x0201);
+}
+
+static void rtl88e_dm_fast_training_init(struct ieee80211_hw *hw)
+{
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        u32 ant_combo = 2;
+        u32 value32, i;
+
+        for (i = 0; i < 6; i++) {
+                fat_tbl->bssid[i] = 0;
+                fat_tbl->ant_sum[i] = 0;
+                fat_tbl->ant_cnt[i] = 0;
+                fat_tbl->ant_ave[i] = 0;
+        }
+        fat_tbl->train_idx = 0;
+        fat_tbl->fat_state = FAT_NORMAL_STATE;
+
+        /*MAC Setting*/
+        value32 = rtl_get_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD);
+        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD, value32 | (BIT(23) |
+                      BIT(25)));
+        value32 = rtl_get_bbreg(hw, DM_REG_ANT_TRAIN_2, MASKDWORD);
+        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2, MASKDWORD, value32 | (BIT(16) |
+                      BIT(17)));
+        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2, MASKLWORD, 0);
+        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_1, MASKDWORD, 0);
+
+        /*Pin Setting*/
+        rtl_set_bbreg(hw, DM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(10), 0);
+        rtl_set_bbreg(hw, DM_REG_LNA_SWITCH_11N, BIT(22), 0);
+        rtl_set_bbreg(hw, DM_REG_LNA_SWITCH_11N, BIT(31), 1);
+
+        /*OFDM Setting*/
+        rtl_set_bbreg(hw, DM_REG_ANTDIV_PARA1_11N, MASKDWORD, 0x000000a0);
+        /*antenna mapping table*/
+        if (ant_combo == 2) {
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE0, 1);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE1, 2);
+        } else if (ant_combo == 7) {
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE0, 1);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE1, 2);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE2, 2);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE3, 3);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE0, 4);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE1, 5);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE2, 6);
+                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE3, 7);
+        }
+
+        /*TX Setting*/
+        rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N, BIT(21), 1);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(5) | BIT(4) | BIT(3), 0);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) | BIT(7) | BIT(6), 1);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(2) | BIT(1) | BIT(0),
+                      (ant_combo - 1));
+
+        rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);
+}
+
+static void rtl88e_dm_antenna_div_init(struct ieee80211_hw *hw)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+
+        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                rtl88e_dm_rx_hw_antena_div_init(hw);
+        else if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
+                rtl88e_dm_trx_hw_antenna_div_init(hw);
+        else if (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV)
+                rtl88e_dm_fast_training_init(hw);
+}
+
+void rtl88e_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
+                                     u8 *pdesc, u32 mac_id)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+
+        if ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) ||
+            (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)) {
+                SET_TX_DESC_ANTSEL_A(pdesc, fat_tbl->antsel_a[mac_id]);
+                SET_TX_DESC_ANTSEL_B(pdesc, fat_tbl->antsel_b[mac_id]);
+                SET_TX_DESC_ANTSEL_C(pdesc, fat_tbl->antsel_c[mac_id]);
+        }
+}
+
+void rtl88e_dm_ant_sel_statistics(struct ieee80211_hw *hw,
+                                  u8 antsel_tr_mux, u32 mac_id, u32 rx_pwdb_all)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+
+        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) {
+                if (antsel_tr_mux == MAIN_ANT_CG_TRX) {
+                        fat_tbl->main_ant_sum[mac_id] += rx_pwdb_all;
+                        fat_tbl->main_ant_cnt[mac_id]++;
+                } else {
+                        fat_tbl->aux_ant_sum[mac_id] += rx_pwdb_all;
+                        fat_tbl->aux_ant_cnt[mac_id]++;
+                }
+        } else if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV) {
+                if (antsel_tr_mux == MAIN_ANT_CGCS_RX) {
+                        fat_tbl->main_ant_sum[mac_id] += rx_pwdb_all;
+                        fat_tbl->main_ant_cnt[mac_id]++;
+                } else {
+                        fat_tbl->aux_ant_sum[mac_id] += rx_pwdb_all;
+                        fat_tbl->aux_ant_cnt[mac_id]++;
+                }
+        }
+}
+
+static void rtl88e_dm_hw_ant_div(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_sta_info *drv_priv;
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        u32 i, min_rssi = 0xff, ant_div_max_rssi = 0, max_rssi = 0;
+        u32 local_min_rssi, local_max_rssi;
+        u32 main_rssi, aux_rssi;
+        u8 rx_idle_ant = 0, target_ant = 7;
+
+        i = 0;
+        main_rssi = (fat_tbl->main_ant_cnt[i] != 0) ?
+                    (fat_tbl->main_ant_sum[i] /
+                     fat_tbl->main_ant_cnt[i]) : 0;
+        aux_rssi = (fat_tbl->aux_ant_cnt[i] != 0) ?
+                (fat_tbl->aux_ant_sum[i] / fat_tbl->aux_ant_cnt[i]) : 0;
+        target_ant = (main_rssi == aux_rssi) ?
+                     fat_tbl->rx_idle_ant : ((main_rssi >= aux_rssi) ?
+                     MAIN_ANT : AUX_ANT);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "main_ant_sum %d main_ant_cnt %d\n",
+                 fat_tbl->main_ant_sum[i], fat_tbl->main_ant_cnt[i]);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "aux_ant_sum %d aux_ant_cnt %d\n",
+                 fat_tbl->aux_ant_sum[i],
+                 fat_tbl->aux_ant_cnt[i]);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "main_rssi %d aux_rssi%d\n", main_rssi, aux_rssi);
+        local_max_rssi = (main_rssi > aux_rssi) ? main_rssi : aux_rssi;
+        if ((local_max_rssi > ant_div_max_rssi) && (local_max_rssi < 40))
+                ant_div_max_rssi = local_max_rssi;
+        if (local_max_rssi > max_rssi)
+                max_rssi = local_max_rssi;
+
+        if ((fat_tbl->rx_idle_ant == MAIN_ANT) && (main_rssi == 0))
+                main_rssi = aux_rssi;
+        else if ((fat_tbl->rx_idle_ant == AUX_ANT) && (aux_rssi == 0))
+                aux_rssi = main_rssi;
+
+        local_min_rssi = (main_rssi > aux_rssi) ? aux_rssi : main_rssi;
+        if (local_min_rssi < min_rssi) {
+                min_rssi = local_min_rssi;
+                rx_idle_ant = target_ant;
+        }
+        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
+                rtl88e_dm_update_tx_ant(hw, target_ant, i);
+
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP ||
+            rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC) {
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
+                        i++;
+                        main_rssi = (fat_tbl->main_ant_cnt[i] != 0) ?
+                                (fat_tbl->main_ant_sum[i] /
+                                 fat_tbl->main_ant_cnt[i]) : 0;
+                        aux_rssi = (fat_tbl->aux_ant_cnt[i] != 0) ?
+                                   (fat_tbl->aux_ant_sum[i] /
+                                    fat_tbl->aux_ant_cnt[i]) : 0;
+                        target_ant = (main_rssi == aux_rssi) ?
+                                      fat_tbl->rx_idle_ant : ((main_rssi >=
+                                      aux_rssi) ? MAIN_ANT : AUX_ANT);
+
+
+                        local_max_rssi = max_t(u32, main_rssi, aux_rssi);
+                        if ((local_max_rssi > ant_div_max_rssi) &&
+                            (local_max_rssi < 40))
+                                ant_div_max_rssi = local_max_rssi;
+                        if (local_max_rssi > max_rssi)
+                                max_rssi = local_max_rssi;
+
+                        if ((fat_tbl->rx_idle_ant == MAIN_ANT) && !main_rssi)
+                                main_rssi = aux_rssi;
+                        else if ((fat_tbl->rx_idle_ant == AUX_ANT) &&
+                                 (aux_rssi == 0))
+                                aux_rssi = main_rssi;
+
+                        local_min_rssi = (main_rssi > aux_rssi) ?
+                                          aux_rssi : main_rssi;
+                        if (local_min_rssi < min_rssi) {
+                                min_rssi = local_min_rssi;
+                                rx_idle_ant = target_ant;
+                        }
+                        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
+                                rtl88e_dm_update_tx_ant(hw, target_ant, i);
+                }
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+        }
+
+        for (i = 0; i < ASSOCIATE_ENTRY_NUM; i++) {
+                fat_tbl->main_ant_sum[i] = 0;
+                fat_tbl->aux_ant_sum[i] = 0;
+                fat_tbl->main_ant_cnt[i] = 0;
+                fat_tbl->aux_ant_cnt[i] = 0;
+        }
+
+        rtl88e_dm_update_rx_idle_ant(hw, rx_idle_ant);
+
+        dm_dig->antdiv_rssi_max = ant_div_max_rssi;
+        dm_dig->rssi_max = max_rssi;
+}
+
+static void rtl88e_set_next_mac_address_target(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_sta_info *drv_priv;
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        u32 value32, i, j = 0;
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                for (i = 0; i < ASSOCIATE_ENTRY_NUM; i++) {
+                        if ((fat_tbl->train_idx + 1) == ASSOCIATE_ENTRY_NUM)
+                                fat_tbl->train_idx = 0;
+                        else
+                                fat_tbl->train_idx++;
+
+                        if (fat_tbl->train_idx == 0) {
+                                value32 = (mac->mac_addr[5] << 8) |
+                                           mac->mac_addr[4];
+                                rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2,
+                                              MASKLWORD, value32);
+
+                                value32 = (mac->mac_addr[3] << 24) |
+                                          (mac->mac_addr[2] << 16) |
+                                          (mac->mac_addr[1] << 8) |
+                                           mac->mac_addr[0];
+                                rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_1,
+                                              MASKDWORD, value32);
+                                break;
+                        }
+
+                        if (rtlpriv->mac80211.opmode !=
+                            NL80211_IFTYPE_STATION) {
+                                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                                list_for_each_entry(drv_priv,
+                                                    &rtlpriv->entry_list,
+                                                    list) {
+                                        j++;
+                                        if (j != fat_tbl->train_idx)
+                                                continue;
+
+                                        value32 = (drv_priv->mac_addr[5] << 8) |
+                                                   drv_priv->mac_addr[4];
+                                        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2,
+                                                      MASKLWORD, value32);
+
+                                        value32 = (drv_priv->mac_addr[3]<<24) |
+                                                  (drv_priv->mac_addr[2]<<16) |
+                                                  (drv_priv->mac_addr[1]<<8) |
+                                                   drv_priv->mac_addr[0];
+                                        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_1,
+                                                      MASKDWORD, value32);
+                                        break;
+                                }
+                                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+                                /*find entry, break*/
+                                if (j == fat_tbl->train_idx)
+                                        break;
+                        }
+                }
+        }
+}
+
+static void rtl88e_dm_fast_ant_training(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        u32 i, max_rssi = 0;
+        u8 target_ant = 2;
+        bool bpkt_filter_match = false;
+
+        if (fat_tbl->fat_state == FAT_TRAINING_STATE) {
+                for (i = 0; i < 7; i++) {
+                        if (fat_tbl->ant_cnt[i] == 0) {
+                                fat_tbl->ant_ave[i] = 0;
+                        } else {
+                                fat_tbl->ant_ave[i] = fat_tbl->ant_sum[i] /
+                                        fat_tbl->ant_cnt[i];
+                                bpkt_filter_match = true;
+                        }
+
+                        if (fat_tbl->ant_ave[i] > max_rssi) {
+                                max_rssi = fat_tbl->ant_ave[i];
+                                target_ant = (u8) i;
+                        }
+                }
+
+                if (bpkt_filter_match == false) {
+                        rtl_set_bbreg(hw, DM_REG_TXAGC_A_1_MCS32_11N,
+                                      BIT(16), 0);
+                        rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 0);
+                } else {
+                        rtl_set_bbreg(hw, DM_REG_TXAGC_A_1_MCS32_11N,
+                                      BIT(16), 0);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) |
+                                      BIT(7) | BIT(6), target_ant);
+                        rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N, BIT(21), 1);
+
+                        fat_tbl->antsel_a[fat_tbl->train_idx] =
+                                  target_ant & BIT(0);
+                        fat_tbl->antsel_b[fat_tbl->train_idx] =
+                                 (target_ant & BIT(1)) >> 1;
+                        fat_tbl->antsel_c[fat_tbl->train_idx] =
+                                 (target_ant & BIT(2)) >> 2;
+
+                        if (target_ant == 0)
+                                rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 0);
+                }
+
+                for (i = 0; i < 7; i++) {
+                        fat_tbl->ant_sum[i] = 0;
+                        fat_tbl->ant_cnt[i] = 0;
+                }
+
+                fat_tbl->fat_state = FAT_NORMAL_STATE;
+                return;
+        }
+
+        if (fat_tbl->fat_state == FAT_NORMAL_STATE) {
+                rtl88e_set_next_mac_address_target(hw);
+
+                fat_tbl->fat_state = FAT_TRAINING_STATE;
+                rtl_set_bbreg(hw, DM_REG_TXAGC_A_1_MCS32_11N, BIT(16), 1);
+                rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);
+
+                mod_timer(&rtlpriv->works.fast_antenna_training_timer,
+                          jiffies + MSECS(RTL_WATCH_DOG_TIME));
+        }
+}
+
+void rtl88e_dm_fast_antenna_training_callback(unsigned long data)
+{
+        struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
+
+        rtl88e_dm_fast_ant_training(hw);
+}
+
+static void rtl88e_dm_antenna_diversity(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+
+        if (mac->link_state < MAC80211_LINKED) {
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "No Link\n");
+                if (fat_tbl->becomelinked == true) {
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "need to turn off HW AntDiv\n");
+                        rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 0);
+                        rtl_set_bbreg(hw, DM_REG_CCK_ANTDIV_PARA1_11N,
+                                      BIT(15), 0);
+                        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N,
+                                              BIT(21), 0);
+                        fat_tbl->becomelinked =
+                          (mac->link_state == MAC80211_LINKED) ? true : false;
+                }
+                return;
+        } else {
+                if (fat_tbl->becomelinked == false) {
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "Need to turn on HW AntDiv\n");
+                        rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);
+                        rtl_set_bbreg(hw, DM_REG_CCK_ANTDIV_PARA1_11N,
+                                      BIT(15), 1);
+                        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N,
+                                              BIT(21), 1);
+                        fat_tbl->becomelinked =
+                           (mac->link_state >= MAC80211_LINKED) ? true : false;
+                }
+        }
+
+        if ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) ||
+            (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV))
+                rtl88e_dm_hw_ant_div(hw);
+        else if (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV)
+                rtl88e_dm_fast_ant_training(hw);
+}
+
+void rtl88e_dm_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.dm_type = DM_TYPE_BYDRIVER;
+        rtl88e_dm_diginit(hw);
+        rtl88e_dm_init_dynamic_txpower(hw);
+        rtl88e_dm_init_edca_turbo(hw);
+        rtl88e_dm_init_rate_adaptive_mask(hw);
+        rtl88e_dm_init_txpower_tracking(hw);
+        rtl92c_dm_init_dynamic_bb_powersaving(hw);
+        rtl88e_dm_antenna_div_init(hw);
+}
+
+void rtl88e_dm_watchdog(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool fw_current_inpsmode = false;
+        bool fw_ps_awake = true;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                      (u8 *)(&fw_current_inpsmode));
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
+                                      (u8 *)(&fw_ps_awake));
+        if (ppsc->p2p_ps_info.p2p_ps_mode)
+                fw_ps_awake = false;
+
+        if ((ppsc->rfpwr_state == ERFON) &&
+            ((!fw_current_inpsmode) && fw_ps_awake) &&
+            (!ppsc->rfchange_inprogress)) {
+                rtl88e_dm_pwdb_monitor(hw);
+                rtl88e_dm_dig(hw);
+                rtl88e_dm_false_alarm_counter_statistics(hw);
+                rtl92c_dm_dynamic_txpower(hw);
+                rtl88e_dm_check_txpower_tracking(hw);
+                rtl88e_dm_refresh_rate_adaptive_mask(hw);
+                rtl88e_dm_check_edca_turbo(hw);
+                rtl88e_dm_antenna_diversity(hw);
+        }
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
new file mode 100644
index 000000000000..0e07f72ea158
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
@@ -0,0 +1,326 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL88E_DM_H__
+#define __RTL88E_DM_H__
+
+#define MAIN_ANT                                        0
+#define AUX_ANT                                         1
+#define MAIN_ANT_CG_TRX                                 1
+#define AUX_ANT_CG_TRX                                  0
+#define MAIN_ANT_CGCS_RX                                0
+#define AUX_ANT_CGCS_RX                                 1
+
+/*RF REG LIST*/
+#define DM_REG_RF_MODE_11N                              0x00
+#define DM_REG_RF_0B_11N                                0x0B
+#define DM_REG_CHNBW_11N                                0x18
+#define DM_REG_T_METER_11N                              0x24
+#define DM_REG_RF_25_11N                                0x25
+#define DM_REG_RF_26_11N                                0x26
+#define DM_REG_RF_27_11N                                0x27
+#define DM_REG_RF_2B_11N                                0x2B
+#define DM_REG_RF_2C_11N                                0x2C
+#define DM_REG_RXRF_A3_11N                              0x3C
+#define DM_REG_T_METER_92D_11N                          0x42
+#define DM_REG_T_METER_88E_11N                          0x42
+
+/*BB REG LIST*/
+/*PAGE 8 */
+#define DM_REG_BB_CTRL_11N                              0x800
+#define DM_REG_RF_PIN_11N                               0x804
+#define DM_REG_PSD_CTRL_11N                             0x808
+#define DM_REG_TX_ANT_CTRL_11N                          0x80C
+#define DM_REG_BB_PWR_SAV5_11N                          0x818
+#define DM_REG_CCK_RPT_FORMAT_11N                       0x824
+#define DM_REG_RX_DEFAULT_A_11N                         0x858
+#define DM_REG_RX_DEFAULT_B_11N                         0x85A
+#define DM_REG_BB_PWR_SAV3_11N                          0x85C
+#define DM_REG_ANTSEL_CTRL_11N                          0x860
+#define DM_REG_RX_ANT_CTRL_11N                          0x864
+#define DM_REG_PIN_CTRL_11N                             0x870
+#define DM_REG_BB_PWR_SAV1_11N                          0x874
+#define DM_REG_ANTSEL_PATH_11N                          0x878
+#define DM_REG_BB_3WIRE_11N                             0x88C
+#define DM_REG_SC_CNT_11N                               0x8C4
+#define DM_REG_PSD_DATA_11N                             0x8B4
+/*PAGE 9*/
+#define DM_REG_ANT_MAPPING1_11N                         0x914
+#define DM_REG_ANT_MAPPING2_11N                         0x918
+/*PAGE A*/
+#define DM_REG_CCK_ANTDIV_PARA1_11N                     0xA00
+#define DM_REG_CCK_CCA_11N                              0xA0A
+#define DM_REG_CCK_ANTDIV_PARA2_11N                     0xA0C
+#define DM_REG_CCK_ANTDIV_PARA3_11N                     0xA10
+#define DM_REG_CCK_ANTDIV_PARA4_11N                     0xA14
+#define DM_REG_CCK_FILTER_PARA1_11N                     0xA22
+#define DM_REG_CCK_FILTER_PARA2_11N                     0xA23
+#define DM_REG_CCK_FILTER_PARA3_11N                     0xA24
+#define DM_REG_CCK_FILTER_PARA4_11N                     0xA25
+#define DM_REG_CCK_FILTER_PARA5_11N                     0xA26
+#define DM_REG_CCK_FILTER_PARA6_11N                     0xA27
+#define DM_REG_CCK_FILTER_PARA7_11N                     0xA28
+#define DM_REG_CCK_FILTER_PARA8_11N                     0xA29
+#define DM_REG_CCK_FA_RST_11N                           0xA2C
+#define DM_REG_CCK_FA_MSB_11N                           0xA58
+#define DM_REG_CCK_FA_LSB_11N                           0xA5C
+#define DM_REG_CCK_CCA_CNT_11N                          0xA60
+#define DM_REG_BB_PWR_SAV4_11N                          0xA74
+/*PAGE B */
+#define DM_REG_LNA_SWITCH_11N                           0xB2C
+#define DM_REG_PATH_SWITCH_11N                          0xB30
+#define DM_REG_RSSI_CTRL_11N                            0xB38
+#define DM_REG_CONFIG_ANTA_11N                          0xB68
+#define DM_REG_RSSI_BT_11N                              0xB9C
+/*PAGE C */
+#define DM_REG_OFDM_FA_HOLDC_11N                        0xC00
+#define DM_REG_RX_PATH_11N                              0xC04
+#define DM_REG_TRMUX_11N                                0xC08
+#define DM_REG_OFDM_FA_RSTC_11N                         0xC0C
+#define DM_REG_RXIQI_MATRIX_11N                         0xC14
+#define DM_REG_TXIQK_MATRIX_LSB1_11N                    0xC4C
+#define DM_REG_IGI_A_11N                                0xC50
+#define DM_REG_ANTDIV_PARA2_11N                         0xC54
+#define DM_REG_IGI_B_11N                                0xC58
+#define DM_REG_ANTDIV_PARA3_11N                         0xC5C
+#define DM_REG_BB_PWR_SAV2_11N                          0xC70
+#define DM_REG_RX_OFF_11N                               0xC7C
+#define DM_REG_TXIQK_MATRIXA_11N                        0xC80
+#define DM_REG_TXIQK_MATRIXB_11N                        0xC88
+#define DM_REG_TXIQK_MATRIXA_LSB2_11N                   0xC94
+#define DM_REG_TXIQK_MATRIXB_LSB2_11N                   0xC9C
+#define DM_REG_RXIQK_MATRIX_LSB_11N                     0xCA0
+#define DM_REG_ANTDIV_PARA1_11N                         0xCA4
+#define DM_REG_OFDM_FA_TYPE1_11N                        0xCF0
+/*PAGE D */
+#define DM_REG_OFDM_FA_RSTD_11N                         0xD00
+#define DM_REG_OFDM_FA_TYPE2_11N                        0xDA0
+#define DM_REG_OFDM_FA_TYPE3_11N                        0xDA4
+#define DM_REG_OFDM_FA_TYPE4_11N                        0xDA8
+/*PAGE E */
+#define DM_REG_TXAGC_A_6_18_11N                         0xE00
+#define DM_REG_TXAGC_A_24_54_11N                        0xE04
+#define DM_REG_TXAGC_A_1_MCS32_11N                      0xE08
+#define DM_REG_TXAGC_A_MCS0_3_11N                       0xE10
+#define DM_REG_TXAGC_A_MCS4_7_11N                       0xE14
+#define DM_REG_TXAGC_A_MCS8_11_11N                      0xE18
+#define DM_REG_TXAGC_A_MCS12_15_11N                     0xE1C
+#define DM_REG_FPGA0_IQK_11N                            0xE28
+#define DM_REG_TXIQK_TONE_A_11N                         0xE30
+#define DM_REG_RXIQK_TONE_A_11N                         0xE34
+#define DM_REG_TXIQK_PI_A_11N                           0xE38
+#define DM_REG_RXIQK_PI_A_11N                           0xE3C
+#define DM_REG_TXIQK_11N                                0xE40
+#define DM_REG_RXIQK_11N                                0xE44
+#define DM_REG_IQK_AGC_PTS_11N                          0xE48
+#define DM_REG_IQK_AGC_RSP_11N                          0xE4C
+#define DM_REG_BLUETOOTH_11N                            0xE6C
+#define DM_REG_RX_WAIT_CCA_11N                          0xE70
+#define DM_REG_TX_CCK_RFON_11N                          0xE74
+#define DM_REG_TX_CCK_BBON_11N                          0xE78
+#define DM_REG_OFDM_RFON_11N                            0xE7C
+#define DM_REG_OFDM_BBON_11N                            0xE80
+#define DM_REG_TX2RX_11N                                0xE84
+#define DM_REG_TX2TX_11N                                0xE88
+#define DM_REG_RX_CCK_11N                               0xE8C
+#define DM_REG_RX_OFDM_11N                              0xED0
+#define DM_REG_RX_WAIT_RIFS_11N                         0xED4
+#define DM_REG_RX2RX_11N                                0xED8
+#define DM_REG_STANDBY_11N                              0xEDC
+#define DM_REG_SLEEP_11N                                0xEE0
+#define DM_REG_PMPD_ANAEN_11N                           0xEEC
+
+
+/*MAC REG LIST*/
+#define DM_REG_BB_RST_11N                               0x02
+#define DM_REG_ANTSEL_PIN_11N                           0x4C
+#define DM_REG_EARLY_MODE_11N                           0x4D0
+#define DM_REG_RSSI_MONITOR_11N                         0x4FE
+#define DM_REG_EDCA_VO_11N                              0x500
+#define DM_REG_EDCA_VI_11N                              0x504
+#define DM_REG_EDCA_BE_11N                              0x508
+#define DM_REG_EDCA_BK_11N                              0x50C
+#define DM_REG_TXPAUSE_11N                              0x522
+#define DM_REG_RESP_TX_11N                              0x6D8
+#define DM_REG_ANT_TRAIN_1                              0x7b0
+#define DM_REG_ANT_TRAIN_2                              0x7b4
+
+/*DIG Related*/
+#define DM_BIT_IGI_11N                                  0x0000007F
+
+#define HAL_DM_DIG_DISABLE                              BIT(0)
+#define HAL_DM_HIPWR_DISABLE                            BIT(1)
+
+#define OFDM_TABLE_LENGTH                               43
+#define CCK_TABLE_LENGTH                                33
+
+#define OFDM_TABLE_SIZE                                 43
+#define CCK_TABLE_SIZE                                  33
+
+#define BW_AUTO_SWITCH_HIGH_LOW                         25
+#define BW_AUTO_SWITCH_LOW_HIGH                         30
+
+#define DM_DIG_THRESH_HIGH                              40
+#define DM_DIG_THRESH_LOW                               35
+
+#define DM_FALSEALARM_THRESH_LOW                        400
+#define DM_FALSEALARM_THRESH_HIGH                       1000
+
+#define DM_DIG_MAX                                      0x3e
+#define DM_DIG_MIN                                      0x1e
+
+#define DM_DIG_MAX_AP                                   0x32
+#define DM_DIG_MIN_AP                                   0x20
+
+#define DM_DIG_FA_UPPER                                 0x3e
+#define DM_DIG_FA_LOWER                                 0x1e
+#define DM_DIG_FA_TH0                                   0x200
+#define DM_DIG_FA_TH1                                   0x300
+#define DM_DIG_FA_TH2                                   0x400
+
+#define DM_DIG_BACKOFF_MAX                              12
+#define DM_DIG_BACKOFF_MIN                              -4
+#define DM_DIG_BACKOFF_DEFAULT                          10
+
+#define RXPATHSELECTION_SS_TH_LOW                       30
+#define RXPATHSELECTION_DIFF_TH                         18
+
+#define DM_RATR_STA_INIT                                0
+#define DM_RATR_STA_HIGH                                1
+#define DM_RATR_STA_MIDDLE                              2
+#define DM_RATR_STA_LOW                                 3
+
+#define CTS2SELF_THVAL                                  30
+#define REGC38_TH                                       20
+
+#define WAIOTTHVAL                                      25
+
+#define TXHIGHPWRLEVEL_NORMAL                           0
+#define TXHIGHPWRLEVEL_LEVEL1                           1
+#define TXHIGHPWRLEVEL_LEVEL2                           2
+#define TXHIGHPWRLEVEL_BT1                              3
+#define TXHIGHPWRLEVEL_BT2                              4
+
+#define DM_TYPE_BYFW                                    0
+#define DM_TYPE_BYDRIVER                                1
+
+#define TX_POWER_NEAR_FIELD_THRESH_LVL2                 74
+#define TX_POWER_NEAR_FIELD_THRESH_LVL1                 67
+#define TXPWRTRACK_MAX_IDX                              6
+
+struct swat_t {
+        u8 failure_cnt;
+        u8 try_flag;
+        u8 stop_trying;
+        long pre_rssi;
+        long trying_threshold;
+        u8 cur_antenna;
+        u8 pre_antenna;
+};
+
+enum FAT_STATE {
+        FAT_NORMAL_STATE        = 0,
+        FAT_TRAINING_STATE = 1,
+};
+
+enum tag_dynamic_init_gain_operation_type_definition {
+        DIG_TYPE_THRESH_HIGH = 0,
+        DIG_TYPE_THRESH_LOW = 1,
+        DIG_TYPE_BACKOFF = 2,
+        DIG_TYPE_RX_GAIN_MIN = 3,
+        DIG_TYPE_RX_GAIN_MAX = 4,
+        DIG_TYPE_ENABLE = 5,
+        DIG_TYPE_DISABLE = 6,
+        DIG_OP_TYPE_MAX
+};
+
+enum tag_cck_packet_detection_threshold_type_definition {
+        CCK_PD_STAGE_LOWRSSI = 0,
+        CCK_PD_STAGE_HIGHRSSI = 1,
+        CCK_FA_STAGE_LOW = 2,
+        CCK_FA_STAGE_HIGH = 3,
+        CCK_PD_STAGE_MAX = 4,
+};
+
+enum dm_1r_cca_e {
+        CCA_1R = 0,
+        CCA_2R = 1,
+        CCA_MAX = 2,
+};
+
+enum dm_rf_e {
+        RF_SAVE = 0,
+        RF_NORMAL = 1,
+        RF_MAX = 2,
+};
+
+enum dm_sw_ant_switch_e {
+        ANS_ANTENNA_B = 1,
+        ANS_ANTENNA_A = 2,
+        ANS_ANTENNA_MAX = 3,
+};
+
+enum dm_dig_ext_port_alg_e {
+        DIG_EXT_PORT_STAGE_0 = 0,
+        DIG_EXT_PORT_STAGE_1 = 1,
+        DIG_EXT_PORT_STAGE_2 = 2,
+        DIG_EXT_PORT_STAGE_3 = 3,
+        DIG_EXT_PORT_STAGE_MAX = 4,
+};
+
+enum dm_dig_connect_e {
+        DIG_STA_DISCONNECT = 0,
+        DIG_STA_CONNECT = 1,
+        DIG_STA_BEFORE_CONNECT = 2,
+        DIG_MULTISTA_DISCONNECT = 3,
+        DIG_MULTISTA_CONNECT = 4,
+        DIG_CONNECT_MAX
+};
+
+enum pwr_track_control_method {
+        BBSWING,
+        TXAGC
+};
+
+void rtl88e_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
+                                     u8 *pdesc, u32 mac_id);
+void rtl88e_dm_ant_sel_statistics(struct ieee80211_hw *hw, u8 antsel_tr_mux,
+                                  u32 mac_id, u32 rx_pwdb_all);
+void rtl88e_dm_fast_antenna_training_callback(unsigned long data);
+void rtl88e_dm_init(struct ieee80211_hw *hw);
+void rtl88e_dm_watchdog(struct ieee80211_hw *hw);
+void rtl88e_dm_write_dig(struct ieee80211_hw *hw);
+void rtl88e_dm_init_edca_turbo(struct ieee80211_hw *hw);
+void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw);
+void rtl88e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
+void rtl88e_dm_txpower_track_adjust(struct ieee80211_hw *hw,
+                                    u8 type, u8 *pdirection,
+                                    u32 *poutwrite_val);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
new file mode 100644
index 000000000000..57e4cc5833a9
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
@@ -0,0 +1,830 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "reg.h"
+#include "def.h"
+#include "fw.h"
+
+#include <linux/kmemleak.h>
+
+static void _rtl88e_enable_fw_download(struct ieee80211_hw *hw, bool enable)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+
+        if (enable) {
+                tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmp | 0x04);
+
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, tmp | 0x01);
+
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL + 2);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL + 2, tmp & 0xf7);
+        } else {
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, tmp & 0xfe);
+
+                rtl_write_byte(rtlpriv, REG_MCUFWDL + 1, 0x00);
+        }
+}
+
+static void _rtl88e_fw_block_write(struct ieee80211_hw *hw,
+                                   const u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 blk_sz = sizeof(u32);
+        u8 *buf_ptr = (u8 *)buffer;
+        u32 *pu4BytePtr = (u32 *)buffer;
+        u32 i, offset, blk_cnt, remain;
+
+        blk_cnt = size / blk_sz;
+        remain = size % blk_sz;
+
+        for (i = 0; i < blk_cnt; i++) {
+                offset = i * blk_sz;
+                rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),
+                                *(pu4BytePtr + i));
+        }
+
+        if (remain) {
+                offset = blk_cnt * blk_sz;
+                buf_ptr += offset;
+                for (i = 0; i < remain; i++) {
+                        rtl_write_byte(rtlpriv, (FW_8192C_START_ADDRESS +
+                                                 offset + i), *(buf_ptr + i));
+                }
+        }
+}
+
+static void _rtl88e_fw_page_write(struct ieee80211_hw *hw,
+                                  u32 page, const u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value8;
+        u8 u8page = (u8) (page & 0x07);
+
+        value8 = (rtl_read_byte(rtlpriv, REG_MCUFWDL + 2) & 0xF8) | u8page;
+
+        rtl_write_byte(rtlpriv, (REG_MCUFWDL + 2), value8);
+        _rtl88e_fw_block_write(hw, buffer, size);
+}
+
+static void _rtl88e_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
+{
+        u32 fwlen = *pfwlen;
+        u8 remain = (u8) (fwlen % 4);
+
+        remain = (remain == 0) ? 0 : (4 - remain);
+
+        while (remain > 0) {
+                pfwbuf[fwlen] = 0;
+                fwlen++;
+                remain--;
+        }
+
+        *pfwlen = fwlen;
+}
+
+static void _rtl88e_write_fw(struct ieee80211_hw *hw,
+                             enum version_8188e version, u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 *buf_ptr = (u8 *)buffer;
+        u32 page_no, remain;
+        u32 page, offset;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);
+
+        _rtl88e_fill_dummy(buf_ptr, &size);
+
+        page_no = size / FW_8192C_PAGE_SIZE;
+        remain = size % FW_8192C_PAGE_SIZE;
+
+        if (page_no > 8) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Page numbers should not greater then 8\n");
+        }
+
+        for (page = 0; page < page_no; page++) {
+                offset = page * FW_8192C_PAGE_SIZE;
+                _rtl88e_fw_page_write(hw, page, (buf_ptr + offset),
+                                      FW_8192C_PAGE_SIZE);
+        }
+
+        if (remain) {
+                offset = page_no * FW_8192C_PAGE_SIZE;
+                page = page_no;
+                _rtl88e_fw_page_write(hw, page, (buf_ptr + offset), remain);
+        }
+}
+
+static int _rtl88e_fw_free_to_go(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int err = -EIO;
+        u32 counter = 0;
+        u32 value32;
+
+        do {
+                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+        } while ((counter++ < FW_8192C_POLLING_TIMEOUT_COUNT) &&
+                 (!(value32 & FWDL_CHKSUM_RPT)));
+
+        if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "chksum report faill ! REG_MCUFWDL:0x%08x .\n",
+                          value32);
+                goto exit;
+        }
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32);
+
+        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+        value32 |= MCUFWDL_RDY;
+        value32 &= ~WINTINI_RDY;
+        rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
+
+        rtl88e_firmware_selfreset(hw);
+        counter = 0;
+
+        do {
+                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+                if (value32 & WINTINI_RDY) {
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x.\n",
+                                  value32);
+                        err = 0;
+                        goto exit;
+                }
+
+                udelay(FW_8192C_POLLING_DELAY);
+
+        } while (counter++ < FW_8192C_POLLING_TIMEOUT_COUNT);
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32);
+
+exit:
+        return err;
+}
+
+int rtl88e_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl92c_firmware_header *pfwheader;
+        u8 *pfwdata;
+        u32 fwsize;
+        int err;
+        enum version_8188e version = rtlhal->version;
+
+        if (!rtlhal->pfirmware)
+                return 1;
+
+        pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
+        pfwdata = (u8 *)rtlhal->pfirmware;
+        fwsize = rtlhal->fwsize;
+        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                 "normal Firmware SIZE %d\n", fwsize);
+
+        if (IS_FW_HEADER_EXIST(pfwheader)) {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                         "Firmware Version(%d), Signature(%#x), Size(%d)\n",
+                         pfwheader->version, pfwheader->signature,
+                         (int)sizeof(struct rtl92c_firmware_header));
+
+                pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
+                fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
+        }
+
+        if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) {
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
+                rtl88e_firmware_selfreset(hw);
+        }
+        _rtl88e_enable_fw_download(hw, true);
+        _rtl88e_write_fw(hw, version, pfwdata, fwsize);
+        _rtl88e_enable_fw_download(hw, false);
+
+        err = _rtl88e_fw_free_to_go(hw);
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                 "Firmware is%s ready to run!\n", err ? " not" : "");
+        return 0;
+}
+
+static bool _rtl88e_check_fw_read_last_h2c(struct ieee80211_hw *hw, u8 boxnum)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 val_hmetfr;
+
+        val_hmetfr = rtl_read_byte(rtlpriv, REG_HMETFR);
+        if (((val_hmetfr >> boxnum) & BIT(0)) == 0)
+                return true;
+        return false;
+}
+
+static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
+                                     u8 element_id, u32 cmd_len,
+                                     u8 *cmd_b)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 boxnum;
+        u16 box_reg = 0, box_extreg = 0;
+        u8 u1b_tmp;
+        bool isfw_read = false;
+        u8 buf_index = 0;
+        bool write_sucess = false;
+        u8 wait_h2c_limit = 100;
+        u8 wait_writeh2c_limit = 100;
+        u8 boxc[4], boxext[2];
+        u32 h2c_waitcounter = 0;
+        unsigned long flag;
+        u8 idx;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
+
+        while (true) {
+                spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
+                if (rtlhal->h2c_setinprogress) {
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                 "H2C set in progress! Wait to set..element_id(%d).\n",
+                                 element_id);
+
+                        while (rtlhal->h2c_setinprogress) {
+                                spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
+                                                       flag);
+                                h2c_waitcounter++;
+                                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                         "Wait 100 us (%d times)...\n",
+                                         h2c_waitcounter);
+                                udelay(100);
+
+                                if (h2c_waitcounter > 1000)
+                                        return;
+                                spin_lock_irqsave(&rtlpriv->locks.h2c_lock,
+                                                  flag);
+                        }
+                        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+                } else {
+                        rtlhal->h2c_setinprogress = true;
+                        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+                        break;
+                }
+        }
+
+        while (!write_sucess) {
+                wait_writeh2c_limit--;
+                if (wait_writeh2c_limit == 0) {
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Write H2C fail because no trigger for FW INT!\n");
+                        break;
+                }
+
+                boxnum = rtlhal->last_hmeboxnum;
+                switch (boxnum) {
+                case 0:
+                        box_reg = REG_HMEBOX_0;
+                        box_extreg = REG_HMEBOX_EXT_0;
+                        break;
+                case 1:
+                        box_reg = REG_HMEBOX_1;
+                        box_extreg = REG_HMEBOX_EXT_1;
+                        break;
+                case 2:
+                        box_reg = REG_HMEBOX_2;
+                        box_extreg = REG_HMEBOX_EXT_2;
+                        break;
+                case 3:
+                        box_reg = REG_HMEBOX_3;
+                        box_extreg = REG_HMEBOX_EXT_3;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
+                        break;
+                }
+
+                isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum);
+                while (!isfw_read) {
+                        wait_h2c_limit--;
+                        if (wait_h2c_limit == 0) {
+                                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                         "Wating too long for FW read "
+                                         "clear HMEBox(%d)!\n", boxnum);
+                                break;
+                        }
+
+                        udelay(10);
+
+                        isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum);
+                        u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                 "Wating for FW read clear HMEBox(%d)!!! "
+                                 "0x130 = %2x\n", boxnum, u1b_tmp);
+                }
+
+                if (!isfw_read) {
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                 "Write H2C register BOX[%d] fail!!!!! "
+                                 "Fw do not read.\n", boxnum);
+                        break;
+                }
+
+                memset(boxc, 0, sizeof(boxc));
+                memset(boxext, 0, sizeof(boxext));
+                boxc[0] = element_id;
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                         "Write element_id box_reg(%4x) = %2x\n",
+                         box_reg, element_id);
+
+                switch (cmd_len) {
+                case 1:
+                case 2:
+                case 3:
+                        /*boxc[0] &= ~(BIT(7));*/
+                        memcpy((u8 *)(boxc) + 1, cmd_b + buf_index, cmd_len);
+
+                        for (idx = 0; idx < 4; idx++)
+                                rtl_write_byte(rtlpriv, box_reg+idx, boxc[idx]);
+                        break;
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                        /*boxc[0] |= (BIT(7));*/
+                        memcpy((u8 *)(boxext), cmd_b + buf_index+3, cmd_len-3);
+                        memcpy((u8 *)(boxc) + 1, cmd_b + buf_index, 3);
+
+                        for (idx = 0; idx < 2; idx++) {
+                                rtl_write_byte(rtlpriv, box_extreg + idx,
+                                               boxext[idx]);
+                        }
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_reg + idx,
+                                               boxc[idx]);
+                        }
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
+                        break;
+                }
+
+                write_sucess = true;
+
+                rtlhal->last_hmeboxnum = boxnum + 1;
+                if (rtlhal->last_hmeboxnum == 4)
+                        rtlhal->last_hmeboxnum = 0;
+
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                         "pHalData->last_hmeboxnum  = %d\n",
+                         rtlhal->last_hmeboxnum);
+        }
+
+        spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
+        rtlhal->h2c_setinprogress = false;
+        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
+}
+
+void rtl88e_fill_h2c_cmd(struct ieee80211_hw *hw,
+                         u8 element_id, u32 cmd_len, u8 *cmd_b)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 tmp_cmdbuf[2];
+
+        if (rtlhal->fw_ready == false) {
+                RT_ASSERT(false, "fail H2C cmd - Fw download fail!!!\n");
+                return;
+        }
+
+        memset(tmp_cmdbuf, 0, 8);
+        memcpy(tmp_cmdbuf, cmd_b, cmd_len);
+        _rtl88e_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
+
+        return;
+}
+
+void rtl88e_firmware_selfreset(struct ieee80211_hw *hw)
+{
+        u8 u1b_tmp;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp & (~BIT(2))));
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp | BIT(2)));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "8051Reset88E(): 8051 reset success.\n");
+}
+
+void rtl88e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 u1_h2c_set_pwrmode[H2C_88E_PWEMODE_LENGTH] = { 0 };
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 power_state = 0;
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
+        SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));
+        SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, 0);
+        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
+                                         (rtlpriv->mac80211.p2p) ?
+                                         ppsc->smart_ps : 1);
+        SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,
+                                               ppsc->reg_max_lps_awakeintvl);
+        SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);
+        if (mode == FW_PS_ACTIVE_MODE)
+                power_state |= FW_PWR_STATE_ACTIVE;
+        else
+                power_state |= FW_PWR_STATE_RF_OFF;
+        SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                      "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
+                      u1_h2c_set_pwrmode, H2C_88E_PWEMODE_LENGTH);
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_SETPWRMODE, H2C_88E_PWEMODE_LENGTH,
+                            u1_h2c_set_pwrmode);
+}
+
+void rtl88e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
+{
+        u8 u1_joinbssrpt_parm[1] = { 0 };
+
+        SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(u1_joinbssrpt_parm, mstatus);
+
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_JOINBSSRPT, 1, u1_joinbssrpt_parm);
+}
+
+void rtl88e_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
+                                   u8 ap_offload_enable)
+{
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u8 u1_apoffload_parm[H2C_88E_AP_OFFLOAD_LENGTH] = { 0 };
+
+        SET_H2CCMD_AP_OFFLOAD_ON(u1_apoffload_parm, ap_offload_enable);
+        SET_H2CCMD_AP_OFFLOAD_HIDDEN(u1_apoffload_parm, mac->hiddenssid);
+        SET_H2CCMD_AP_OFFLOAD_DENYANY(u1_apoffload_parm, 0);
+
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_AP_OFFLOAD, H2C_88E_AP_OFFLOAD_LENGTH,
+                            u1_apoffload_parm);
+}
+
+static bool _rtl88e_cmd_send_packet(struct ieee80211_hw *hw,
+                                    struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring;
+        struct rtl_tx_desc *pdesc;
+        struct sk_buff *pskb = NULL;
+        unsigned long flags;
+
+        ring = &rtlpci->tx_ring[BEACON_QUEUE];
+
+        pskb = __skb_dequeue(&ring->queue);
+        if (pskb)
+                kfree_skb(pskb);
+
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+
+        pdesc = &ring->desc[0];
+
+        rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *)pdesc, 1, 1, skb);
+
+        __skb_queue_tail(&ring->queue, skb);
+
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
+
+        rtlpriv->cfg->ops->tx_polling(hw, BEACON_QUEUE);
+
+        return true;
+}
+
+#define BEACON_PG               0 /* ->1 */
+#define PSPOLL_PG               2
+#define NULL_PG                 3
+#define PROBERSP_PG             4 /* ->5 */
+
+#define TOTAL_RESERVED_PKT_LEN  768
+
+static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {
+        /* page 0 beacon */
+        0x80, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0x00, 0xE0, 0x4C, 0x76, 0x00, 0x42,
+        0x00, 0x40, 0x10, 0x10, 0x00, 0x03, 0x50, 0x08,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x64, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x6C, 0x69,
+        0x6E, 0x6B, 0x73, 0x79, 0x73, 0x5F, 0x77, 0x6C,
+        0x61, 0x6E, 0x01, 0x04, 0x82, 0x84, 0x8B, 0x96,
+        0x03, 0x01, 0x01, 0x06, 0x02, 0x00, 0x00, 0x2A,
+        0x01, 0x00, 0x32, 0x08, 0x24, 0x30, 0x48, 0x6C,
+        0x0C, 0x12, 0x18, 0x60, 0x2D, 0x1A, 0x6C, 0x18,
+        0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x3D, 0x00, 0xDD, 0x06, 0x00, 0xE0, 0x4C, 0x02,
+        0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 1 beacon */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x10, 0x00, 0x20, 0x8C, 0x00, 0x12, 0x10, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 2  ps-poll */
+        0xA4, 0x10, 0x01, 0xC0, 0x00, 0x40, 0x10, 0x10,
+        0x00, 0x03, 0x00, 0xE0, 0x4C, 0x76, 0x00, 0x42,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x18, 0x00, 0x20, 0x8C, 0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 3  null */
+        0x48, 0x01, 0x00, 0x00, 0x00, 0x40, 0x10, 0x10,
+        0x00, 0x03, 0x00, 0xE0, 0x4C, 0x76, 0x00, 0x42,
+        0x00, 0x40, 0x10, 0x10, 0x00, 0x03, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x72, 0x00, 0x20, 0x8C, 0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 4  probe_resp */
+        0x50, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x10,
+        0x00, 0x03, 0x00, 0xE0, 0x4C, 0x76, 0x00, 0x42,
+        0x00, 0x40, 0x10, 0x10, 0x00, 0x03, 0x00, 0x00,
+        0x9E, 0x46, 0x15, 0x32, 0x27, 0xF2, 0x2D, 0x00,
+        0x64, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x6C, 0x69,
+        0x6E, 0x6B, 0x73, 0x79, 0x73, 0x5F, 0x77, 0x6C,
+        0x61, 0x6E, 0x01, 0x04, 0x82, 0x84, 0x8B, 0x96,
+        0x03, 0x01, 0x01, 0x06, 0x02, 0x00, 0x00, 0x2A,
+        0x01, 0x00, 0x32, 0x08, 0x24, 0x30, 0x48, 0x6C,
+        0x0C, 0x12, 0x18, 0x60, 0x2D, 0x1A, 0x6C, 0x18,
+        0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x3D, 0x00, 0xDD, 0x06, 0x00, 0xE0, 0x4C, 0x02,
+        0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 5  probe_resp */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct sk_buff *skb = NULL;
+
+        u32 totalpacketlen;
+        u8 u1RsvdPageLoc[5] = { 0 };
+
+        u8 *beacon;
+        u8 *pspoll;
+        u8 *nullfunc;
+        u8 *probersp;
+        /*---------------------------------------------------------
+         *                      (1) beacon
+         *---------------------------------------------------------
+         */
+        beacon = &reserved_page_packet[BEACON_PG * 128];
+        SET_80211_HDR_ADDRESS2(beacon, mac->mac_addr);
+        SET_80211_HDR_ADDRESS3(beacon, mac->bssid);
+
+        /*-------------------------------------------------------
+         *                      (2) ps-poll
+         *--------------------------------------------------------
+         */
+        pspoll = &reserved_page_packet[PSPOLL_PG * 128];
+        SET_80211_PS_POLL_AID(pspoll, (mac->assoc_id | 0xc000));
+        SET_80211_PS_POLL_BSSID(pspoll, mac->bssid);
+        SET_80211_PS_POLL_TA(pspoll, mac->mac_addr);
+
+        SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
+
+        /*--------------------------------------------------------
+         *                      (3) null data
+         *---------------------------------------------------------
+         */
+        nullfunc = &reserved_page_packet[NULL_PG * 128];
+        SET_80211_HDR_ADDRESS1(nullfunc, mac->bssid);
+        SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
+        SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
+
+        SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
+
+        /*---------------------------------------------------------
+         *                      (4) probe response
+         *----------------------------------------------------------
+         */
+        probersp = &reserved_page_packet[PROBERSP_PG * 128];
+        SET_80211_HDR_ADDRESS1(probersp, mac->bssid);
+        SET_80211_HDR_ADDRESS2(probersp, mac->mac_addr);
+        SET_80211_HDR_ADDRESS3(probersp, mac->bssid);
+
+        SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1RsvdPageLoc, PROBERSP_PG);
+
+        totalpacketlen = TOTAL_RESERVED_PKT_LEN;
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "rtl88e_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      &reserved_page_packet[0], totalpacketlen);
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                      "rtl88e_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      u1RsvdPageLoc, 3);
+
+        skb = dev_alloc_skb(totalpacketlen);
+        if (!skb)
+                return;
+        kmemleak_not_leak(skb);
+        memcpy(skb_put(skb, totalpacketlen),
+               &reserved_page_packet, totalpacketlen);
+
+        if (_rtl88e_cmd_send_packet(hw, skb)) {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "Set RSVD page location to Fw.\n");
+                RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                              "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 3);
+                rtl88e_fill_h2c_cmd(hw, H2C_88E_RSVDPAGE,
+                                    sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+        } else
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set RSVD page location to Fw FAIL!!!!!!.\n");
+}
+
+/*Shoud check FW support p2p or not.*/
+static void rtl88e_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw, u8 ctwindow)
+{
+        u8 u1_ctwindow_period[1] = {ctwindow};
+
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
+}
+
+void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_p2p_ps_info *p2pinfo = &(rtlps->p2p_ps_info);
+        struct p2p_ps_offload_t *p2p_ps_offload = &rtlhal->p2p_ps_offload;
+        u8      i;
+        u16     ctwindow;
+        u32     start_time, tsf_low;
+
+        switch (p2p_ps_state) {
+        case P2P_PS_DISABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
+                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
+                break;
+        case P2P_PS_ENABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
+                /* update CTWindow value. */
+                if (p2pinfo->ctwindow > 0) {
+                        p2p_ps_offload->ctwindow_en = 1;
+                        ctwindow = p2pinfo->ctwindow;
+                        rtl88e_set_p2p_ctw_period_cmd(hw, ctwindow);
+                }
+                /* hw only support 2 set of NoA */
+                for (i = 0; i < p2pinfo->noa_num; i++) {
+                        /* To control the register setting for which NOA*/
+                        rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
+                        if (i == 0)
+                                p2p_ps_offload->noa0_en = 1;
+                        else
+                                p2p_ps_offload->noa1_en = 1;
+
+                        /* config P2P NoA Descriptor Register */
+                        rtl_write_dword(rtlpriv, 0x5E0,
+                                        p2pinfo->noa_duration[i]);
+                        rtl_write_dword(rtlpriv, 0x5E4,
+                                        p2pinfo->noa_interval[i]);
+
+                        /*Get Current TSF value */
+                        tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                        start_time = p2pinfo->noa_start_time[i];
+                        if (p2pinfo->noa_count_type[i] != 1) {
+                                while (start_time <= (tsf_low + (50 * 1024))) {
+                                        start_time += p2pinfo->noa_interval[i];
+                                        if (p2pinfo->noa_count_type[i] != 255)
+                                                p2pinfo->noa_count_type[i]--;
+                                }
+                        }
+                        rtl_write_dword(rtlpriv, 0x5E8, start_time);
+                        rtl_write_dword(rtlpriv, 0x5EC,
+                                        p2pinfo->noa_count_type[i]);
+                }
+
+                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                        /* rst p2p circuit */
+                        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
+
+                        p2p_ps_offload->offload_en = 1;
+
+                        if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
+                                p2p_ps_offload->role = 1;
+                                p2p_ps_offload->allstasleep = 0;
+                        } else {
+                                p2p_ps_offload->role = 0;
+                        }
+
+                        p2p_ps_offload->discovery = 0;
+                }
+                break;
+        case P2P_PS_SCAN:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
+                p2p_ps_offload->discovery = 1;
+                break;
+        case P2P_PS_SCAN_DONE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
+                p2p_ps_offload->discovery = 0;
+                p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
+                break;
+        default:
+                break;
+        }
+
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_P2P_PS_OFFLOAD, 1,
+                            (u8 *)p2p_ps_offload);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h
new file mode 100644
index 000000000000..854a9875cd5f
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h
@@ -0,0 +1,301 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92C__FW__H__
+#define __RTL92C__FW__H__
+
+#define FW_8192C_SIZE                           0x8000
+#define FW_8192C_START_ADDRESS                  0x1000
+#define FW_8192C_END_ADDRESS                    0x5FFF
+#define FW_8192C_PAGE_SIZE                      4096
+#define FW_8192C_POLLING_DELAY                  5
+#define FW_8192C_POLLING_TIMEOUT_COUNT          3000
+
+#define IS_FW_HEADER_EXIST(_pfwhdr)             \
+        ((_pfwhdr->signature&0xFFFF) == 0x88E1)
+#define USE_OLD_WOWLAN_DEBUG_FW                 0
+
+#define H2C_88E_RSVDPAGE_LOC_LEN                5
+#define H2C_88E_PWEMODE_LENGTH                  5
+#define H2C_88E_JOINBSSRPT_LENGTH               1
+#define H2C_88E_AP_OFFLOAD_LENGTH               3
+#define H2C_88E_WOWLAN_LENGTH                   3
+#define H2C_88E_KEEP_ALIVE_CTRL_LENGTH          3
+#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
+#define H2C_88E_REMOTE_WAKE_CTRL_LEN            1
+#else
+#define H2C_88E_REMOTE_WAKE_CTRL_LEN            3
+#endif
+#define H2C_88E_AOAC_GLOBAL_INFO_LEN            2
+#define H2C_88E_AOAC_RSVDPAGE_LOC_LEN           7
+
+/* Fw PS state for RPWM.
+ * BIT[2:0] = HW state
+ * BIT[3] = Protocol PS state, 1: register active state, 0: register sleep state
+ * BIT[4] = sub-state
+ */
+#define FW_PS_GO_ON                     BIT(0)
+#define FW_PS_TX_NULL                   BIT(1)
+#define FW_PS_RF_ON                     BIT(2)
+#define FW_PS_REGISTER_ACTIVE           BIT(3)
+
+#define FW_PS_DPS                       BIT(0)
+#define FW_PS_LCLK                      (FW_PS_DPS)
+#define FW_PS_RF_OFF                    BIT(1)
+#define FW_PS_ALL_ON                    BIT(2)
+#define FW_PS_ST_ACTIVE                 BIT(3)
+#define FW_PS_ISR_ENABLE                BIT(4)
+#define FW_PS_IMR_ENABLE                BIT(5)
+
+
+#define FW_PS_ACK                       BIT(6)
+#define FW_PS_TOGGLE                    BIT(7)
+
+ /* 88E RPWM value*/
+ /* BIT[0] = 1: 32k, 0: 40M*/
+#define FW_PS_CLOCK_OFF                 BIT(0)          /* 32k*/
+#define FW_PS_CLOCK_ON                  0               /*40M*/
+
+#define FW_PS_STATE_MASK                (0x0F)
+#define FW_PS_STATE_HW_MASK             (0x07)
+/*ISR_ENABLE, IMR_ENABLE, and PS mode should be inherited.*/
+#define FW_PS_STATE_INT_MASK            (0x3F)
+
+#define FW_PS_STATE(x)                  (FW_PS_STATE_MASK & (x))
+#define FW_PS_STATE_HW(x)               (FW_PS_STATE_HW_MASK & (x))
+#define FW_PS_STATE_INT(x)              (FW_PS_STATE_INT_MASK & (x))
+#define FW_PS_ISR_VAL(x)                ((x) & 0x70)
+#define FW_PS_IMR_MASK(x)               ((x) & 0xDF)
+#define FW_PS_KEEP_IMR(x)               ((x) & 0x20)
+
+#define FW_PS_STATE_S0                  (FW_PS_DPS)
+#define FW_PS_STATE_S1                  (FW_PS_LCLK)
+#define FW_PS_STATE_S2                  (FW_PS_RF_OFF)
+#define FW_PS_STATE_S3                  (FW_PS_ALL_ON)
+#define FW_PS_STATE_S4                  ((FW_PS_ST_ACTIVE) | (FW_PS_ALL_ON))
+
+#define FW_PS_STATE_ALL_ON_88E          (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_ON_88E           (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_OFF_88E          (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_OFF_LOW_PWR_88E  (FW_PS_CLOCK_OFF)
+
+#define FW_PS_STATE_ALL_ON_92C          (FW_PS_STATE_S4)
+#define FW_PS_STATE_RF_ON_92C           (FW_PS_STATE_S3)
+#define FW_PS_STATE_RF_OFF_92C          (FW_PS_STATE_S2)
+#define FW_PS_STATE_RF_OFF_LOW_PWR_92C  (FW_PS_STATE_S1)
+
+/* For 88E H2C PwrMode Cmd ID 5.*/
+#define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
+#define FW_PWR_STATE_RF_OFF             0
+
+#define FW_PS_IS_ACK(x)                 ((x) & FW_PS_ACK)
+#define FW_PS_IS_CLK_ON(x)              ((x) & (FW_PS_RF_OFF | FW_PS_ALL_ON))
+#define FW_PS_IS_RF_ON(x)               ((x) & (FW_PS_ALL_ON))
+#define FW_PS_IS_ACTIVE(x)              ((x) & (FW_PS_ST_ACTIVE))
+#define FW_PS_IS_CPWM_INT(x)            ((x) & 0x40)
+
+#define FW_CLR_PS_STATE(x)              ((x) = ((x) & (0xF0)))
+
+#define IS_IN_LOW_POWER_STATE_88E(fwpsstate)            \
+        (FW_PS_STATE(fwpsstate) == FW_PS_CLOCK_OFF)
+
+#define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
+#define FW_PWR_STATE_RF_OFF             0
+
+struct rtl92c_firmware_header {
+        u16 signature;
+        u8 category;
+        u8 function;
+        u16 version;
+        u8 subversion;
+        u8 rsvd1;
+        u8 month;
+        u8 date;
+        u8 hour;
+        u8 minute;
+        u16 ramcodesize;
+        u16 rsvd2;
+        u32 svnindex;
+        u32 rsvd3;
+        u32 rsvd4;
+        u32 rsvd5;
+};
+
+enum rtl8192c_h2c_cmd {
+        H2C_88E_RSVDPAGE = 0,
+        H2C_88E_JOINBSSRPT = 1,
+        H2C_88E_SCAN = 2,
+        H2C_88E_KEEP_ALIVE_CTRL = 3,
+        H2C_88E_DISCONNECT_DECISION = 4,
+#if (USE_OLD_WOWLAN_DEBUG_FW == 1)
+        H2C_88E_WO_WLAN = 5,
+#endif
+        H2C_88E_INIT_OFFLOAD = 6,
+#if (USE_OLD_WOWLAN_DEBUG_FW == 1)
+        H2C_88E_REMOTE_WAKE_CTRL = 7,
+#endif
+        H2C_88E_AP_OFFLOAD = 8,
+        H2C_88E_BCN_RSVDPAGE = 9,
+        H2C_88E_PROBERSP_RSVDPAGE = 10,
+
+        H2C_88E_SETPWRMODE = 0x20,
+        H2C_88E_PS_TUNING_PARA = 0x21,
+        H2C_88E_PS_TUNING_PARA2 = 0x22,
+        H2C_88E_PS_LPS_PARA = 0x23,
+        H2C_88E_P2P_PS_OFFLOAD = 024,
+
+#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
+        H2C_88E_WO_WLAN = 0x80,
+        H2C_88E_REMOTE_WAKE_CTRL = 0x81,
+        H2C_88E_AOAC_GLOBAL_INFO = 0x82,
+        H2C_88E_AOAC_RSVDPAGE = 0x83,
+#endif
+        /* Not defined in new 88E H2C CMD Format */
+        H2C_88E_RA_MASK,
+        H2C_88E_SELECTIVE_SUSPEND_ROF_CMD,
+        H2C_88E_P2P_PS_MODE,
+        H2C_88E_PSD_RESULT,
+        /*Not defined CTW CMD for P2P yet*/
+        H2C_88E_P2P_PS_CTW_CMD,
+        MAX_88E_H2CCMD
+};
+
+#define pagenum_128(_len)       (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))
+
+#define SET_88E_H2CCMD_WOWLAN_FUNC_ENABLE(__cmd, __value)               \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_PATTERN_MATCH_ENABLE(__cmd, __value)      \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_MAGIC_PKT_ENABLE(__cmd, __value)  \
+        SET_BITS_TO_LE_1BYTE(__cmd, 2, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_UNICAST_PKT_ENABLE(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE(__cmd, 3, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_ALL_PKT_DROP(__cmd, __value)              \
+        SET_BITS_TO_LE_1BYTE(__cmd, 4, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_GPIO_ACTIVE(__cmd, __value)               \
+        SET_BITS_TO_LE_1BYTE(__cmd, 5, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_REKEY_WAKE_UP(__cmd, __value)             \
+        SET_BITS_TO_LE_1BYTE(__cmd, 6, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_DISCONNECT_WAKE_UP(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE(__cmd, 7, 1, __value)
+#define SET_88E_H2CCMD_WOWLAN_GPIONUM(__cmd, __value)           \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+#define SET_88E_H2CCMD_WOWLAN_GPIO_DURATION(__cmd, __value)             \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+
+
+#define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)                  \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_RLBM(__cmd, __value)            \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 4, __value)
+#define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__cmd, __value)                \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 4, 4, __value)
+#define SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(__cmd, __value)  \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#define SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
+#define SET_H2CCMD_PWRMODE_PARM_PWR_STATE(__cmd, __value)               \
+        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __value)
+#define GET_88E_H2CCMD_PWRMODE_PARM_MODE(__cmd)                 \
+        LE_BITS_TO_1BYTE(__cmd, 0, 8)
+
+#define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__ph2ccmd, __val)                \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
+
+/* AP_OFFLOAD */
+#define SET_H2CCMD_AP_OFFLOAD_ON(__cmd, __value)                        \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 8, __value)
+#define SET_H2CCMD_AP_OFFLOAD_HIDDEN(__cmd, __value)            \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+#define SET_H2CCMD_AP_OFFLOAD_DENYANY(__cmd, __value)           \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#define SET_H2CCMD_AP_OFFLOAD_WAKEUP_EVT_RPT(__cmd, __value)    \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
+
+/* Keep Alive Control*/
+#define SET_88E_H2CCMD_KEEP_ALIVE_ENABLE(__cmd, __value)                \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_88E_H2CCMD_KEEP_ALIVE_ACCPEPT_USER_DEFINED(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_88E_H2CCMD_KEEP_ALIVE_PERIOD(__cmd, __value)                \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+
+/*REMOTE_WAKE_CTRL */
+#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_EN(__cmd, __value)              \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
+#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_ARP_OFFLOAD_EN(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_NDP_OFFLOAD_EN(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 2, 1, __value)
+#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_GTK_OFFLOAD_EN(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 3, 1, __value)
+#else
+#define SET_88E_H2_REM_WAKE_ENC_ALG(__cmd, __value)             \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_GROUP_ENC_ALG(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#endif
+
+/* GTK_OFFLOAD */
+#define SET_88E_H2CCMD_AOAC_GLOBAL_INFO_PAIRWISE_ENC_ALG(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 8, __value)
+#define SET_88E_H2CCMD_AOAC_GLOBAL_INFO_GROUP_ENC_ALG(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+
+/* AOAC_RSVDPAGE_LOC */
+#define SET_88E_H2CCMD_AOAC_RSVD_LOC_REM_WAKE_CTRL_INFO(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd), 0, 8, __value)
+#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_NEIGHBOR_ADV(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_RSP(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
+#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_INFO(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __value)
+
+int rtl88e_download_fw(struct ieee80211_hw *hw,
+                       bool buse_wake_on_wlan_fw);
+void rtl88e_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
+                         u32 cmd_len, u8 *p_cmdbuffer);
+void rtl88e_firmware_selfreset(struct ieee80211_hw *hw);
+void rtl88e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
+void rtl88e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw,
+                                      u8 mstatus);
+void rtl88e_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,  u8 enable);
+void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
+void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
new file mode 100644
index 000000000000..b68cae3024fc
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
@@ -0,0 +1,2530 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../efuse.h"
+#include "../base.h"
+#include "../regd.h"
+#include "../cam.h"
+#include "../ps.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "led.h"
+#include "hw.h"
+#include "pwrseqcmd.h"
+#include "pwrseq.h"
+
+#define LLT_CONFIG              5
+
+static void _rtl88ee_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
+                                      u8 set_bits, u8 clear_bits)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpci->reg_bcn_ctrl_val |= set_bits;
+        rtlpci->reg_bcn_ctrl_val &= ~clear_bits;
+
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8) rtlpci->reg_bcn_ctrl_val);
+}
+
+static void _rtl88ee_stop_tx_beacon(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp1byte;
+
+        tmp1byte = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp1byte & (~BIT(6)));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0x64);
+        tmp1byte = rtl_read_byte(rtlpriv, REG_TBTT_PROHIBIT + 2);
+        tmp1byte &= ~(BIT(0));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp1byte);
+}
+
+static void _rtl88ee_resume_tx_beacon(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp1byte;
+
+        tmp1byte = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp1byte | BIT(6));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0xff);
+        tmp1byte = rtl_read_byte(rtlpriv, REG_TBTT_PROHIBIT + 2);
+        tmp1byte |= BIT(0);
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp1byte);
+}
+
+static void _rtl88ee_enable_bcn_sub_func(struct ieee80211_hw *hw)
+{
+        _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(1));
+}
+
+static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
+
+        while (skb_queue_len(&ring->queue)) {
+                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
+                struct sk_buff *skb = __skb_dequeue(&ring->queue);
+
+                pci_unmap_single(rtlpci->pdev,
+                                 rtlpriv->cfg->ops->get_desc(
+                                 (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
+                                 skb->len, PCI_DMA_TODEVICE);
+                kfree_skb(skb);
+                ring->idx = (ring->idx + 1) % ring->entries;
+        }
+}
+
+static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw)
+{
+        _rtl88ee_set_bcn_ctrl_reg(hw, BIT(1), 0);
+}
+
+static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw,
+                                     u8 rpwm_val, bool need_turn_off_ckk)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool support_remote_wake_up;
+        u32 count = 0, isr_regaddr, content;
+        bool schedule_timer = need_turn_off_ckk;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&support_remote_wake_up));
+        if (!rtlhal->fw_ready)
+                return;
+        if (!rtlpriv->psc.fw_current_inpsmode)
+                return;
+
+        while (1) {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (rtlhal->fw_clk_change_in_progress) {
+                        while (rtlhal->fw_clk_change_in_progress) {
+                                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                                udelay(100);
+                                if (++count > 1000)
+                                        return;
+                                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                        }
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                } else {
+                        rtlhal->fw_clk_change_in_progress = false;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                }
+        }
+
+        if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) {
+                rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
+                if (FW_PS_IS_ACK(rpwm_val)) {
+                        isr_regaddr = REG_HISR;
+                        content = rtl_read_dword(rtlpriv, isr_regaddr);
+                        while (!(content & IMR_CPWM) && (count < 500)) {
+                                udelay(50);
+                                count++;
+                                content = rtl_read_dword(rtlpriv, isr_regaddr);
+                        }
+
+                        if (content & IMR_CPWM) {
+                                rtl_write_word(rtlpriv, isr_regaddr, 0x0100);
+                                rtlhal->fw_ps_state = FW_PS_STATE_RF_ON_88E;
+                                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                         "Receive CPWM INT!!! Set pHalData->FwPSState = %X\n",
+                                         rtlhal->fw_ps_state);
+                        }
+                }
+
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                rtlhal->fw_clk_change_in_progress = false;
+                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (schedule_timer) {
+                        mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                                  jiffies + MSECS(10));
+                }
+        } else  {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                rtlhal->fw_clk_change_in_progress = false;
+                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+        }
+}
+
+static void _rtl88ee_set_fw_clock_off(struct ieee80211_hw *hw,
+                                      u8 rpwm_val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring;
+        enum rf_pwrstate rtstate;
+        bool schedule_timer = false;
+        u8 queue;
+
+        if (!rtlhal->fw_ready)
+                return;
+        if (!rtlpriv->psc.fw_current_inpsmode)
+                return;
+        if (!rtlhal->allow_sw_to_change_hwclc)
+                return;
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE, (u8 *)(&rtstate));
+        if (rtstate == ERFOFF || rtlpriv->psc.inactive_pwrstate == ERFOFF)
+                return;
+
+        for (queue = 0; queue < RTL_PCI_MAX_TX_QUEUE_COUNT; queue++) {
+                ring = &rtlpci->tx_ring[queue];
+                if (skb_queue_len(&ring->queue)) {
+                        schedule_timer = true;
+                        break;
+                }
+        }
+
+        if (schedule_timer) {
+                mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                          jiffies + MSECS(10));
+                return;
+        }
+
+        if (FW_PS_STATE(rtlhal->fw_ps_state) !=
+            FW_PS_STATE_RF_OFF_LOW_PWR_88E) {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (!rtlhal->fw_clk_change_in_progress) {
+                        rtlhal->fw_clk_change_in_progress = true;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val);
+                        rtl_write_word(rtlpriv, REG_HISR, 0x0100);
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                                      (u8 *)(&rpwm_val));
+                        spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                        rtlhal->fw_clk_change_in_progress = false;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                } else {
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                                  jiffies + MSECS(10));
+                }
+        }
+}
+
+static void _rtl88ee_set_fw_ps_rf_on(struct ieee80211_hw *hw)
+{
+        u8 rpwm_val = 0;
+
+        rpwm_val |= (FW_PS_STATE_RF_OFF_88E | FW_PS_ACK);
+        _rtl88ee_set_fw_clock_on(hw, rpwm_val, true);
+}
+
+static void _rtl88ee_set_fw_ps_rf_off_low_power(struct ieee80211_hw *hw)
+{
+        u8 rpwm_val = 0;
+
+        rpwm_val |= FW_PS_STATE_RF_OFF_LOW_PWR_88E;
+        _rtl88ee_set_fw_clock_off(hw, rpwm_val);
+}
+
+void rtl88ee_fw_clk_off_timer_callback(unsigned long data)
+{
+        struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
+
+        _rtl88ee_set_fw_ps_rf_off_low_power(hw);
+}
+
+static void _rtl88ee_fwlps_leave(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inps = false;
+        u8 rpwm_val = 0, fw_pwrmode = FW_PS_ACTIVE_MODE;
+
+        if (ppsc->low_power_enable) {
+                rpwm_val = (FW_PS_STATE_ALL_ON_88E|FW_PS_ACK);/* RF on */
+                _rtl88ee_set_fw_clock_on(hw, rpwm_val, false);
+                rtlhal->allow_sw_to_change_hwclc = false;
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&fw_pwrmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+        } else {
+                rpwm_val = FW_PS_STATE_ALL_ON_88E;      /* RF on */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&fw_pwrmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+        }
+}
+
+static void _rtl88ee_fwlps_enter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inps = true;
+        u8 rpwm_val;
+
+        if (ppsc->low_power_enable) {
+                rpwm_val = FW_PS_STATE_RF_OFF_LOW_PWR_88E;      /* RF off */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&ppsc->fwctrl_psmode));
+                rtlhal->allow_sw_to_change_hwclc = true;
+                _rtl88ee_set_fw_clock_off(hw, rpwm_val);
+        } else {
+                rpwm_val = FW_PS_STATE_RF_OFF_88E;      /* RF off */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&ppsc->fwctrl_psmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
+        }
+}
+
+void rtl88ee_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        switch (variable) {
+        case HW_VAR_RCR:
+                *((u32 *)(val)) = rtlpci->receive_config;
+                break;
+        case HW_VAR_RF_STATE:
+                *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
+                break;
+        case HW_VAR_FWLPS_RF_ON:{
+                        enum rf_pwrstate rfstate;
+                        u32 val_rcr;
+
+                        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
+                                                      (u8 *)(&rfstate));
+                        if (rfstate == ERFOFF) {
+                                *((bool *)(val)) = true;
+                        } else {
+                                val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
+                                val_rcr &= 0x00070000;
+                                if (val_rcr)
+                                        *((bool *)(val)) = false;
+                                else
+                                        *((bool *)(val)) = true;
+                        }
+                        break;
+                }
+        case HW_VAR_FW_PSMODE_STATUS:
+                *((bool *)(val)) = ppsc->fw_current_inpsmode;
+                break;
+        case HW_VAR_CORRECT_TSF:{
+                u64 tsf;
+                u32 *ptsf_low = (u32 *)&tsf;
+                u32 *ptsf_high = ((u32 *)&tsf) + 1;
+
+                *ptsf_high = rtl_read_dword(rtlpriv, (REG_TSFTR + 4));
+                *ptsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                *((u64 *)(val)) = tsf;
+                break; }
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process %x\n", variable);
+                break;
+        }
+}
+
+void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 idx;
+
+        switch (variable) {
+        case HW_VAR_ETHER_ADDR:
+                for (idx = 0; idx < ETH_ALEN; idx++)
+                        rtl_write_byte(rtlpriv, (REG_MACID + idx), val[idx]);
+                break;
+        case HW_VAR_BASIC_RATE:{
+                u16 rate_cfg = ((u16 *)val)[0];
+                u8 rate_index = 0;
+                rate_cfg = rate_cfg & 0x15f;
+                rate_cfg |= 0x01;
+                rtl_write_byte(rtlpriv, REG_RRSR, rate_cfg & 0xff);
+                rtl_write_byte(rtlpriv, REG_RRSR + 1, (rate_cfg >> 8) & 0xff);
+                while (rate_cfg > 0x1) {
+                        rate_cfg = (rate_cfg >> 1);
+                        rate_index++;
+                }
+                rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, rate_index);
+                break; }
+        case HW_VAR_BSSID:
+                for (idx = 0; idx < ETH_ALEN; idx++)
+                        rtl_write_byte(rtlpriv, (REG_BSSID + idx), val[idx]);
+                break;
+        case HW_VAR_SIFS:
+                rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_SIFS_TRX + 1, val[1]);
+
+                rtl_write_byte(rtlpriv, REG_SPEC_SIFS + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
+
+                if (!mac->ht_enable)
+                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM, 0x0e0e);
+                else
+                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
+                                       *((u16 *)val));
+                break;
+        case HW_VAR_SLOT_TIME:{
+                u8 e_aci;
+
+                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                         "HW_VAR_SLOT_TIME %x\n", val[0]);
+
+                rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
+
+                for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+                                                      (u8 *)(&e_aci));
+                }
+                break; }
+        case HW_VAR_ACK_PREAMBLE:{
+                u8 reg_tmp;
+                u8 short_preamble = (bool) (*(u8 *)val);
+                reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL+2);
+                if (short_preamble) {
+                        reg_tmp |= 0x02;
+                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL + 2, reg_tmp);
+                } else {
+                        reg_tmp |= 0xFD;
+                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL + 2, reg_tmp);
+                }
+                break; }
+        case HW_VAR_WPA_CONFIG:
+                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));
+                break;
+        case HW_VAR_AMPDU_MIN_SPACE:{
+                u8 min_spacing_to_set;
+                u8 sec_min_space;
+
+                min_spacing_to_set = *((u8 *)val);
+                if (min_spacing_to_set <= 7) {
+                        sec_min_space = 0;
+
+                        if (min_spacing_to_set < sec_min_space)
+                                min_spacing_to_set = sec_min_space;
+
+                        mac->min_space_cfg = ((mac->min_space_cfg &
+                                               0xf8) | min_spacing_to_set);
+
+                        *val = min_spacing_to_set;
+
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                  mac->min_space_cfg);
+
+                        rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
+                                       mac->min_space_cfg);
+                }
+                break; }
+        case HW_VAR_SHORTGI_DENSITY:{
+                u8 density_to_set;
+
+                density_to_set = *((u8 *)val);
+                mac->min_space_cfg |= (density_to_set << 3);
+
+                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                         "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                          mac->min_space_cfg);
+
+                rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
+                               mac->min_space_cfg);
+                break; }
+        case HW_VAR_AMPDU_FACTOR:{
+                u8 regtoset_normal[4] = { 0x41, 0xa8, 0x72, 0xb9 };
+                u8 factor;
+                u8 *reg = NULL;
+                u8 id = 0;
+
+                reg = regtoset_normal;
+
+                factor = *((u8 *)val);
+                if (factor <= 3) {
+                        factor = (1 << (factor + 2));
+                        if (factor > 0xf)
+                                factor = 0xf;
+
+                        for (id = 0; id < 4; id++) {
+                                if ((reg[id] & 0xf0) > (factor << 4))
+                                        reg[id] = (reg[id] & 0x0f) |
+                                                  (factor << 4);
+
+                                if ((reg[id] & 0x0f) > factor)
+                                        reg[id] = (reg[id] & 0xf0) | (factor);
+
+                                rtl_write_byte(rtlpriv, (REG_AGGLEN_LMT + id),
+                                               reg[id]);
+                        }
+
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "Set HW_VAR_AMPDU_FACTOR: %#x\n", factor);
+                }
+                break; }
+        case HW_VAR_AC_PARAM:{
+                u8 e_aci = *((u8 *)val);
+                rtl88e_dm_init_edca_turbo(hw);
+
+                if (rtlpci->acm_method != eAcmWay2_SW)
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
+                                                      (u8 *)(&e_aci));
+                break; }
+        case HW_VAR_ACM_CTRL:{
+                u8 e_aci = *((u8 *)val);
+                union aci_aifsn *p_aci_aifsn =
+                    (union aci_aifsn *)(&(mac->ac[0].aifs));
+                u8 acm = p_aci_aifsn->f.acm;
+                u8 acm_ctrl = rtl_read_byte(rtlpriv, REG_ACMHWCTRL);
+
+                acm_ctrl = acm_ctrl | ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
+
+                if (acm) {
+                        switch (e_aci) {
+                        case AC0_BE:
+                                acm_ctrl |= ACMHW_BEQEN;
+                                break;
+                        case AC2_VI:
+                                acm_ctrl |= ACMHW_VIQEN;
+                                break;
+                        case AC3_VO:
+                                acm_ctrl |= ACMHW_VOQEN;
+                                break;
+                        default:
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                         acm);
+                                break;
+                        }
+                } else {
+                        switch (e_aci) {
+                        case AC0_BE:
+                                acm_ctrl &= (~ACMHW_BEQEN);
+                                break;
+                        case AC2_VI:
+                                acm_ctrl &= (~ACMHW_VIQEN);
+                                break;
+                        case AC3_VO:
+                                acm_ctrl &= (~ACMHW_BEQEN);
+                                break;
+                        default:
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                         "switch case not process\n");
+                                break;
+                        }
+                }
+
+                RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
+                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                         acm_ctrl);
+                rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
+                break; }
+        case HW_VAR_RCR:
+                rtl_write_dword(rtlpriv, REG_RCR, ((u32 *)(val))[0]);
+                rtlpci->receive_config = ((u32 *)(val))[0];
+                break;
+        case HW_VAR_RETRY_LIMIT:{
+                u8 retry_limit = ((u8 *)(val))[0];
+
+                rtl_write_word(rtlpriv, REG_RL,
+                               retry_limit << RETRY_LIMIT_SHORT_SHIFT |
+                               retry_limit << RETRY_LIMIT_LONG_SHIFT);
+                break; }
+        case HW_VAR_DUAL_TSF_RST:
+                rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));
+                break;
+        case HW_VAR_EFUSE_BYTES:
+                rtlefuse->efuse_usedbytes = *((u16 *)val);
+                break;
+        case HW_VAR_EFUSE_USAGE:
+                rtlefuse->efuse_usedpercentage = *((u8 *)val);
+                break;
+        case HW_VAR_IO_CMD:
+                rtl88e_phy_set_io_cmd(hw, (*(enum io_type *)val));
+                break;
+        case HW_VAR_SET_RPWM:{
+                u8 rpwm_val;
+
+                rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM);
+                udelay(1);
+
+                if (rpwm_val & BIT(7)) {
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                       (*(u8 *)val));
+                } else {
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                       ((*(u8 *)val) | BIT(7)));
+                }
+                break; }
+        case HW_VAR_H2C_FW_PWRMODE:
+                rtl88e_set_fw_pwrmode_cmd(hw, (*(u8 *)val));
+                break;
+        case HW_VAR_FW_PSMODE_STATUS:
+                ppsc->fw_current_inpsmode = *((bool *)val);
+                break;
+        case HW_VAR_RESUME_CLK_ON:
+                _rtl88ee_set_fw_ps_rf_on(hw);
+                break;
+        case HW_VAR_FW_LPS_ACTION:{
+                bool enter_fwlps = *((bool *)val);
+
+                if (enter_fwlps)
+                        _rtl88ee_fwlps_enter(hw);
+                 else
+                        _rtl88ee_fwlps_leave(hw);
+                 break; }
+        case HW_VAR_H2C_FW_JOINBSSRPT:{
+                u8 mstatus = (*(u8 *)val);
+                u8 tmp, tmp_reg422, uval;
+                u8 count = 0, dlbcn_count = 0;
+                bool recover = false;
+
+                if (mstatus == RT_MEDIA_CONNECT) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID, NULL);
+
+                        tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
+                        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp | BIT(0)));
+
+                        _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(3));
+                        _rtl88ee_set_bcn_ctrl_reg(hw, BIT(4), 0);
+
+                        tmp_reg422 = rtl_read_byte(rtlpriv,
+                                                   REG_FWHW_TXQ_CTRL + 2);
+                        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
+                                       tmp_reg422 & (~BIT(6)));
+                        if (tmp_reg422 & BIT(6))
+                                recover = true;
+
+                        do {
+                                uval = rtl_read_byte(rtlpriv, REG_TDECTRL+2);
+                                rtl_write_byte(rtlpriv, REG_TDECTRL+2,
+                                               (uval | BIT(0)));
+                                _rtl88ee_return_beacon_queue_skb(hw);
+
+                                rtl88e_set_fw_rsvdpagepkt(hw, 0);
+                                uval = rtl_read_byte(rtlpriv, REG_TDECTRL+2);
+                                count = 0;
+                                while (!(uval & BIT(0)) && count < 20) {
+                                        count++;
+                                        udelay(10);
+                                        uval = rtl_read_byte(rtlpriv,
+                                                             REG_TDECTRL+2);
+                                }
+                                dlbcn_count++;
+                        } while (!(uval & BIT(0)) && dlbcn_count < 5);
+
+                        if (uval & BIT(0))
+                                rtl_write_byte(rtlpriv, REG_TDECTRL+2, BIT(0));
+
+                        _rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
+                        _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(4));
+
+                        if (recover) {
+                                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
+                                               tmp_reg422);
+                        }
+                        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp & ~(BIT(0))));
+                }
+                rtl88e_set_fw_joinbss_report_cmd(hw, (*(u8 *)val));
+                break; }
+        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
+                rtl88e_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
+                break;
+        case HW_VAR_AID:{
+                u16 u2btmp;
+                u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
+                u2btmp &= 0xC000;
+                rtl_write_word(rtlpriv, REG_BCN_PSR_RPT, (u2btmp |
+                               mac->assoc_id));
+                break; }
+        case HW_VAR_CORRECT_TSF:{
+                u8 btype_ibss = ((u8 *)(val))[0];
+
+                if (btype_ibss == true)
+                        _rtl88ee_stop_tx_beacon(hw);
+
+                _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(3));
+
+                rtl_write_dword(rtlpriv, REG_TSFTR,
+                                (u32) (mac->tsf & 0xffffffff));
+                rtl_write_dword(rtlpriv, REG_TSFTR + 4,
+                                (u32) ((mac->tsf >> 32) & 0xffffffff));
+
+                _rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
+
+                if (btype_ibss == true)
+                        _rtl88ee_resume_tx_beacon(hw);
+                break; }
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process %x\n", variable);
+                break;
+        }
+}
+
+static bool _rtl88ee_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        bool status = true;
+        long count = 0;
+        u32 value = _LLT_INIT_ADDR(address) | _LLT_INIT_DATA(data) |
+                    _LLT_OP(_LLT_WRITE_ACCESS);
+
+        rtl_write_dword(rtlpriv, REG_LLT_INIT, value);
+
+        do {
+                value = rtl_read_dword(rtlpriv, REG_LLT_INIT);
+                if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value))
+                        break;
+
+                if (count > POLLING_LLT_THRESHOLD) {
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
+                        status = false;
+                        break;
+                }
+        } while (++count);
+
+        return status;
+}
+
+static bool _rtl88ee_llt_table_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        unsigned short i;
+        u8 txpktbuf_bndy;
+        u8 maxpage;
+        bool status;
+
+        maxpage = 0xAF;
+        txpktbuf_bndy = 0xAB;
+
+        rtl_write_byte(rtlpriv, REG_RQPN_NPQ, 0x01);
+        rtl_write_dword(rtlpriv, REG_RQPN, 0x80730d29);
+
+
+        rtl_write_dword(rtlpriv, REG_TRXFF_BNDY, (0x25FF0000 | txpktbuf_bndy));
+        rtl_write_byte(rtlpriv, REG_TDECTRL + 1, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_BCNQ_BDNY, txpktbuf_bndy);
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_MGQ_BDNY, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, 0x45D, txpktbuf_bndy);
+        rtl_write_byte(rtlpriv, REG_PBP, 0x11);
+        rtl_write_byte(rtlpriv, REG_RX_DRVINFO_SZ, 0x4);
+
+        for (i = 0; i < (txpktbuf_bndy - 1); i++) {
+                status = _rtl88ee_llt_write(hw, i, i + 1);
+                if (true != status)
+                        return status;
+        }
+
+        status = _rtl88ee_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
+        if (true != status)
+                return status;
+
+        for (i = txpktbuf_bndy; i < maxpage; i++) {
+                status = _rtl88ee_llt_write(hw, i, (i + 1));
+                if (true != status)
+                        return status;
+        }
+
+        status = _rtl88ee_llt_write(hw, maxpage, txpktbuf_bndy);
+        if (true != status)
+                return status;
+
+        return true;
+}
+
+static void _rtl88ee_gen_refresh_led_state(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);
+
+        if (rtlpriv->rtlhal.up_first_time)
+                return;
+
+        if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS)
+                rtl88ee_sw_led_on(hw, pLed0);
+        else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT)
+                rtl88ee_sw_led_on(hw, pLed0);
+        else
+                rtl88ee_sw_led_off(hw, pLed0);
+}
+
+static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 bytetmp;
+        u16 wordtmp;
+
+        /*Disable XTAL OUTPUT for power saving. YJ, add, 111206. */
+        bytetmp = rtl_read_byte(rtlpriv, REG_XCK_OUT_CTRL) & (~BIT(0));
+        rtl_write_byte(rtlpriv, REG_XCK_OUT_CTRL, bytetmp);
+        /*Auto Power Down to CHIP-off State*/
+        bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1) & (~BIT(7));
+        rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, bytetmp);
+
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x00);
+        /* HW Power on sequence */
+        if (!rtl88_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,
+                                        PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
+                                        Rtl8188E_NIC_ENABLE_FLOW)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "init MAC Fail as rtl88_hal_pwrseqcmdparsing\n");
+                return false;
+        }
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO) | BIT(4);
+        rtl_write_byte(rtlpriv, REG_APS_FSMCO, bytetmp);
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG+2);
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG+2, bytetmp|BIT(2));
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_WATCH_DOG+1);
+        rtl_write_byte(rtlpriv, REG_WATCH_DOG+1, bytetmp|BIT(7));
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_AFE_XTAL_CTRL_EXT+1);
+        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL_EXT+1, bytetmp|BIT(1));
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_TX_RPT_CTRL);
+        rtl_write_byte(rtlpriv, REG_TX_RPT_CTRL, bytetmp|BIT(1)|BIT(0));
+        rtl_write_byte(rtlpriv, REG_TX_RPT_CTRL+1, 2);
+        rtl_write_word(rtlpriv, REG_TX_RPT_TIME, 0xcdf0);
+
+        /*Add for wake up online*/
+        bytetmp = rtl_read_byte(rtlpriv, REG_SYS_CLKR);
+
+        rtl_write_byte(rtlpriv, REG_SYS_CLKR, bytetmp|BIT(3));
+        bytetmp = rtl_read_byte(rtlpriv, REG_GPIO_MUXCFG+1);
+        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG+1, (bytetmp & (~BIT(4))));
+        rtl_write_byte(rtlpriv, 0x367, 0x80);
+
+        rtl_write_word(rtlpriv, REG_CR, 0x2ff);
+        rtl_write_byte(rtlpriv, REG_CR+1, 0x06);
+        rtl_write_byte(rtlpriv, REG_CR+2, 0x00);
+
+        if (!rtlhal->mac_func_enable) {
+                if (_rtl88ee_llt_table_init(hw) == false) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "LLT table init fail\n");
+                        return false;
+                }
+        }
+
+
+        rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
+        rtl_write_dword(rtlpriv, REG_HISRE, 0xffffffff);
+
+        wordtmp = rtl_read_word(rtlpriv, REG_TRXDMA_CTRL);
+        wordtmp &= 0xf;
+        wordtmp |= 0xE771;
+        rtl_write_word(rtlpriv, REG_TRXDMA_CTRL, wordtmp);
+
+        rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+        rtl_write_word(rtlpriv, REG_RXFLTMAP2, 0xffff);
+        rtl_write_dword(rtlpriv, REG_TCR, rtlpci->transmit_config);
+
+        rtl_write_dword(rtlpriv, REG_BCNQ_DESA,
+                        ((u64) rtlpci->tx_ring[BEACON_QUEUE].dma) &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_MGQ_DESA,
+                        (u64) rtlpci->tx_ring[MGNT_QUEUE].dma &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VOQ_DESA,
+                        (u64) rtlpci->tx_ring[VO_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VIQ_DESA,
+                        (u64) rtlpci->tx_ring[VI_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_BEQ_DESA,
+                        (u64) rtlpci->tx_ring[BE_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_BKQ_DESA,
+                        (u64) rtlpci->tx_ring[BK_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_HQ_DESA,
+                        (u64) rtlpci->tx_ring[HIGH_QUEUE].dma &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_RX_DESA,
+                        (u64) rtlpci->rx_ring[RX_MPDU_QUEUE].dma &
+                        DMA_BIT_MASK(32));
+
+        /* if we want to support 64 bit DMA, we should set it here,
+         * but at the moment we do not support 64 bit DMA
+         */
+
+        rtl_write_dword(rtlpriv, REG_INT_MIG, 0);
+
+        rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG+1, 0);/*Enable RX DMA */
+
+        if (rtlhal->earlymode_enable) {/*Early mode enable*/
+                bytetmp = rtl_read_byte(rtlpriv, REG_EARLY_MODE_CONTROL);
+                bytetmp |= 0x1f;
+                rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, bytetmp);
+                rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL+3, 0x81);
+        }
+        _rtl88ee_gen_refresh_led_state(hw);
+        return true;
+}
+
+static void _rtl88ee_hw_configure(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 reg_prsr;
+
+        reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+
+        rtl_write_dword(rtlpriv, REG_RRSR, reg_prsr);
+        rtl_write_byte(rtlpriv, REG_HWSEQ_CTRL, 0xFF);
+}
+
+static void _rtl88ee_enable_aspm_back_door(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 tmp1byte = 0;
+        u32 tmp4Byte = 0, count;
+
+        rtl_write_word(rtlpriv, 0x354, 0x8104);
+        rtl_write_word(rtlpriv, 0x358, 0x24);
+
+        rtl_write_word(rtlpriv, 0x350, 0x70c);
+        rtl_write_byte(rtlpriv, 0x352, 0x2);
+        tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+        count = 0;
+        while (tmp1byte && count < 20) {
+                udelay(10);
+                tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+                count++;
+        }
+        if (0 == tmp1byte) {
+                tmp4Byte = rtl_read_dword(rtlpriv, 0x34c);
+                rtl_write_dword(rtlpriv, 0x348, tmp4Byte|BIT(31));
+                rtl_write_word(rtlpriv, 0x350, 0xf70c);
+                rtl_write_byte(rtlpriv, 0x352, 0x1);
+        }
+
+        tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+        count = 0;
+        while (tmp1byte && count < 20) {
+                udelay(10);
+                tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+                count++;
+        }
+
+        rtl_write_word(rtlpriv, 0x350, 0x718);
+        rtl_write_byte(rtlpriv, 0x352, 0x2);
+        tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+        count = 0;
+        while (tmp1byte && count < 20) {
+                udelay(10);
+                tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+                count++;
+        }
+        if (ppsc->support_backdoor || (0 == tmp1byte)) {
+                tmp4Byte = rtl_read_dword(rtlpriv, 0x34c);
+                rtl_write_dword(rtlpriv, 0x348, tmp4Byte|BIT(11)|BIT(12));
+                rtl_write_word(rtlpriv, 0x350, 0xf718);
+                rtl_write_byte(rtlpriv, 0x352, 0x1);
+        }
+        tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+        count = 0;
+        while (tmp1byte && count < 20) {
+                udelay(10);
+                tmp1byte = rtl_read_byte(rtlpriv, 0x352);
+                count++;
+        }
+}
+
+void rtl88ee_enable_hw_security_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 sec_reg_value;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
+
+        if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                         "not open hw encryption\n");
+                return;
+        }
+        sec_reg_value = SCR_TXENCENABLE | SCR_RXDECENABLE;
+
+        if (rtlpriv->sec.use_defaultkey) {
+                sec_reg_value |= SCR_TXUSEDK;
+                sec_reg_value |= SCR_RXUSEDK;
+        }
+
+        sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
+
+        rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
+
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                 "The SECR-value %x\n", sec_reg_value);
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
+}
+
+int rtl88ee_hw_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        bool rtstatus = true;
+        int err = 0;
+        u8 tmp_u1b, u1byte;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Rtl8188EE hw init\n");
+        rtlpriv->rtlhal.being_init_adapter = true;
+        rtlpriv->intf_ops->disable_aspm(hw);
+
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_SYS_CLKR+1);
+        u1byte = rtl_read_byte(rtlpriv, REG_CR);
+        if ((tmp_u1b & BIT(3)) && (u1byte != 0 && u1byte != 0xEA)) {
+                rtlhal->mac_func_enable = true;
+        } else {
+                rtlhal->mac_func_enable = false;
+                rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_88E;
+        }
+
+        rtstatus = _rtl88ee_init_mac(hw);
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
+                err = 1;
+                return err;
+        }
+
+        err = rtl88e_download_fw(hw, false);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Failed to download FW. Init HW without FW now..\n");
+                err = 1;
+                rtlhal->fw_ready = false;
+                return err;
+        } else {
+                rtlhal->fw_ready = true;
+        }
+        /*fw related variable initialize */
+        rtlhal->last_hmeboxnum = 0;
+        rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_88E;
+        rtlhal->fw_clk_change_in_progress = false;
+        rtlhal->allow_sw_to_change_hwclc = false;
+        ppsc->fw_current_inpsmode = false;
+
+        rtl88e_phy_mac_config(hw);
+        /* because last function modifies RCR, we update
+         * rcr var here, or TP will be unstable for receive_config
+         * is wrong, RX RCR_ACRC32 will cause TP unstable & Rx
+         * RCR_APP_ICV will cause mac80211 disassoc for cisco 1252
+         */
+        rtlpci->receive_config &= ~(RCR_ACRC32 | RCR_AICV);
+        rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+
+        rtl88e_phy_bb_config(hw);
+        rtl_set_bbreg(hw, RFPGA0_RFMOD, BCCKEN, 0x1);
+        rtl_set_bbreg(hw, RFPGA0_RFMOD, BOFDMEN, 0x1);
+
+        rtlphy->rf_mode = RF_OP_BY_SW_3WIRE;
+        rtl88e_phy_rf_config(hw);
+
+        rtlphy->rfreg_chnlval[0] = rtl_get_rfreg(hw, (enum radio_path)0,
+                                                 RF_CHNLBW, RFREG_OFFSET_MASK);
+        rtlphy->rfreg_chnlval[0] = rtlphy->rfreg_chnlval[0] & 0xfff00fff;
+
+        _rtl88ee_hw_configure(hw);
+        rtl_cam_reset_all_entry(hw);
+        rtl88ee_enable_hw_security_config(hw);
+
+        rtlhal->mac_func_enable = true;
+        ppsc->rfpwr_state = ERFON;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR, mac->mac_addr);
+        _rtl88ee_enable_aspm_back_door(hw);
+        rtlpriv->intf_ops->enable_aspm(hw);
+
+        if (ppsc->rfpwr_state == ERFON) {
+                if ((rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV) ||
+                    ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) &&
+                    (rtlhal->oem_id == RT_CID_819x_HP))) {
+                        rtl88e_phy_set_rfpath_switch(hw, true);
+                        rtlpriv->dm.fat_table.rx_idle_ant = MAIN_ANT;
+                } else {
+                        rtl88e_phy_set_rfpath_switch(hw, false);
+                        rtlpriv->dm.fat_table.rx_idle_ant = AUX_ANT;
+                }
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "rx idle ant %s\n",
+                         (rtlpriv->dm.fat_table.rx_idle_ant == MAIN_ANT) ?
+                         ("MAIN_ANT") : ("AUX_ANT"));
+
+                if (rtlphy->iqk_initialized) {
+                        rtl88e_phy_iq_calibrate(hw, true);
+                } else {
+                        rtl88e_phy_iq_calibrate(hw, false);
+                        rtlphy->iqk_initialized = true;
+                }
+                rtl88e_dm_check_txpower_tracking(hw);
+                rtl88e_phy_lc_calibrate(hw);
+        }
+
+        tmp_u1b = efuse_read_1byte(hw, 0x1FA);
+        if (!(tmp_u1b & BIT(0))) {
+                rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path A\n");
+        }
+
+        if (!(tmp_u1b & BIT(4))) {
+                tmp_u1b = rtl_read_byte(rtlpriv, 0x16);
+                tmp_u1b &= 0x0F;
+                rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
+                udelay(10);
+                rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "under 1.5V\n");
+        }
+        rtl_write_byte(rtlpriv, REG_NAV_CTRL+2,  ((30000+127)/128));
+        rtl88e_dm_init(hw);
+        rtlpriv->rtlhal.being_init_adapter = false;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "end of Rtl8188EE hw init %x\n",
+                 err);
+        return 0;
+}
+
+static enum version_8188e _rtl88ee_read_chip_version(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        enum version_8188e version = VERSION_UNKNOWN;
+        u32 value32;
+
+        value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
+        if (value32 & TRP_VAUX_EN) {
+                version = (enum version_8188e) VERSION_TEST_CHIP_88E;
+        } else {
+                version = NORMAL_CHIP;
+                version = version | ((value32 & TYPE_ID) ? RF_TYPE_2T2R : 0);
+                version = version | ((value32 & VENDOR_ID) ?
+                          CHIP_VENDOR_UMC : 0);
+        }
+
+        rtlphy->rf_type = RF_1T1R;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
+                 "RF_2T2R" : "RF_1T1R");
+
+        return version;
+}
+
+static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
+                                     enum nl80211_iftype type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 bt_msr = rtl_read_byte(rtlpriv, MSR);
+        enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
+        bt_msr &= 0xfc;
+
+        if (type == NL80211_IFTYPE_UNSPECIFIED ||
+            type == NL80211_IFTYPE_STATION) {
+                _rtl88ee_stop_tx_beacon(hw);
+                _rtl88ee_enable_bcn_sub_func(hw);
+        } else if (type == NL80211_IFTYPE_ADHOC ||
+                type == NL80211_IFTYPE_AP ||
+                type == NL80211_IFTYPE_MESH_POINT) {
+                _rtl88ee_resume_tx_beacon(hw);
+                _rtl88ee_disable_bcn_sub_func(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
+                         type);
+        }
+
+        switch (type) {
+        case NL80211_IFTYPE_UNSPECIFIED:
+                bt_msr |= MSR_NOLINK;
+                ledaction = LED_CTL_LINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to NO LINK!\n");
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                bt_msr |= MSR_ADHOC;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to Ad Hoc!\n");
+                break;
+        case NL80211_IFTYPE_STATION:
+                bt_msr |= MSR_INFRA;
+                ledaction = LED_CTL_LINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to STA!\n");
+                break;
+        case NL80211_IFTYPE_AP:
+                bt_msr |= MSR_AP;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to AP!\n");
+                break;
+        case NL80211_IFTYPE_MESH_POINT:
+                bt_msr |= MSR_ADHOC;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to Mesh Point!\n");
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Network type %d not support!\n", type);
+                return 1;
+        }
+
+        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtlpriv->cfg->ops->led_control(hw, ledaction);
+        if ((bt_msr & 0xfc) == MSR_AP)
+                rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
+        else
+                rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
+        return 0;
+}
+
+void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rcr = rtlpci->receive_config;
+
+        if (rtlpriv->psc.rfpwr_state != ERFON)
+                return;
+
+        if (check_bssid == true) {
+                reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
+                                              (u8 *)(&reg_rcr));
+                _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(4));
+        } else if (check_bssid == false) {
+                reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN));
+                _rtl88ee_set_bcn_ctrl_reg(hw, BIT(4), 0);
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                        HW_VAR_RCR, (u8 *)(&reg_rcr));
+        }
+}
+
+int rtl88ee_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (_rtl88ee_set_media_status(hw, type))
+                return -EOPNOTSUPP;
+
+        if (rtlpriv->mac80211.link_state == MAC80211_LINKED) {
+                if (type != NL80211_IFTYPE_AP &&
+                    type != NL80211_IFTYPE_MESH_POINT)
+                        rtl88ee_set_check_bssid(hw, true);
+        } else {
+                rtl88ee_set_check_bssid(hw, false);
+        }
+
+        return 0;
+}
+
+/* don't set REG_EDCA_BE_PARAM here because mac80211 will send pkt when scan */
+void rtl88ee_set_qos(struct ieee80211_hw *hw, int aci)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        rtl88e_dm_init_edca_turbo(hw);
+        switch (aci) {
+        case AC1_BK:
+                rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, 0xa44f);
+                break;
+        case AC0_BE:
+                break;
+        case AC2_VI:
+                rtl_write_dword(rtlpriv, REG_EDCA_VI_PARAM, 0x5e4322);
+                break;
+        case AC3_VO:
+                rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
+                break;
+        default:
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
+                break;
+        }
+}
+
+void rtl88ee_enable_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
+        rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
+        rtlpci->irq_enabled = true;
+        /* there are some C2H CMDs have been sent before system interrupt
+         * is enabled, e.g., C2H, CPWM.
+         * So we need to clear all C2H events that FW has notified, otherwise
+         * FW won't schedule any commands anymore.
+         */
+        rtl_write_byte(rtlpriv, REG_C2HEVT_CLEAR, 0);
+        /*enable system interrupt*/
+        rtl_write_dword(rtlpriv, REG_HSIMR, rtlpci->sys_irq_mask & 0xFFFFFFFF);
+}
+
+void rtl88ee_disable_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        rtl_write_dword(rtlpriv, REG_HIMR, IMR_DISABLED);
+        rtl_write_dword(rtlpriv, REG_HIMRE, IMR_DISABLED);
+        rtlpci->irq_enabled = false;
+        synchronize_irq(rtlpci->pdev->irq);
+}
+
+static void _rtl88ee_poweroff_adapter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 u1b_tmp;
+        u32 count = 0;
+        rtlhal->mac_func_enable = false;
+        rtlpriv->intf_ops->enable_aspm(hw);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "POWER OFF adapter\n");
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_TX_RPT_CTRL);
+        rtl_write_byte(rtlpriv, REG_TX_RPT_CTRL, u1b_tmp & (~BIT(1)));
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        while (!(u1b_tmp & BIT(1)) && (count++ < 100)) {
+                udelay(10);
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+                count++;
+        }
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG+1, 0xFF);
+
+        rtl88_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                   PWR_INTF_PCI_MSK,
+                                   Rtl8188E_NIC_LPS_ENTER_FLOW);
+
+        rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00);
+
+        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
+                rtl88e_firmware_selfreset(hw);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp & (~BIT(2))));
+        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_32K_CTRL);
+        rtl_write_byte(rtlpriv, REG_32K_CTRL, (u1b_tmp & (~BIT(0))));
+
+        rtl88_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                   PWR_INTF_PCI_MSK, Rtl8188E_NIC_DISABLE_FLOW);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp & (~BIT(3))));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp | BIT(3)));
+
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0E);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, GPIO_IN);
+        rtl_write_byte(rtlpriv, GPIO_OUT, u1b_tmp);
+        rtl_write_byte(rtlpriv, GPIO_IO_SEL, 0x7F);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL);
+        rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL, (u1b_tmp << 4) | u1b_tmp);
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL+1);
+        rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL+1, u1b_tmp | 0x0F);
+
+        rtl_write_dword(rtlpriv, REG_GPIO_IO_SEL_2+2, 0x00080808);
+}
+
+void rtl88ee_card_disable(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        enum nl80211_iftype opmode;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RTL8188ee card disable\n");
+
+        mac->link_state = MAC80211_NOLINK;
+        opmode = NL80211_IFTYPE_UNSPECIFIED;
+
+        _rtl88ee_set_media_status(hw, opmode);
+
+        if (rtlpriv->rtlhal.driver_is_goingto_unload ||
+            ppsc->rfoff_reason > RF_CHANGE_BY_PS)
+                rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
+
+        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+        _rtl88ee_poweroff_adapter(hw);
+
+        /* after power off we should do iqk again */
+        rtlpriv->phy.iqk_initialized = false;
+}
+
+void rtl88ee_interrupt_recognized(struct ieee80211_hw *hw,
+                                  u32 *p_inta, u32 *p_intb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        *p_inta = rtl_read_dword(rtlpriv, ISR) & rtlpci->irq_mask[0];
+        rtl_write_dword(rtlpriv, ISR, *p_inta);
+
+        *p_intb = rtl_read_dword(rtlpriv, REG_HISRE) & rtlpci->irq_mask[1];
+        rtl_write_dword(rtlpriv, REG_HISRE, *p_intb);
+}
+
+void rtl88ee_set_beacon_related_registers(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u16 bcn_interval, atim_window;
+
+        bcn_interval = mac->beacon_interval;
+        atim_window = 2;        /*FIX MERGE */
+        rtl88ee_disable_interrupt(hw);
+        rtl_write_word(rtlpriv, REG_ATIMWND, atim_window);
+        rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
+        rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660f);
+        rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_CCK, 0x18);
+        rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_OFDM, 0x18);
+        rtl_write_byte(rtlpriv, 0x606, 0x30);
+        rtlpci->reg_bcn_ctrl_val |= BIT(3);
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8) rtlpci->reg_bcn_ctrl_val);
+        /*rtl88ee_enable_interrupt(hw);*/
+}
+
+void rtl88ee_set_beacon_interval(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u16 bcn_interval = mac->beacon_interval;
+
+        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
+                 "beacon_interval:%d\n", bcn_interval);
+        /*rtl88ee_disable_interrupt(hw);*/
+        rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
+        /*rtl88ee_enable_interrupt(hw);*/
+}
+
+void rtl88ee_update_interrupt_mask(struct ieee80211_hw *hw,
+                                   u32 add_msr, u32 rm_msr)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
+                 "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
+
+        rtl88ee_disable_interrupt(hw);
+        if (add_msr)
+                rtlpci->irq_mask[0] |= add_msr;
+        if (rm_msr)
+                rtlpci->irq_mask[0] &= (~rm_msr);
+        rtl88ee_enable_interrupt(hw);
+}
+
+static inline u8 get_chnl_group(u8 chnl)
+{
+        u8 group;
+
+        group = chnl / 3;
+        if (chnl == 14)
+                group = 5;
+
+        return group;
+}
+
+static void set_diff0_2g(struct txpower_info_2g *pwr2g, u8 *hwinfo, u32 path,
+                         u32 i, u32 eadr)
+{
+        pwr2g->bw40_diff[path][i] = 0;
+        if (hwinfo[eadr] == 0xFF) {
+                pwr2g->bw20_diff[path][i] = 0x02;
+        } else {
+                pwr2g->bw20_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
+                /*bit sign number to 8 bit sign number*/
+                if (pwr2g->bw20_diff[path][i] & BIT(3))
+                        pwr2g->bw20_diff[path][i] |= 0xF0;
+        }
+
+        if (hwinfo[eadr] == 0xFF) {
+                pwr2g->ofdm_diff[path][i] = 0x04;
+        } else {
+                pwr2g->ofdm_diff[path][i] = (hwinfo[eadr] & 0x0f);
+                /*bit sign number to 8 bit sign number*/
+                if (pwr2g->ofdm_diff[path][i] & BIT(3))
+                        pwr2g->ofdm_diff[path][i] |= 0xF0;
+        }
+        pwr2g->cck_diff[path][i] = 0;
+}
+
+static void set_diff0_5g(struct txpower_info_5g *pwr5g, u8 *hwinfo, u32 path,
+                         u32 i, u32 eadr)
+{
+        pwr5g->bw40_diff[path][i] = 0;
+        if (hwinfo[eadr] == 0xFF) {
+                pwr5g->bw20_diff[path][i] = 0;
+        } else {
+                pwr5g->bw20_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
+                /*bit sign number to 8 bit sign number*/
+                if (pwr5g->bw20_diff[path][i] & BIT(3))
+                        pwr5g->bw20_diff[path][i] |= 0xF0;
+        }
+
+        if (hwinfo[eadr] == 0xFF) {
+                pwr5g->ofdm_diff[path][i] = 0x04;
+        } else {
+                pwr5g->ofdm_diff[path][i] = (hwinfo[eadr] & 0x0f);
+                /*bit sign number to 8 bit sign number*/
+                if (pwr5g->ofdm_diff[path][i] & BIT(3))
+                        pwr5g->ofdm_diff[path][i] |= 0xF0;
+        }
+}
+
+static void set_diff1_2g(struct txpower_info_2g *pwr2g, u8 *hwinfo, u32 path,
+                         u32 i, u32 eadr)
+{
+        if (hwinfo[eadr] == 0xFF) {
+                pwr2g->bw40_diff[path][i] = 0xFE;
+        } else {
+                pwr2g->bw40_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
+                if (pwr2g->bw40_diff[path][i] & BIT(3))
+                        pwr2g->bw40_diff[path][i] |= 0xF0;
+        }
+
+        if (hwinfo[eadr] == 0xFF) {
+                pwr2g->bw20_diff[path][i] = 0xFE;
+        } else {
+                pwr2g->bw20_diff[path][i] = (hwinfo[eadr]&0x0f);
+                if (pwr2g->bw20_diff[path][i] & BIT(3))
+                        pwr2g->bw20_diff[path][i] |= 0xF0;
+        }
+}
+
+static void set_diff1_5g(struct txpower_info_5g *pwr5g, u8 *hwinfo, u32 path,
+                         u32 i, u32 eadr)
+{
+        if (hwinfo[eadr] == 0xFF) {
+                pwr5g->bw40_diff[path][i] = 0xFE;
+        } else {
+                pwr5g->bw40_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
+                if (pwr5g->bw40_diff[path][i] & BIT(3))
+                        pwr5g->bw40_diff[path][i] |= 0xF0;
+        }
+
+        if (hwinfo[eadr] == 0xFF) {
+                pwr5g->bw20_diff[path][i] = 0xFE;
+        } else {
+                pwr5g->bw20_diff[path][i] = (hwinfo[eadr] & 0x0f);
+                if (pwr5g->bw20_diff[path][i] & BIT(3))
+                        pwr5g->bw20_diff[path][i] |= 0xF0;
+        }
+}
+
+static void set_diff2_2g(struct txpower_info_2g *pwr2g, u8 *hwinfo, u32 path,
+                         u32 i, u32 eadr)
+{
+        if (hwinfo[eadr] == 0xFF) {
+                pwr2g->ofdm_diff[path][i] = 0xFE;
+        } else {
+                pwr2g->ofdm_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
+                if (pwr2g->ofdm_diff[path][i] & BIT(3))
+                        pwr2g->ofdm_diff[path][i] |= 0xF0;
+        }
+
+        if (hwinfo[eadr] == 0xFF) {
+                pwr2g->cck_diff[path][i] = 0xFE;
+        } else {
+                pwr2g->cck_diff[path][i] = (hwinfo[eadr]&0x0f);
+                if (pwr2g->cck_diff[path][i] & BIT(3))
+                        pwr2g->cck_diff[path][i] |= 0xF0;
+        }
+}
+
+static void _rtl8188e_read_power_value_fromprom(struct ieee80211_hw *hw,
+                                                struct txpower_info_2g *pwr2g,
+                                                struct txpower_info_5g *pwr5g,
+                                                bool autoload_fail,
+                                                u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 path, eadr = EEPROM_TX_PWR_INX, i;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "hal_ReadPowerValueFromPROM88E(): PROMContent[0x%x]= 0x%x\n",
+                 (eadr+1), hwinfo[eadr+1]);
+        if (0xFF == hwinfo[eadr+1])
+                autoload_fail = true;
+
+        if (autoload_fail) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "auto load fail : Use Default value!\n");
+                for (path = 0; path < MAX_RF_PATH; path++) {
+                        /* 2.4G default value */
+                        for (i = 0; i < MAX_CHNL_GROUP_24G; i++) {
+                                pwr2g->index_cck_base[path][i] = 0x2D;
+                                pwr2g->index_bw40_base[path][i] = 0x2D;
+                        }
+                        for (i = 0; i < MAX_TX_COUNT; i++) {
+                                if (i == 0) {
+                                        pwr2g->bw20_diff[path][0] = 0x02;
+                                        pwr2g->ofdm_diff[path][0] = 0x04;
+                                } else {
+                                        pwr2g->bw20_diff[path][i] = 0xFE;
+                                        pwr2g->bw40_diff[path][i] = 0xFE;
+                                        pwr2g->cck_diff[path][i] = 0xFE;
+                                        pwr2g->ofdm_diff[path][i] = 0xFE;
+                                }
+                        }
+                }
+                return;
+        }
+
+        for (path = 0; path < MAX_RF_PATH; path++) {
+                /*2.4G default value*/
+                for (i = 0; i < MAX_CHNL_GROUP_24G; i++) {
+                        pwr2g->index_cck_base[path][i] = hwinfo[eadr++];
+                        if (pwr2g->index_cck_base[path][i] == 0xFF)
+                                pwr2g->index_cck_base[path][i] = 0x2D;
+                }
+                for (i = 0; i < MAX_CHNL_GROUP_24G; i++) {
+                        pwr2g->index_bw40_base[path][i] = hwinfo[eadr++];
+                        if (pwr2g->index_bw40_base[path][i] == 0xFF)
+                                pwr2g->index_bw40_base[path][i] = 0x2D;
+                }
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        if (i == 0) {
+                                set_diff0_2g(pwr2g, hwinfo, path, i, eadr);
+                                eadr++;
+                        } else {
+                                set_diff1_2g(pwr2g, hwinfo, path, i, eadr);
+                                eadr++;
+
+                                set_diff2_2g(pwr2g, hwinfo, path, i, eadr);
+                                eadr++;
+                        }
+                }
+
+                /*5G default value*/
+                for (i = 0; i < MAX_CHNL_GROUP_5G; i++) {
+                        pwr5g->index_bw40_base[path][i] = hwinfo[eadr++];
+                        if (pwr5g->index_bw40_base[path][i] == 0xFF)
+                                pwr5g->index_bw40_base[path][i] = 0xFE;
+                }
+
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        if (i == 0) {
+                                set_diff0_5g(pwr5g, hwinfo, path, i, eadr);
+                                eadr++;
+                        } else {
+                                set_diff1_5g(pwr5g, hwinfo, path, i, eadr);
+                                eadr++;
+                        }
+                }
+
+                if (hwinfo[eadr] == 0xFF) {
+                        pwr5g->ofdm_diff[path][1] = 0xFE;
+                        pwr5g->ofdm_diff[path][2] = 0xFE;
+                } else {
+                        pwr5g->ofdm_diff[path][1] = (hwinfo[eadr] & 0xf0) >> 4;
+                        pwr5g->ofdm_diff[path][2] = (hwinfo[eadr] & 0x0f);
+                }
+                eadr++;
+
+                if (hwinfo[eadr] == 0xFF)
+                        pwr5g->ofdm_diff[path][3] = 0xFE;
+                else
+                        pwr5g->ofdm_diff[path][3] = (hwinfo[eadr]&0x0f);
+                eadr++;
+
+                for (i = 1; i < MAX_TX_COUNT; i++) {
+                        if (pwr5g->ofdm_diff[path][i] == 0xFF)
+                                pwr5g->ofdm_diff[path][i] = 0xFE;
+                        else if (pwr5g->ofdm_diff[path][i] & BIT(3))
+                                pwr5g->ofdm_diff[path][i] |= 0xF0;
+                }
+        }
+}
+
+static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
+                                                 bool autoload_fail,
+                                                 u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct txpower_info_2g pwrinfo24g;
+        struct txpower_info_5g pwrinfo5g;
+        u8 rf_path, index;
+        u8 i;
+        int jj = EEPROM_RF_BOARD_OPTION_88E;
+        int kk = EEPROM_THERMAL_METER_88E;
+
+        _rtl8188e_read_power_value_fromprom(hw, &pwrinfo24g, &pwrinfo5g,
+                                            autoload_fail, hwinfo);
+
+        for (rf_path = 0; rf_path < 2; rf_path++) {
+                for (i = 0; i < 14; i++) {
+                        index = get_chnl_group(i+1);
+
+                        rtlefuse->txpwrlevel_cck[rf_path][i] =
+                                 pwrinfo24g.index_cck_base[rf_path][index];
+                        if (i == 13)
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                     pwrinfo24g.index_bw40_base[rf_path][4];
+                        else
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                     pwrinfo24g.index_bw40_base[rf_path][index];
+                        rtlefuse->txpwr_ht20diff[rf_path][i] =
+                                 pwrinfo24g.bw20_diff[rf_path][0];
+                        rtlefuse->txpwr_legacyhtdiff[rf_path][i] =
+                                 pwrinfo24g.ofdm_diff[rf_path][0];
+                }
+
+                for (i = 0; i < 14; i++) {
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S ] = "
+                                "[0x%x / 0x%x ]\n", rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i]);
+                }
+        }
+
+        if (!autoload_fail)
+                rtlefuse->eeprom_thermalmeter = hwinfo[kk];
+        else
+                rtlefuse->eeprom_thermalmeter = EEPROM_DEFAULT_THERMALMETER;
+
+        if (rtlefuse->eeprom_thermalmeter == 0xff || autoload_fail) {
+                rtlefuse->apk_thermalmeterignore = true;
+                rtlefuse->eeprom_thermalmeter = EEPROM_DEFAULT_THERMALMETER;
+        }
+
+        rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
+
+        if (!autoload_fail) {
+                rtlefuse->eeprom_regulatory = hwinfo[jj] & 0x07;/*bit0~2*/
+                if (hwinfo[jj] == 0xFF)
+                        rtlefuse->eeprom_regulatory = 0;
+        } else {
+                rtlefuse->eeprom_regulatory = 0;
+        }
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
+}
+
+static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
+        u16 i, usvalue;
+        u8 hwinfo[HWSET_MAX_SIZE];
+        u16 eeprom_id;
+        int jj = EEPROM_RF_BOARD_OPTION_88E;
+        int kk = EEPROM_RF_FEATURE_OPTION_88E;
+
+        if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {
+                rtl_efuse_shadow_map_update(hw);
+
+                memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+                       HWSET_MAX_SIZE);
+        } else if (rtlefuse->epromtype == EEPROM_93C46) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "RTL819X Not boot from eeprom, check it !!");
+        }
+
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+                      hwinfo, HWSET_MAX_SIZE);
+
+        eeprom_id = *((u16 *)&hwinfo[0]);
+        if (eeprom_id != RTL8188E_EEPROM_ID) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
+                rtlefuse->autoload_failflag = true;
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+                rtlefuse->autoload_failflag = false;
+        }
+
+        if (rtlefuse->autoload_failflag == true)
+                return;
+        /*VID DID SVID SDID*/
+        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
+        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
+        rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROMId = 0x%4x\n", eeprom_id);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
+        /*customer ID*/
+        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        if (rtlefuse->eeprom_oemid == 0xFF)
+                rtlefuse->eeprom_oemid = 0;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
+        /*EEPROM version*/
+        rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
+        /*mac address*/
+        for (i = 0; i < 6; i += 2) {
+                usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
+                *((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "dev_addr: %pM\n", rtlefuse->dev_addr);
+        /*channel plan */
+        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        /* set channel paln to world wide 13 */
+        rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
+        /*tx power*/
+        _rtl88ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,
+                                             hwinfo);
+        rtlefuse->txpwr_fromeprom = true;
+
+        rtl8188ee_read_bt_coexist_info_from_hwpg(hw,
+                                                 rtlefuse->autoload_failflag,
+                                                 hwinfo);
+        /*board type*/
+        rtlefuse->board_type = (((*(u8 *)&hwinfo[jj]) & 0xE0) >> 5);
+        /*Wake on wlan*/
+        rtlefuse->wowlan_enable = ((hwinfo[kk] & 0x40) >> 6);
+        /*parse xtal*/
+        rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_88E];
+        if (hwinfo[EEPROM_XTAL_88E])
+                rtlefuse->crystalcap = 0x20;
+        /*antenna diversity*/
+        rtlefuse->antenna_div_cfg = (hwinfo[jj] & 0x18) >> 3;
+        if (hwinfo[jj] == 0xFF)
+                rtlefuse->antenna_div_cfg = 0;
+        if (rppriv->bt_coexist.eeprom_bt_coexist != 0 &&
+            rppriv->bt_coexist.eeprom_bt_ant_num == ANT_X1)
+                rtlefuse->antenna_div_cfg = 0;
+
+        rtlefuse->antenna_div_type = hwinfo[EEPROM_RF_ANTENNA_OPT_88E];
+        if (rtlefuse->antenna_div_type == 0xFF)
+                rtlefuse->antenna_div_type = 0x01;
+        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV ||
+            rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                rtlefuse->antenna_div_cfg = 1;
+
+        if (rtlhal->oem_id == RT_CID_DEFAULT) {
+                switch (rtlefuse->eeprom_oemid) {
+                case EEPROM_CID_DEFAULT:
+                        if (rtlefuse->eeprom_did == 0x8179) {
+                                if (rtlefuse->eeprom_svid == 0x1025) {
+                                        rtlhal->oem_id = RT_CID_819x_Acer;
+                                } else if ((rtlefuse->eeprom_svid == 0x10EC &&
+                                            rtlefuse->eeprom_smid == 0x0179) ||
+                                            (rtlefuse->eeprom_svid == 0x17AA &&
+                                            rtlefuse->eeprom_smid == 0x0179)) {
+                                        rtlhal->oem_id = RT_CID_819x_Lenovo;
+                                } else if (rtlefuse->eeprom_svid == 0x103c &&
+                                         rtlefuse->eeprom_smid == 0x197d) {
+                                        rtlhal->oem_id = RT_CID_819x_HP;
+                                } else {
+                                        rtlhal->oem_id = RT_CID_DEFAULT;
+                                }
+                        } else {
+                                rtlhal->oem_id = RT_CID_DEFAULT;
+                        }
+                        break;
+                case EEPROM_CID_TOSHIBA:
+                        rtlhal->oem_id = RT_CID_TOSHIBA;
+                        break;
+                case EEPROM_CID_QMI:
+                        rtlhal->oem_id = RT_CID_819x_QMI;
+                        break;
+                case EEPROM_CID_WHQL:
+                default:
+                        rtlhal->oem_id = RT_CID_DEFAULT;
+                        break;
+                }
+        }
+}
+
+static void _rtl88ee_hal_customized_behavior(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        pcipriv->ledctl.led_opendrain = true;
+
+        switch (rtlhal->oem_id) {
+        case RT_CID_819x_HP:
+                pcipriv->ledctl.led_opendrain = true;
+                break;
+        case RT_CID_819x_Lenovo:
+        case RT_CID_DEFAULT:
+        case RT_CID_TOSHIBA:
+        case RT_CID_CCX:
+        case RT_CID_819x_Acer:
+        case RT_CID_WHQL:
+        default:
+                break;
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
+}
+
+void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp_u1b;
+
+        rtlhal->version = _rtl88ee_read_chip_version(hw);
+        if (get_rf_type(rtlphy) == RF_1T1R) {
+                rtlpriv->dm.rfpath_rxenable[0] = true;
+        } else {
+                rtlpriv->dm.rfpath_rxenable[0] = true;
+                rtlpriv->dm.rfpath_rxenable[1] = true;
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                 rtlhal->version);
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
+        if (tmp_u1b & BIT(4)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
+                rtlefuse->epromtype = EEPROM_93C46;
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
+                rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
+        }
+        if (tmp_u1b & BIT(5)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+                rtlefuse->autoload_failflag = false;
+                _rtl88ee_read_adapter_info(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
+        }
+        _rtl88ee_hal_customized_behavior(hw);
+}
+
+static void rtl88ee_update_hal_rate_table(struct ieee80211_hw *hw,
+                                          struct ieee80211_sta *sta)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 ratr_value;
+        u8 ratr_index = 0;
+        u8 nmode = mac->ht_enable;
+        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        u16 shortgi_rate;
+        u32 tmp_ratr_value;
+        u8 ctx40 = mac->bw_40;
+        u16 cap = sta->ht_cap.cap;
+        u8 short40 = (cap & IEEE80211_HT_CAP_SGI_40) ?  1 : 0;
+        u8 short20 = (cap & IEEE80211_HT_CAP_SGI_20) ?  1 : 0;
+        enum wireless_mode wirelessmode = mac->mode;
+
+        if (rtlhal->current_bandtype == BAND_ON_5G)
+                ratr_value = sta->supp_rates[1] << 4;
+        else
+                ratr_value = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_value = 0xfff;
+        ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
+                        sta->ht_cap.mcs.rx_mask[0] << 12);
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                if (ratr_value & 0x0000000c)
+                        ratr_value &= 0x0000000d;
+                else
+                        ratr_value &= 0x0000000f;
+                break;
+        case WIRELESS_MODE_G:
+                ratr_value &= 0x00000FF5;
+                break;
+        case WIRELESS_MODE_N_24G:
+        case WIRELESS_MODE_N_5G:
+                nmode = 1;
+                if (mimo_ps == IEEE80211_SMPS_STATIC) {
+                        ratr_value &= 0x0007F005;
+                } else {
+                        u32 ratr_mask;
+
+                        if (get_rf_type(rtlphy) == RF_1T2R ||
+                            get_rf_type(rtlphy) == RF_1T1R)
+                                ratr_mask = 0x000ff005;
+                        else
+                                ratr_mask = 0x0f0ff005;
+
+                        ratr_value &= ratr_mask;
+                }
+                break;
+        default:
+                if (rtlphy->rf_type == RF_1T2R)
+                        ratr_value &= 0x000ff0ff;
+                else
+                        ratr_value &= 0x0f0ff0ff;
+
+                break;
+        }
+
+        if ((rppriv->bt_coexist.bt_coexistence) &&
+            (rppriv->bt_coexist.bt_coexist_type == BT_CSR_BC4) &&
+            (rppriv->bt_coexist.bt_cur_state) &&
+            (rppriv->bt_coexist.bt_ant_isolation) &&
+            ((rppriv->bt_coexist.bt_service == BT_SCO) ||
+            (rppriv->bt_coexist.bt_service == BT_BUSY)))
+                ratr_value &= 0x0fffcfc0;
+        else
+                ratr_value &= 0x0FFFFFFF;
+
+        if (nmode && ((ctx40 && short40) ||
+                      (!ctx40 && short20))) {
+                ratr_value |= 0x10000000;
+                tmp_ratr_value = (ratr_value >> 12);
+
+                for (shortgi_rate = 15; shortgi_rate > 0; shortgi_rate--) {
+                        if ((1 << shortgi_rate) & tmp_ratr_value)
+                                break;
+                }
+
+                shortgi_rate = (shortgi_rate << 12) | (shortgi_rate << 8) |
+                    (shortgi_rate << 4) | (shortgi_rate);
+        }
+
+        rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
+}
+
+static void rtl88ee_update_hal_rate_mask(struct ieee80211_hw *hw,
+                                         struct ieee80211_sta *sta, u8 rssi)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_sta_info *sta_entry = NULL;
+        u32 ratr_bitmap;
+        u8 ratr_index;
+        u16 cap = sta->ht_cap.cap;
+        u8 ctx40 = (cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) ? 1 : 0;
+        u8 short40 = (cap & IEEE80211_HT_CAP_SGI_40) ?  1 : 0;
+        u8 short20 = (cap & IEEE80211_HT_CAP_SGI_20) ?  1 : 0;
+        enum wireless_mode wirelessmode = 0;
+        bool shortgi = false;
+        u8 rate_mask[5];
+        u8 macid = 0;
+        u8 mimo_ps = IEEE80211_SMPS_OFF;
+
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        wirelessmode = sta_entry->wireless_mode;
+        if (mac->opmode == NL80211_IFTYPE_STATION ||
+            mac->opmode == NL80211_IFTYPE_MESH_POINT)
+                ctx40 = mac->bw_40;
+        else if (mac->opmode == NL80211_IFTYPE_AP ||
+                 mac->opmode == NL80211_IFTYPE_ADHOC)
+                macid = sta->aid + 1;
+
+        if (rtlhal->current_bandtype == BAND_ON_5G)
+                ratr_bitmap = sta->supp_rates[1] << 4;
+        else
+                ratr_bitmap = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_bitmap = 0xfff;
+        ratr_bitmap |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
+                        sta->ht_cap.mcs.rx_mask[0] << 12);
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                ratr_index = RATR_INX_WIRELESS_B;
+                if (ratr_bitmap & 0x0000000c)
+                        ratr_bitmap &= 0x0000000d;
+                else
+                        ratr_bitmap &= 0x0000000f;
+                break;
+        case WIRELESS_MODE_G:
+                ratr_index = RATR_INX_WIRELESS_GB;
+
+                if (rssi == 1)
+                        ratr_bitmap &= 0x00000f00;
+                else if (rssi == 2)
+                        ratr_bitmap &= 0x00000ff0;
+                else
+                        ratr_bitmap &= 0x00000ff5;
+                break;
+        case WIRELESS_MODE_A:
+                ratr_index = RATR_INX_WIRELESS_A;
+                ratr_bitmap &= 0x00000ff0;
+                break;
+        case WIRELESS_MODE_N_24G:
+        case WIRELESS_MODE_N_5G:
+                ratr_index = RATR_INX_WIRELESS_NGB;
+
+                if (mimo_ps == IEEE80211_SMPS_STATIC) {
+                        if (rssi == 1)
+                                ratr_bitmap &= 0x00070000;
+                        else if (rssi == 2)
+                                ratr_bitmap &= 0x0007f000;
+                        else
+                                ratr_bitmap &= 0x0007f005;
+                } else {
+                        if (rtlphy->rf_type == RF_1T2R ||
+                            rtlphy->rf_type == RF_1T1R) {
+                                if (ctx40) {
+                                        if (rssi == 1)
+                                                ratr_bitmap &= 0x000f0000;
+                                        else if (rssi == 2)
+                                                ratr_bitmap &= 0x000ff000;
+                                        else
+                                                ratr_bitmap &= 0x000ff015;
+                                } else {
+                                        if (rssi == 1)
+                                                ratr_bitmap &= 0x000f0000;
+                                        else if (rssi == 2)
+                                                ratr_bitmap &= 0x000ff000;
+                                        else
+                                                ratr_bitmap &= 0x000ff005;
+                                }
+                        } else {
+                                if (ctx40) {
+                                        if (rssi == 1)
+                                                ratr_bitmap &= 0x0f8f0000;
+                                        else if (rssi == 2)
+                                                ratr_bitmap &= 0x0f8ff000;
+                                        else
+                                                ratr_bitmap &= 0x0f8ff015;
+                                } else {
+                                        if (rssi == 1)
+                                                ratr_bitmap &= 0x0f8f0000;
+                                        else if (rssi == 2)
+                                                ratr_bitmap &= 0x0f8ff000;
+                                        else
+                                                ratr_bitmap &= 0x0f8ff005;
+                                }
+                        }
+                }
+
+                if ((ctx40 && short40) || (!ctx40 && short20)) {
+                        if (macid == 0)
+                                shortgi = true;
+                        else if (macid == 1)
+                                shortgi = false;
+                }
+                break;
+        default:
+                ratr_index = RATR_INX_WIRELESS_NGB;
+
+                if (rtlphy->rf_type == RF_1T2R)
+                        ratr_bitmap &= 0x000ff0ff;
+                else
+                        ratr_bitmap &= 0x0f0ff0ff;
+                break;
+        }
+        sta_entry->ratr_index = ratr_index;
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "ratr_bitmap :%x\n", ratr_bitmap);
+        *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
+                             (ratr_index << 28);
+        rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
+                 ratr_index, ratr_bitmap, rate_mask[0], rate_mask[1],
+                 rate_mask[2], rate_mask[3], rate_mask[4]);
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_RA_MASK, 5, rate_mask);
+        _rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
+}
+
+void rtl88ee_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                struct ieee80211_sta *sta, u8 rssi)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->dm.useramask)
+                rtl88ee_update_hal_rate_mask(hw, sta, rssi);
+        else
+                rtl88ee_update_hal_rate_table(hw, sta);
+}
+
+void rtl88ee_update_channel_access_setting(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u16 sifs_timer;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
+                                      (u8 *)&mac->slot_time);
+        if (!mac->ht_enable)
+                sifs_timer = 0x0a0a;
+        else
+                sifs_timer = 0x0e0e;
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SIFS, (u8 *)&sifs_timer);
+}
+
+bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        enum rf_pwrstate state_toset;
+        u32 u4tmp;
+        bool actuallyset = false;
+
+        if (rtlpriv->rtlhal.being_init_adapter)
+                return false;
+
+        if (ppsc->swrf_processing)
+                return false;
+
+        spin_lock(&rtlpriv->locks.rf_ps_lock);
+        if (ppsc->rfchange_inprogress) {
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+                return false;
+        } else {
+                ppsc->rfchange_inprogress = true;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        }
+
+        u4tmp = rtl_read_dword(rtlpriv, REG_GPIO_OUTPUT);
+        state_toset = (u4tmp & BIT(31)) ? ERFON : ERFOFF;
+
+
+        if ((ppsc->hwradiooff == true) && (state_toset == ERFON)) {
+                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
+
+                state_toset = ERFON;
+                ppsc->hwradiooff = false;
+                actuallyset = true;
+        } else if ((ppsc->hwradiooff == false) && (state_toset == ERFOFF)) {
+                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                         "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
+
+                state_toset = ERFOFF;
+                ppsc->hwradiooff = true;
+                actuallyset = true;
+        }
+
+        if (actuallyset) {
+                spin_lock(&rtlpriv->locks.rf_ps_lock);
+                ppsc->rfchange_inprogress = false;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        } else {
+                if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC)
+                        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+
+                spin_lock(&rtlpriv->locks.rf_ps_lock);
+                ppsc->rfchange_inprogress = false;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        }
+
+        *valid = 1;
+        return !ppsc->hwradiooff;
+}
+
+static void add_one_key(struct ieee80211_hw *hw, u8 *macaddr,
+                        struct rtl_mac *mac, u32 key, u32 id,
+                        u8 enc_algo, bool is_pairwise)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "add one entry\n");
+        if (is_pairwise) {
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "set Pairwise key\n");
+
+                rtl_cam_add_one_entry(hw, macaddr, key, id, enc_algo,
+                                      CAM_CONFIG_NO_USEDK,
+                                      rtlpriv->sec.key_buf[key]);
+        } else {
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "set group key\n");
+
+                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+                        rtl_cam_add_one_entry(hw, rtlefuse->dev_addr,
+                                              PAIRWISE_KEYIDX,
+                                              CAM_PAIRWISE_KEY_POSITION,
+                                              enc_algo,
+                                              CAM_CONFIG_NO_USEDK,
+                                              rtlpriv->sec.key_buf[id]);
+                }
+
+                rtl_cam_add_one_entry(hw, macaddr, key, id, enc_algo,
+                                      CAM_CONFIG_NO_USEDK,
+                                      rtlpriv->sec.key_buf[id]);
+        }
+}
+
+void rtl88ee_set_key(struct ieee80211_hw *hw, u32 key,
+                     u8 *mac_ad, bool is_group, u8 enc_algo,
+                     bool is_wepkey, bool clear_all)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u8 *macaddr = mac_ad;
+        u32 id = 0;
+        bool is_pairwise = false;
+
+        static u8 cam_const_addr[4][6] = {
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x02},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x03}
+        };
+        static u8 cam_const_broad[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+
+        if (clear_all) {
+                u8 idx = 0;
+                u8 cam_offset = 0;
+                u8 clear_number = 5;
+
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
+
+                for (idx = 0; idx < clear_number; idx++) {
+                        rtl_cam_mark_invalid(hw, cam_offset + idx);
+                        rtl_cam_empty_entry(hw, cam_offset + idx);
+
+                        if (idx < 5) {
+                                memset(rtlpriv->sec.key_buf[idx], 0,
+                                       MAX_KEY_LEN);
+                                rtlpriv->sec.key_len[idx] = 0;
+                        }
+                }
+
+        } else {
+                switch (enc_algo) {
+                case WEP40_ENCRYPTION:
+                        enc_algo = CAM_WEP40;
+                        break;
+                case WEP104_ENCRYPTION:
+                        enc_algo = CAM_WEP104;
+                        break;
+                case TKIP_ENCRYPTION:
+                        enc_algo = CAM_TKIP;
+                        break;
+                case AESCCMP_ENCRYPTION:
+                        enc_algo = CAM_AES;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
+                        enc_algo = CAM_TKIP;
+                        break;
+                }
+
+                if (is_wepkey || rtlpriv->sec.use_defaultkey) {
+                        macaddr = cam_const_addr[key];
+                        id = key;
+                } else {
+                        if (is_group) {
+                                macaddr = cam_const_broad;
+                                id = key;
+                        } else {
+                                if (mac->opmode == NL80211_IFTYPE_AP ||
+                                    mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                                        id = rtl_cam_get_free_entry(hw, mac_ad);
+                                        if (id >=  TOTAL_CAM_ENTRY) {
+                                                RT_TRACE(rtlpriv, COMP_SEC,
+                                                         DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
+                                                return;
+                                        }
+                                } else {
+                                        id = CAM_PAIRWISE_KEY_POSITION;
+                                }
+
+                                key = PAIRWISE_KEYIDX;
+                                is_pairwise = true;
+                        }
+                }
+
+                if (rtlpriv->sec.key_len[key] == 0) {
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "delete one entry, id is %d\n", id);
+                        if (mac->opmode == NL80211_IFTYPE_AP ||
+                            mac->opmode == NL80211_IFTYPE_MESH_POINT)
+                                rtl_cam_del_entry(hw, mac_ad);
+                        rtl_cam_delete_one_entry(hw, mac_ad, id);
+                } else {
+                        add_one_key(hw, macaddr, mac, key, id, enc_algo,
+                                    is_pairwise);
+                }
+        }
+}
+
+static void rtl8188ee_bt_var_init(struct ieee80211_hw *hw)
+{
+        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
+        struct bt_coexist_info coexist = rppriv->bt_coexist;
+
+        coexist.bt_coexistence = rppriv->bt_coexist.eeprom_bt_coexist;
+        coexist.bt_ant_num = coexist.eeprom_bt_ant_num;
+        coexist.bt_coexist_type = coexist.eeprom_bt_type;
+
+        if (coexist.reg_bt_iso == 2)
+                coexist.bt_ant_isolation = coexist.eeprom_bt_ant_isol;
+        else
+                coexist.bt_ant_isolation = coexist.reg_bt_iso;
+
+        coexist.bt_radio_shared_type = coexist.eeprom_bt_radio_shared;
+
+        if (coexist.bt_coexistence) {
+                if (coexist.reg_bt_sco == 1)
+                        coexist.bt_service = BT_OTHER_ACTION;
+                else if (coexist.reg_bt_sco == 2)
+                        coexist.bt_service = BT_SCO;
+                else if (coexist.reg_bt_sco == 4)
+                        coexist.bt_service = BT_BUSY;
+                else if (coexist.reg_bt_sco == 5)
+                        coexist.bt_service = BT_OTHERBUSY;
+                else
+                        coexist.bt_service = BT_IDLE;
+
+                coexist.bt_edca_ul = 0;
+                coexist.bt_edca_dl = 0;
+                coexist.bt_rssi_state = 0xff;
+        }
+}
+
+void rtl8188ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                              bool auto_load_fail, u8 *hwinfo)
+{
+        rtl8188ee_bt_var_init(hw);
+}
+
+void rtl8188ee_bt_reg_init(struct ieee80211_hw *hw)
+{
+        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
+
+        /* 0:Low, 1:High, 2:From Efuse. */
+        rppriv->bt_coexist.reg_bt_iso = 2;
+        /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter. */
+        rppriv->bt_coexist.reg_bt_sco = 3;
+        /* 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. */
+        rppriv->bt_coexist.reg_bt_sco = 0;
+}
+
+void rtl8188ee_bt_hw_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
+        struct bt_coexist_info coexist = rppriv->bt_coexist;
+        u8 u1_tmp;
+
+        if (coexist.bt_coexistence &&
+            ((coexist.bt_coexist_type == BT_CSR_BC4) ||
+              coexist.bt_coexist_type == BT_CSR_BC8)) {
+                if (coexist.bt_ant_isolation)
+                        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);
+
+                u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) &
+                                       BIT_OFFSET_LEN_MASK_32(0, 1);
+                u1_tmp = u1_tmp | ((coexist.bt_ant_isolation == 1) ?
+                         0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |
+                         ((coexist.bt_service == BT_SCO) ?
+                         0 : BIT_OFFSET_LEN_MASK_32(2, 1));
+                rtl_write_byte(rtlpriv, 0x4fd, u1_tmp);
+
+                rtl_write_dword(rtlpriv, REG_BT_COEX_TABLE+4, 0xaaaa9aaa);
+                rtl_write_dword(rtlpriv, REG_BT_COEX_TABLE+8, 0xffbd0040);
+                rtl_write_dword(rtlpriv, REG_BT_COEX_TABLE+0xc, 0x40000010);
+
+                /* Config to 1T1R. */
+                if (rtlphy->rf_type == RF_1T1R) {
+                        u1_tmp = rtl_read_byte(rtlpriv, ROFDM0_TRXPATHENABLE);
+                        u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1));
+                        rtl_write_byte(rtlpriv, ROFDM0_TRXPATHENABLE, u1_tmp);
+
+                        u1_tmp = rtl_read_byte(rtlpriv, ROFDM1_TRXPATHENABLE);
+                        u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1));
+                        rtl_write_byte(rtlpriv, ROFDM1_TRXPATHENABLE, u1_tmp);
+                }
+        }
+}
+
+void rtl88ee_suspend(struct ieee80211_hw *hw)
+{
+}
+
+void rtl88ee_resume(struct ieee80211_hw *hw)
+{
+}
+
+/* Turn on AAP (RCR:bit 0) for promicuous mode. */
+void rtl88ee_allow_all_destaddr(struct ieee80211_hw *hw,
+                                bool allow_all_da, bool write_into_reg)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        if (allow_all_da) /* Set BIT0 */
+                rtlpci->receive_config |= RCR_AAP;
+         else /* Clear BIT0 */
+                rtlpci->receive_config &= ~RCR_AAP;
+
+        if (write_into_reg)
+                rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+
+        RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
+                 "receive_config = 0x%08X, write_into_reg =%d\n",
+                 rtlpci->receive_config, write_into_reg);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.h b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.h
new file mode 100644
index 000000000000..b4460a41bd01
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.h
@@ -0,0 +1,68 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92CE_HW_H__
+#define __RTL92CE_HW_H__
+
+void rtl88ee_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw);
+void rtl88ee_interrupt_recognized(struct ieee80211_hw *hw,
+                                  u32 *p_inta, u32 *p_intb);
+int rtl88ee_hw_init(struct ieee80211_hw *hw);
+void rtl88ee_card_disable(struct ieee80211_hw *hw);
+void rtl88ee_enable_interrupt(struct ieee80211_hw *hw);
+void rtl88ee_disable_interrupt(struct ieee80211_hw *hw);
+int rtl88ee_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type);
+void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid);
+void rtl88ee_set_qos(struct ieee80211_hw *hw, int aci);
+void rtl88ee_set_beacon_related_registers(struct ieee80211_hw *hw);
+void rtl88ee_set_beacon_interval(struct ieee80211_hw *hw);
+void rtl88ee_update_interrupt_mask(struct ieee80211_hw *hw,
+                                   u32 add_msr, u32 rm_msr);
+void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl88ee_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                 struct ieee80211_sta *sta, u8 rssi_level);
+void rtl88ee_update_channel_access_setting(struct ieee80211_hw *hw);
+bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid);
+void rtl88ee_enable_hw_security_config(struct ieee80211_hw *hw);
+void rtl88ee_set_key(struct ieee80211_hw *hw, u32 key_index,
+                     u8 *p_macaddr, bool is_group, u8 enc_algo,
+                     bool is_wepkey, bool clear_all);
+
+void rtl8188ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                              bool autoload_fail, u8 *hwinfo);
+void rtl8188ee_bt_reg_init(struct ieee80211_hw *hw);
+void rtl8188ee_bt_hw_init(struct ieee80211_hw *hw);
+void rtl88ee_suspend(struct ieee80211_hw *hw);
+void rtl88ee_resume(struct ieee80211_hw *hw);
+void rtl88ee_allow_all_destaddr(struct ieee80211_hw *hw,
+                                bool allow_all_da, bool write_into_reg);
+void rtl88ee_fw_clk_off_timer_callback(unsigned long data);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/led.c b/drivers/net/wireless/rtlwifi/rtl8188ee/led.c
new file mode 100644
index 000000000000..c81a9cb6894c
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/led.c
@@ -0,0 +1,157 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "reg.h"
+#include "led.h"
+
+static void rtl88ee_init_led(struct ieee80211_hw *hw,
+                             struct rtl_led *pled, enum rtl_led_pin ledpin)
+{
+        pled->hw = hw;
+        pled->ledpin = ledpin;
+        pled->ledon = false;
+}
+
+void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        u8 ledcfg;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "LedAddr:%X ledpin =%d\n", REG_LEDCFG2, pled->ledpin);
+
+        switch (pled->ledpin) {
+        case LED_PIN_GPIO0:
+                break;
+        case LED_PIN_LED0:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
+                rtl_write_byte(rtlpriv, REG_LEDCFG2,
+                               (ledcfg & 0xf0) | BIT(5) | BIT(6));
+                break;
+        case LED_PIN_LED1:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg & 0x10);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
+                break;
+        }
+        pled->ledon = true;
+}
+
+void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        u8 ledcfg;
+        u8 val;
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "LedAddr:%X ledpin =%d\n", REG_LEDCFG2, pled->ledpin);
+
+        switch (pled->ledpin) {
+        case LED_PIN_GPIO0:
+                break;
+        case LED_PIN_LED0:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
+                ledcfg &= 0xf0;
+                val = ledcfg | BIT(3) | BIT(5) | BIT(6);
+                if (pcipriv->ledctl.led_opendrain == true) {
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2, val);
+                        ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
+                        val = ledcfg & 0xFE;
+                        rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, val);
+                } else {
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2, val);
+                }
+                break;
+        case LED_PIN_LED1:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
+                ledcfg &= 0x10;
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, (ledcfg | BIT(3)));
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
+                break;
+        }
+        pled->ledon = false;
+}
+
+void rtl88ee_init_sw_leds(struct ieee80211_hw *hw)
+{
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+
+        rtl88ee_init_led(hw, &(pcipriv->ledctl.sw_led0), LED_PIN_LED0);
+        rtl88ee_init_led(hw, &(pcipriv->ledctl.sw_led1), LED_PIN_LED1);
+}
+
+static void rtl88ee_sw_led_control(struct ieee80211_hw *hw,
+                                    enum led_ctl_mode ledaction)
+{
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);
+
+        switch (ledaction) {
+        case LED_CTL_POWER_ON:
+        case LED_CTL_LINK:
+        case LED_CTL_NO_LINK:
+                rtl88ee_sw_led_on(hw, pLed0);
+                break;
+        case LED_CTL_POWER_OFF:
+                rtl88ee_sw_led_off(hw, pLed0);
+                break;
+        default:
+                break;
+        }
+}
+
+void rtl88ee_led_control(struct ieee80211_hw *hw,
+                        enum led_ctl_mode ledaction)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+
+        if ((ppsc->rfoff_reason > RF_CHANGE_BY_PS) &&
+            (ledaction == LED_CTL_TX ||
+             ledaction == LED_CTL_RX ||
+             ledaction == LED_CTL_SITE_SURVEY ||
+             ledaction == LED_CTL_LINK ||
+             ledaction == LED_CTL_NO_LINK ||
+             ledaction == LED_CTL_START_TO_LINK ||
+             ledaction == LED_CTL_POWER_ON)) {
+                return;
+        }
+        RT_TRACE(rtlpriv, COMP_LED, DBG_TRACE, "ledaction %d,\n",
+                 ledaction);
+        rtl88ee_sw_led_control(hw, ledaction);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/led.h b/drivers/net/wireless/rtlwifi/rtl8188ee/led.h
new file mode 100644
index 000000000000..4073f6f847b2
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/led.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92CE_LED_H__
+#define __RTL92CE_LED_H__
+
+void rtl88ee_init_sw_leds(struct ieee80211_hw *hw);
+void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl88ee_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
new file mode 100644
index 000000000000..e655c0473225
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
@@ -0,0 +1,2202 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../ps.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+#include "table.h"
+
+static void set_baseband_phy_config(struct ieee80211_hw *hw);
+static void set_baseband_agc_config(struct ieee80211_hw *hw);
+static void store_pwrindex_offset(struct ieee80211_hw *hw,
+                                  u32 regaddr, u32 bitmask,
+                                  u32 data);
+static bool check_cond(struct ieee80211_hw *hw, const u32  condition);
+
+static u32 rf_serial_read(struct ieee80211_hw *hw,
+                          enum radio_path rfpath, u32 offset)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct bb_reg_def *phreg = &rtlphy->phyreg_def[rfpath];
+        u32 newoffset;
+        u32 tmplong, tmplong2;
+        u8 rfpi_enable = 0;
+        u32 ret;
+        int jj = RF90_PATH_A;
+        int kk = RF90_PATH_B;
+
+        offset &= 0xff;
+        newoffset = offset;
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
+                return 0xFFFFFFFF;
+        }
+        tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
+        if (rfpath == jj)
+                tmplong2 = tmplong;
+        else
+                tmplong2 = rtl_get_bbreg(hw, phreg->rfhssi_para2, MASKDWORD);
+        tmplong2 = (tmplong2 & (~BLSSIREADADDRESS)) |
+            (newoffset << 23) | BLSSIREADEDGE;
+        rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
+                      tmplong & (~BLSSIREADEDGE));
+        mdelay(1);
+        rtl_set_bbreg(hw, phreg->rfhssi_para2, MASKDWORD, tmplong2);
+        mdelay(2);
+        if (rfpath == jj)
+                rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
+                                                 BIT(8));
+        else if (rfpath == kk)
+                rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XB_HSSIPARAMETER1,
+                                                 BIT(8));
+        if (rfpi_enable)
+                ret = rtl_get_bbreg(hw, phreg->rf_rbpi, BLSSIREADBACKDATA);
+        else
+                ret = rtl_get_bbreg(hw, phreg->rf_rb, BLSSIREADBACKDATA);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]= 0x%x\n",
+                 rfpath, phreg->rf_rb, ret);
+        return ret;
+}
+
+static void rf_serial_write(struct ieee80211_hw *hw,
+                            enum radio_path rfpath, u32 offset,
+                            u32 data)
+{
+        u32 data_and_addr;
+        u32 newoffset;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct bb_reg_def *phreg = &rtlphy->phyreg_def[rfpath];
+
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
+                return;
+        }
+        offset &= 0xff;
+        newoffset = offset;
+        data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
+        rtl_set_bbreg(hw, phreg->rf3wire_offset, MASKDWORD, data_and_addr);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]= 0x%x\n",
+                 rfpath, phreg->rf3wire_offset, data_and_addr);
+}
+
+static u32 cal_bit_shift(u32 bitmask)
+{
+        u32 i;
+
+        for (i = 0; i <= 31; i++) {
+                if (((bitmask >> i) & 0x1) == 1)
+                        break;
+        }
+        return i;
+}
+
+static bool config_bb_with_header(struct ieee80211_hw *hw,
+                                  u8 configtype)
+{
+        if (configtype == BASEBAND_CONFIG_PHY_REG)
+                set_baseband_phy_config(hw);
+        else if (configtype == BASEBAND_CONFIG_AGC_TAB)
+                set_baseband_agc_config(hw);
+        return true;
+}
+
+static bool config_bb_with_pgheader(struct ieee80211_hw *hw,
+                                    u8 configtype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int i;
+        u32 *table_pg;
+        u16 tbl_page_len;
+        u32 v1 = 0, v2 = 0;
+
+        tbl_page_len = RTL8188EEPHY_REG_ARRAY_PGLEN;
+        table_pg = RTL8188EEPHY_REG_ARRAY_PG;
+
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                for (i = 0; i < tbl_page_len; i = i + 3) {
+                        v1 = table_pg[i];
+                        v2 = table_pg[i + 1];
+
+                        if (v1 < 0xcdcdcdcd) {
+                                if (table_pg[i] == 0xfe)
+                                        mdelay(50);
+                                else if (table_pg[i] == 0xfd)
+                                        mdelay(5);
+                                else if (table_pg[i] == 0xfc)
+                                        mdelay(1);
+                                else if (table_pg[i] == 0xfb)
+                                        udelay(50);
+                                else if (table_pg[i] == 0xfa)
+                                        udelay(5);
+                                else if (table_pg[i] == 0xf9)
+                                        udelay(1);
+
+                                store_pwrindex_offset(hw, table_pg[i],
+                                                      table_pg[i + 1],
+                                                      table_pg[i + 2]);
+                                continue;
+                        } else {
+                                if (!check_cond(hw, table_pg[i])) {
+                                        /*don't need the hw_body*/
+                                        i += 2; /* skip the pair of expression*/
+                                        v1 = table_pg[i];
+                                        v2 = table_pg[i + 1];
+                                        while (v2 != 0xDEAD) {
+                                                i += 3;
+                                                v1 = table_pg[i];
+                                                v2 = table_pg[i + 1];
+                                        }
+                                }
+                        }
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "configtype != BaseBand_Config_PHY_REG\n");
+        }
+        return true;
+}
+
+static bool config_parafile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
+        bool rtstatus;
+
+        rtstatus = config_bb_with_header(hw, BASEBAND_CONFIG_PHY_REG);
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
+                return false;
+        }
+
+        if (fuse->autoload_failflag == false) {
+                rtlphy->pwrgroup_cnt = 0;
+                rtstatus = config_bb_with_pgheader(hw, BASEBAND_CONFIG_PHY_REG);
+        }
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
+                return false;
+        }
+        rtstatus = config_bb_with_header(hw, BASEBAND_CONFIG_AGC_TAB);
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
+                return false;
+        }
+        rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
+                                 RFPGA0_XA_HSSIPARAMETER2, 0x200));
+
+        return true;
+}
+
+static void rtl88e_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        int jj = RF90_PATH_A;
+        int kk = RF90_PATH_B;
+
+        rtlphy->phyreg_def[jj].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+        rtlphy->phyreg_def[kk].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_C].rfintfs = RFPGA0_XCD_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_D].rfintfs = RFPGA0_XCD_RFINTERFACESW;
+
+        rtlphy->phyreg_def[jj].rfintfi = RFPGA0_XAB_RFINTERFACERB;
+        rtlphy->phyreg_def[kk].rfintfi = RFPGA0_XAB_RFINTERFACERB;
+        rtlphy->phyreg_def[RF90_PATH_C].rfintfi = RFPGA0_XCD_RFINTERFACERB;
+        rtlphy->phyreg_def[RF90_PATH_D].rfintfi = RFPGA0_XCD_RFINTERFACERB;
+
+        rtlphy->phyreg_def[jj].rfintfo = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[kk].rfintfo = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[jj].rfintfe = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[kk].rfintfe = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[jj].rf3wire_offset = RFPGA0_XA_LSSIPARAMETER;
+        rtlphy->phyreg_def[kk].rf3wire_offset = RFPGA0_XB_LSSIPARAMETER;
+
+        rtlphy->phyreg_def[jj].rflssi_select = rFPGA0_XAB_RFPARAMETER;
+        rtlphy->phyreg_def[kk].rflssi_select = rFPGA0_XAB_RFPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_C].rflssi_select = rFPGA0_XCD_RFPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_D].rflssi_select = rFPGA0_XCD_RFPARAMETER;
+
+        rtlphy->phyreg_def[jj].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+        rtlphy->phyreg_def[kk].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+        rtlphy->phyreg_def[RF90_PATH_C].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+        rtlphy->phyreg_def[RF90_PATH_D].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+
+        rtlphy->phyreg_def[jj].rfhssi_para1 = RFPGA0_XA_HSSIPARAMETER1;
+        rtlphy->phyreg_def[kk].rfhssi_para1 = RFPGA0_XB_HSSIPARAMETER1;
+
+        rtlphy->phyreg_def[jj].rfhssi_para2 = RFPGA0_XA_HSSIPARAMETER2;
+        rtlphy->phyreg_def[kk].rfhssi_para2 = RFPGA0_XB_HSSIPARAMETER2;
+
+        rtlphy->phyreg_def[jj].rfsw_ctrl = RFPGA0_XAB_SWITCHCONTROL;
+        rtlphy->phyreg_def[kk].rfsw_ctrl = RFPGA0_XAB_SWITCHCONTROL;
+        rtlphy->phyreg_def[RF90_PATH_C].rfsw_ctrl = RFPGA0_XCD_SWITCHCONTROL;
+        rtlphy->phyreg_def[RF90_PATH_D].rfsw_ctrl = RFPGA0_XCD_SWITCHCONTROL;
+
+        rtlphy->phyreg_def[jj].rfagc_control1 = ROFDM0_XAAGCCORE1;
+        rtlphy->phyreg_def[kk].rfagc_control1 = ROFDM0_XBAGCCORE1;
+        rtlphy->phyreg_def[RF90_PATH_C].rfagc_control1 = ROFDM0_XCAGCCORE1;
+        rtlphy->phyreg_def[RF90_PATH_D].rfagc_control1 = ROFDM0_XDAGCCORE1;
+
+        rtlphy->phyreg_def[jj].rfagc_control2 = ROFDM0_XAAGCCORE2;
+        rtlphy->phyreg_def[kk].rfagc_control2 = ROFDM0_XBAGCCORE2;
+        rtlphy->phyreg_def[RF90_PATH_C].rfagc_control2 = ROFDM0_XCAGCCORE2;
+        rtlphy->phyreg_def[RF90_PATH_D].rfagc_control2 = ROFDM0_XDAGCCORE2;
+
+        rtlphy->phyreg_def[jj].rfrxiq_imbal = ROFDM0_XARXIQIMBAL;
+        rtlphy->phyreg_def[kk].rfrxiq_imbal = ROFDM0_XBRXIQIMBAL;
+        rtlphy->phyreg_def[RF90_PATH_C].rfrxiq_imbal = ROFDM0_XCRXIQIMBAL;
+        rtlphy->phyreg_def[RF90_PATH_D].rfrxiq_imbal = ROFDM0_XDRXIQIMBAL;
+
+        rtlphy->phyreg_def[jj].rfrx_afe = ROFDM0_XARXAFE;
+        rtlphy->phyreg_def[kk].rfrx_afe = ROFDM0_XBRXAFE;
+        rtlphy->phyreg_def[RF90_PATH_C].rfrx_afe = ROFDM0_XCRXAFE;
+        rtlphy->phyreg_def[RF90_PATH_D].rfrx_afe = ROFDM0_XDRXAFE;
+
+        rtlphy->phyreg_def[jj].rftxiq_imbal = ROFDM0_XATXIQIMBAL;
+        rtlphy->phyreg_def[kk].rftxiq_imbal = ROFDM0_XBTXIQIMBAL;
+        rtlphy->phyreg_def[RF90_PATH_C].rftxiq_imbal = ROFDM0_XCTXIQIMBAL;
+        rtlphy->phyreg_def[RF90_PATH_D].rftxiq_imbal = ROFDM0_XDTXIQIMBAL;
+
+        rtlphy->phyreg_def[jj].rftx_afe = ROFDM0_XATXAFE;
+        rtlphy->phyreg_def[kk].rftx_afe = ROFDM0_XBTXAFE;
+
+        rtlphy->phyreg_def[jj].rf_rb = RFPGA0_XA_LSSIREADBACK;
+        rtlphy->phyreg_def[kk].rf_rb = RFPGA0_XB_LSSIREADBACK;
+
+        rtlphy->phyreg_def[jj].rf_rbpi = TRANSCEIVEA_HSPI_READBACK;
+        rtlphy->phyreg_def[kk].rf_rbpi = TRANSCEIVEB_HSPI_READBACK;
+}
+
+static bool rtl88e_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
+                                            u32 cmdtableidx, u32 cmdtablesz,
+                                            enum swchnlcmd_id cmdid,
+                                            u32 para1, u32 para2, u32 msdelay)
+{
+        struct swchnlcmd *pcmd;
+
+        if (cmdtable == NULL) {
+                RT_ASSERT(false, "cmdtable cannot be NULL.\n");
+                return false;
+        }
+
+        if (cmdtableidx >= cmdtablesz)
+                return false;
+
+        pcmd = cmdtable + cmdtableidx;
+        pcmd->cmdid = cmdid;
+        pcmd->para1 = para1;
+        pcmd->para2 = para2;
+        pcmd->msdelay = msdelay;
+        return true;
+}
+
+static bool chnl_step_by_step(struct ieee80211_hw *hw,
+                              u8 channel, u8 *stage, u8 *step,
+                              u32 *delay)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct swchnlcmd precommoncmd[MAX_PRECMD_CNT];
+        u32 precommoncmdcnt;
+        struct swchnlcmd postcommoncmd[MAX_POSTCMD_CNT];
+        u32 postcommoncmdcnt;
+        struct swchnlcmd rfdependcmd[MAX_RFDEPENDCMD_CNT];
+        u32 rfdependcmdcnt;
+        struct swchnlcmd *currentcmd = NULL;
+        u8 rfpath;
+        u8 num_total_rfpath = rtlphy->num_total_rfpath;
+
+        precommoncmdcnt = 0;
+        rtl88e_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+                                        MAX_PRECMD_CNT,
+                                        CMDID_SET_TXPOWEROWER_LEVEL, 0, 0, 0);
+        rtl88e_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+                                        MAX_PRECMD_CNT, CMDID_END, 0, 0, 0);
+
+        postcommoncmdcnt = 0;
+
+        rtl88e_phy_set_sw_chnl_cmdarray(postcommoncmd, postcommoncmdcnt++,
+                                        MAX_POSTCMD_CNT, CMDID_END, 0, 0, 0);
+
+        rfdependcmdcnt = 0;
+
+        RT_ASSERT((channel >= 1 && channel <= 14),
+                  "illegal channel for Zebra: %d\n", channel);
+
+        rtl88e_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
+                                        MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
+                                        RF_CHNLBW, channel, 10);
+
+        rtl88e_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
+                                        MAX_RFDEPENDCMD_CNT, CMDID_END, 0, 0,
+                                         0);
+
+        do {
+                switch (*stage) {
+                case 0:
+                        currentcmd = &precommoncmd[*step];
+                        break;
+                case 1:
+                        currentcmd = &rfdependcmd[*step];
+                        break;
+                case 2:
+                        currentcmd = &postcommoncmd[*step];
+                        break;
+                }
+
+                if (currentcmd->cmdid == CMDID_END) {
+                        if ((*stage) == 2) {
+                                return true;
+                        } else {
+                                (*stage)++;
+                                (*step) = 0;
+                                continue;
+                        }
+                }
+
+                switch (currentcmd->cmdid) {
+                case CMDID_SET_TXPOWEROWER_LEVEL:
+                        rtl88e_phy_set_txpower_level(hw, channel);
+                        break;
+                case CMDID_WRITEPORT_ULONG:
+                        rtl_write_dword(rtlpriv, currentcmd->para1,
+                                        currentcmd->para2);
+                        break;
+                case CMDID_WRITEPORT_USHORT:
+                        rtl_write_word(rtlpriv, currentcmd->para1,
+                                       (u16) currentcmd->para2);
+                        break;
+                case CMDID_WRITEPORT_UCHAR:
+                        rtl_write_byte(rtlpriv, currentcmd->para1,
+                                       (u8) currentcmd->para2);
+                        break;
+                case CMDID_RF_WRITEREG:
+                        for (rfpath = 0; rfpath < num_total_rfpath; rfpath++) {
+                                rtlphy->rfreg_chnlval[rfpath] =
+                                    ((rtlphy->rfreg_chnlval[rfpath] &
+                                      0xfffffc00) | currentcmd->para2);
+
+                                rtl_set_rfreg(hw, (enum radio_path)rfpath,
+                                              currentcmd->para1,
+                                              RFREG_OFFSET_MASK,
+                                              rtlphy->rfreg_chnlval[rfpath]);
+                        }
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
+                        break;
+                }
+
+                break;
+        } while (true);
+
+        (*delay) = currentcmd->msdelay;
+        (*step)++;
+        return false;
+}
+
+static long rtl88e_pwr_idx_dbm(struct ieee80211_hw *hw,
+                               enum wireless_mode wirelessmode,
+                               u8 txpwridx)
+{
+        long offset;
+        long pwrout_dbm;
+
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                offset = -7;
+                break;
+        case WIRELESS_MODE_G:
+        case WIRELESS_MODE_N_24G:
+                offset = -8;
+                break;
+        default:
+                offset = -8;
+                break;
+        }
+        pwrout_dbm = txpwridx / 2 + offset;
+        return pwrout_dbm;
+}
+
+static void rtl88e_phy_set_io(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
+        switch (rtlphy->current_io_type) {
+        case IO_CMD_RESUME_DM_BY_SCAN:
+                dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
+                /*rtl92c_dm_write_dig(hw);*/
+                rtl88e_phy_set_txpower_level(hw, rtlphy->current_channel);
+                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x83);
+                break;
+        case IO_CMD_PAUSE_DM_BY_SCAN:
+                rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
+                dm_digtable->cur_igvalue = 0x17;
+                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x40);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
+                break;
+        }
+        rtlphy->set_io_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "(%#x)\n", rtlphy->current_io_type);
+}
+
+u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 returnvalue, originalvalue, bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
+        originalvalue = rtl_read_dword(rtlpriv, regaddr);
+        bitshift = cal_bit_shift(bitmask);
+        returnvalue = (originalvalue & bitmask) >> bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK = 0x%x Addr[0x%x]= 0x%x\n", bitmask,
+                 regaddr, originalvalue);
+
+        return returnvalue;
+}
+
+void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,
+                           u32 regaddr, u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 originalvalue, bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x),data(%#x)\n",
+                 regaddr, bitmask, data);
+
+        if (bitmask != MASKDWORD) {
+                originalvalue = rtl_read_dword(rtlpriv, regaddr);
+                bitshift = cal_bit_shift(bitmask);
+                data = ((originalvalue & (~bitmask)) | (data << bitshift));
+        }
+
+        rtl_write_dword(rtlpriv, regaddr, data);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
+}
+
+u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
+                            enum radio_path rfpath, u32 regaddr, u32 bitmask)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 original_value, readback_value, bitshift;
+        unsigned long flags;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
+
+        spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+
+
+        original_value = rf_serial_read(hw, rfpath, regaddr);
+        bitshift = cal_bit_shift(bitmask);
+        readback_value = (original_value & bitmask) >> bitshift;
+
+        spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                  regaddr, rfpath, bitmask, original_value);
+
+        return readback_value;
+}
+
+void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
+                           enum radio_path rfpath,
+                           u32 regaddr, u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 original_value, bitshift;
+        unsigned long flags;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                  regaddr, bitmask, data, rfpath);
+
+        spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+
+        if (bitmask != RFREG_OFFSET_MASK) {
+                        original_value = rf_serial_read(hw, rfpath, regaddr);
+                        bitshift = cal_bit_shift(bitmask);
+                        data = ((original_value & (~bitmask)) |
+                                (data << bitshift));
+                }
+
+        rf_serial_write(hw, rfpath, regaddr, data);
+
+
+        spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
+}
+
+static bool config_mac_with_header(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+        u32 arraylength;
+        u32 *ptrarray;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl8188EMACPHY_Array\n");
+        arraylength = RTL8188EEMAC_1T_ARRAYLEN;
+        ptrarray = RTL8188EEMAC_1T_ARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Img:RTL8188EEMAC_1T_ARRAY LEN %d\n", arraylength);
+        for (i = 0; i < arraylength; i = i + 2)
+                rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
+        return true;
+}
+
+bool rtl88e_phy_mac_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        bool rtstatus = config_mac_with_header(hw);
+
+        rtl_write_byte(rtlpriv, 0x04CA, 0x0B);
+        return rtstatus;
+}
+
+bool rtl88e_phy_bb_config(struct ieee80211_hw *hw)
+{
+        bool rtstatus = true;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 regval;
+        u8 reg_hwparafile = 1;
+        u32 tmp;
+        rtl88e_phy_init_bb_rf_register_definition(hw);
+        regval = rtl_read_word(rtlpriv, REG_SYS_FUNC_EN);
+        rtl_write_word(rtlpriv, REG_SYS_FUNC_EN,
+                       regval | BIT(13) | BIT(0) | BIT(1));
+
+        rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN,
+                       FEN_PPLL | FEN_PCIEA | FEN_DIO_PCIE |
+                       FEN_BB_GLB_RSTN | FEN_BBRSTB);
+        tmp = rtl_read_dword(rtlpriv, 0x4c);
+        rtl_write_dword(rtlpriv, 0x4c, tmp | BIT(23));
+        if (reg_hwparafile == 1)
+                rtstatus = config_parafile(hw);
+        return rtstatus;
+}
+
+bool rtl88e_phy_rf_config(struct ieee80211_hw *hw)
+{
+        return rtl88e_phy_rf6052_config(hw);
+}
+
+static bool check_cond(struct ieee80211_hw *hw,
+                                    const u32  condition)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
+        u32 _board = fuse->board_type; /*need efuse define*/
+        u32 _interface = rtlhal->interface;
+        u32 _platform = 0x08;/*SupportPlatform */
+        u32 cond = condition;
+
+        if (condition == 0xCDCDCDCD)
+                return true;
+
+        cond = condition & 0xFF;
+        if ((_board & cond) == 0 && cond != 0x1F)
+                return false;
+
+        cond = condition & 0xFF00;
+        cond = cond >> 8;
+        if ((_interface & cond) == 0 && cond != 0x07)
+                return false;
+
+        cond = condition & 0xFF0000;
+        cond = cond >> 16;
+        if ((_platform & cond) == 0 && cond != 0x0F)
+                return false;
+        return true;
+}
+
+static void _rtl8188e_config_rf_reg(struct ieee80211_hw *hw,
+                                    u32 addr, u32 data, enum radio_path rfpath,
+                                    u32 regaddr)
+{
+        if (addr == 0xffe) {
+                mdelay(50);
+        } else if (addr == 0xfd) {
+                mdelay(5);
+        } else if (addr == 0xfc) {
+                mdelay(1);
+        } else if (addr == 0xfb) {
+                udelay(50);
+        } else if (addr == 0xfa) {
+                udelay(5);
+        } else if (addr == 0xf9) {
+                udelay(1);
+        } else {
+                rtl_set_rfreg(hw, rfpath, regaddr,
+                              RFREG_OFFSET_MASK,
+                              data);
+                udelay(1);
+        }
+}
+
+static void rtl88_config_s(struct ieee80211_hw *hw,
+        u32 addr, u32 data)
+{
+        u32 content = 0x1000; /*RF Content: radio_a_txt*/
+        u32 maskforphyset = (u32)(content & 0xE000);
+
+        _rtl8188e_config_rf_reg(hw, addr, data, RF90_PATH_A,
+                                addr | maskforphyset);
+}
+
+static void _rtl8188e_config_bb_reg(struct ieee80211_hw *hw,
+                                    u32 addr, u32 data)
+{
+        if (addr == 0xfe) {
+                mdelay(50);
+        } else if (addr == 0xfd) {
+                mdelay(5);
+        } else if (addr == 0xfc) {
+                mdelay(1);
+        } else if (addr == 0xfb) {
+                udelay(50);
+        } else if (addr == 0xfa) {
+                udelay(5);
+        } else if (addr == 0xf9) {
+                udelay(1);
+        } else {
+                rtl_set_bbreg(hw, addr, MASKDWORD, data);
+                udelay(1);
+        }
+}
+
+
+#define NEXT_PAIR(v1, v2, i)                            \
+        do {                                            \
+                i += 2; v1 = array_table[i];            \
+                v2 = array_table[i + 1];                \
+        } while (0)
+
+static void set_baseband_agc_config(struct ieee80211_hw *hw)
+{
+        int i;
+        u32 *array_table;
+        u16 arraylen;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 v1 = 0, v2 = 0;
+
+        arraylen = RTL8188EEAGCTAB_1TARRAYLEN;
+        array_table = RTL8188EEAGCTAB_1TARRAY;
+
+        for (i = 0; i < arraylen; i += 2) {
+                v1 = array_table[i];
+                v2 = array_table[i + 1];
+                if (v1 < 0xCDCDCDCD) {
+                        rtl_set_bbreg(hw, array_table[i], MASKDWORD,
+                                      array_table[i + 1]);
+                        udelay(1);
+                        continue;
+                } else {/*This line is the start line of branch.*/
+                        if (!check_cond(hw, array_table[i])) {
+                                /*Discard the following (offset, data) pairs*/
+                                NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD && v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2) {
+                                        NEXT_PAIR(v1, v2, i);
+                                }
+                                i -= 2; /* compensate for loop's += 2*/
+                        } else {
+                                /* Configure matched pairs and skip to end */
+                                NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD && v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2) {
+                                        rtl_set_bbreg(hw, array_table[i],
+                                                      MASKDWORD,
+                                                      array_table[i + 1]);
+                                        udelay(1);
+                                        NEXT_PAIR(v1, v2, i);
+                                }
+
+                                while (v2 != 0xDEAD && i < arraylen - 2)
+                                        NEXT_PAIR(v1, v2, i);
+                        }
+                }
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
+                         array_table[i],
+                         array_table[i + 1]);
+        }
+}
+
+static void set_baseband_phy_config(struct ieee80211_hw *hw)
+{
+        int i;
+        u32 *array_table;
+        u16 arraylen;
+        u32 v1 = 0, v2 = 0;
+
+        arraylen = RTL8188EEPHY_REG_1TARRAYLEN;
+        array_table = RTL8188EEPHY_REG_1TARRAY;
+
+        for (i = 0; i < arraylen; i += 2) {
+                v1 = array_table[i];
+                v2 = array_table[i + 1];
+                if (v1 < 0xcdcdcdcd) {
+                        _rtl8188e_config_bb_reg(hw, v1, v2);
+                } else {/*This line is the start line of branch.*/
+                        if (!check_cond(hw, array_table[i])) {
+                                /*Discard the following (offset, data) pairs*/
+                                NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2)
+                                        NEXT_PAIR(v1, v2, i);
+                                i -= 2; /* prevent from for-loop += 2*/
+                        } else {
+                                /* Configure matched pairs and skip to end */
+                                NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2) {
+                                        _rtl8188e_config_bb_reg(hw, v1, v2);
+                                        NEXT_PAIR(v1, v2, i);
+                                }
+
+                                while (v2 != 0xDEAD && i < arraylen - 2)
+                                        NEXT_PAIR(v1, v2, i);
+                        }
+                }
+        }
+}
+
+static void store_pwrindex_offset(struct ieee80211_hw *hw,
+                                  u32 regaddr, u32 bitmask,
+                                  u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+
+        if (regaddr == RTXAGC_A_RATE18_06) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][0] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][0]);
+        }
+        if (regaddr == RTXAGC_A_RATE54_24) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][1] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][1]);
+        }
+        if (regaddr == RTXAGC_A_CCK1_MCS32) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][6] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][6]);
+        }
+        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][7] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][7]);
+        }
+        if (regaddr == RTXAGC_A_MCS03_MCS00) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][2] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][2]);
+        }
+        if (regaddr == RTXAGC_A_MCS07_MCS04) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][3] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][3]);
+        }
+        if (regaddr == RTXAGC_A_MCS11_MCS08) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][4] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][4]);
+        }
+        if (regaddr == RTXAGC_A_MCS15_MCS12) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][5] = data;
+                if (get_rf_type(rtlphy) == RF_1T1R)
+                        rtlphy->pwrgroup_cnt++;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][5]);
+        }
+        if (regaddr == RTXAGC_B_RATE18_06) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][8] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][8]);
+        }
+        if (regaddr == RTXAGC_B_RATE54_24) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][9] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][9]);
+        }
+        if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][14] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][14]);
+        }
+        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][15] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][15]);
+        }
+        if (regaddr == RTXAGC_B_MCS03_MCS00) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][10] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][10]);
+        }
+        if (regaddr == RTXAGC_B_MCS07_MCS04) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][11] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][11]);
+        }
+        if (regaddr == RTXAGC_B_MCS11_MCS08) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][12] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][12]);
+        }
+        if (regaddr == RTXAGC_B_MCS15_MCS12) {
+                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][13] = data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][13]);
+                if (get_rf_type(rtlphy) != RF_1T1R)
+                        rtlphy->pwrgroup_cnt++;
+        }
+}
+
+#define READ_NEXT_RF_PAIR(v1, v2, i)            \
+        do {                                    \
+                i += 2; v1 = a_table[i];        \
+                v2 = a_table[i + 1];            \
+        } while (0)
+
+bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                          enum radio_path rfpath)
+{
+        int i;
+        u32 *a_table;
+        u16 a_len;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 v1 = 0, v2 = 0;
+
+        a_len = RTL8188EE_RADIOA_1TARRAYLEN;
+        a_table = RTL8188EE_RADIOA_1TARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Radio_A:RTL8188EE_RADIOA_1TARRAY %d\n", a_len);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+        switch (rfpath) {
+        case RF90_PATH_A:
+                for (i = 0; i < a_len; i = i + 2) {
+                        v1 = a_table[i];
+                        v2 = a_table[i + 1];
+                        if (v1 < 0xcdcdcdcd) {
+                                rtl88_config_s(hw, v1, v2);
+                        } else {/*This line is the start line of branch.*/
+                                if (!check_cond(hw, a_table[i])) {
+                                        /* Discard the following (offset, data)
+                                         * pairs
+                                         */
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD && v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < a_len - 2)
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {
+                                        /* Configure matched pairs and skip to
+                                         * end of if-else.
+                                         */
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD && v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < a_len - 2) {
+                                                rtl88_config_s(hw, v1, v2);
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < a_len - 2)
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                }
+                        }
+                }
+
+                if (rtlhal->oem_id == RT_CID_819x_HP)
+                        rtl88_config_s(hw, 0x52, 0x7E4BD);
+
+                break;
+
+        case RF90_PATH_B:
+        case RF90_PATH_C:
+        case RF90_PATH_D:
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
+                break;
+        }
+        return true;
+}
+
+void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+
+        rtlphy->default_initialgain[0] = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1,
+                                                       MASKBYTE0);
+        rtlphy->default_initialgain[1] = rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1,
+                                                       MASKBYTE0);
+        rtlphy->default_initialgain[2] = rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1,
+                                                       MASKBYTE0);
+        rtlphy->default_initialgain[3] = rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1,
+                                                       MASKBYTE0);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Default initial gain (c50 = 0x%x, c58 = 0x%x, c60 = 0x%x, c68 = 0x%x\n",
+                  rtlphy->default_initialgain[0],
+                  rtlphy->default_initialgain[1],
+                  rtlphy->default_initialgain[2],
+                  rtlphy->default_initialgain[3]);
+
+        rtlphy->framesync = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
+                                          MASKBYTE0);
+        rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
+                                              MASKDWORD);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
+}
+
+void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        u8 level;
+        long dbm;
+
+        level = rtlphy->cur_cck_txpwridx;
+        dbm = rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_B, level);
+        level = rtlphy->cur_ofdm24g_txpwridx;
+        if (rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_G, level) > dbm)
+                dbm = rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_G, level);
+        level = rtlphy->cur_ofdm24g_txpwridx;
+        if (rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_N_24G, level) > dbm)
+                dbm = rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_N_24G, level);
+        *powerlevel = dbm;
+}
+
+static void _rtl88e_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
+                                      u8 *cckpower, u8 *ofdm, u8 *bw20_pwr,
+                                      u8 *bw40_pwr)
+{
+        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
+        u8 i = (channel - 1);
+        u8 rf_path = 0;
+        int jj = RF90_PATH_A;
+        int kk = RF90_PATH_B;
+
+        for (rf_path = 0; rf_path < 2; rf_path++) {
+                if (rf_path == jj) {
+                        cckpower[jj] = fuse->txpwrlevel_cck[jj][i];
+                        if (fuse->txpwr_ht20diff[jj][i] > 0x0f) /*-8~7 */
+                                bw20_pwr[jj] = fuse->txpwrlevel_ht40_1s[jj][i] -
+                                        (~(fuse->txpwr_ht20diff[jj][i]) + 1);
+                        else
+                                bw20_pwr[jj] = fuse->txpwrlevel_ht40_1s[jj][i] +
+                                         fuse->txpwr_ht20diff[jj][i];
+                        if (fuse->txpwr_legacyhtdiff[jj][i] > 0xf)
+                                ofdm[jj] = fuse->txpwrlevel_ht40_1s[jj][i] -
+                                        (~(fuse->txpwr_legacyhtdiff[jj][i])+1);
+                        else
+                                ofdm[jj] = fuse->txpwrlevel_ht40_1s[jj][i] +
+                                           fuse->txpwr_legacyhtdiff[jj][i];
+                        bw40_pwr[jj] = fuse->txpwrlevel_ht40_1s[jj][i];
+
+                } else if (rf_path == kk) {
+                        cckpower[kk] = fuse->txpwrlevel_cck[kk][i];
+                        bw20_pwr[kk] = fuse->txpwrlevel_ht40_1s[kk][i] +
+                                       fuse->txpwr_ht20diff[kk][i];
+                        ofdm[kk] = fuse->txpwrlevel_ht40_1s[kk][i] +
+                                        fuse->txpwr_legacyhtdiff[kk][i];
+                        bw40_pwr[kk] = fuse->txpwrlevel_ht40_1s[kk][i];
+                }
+        }
+}
+
+static void _rtl88e_ccxpower_index_check(struct ieee80211_hw *hw,
+                                         u8 channel, u8 *cckpower,
+                                         u8 *ofdm, u8 *bw20_pwr,
+                                         u8 *bw40_pwr)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+
+        rtlphy->cur_cck_txpwridx = cckpower[0];
+        rtlphy->cur_ofdm24g_txpwridx = ofdm[0];
+        rtlphy->cur_bw20_txpwridx = bw20_pwr[0];
+        rtlphy->cur_bw40_txpwridx = bw40_pwr[0];
+}
+
+void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
+{
+        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
+        u8 cckpower[MAX_TX_COUNT]  = {0}, ofdm[MAX_TX_COUNT] = {0};
+        u8 bw20_pwr[MAX_TX_COUNT] = {0}, bw40_pwr[MAX_TX_COUNT] = {0};
+
+        if (fuse->txpwr_fromeprom == false)
+                return;
+        _rtl88e_get_txpower_index(hw, channel, &cckpower[0], &ofdm[0],
+                                  &bw20_pwr[0], &bw40_pwr[0]);
+        _rtl88e_ccxpower_index_check(hw, channel, &cckpower[0], &ofdm[0],
+                                     &bw20_pwr[0], &bw40_pwr[0]);
+        rtl88e_phy_rf6052_set_cck_txpower(hw, &cckpower[0]);
+        rtl88e_phy_rf6052_set_ofdm_txpower(hw, &ofdm[0], &bw20_pwr[0],
+                                           &bw40_pwr[0], channel);
+}
+
+void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        enum io_type iotype;
+
+        if (!is_hal_stop(rtlhal)) {
+                switch (operation) {
+                case SCAN_OPT_BACKUP:
+                        iotype = IO_CMD_PAUSE_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+                        break;
+                case SCAN_OPT_RESTORE:
+                        iotype = IO_CMD_RESUME_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Unknown Scan Backup operation.\n");
+                        break;
+                }
+        }
+}
+
+void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u8 reg_bw_opmode;
+        u8 reg_prsr_rsc;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
+
+        if (is_hal_stop(rtlhal)) {
+                rtlphy->set_bwmode_inprogress = false;
+                return;
+        }
+
+        reg_bw_opmode = rtl_read_byte(rtlpriv, REG_BWOPMODE);
+        reg_prsr_rsc = rtl_read_byte(rtlpriv, REG_RRSR + 2);
+
+        switch (rtlphy->current_chan_bw) {
+        case HT_CHANNEL_WIDTH_20:
+                reg_bw_opmode |= BW_OPMODE_20MHZ;
+                rtl_write_byte(rtlpriv, REG_BWOPMODE, reg_bw_opmode);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                reg_bw_opmode &= ~BW_OPMODE_20MHZ;
+                rtl_write_byte(rtlpriv, REG_BWOPMODE, reg_bw_opmode);
+                reg_prsr_rsc =
+                    (reg_prsr_rsc & 0x90) | (mac->cur_40_prime_sc << 5);
+                rtl_write_byte(rtlpriv, REG_RRSR + 2, reg_prsr_rsc);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
+                break;
+        }
+
+        switch (rtlphy->current_chan_bw) {
+        case HT_CHANNEL_WIDTH_20:
+                rtl_set_bbreg(hw, RFPGA0_RFMOD, BRFMOD, 0x0);
+                rtl_set_bbreg(hw, RFPGA1_RFMOD, BRFMOD, 0x0);
+        /*      rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER2, BIT(10), 1);*/
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                rtl_set_bbreg(hw, RFPGA0_RFMOD, BRFMOD, 0x1);
+                rtl_set_bbreg(hw, RFPGA1_RFMOD, BRFMOD, 0x1);
+
+                rtl_set_bbreg(hw, RCCK0_SYSTEM, BCCK_SIDEBAND,
+                              (mac->cur_40_prime_sc >> 1));
+                rtl_set_bbreg(hw, ROFDM1_LSTF, 0xC00, mac->cur_40_prime_sc);
+                /*rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER2, BIT(10), 0);*/
+
+                rtl_set_bbreg(hw, 0x818, (BIT(26) | BIT(27)),
+                              (mac->cur_40_prime_sc ==
+                               HAL_PRIME_CHNL_OFFSET_LOWER) ? 2 : 1);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
+                break;
+        }
+        rtl88e_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
+        rtlphy->set_bwmode_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
+}
+
+void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
+                            enum nl80211_channel_type ch_type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp_bw = rtlphy->current_chan_bw;
+
+        if (rtlphy->set_bwmode_inprogress)
+                return;
+        rtlphy->set_bwmode_inprogress = true;
+        if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
+                rtl88e_phy_set_bw_mode_callback(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "FALSE driver sleep or unload\n");
+                rtlphy->set_bwmode_inprogress = false;
+                rtlphy->current_chan_bw = tmp_bw;
+        }
+}
+
+void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        u32 delay;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "switch to channel%d\n", rtlphy->current_channel);
+        if (is_hal_stop(rtlhal))
+                return;
+        do {
+                if (!rtlphy->sw_chnl_inprogress)
+                        break;
+                if (!chnl_step_by_step(hw, rtlphy->current_channel,
+                                       &rtlphy->sw_chnl_stage,
+                                       &rtlphy->sw_chnl_step, &delay)) {
+                        if (delay > 0)
+                                mdelay(delay);
+                        else
+                                continue;
+                } else {
+                        rtlphy->sw_chnl_inprogress = false;
+                }
+                break;
+        } while (true);
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
+}
+
+u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        if (rtlphy->sw_chnl_inprogress)
+                return 0;
+        if (rtlphy->set_bwmode_inprogress)
+                return 0;
+        RT_ASSERT((rtlphy->current_channel <= 14),
+                  "WIRELESS_MODE_G but channel>14");
+        rtlphy->sw_chnl_inprogress = true;
+        rtlphy->sw_chnl_stage = 0;
+        rtlphy->sw_chnl_step = 0;
+        if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
+                rtl88e_phy_sw_chnl_callback(hw);
+                RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
+                         "sw_chnl_inprogress false schdule workitem current channel %d\n",
+                         rtlphy->current_channel);
+                rtlphy->sw_chnl_inprogress = false;
+        } else {
+                RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
+                         "sw_chnl_inprogress false driver sleep or unload\n");
+                rtlphy->sw_chnl_inprogress = false;
+        }
+        return 1;
+}
+
+static u8 _rtl88e_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
+{
+        u32 reg_eac, reg_e94, reg_e9c;
+        u8 result = 0x00;
+
+        rtl_set_bbreg(hw, 0xe30, MASKDWORD, 0x10008c1c);
+        rtl_set_bbreg(hw, 0xe34, MASKDWORD, 0x30008c1c);
+        rtl_set_bbreg(hw, 0xe38, MASKDWORD, 0x8214032a);
+        rtl_set_bbreg(hw, 0xe3c, MASKDWORD, 0x28160000);
+
+        rtl_set_bbreg(hw, 0xe4c, MASKDWORD, 0x00462911);
+        rtl_set_bbreg(hw, 0xe48, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, 0xe48, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        reg_eac = rtl_get_bbreg(hw, 0xeac, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, 0xe94, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, 0xe9c, MASKDWORD);
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        return result;
+}
+
+static u8 _rtl88e_phy_path_b_iqk(struct ieee80211_hw *hw)
+{
+        u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc;
+        u8 result = 0x00;
+
+        rtl_set_bbreg(hw, 0xe60, MASKDWORD, 0x00000002);
+        rtl_set_bbreg(hw, 0xe60, MASKDWORD, 0x00000000);
+        mdelay(IQK_DELAY_TIME);
+        reg_eac = rtl_get_bbreg(hw, 0xeac, MASKDWORD);
+        reg_eb4 = rtl_get_bbreg(hw, 0xeb4, MASKDWORD);
+        reg_ebc = rtl_get_bbreg(hw, 0xebc, MASKDWORD);
+        reg_ec4 = rtl_get_bbreg(hw, 0xec4, MASKDWORD);
+        reg_ecc = rtl_get_bbreg(hw, 0xecc, MASKDWORD);
+
+        if (!(reg_eac & BIT(31)) &&
+            (((reg_eb4 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_ebc & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else
+                return result;
+        if (!(reg_eac & BIT(30)) &&
+            (((reg_ec4 & 0x03FF0000) >> 16) != 0x132) &&
+            (((reg_ecc & 0x03FF0000) >> 16) != 0x36))
+                result |= 0x02;
+        return result;
+}
+
+static u8 _rtl88e_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
+{
+        u32 reg_eac, reg_e94, reg_e9c, reg_ea4, u32temp;
+        u8 result = 0x00;
+        int jj = RF90_PATH_A;
+
+        /*Get TXIMR Setting*/
+        /*Modify RX IQK mode table*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, jj, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, jj, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, jj, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, jj, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf117b);
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /*IQK Setting*/
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x81004800);
+
+        /*path a IQK setting*/
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x10008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x30008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82160804);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28160000);
+
+        /*LO calibration Setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
+        /*one shot, path A LOK & iqk*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_A, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A, MASKDWORD);
+
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else
+                return result;
+
+        u32temp = 0x80007C00 | (reg_e94&0x3FF0000)  |
+                  ((reg_e9c&0x3FF0000) >> 16);
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, u32temp);
+        /*RX IQK*/
+        /*Modify RX IQK mode table*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, jj, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, jj, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, jj, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, jj, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7ffa);
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /*IQK Setting*/
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /*path a IQK setting*/
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x30008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x10008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82160c05);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28160c05);
+
+        /*LO calibration Setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
+        /*one shot, path A LOK & iqk*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_A, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A, MASKDWORD);
+        reg_ea4 = rtl_get_bbreg(hw, RRX_POWER_BEFORE_IQK_A_2, MASKDWORD);
+
+        if (!(reg_eac & BIT(27)) &&
+            (((reg_ea4 & 0x03FF0000) >> 16) != 0x132) &&
+            (((reg_eac & 0x03FF0000) >> 16) != 0x36))
+                result |= 0x02;
+        return result;
+}
+
+static void fill_iqk(struct ieee80211_hw *hw, bool iqk_ok, long result[][8],
+                     u8 final, bool btxonly)
+{
+        u32 oldval_0, x, tx0_a, reg;
+        long y, tx0_c;
+
+        if (final == 0xFF) {
+                return;
+        } else if (iqk_ok) {
+                oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBAL,
+                                          MASKDWORD) >> 22) & 0x3FF;
+                x = result[final][0];
+                if ((x & 0x00000200) != 0)
+                        x = x | 0xFFFFFC00;
+                tx0_a = (x * oldval_0) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, 0x3FF, tx0_a);
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(31),
+                              ((x * oldval_0 >> 7) & 0x1));
+                y = result[final][1];
+                if ((y & 0x00000200) != 0)
+                        y |= 0xFFFFFC00;
+                tx0_c = (y * oldval_0) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XCTXAFE, 0xF0000000,
+                              ((tx0_c & 0x3C0) >> 6));
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, 0x003F0000,
+                              (tx0_c & 0x3F));
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(29),
+                              ((y * oldval_0 >> 7) & 0x1));
+                if (btxonly)
+                        return;
+                reg = result[final][2];
+                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBAL, 0x3FF, reg);
+                reg = result[final][3] & 0x3F;
+                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBAL, 0xFC00, reg);
+                reg = (result[final][3] >> 6) & 0xF;
+                rtl_set_bbreg(hw, 0xca0, 0xF0000000, reg);
+        }
+}
+
+static void save_adda_reg(struct ieee80211_hw *hw,
+                          const u32 *addareg, u32 *backup,
+                          u32 registernum)
+{
+        u32 i;
+
+        for (i = 0; i < registernum; i++)
+                backup[i] = rtl_get_bbreg(hw, addareg[i], MASKDWORD);
+}
+
+static void save_mac_reg(struct ieee80211_hw *hw, const u32 *macreg,
+                         u32 *macbackup)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
+                macbackup[i] = rtl_read_byte(rtlpriv, macreg[i]);
+        macbackup[i] = rtl_read_dword(rtlpriv, macreg[i]);
+}
+
+static void reload_adda(struct ieee80211_hw *hw, const u32 *addareg,
+                        u32 *backup, u32 reg_num)
+{
+        u32 i;
+
+        for (i = 0; i < reg_num; i++)
+                rtl_set_bbreg(hw, addareg[i], MASKDWORD, backup[i]);
+}
+
+static void reload_mac(struct ieee80211_hw *hw, const u32 *macreg,
+                       u32 *macbackup)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
+                rtl_write_byte(rtlpriv, macreg[i], (u8) macbackup[i]);
+        rtl_write_dword(rtlpriv, macreg[i], macbackup[i]);
+}
+
+static void _rtl88e_phy_path_adda_on(struct ieee80211_hw *hw,
+                                     const u32 *addareg, bool is_patha_on,
+                                     bool is2t)
+{
+        u32 pathon;
+        u32 i;
+
+        pathon = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
+        if (false == is2t) {
+                pathon = 0x0bdb25a0;
+                rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0);
+        } else {
+                rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
+        }
+
+        for (i = 1; i < IQK_ADDA_REG_NUM; i++)
+                rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathon);
+}
+
+static void _rtl88e_phy_mac_setting_calibration(struct ieee80211_hw *hw,
+                                                const u32 *macreg,
+                                                u32 *macbackup)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i = 0;
+
+        rtl_write_byte(rtlpriv, macreg[i], 0x3F);
+
+        for (i = 1; i < (IQK_MAC_REG_NUM - 1); i++)
+                rtl_write_byte(rtlpriv, macreg[i],
+                               (u8) (macbackup[i] & (~BIT(3))));
+        rtl_write_byte(rtlpriv, macreg[i], (u8) (macbackup[i] & (~BIT(5))));
+}
+
+static void _rtl88e_phy_path_a_standby(struct ieee80211_hw *hw)
+{
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x0);
+        rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00010000);
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x80800000);
+}
+
+static void _rtl88e_phy_pi_mode_switch(struct ieee80211_hw *hw, bool pi_mode)
+{
+        u32 mode;
+
+        mode = pi_mode ? 0x01000100 : 0x01000000;
+        rtl_set_bbreg(hw, 0x820, MASKDWORD, mode);
+        rtl_set_bbreg(hw, 0x828, MASKDWORD, mode);
+}
+
+static bool sim_comp(struct ieee80211_hw *hw, long result[][8], u8 c1, u8 c2)
+{
+        u32 i, j, diff, bitmap, bound;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        u8 final[2] = {0xFF, 0xFF};
+        bool bresult = true, is2t = IS_92C_SERIAL(rtlhal->version);
+
+        if (is2t)
+                bound = 8;
+        else
+                bound = 4;
+
+        bitmap = 0;
+
+        for (i = 0; i < bound; i++) {
+                diff = (result[c1][i] > result[c2][i]) ?
+                       (result[c1][i] - result[c2][i]) :
+                       (result[c2][i] - result[c1][i]);
+
+                if (diff > MAX_TOLERANCE) {
+                        if ((i == 2 || i == 6) && !bitmap) {
+                                if (result[c1][i] + result[c1][i + 1] == 0)
+                                        final[(i / 4)] = c2;
+                                else if (result[c2][i] + result[c2][i + 1] == 0)
+                                        final[(i / 4)] = c1;
+                                else
+                                        bitmap = bitmap | (1 << i);
+                        } else {
+                                bitmap = bitmap | (1 << i);
+                        }
+                }
+        }
+
+        if (bitmap == 0) {
+                for (i = 0; i < (bound / 4); i++) {
+                        if (final[i] != 0xFF) {
+                                for (j = i * 4; j < (i + 1) * 4 - 2; j++)
+                                        result[3][j] = result[final[i]][j];
+                                bresult = false;
+                        }
+                }
+                return bresult;
+        } else if (!(bitmap & 0x0F)) {
+                for (i = 0; i < 4; i++)
+                        result[3][i] = result[c1][i];
+                return false;
+        } else if (!(bitmap & 0xF0) && is2t) {
+                for (i = 4; i < 8; i++)
+                        result[3][i] = result[c1][i];
+                return false;
+        } else {
+                return false;
+        }
+}
+
+static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
+                                     long result[][8], u8 t, bool is2t)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        u32 i;
+        u8 patha_ok, pathb_ok;
+        const u32 adda_reg[IQK_ADDA_REG_NUM] = {
+                0x85c, 0xe6c, 0xe70, 0xe74,
+                0xe78, 0xe7c, 0xe80, 0xe84,
+                0xe88, 0xe8c, 0xed0, 0xed4,
+                0xed8, 0xedc, 0xee0, 0xeec
+        };
+        const u32 iqk_mac_reg[IQK_MAC_REG_NUM] = {
+                0x522, 0x550, 0x551, 0x040
+        };
+        const u32 iqk_bb_reg[IQK_BB_REG_NUM] = {
+                ROFDM0_TRXPATHENABLE, ROFDM0_TRMUXPAR, RFPGA0_XCD_RFINTERFACESW,
+                0xb68, 0xb6c, 0x870, 0x860, 0x864, 0x800
+        };
+        const u32 retrycount = 2;
+
+        if (t == 0) {
+                save_adda_reg(hw, adda_reg, rtlphy->adda_backup, 16);
+                save_mac_reg(hw, iqk_mac_reg, rtlphy->iqk_mac_backup);
+                save_adda_reg(hw, iqk_bb_reg, rtlphy->iqk_bb_backup,
+                              IQK_BB_REG_NUM);
+        }
+        _rtl88e_phy_path_adda_on(hw, adda_reg, true, is2t);
+        if (t == 0) {
+                rtlphy->rfpi_enable = (u8) rtl_get_bbreg(hw,
+                                           RFPGA0_XA_HSSIPARAMETER1, BIT(8));
+        }
+
+        if (!rtlphy->rfpi_enable)
+                _rtl88e_phy_pi_mode_switch(hw, true);
+        /*BB Setting*/
+        rtl_set_bbreg(hw, 0x800, BIT(24), 0x00);
+        rtl_set_bbreg(hw, 0xc04, MASKDWORD, 0x03a05600);
+        rtl_set_bbreg(hw, 0xc08, MASKDWORD, 0x000800e4);
+        rtl_set_bbreg(hw, 0x874, MASKDWORD, 0x22204000);
+
+        rtl_set_bbreg(hw, 0x870, BIT(10), 0x01);
+        rtl_set_bbreg(hw, 0x870, BIT(26), 0x01);
+        rtl_set_bbreg(hw, 0x860, BIT(10), 0x00);
+        rtl_set_bbreg(hw, 0x864, BIT(10), 0x00);
+
+        if (is2t) {
+                rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00010000);
+                rtl_set_bbreg(hw, 0x844, MASKDWORD, 0x00010000);
+        }
+        _rtl88e_phy_mac_setting_calibration(hw, iqk_mac_reg,
+                                            rtlphy->iqk_mac_backup);
+        rtl_set_bbreg(hw, 0xb68, MASKDWORD, 0x0f600000);
+        if (is2t)
+                rtl_set_bbreg(hw, 0xb6c, MASKDWORD, 0x0f600000);
+
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x80800000);
+        rtl_set_bbreg(hw, 0xe40, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, 0xe44, MASKDWORD, 0x81004800);
+        for (i = 0; i < retrycount; i++) {
+                patha_ok = _rtl88e_phy_path_a_iqk(hw, is2t);
+                if (patha_ok == 0x01) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path A Tx IQK Success!!\n");
+                        result[t][0] = (rtl_get_bbreg(hw, 0xe94, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                        result[t][1] = (rtl_get_bbreg(hw, 0xe9c, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                        break;
+                }
+        }
+
+        for (i = 0; i < retrycount; i++) {
+                patha_ok = _rtl88e_phy_path_a_rx_iqk(hw, is2t);
+                if (patha_ok == 0x03) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path A Rx IQK Success!!\n");
+                        result[t][2] = (rtl_get_bbreg(hw, 0xea4, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                        result[t][3] = (rtl_get_bbreg(hw, 0xeac, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                        break;
+                } else {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path a RX iqk fail!!!\n");
+                }
+        }
+
+        if (0 == patha_ok) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Path A IQK Success!!\n");
+        }
+        if (is2t) {
+                _rtl88e_phy_path_a_standby(hw);
+                _rtl88e_phy_path_adda_on(hw, adda_reg, false, is2t);
+                for (i = 0; i < retrycount; i++) {
+                        pathb_ok = _rtl88e_phy_path_b_iqk(hw);
+                        if (pathb_ok == 0x03) {
+                                result[t][4] = (rtl_get_bbreg(hw,
+                                                0xeb4, MASKDWORD) &
+                                                0x3FF0000) >> 16;
+                                result[t][5] =
+                                    (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
+                                                   0x3FF0000) >> 16;
+                                result[t][6] =
+                                    (rtl_get_bbreg(hw, 0xec4, MASKDWORD) &
+                                                   0x3FF0000) >> 16;
+                                result[t][7] =
+                                    (rtl_get_bbreg(hw, 0xecc, MASKDWORD) &
+                                                   0x3FF0000) >> 16;
+                                break;
+                        } else if (i == (retrycount - 1) && pathb_ok == 0x01) {
+                                result[t][4] = (rtl_get_bbreg(hw,
+                                                0xeb4, MASKDWORD) &
+                                                0x3FF0000) >> 16;
+                        }
+                        result[t][5] = (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                }
+        }
+
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0);
+
+        if (t != 0) {
+                if (!rtlphy->rfpi_enable)
+                        _rtl88e_phy_pi_mode_switch(hw, false);
+                reload_adda(hw, adda_reg, rtlphy->adda_backup, 16);
+                reload_mac(hw, iqk_mac_reg, rtlphy->iqk_mac_backup);
+                reload_adda(hw, iqk_bb_reg, rtlphy->iqk_bb_backup,
+                            IQK_BB_REG_NUM);
+
+                rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00032ed3);
+                if (is2t)
+                        rtl_set_bbreg(hw, 0x844, MASKDWORD, 0x00032ed3);
+                rtl_set_bbreg(hw, 0xe30, MASKDWORD, 0x01008c00);
+                rtl_set_bbreg(hw, 0xe34, MASKDWORD, 0x01008c00);
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "88ee IQK Finish!!\n");
+}
+
+static void _rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
+{
+        u8 tmpreg;
+        u32 rf_a_mode = 0, rf_b_mode = 0, lc_cal;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int jj = RF90_PATH_A;
+        int kk = RF90_PATH_B;
+
+        tmpreg = rtl_read_byte(rtlpriv, 0xd03);
+
+        if ((tmpreg & 0x70) != 0)
+                rtl_write_byte(rtlpriv, 0xd03, tmpreg & 0x8F);
+        else
+                rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
+
+        if ((tmpreg & 0x70) != 0) {
+                rf_a_mode = rtl_get_rfreg(hw, jj, 0x00, MASK12BITS);
+
+                if (is2t)
+                        rf_b_mode = rtl_get_rfreg(hw, kk, 0x00,
+                                                  MASK12BITS);
+
+                rtl_set_rfreg(hw, jj, 0x00, MASK12BITS,
+                              (rf_a_mode & 0x8FFFF) | 0x10000);
+
+                if (is2t)
+                        rtl_set_rfreg(hw, kk, 0x00, MASK12BITS,
+                                      (rf_b_mode & 0x8FFFF) | 0x10000);
+        }
+        lc_cal = rtl_get_rfreg(hw, jj, 0x18, MASK12BITS);
+
+        rtl_set_rfreg(hw, jj, 0x18, MASK12BITS, lc_cal | 0x08000);
+
+        mdelay(100);
+
+        if ((tmpreg & 0x70) != 0) {
+                rtl_write_byte(rtlpriv, 0xd03, tmpreg);
+                rtl_set_rfreg(hw, jj, 0x00, MASK12BITS, rf_a_mode);
+
+                if (is2t)
+                        rtl_set_rfreg(hw, kk, 0x00, MASK12BITS,
+                                      rf_b_mode);
+        } else {
+                rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+}
+
+static void rfpath_switch(struct ieee80211_hw *hw,
+                          bool bmain, bool is2t)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+
+        if (is_hal_stop(rtlhal)) {
+                u8 u1btmp;
+                u1btmp = rtl_read_byte(rtlpriv, REG_LEDCFG0);
+                rtl_write_byte(rtlpriv, REG_LEDCFG0, u1btmp | BIT(7));
+                rtl_set_bbreg(hw, rFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
+        }
+        if (is2t) {
+                if (bmain)
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(6), 0x1);
+                else
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(6), 0x2);
+        } else {
+                rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BIT(8) | BIT(9), 0);
+                rtl_set_bbreg(hw, 0x914, MASKLWORD, 0x0201);
+
+                /* We use the RF definition of MAIN and AUX, left antenna and
+                 * right antenna repectively.
+                 * Default output at AUX.
+                 */
+                if (bmain) {
+                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, BIT(14) |
+                                      BIT(13) | BIT(12), 0);
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE, BIT(5) |
+                                      BIT(4) | BIT(3), 0);
+                        if (fuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, RCONFIG_RAM64X16, BIT(31), 0);
+                } else {
+                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, BIT(14) |
+                                      BIT(13) | BIT(12), 1);
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE, BIT(5) |
+                                      BIT(4) | BIT(3), 1);
+                        if (fuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, RCONFIG_RAM64X16, BIT(31), 1);
+                }
+        }
+}
+
+#undef IQK_ADDA_REG_NUM
+#undef IQK_DELAY_TIME
+
+void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        long result[4][8];
+        u8 i, final;
+        bool patha_ok;
+        long reg_e94, reg_e9c, reg_ea4, reg_eb4, reg_ebc, reg_tmp = 0;
+        bool is12simular, is13simular, is23simular;
+        u32 iqk_bb_reg[9] = {
+                ROFDM0_XARXIQIMBAL,
+                ROFDM0_XBRXIQIMBAL,
+                ROFDM0_ECCATHRES,
+                ROFDM0_AGCRSSITABLE,
+                ROFDM0_XATXIQIMBAL,
+                ROFDM0_XBTXIQIMBAL,
+                ROFDM0_XCTXAFE,
+                ROFDM0_XDTXAFE,
+                ROFDM0_RXIQEXTANTA
+        };
+
+        if (recovery) {
+                reload_adda(hw, iqk_bb_reg, rtlphy->iqk_bb_backup, 9);
+                return;
+        }
+
+        memset(result, 0, 32 * sizeof(long));
+        final = 0xff;
+        patha_ok = false;
+        is12simular = false;
+        is23simular = false;
+        is13simular = false;
+        for (i = 0; i < 3; i++) {
+                if (get_rf_type(rtlphy) == RF_2T2R)
+                        _rtl88e_phy_iq_calibrate(hw, result, i, true);
+                else
+                        _rtl88e_phy_iq_calibrate(hw, result, i, false);
+                if (i == 1) {
+                        is12simular = sim_comp(hw, result, 0, 1);
+                        if (is12simular) {
+                                final = 0;
+                                break;
+                        }
+                }
+                if (i == 2) {
+                        is13simular = sim_comp(hw, result, 0, 2);
+                        if (is13simular) {
+                                final = 0;
+                                break;
+                        }
+                        is23simular = sim_comp(hw, result, 1, 2);
+                        if (is23simular) {
+                                final = 1;
+                        } else {
+                                for (i = 0; i < 8; i++)
+                                        reg_tmp += result[3][i];
+
+                                if (reg_tmp != 0)
+                                        final = 3;
+                                else
+                                        final = 0xFF;
+                        }
+                }
+        }
+        for (i = 0; i < 4; i++) {
+                reg_e94 = result[i][0];
+                reg_e9c = result[i][1];
+                reg_ea4 = result[i][2];
+                reg_eb4 = result[i][4];
+                reg_ebc = result[i][5];
+        }
+        if (final != 0xff) {
+                reg_e94 = result[final][0];
+                rtlphy->reg_e94 = reg_e94;
+                reg_e9c = result[final][1];
+                rtlphy->reg_e9c = reg_e9c;
+                reg_ea4 = result[final][2];
+                reg_eb4 = result[final][4];
+                rtlphy->reg_eb4 = reg_eb4;
+                reg_ebc = result[final][5];
+                rtlphy->reg_ebc = reg_ebc;
+                patha_ok = true;
+        } else {
+                rtlphy->reg_e94 = 0x100;
+                rtlphy->reg_eb4 = 0x100;
+                rtlphy->reg_ebc = 0x0;
+                rtlphy->reg_e9c = 0x0;
+        }
+        if (reg_e94 != 0) /*&&(reg_ea4 != 0) */
+                fill_iqk(hw, patha_ok, result, final, (reg_ea4 == 0));
+        if (final != 0xFF) {
+                for (i = 0; i < IQK_MATRIX_REG_NUM; i++)
+                        rtlphy->iqk_matrix[0].value[0][i] = result[final][i];
+                rtlphy->iqk_matrix[0].iqk_done = true;
+        }
+        save_adda_reg(hw, iqk_bb_reg, rtlphy->iqk_bb_backup, 9);
+}
+
+void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_hal *rtlhal = &(rtlpriv->rtlhal);
+        bool start_conttx = false, singletone = false;
+        u32 timeout = 2000, timecount = 0;
+
+        if (start_conttx || singletone)
+                return;
+
+        while (rtlpriv->mac80211.act_scanning && timecount < timeout) {
+                udelay(50);
+                timecount += 50;
+        }
+
+        rtlphy->lck_inprogress = true;
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                "LCK:Start!!! currentband %x delay %d ms\n",
+                 rtlhal->current_bandtype, timecount);
+
+        _rtl88e_phy_lc_calibrate(hw, false);
+
+        rtlphy->lck_inprogress = false;
+}
+
+void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
+{
+        rfpath_switch(hw, bmain, false);
+}
+
+bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        bool postprocessing = false;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                 iotype, rtlphy->set_io_inprogress);
+        do {
+                switch (iotype) {
+                case IO_CMD_RESUME_DM_BY_SCAN:
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                                 "[IO CMD] Resume DM after scan.\n");
+                        postprocessing = true;
+                        break;
+                case IO_CMD_PAUSE_DM_BY_SCAN:
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                                 "[IO CMD] Pause DM before scan.\n");
+                        postprocessing = true;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
+                        break;
+                }
+        } while (false);
+        if (postprocessing && !rtlphy->set_io_inprogress) {
+                rtlphy->set_io_inprogress = true;
+                rtlphy->current_io_type = iotype;
+        } else {
+                return false;
+        }
+        rtl88e_phy_set_io(hw);
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
+        return true;
+}
+
+static void rtl88ee_phy_set_rf_on(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x2b);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
+        /*rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x00);*/
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
+}
+
+static void _rtl88ee_phy_set_rf_sleep(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int jj = RF90_PATH_A;
+
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
+        rtl_set_rfreg(hw, jj, 0x00, RFREG_OFFSET_MASK, 0x00);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
+        rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x22);
+}
+
+static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                            enum rf_pwrstate rfpwr_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl8192_tx_ring *ring = NULL;
+        bool bresult = true;
+        u8 i, queue_id;
+
+        switch (rfpwr_state) {
+        case ERFON:{
+                if ((ppsc->rfpwr_state == ERFOFF) &&
+                    RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
+                        bool rtstatus;
+                        u32 init = 0;
+                        do {
+                                init++;
+                                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                         "IPS Set eRf nic enable\n");
+                                rtstatus = rtl_ps_enable_nic(hw);
+                        } while ((rtstatus != true) && (init < 10));
+                        RT_CLEAR_PS_LEVEL(ppsc,
+                                          RT_RF_OFF_LEVL_HALT_NIC);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "Set ERFON sleeped:%d ms\n",
+                                 jiffies_to_msecs(jiffies - ppsc->
+                                                  last_sleep_jiffies));
+                        ppsc->last_awake_jiffies = jiffies;
+                        rtl88ee_phy_set_rf_on(hw);
+                }
+                if (mac->link_state == MAC80211_LINKED)
+                        rtlpriv->cfg->ops->led_control(hw, LED_CTL_LINK);
+                else
+                        rtlpriv->cfg->ops->led_control(hw, LED_CTL_NO_LINK);
+                break; }
+        case ERFOFF:{
+                for (queue_id = 0, i = 0;
+                     queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
+                        ring = &pcipriv->dev.tx_ring[queue_id];
+                        if (skb_queue_len(&ring->queue) == 0) {
+                                queue_id++;
+                                continue;
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
+
+                                udelay(10);
+                                i++;
+                        }
+                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                          MAX_DOZE_WAITING_TIMES_9x,
+                                          queue_id,
+                                          skb_queue_len(&ring->queue));
+                                break;
+                        }
+                }
+                if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "IPS Set eRf nic disable\n");
+                        rtl_ps_disable_nic(hw);
+                        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+                } else {
+                        if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS) {
+                                rtlpriv->cfg->ops->led_control(hw,
+                                                LED_CTL_NO_LINK);
+                        } else {
+                                rtlpriv->cfg->ops->led_control(hw,
+                                                LED_CTL_POWER_OFF);
+                        }
+                }
+                break; }
+        case ERFSLEEP:{
+                if (ppsc->rfpwr_state == ERFOFF)
+                        break;
+                for (queue_id = 0, i = 0;
+                     queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
+                        ring = &pcipriv->dev.tx_ring[queue_id];
+                        if (skb_queue_len(&ring->queue) == 0) {
+                                queue_id++;
+                                continue;
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
+
+                                udelay(10);
+                                i++;
+                        }
+                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
+                                break;
+                        }
+                }
+                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                         "Set ERFSLEEP awaked:%d ms\n",
+                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
+                ppsc->last_sleep_jiffies = jiffies;
+                _rtl88ee_phy_set_rf_sleep(hw);
+                break; }
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
+                bresult = false;
+                break;
+        }
+        if (bresult)
+                ppsc->rfpwr_state = rfpwr_state;
+        return bresult;
+}
+
+bool rtl88e_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                   enum rf_pwrstate rfpwr_state)
+{
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool bresult;
+
+        if (rfpwr_state == ppsc->rfpwr_state)
+                return false;
+        bresult = _rtl88ee_phy_set_rf_power_state(hw, rfpwr_state);
+        return bresult;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
new file mode 100644
index 000000000000..f1acd6d27e44
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
@@ -0,0 +1,236 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92C_PHY_H__
+#define __RTL92C_PHY_H__
+
+/*It must always set to 4, otherwise read efuse table secquence will be wrong.*/
+#define MAX_TX_COUNT                            4
+
+#define MAX_PRECMD_CNT                          16
+#define MAX_RFDEPENDCMD_CNT                     16
+#define MAX_POSTCMD_CNT                         16
+
+#define MAX_DOZE_WAITING_TIMES_9x               64
+
+#define RT_CANNOT_IO(hw)                        false
+#define HIGHPOWER_RADIOA_ARRAYLEN               22
+
+#define IQK_ADDA_REG_NUM                        16
+#define IQK_BB_REG_NUM                          9
+#define MAX_TOLERANCE                           5
+#define IQK_DELAY_TIME                          10
+#define IDX_MAP                                 15
+
+#define APK_BB_REG_NUM                          5
+#define APK_AFE_REG_NUM                         16
+#define APK_CURVE_REG_NUM                       4
+#define PATH_NUM                                2
+
+#define LOOP_LIMIT                              5
+#define MAX_STALL_TIME                          50
+#define ANTENNADIVERSITYVALUE                   0x80
+#define MAX_TXPWR_IDX_NMODE_92S                 63
+#define RESET_CNT_LIMIT                         3
+
+#define IQK_ADDA_REG_NUM                        16
+#define IQK_MAC_REG_NUM                         4
+
+#define RF6052_MAX_PATH                         2
+
+#define CT_OFFSET_MAC_ADDR                      0X16
+
+#define CT_OFFSET_CCK_TX_PWR_IDX                0x5A
+#define CT_OFFSET_HT401S_TX_PWR_IDX             0x60
+#define CT_OFFSET_HT402S_TX_PWR_IDX_DIFF        0x66
+#define CT_OFFSET_HT20_TX_PWR_IDX_DIFF          0x69
+#define CT_OFFSET_OFDM_TX_PWR_IDX_DIFF          0x6C
+
+#define CT_OFFSET_HT40_MAX_PWR_OFFSET           0x6F
+#define CT_OFFSET_HT20_MAX_PWR_OFFSET           0x72
+
+#define CT_OFFSET_CHANNEL_PLAH                  0x75
+#define CT_OFFSET_THERMAL_METER                 0x78
+#define CT_OFFSET_RF_OPTION                     0x79
+#define CT_OFFSET_VERSION                       0x7E
+#define CT_OFFSET_CUSTOMER_ID                   0x7F
+
+#define RTL92C_MAX_PATH_NUM                     2
+
+enum swchnlcmd_id {
+        CMDID_END,
+        CMDID_SET_TXPOWEROWER_LEVEL,
+        CMDID_BBREGWRITE10,
+        CMDID_WRITEPORT_ULONG,
+        CMDID_WRITEPORT_USHORT,
+        CMDID_WRITEPORT_UCHAR,
+        CMDID_RF_WRITEREG,
+};
+
+struct swchnlcmd {
+        enum swchnlcmd_id cmdid;
+        u32 para1;
+        u32 para2;
+        u32 msdelay;
+};
+
+enum hw90_block_e {
+        HW90_BLOCK_MAC = 0,
+        HW90_BLOCK_PHY0 = 1,
+        HW90_BLOCK_PHY1 = 2,
+        HW90_BLOCK_RF = 3,
+        HW90_BLOCK_MAXIMUM = 4,
+};
+
+enum baseband_config_type {
+        BASEBAND_CONFIG_PHY_REG = 0,
+        BASEBAND_CONFIG_AGC_TAB = 1,
+};
+
+enum ra_offset_area {
+        RA_OFFSET_LEGACY_OFDM1,
+        RA_OFFSET_LEGACY_OFDM2,
+        RA_OFFSET_HT_OFDM1,
+        RA_OFFSET_HT_OFDM2,
+        RA_OFFSET_HT_OFDM3,
+        RA_OFFSET_HT_OFDM4,
+        RA_OFFSET_HT_CCK,
+};
+
+enum antenna_path {
+        ANTENNA_NONE,
+        ANTENNA_D,
+        ANTENNA_C,
+        ANTENNA_CD,
+        ANTENNA_B,
+        ANTENNA_BD,
+        ANTENNA_BC,
+        ANTENNA_BCD,
+        ANTENNA_A,
+        ANTENNA_AD,
+        ANTENNA_AC,
+        ANTENNA_ACD,
+        ANTENNA_AB,
+        ANTENNA_ABD,
+        ANTENNA_ABC,
+        ANTENNA_ABCD
+};
+
+struct r_antenna_select_ofdm {
+        u32 r_tx_antenna:4;
+        u32 r_ant_l:4;
+        u32 r_ant_non_ht:4;
+        u32 r_ant_ht1:4;
+        u32 r_ant_ht2:4;
+        u32 r_ant_ht_s1:4;
+        u32 r_ant_non_ht_s1:4;
+        u32 ofdm_txsc:2;
+        u32 reserved:2;
+};
+
+struct r_antenna_select_cck {
+        u8 r_cckrx_enable_2:2;
+        u8 r_cckrx_enable:2;
+        u8 r_ccktx_enable:4;
+};
+
+
+struct efuse_contents {
+        u8 mac_addr[ETH_ALEN];
+        u8 cck_tx_power_idx[6];
+        u8 ht40_1s_tx_power_idx[6];
+        u8 ht40_2s_tx_power_idx_diff[3];
+        u8 ht20_tx_power_idx_diff[3];
+        u8 ofdm_tx_power_idx_diff[3];
+        u8 ht40_max_power_offset[3];
+        u8 ht20_max_power_offset[3];
+        u8 channel_plan;
+        u8 thermal_meter;
+        u8 rf_option[5];
+        u8 version;
+        u8 oem_id;
+        u8 regulatory;
+};
+
+struct tx_power_struct {
+        u8 cck[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 ht40_1s[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 ht40_2s[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 ht20_diff[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 legacy_ht_diff[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 legacy_ht_txpowerdiff;
+        u8 groupht20[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 groupht40[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 pwrgroup_cnt;
+        u32 mcs_original_offset[4][16];
+};
+
+enum _ANT_DIV_TYPE {
+        NO_ANTDIV                       = 0xFF,
+        CG_TRX_HW_ANTDIV                = 0x01,
+        CGCS_RX_HW_ANTDIV               = 0x02,
+        FIXED_HW_ANTDIV                 = 0x03,
+        CG_TRX_SMART_ANTDIV             = 0x04,
+        CGCS_RX_SW_ANTDIV               = 0x05,
+};
+
+extern u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw,
+                                   u32 regaddr, u32 bitmask);
+extern void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,
+                                  u32 regaddr, u32 bitmask, u32 data);
+extern u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
+                                   enum radio_path rfpath, u32 regaddr,
+                                   u32 bitmask);
+extern void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
+                                  enum radio_path rfpath, u32 regaddr,
+                                  u32 bitmask, u32 data);
+extern bool rtl88e_phy_mac_config(struct ieee80211_hw *hw);
+extern bool rtl88e_phy_bb_config(struct ieee80211_hw *hw);
+extern bool rtl88e_phy_rf_config(struct ieee80211_hw *hw);
+extern void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
+extern void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw,
+                                         long *powerlevel);
+extern void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);
+extern void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw,
+                                             u8 operation);
+extern void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
+extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
+                                   enum nl80211_channel_type ch_type);
+extern void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw);
+extern u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw);
+extern void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery);
+void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw);
+void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);
+bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                          enum radio_path rfpath);
+bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
+extern bool rtl88e_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                          enum rf_pwrstate rfpwr_state);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c
new file mode 100644
index 000000000000..6dc4e3a954f6
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c
@@ -0,0 +1,109 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "pwrseqcmd.h"
+#include "pwrseq.h"
+
+/* drivers should parse below arrays and do the corresponding actions */
+/*3 Power on  Array*/
+struct wlan_pwr_cfg rtl8188e_power_on_flow[RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS +
+                                           RTL8188E_TRANS_END_STEPS] = {
+        RTL8188E_TRANS_CARDEMU_TO_ACT
+        RTL8188E_TRANS_END
+};
+
+/*3Radio off GPIO Array */
+struct wlan_pwr_cfg rtl8188e_radio_off_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
+                                            + RTL8188E_TRANS_END_STEPS] = {
+        RTL8188E_TRANS_ACT_TO_CARDEMU
+        RTL8188E_TRANS_END
+};
+
+/*3Card Disable Array*/
+struct wlan_pwr_cfg rtl8188e_card_disable_flow
+        [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+        RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
+        RTL8188E_TRANS_END_STEPS] = {
+                RTL8188E_TRANS_ACT_TO_CARDEMU
+                RTL8188E_TRANS_CARDEMU_TO_CARDDIS
+                RTL8188E_TRANS_END
+};
+
+/*3 Card Enable Array*/
+struct wlan_pwr_cfg rtl8188e_card_enable_flow
+        [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+        RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
+        RTL8188E_TRANS_END_STEPS] = {
+                RTL8188E_TRANS_CARDDIS_TO_CARDEMU
+                RTL8188E_TRANS_CARDEMU_TO_ACT
+                RTL8188E_TRANS_END
+};
+
+/*3Suspend Array*/
+struct wlan_pwr_cfg rtl8188e_suspend_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS
+                                        + RTL8188E_TRANS_END_STEPS] = {
+        RTL8188E_TRANS_ACT_TO_CARDEMU
+        RTL8188E_TRANS_CARDEMU_TO_SUS
+        RTL8188E_TRANS_END
+};
+
+/*3 Resume Array*/
+struct wlan_pwr_cfg rtl8188e_resume_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS
+                                        + RTL8188E_TRANS_END_STEPS] = {
+        RTL8188E_TRANS_SUS_TO_CARDEMU
+        RTL8188E_TRANS_CARDEMU_TO_ACT
+        RTL8188E_TRANS_END
+};
+
+/*3HWPDN Array*/
+struct wlan_pwr_cfg rtl8188e_hwpdn_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
+                                + RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS
+                                + RTL8188E_TRANS_END_STEPS] = {
+        RTL8188E_TRANS_ACT_TO_CARDEMU
+        RTL8188E_TRANS_CARDEMU_TO_PDN
+        RTL8188E_TRANS_END
+};
+
+/*3 Enter LPS */
+struct wlan_pwr_cfg rtl8188e_enter_lps_flow[RTL8188E_TRANS_ACT_TO_LPS_STEPS
+                                        + RTL8188E_TRANS_END_STEPS] = {
+        /*FW behavior*/
+        RTL8188E_TRANS_ACT_TO_LPS
+        RTL8188E_TRANS_END
+};
+
+/*3 Leave LPS */
+struct wlan_pwr_cfg rtl8188e_leave_lps_flow[RTL8188E_TRANS_LPS_TO_ACT_STEPS
+                                        + RTL8188E_TRANS_END_STEPS] = {
+        /*FW behavior*/
+        RTL8188E_TRANS_LPS_TO_ACT
+        RTL8188E_TRANS_END
+};
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h
new file mode 100644
index 000000000000..028ec6dd52b4
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h
@@ -0,0 +1,327 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8723E_PWRSEQ_H__
+#define __RTL8723E_PWRSEQ_H__
+
+#include "pwrseqcmd.h"
+/*
+        Check document WM-20110607-Paul-RTL8188E_Power_Architecture-R02.vsd
+        There are 6 HW Power States:
+        0: POFF--Power Off
+        1: PDN--Power Down
+        2: CARDEMU--Card Emulation
+        3: ACT--Active Mode
+        4: LPS--Low Power State
+        5: SUS--Suspend
+
+        The transision from different states are defined below
+        TRANS_CARDEMU_TO_ACT
+        TRANS_ACT_TO_CARDEMU
+        TRANS_CARDEMU_TO_SUS
+        TRANS_SUS_TO_CARDEMU
+        TRANS_CARDEMU_TO_PDN
+        TRANS_ACT_TO_LPS
+        TRANS_LPS_TO_ACT
+
+        TRANS_END
+        PWR SEQ Version: rtl8188e_PwrSeq_V09.h
+*/
+
+#define RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS     10
+#define RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS     10
+#define RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS     10
+#define RTL8188E_TRANS_SUS_TO_CARDEMU_STEPS     10
+#define RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS     10
+#define RTL8188E_TRANS_PDN_TO_CARDEMU_STEPS     10
+#define RTL8188E_TRANS_ACT_TO_LPS_STEPS         15
+#define RTL8188E_TRANS_LPS_TO_ACT_STEPS         15
+#define RTL8188E_TRANS_END_STEPS                1
+
+
+#define RTL8188E_TRANS_CARDEMU_TO_ACT                                   \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /* wait till 0x04[17] = 1    power ready*/                      \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), BIT(1)},             \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /* 0x02[1:0] = 0        reset BB*/                              \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0)|BIT(1), 0},             \
+        {0x0026, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*0x24[23] = 2b'01 schmit trigger */                            \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /* 0x04[15] = 0 disable HWPDN (control by DRV)*/                \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},                    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*0x04[12:11] = 2b'00 disable WL suspend*/                      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4)|BIT(3), 0},             \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*0x04[8] = 1 polling until return 0*/                          \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*wait till 0x04[8] = 0*/                                       \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(0), 0},                  \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0}, /*LDO normal mode*/\
+        {0x0074, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)}, /*SDIO Driving*/\
+
+#define RTL8188E_TRANS_ACT_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},/*0x1F[7:0] = 0 turn off RF*/\
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)}, /*LDO Sleep mode*/\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*0x04[9] = 1 turn off MAC by HW state machine*/                \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*wait till 0x04[9] = 0 polling until return 0 to disable*/     \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), 0},                  \
+
+
+#define RTL8188E_TRANS_CARDEMU_TO_SUS                                   \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},        \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+        /*0x04[12:11] = 2b'11enable WL suspend for PCIe*/               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)|BIT(4)},\
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*  0x04[31:30] = 2b'10 enable enable bandgap mbias in suspend */\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, BIT(7)},                 \
+        {0x0041, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*Clear SIC_EN register 0x40[12] = 1'b0 */                      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                    \
+        {0xfe10, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*Set USB suspend enable local register  0xfe10[4]= 1 */        \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},               \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        /*Set SDIO suspend local register*/                             \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        /*wait power state to suspend*/                                 \
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0},
+
+#define RTL8188E_TRANS_SUS_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        /*Set SDIO suspend local register*/                             \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},                   \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        /*wait power state to suspend*/                                 \
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},            \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},
+
+#define RTL8188E_TRANS_CARDEMU_TO_CARDDIS                               \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        {0x0026, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*0x24[23] = 2b'01 schmit trigger */                            \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*0x04[12:11] = 2b'01 enable WL suspend*/                       \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},        \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*  0x04[31:30] = 2b'10 enable enable bandgap mbias in suspend */\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},                      \
+        {0x0041, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
+        /*Clear SIC_EN register 0x40[12] = 1'b0 */                      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                    \
+        {0xfe10, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
+        /*Set USB suspend enable local register  0xfe10[4]= 1 */        \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},               \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        /*Set SDIO suspend local register*/                             \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        PWR_CMD_POLLING, BIT(1), 0}, /*wait power state to suspend*/
+
+#define RTL8188E_TRANS_CARDDIS_TO_CARDEMU                               \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        PWR_BASEADDR_SDIO,\
+        PWR_CMD_WRITE, BIT(0), 0}, /*Set SDIO suspend local register*/  \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        PWR_BASEADDR_SDIO,\
+        PWR_CMD_POLLING, BIT(1), BIT(1)}, /*wait power state to suspend*/\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC,                                               \
+        PWR_CMD_WRITE, BIT(3)|BIT(4), 0},                               \
+        /*0x04[12:11] = 2b'01enable WL suspend*/
+
+
+#define RTL8188E_TRANS_CARDEMU_TO_PDN                                   \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},/* 0x04[16] = 0*/   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},/* 0x04[15] = 1*/
+
+
+#define RTL8188E_TRANS_PDN_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},/* 0x04[15] = 0*/
+
+
+#define RTL8188E_TRANS_ACT_TO_LPS                                       \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x7F},/*Tx Pause*/       \
+        {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*zero if no pkt is tx*/\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*Should be zero if no packet is transmitting*/ \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*Should be zero if no packet is transmitting*/                 \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*Should be zero if no packet is transmitting*/                 \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*CCK and OFDM are disabled, and clock are gated*/              \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},                    \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US},/*Delay 1us*/\
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x3F},/*Reset MAC TRX*/  \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*check if removed later*/                                      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},                    \
+        {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*Respond TxOK to scheduler*/                                   \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(5), BIT(5)},               \
+
+
+#define RTL8188E_TRANS_LPS_TO_ACT                                       \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84}, /*SDIO RPWM*/    \
+        {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84}, /*USB RPWM*/      \
+        {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84}, /*PCIe RPWM*/     \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS}, /*Delay*/ \
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*.     0x08[4] = 0              switch TSF to 40M*/            \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                    \
+        {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*Polling 0x109[7]= 0  TSF in 40M*/                             \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(7), 0},                  \
+        {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*. 0x29[7:6] = 2b'00    enable BB clock*/                      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6)|BIT(7), 0},             \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*.     0x101[1] = 1*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},               \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*.     0x100[7:0] = 0xFF        enable WMAC TRX*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},                   \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        /*. 0x02[1:0] = 2b'11  enable BB macro*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1)|BIT(0), BIT(1)|BIT(0)}, \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0}, /*.  0x522 = 0*/
+
+
+#define RTL8188E_TRANS_END                                              \
+        /* format */                                                    \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        0, PWR_CMD_END, 0, 0}
+
+extern struct wlan_pwr_cfg rtl8188e_power_on_flow
+                [RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_radio_off_flow
+                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_card_disable_flow
+                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+                RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_card_enable_flow
+                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+                RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_suspend_flow
+                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+                RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_resume_flow
+                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+                RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_hwpdn_flow
+                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
+                RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_enter_lps_flow
+                [RTL8188E_TRANS_ACT_TO_LPS_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188e_leave_lps_flow
+                [RTL8188E_TRANS_LPS_TO_ACT_STEPS +
+                RTL8188E_TRANS_END_STEPS];
+
+/* RTL8723 Power Configuration CMDs for PCIe interface */
+#define Rtl8188E_NIC_PWR_ON_FLOW        rtl8188e_power_on_flow
+#define Rtl8188E_NIC_RF_OFF_FLOW        rtl8188e_radio_off_flow
+#define Rtl8188E_NIC_DISABLE_FLOW       rtl8188e_card_disable_flow
+#define Rtl8188E_NIC_ENABLE_FLOW        rtl8188e_card_enable_flow
+#define Rtl8188E_NIC_SUSPEND_FLOW       rtl8188e_suspend_flow
+#define Rtl8188E_NIC_RESUME_FLOW        rtl8188e_resume_flow
+#define Rtl8188E_NIC_PDN_FLOW           rtl8188e_hwpdn_flow
+#define Rtl8188E_NIC_LPS_ENTER_FLOW     rtl8188e_enter_lps_flow
+#define Rtl8188E_NIC_LPS_LEAVE_FLOW     rtl8188e_leave_lps_flow
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
new file mode 100644
index 000000000000..a9cfa13be3a8
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
@@ -0,0 +1,140 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "pwrseq.h"
+
+
+/*      Description:
+ *              This routine deal with the Power Configuration CMDs
+ *               parsing for RTL8723/RTL8188E Series IC.
+ *      Assumption:
+ *              We should follow specific format which was released from HW SD.
+ *
+ *      2011.07.07, added by Roger.
+ */
+
+bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
+                                u8 fab_version, u8 interface_type,
+                                struct wlan_pwr_cfg pwrcfgcmd[])
+{
+        struct wlan_pwr_cfg cmd = {0};
+        bool polling_bit = false;
+        u32 ary_idx = 0;
+        u8 val = 0;
+        u32 offset = 0;
+        u32 polling_count = 0;
+        u32 max_polling_cnt = 5000;
+
+        do {
+                cmd = pwrcfgcmd[ary_idx];
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "rtl88_hal_pwrseqcmdparsing(): offset(%#x), cut_msk(%#x), fab_msk(%#x),"
+                         "interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), val(%#x)\n",
+                         GET_PWR_CFG_OFFSET(cmd),
+                         GET_PWR_CFG_CUT_MASK(cmd),
+                         GET_PWR_CFG_FAB_MASK(cmd),
+                         GET_PWR_CFG_INTF_MASK(cmd),
+                         GET_PWR_CFG_BASE(cmd),
+                         GET_PWR_CFG_CMD(cmd),
+                         GET_PWR_CFG_MASK(cmd),
+                         GET_PWR_CFG_VALUE(cmd));
+
+                if ((GET_PWR_CFG_FAB_MASK(cmd) & fab_version) &&
+                    (GET_PWR_CFG_CUT_MASK(cmd) & cut_version) &&
+                    (GET_PWR_CFG_INTF_MASK(cmd) & interface_type)) {
+                        switch (GET_PWR_CFG_CMD(cmd)) {
+                        case PWR_CMD_READ:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");
+                                break;
+                        case PWR_CMD_WRITE: {
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");
+                                offset = GET_PWR_CFG_OFFSET(cmd);
+
+                                        /*Read the val from system register*/
+                                        val = rtl_read_byte(rtlpriv, offset);
+                                        val &= (~(GET_PWR_CFG_MASK(cmd)));
+                                        val |= (GET_PWR_CFG_VALUE(cmd) &
+                                                GET_PWR_CFG_MASK(cmd));
+
+                                        /*Write the val back to sytem register*/
+                                        rtl_write_byte(rtlpriv, offset, val);
+                                }
+                                break;
+                        case PWR_CMD_POLLING:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");
+                                polling_bit = false;
+                                offset = GET_PWR_CFG_OFFSET(cmd);
+
+                                do {
+                                        val = rtl_read_byte(rtlpriv, offset);
+
+                                        val = val & GET_PWR_CFG_MASK(cmd);
+                                        if (val == (GET_PWR_CFG_VALUE(cmd) &
+                                                    GET_PWR_CFG_MASK(cmd)))
+                                                polling_bit = true;
+                                        else
+                                                udelay(10);
+
+                                        if (polling_count++ > max_polling_cnt) {
+                                                RT_TRACE(rtlpriv, COMP_INIT,
+                                                         DBG_LOUD,
+                                                         "polling fail in pwrseqcmd\n");
+                                                return false;
+                                        }
+                                } while (!polling_bit);
+
+                                break;
+                        case PWR_CMD_DELAY:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");
+                                if (GET_PWR_CFG_VALUE(cmd) == PWRSEQ_DELAY_US)
+                                        udelay(GET_PWR_CFG_OFFSET(cmd));
+                                else
+                                        mdelay(GET_PWR_CFG_OFFSET(cmd));
+                                break;
+                        case PWR_CMD_END:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_END\n");
+                                return true;
+                                break;
+                        default:
+                                RT_ASSERT(false,
+                                          "rtl88_hal_pwrseqcmdparsing(): Unknown CMD!!\n");
+                                break;
+                        }
+                }
+
+                ary_idx++;
+        } while (1);
+
+        return true;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h
new file mode 100644
index 000000000000..d9ae280bb1a2
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h
@@ -0,0 +1,97 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8723E_PWRSEQCMD_H__
+#define __RTL8723E_PWRSEQCMD_H__
+
+#include "../wifi.h"
+/*---------------------------------------------*/
+/* The value of cmd: 4 bits */
+/*---------------------------------------------*/
+#define PWR_CMD_READ            0x00
+#define PWR_CMD_WRITE           0x01
+#define PWR_CMD_POLLING         0x02
+#define PWR_CMD_DELAY           0x03
+#define PWR_CMD_END             0x04
+
+/* define the base address of each block */
+#define PWR_BASEADDR_MAC        0x00
+#define PWR_BASEADDR_USB        0x01
+#define PWR_BASEADDR_PCIE       0x02
+#define PWR_BASEADDR_SDIO       0x03
+
+#define PWR_INTF_SDIO_MSK       BIT(0)
+#define PWR_INTF_USB_MSK        BIT(1)
+#define PWR_INTF_PCI_MSK        BIT(2)
+#define PWR_INTF_ALL_MSK        (BIT(0)|BIT(1)|BIT(2)|BIT(3))
+
+#define PWR_FAB_TSMC_MSK        BIT(0)
+#define PWR_FAB_UMC_MSK         BIT(1)
+#define PWR_FAB_ALL_MSK         (BIT(0)|BIT(1)|BIT(2)|BIT(3))
+
+#define PWR_CUT_TESTCHIP_MSK    BIT(0)
+#define PWR_CUT_A_MSK           BIT(1)
+#define PWR_CUT_B_MSK           BIT(2)
+#define PWR_CUT_C_MSK           BIT(3)
+#define PWR_CUT_D_MSK           BIT(4)
+#define PWR_CUT_E_MSK           BIT(5)
+#define PWR_CUT_F_MSK           BIT(6)
+#define PWR_CUT_G_MSK           BIT(7)
+#define PWR_CUT_ALL_MSK         0xFF
+
+enum pwrseq_delay_unit {
+        PWRSEQ_DELAY_US,
+        PWRSEQ_DELAY_MS,
+};
+
+struct wlan_pwr_cfg {
+        u16 offset;
+        u8 cut_msk;
+        u8 fab_msk:4;
+        u8 interface_msk:4;
+        u8 base:4;
+        u8 cmd:4;
+        u8 msk;
+        u8 value;
+};
+
+#define GET_PWR_CFG_OFFSET(__PWR)       (__PWR.offset)
+#define GET_PWR_CFG_CUT_MASK(__PWR)     (__PWR.cut_msk)
+#define GET_PWR_CFG_FAB_MASK(__PWR)     (__PWR.fab_msk)
+#define GET_PWR_CFG_INTF_MASK(__PWR)    (__PWR.interface_msk)
+#define GET_PWR_CFG_BASE(__PWR)         (__PWR.base)
+#define GET_PWR_CFG_CMD(__PWR)          (__PWR.cmd)
+#define GET_PWR_CFG_MASK(__PWR)         (__PWR.msk)
+#define GET_PWR_CFG_VALUE(__PWR)        (__PWR.value)
+
+bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
+                                u8 fab_version, u8 interface_type,
+                                struct wlan_pwr_cfg pwrcfgcmd[]);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h
new file mode 100644
index 000000000000..d849abf7d94a
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h
@@ -0,0 +1,2258 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92C_REG_H__
+#define __RTL92C_REG_H__
+
+#define TXPKT_BUF_SELECT                        0x69
+#define RXPKT_BUF_SELECT                        0xA5
+#define DISABLE_TRXPKT_BUF_ACCESS               0x0
+
+#define REG_SYS_ISO_CTRL                        0x0000
+#define REG_SYS_FUNC_EN                         0x0002
+#define REG_APS_FSMCO                           0x0004
+#define REG_SYS_CLKR                            0x0008
+#define REG_9346CR                              0x000A
+#define REG_EE_VPD                              0x000C
+#define REG_AFE_MISC                            0x0010
+#define REG_SPS0_CTRL                           0x0011
+#define REG_SPS_OCP_CFG                         0x0018
+#define REG_RSV_CTRL                            0x001C
+#define REG_RF_CTRL                             0x001F
+#define REG_LDOA15_CTRL                         0x0020
+#define REG_LDOV12D_CTRL                        0x0021
+#define REG_LDOHCI12_CTRL                       0x0022
+#define REG_LPLDO_CTRL                          0x0023
+#define REG_AFE_XTAL_CTRL                       0x0024
+#define REG_AFE_LDO_CTRL                        0x0027 /* 1.5v for 8188EE test
+                                                        * chip, 1.4v for MP chip
+                                                        */
+#define REG_AFE_PLL_CTRL                        0x0028
+#define REG_EFUSE_CTRL                          0x0030
+#define REG_EFUSE_TEST                          0x0034
+#define REG_PWR_DATA                            0x0038
+#define REG_CAL_TIMER                           0x003C
+#define REG_ACLK_MON                            0x003E
+#define REG_GPIO_MUXCFG                         0x0040
+#define REG_GPIO_IO_SEL                         0x0042
+#define REG_MAC_PINMUX_CFG                      0x0043
+#define REG_GPIO_PIN_CTRL                       0x0044
+#define REG_GPIO_INTM                           0x0048
+#define REG_LEDCFG0                             0x004C
+#define REG_LEDCFG1                             0x004D
+#define REG_LEDCFG2                             0x004E
+#define REG_LEDCFG3                             0x004F
+#define REG_FSIMR                               0x0050
+#define REG_FSISR                               0x0054
+#define REG_HSIMR                               0x0058
+#define REG_HSISR                               0x005c
+#define REG_GPIO_PIN_CTRL_2                     0x0060
+#define REG_GPIO_IO_SEL_2                       0x0062
+#define REG_GPIO_OUTPUT                         0x006c
+#define REG_AFE_XTAL_CTRL_EXT                   0x0078
+#define REG_XCK_OUT_CTRL                        0x007c
+#define REG_MCUFWDL                             0x0080
+#define REG_WOL_EVENT                           0x0081
+#define REG_MCUTSTCFG                           0x0084
+
+
+#define REG_HIMR                                0x00B0
+#define REG_HISR                                0x00B4
+#define REG_HIMRE                               0x00B8
+#define REG_HISRE                               0x00BC
+
+#define REG_EFUSE_ACCESS                        0x00CF
+
+#define REG_BIST_SCAN                           0x00D0
+#define REG_BIST_RPT                            0x00D4
+#define REG_BIST_ROM_RPT                        0x00D8
+#define REG_USB_SIE_INTF                        0x00E0
+#define REG_PCIE_MIO_INTF                       0x00E4
+#define REG_PCIE_MIO_INTD                       0x00E8
+#define REG_HPON_FSM                            0x00EC
+#define REG_SYS_CFG                             0x00F0
+
+#define REG_CR                                  0x0100
+#define REG_PBP                                 0x0104
+#define REG_PKT_BUFF_ACCESS_CTRL                0x0106
+#define REG_TRXDMA_CTRL                         0x010C
+#define REG_TRXFF_BNDY                          0x0114
+#define REG_TRXFF_STATUS                        0x0118
+#define REG_RXFF_PTR                            0x011C
+
+#define REG_CPWM                                0x012F
+#define REG_FWIMR                               0x0130
+#define REG_FWISR                               0x0134
+#define REG_PKTBUF_DBG_CTRL                     0x0140
+#define REG_PKTBUF_DBG_DATA_L                   0x0144
+#define REG_PKTBUF_DBG_DATA_H                   0x0148
+#define REG_RXPKTBUF_CTRL                       (REG_PKTBUF_DBG_CTRL+2)
+
+#define REG_TC0_CTRL                            0x0150
+#define REG_TC1_CTRL                            0x0154
+#define REG_TC2_CTRL                            0x0158
+#define REG_TC3_CTRL                            0x015C
+#define REG_TC4_CTRL                            0x0160
+#define REG_TCUNIT_BASE                         0x0164
+#define REG_MBIST_START                         0x0174
+#define REG_MBIST_DONE                          0x0178
+#define REG_MBIST_FAIL                          0x017C
+#define REG_32K_CTRL                            0x0194
+#define REG_C2HEVT_MSG_NORMAL                   0x01A0
+#define REG_C2HEVT_CLEAR                        0x01AF
+#define REG_C2HEVT_MSG_TEST                     0x01B8
+#define REG_MCUTST_1                            0x01c0
+#define REG_FMETHR                              0x01C8
+#define REG_HMETFR                              0x01CC
+#define REG_HMEBOX_0                            0x01D0
+#define REG_HMEBOX_1                            0x01D4
+#define REG_HMEBOX_2                            0x01D8
+#define REG_HMEBOX_3                            0x01DC
+
+#define REG_LLT_INIT                            0x01E0
+#define REG_BB_ACCEESS_CTRL                     0x01E8
+#define REG_BB_ACCESS_DATA                      0x01EC
+
+#define REG_HMEBOX_EXT_0                        0x01F0
+#define REG_HMEBOX_EXT_1                        0x01F4
+#define REG_HMEBOX_EXT_2                        0x01F8
+#define REG_HMEBOX_EXT_3                        0x01FC
+
+#define REG_RQPN                                0x0200
+#define REG_FIFOPAGE                            0x0204
+#define REG_TDECTRL                             0x0208
+#define REG_TXDMA_OFFSET_CHK                    0x020C
+#define REG_TXDMA_STATUS                        0x0210
+#define REG_RQPN_NPQ                            0x0214
+
+#define REG_RXDMA_AGG_PG_TH                     0x0280
+#define REG_FW_UPD_RDPTR                        0x0284 /* FW shall update this
+                                                * register before FW * write
+                                                * RXPKT_RELEASE_POLL to 1
+                                                */
+#define REG_RXDMA_CONTROL                       0x0286 /* Control the RX DMA.*/
+#define REG_RXPKT_NUM                           0x0287 /* The number of packets
+                                                        * in RXPKTBUF.
+                                                         */
+#define REG_PCIE_CTRL_REG                       0x0300
+#define REG_INT_MIG                             0x0304
+#define REG_BCNQ_DESA                           0x0308
+#define REG_HQ_DESA                             0x0310
+#define REG_MGQ_DESA                            0x0318
+#define REG_VOQ_DESA                            0x0320
+#define REG_VIQ_DESA                            0x0328
+#define REG_BEQ_DESA                            0x0330
+#define REG_BKQ_DESA                            0x0338
+#define REG_RX_DESA                             0x0340
+
+#define REG_DBI                                 0x0348
+#define REG_MDIO                                0x0354
+#define REG_DBG_SEL                             0x0360
+#define REG_PCIE_HRPWM                          0x0361
+#define REG_PCIE_HCPWM                          0x0363
+#define REG_UART_CTRL                           0x0364
+#define REG_WATCH_DOG                           0x0368
+#define REG_UART_TX_DESA                        0x0370
+#define REG_UART_RX_DESA                        0x0378
+
+
+#define REG_HDAQ_DESA_NODEF                     0x0000
+#define REG_CMDQ_DESA_NODEF                     0x0000
+
+#define REG_VOQ_INFORMATION                     0x0400
+#define REG_VIQ_INFORMATION                     0x0404
+#define REG_BEQ_INFORMATION                     0x0408
+#define REG_BKQ_INFORMATION                     0x040C
+#define REG_MGQ_INFORMATION                     0x0410
+#define REG_HGQ_INFORMATION                     0x0414
+#define REG_BCNQ_INFORMATION                    0x0418
+#define REG_TXPKT_EMPTY                         0x041A
+
+
+#define REG_CPU_MGQ_INFORMATION                 0x041C
+#define REG_FWHW_TXQ_CTRL                       0x0420
+#define REG_HWSEQ_CTRL                          0x0423
+#define REG_TXPKTBUF_BCNQ_BDNY                  0x0424
+#define REG_TXPKTBUF_MGQ_BDNY                   0x0425
+#define REG_MULTI_BCNQ_EN                       0x0426
+#define REG_MULTI_BCNQ_OFFSET                   0x0427
+#define REG_SPEC_SIFS                           0x0428
+#define REG_RL                                  0x042A
+#define REG_DARFRC                              0x0430
+#define REG_RARFRC                              0x0438
+#define REG_RRSR                                0x0440
+#define REG_ARFR0                               0x0444
+#define REG_ARFR1                               0x0448
+#define REG_ARFR2                               0x044C
+#define REG_ARFR3                               0x0450
+#define REG_AGGLEN_LMT                          0x0458
+#define REG_AMPDU_MIN_SPACE                     0x045C
+#define REG_TXPKTBUF_WMAC_LBK_BF_HD             0x045D
+#define REG_FAST_EDCA_CTRL                      0x0460
+#define REG_RD_RESP_PKT_TH                      0x0463
+#define REG_INIRTS_RATE_SEL                     0x0480
+#define REG_INIDATA_RATE_SEL                    0x0484
+#define REG_POWER_STATUS                        0x04A4
+#define REG_POWER_STAGE1                        0x04B4
+#define REG_POWER_STAGE2                        0x04B8
+#define REG_PKT_LIFE_TIME                       0x04C0
+#define REG_STBC_SETTING                        0x04C4
+#define REG_PROT_MODE_CTRL                      0x04C8
+#define REG_BAR_MODE_CTRL                       0x04CC
+#define REG_RA_TRY_RATE_AGG_LMT                 0x04CF
+#define REG_EARLY_MODE_CONTROL                  0x04D0
+#define REG_NQOS_SEQ                            0x04DC
+#define REG_QOS_SEQ                             0x04DE
+#define REG_NEED_CPU_HANDLE                     0x04E0
+#define REG_PKT_LOSE_RPT                        0x04E1
+#define REG_PTCL_ERR_STATUS                     0x04E2
+#define REG_TX_RPT_CTRL                         0x04EC
+#define REG_TX_RPT_TIME                         0x04F0
+#define REG_DUMMY                               0x04FC
+
+#define REG_EDCA_VO_PARAM                       0x0500
+#define REG_EDCA_VI_PARAM                       0x0504
+#define REG_EDCA_BE_PARAM                       0x0508
+#define REG_EDCA_BK_PARAM                       0x050C
+#define REG_BCNTCFG                             0x0510
+#define REG_PIFS                                0x0512
+#define REG_RDG_PIFS                            0x0513
+#define REG_SIFS_CTX                            0x0514
+#define REG_SIFS_TRX                            0x0516
+#define REG_AGGR_BREAK_TIME                     0x051A
+#define REG_SLOT                                0x051B
+#define REG_TX_PTCL_CTRL                        0x0520
+#define REG_TXPAUSE                             0x0522
+#define REG_DIS_TXREQ_CLR                       0x0523
+#define REG_RD_CTRL                             0x0524
+#define REG_TBTT_PROHIBIT                       0x0540
+#define REG_RD_NAV_NXT                          0x0544
+#define REG_NAV_PROT_LEN                        0x0546
+#define REG_BCN_CTRL                            0x0550
+#define REG_USTIME_TSF                          0x0551
+#define REG_MBID_NUM                            0x0552
+#define REG_DUAL_TSF_RST                        0x0553
+#define REG_BCN_INTERVAL                        0x0554
+#define REG_MBSSID_BCN_SPACE                    0x0554
+#define REG_DRVERLYINT                          0x0558
+#define REG_BCNDMATIM                           0x0559
+#define REG_ATIMWND                             0x055A
+#define REG_BCN_MAX_ERR                         0x055D
+#define REG_RXTSF_OFFSET_CCK                    0x055E
+#define REG_RXTSF_OFFSET_OFDM                   0x055F
+#define REG_TSFTR                               0x0560
+#define REG_INIT_TSFTR                          0x0564
+#define REG_PSTIMER                             0x0580
+#define REG_TIMER0                              0x0584
+#define REG_TIMER1                              0x0588
+#define REG_ACMHWCTRL                           0x05C0
+#define REG_ACMRSTCTRL                          0x05C1
+#define REG_ACMAVG                              0x05C2
+#define REG_VO_ADMTIME                          0x05C4
+#define REG_VI_ADMTIME                          0x05C6
+#define REG_BE_ADMTIME                          0x05C8
+#define REG_EDCA_RANDOM_GEN                     0x05CC
+#define REG_SCH_TXCMD                           0x05D0
+
+#define REG_APSD_CTRL                           0x0600
+#define REG_BWOPMODE                            0x0603
+#define REG_TCR                                 0x0604
+#define REG_RCR                                 0x0608
+#define REG_RX_PKT_LIMIT                        0x060C
+#define REG_RX_DLK_TIME                         0x060D
+#define REG_RX_DRVINFO_SZ                       0x060F
+
+#define REG_MACID                               0x0610
+#define REG_BSSID                               0x0618
+#define REG_MAR                                 0x0620
+#define REG_MBIDCAMCFG                          0x0628
+
+#define REG_USTIME_EDCA                         0x0638
+#define REG_MAC_SPEC_SIFS                       0x063A
+#define REG_RESP_SIFS_CCK                       0x063C
+#define REG_RESP_SIFS_OFDM                      0x063E
+#define REG_ACKTO                               0x0640
+#define REG_CTS2TO                              0x0641
+#define REG_EIFS                                0x0642
+
+#define REG_NAV_CTRL                            0x0650
+#define REG_BACAMCMD                            0x0654
+#define REG_BACAMCONTENT                        0x0658
+#define REG_LBDLY                               0x0660
+#define REG_FWDLY                               0x0661
+#define REG_RXERR_RPT                           0x0664
+#define REG_TRXPTCL_CTL                         0x0668
+
+#define REG_CAMCMD                              0x0670
+#define REG_CAMWRITE                            0x0674
+#define REG_CAMREAD                             0x0678
+#define REG_CAMDBG                              0x067C
+#define REG_SECCFG                              0x0680
+
+#define REG_WOW_CTRL                            0x0690
+#define REG_PSSTATUS                            0x0691
+#define REG_PS_RX_INFO                          0x0692
+#define REG_UAPSD_TID                           0x0693
+#define REG_LPNAV_CTRL                          0x0694
+#define REG_WKFMCAM_NUM                         0x0698
+#define REG_WKFMCAM_RWD                         0x069C
+#define REG_RXFLTMAP0                           0x06A0
+#define REG_RXFLTMAP1                           0x06A2
+#define REG_RXFLTMAP2                           0x06A4
+#define REG_BCN_PSR_RPT                         0x06A8
+#define REG_CALB32K_CTRL                        0x06AC
+#define REG_PKT_MON_CTRL                        0x06B4
+#define REG_BT_COEX_TABLE                       0x06C0
+#define REG_WMAC_RESP_TXINFO                    0x06D8
+
+#define REG_USB_INFO                            0xFE17
+#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_DMA_AGG_TO                      0xFE5B
+#define REG_USB_AGG_TO                          0xFE5C
+#define REG_USB_AGG_TH                          0xFE5D
+
+#define REG_TEST_USB_TXQS                       0xFE48
+#define REG_TEST_SIE_VID                        0xFE60
+#define REG_TEST_SIE_PID                        0xFE62
+#define REG_TEST_SIE_OPTIONAL                   0xFE64
+#define REG_TEST_SIE_CHIRP_K                    0xFE65
+#define REG_TEST_SIE_PHY                        0xFE66
+#define REG_TEST_SIE_MAC_ADDR                   0xFE70
+#define REG_TEST_SIE_STRING                     0xFE80
+
+#define REG_NORMAL_SIE_VID                      0xFE60
+#define REG_NORMAL_SIE_PID                      0xFE62
+#define REG_NORMAL_SIE_OPTIONAL                 0xFE64
+#define REG_NORMAL_SIE_EP                       0xFE65
+#define REG_NORMAL_SIE_PHY                      0xFE68
+#define REG_NORMAL_SIE_MAC_ADDR                 0xFE70
+#define REG_NORMAL_SIE_STRING                   0xFE80
+
+#define CR9346                                  REG_9346CR
+#define MSR                                     (REG_CR + 2)
+#define ISR                                     REG_HISR
+#define TSFR                                    REG_TSFTR
+
+#define MACIDR0                                 REG_MACID
+#define MACIDR4                                 (REG_MACID + 4)
+
+#define PBP                                     REG_PBP
+
+#define IDR0                                    MACIDR0
+#define IDR4                                    MACIDR4
+
+#define UNUSED_REGISTER                         0x1BF
+#define DCAM                                    UNUSED_REGISTER
+#define PSR                                     UNUSED_REGISTER
+#define BBADDR                                  UNUSED_REGISTER
+#define PHYDATAR                                UNUSED_REGISTER
+
+#define INVALID_BBRF_VALUE                      0x12345678
+
+#define MAX_MSS_DENSITY_2T                      0x13
+#define MAX_MSS_DENSITY_1T                      0x0A
+
+#define CMDEEPROM_EN                            BIT(5)
+#define CMDEEPROM_SEL                           BIT(4)
+#define CMD9346CR_9356SEL                       BIT(4)
+#define AUTOLOAD_EEPROM                         (CMDEEPROM_EN|CMDEEPROM_SEL)
+#define AUTOLOAD_EFUSE                          CMDEEPROM_EN
+
+#define GPIOSEL_GPIO                            0
+#define GPIOSEL_ENBT                            BIT(5)
+
+#define GPIO_IN                                 REG_GPIO_PIN_CTRL
+#define GPIO_OUT                                (REG_GPIO_PIN_CTRL+1)
+#define GPIO_IO_SEL                             (REG_GPIO_PIN_CTRL+2)
+#define GPIO_MOD                                (REG_GPIO_PIN_CTRL+3)
+
+/* 8723/8188E Host System Interrupt Mask Register (offset 0x58, 32 byte) */
+#define HSIMR_GPIO12_0_INT_EN                   BIT(0)
+#define HSIMR_SPS_OCP_INT_EN                    BIT(5)
+#define HSIMR_RON_INT_EN                        BIT(6)
+#define HSIMR_PDN_INT_EN                        BIT(7)
+#define HSIMR_GPIO9_INT_EN                      BIT(25)
+
+
+/* 8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */
+#define HSISR_GPIO12_0_INT                      BIT(0)
+#define HSISR_SPS_OCP_INT                       BIT(5)
+#define HSISR_RON_INT_EN                        BIT(6)
+#define HSISR_PDNINT                            BIT(7)
+#define HSISR_GPIO9_INT                         BIT(25)
+
+#define MSR_NOLINK                              0x00
+#define MSR_ADHOC                               0x01
+#define MSR_INFRA                               0x02
+#define MSR_AP                                  0x03
+
+#define RRSR_RSC_OFFSET                         21
+#define RRSR_SHORT_OFFSET                       23
+#define RRSR_RSC_BW_40M                         0x600000
+#define RRSR_RSC_UPSUBCHNL                      0x400000
+#define RRSR_RSC_LOWSUBCHNL                     0x200000
+#define RRSR_SHORT                              0x800000
+#define RRSR_1M                                 BIT(0)
+#define RRSR_2M                                 BIT(1)
+#define RRSR_5_5M                               BIT(2)
+#define RRSR_11M                                BIT(3)
+#define RRSR_6M                                 BIT(4)
+#define RRSR_9M                                 BIT(5)
+#define RRSR_12M                                BIT(6)
+#define RRSR_18M                                BIT(7)
+#define RRSR_24M                                BIT(8)
+#define RRSR_36M                                BIT(9)
+#define RRSR_48M                                BIT(10)
+#define RRSR_54M                                BIT(11)
+#define RRSR_MCS0                               BIT(12)
+#define RRSR_MCS1                               BIT(13)
+#define RRSR_MCS2                               BIT(14)
+#define RRSR_MCS3                               BIT(15)
+#define RRSR_MCS4                               BIT(16)
+#define RRSR_MCS5                               BIT(17)
+#define RRSR_MCS6                               BIT(18)
+#define RRSR_MCS7                               BIT(19)
+#define BRSR_ACKSHORTPMB                        BIT(23)
+
+#define RATR_1M                                 0x00000001
+#define RATR_2M                                 0x00000002
+#define RATR_55M                                0x00000004
+#define RATR_11M                                0x00000008
+#define RATR_6M                                 0x00000010
+#define RATR_9M                                 0x00000020
+#define RATR_12M                                0x00000040
+#define RATR_18M                                0x00000080
+#define RATR_24M                                0x00000100
+#define RATR_36M                                0x00000200
+#define RATR_48M                                0x00000400
+#define RATR_54M                                0x00000800
+#define RATR_MCS0                               0x00001000
+#define RATR_MCS1                               0x00002000
+#define RATR_MCS2                               0x00004000
+#define RATR_MCS3                               0x00008000
+#define RATR_MCS4                               0x00010000
+#define RATR_MCS5                               0x00020000
+#define RATR_MCS6                               0x00040000
+#define RATR_MCS7                               0x00080000
+#define RATR_MCS8                               0x00100000
+#define RATR_MCS9                               0x00200000
+#define RATR_MCS10                              0x00400000
+#define RATR_MCS11                              0x00800000
+#define RATR_MCS12                              0x01000000
+#define RATR_MCS13                              0x02000000
+#define RATR_MCS14                              0x04000000
+#define RATR_MCS15                              0x08000000
+
+#define RATE_1M                                 BIT(0)
+#define RATE_2M                                 BIT(1)
+#define RATE_5_5M                               BIT(2)
+#define RATE_11M                                BIT(3)
+#define RATE_6M                                 BIT(4)
+#define RATE_9M                                 BIT(5)
+#define RATE_12M                                BIT(6)
+#define RATE_18M                                BIT(7)
+#define RATE_24M                                BIT(8)
+#define RATE_36M                                BIT(9)
+#define RATE_48M                                BIT(10)
+#define RATE_54M                                BIT(11)
+#define RATE_MCS0                               BIT(12)
+#define RATE_MCS1                               BIT(13)
+#define RATE_MCS2                               BIT(14)
+#define RATE_MCS3                               BIT(15)
+#define RATE_MCS4                               BIT(16)
+#define RATE_MCS5                               BIT(17)
+#define RATE_MCS6                               BIT(18)
+#define RATE_MCS7                               BIT(19)
+#define RATE_MCS8                               BIT(20)
+#define RATE_MCS9                               BIT(21)
+#define RATE_MCS10                              BIT(22)
+#define RATE_MCS11                              BIT(23)
+#define RATE_MCS12                              BIT(24)
+#define RATE_MCS13                              BIT(25)
+#define RATE_MCS14                              BIT(26)
+#define RATE_MCS15                              BIT(27)
+
+#define RATE_ALL_CCK            (RATR_1M | RATR_2M | RATR_55M | RATR_11M)
+#define RATE_ALL_OFDM_AG        (RATR_6M | RATR_9M | RATR_12M | RATR_18M | \
+                                RATR_24M | RATR_36M | RATR_48M | RATR_54M)
+#define RATE_ALL_OFDM_1SS       (RATR_MCS0 | RATR_MCS1 | RATR_MCS2 | \
+                                RATR_MCS3 | RATR_MCS4 | RATR_MCS5 | \
+                                RATR_MCS6 | RATR_MCS7)
+#define RATE_ALL_OFDM_2SS       (RATR_MCS8 | RATR_MCS9 | RATR_MCS10 | \
+                                RATR_MCS11 | RATR_MCS12 | RATR_MCS13 | \
+                                RATR_MCS14 | RATR_MCS15)
+
+#define BW_OPMODE_20MHZ                         BIT(2)
+#define BW_OPMODE_5G                            BIT(1)
+#define BW_OPMODE_11J                           BIT(0)
+
+#define CAM_VALID                               BIT(15)
+#define CAM_NOTVALID                            0x0000
+#define CAM_USEDK                               BIT(5)
+
+#define CAM_NONE                                0x0
+#define CAM_WEP40                               0x01
+#define CAM_TKIP                                0x02
+#define CAM_AES                                 0x04
+#define CAM_WEP104                              0x05
+
+#define TOTAL_CAM_ENTRY                         32
+#define HALF_CAM_ENTRY                          16
+
+#define CAM_WRITE                               BIT(16)
+#define CAM_READ                                0x00000000
+#define CAM_POLLINIG                            BIT(31)
+
+#define SCR_USEDK                               0x01
+#define SCR_TXSEC_ENABLE                        0x02
+#define SCR_RXSEC_ENABLE                        0x04
+
+#define WOW_PMEN                                BIT(0)
+#define WOW_WOMEN                               BIT(1)
+#define WOW_MAGIC                               BIT(2)
+#define WOW_UWF                                 BIT(3)
+
+/*********************************************
+*       8188 IMR/ISR bits
+**********************************************/
+#define IMR_DISABLED                            0x0
+/* IMR DW0(0x0060-0063) Bit 0-31 */
+#define IMR_TXCCK               BIT(30) /* TXRPT interrupt when CCX bit of
+                                         * the packet is set
+                                         */
+#define IMR_PSTIMEOUT           BIT(29) /* Power Save Time Out Interrupt */
+#define IMR_GTINT4              BIT(28) /* When GTIMER4 expires,
+                                         * this bit is set to 1
+                                         */
+#define IMR_GTINT3              BIT(27) /* When GTIMER3 expires,
+                                         * this bit is set to 1
+                                         */
+#define IMR_TBDER               BIT(26) /* Transmit Beacon0 Error */
+#define IMR_TBDOK               BIT(25) /* Transmit Beacon0 OK  */
+#define IMR_TSF_BIT32_TOGGLE    BIT(24) /* TSF Timer BIT32 toggle ind int */
+#define IMR_BCNDMAINT0          BIT(20) /* Beacon DMA Interrupt 0 */
+#define IMR_BCNDOK0             BIT(16) /* Beacon Queue DMA OK0 */
+#define IMR_HSISR_IND_ON_INT    BIT(15) /* HSISR Indicator (HSIMR & HSISR is
+                                         * true, this bit is set to 1)
+                                         */
+#define IMR_BCNDMAINT_E         BIT(14) /* Beacon DMA Int Extension for Win7 */
+#define IMR_ATIMEND             BIT(12) /* CTWidnow End or ATIM Window End */
+#define IMR_HISR1_IND_INT       BIT(11) /* HISR1 Indicator (HISR1 & HIMR1 is
+                                         * true, this bit is set to 1)
+                                         */
+#define IMR_C2HCMD              BIT(10) /* CPU to Host Command INT Status,
+                                         * Write 1 clear
+                                         */
+#define IMR_CPWM2               BIT(9)  /* CPU power Mode exchange INT Status,
+                                         * Write 1 clear
+                                         */
+#define IMR_CPWM                BIT(8)  /* CPU power Mode exchange INT Status,
+                                         * Write 1 clear
+                                         */
+#define IMR_HIGHDOK             BIT(7)  /* High Queue DMA OK    */
+#define IMR_MGNTDOK             BIT(6)  /* Management Queue DMA OK */
+#define IMR_BKDOK               BIT(5)  /* AC_BK DMA OK         */
+#define IMR_BEDOK               BIT(4)  /* AC_BE DMA OK */
+#define IMR_VIDOK               BIT(3)  /* AC_VI DMA OK */
+#define IMR_VODOK               BIT(2)  /* AC_VO DMA OK */
+#define IMR_RDU                 BIT(1)  /* Rx Descriptor Unavailable */
+#define IMR_ROK                 BIT(0)  /* Receive DMA OK */
+
+/* IMR DW1(0x00B4-00B7) Bit 0-31 */
+#define IMR_BCNDMAINT7          BIT(27) /* Beacon DMA Interrupt 7 */
+#define IMR_BCNDMAINT6          BIT(26) /* Beacon DMA Interrupt 6 */
+#define IMR_BCNDMAINT5          BIT(25) /* Beacon DMA Interrupt 5 */
+#define IMR_BCNDMAINT4          BIT(24) /* Beacon DMA Interrupt 4 */
+#define IMR_BCNDMAINT3          BIT(23) /* Beacon DMA Interrupt 3 */
+#define IMR_BCNDMAINT2          BIT(22) /* Beacon DMA Interrupt 2 */
+#define IMR_BCNDMAINT1          BIT(21) /* Beacon DMA Interrupt 1 */
+#define IMR_BCNDOK7             BIT(20) /* Beacon Queue DMA OK Interrup 7 */
+#define IMR_BCNDOK6             BIT(19) /* Beacon Queue DMA OK Interrup 6 */
+#define IMR_BCNDOK5             BIT(18) /* Beacon Queue DMA OK Interrup 5 */
+#define IMR_BCNDOK4             BIT(17) /* Beacon Queue DMA OK Interrup 4 */
+#define IMR_BCNDOK3             BIT(16) /* Beacon Queue DMA OK Interrup 3 */
+#define IMR_BCNDOK2             BIT(15) /* Beacon Queue DMA OK Interrup 2 */
+#define IMR_BCNDOK1             BIT(14) /* Beacon Queue DMA OK Interrup 1 */
+#define IMR_ATIMEND_E           BIT(13) /* ATIM Window End Extension for Win7 */
+#define IMR_TXERR               BIT(11) /* Tx Err Flag Int Status,
+                                         * write 1 clear.
+                                         */
+#define IMR_RXERR               BIT(10) /* Rx Err Flag INT Status,
+                                         * Write 1 clear
+                                         */
+#define IMR_TXFOVW              BIT(9)  /* Transmit FIFO Overflow */
+#define IMR_RXFOVW              BIT(8)  /* Receive FIFO Overflow */
+
+
+#define HWSET_MAX_SIZE                          512
+#define   EFUSE_MAX_SECTION                     64
+#define   EFUSE_REAL_CONTENT_LEN                256
+#define EFUSE_OOB_PROTECT_BYTES                 18 /* PG data exclude header,
+                                                    * dummy 7 bytes frome CP
+                                                    * test and reserved 1byte.
+                                                    */
+
+#define EEPROM_DEFAULT_TSSI                     0x0
+#define EEPROM_DEFAULT_TXPOWERDIFF              0x0
+#define EEPROM_DEFAULT_CRYSTALCAP               0x5
+#define EEPROM_DEFAULT_BOARDTYPE                0x02
+#define EEPROM_DEFAULT_TXPOWER                  0x1010
+#define EEPROM_DEFAULT_HT2T_TXPWR               0x10
+
+#define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
+#define EEPROM_DEFAULT_THERMALMETER             0x18
+#define EEPROM_DEFAULT_ANTTXPOWERDIFF           0x0
+#define EEPROM_DEFAULT_TXPWDIFF_CRYSTALCAP      0x5
+#define EEPROM_DEFAULT_TXPOWERLEVEL             0x22
+#define EEPROM_DEFAULT_HT40_2SDIFF              0x0
+#define EEPROM_DEFAULT_HT20_DIFF                2
+#define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
+#define EEPROM_DEFAULT_HT40_PWRMAXOFFSET        0
+#define EEPROM_DEFAULT_HT20_PWRMAXOFFSET        0
+
+#define RF_OPTION1                              0x79
+#define RF_OPTION2                              0x7A
+#define RF_OPTION3                              0x7B
+#define RF_OPTION4                              0x7C
+
+#define EEPROM_DEFAULT_PID                      0x1234
+#define EEPROM_DEFAULT_VID                      0x5678
+#define EEPROM_DEFAULT_CUSTOMERID               0xAB
+#define EEPROM_DEFAULT_SUBCUSTOMERID            0xCD
+#define EEPROM_DEFAULT_VERSION                  0
+
+#define EEPROM_CHANNEL_PLAN_FCC                 0x0
+#define EEPROM_CHANNEL_PLAN_IC                  0x1
+#define EEPROM_CHANNEL_PLAN_ETSI                0x2
+#define EEPROM_CHANNEL_PLAN_SPAIN               0x3
+#define EEPROM_CHANNEL_PLAN_FRANCE              0x4
+#define EEPROM_CHANNEL_PLAN_MKK                 0x5
+#define EEPROM_CHANNEL_PLAN_MKK1                0x6
+#define EEPROM_CHANNEL_PLAN_ISRAEL              0x7
+#define EEPROM_CHANNEL_PLAN_TELEC               0x8
+#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN       0x9
+#define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13       0xA
+#define EEPROM_CHANNEL_PLAN_NCC                 0xB
+#define EEPROM_CHANNEL_PLAN_BY_HW_MASK          0x80
+
+#define EEPROM_CID_DEFAULT                      0x0
+#define EEPROM_CID_TOSHIBA                      0x4
+#define EEPROM_CID_CCX                          0x10
+#define EEPROM_CID_QMI                          0x0D
+#define EEPROM_CID_WHQL                         0xFE
+
+#define RTL8188E_EEPROM_ID                      0x8129
+
+#define EEPROM_HPON                             0x02
+#define EEPROM_CLK                              0x06
+#define EEPROM_TESTR                            0x08
+
+#define EEPROM_TXPOWERCCK                       0x10
+#define EEPROM_TXPOWERHT40_1S                   0x16
+#define EEPROM_TXPOWERHT20DIFF                  0x1B
+#define EEPROM_TXPOWER_OFDMDIFF                 0x1B
+
+#define EEPROM_TX_PWR_INX                       0x10
+
+#define EEPROM_CHANNELPLAN                      0xB8
+#define EEPROM_XTAL_88E                         0xB9
+#define EEPROM_THERMAL_METER_88E                0xBA
+#define EEPROM_IQK_LCK_88E                      0xBB
+
+#define EEPROM_RF_BOARD_OPTION_88E              0xC1
+#define EEPROM_RF_FEATURE_OPTION_88E            0xC2
+#define EEPROM_RF_BT_SETTING_88E                0xC3
+#define EEPROM_VERSION                          0xC4
+#define EEPROM_CUSTOMER_ID                      0xC5
+#define EEPROM_RF_ANTENNA_OPT_88E               0xC9
+
+#define EEPROM_MAC_ADDR                         0xD0
+#define EEPROM_VID                              0xD6
+#define EEPROM_DID                              0xD8
+#define EEPROM_SVID                             0xDA
+#define EEPROM_SMID                             0xDC
+
+#define STOPBECON                               BIT(6)
+#define STOPHIGHT                               BIT(5)
+#define STOPMGT                                 BIT(4)
+#define STOPVO                                  BIT(3)
+#define STOPVI                                  BIT(2)
+#define STOPBE                                  BIT(1)
+#define STOPBK                                  BIT(0)
+
+#define RCR_APPFCS                              BIT(31)
+#define RCR_APP_MIC                             BIT(30)
+#define RCR_APP_ICV                             BIT(29)
+#define RCR_APP_PHYST_RXFF                      BIT(28)
+#define RCR_APP_BA_SSN                          BIT(27)
+#define RCR_ENMBID                              BIT(24)
+#define RCR_LSIGEN                              BIT(23)
+#define RCR_MFBEN                               BIT(22)
+#define RCR_HTC_LOC_CTRL                        BIT(14)
+#define RCR_AMF                                 BIT(13)
+#define RCR_ACF                                 BIT(12)
+#define RCR_ADF                                 BIT(11)
+#define RCR_AICV                                BIT(9)
+#define RCR_ACRC32                              BIT(8)
+#define RCR_CBSSID_BCN                          BIT(7)
+#define RCR_CBSSID_DATA                         BIT(6)
+#define RCR_CBSSID                              RCR_CBSSID_DATA
+#define RCR_APWRMGT                             BIT(5)
+#define RCR_ADD3                                BIT(4)
+#define RCR_AB                                  BIT(3)
+#define RCR_AM                                  BIT(2)
+#define RCR_APM                                 BIT(1)
+#define RCR_AAP                                 BIT(0)
+#define RCR_MXDMA_OFFSET                        8
+#define RCR_FIFO_OFFSET                         13
+
+#define RSV_CTRL                                0x001C
+#define RD_CTRL                                 0x0524
+
+#define REG_USB_INFO                            0xFE17
+#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_DMA_AGG_TO                      0xFE5B
+#define REG_USB_AGG_TO                          0xFE5C
+#define REG_USB_AGG_TH                          0xFE5D
+
+#define REG_USB_VID                             0xFE60
+#define REG_USB_PID                             0xFE62
+#define REG_USB_OPTIONAL                        0xFE64
+#define REG_USB_CHIRP_K                         0xFE65
+#define REG_USB_PHY                             0xFE66
+#define REG_USB_MAC_ADDR                        0xFE70
+#define REG_USB_HRPWM                           0xFE58
+#define REG_USB_HCPWM                           0xFE57
+
+#define SW18_FPWM                               BIT(3)
+
+#define ISO_MD2PP                               BIT(0)
+#define ISO_UA2USB                              BIT(1)
+#define ISO_UD2CORE                             BIT(2)
+#define ISO_PA2PCIE                             BIT(3)
+#define ISO_PD2CORE                             BIT(4)
+#define ISO_IP2MAC                              BIT(5)
+#define ISO_DIOP                                BIT(6)
+#define ISO_DIOE                                BIT(7)
+#define ISO_EB2CORE                             BIT(8)
+#define ISO_DIOR                                BIT(9)
+
+#define PWC_EV25V                               BIT(14)
+#define PWC_EV12V                               BIT(15)
+
+#define FEN_BBRSTB                              BIT(0)
+#define FEN_BB_GLB_RSTN                         BIT(1)
+#define FEN_USBA                                BIT(2)
+#define FEN_UPLL                                BIT(3)
+#define FEN_USBD                                BIT(4)
+#define FEN_DIO_PCIE                            BIT(5)
+#define FEN_PCIEA                               BIT(6)
+#define FEN_PPLL                                BIT(7)
+#define FEN_PCIED                               BIT(8)
+#define FEN_DIOE                                BIT(9)
+#define FEN_CPUEN                               BIT(10)
+#define FEN_DCORE                               BIT(11)
+#define FEN_ELDR                                BIT(12)
+#define FEN_DIO_RF                              BIT(13)
+#define FEN_HWPDN                               BIT(14)
+#define FEN_MREGEN                              BIT(15)
+
+#define PFM_LDALL                               BIT(0)
+#define PFM_ALDN                                BIT(1)
+#define PFM_LDKP                                BIT(2)
+#define PFM_WOWL                                BIT(3)
+#define ENPDN                                   BIT(4)
+#define PDN_PL                                  BIT(5)
+#define APFM_ONMAC                              BIT(8)
+#define APFM_OFF                                BIT(9)
+#define APFM_RSM                                BIT(10)
+#define AFSM_HSUS                               BIT(11)
+#define AFSM_PCIE                               BIT(12)
+#define APDM_MAC                                BIT(13)
+#define APDM_HOST                               BIT(14)
+#define APDM_HPDN                               BIT(15)
+#define RDY_MACON                               BIT(16)
+#define SUS_HOST                                BIT(17)
+#define ROP_ALD                                 BIT(20)
+#define ROP_PWR                                 BIT(21)
+#define ROP_SPS                                 BIT(22)
+#define SOP_MRST                                BIT(25)
+#define SOP_FUSE                                BIT(26)
+#define SOP_ABG                                 BIT(27)
+#define SOP_AMB                                 BIT(28)
+#define SOP_RCK                                 BIT(29)
+#define SOP_A8M                                 BIT(30)
+#define XOP_BTCK                                BIT(31)
+
+#define ANAD16V_EN                              BIT(0)
+#define ANA8M                                   BIT(1)
+#define MACSLP                                  BIT(4)
+#define LOADER_CLK_EN                           BIT(5)
+#define _80M_SSC_DIS                            BIT(7)
+#define _80M_SSC_EN_HO                          BIT(8)
+#define PHY_SSC_RSTB                            BIT(9)
+#define SEC_CLK_EN                              BIT(10)
+#define MAC_CLK_EN                              BIT(11)
+#define SYS_CLK_EN                              BIT(12)
+#define RING_CLK_EN                             BIT(13)
+
+#define BOOT_FROM_EEPROM                        BIT(4)
+#define EEPROM_EN                               BIT(5)
+
+#define AFE_BGEN                                BIT(0)
+#define AFE_MBEN                                BIT(1)
+#define MAC_ID_EN                               BIT(7)
+
+#define WLOCK_ALL                               BIT(0)
+#define WLOCK_00                                BIT(1)
+#define WLOCK_04                                BIT(2)
+#define WLOCK_08                                BIT(3)
+#define WLOCK_40                                BIT(4)
+#define R_DIS_PRST_0                            BIT(5)
+#define R_DIS_PRST_1                            BIT(6)
+#define LOCK_ALL_EN                             BIT(7)
+
+#define RF_EN                                   BIT(0)
+#define RF_RSTB                                 BIT(1)
+#define RF_SDMRSTB                              BIT(2)
+
+#define LDA15_EN                                BIT(0)
+#define LDA15_STBY                              BIT(1)
+#define LDA15_OBUF                              BIT(2)
+#define LDA15_REG_VOS                           BIT(3)
+#define _LDA15_VOADJ(x)                         (((x) & 0x7) << 4)
+
+#define LDV12_EN                                BIT(0)
+#define LDV12_SDBY                              BIT(1)
+#define LPLDO_HSM                               BIT(2)
+#define LPLDO_LSM_DIS                           BIT(3)
+#define _LDV12_VADJ(x)                          (((x) & 0xF) << 4)
+
+#define XTAL_EN                                 BIT(0)
+#define XTAL_BSEL                               BIT(1)
+#define _XTAL_BOSC(x)                           (((x) & 0x3) << 2)
+#define _XTAL_CADJ(x)                           (((x) & 0xF) << 4)
+#define XTAL_GATE_USB                           BIT(8)
+#define _XTAL_USB_DRV(x)                        (((x) & 0x3) << 9)
+#define XTAL_GATE_AFE                           BIT(11)
+#define _XTAL_AFE_DRV(x)                        (((x) & 0x3) << 12)
+#define XTAL_RF_GATE                            BIT(14)
+#define _XTAL_RF_DRV(x)                         (((x) & 0x3) << 15)
+#define XTAL_GATE_DIG                           BIT(17)
+#define _XTAL_DIG_DRV(x)                        (((x) & 0x3) << 18)
+#define XTAL_BT_GATE                            BIT(20)
+#define _XTAL_BT_DRV(x)                         (((x) & 0x3) << 21)
+#define _XTAL_GPIO(x)                           (((x) & 0x7) << 23)
+
+#define CKDLY_AFE                               BIT(26)
+#define CKDLY_USB                               BIT(27)
+#define CKDLY_DIG                               BIT(28)
+#define CKDLY_BT                                BIT(29)
+
+#define APLL_EN                                 BIT(0)
+#define APLL_320_EN                             BIT(1)
+#define APLL_FREF_SEL                           BIT(2)
+#define APLL_EDGE_SEL                           BIT(3)
+#define APLL_WDOGB                              BIT(4)
+#define APLL_LPFEN                              BIT(5)
+
+#define APLL_REF_CLK_13MHZ                      0x1
+#define APLL_REF_CLK_19_2MHZ                    0x2
+#define APLL_REF_CLK_20MHZ                      0x3
+#define APLL_REF_CLK_25MHZ                      0x4
+#define APLL_REF_CLK_26MHZ                      0x5
+#define APLL_REF_CLK_38_4MHZ                    0x6
+#define APLL_REF_CLK_40MHZ                      0x7
+
+#define APLL_320EN                              BIT(14)
+#define APLL_80EN                               BIT(15)
+#define APLL_1MEN                               BIT(24)
+
+#define ALD_EN                                  BIT(18)
+#define EF_PD                                   BIT(19)
+#define EF_FLAG                                 BIT(31)
+
+#define EF_TRPT                                 BIT(7)
+#define LDOE25_EN                               BIT(31)
+
+#define RSM_EN                                  BIT(0)
+#define TIMER_EN                                BIT(4)
+
+#define TRSW0EN                                 BIT(2)
+#define TRSW1EN                                 BIT(3)
+#define EROM_EN                                 BIT(4)
+#define ENBT                                    BIT(5)
+#define ENUART                                  BIT(8)
+#define UART_910                                BIT(9)
+#define ENPMAC                                  BIT(10)
+#define SIC_SWRST                               BIT(11)
+#define ENSIC                                   BIT(12)
+#define SIC_23                                  BIT(13)
+#define ENHDP                                   BIT(14)
+#define SIC_LBK                                 BIT(15)
+
+#define LED0PL                                  BIT(4)
+#define LED1PL                                  BIT(12)
+#define LED0DIS                                 BIT(7)
+
+#define MCUFWDL_EN                              BIT(0)
+#define MCUFWDL_RDY                             BIT(1)
+#define FWDL_CHKSUM_RPT                         BIT(2)
+#define MACINI_RDY                              BIT(3)
+#define BBINI_RDY                               BIT(4)
+#define RFINI_RDY                               BIT(5)
+#define WINTINI_RDY                             BIT(6)
+#define CPRST                                   BIT(23)
+
+#define XCLK_VLD                                BIT(0)
+#define ACLK_VLD                                BIT(1)
+#define UCLK_VLD                                BIT(2)
+#define PCLK_VLD                                BIT(3)
+#define PCIRSTB                                 BIT(4)
+#define V15_VLD                                 BIT(5)
+#define TRP_B15V_EN                             BIT(7)
+#define SIC_IDLE                                BIT(8)
+#define BD_MAC2                                 BIT(9)
+#define BD_MAC1                                 BIT(10)
+#define IC_MACPHY_MODE                          BIT(11)
+#define VENDOR_ID                               BIT(19)
+#define PAD_HWPD_IDN                            BIT(22)
+#define TRP_VAUX_EN                             BIT(23)
+#define TRP_BT_EN                               BIT(24)
+#define BD_PKG_SEL                              BIT(25)
+#define BD_HCI_SEL                              BIT(26)
+#define TYPE_ID                                 BIT(27)
+
+#define CHIP_VER_RTL_MASK                       0xF000
+#define CHIP_VER_RTL_SHIFT                      12
+
+#define REG_LBMODE                              (REG_CR + 3)
+
+#define HCI_TXDMA_EN                            BIT(0)
+#define HCI_RXDMA_EN                            BIT(1)
+#define TXDMA_EN                                BIT(2)
+#define RXDMA_EN                                BIT(3)
+#define PROTOCOL_EN                             BIT(4)
+#define SCHEDULE_EN                             BIT(5)
+#define MACTXEN                                 BIT(6)
+#define MACRXEN                                 BIT(7)
+#define ENSWBCN                                 BIT(8)
+#define ENSEC                                   BIT(9)
+
+#define _NETTYPE(x)                             (((x) & 0x3) << 16)
+#define MASK_NETTYPE                            0x30000
+#define NT_NO_LINK                              0x0
+#define NT_LINK_AD_HOC                          0x1
+#define NT_LINK_AP                              0x2
+#define NT_AS_AP                                0x3
+
+#define _LBMODE(x)                              (((x) & 0xF) << 24)
+#define MASK_LBMODE                             0xF000000
+#define LOOPBACK_NORMAL                         0x0
+#define LOOPBACK_IMMEDIATELY                    0xB
+#define LOOPBACK_MAC_DELAY                      0x3
+#define LOOPBACK_PHY                            0x1
+#define LOOPBACK_DMA                            0x7
+
+#define GET_RX_PAGE_SIZE(value)         ((value) & 0xF)
+#define GET_TX_PAGE_SIZE(value)         (((value) & 0xF0) >> 4)
+#define _PSRX_MASK                              0xF
+#define _PSTX_MASK                              0xF0
+#define _PSRX(x)                                (x)
+#define _PSTX(x)                                ((x) << 4)
+
+#define PBP_64                                  0x0
+#define PBP_128                                 0x1
+#define PBP_256                                 0x2
+#define PBP_512                                 0x3
+#define PBP_1024                                0x4
+
+#define RXDMA_ARBBW_EN                          BIT(0)
+#define RXSHFT_EN                               BIT(1)
+#define RXDMA_AGG_EN                            BIT(2)
+#define QS_VO_QUEUE                             BIT(8)
+#define QS_VI_QUEUE                             BIT(9)
+#define QS_BE_QUEUE                             BIT(10)
+#define QS_BK_QUEUE                             BIT(11)
+#define QS_MANAGER_QUEUE                        BIT(12)
+#define QS_HIGH_QUEUE                           BIT(13)
+
+#define HQSEL_VOQ                               BIT(0)
+#define HQSEL_VIQ                               BIT(1)
+#define HQSEL_BEQ                               BIT(2)
+#define HQSEL_BKQ                               BIT(3)
+#define HQSEL_MGTQ                              BIT(4)
+#define HQSEL_HIQ                               BIT(5)
+
+#define _TXDMA_HIQ_MAP(x)                       (((x)&0x3) << 14)
+#define _TXDMA_MGQ_MAP(x)                       (((x)&0x3) << 12)
+#define _TXDMA_BKQ_MAP(x)                       (((x)&0x3) << 10)
+#define _TXDMA_BEQ_MAP(x)                       (((x)&0x3) << 8)
+#define _TXDMA_VIQ_MAP(x)                       (((x)&0x3) << 6)
+#define _TXDMA_VOQ_MAP(x)                       (((x)&0x3) << 4)
+
+#define QUEUE_LOW                               1
+#define QUEUE_NORMAL                            2
+#define QUEUE_HIGH                              3
+
+#define _LLT_NO_ACTIVE                          0x0
+#define _LLT_WRITE_ACCESS                       0x1
+#define _LLT_READ_ACCESS                        0x2
+
+#define _LLT_INIT_DATA(x)                       ((x) & 0xFF)
+#define _LLT_INIT_ADDR(x)                       (((x) & 0xFF) << 8)
+#define _LLT_OP(x)                              (((x) & 0x3) << 30)
+#define _LLT_OP_VALUE(x)                        (((x) >> 30) & 0x3)
+
+#define BB_WRITE_READ_MASK                      (BIT(31) | BIT(30))
+#define BB_WRITE_EN                             BIT(30)
+#define BB_READ_EN                              BIT(31)
+
+#define _HPQ(x)                                 ((x) & 0xFF)
+#define _LPQ(x)                                 (((x) & 0xFF) << 8)
+#define _PUBQ(x)                                (((x) & 0xFF) << 16)
+#define _NPQ(x)                                 ((x) & 0xFF)
+
+#define HPQ_PUBLIC_DIS                          BIT(24)
+#define LPQ_PUBLIC_DIS                          BIT(25)
+#define LD_RQPN                                 BIT(31)
+
+#define BCN_VALID                               BIT(16)
+#define BCN_HEAD(x)                             (((x) & 0xFF) << 8)
+#define BCN_HEAD_MASK                           0xFF00
+
+#define BLK_DESC_NUM_SHIFT                      4
+#define BLK_DESC_NUM_MASK                       0xF
+
+#define DROP_DATA_EN                            BIT(9)
+
+#define EN_AMPDU_RTY_NEW                        BIT(7)
+
+#define _INIRTSMCS_SEL(x)                       ((x) & 0x3F)
+
+#define _SPEC_SIFS_CCK(x)                       ((x) & 0xFF)
+#define _SPEC_SIFS_OFDM(x)                      (((x) & 0xFF) << 8)
+
+#define RATE_REG_BITMAP_ALL                     0xFFFFF
+
+#define _RRSC_BITMAP(x)                         ((x) & 0xFFFFF)
+
+#define _RRSR_RSC(x)                            (((x) & 0x3) << 21)
+#define RRSR_RSC_RESERVED                       0x0
+#define RRSR_RSC_UPPER_SUBCHANNEL               0x1
+#define RRSR_RSC_LOWER_SUBCHANNEL               0x2
+#define RRSR_RSC_DUPLICATE_MODE                 0x3
+
+#define USE_SHORT_G1                            BIT(20)
+
+#define _AGGLMT_MCS0(x)                         ((x) & 0xF)
+#define _AGGLMT_MCS1(x)                         (((x) & 0xF) << 4)
+#define _AGGLMT_MCS2(x)                         (((x) & 0xF) << 8)
+#define _AGGLMT_MCS3(x)                         (((x) & 0xF) << 12)
+#define _AGGLMT_MCS4(x)                         (((x) & 0xF) << 16)
+#define _AGGLMT_MCS5(x)                         (((x) & 0xF) << 20)
+#define _AGGLMT_MCS6(x)                         (((x) & 0xF) << 24)
+#define _AGGLMT_MCS7(x)                         (((x) & 0xF) << 28)
+
+#define RETRY_LIMIT_SHORT_SHIFT                 8
+#define RETRY_LIMIT_LONG_SHIFT                  0
+
+#define _DARF_RC1(x)                            ((x) & 0x1F)
+#define _DARF_RC2(x)                            (((x) & 0x1F) << 8)
+#define _DARF_RC3(x)                            (((x) & 0x1F) << 16)
+#define _DARF_RC4(x)                            (((x) & 0x1F) << 24)
+#define _DARF_RC5(x)                            ((x) & 0x1F)
+#define _DARF_RC6(x)                            (((x) & 0x1F) << 8)
+#define _DARF_RC7(x)                            (((x) & 0x1F) << 16)
+#define _DARF_RC8(x)                            (((x) & 0x1F) << 24)
+
+#define _RARF_RC1(x)                            ((x) & 0x1F)
+#define _RARF_RC2(x)                            (((x) & 0x1F) << 8)
+#define _RARF_RC3(x)                            (((x) & 0x1F) << 16)
+#define _RARF_RC4(x)                            (((x) & 0x1F) << 24)
+#define _RARF_RC5(x)                            ((x) & 0x1F)
+#define _RARF_RC6(x)                            (((x) & 0x1F) << 8)
+#define _RARF_RC7(x)                            (((x) & 0x1F) << 16)
+#define _RARF_RC8(x)                            (((x) & 0x1F) << 24)
+
+#define AC_PARAM_TXOP_LIMIT_OFFSET              16
+#define AC_PARAM_ECW_MAX_OFFSET                 12
+#define AC_PARAM_ECW_MIN_OFFSET                 8
+#define AC_PARAM_AIFS_OFFSET                    0
+
+#define _AIFS(x)                                (x)
+#define _ECW_MAX_MIN(x)                         ((x) << 8)
+#define _TXOP_LIMIT(x)                          ((x) << 16)
+
+#define _BCNIFS(x)                              ((x) & 0xFF)
+#define _BCNECW(x)                              ((((x) & 0xF)) << 8)
+
+#define _LRL(x)                                 ((x) & 0x3F)
+#define _SRL(x)                                 (((x) & 0x3F) << 8)
+
+#define _SIFS_CCK_CTX(x)                        ((x) & 0xFF)
+#define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8);
+
+#define _SIFS_OFDM_CTX(x)                       ((x) & 0xFF)
+#define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8);
+
+#define _TBTT_PROHIBIT_HOLD(x)                  (((x) & 0xFF) << 8)
+
+#define DIS_EDCA_CNT_DWN                        BIT(11)
+
+#define EN_MBSSID                               BIT(1)
+#define EN_TXBCN_RPT                            BIT(2)
+#define EN_BCN_FUNCTION                         BIT(3)
+
+#define TSFTR_RST                               BIT(0)
+#define TSFTR1_RST                              BIT(1)
+
+#define STOP_BCNQ                               BIT(6)
+
+#define DIS_TSF_UDT0_NORMAL_CHIP                BIT(4)
+#define DIS_TSF_UDT0_TEST_CHIP                  BIT(5)
+
+#define ACMHW_HWEN                              BIT(0)
+#define ACMHW_BEQEN                             BIT(1)
+#define ACMHW_VIQEN                             BIT(2)
+#define ACMHW_VOQEN                             BIT(3)
+#define ACMHW_BEQSTATUS                         BIT(4)
+#define ACMHW_VIQSTATUS                         BIT(5)
+#define ACMHW_VOQSTATUS                         BIT(6)
+
+#define APSDOFF                                 BIT(6)
+#define APSDOFF_STATUS                          BIT(7)
+
+#define BW_20MHZ                                BIT(2)
+
+#define RATE_BITMAP_ALL                         0xFFFFF
+
+#define RATE_RRSR_CCK_ONLY_1M                   0xFFFF1
+
+#define TSFRST                                  BIT(0)
+#define DIS_GCLK                                BIT(1)
+#define PAD_SEL                                 BIT(2)
+#define PWR_ST                                  BIT(6)
+#define PWRBIT_OW_EN                            BIT(7)
+#define ACRC                                    BIT(8)
+#define CFENDFORM                               BIT(9)
+#define ICV                                     BIT(10)
+
+#define AAP                                     BIT(0)
+#define APM                                     BIT(1)
+#define AM                                      BIT(2)
+#define AB                                      BIT(3)
+#define ADD3                                    BIT(4)
+#define APWRMGT                                 BIT(5)
+#define CBSSID                                  BIT(6)
+#define CBSSID_DATA                             BIT(6)
+#define CBSSID_BCN                              BIT(7)
+#define ACRC32                                  BIT(8)
+#define AICV                                    BIT(9)
+#define ADF                                     BIT(11)
+#define ACF                                     BIT(12)
+#define AMF                                     BIT(13)
+#define HTC_LOC_CTRL                            BIT(14)
+#define UC_DATA_EN                              BIT(16)
+#define BM_DATA_EN                              BIT(17)
+#define MFBEN                                   BIT(22)
+#define LSIGEN                                  BIT(23)
+#define ENMBID                                  BIT(24)
+#define APP_BASSN                               BIT(27)
+#define APP_PHYSTS                              BIT(28)
+#define APP_ICV                                 BIT(29)
+#define APP_MIC                                 BIT(30)
+#define APP_FCS                                 BIT(31)
+
+#define _MIN_SPACE(x)                           ((x) & 0x7)
+#define _SHORT_GI_PADDING(x)                    (((x) & 0x1F) << 3)
+
+#define RXERR_TYPE_OFDM_PPDU                    0
+#define RXERR_TYPE_OFDM_FALSE_ALARM             1
+#define RXERR_TYPE_OFDM_MPDU_OK                 2
+#define RXERR_TYPE_OFDM_MPDU_FAIL               3
+#define RXERR_TYPE_CCK_PPDU                     4
+#define RXERR_TYPE_CCK_FALSE_ALARM              5
+#define RXERR_TYPE_CCK_MPDU_OK                  6
+#define RXERR_TYPE_CCK_MPDU_FAIL                7
+#define RXERR_TYPE_HT_PPDU                      8
+#define RXERR_TYPE_HT_FALSE_ALARM               9
+#define RXERR_TYPE_HT_MPDU_TOTAL                10
+#define RXERR_TYPE_HT_MPDU_OK                   11
+#define RXERR_TYPE_HT_MPDU_FAIL                 12
+#define RXERR_TYPE_RX_FULL_DROP                 15
+
+#define RXERR_COUNTER_MASK                      0xFFFFF
+#define RXERR_RPT_RST                           BIT(27)
+#define _RXERR_RPT_SEL(type)                    ((type) << 28)
+
+#define SCR_TXUSEDK                             BIT(0)
+#define SCR_RXUSEDK                             BIT(1)
+#define SCR_TXENCENABLE                         BIT(2)
+#define SCR_RXDECENABLE                         BIT(3)
+#define SCR_SKBYA2                              BIT(4)
+#define SCR_NOSKMC                              BIT(5)
+#define SCR_TXBCUSEDK                           BIT(6)
+#define SCR_RXBCUSEDK                           BIT(7)
+
+#define USB_IS_HIGH_SPEED                       0
+#define USB_IS_FULL_SPEED                       1
+#define USB_SPEED_MASK                          BIT(5)
+
+#define USB_NORMAL_SIE_EP_MASK                  0xF
+#define USB_NORMAL_SIE_EP_SHIFT                 4
+
+#define USB_TEST_EP_MASK                        0x30
+#define USB_TEST_EP_SHIFT                       4
+
+#define USB_AGG_EN                              BIT(3)
+
+#define MAC_ADDR_LEN                            6
+#define LAST_ENTRY_OF_TX_PKT_BUFFER             175/*255    88e*/
+
+#define POLLING_LLT_THRESHOLD                   20
+#define POLLING_READY_TIMEOUT_COUNT             3000
+
+#define MAX_MSS_DENSITY_2T                      0x13
+#define MAX_MSS_DENSITY_1T                      0x0A
+
+#define EPROM_CMD_OPERATING_MODE_MASK           ((1<<7)|(1<<6))
+#define EPROM_CMD_CONFIG                        0x3
+#define EPROM_CMD_LOAD                          1
+
+#define HWSET_MAX_SIZE_92S                      HWSET_MAX_SIZE
+
+#define HAL_8192C_HW_GPIO_WPS_BIT               BIT(2)
+
+#define RPMAC_RESET                             0x100
+#define RPMAC_TXSTART                           0x104
+#define RPMAC_TXLEGACYSIG                       0x108
+#define RPMAC_TXHTSIG1                          0x10c
+#define RPMAC_TXHTSIG2                          0x110
+#define RPMAC_PHYDEBUG                          0x114
+#define RPMAC_TXPACKETNUM                       0x118
+#define RPMAC_TXIDLE                            0x11c
+#define RPMAC_TXMACHEADER0                      0x120
+#define RPMAC_TXMACHEADER1                      0x124
+#define RPMAC_TXMACHEADER2                      0x128
+#define RPMAC_TXMACHEADER3                      0x12c
+#define RPMAC_TXMACHEADER4                      0x130
+#define RPMAC_TXMACHEADER5                      0x134
+#define RPMAC_TXDADATYPE                        0x138
+#define RPMAC_TXRANDOMSEED                      0x13c
+#define RPMAC_CCKPLCPPREAMBLE                   0x140
+#define RPMAC_CCKPLCPHEADER                     0x144
+#define RPMAC_CCKCRC16                          0x148
+#define RPMAC_OFDMRXCRC32OK                     0x170
+#define RPMAC_OFDMRXCRC32Er                     0x174
+#define RPMAC_OFDMRXPARITYER                    0x178
+#define RPMAC_OFDMRXCRC8ER                      0x17c
+#define RPMAC_CCKCRXRC16ER                      0x180
+#define RPMAC_CCKCRXRC32ER                      0x184
+#define RPMAC_CCKCRXRC32OK                      0x188
+#define RPMAC_TXSTATUS                          0x18c
+
+#define RFPGA0_RFMOD                            0x800
+
+#define RFPGA0_TXINFO                           0x804
+#define RFPGA0_PSDFUNCTION                      0x808
+
+#define RFPGA0_TXGAINSTAGE                      0x80c
+
+#define RFPGA0_RFTIMING1                        0x810
+#define RFPGA0_RFTIMING2                        0x814
+
+#define RFPGA0_XA_HSSIPARAMETER1                0x820
+#define RFPGA0_XA_HSSIPARAMETER2                0x824
+#define RFPGA0_XB_HSSIPARAMETER1                0x828
+#define RFPGA0_XB_HSSIPARAMETER2                0x82c
+
+#define RFPGA0_XA_LSSIPARAMETER                 0x840
+#define RFPGA0_XB_LSSIPARAMETER                 0x844
+
+#define RFPGA0_RFWAKEUPPARAMETER                0x850
+#define RFPGA0_RFSLEEPUPPARAMETER               0x854
+
+#define RFPGA0_XAB_SWITCHCONTROL                0x858
+#define RFPGA0_XCD_SWITCHCONTROL                0x85c
+
+#define RFPGA0_XA_RFINTERFACEOE                 0x860
+#define RFPGA0_XB_RFINTERFACEOE                 0x864
+
+#define RFPGA0_XAB_RFINTERFACESW                0x870
+#define RFPGA0_XCD_RFINTERFACESW                0x874
+
+#define rFPGA0_XAB_RFPARAMETER                  0x878
+#define rFPGA0_XCD_RFPARAMETER                  0x87c
+
+#define RFPGA0_ANALOGPARAMETER1                 0x880
+#define RFPGA0_ANALOGPARAMETER2                 0x884
+#define RFPGA0_ANALOGPARAMETER3                 0x888
+#define RFPGA0_ANALOGPARAMETER4                 0x88c
+
+#define RFPGA0_XA_LSSIREADBACK                  0x8a0
+#define RFPGA0_XB_LSSIREADBACK                  0x8a4
+#define RFPGA0_XC_LSSIREADBACK                  0x8a8
+#define RFPGA0_XD_LSSIREADBACK                  0x8ac
+
+#define RFPGA0_PSDREPORT                        0x8b4
+#define TRANSCEIVEA_HSPI_READBACK               0x8b8
+#define TRANSCEIVEB_HSPI_READBACK               0x8bc
+#define REG_SC_CNT                              0x8c4
+#define RFPGA0_XAB_RFINTERFACERB                0x8e0
+#define RFPGA0_XCD_RFINTERFACERB                0x8e4
+
+#define RFPGA1_RFMOD                            0x900
+
+#define RFPGA1_TXBLOCK                          0x904
+#define RFPGA1_DEBUGSELECT                      0x908
+#define RFPGA1_TXINFO                           0x90c
+
+#define RCCK0_SYSTEM                            0xa00
+
+#define RCCK0_AFESETTING                        0xa04
+#define RCCK0_CCA                               0xa08
+
+#define RCCK0_RXAGC1                            0xa0c
+#define RCCK0_RXAGC2                            0xa10
+
+#define RCCK0_RXHP                              0xa14
+
+#define RCCK0_DSPPARAMETER1                     0xa18
+#define RCCK0_DSPPARAMETER2                     0xa1c
+
+#define RCCK0_TXFILTER1                         0xa20
+#define RCCK0_TXFILTER2                         0xa24
+#define RCCK0_DEBUGPORT                         0xa28
+#define RCCK0_FALSEALARMREPORT                  0xa2c
+#define RCCK0_TRSSIREPORT                       0xa50
+#define RCCK0_RXREPORT                          0xa54
+#define RCCK0_FACOUNTERLOWER                    0xa5c
+#define RCCK0_FACOUNTERUPPER                    0xa58
+#define RCCK0_CCA_CNT                           0xa60
+
+
+/* PageB(0xB00) */
+#define RPDP_ANTA                               0xb00
+#define RPDP_ANTA_4                             0xb04
+#define RPDP_ANTA_8                             0xb08
+#define RPDP_ANTA_C                             0xb0c
+#define RPDP_ANTA_10                            0xb10
+#define RPDP_ANTA_14                            0xb14
+#define RPDP_ANTA_18                            0xb18
+#define RPDP_ANTA_1C                            0xb1c
+#define RPDP_ANTA_20                            0xb20
+#define RPDP_ANTA_24                            0xb24
+
+#define RCONFIG_PMPD_ANTA                       0xb28
+#define RCONFIG_RAM64X16                        0xb2c
+
+#define RBNDA                                   0xb30
+#define RHSSIPAR                                0xb34
+
+#define RCONFIG_ANTA                            0xb68
+#define RCONFIG_ANTB                            0xb6c
+
+#define RPDP_ANTB                               0xb70
+#define RPDP_ANTB_4                             0xb74
+#define RPDP_ANTB_8                             0xb78
+#define RPDP_ANTB_C                             0xb7c
+#define RPDP_ANTB_10                            0xb80
+#define RPDP_ANTB_14                            0xb84
+#define RPDP_ANTB_18                            0xb88
+#define RPDP_ANTB_1C                            0xb8c
+#define RPDP_ANTB_20                            0xb90
+#define RPDP_ANTB_24                            0xb94
+
+#define RCONFIG_PMPD_ANTB                       0xb98
+
+#define RBNDB                                   0xba0
+
+#define RAPK                                    0xbd8
+#define rPm_Rx0_AntA                            0xbdc
+#define rPm_Rx1_AntA                            0xbe0
+#define rPm_Rx2_AntA                            0xbe4
+#define rPm_Rx3_AntA                            0xbe8
+#define rPm_Rx0_AntB                            0xbec
+#define rPm_Rx1_AntB                            0xbf0
+#define rPm_Rx2_AntB                            0xbf4
+#define rPm_Rx3_AntB                            0xbf8
+
+/*Page C*/
+#define ROFDM0_LSTF                             0xc00
+
+#define ROFDM0_TRXPATHENABLE                    0xc04
+#define ROFDM0_TRMUXPAR                         0xc08
+#define ROFDM0_TRSWISOLATION                    0xc0c
+
+#define ROFDM0_XARXAFE                          0xc10
+#define ROFDM0_XARXIQIMBAL                      0xc14
+#define ROFDM0_XBRXAFE                          0xc18
+#define ROFDM0_XBRXIQIMBAL                      0xc1c
+#define ROFDM0_XCRXAFE                          0xc20
+#define ROFDM0_XCRXIQIMBAL                      0xc24
+#define ROFDM0_XDRXAFE                          0xc28
+#define ROFDM0_XDRXIQIMBAL                      0xc2c
+
+#define ROFDM0_RXDETECTOR1                      0xc30
+#define ROFDM0_RXDETECTOR2                      0xc34
+#define ROFDM0_RXDETECTOR3                      0xc38
+#define ROFDM0_RXDETECTOR4                      0xc3c
+
+#define ROFDM0_RXDSP                            0xc40
+#define ROFDM0_CFOANDDAGC                       0xc44
+#define ROFDM0_CCADROPTHRES                     0xc48
+#define ROFDM0_ECCATHRES                        0xc4c
+
+#define ROFDM0_XAAGCCORE1                       0xc50
+#define ROFDM0_XAAGCCORE2                       0xc54
+#define ROFDM0_XBAGCCORE1                       0xc58
+#define ROFDM0_XBAGCCORE2                       0xc5c
+#define ROFDM0_XCAGCCORE1                       0xc60
+#define ROFDM0_XCAGCCORE2                       0xc64
+#define ROFDM0_XDAGCCORE1                       0xc68
+#define ROFDM0_XDAGCCORE2                       0xc6c
+
+#define ROFDM0_AGCPARAMETER1                    0xc70
+#define ROFDM0_AGCPARAMETER2                    0xc74
+#define ROFDM0_AGCRSSITABLE                     0xc78
+#define ROFDM0_HTSTFAGC                         0xc7c
+
+#define ROFDM0_XATXIQIMBAL                      0xc80
+#define ROFDM0_XATXAFE                          0xc84
+#define ROFDM0_XBTXIQIMBAL                      0xc88
+#define ROFDM0_XBTXAFE                          0xc8c
+#define ROFDM0_XCTXIQIMBAL                      0xc90
+#define ROFDM0_XCTXAFE                          0xc94
+#define ROFDM0_XDTXIQIMBAL                      0xc98
+#define ROFDM0_XDTXAFE                          0xc9c
+
+#define ROFDM0_RXIQEXTANTA                      0xca0
+#define ROFDM0_TXCOEFF1                         0xca4
+#define ROFDM0_TXCOEFF2                         0xca8
+#define ROFDM0_TXCOEFF3                         0xcac
+#define ROFDM0_TXCOEFF4                         0xcb0
+#define ROFDM0_TXCOEFF5                         0xcb4
+#define ROFDM0_TXCOEFF6                         0xcb8
+
+#define ROFDM0_RXHPPARAMETER                    0xce0
+#define ROFDM0_TXPSEUDONOISEWGT                 0xce4
+#define ROFDM0_FRAMESYNC                        0xcf0
+#define ROFDM0_DFSREPORT                        0xcf4
+
+
+#define ROFDM1_LSTF                             0xd00
+#define ROFDM1_TRXPATHENABLE                    0xd04
+
+#define ROFDM1_CF0                              0xd08
+#define ROFDM1_CSI1                             0xd10
+#define ROFDM1_SBD                              0xd14
+#define ROFDM1_CSI2                             0xd18
+#define ROFDM1_CFOTRACKING                      0xd2c
+#define ROFDM1_TRXMESAURE1                      0xd34
+#define ROFDM1_INTFDET                          0xd3c
+#define ROFDM1_PSEUDONOISESTATEAB               0xd50
+#define ROFDM1_PSEUDONOISESTATECD               0xd54
+#define ROFDM1_RXPSEUDONOISEWGT                 0xd58
+
+#define ROFDM_PHYCOUNTER1                       0xda0
+#define ROFDM_PHYCOUNTER2                       0xda4
+#define ROFDM_PHYCOUNTER3                       0xda8
+
+#define ROFDM_SHORTCFOAB                        0xdac
+#define ROFDM_SHORTCFOCD                        0xdb0
+#define ROFDM_LONGCFOAB                         0xdb4
+#define ROFDM_LONGCFOCD                         0xdb8
+#define ROFDM_TAILCF0AB                         0xdbc
+#define ROFDM_TAILCF0CD                         0xdc0
+#define ROFDM_PWMEASURE1                        0xdc4
+#define ROFDM_PWMEASURE2                        0xdc8
+#define ROFDM_BWREPORT                          0xdcc
+#define ROFDM_AGCREPORT                         0xdd0
+#define ROFDM_RXSNR                             0xdd4
+#define ROFDM_RXEVMCSI                          0xdd8
+#define ROFDM_SIGREPORT                         0xddc
+
+#define RTXAGC_A_RATE18_06                      0xe00
+#define RTXAGC_A_RATE54_24                      0xe04
+#define RTXAGC_A_CCK1_MCS32                     0xe08
+#define RTXAGC_A_MCS03_MCS00                    0xe10
+#define RTXAGC_A_MCS07_MCS04                    0xe14
+#define RTXAGC_A_MCS11_MCS08                    0xe18
+#define RTXAGC_A_MCS15_MCS12                    0xe1c
+
+#define RTXAGC_B_RATE18_06                      0x830
+#define RTXAGC_B_RATE54_24                      0x834
+#define RTXAGC_B_CCK1_55_MCS32                  0x838
+#define RTXAGC_B_MCS03_MCS00                    0x83c
+#define RTXAGC_B_MCS07_MCS04                    0x848
+#define RTXAGC_B_MCS11_MCS08                    0x84c
+#define RTXAGC_B_MCS15_MCS12                    0x868
+#define RTXAGC_B_CCK11_A_CCK2_11                0x86c
+
+#define RFPGA0_IQK                              0xe28
+#define RTX_IQK_TONE_A                          0xe30
+#define RRX_IQK_TONE_A                          0xe34
+#define RTX_IQK_PI_A                            0xe38
+#define RRX_IQK_PI_A                            0xe3c
+
+#define RTX_IQK                                 0xe40
+#define RRX_IQK                                 0xe44
+#define RIQK_AGC_PTS                            0xe48
+#define RIQK_AGC_RSP                            0xe4c
+#define RTX_IQK_TONE_B                          0xe50
+#define RRX_IQK_TONE_B                          0xe54
+#define RTX_IQK_PI_B                            0xe58
+#define RRX_IQK_PI_B                            0xe5c
+#define RIQK_AGC_CONT                           0xe60
+
+#define RBLUE_TOOTH                             0xe6c
+#define RRX_WAIT_CCA                            0xe70
+#define RTX_CCK_RFON                            0xe74
+#define RTX_CCK_BBON                            0xe78
+#define RTX_OFDM_RFON                           0xe7c
+#define RTX_OFDM_BBON                           0xe80
+#define RTX_TO_RX                               0xe84
+#define RTX_TO_TX                               0xe88
+#define RRX_CCK                                 0xe8c
+
+#define RTX_POWER_BEFORE_IQK_A                  0xe94
+#define RTX_POWER_AFTER_IQK_A                   0xe9c
+
+#define RRX_POWER_BEFORE_IQK_A                  0xea0
+#define RRX_POWER_BEFORE_IQK_A_2                0xea4
+#define RRX_POWER_AFTER_IQK_A                   0xea8
+#define RRX_POWER_AFTER_IQK_A_2                 0xeac
+
+#define RTX_POWER_BEFORE_IQK_B                  0xeb4
+#define RTX_POWER_AFTER_IQK_B                   0xebc
+
+#define RRX_POWER_BEFORE_IQK_B                  0xec0
+#define RRX_POWER_BEFORE_IQK_B_2                0xec4
+#define RRX_POWER_AFTER_IQK_B                   0xec8
+#define RRX_POWER_AFTER_IQK_B_2                 0xecc
+
+#define RRX_OFDM                                0xed0
+#define RRX_WAIT_RIFS                           0xed4
+#define RRX_TO_RX                               0xed8
+#define RSTANDBY                                0xedc
+#define RSLEEP                                  0xee0
+#define RPMPD_ANAEN                             0xeec
+
+#define RZEBRA1_HSSIENABLE                      0x0
+#define RZEBRA1_TRXENABLE1                      0x1
+#define RZEBRA1_TRXENABLE2                      0x2
+#define RZEBRA1_AGC                             0x4
+#define RZEBRA1_CHARGEPUMP                      0x5
+#define RZEBRA1_CHANNEL                         0x7
+
+#define RZEBRA1_TXGAIN                          0x8
+#define RZEBRA1_TXLPF                           0x9
+#define RZEBRA1_RXLPF                           0xb
+#define RZEBRA1_RXHPFCORNER                     0xc
+
+#define RGLOBALCTRL                             0
+#define RRTL8256_TXLPF                          19
+#define RRTL8256_RXLPF                          11
+#define RRTL8258_TXLPF                          0x11
+#define RRTL8258_RXLPF                          0x13
+#define RRTL8258_RSSILPF                        0xa
+
+#define RF_AC                                   0x00
+
+#define RF_IQADJ_G1                             0x01
+#define RF_IQADJ_G2                             0x02
+#define RF_POW_TRSW                             0x05
+
+#define RF_GAIN_RX                              0x06
+#define RF_GAIN_TX                              0x07
+
+#define RF_TXM_IDAC                             0x08
+#define RF_BS_IQGEN                             0x0F
+
+#define RF_MODE1                                0x10
+#define RF_MODE2                                0x11
+
+#define RF_RX_AGC_HP                            0x12
+#define RF_TX_AGC                               0x13
+#define RF_BIAS                                 0x14
+#define RF_IPA                                  0x15
+#define RF_POW_ABILITY                          0x17
+#define RF_MODE_AG                              0x18
+#define RRFCHANNEL                              0x18
+#define RF_CHNLBW                               0x18
+#define RF_TOP                                  0x19
+
+#define RF_RX_G1                                0x1A
+#define RF_RX_G2                                0x1B
+
+#define RF_RX_BB2                               0x1C
+#define RF_RX_BB1                               0x1D
+
+#define RF_RCK1                                 0x1E
+#define RF_RCK2                                 0x1F
+
+#define RF_TX_G1                                0x20
+#define RF_TX_G2                                0x21
+#define RF_TX_G3                                0x22
+
+#define RF_TX_BB1                               0x23
+#define RF_T_METER                              0x42
+
+#define RF_SYN_G1                               0x25
+#define RF_SYN_G2                               0x26
+#define RF_SYN_G3                               0x27
+#define RF_SYN_G4                               0x28
+#define RF_SYN_G5                               0x29
+#define RF_SYN_G6                               0x2A
+#define RF_SYN_G7                               0x2B
+#define RF_SYN_G8                               0x2C
+
+#define RF_RCK_OS                               0x30
+#define RF_TXPA_G1                              0x31
+#define RF_TXPA_G2                              0x32
+#define RF_TXPA_G3                              0x33
+
+#define RF_TX_BIAS_A                            0x35
+#define RF_TX_BIAS_D                            0x36
+#define RF_LOBF_9                               0x38
+#define RF_RXRF_A3                              0x3C
+#define RF_TRSW                                 0x3F
+
+#define RF_TXRF_A2                              0x41
+#define RF_TXPA_G4                              0x46
+#define RF_TXPA_A4                              0x4B
+
+#define RF_WE_LUT                               0xEF
+
+#define BBBRESETB                               0x100
+#define BGLOBALRESETB                           0x200
+#define BOFDMTXSTART                            0x4
+#define BCCKTXSTART                             0x8
+#define BCRC32DEBUG                             0x100
+#define BPMACLOOPBACK                           0x10
+#define BTXLSIG                                 0xffffff
+#define BOFDMTXRATE                             0xf
+#define BOFDMTXRESERVED                         0x10
+#define BOFDMTXLENGTH                           0x1ffe0
+#define BOFDMTXPARITY                           0x20000
+#define BTXHTSIG1                               0xffffff
+#define BTXHTMCSRATE                            0x7f
+#define BTXHTBW                                 0x80
+#define BTXHTLENGTH                             0xffff00
+#define BTXHTSIG2                               0xffffff
+#define BTXHTSMOOTHING                          0x1
+#define BTXHTSOUNDING                           0x2
+#define BTXHTRESERVED                           0x4
+#define BTXHTAGGREATION                         0x8
+#define BTXHTSTBC                               0x30
+#define BTXHTADVANCECODING                      0x40
+#define BTXHTSHORTGI                            0x80
+#define BTXHTNUMBERHT_LTF                       0x300
+#define BTXHTCRC8                               0x3fc00
+#define BCOUNTERRESET                           0x10000
+#define BNUMOFOFDMTX                            0xffff
+#define BNUMOFCCKTX                             0xffff0000
+#define BTXIDLEINTERVAL                         0xffff
+#define BOFDMSERVICE                            0xffff0000
+#define BTXMACHEADER                            0xffffffff
+#define BTXDATAINIT                             0xff
+#define BTXHTMODE                               0x100
+#define BTXDATATYPE                             0x30000
+#define BTXRANDOMSEED                           0xffffffff
+#define BCCKTXPREAMBLE                          0x1
+#define BCCKTXSFD                               0xffff0000
+#define BCCKTXSIG                               0xff
+#define BCCKTXSERVICE                           0xff00
+#define BCCKLENGTHEXT                           0x8000
+#define BCCKTXLENGHT                            0xffff0000
+#define BCCKTXCRC16                             0xffff
+#define BCCKTXSTATUS                            0x1
+#define BOFDMTXSTATUS                           0x2
+#define IS_BB_REG_OFFSET_92S(_offset)   \
+        ((_offset >= 0x800) && (_offset <= 0xfff))
+
+#define BRFMOD                                  0x1
+#define BJAPANMODE                              0x2
+#define BCCKTXSC                                0x30
+#define BCCKEN                                  0x1000000
+#define BOFDMEN                                 0x2000000
+
+#define BOFDMRXADCPHASE                         0x10000
+#define BOFDMTXDACPHASE                         0x40000
+#define BXATXAGC                                0x3f
+
+#define BXBTXAGC                                0xf00
+#define BXCTXAGC                                0xf000
+#define BXDTXAGC                                0xf0000
+
+#define BPASTART                                0xf0000000
+#define BTRSTART                                0x00f00000
+#define BRFSTART                                0x0000f000
+#define BBBSTART                                0x000000f0
+#define BBBCCKSTART                             0x0000000f
+#define BPAEND                                  0xf
+#define BTREND                                  0x0f000000
+#define BRFEND                                  0x000f0000
+#define BCCAMASK                                0x000000f0
+#define BR2RCCAMASK                             0x00000f00
+#define BHSSI_R2TDELAY                          0xf8000000
+#define BHSSI_T2RDELAY                          0xf80000
+#define BCONTXHSSI                              0x400
+#define BIGFROMCCK                              0x200
+#define BAGCADDRESS                             0x3f
+#define BRXHPTX                                 0x7000
+#define BRXHP2RX                                0x38000
+#define BRXHPCCKINI                             0xc0000
+#define BAGCTXCODE                              0xc00000
+#define BAGCRXCODE                              0x300000
+
+#define B3WIREDATALENGTH                        0x800
+#define B3WIREADDREAALENGTH                     0x400
+
+#define B3WIRERFPOWERDOWN                       0x1
+#define B5GPAPEPOLARITY                         0x40000000
+#define B2GPAPEPOLARITY                         0x80000000
+#define BRFSW_TXDEFAULTANT                      0x3
+#define BRFSW_TXOPTIONANT                       0x30
+#define BRFSW_RXDEFAULTANT                      0x300
+#define BRFSW_RXOPTIONANT                       0x3000
+#define BRFSI_3WIREDATA                         0x1
+#define BRFSI_3WIRECLOCK                        0x2
+#define BRFSI_3WIRELOAD                         0x4
+#define BRFSI_3WIRERW                           0x8
+#define BRFSI_3WIRE                             0xf
+
+#define BRFSI_RFENV                             0x10
+
+#define BRFSI_TRSW                              0x20
+#define BRFSI_TRSWB                             0x40
+#define BRFSI_ANTSW                             0x100
+#define BRFSI_ANTSWB                            0x200
+#define BRFSI_PAPE                              0x400
+#define BRFSI_PAPE5G                            0x800
+#define BBANDSELECT                             0x1
+#define BHTSIG2_GI                              0x80
+#define BHTSIG2_SMOOTHING                       0x01
+#define BHTSIG2_SOUNDING                        0x02
+#define BHTSIG2_AGGREATON                       0x08
+#define BHTSIG2_STBC                            0x30
+#define BHTSIG2_ADVCODING                       0x40
+#define BHTSIG2_NUMOFHTLTF                      0x300
+#define BHTSIG2_CRC8                            0x3fc
+#define BHTSIG1_MCS                             0x7f
+#define BHTSIG1_BANDWIDTH                       0x80
+#define BHTSIG1_HTLENGTH                        0xffff
+#define BLSIG_RATE                              0xf
+#define BLSIG_RESERVED                          0x10
+#define BLSIG_LENGTH                            0x1fffe
+#define BLSIG_PARITY                            0x20
+#define BCCKRXPHASE                             0x4
+
+#define BLSSIREADADDRESS                        0x7f800000
+#define BLSSIREADEDGE                           0x80000000
+
+#define BLSSIREADBACKDATA                       0xfffff
+
+#define BLSSIREADOKFLAG                         0x1000
+#define BCCKSAMPLERATE                          0x8
+#define BREGULATOR0STANDBY                      0x1
+#define BREGULATORPLLSTANDBY                    0x2
+#define BREGULATOR1STANDBY                      0x4
+#define BPLLPOWERUP                             0x8
+#define BDPLLPOWERUP                            0x10
+#define BDA10POWERUP                            0x20
+#define BAD7POWERUP                             0x200
+#define BDA6POWERUP                             0x2000
+#define BXTALPOWERUP                            0x4000
+#define B40MDCLKPOWERUP                         0x8000
+#define BDA6DEBUGMODE                           0x20000
+#define BDA6SWING                               0x380000
+
+#define BADCLKPHASE                             0x4000000
+#define B80MCLKDELAY                            0x18000000
+#define BAFEWATCHDOGENABLE                      0x20000000
+
+#define BXTALCAP01                              0xc0000000
+#define BXTALCAP23                              0x3
+#define BXTALCAP92X                             0x0f000000
+#define BXTALCAP                                0x0f000000
+
+#define BINTDIFCLKENABLE                        0x400
+#define BEXTSIGCLKENABLE                        0x800
+#define BBANDGAP_MBIAS_POWERUP                  0x10000
+#define BAD11SH_GAIN                            0xc0000
+#define BAD11NPUT_RANGE                         0x700000
+#define BAD110P_CURRENT                         0x3800000
+#define BLPATH_LOOPBACK                         0x4000000
+#define BQPATH_LOOPBACK                         0x8000000
+#define BAFE_LOOPBACK                           0x10000000
+#define BDA10_SWING                             0x7e0
+#define BDA10_REVERSE                           0x800
+#define BDA_CLK_SOURCE                          0x1000
+#define BDA7INPUT_RANGE                         0x6000
+#define BDA7_GAIN                               0x38000
+#define BDA7OUTPUT_CM_MODE                      0x40000
+#define BDA7INPUT_CM_MODE                       0x380000
+#define BDA7CURRENT                             0xc00000
+#define BREGULATOR_ADJUST                       0x7000000
+#define BAD11POWERUP_ATTX                       0x1
+#define BDA10PS_ATTX                            0x10
+#define BAD11POWERUP_ATRX                       0x100
+#define BDA10PS_ATRX                            0x1000
+#define BCCKRX_AGC_FORMAT                       0x200
+#define BPSDFFT_SAMPLE_POINT                    0xc000
+#define BPSD_AVERAGE_NUM                        0x3000
+#define BIQPATH_CONTROL                         0xc00
+#define BPSD_FREQ                               0x3ff
+#define BPSD_ANTENNA_PATH                       0x30
+#define BPSD_IQ_SWITCH                          0x40
+#define BPSD_RX_TRIGGER                         0x400000
+#define BPSD_TX_TRIGGERCW                       0x80000000
+#define BPSD_SINE_TONE_SCALE                    0x7f000000
+#define BPSD_REPORT                             0xffff
+
+#define BOFDM_TXSC                              0x30000000
+#define BCCK_TXON                               0x1
+#define BOFDM_TXON                              0x2
+#define BDEBUG_PAGE                             0xfff
+#define BDEBUG_ITEM                             0xff
+#define BANTL                                   0x10
+#define BANT_NONHT                              0x100
+#define BANT_HT1                                0x1000
+#define BANT_HT2                                0x10000
+#define BANT_HT1S1                              0x100000
+#define BANT_NONHTS1                            0x1000000
+
+#define BCCK_BBMODE                             0x3
+#define BCCK_TXPOWERSAVING                      0x80
+#define BCCK_RXPOWERSAVING                      0x40
+
+#define BCCK_SIDEBAND                           0x10
+
+#define BCCK_SCRAMBLE                           0x8
+#define BCCK_ANTDIVERSITY                       0x8000
+#define BCCK_CARRIER_RECOVERY                   0x4000
+#define BCCK_TXRATE                             0x3000
+#define BCCK_DCCANCEL                           0x0800
+#define BCCK_ISICANCEL                          0x0400
+#define BCCK_MATCH_FILTER                       0x0200
+#define BCCK_EQUALIZER                          0x0100
+#define BCCK_PREAMBLE_DETECT                    0x800000
+#define BCCK_FAST_FALSECCA                      0x400000
+#define BCCK_CH_ESTSTART                        0x300000
+#define BCCK_CCA_COUNT                          0x080000
+#define BCCK_CS_LIM                             0x070000
+#define BCCK_BIST_MODE                          0x80000000
+#define BCCK_CCAMASK                            0x40000000
+#define BCCK_TX_DAC_PHASE                       0x4
+#define BCCK_RX_ADC_PHASE                       0x20000000
+#define BCCKR_CP_MODE                           0x0100
+#define BCCK_TXDC_OFFSET                        0xf0
+#define BCCK_RXDC_OFFSET                        0xf
+#define BCCK_CCA_MODE                           0xc000
+#define BCCK_FALSECS_LIM                        0x3f00
+#define BCCK_CS_RATIO                           0xc00000
+#define BCCK_CORGBIT_SEL                        0x300000
+#define BCCK_PD_LIM                             0x0f0000
+#define BCCK_NEWCCA                             0x80000000
+#define BCCK_RXHP_OF_IG                         0x8000
+#define BCCK_RXIG                               0x7f00
+#define BCCK_LNA_POLARITY                       0x800000
+#define BCCK_RX1ST_BAIN                         0x7f0000
+#define BCCK_RF_EXTEND                          0x20000000
+#define BCCK_RXAGC_SATLEVEL                     0x1f000000
+#define BCCK_RXAGC_SATCOUNT                     0xe0
+#define BCCKRXRFSETTLE                          0x1f
+#define BCCK_FIXED_RXAGC                        0x8000
+#define BCCK_ANTENNA_POLARITY                   0x2000
+#define BCCK_TXFILTER_TYPE                      0x0c00
+#define BCCK_RXAGC_REPORTTYPE                   0x0300
+#define BCCK_RXDAGC_EN                          0x80000000
+#define BCCK_RXDAGC_PERIOD                      0x20000000
+#define BCCK_RXDAGC_SATLEVEL                    0x1f000000
+#define BCCK_TIMING_RECOVERY                    0x800000
+#define BCCK_TXC0                               0x3f0000
+#define BCCK_TXC1                               0x3f000000
+#define BCCK_TXC2                               0x3f
+#define BCCK_TXC3                               0x3f00
+#define BCCK_TXC4                               0x3f0000
+#define BCCK_TXC5                               0x3f000000
+#define BCCK_TXC6                               0x3f
+#define BCCK_TXC7                               0x3f00
+#define BCCK_DEBUGPORT                          0xff0000
+#define BCCK_DAC_DEBUG                          0x0f000000
+#define BCCK_FALSEALARM_ENABLE                  0x8000
+#define BCCK_FALSEALARM_READ                    0x4000
+#define BCCK_TRSSI                              0x7f
+#define BCCK_RXAGC_REPORT                       0xfe
+#define BCCK_RXREPORT_ANTSEL                    0x80000000
+#define BCCK_RXREPORT_MFOFF                     0x40000000
+#define BCCK_RXREPORT_SQLOSS                    0x20000000
+#define BCCK_RXREPORT_PKTLOSS                   0x10000000
+#define BCCK_RXREPORT_LOCKEDBIT                 0x08000000
+#define BCCK_RXREPORT_RATEERROR                 0x04000000
+#define BCCK_RXREPORT_RXRATE                    0x03000000
+#define BCCK_RXFA_COUNTER_LOWER                 0xff
+#define BCCK_RXFA_COUNTER_UPPER                 0xff000000
+#define BCCK_RXHPAGC_START                      0xe000
+#define BCCK_RXHPAGC_FINAL                      0x1c00
+#define BCCK_RXFALSEALARM_ENABLE                0x8000
+#define BCCK_FACOUNTER_FREEZE                   0x4000
+#define BCCK_TXPATH_SEL                         0x10000000
+#define BCCK_DEFAULT_RXPATH                     0xc000000
+#define BCCK_OPTION_RXPATH                      0x3000000
+
+#define BNUM_OFSTF                              0x3
+#define BSHIFT_L                                0xc0
+#define BGI_TH                                  0xc
+#define BRXPATH_A                               0x1
+#define BRXPATH_B                               0x2
+#define BRXPATH_C                               0x4
+#define BRXPATH_D                               0x8
+#define BTXPATH_A                               0x1
+#define BTXPATH_B                               0x2
+#define BTXPATH_C                               0x4
+#define BTXPATH_D                               0x8
+#define BTRSSI_FREQ                             0x200
+#define BADC_BACKOFF                            0x3000
+#define BDFIR_BACKOFF                           0xc000
+#define BTRSSI_LATCH_PHASE                      0x10000
+#define BRX_LDC_OFFSET                          0xff
+#define BRX_QDC_OFFSET                          0xff00
+#define BRX_DFIR_MODE                           0x1800000
+#define BRX_DCNF_TYPE                           0xe000000
+#define BRXIQIMB_A                              0x3ff
+#define BRXIQIMB_B                              0xfc00
+#define BRXIQIMB_C                              0x3f0000
+#define BRXIQIMB_D                              0xffc00000
+#define BDC_DC_NOTCH                            0x60000
+#define BRXNB_NOTCH                             0x1f000000
+#define BPD_TH                                  0xf
+#define BPD_TH_OPT2                             0xc000
+#define BPWED_TH                                0x700
+#define BIFMF_WIN_L                             0x800
+#define BPD_OPTION                              0x1000
+#define BMF_WIN_L                               0xe000
+#define BBW_SEARCH_L                            0x30000
+#define BWIN_ENH_L                              0xc0000
+#define BBW_TH                                  0x700000
+#define BED_TH2                                 0x3800000
+#define BBW_OPTION                              0x4000000
+#define BRADIO_TH                               0x18000000
+#define BWINDOW_L                               0xe0000000
+#define BSBD_OPTION                             0x1
+#define BFRAME_TH                               0x1c
+#define BFS_OPTION                              0x60
+#define BDC_SLOPE_CHECK                         0x80
+#define BFGUARD_COUNTER_DC_L                    0xe00
+#define BFRAME_WEIGHT_SHORT                     0x7000
+#define BSUB_TUNE                               0xe00000
+#define BFRAME_DC_LENGTH                        0xe000000
+#define BSBD_START_OFFSET                       0x30000000
+#define BFRAME_TH_2                             0x7
+#define BFRAME_GI2_TH                           0x38
+#define BGI2_SYNC_EN                            0x40
+#define BSARCH_SHORT_EARLY                      0x300
+#define BSARCH_SHORT_LATE                       0xc00
+#define BSARCH_GI2_LATE                         0x70000
+#define BCFOANTSUM                              0x1
+#define BCFOACC                                 0x2
+#define BCFOSTARTOFFSET                         0xc
+#define BCFOLOOPBACK                            0x70
+#define BCFOSUMWEIGHT                           0x80
+#define BDAGCENABLE                             0x10000
+#define BTXIQIMB_A                              0x3ff
+#define BTXIQIMB_B                              0xfc00
+#define BTXIQIMB_C                              0x3f0000
+#define BTXIQIMB_D                              0xffc00000
+#define BTXIDCOFFSET                            0xff
+#define BTXIQDCOFFSET                           0xff00
+#define BTXDFIRMODE                             0x10000
+#define BTXPESUDO_NOISEON                       0x4000000
+#define BTXPESUDO_NOISE_A                       0xff
+#define BTXPESUDO_NOISE_B                       0xff00
+#define BTXPESUDO_NOISE_C                       0xff0000
+#define BTXPESUDO_NOISE_D                       0xff000000
+#define BCCA_DROPOPTION                         0x20000
+#define BCCA_DROPTHRES                          0xfff00000
+#define BEDCCA_H                                0xf
+#define BEDCCA_L                                0xf0
+#define BLAMBDA_ED                              0x300
+#define BRX_INITIALGAIN                         0x7f
+#define BRX_ANTDIV_EN                           0x80
+#define BRX_AGC_ADDRESS_FOR_LNA                 0x7f00
+#define BRX_HIGHPOWER_FLOW                      0x8000
+#define BRX_AGC_FREEZE_THRES                    0xc0000
+#define BRX_FREEZESTEP_AGC1                     0x300000
+#define BRX_FREEZESTEP_AGC2                     0xc00000
+#define BRX_FREEZESTEP_AGC3                     0x3000000
+#define BRX_FREEZESTEP_AGC0                     0xc000000
+#define BRXRSSI_CMP_EN                          0x10000000
+#define BRXQUICK_AGCEN                          0x20000000
+#define BRXAGC_FREEZE_THRES_MODE                0x40000000
+#define BRX_OVERFLOW_CHECKTYPE                  0x80000000
+#define BRX_AGCSHIFT                            0x7f
+#define BTRSW_TRI_ONLY                          0x80
+#define BPOWER_THRES                            0x300
+#define BRXAGC_EN                               0x1
+#define BRXAGC_TOGETHER_EN                      0x2
+#define BRXAGC_MIN                              0x4
+#define BRXHP_INI                               0x7
+#define BRXHP_TRLNA                             0x70
+#define BRXHP_RSSI                              0x700
+#define BRXHP_BBP1                              0x7000
+#define BRXHP_BBP2                              0x70000
+#define BRXHP_BBP3                              0x700000
+#define BRSSI_H                                 0x7f0000
+#define BRSSI_GEN                               0x7f000000
+#define BRXSETTLE_TRSW                          0x7
+#define BRXSETTLE_LNA                           0x38
+#define BRXSETTLE_RSSI                          0x1c0
+#define BRXSETTLE_BBP                           0xe00
+#define BRXSETTLE_RXHP                          0x7000
+#define BRXSETTLE_ANTSW_RSSI                    0x38000
+#define BRXSETTLE_ANTSW                         0xc0000
+#define BRXPROCESS_TIME_DAGC                    0x300000
+#define BRXSETTLE_HSSI                          0x400000
+#define BRXPROCESS_TIME_BBPPW                   0x800000
+#define BRXANTENNA_POWER_SHIFT                  0x3000000
+#define BRSSI_TABLE_SELECT                      0xc000000
+#define BRXHP_FINAL                             0x7000000
+#define BRXHPSETTLE_BBP                         0x7
+#define BRXHTSETTLE_HSSI                        0x8
+#define BRXHTSETTLE_RXHP                        0x70
+#define BRXHTSETTLE_BBPPW                       0x80
+#define BRXHTSETTLE_IDLE                        0x300
+#define BRXHTSETTLE_RESERVED                    0x1c00
+#define BRXHT_RXHP_EN                           0x8000
+#define BRXAGC_FREEZE_THRES                     0x30000
+#define BRXAGC_TOGETHEREN                       0x40000
+#define BRXHTAGC_MIN                            0x80000
+#define BRXHTAGC_EN                             0x100000
+#define BRXHTDAGC_EN                            0x200000
+#define BRXHT_RXHP_BBP                          0x1c00000
+#define BRXHT_RXHP_FINAL                        0xe0000000
+#define BRXPW_RADIO_TH                          0x3
+#define BRXPW_RADIO_EN                          0x4
+#define BRXMF_HOLD                              0x3800
+#define BRXPD_DELAY_TH1                         0x38
+#define BRXPD_DELAY_TH2                         0x1c0
+#define BRXPD_DC_COUNT_MAX                      0x600
+#define BRXPD_DELAY_TH                          0x8000
+#define BRXPROCESS_DELAY                        0xf0000
+#define BRXSEARCHRANGE_GI2_EARLY                0x700000
+#define BRXFRAME_FUARD_COUNTER_L                0x3800000
+#define BRXSGI_GUARD_L                          0xc000000
+#define BRXSGI_SEARCH_L                         0x30000000
+#define BRXSGI_TH                               0xc0000000
+#define BDFSCNT0                                0xff
+#define BDFSCNT1                                0xff00
+#define BDFSFLAG                                0xf0000
+#define BMF_WEIGHT_SUM                          0x300000
+#define BMINIDX_TH                              0x7f000000
+#define BDAFORMAT                               0x40000
+#define BTXCH_EMU_ENABLE                        0x01000000
+#define BTRSW_ISOLATION_A                       0x7f
+#define BTRSW_ISOLATION_B                       0x7f00
+#define BTRSW_ISOLATION_C                       0x7f0000
+#define BTRSW_ISOLATION_D                       0x7f000000
+#define BEXT_LNA_GAIN                           0x7c00
+
+#define BSTBC_EN                                0x4
+#define BANTENNA_MAPPING                        0x10
+#define BNSS                                    0x20
+#define BCFO_ANTSUM_ID                          0x200
+#define BPHY_COUNTER_RESET                      0x8000000
+#define BCFO_REPORT_GET                         0x4000000
+#define BOFDM_CONTINUE_TX                       0x10000000
+#define BOFDM_SINGLE_CARRIER                    0x20000000
+#define BOFDM_SINGLE_TONE                       0x40000000
+#define BHT_DETECT                              0x100
+#define BCFOEN                                  0x10000
+#define BCFOVALUE                               0xfff00000
+#define BSIGTONE_RE                             0x3f
+#define BSIGTONE_IM                             0x7f00
+#define BCOUNTER_CCA                            0xffff
+#define BCOUNTER_PARITYFAIL                     0xffff0000
+#define BCOUNTER_RATEILLEGAL                    0xffff
+#define BCOUNTER_CRC8FAIL                       0xffff0000
+#define BCOUNTER_MCSNOSUPPORT                   0xffff
+#define BCOUNTER_FASTSYNC                       0xffff
+#define BSHORTCFO                               0xfff
+#define BSHORTCFOT_LENGTH                       12
+#define BSHORTCFOF_LENGTH                       11
+#define BLONGCFO                                0x7ff
+#define BLONGCFOT_LENGTH                        11
+#define BLONGCFOF_LENGTH                        11
+#define BTAILCFO                                0x1fff
+#define BTAILCFOT_LENGTH                        13
+#define BTAILCFOF_LENGTH                        12
+#define BNOISE_EN_PWDB                          0xffff
+#define BCC_POWER_DB                            0xffff0000
+#define BMOISE_PWDB                             0xffff
+#define BPOWERMEAST_LENGTH                      10
+#define BPOWERMEASF_LENGTH                      3
+#define BRX_HT_BW                               0x1
+#define BRXSC                                   0x6
+#define BRX_HT                                  0x8
+#define BNB_INTF_DET_ON                         0x1
+#define BINTF_WIN_LEN_CFG                       0x30
+#define BNB_INTF_TH_CFG                         0x1c0
+#define BRFGAIN                                 0x3f
+#define BTABLESEL                               0x40
+#define BTRSW                                   0x80
+#define BRXSNR_A                                0xff
+#define BRXSNR_B                                0xff00
+#define BRXSNR_C                                0xff0000
+#define BRXSNR_D                                0xff000000
+#define BSNR_EVMT_LENGTH                        8
+#define BSNR_EVMF_LENGTH                        1
+#define BCSI1ST                                 0xff
+#define BCSI2ND                                 0xff00
+#define BRXEVM1ST                               0xff0000
+#define BRXEVM2ND                               0xff000000
+#define BSIGEVM                                 0xff
+#define BPWDB                                   0xff00
+#define BSGIEN                                  0x10000
+
+#define BSFACTOR_QMA1                           0xf
+#define BSFACTOR_QMA2                           0xf0
+#define BSFACTOR_QMA3                           0xf00
+#define BSFACTOR_QMA4                           0xf000
+#define BSFACTOR_QMA5                           0xf0000
+#define BSFACTOR_QMA6                           0xf0000
+#define BSFACTOR_QMA7                           0xf00000
+#define BSFACTOR_QMA8                           0xf000000
+#define BSFACTOR_QMA9                           0xf0000000
+#define BCSI_SCHEME                             0x100000
+
+#define BNOISE_LVL_TOP_SET                      0x3
+#define BCHSMOOTH                               0x4
+#define BCHSMOOTH_CFG1                          0x38
+#define BCHSMOOTH_CFG2                          0x1c0
+#define BCHSMOOTH_CFG3                          0xe00
+#define BCHSMOOTH_CFG4                          0x7000
+#define BMRCMODE                                0x800000
+#define BTHEVMCFG                               0x7000000
+
+#define BLOOP_FIT_TYPE                          0x1
+#define BUPD_CFO                                0x40
+#define BUPD_CFO_OFFDATA                        0x80
+#define BADV_UPD_CFO                            0x100
+#define BADV_TIME_CTRL                          0x800
+#define BUPD_CLKO                               0x1000
+#define BFC                                     0x6000
+#define BTRACKING_MODE                          0x8000
+#define BPHCMP_ENABLE                           0x10000
+#define BUPD_CLKO_LTF                           0x20000
+#define BCOM_CH_CFO                             0x40000
+#define BCSI_ESTI_MODE                          0x80000
+#define BADV_UPD_EQZ                            0x100000
+#define BUCHCFG                                 0x7000000
+#define BUPDEQZ                                 0x8000000
+
+#define BRX_PESUDO_NOISE_ON                     0x20000000
+#define BRX_PESUDO_NOISE_A                      0xff
+#define BRX_PESUDO_NOISE_B                      0xff00
+#define BRX_PESUDO_NOISE_C                      0xff0000
+#define BRX_PESUDO_NOISE_D                      0xff000000
+#define BRX_PESUDO_NOISESTATE_A                 0xffff
+#define BRX_PESUDO_NOISESTATE_B                 0xffff0000
+#define BRX_PESUDO_NOISESTATE_C                 0xffff
+#define BRX_PESUDO_NOISESTATE_D                 0xffff0000
+
+#define BZEBRA1_HSSIENABLE                      0x8
+#define BZEBRA1_TRXCONTROL                      0xc00
+#define BZEBRA1_TRXGAINSETTING                  0x07f
+#define BZEBRA1_RXCOUNTER                       0xc00
+#define BZEBRA1_TXCHANGEPUMP                    0x38
+#define BZEBRA1_RXCHANGEPUMP                    0x7
+#define BZEBRA1_CHANNEL_NUM                     0xf80
+#define BZEBRA1_TXLPFBW                         0x400
+#define BZEBRA1_RXLPFBW                         0x600
+
+#define BRTL8256REG_MODE_CTRL1                  0x100
+#define BRTL8256REG_MODE_CTRL0                  0x40
+#define BRTL8256REG_TXLPFBW                     0x18
+#define BRTL8256REG_RXLPFBW                     0x600
+
+#define BRTL8258_TXLPFBW                        0xc
+#define BRTL8258_RXLPFBW                        0xc00
+#define BRTL8258_RSSILPFBW                      0xc0
+
+#define BBYTE0                                  0x1
+#define BBYTE1                                  0x2
+#define BBYTE2                                  0x4
+#define BBYTE3                                  0x8
+#define BWORD0                                  0x3
+#define BWORD1                                  0xc
+#define BWORD                                   0xf
+
+#define MASKBYTE0                               0xff
+#define MASKBYTE1                               0xff00
+#define MASKBYTE2                               0xff0000
+#define MASKBYTE3                               0xff000000
+#define MASKHWORD                               0xffff0000
+#define MASKLWORD                               0x0000ffff
+#define MASKDWORD                               0xffffffff
+#define MASK12BITS                              0xfff
+#define MASKH4BITS                              0xf0000000
+#define MASKOFDM_D                              0xffc00000
+#define MASKCCK                                 0x3f3f3f3f
+
+#define MASK4BITS                               0x0f
+#define MASK20BITS                              0xfffff
+#define RFREG_OFFSET_MASK                       0xfffff
+
+#define BENABLE                                 0x1
+#define BDISABLE                                0x0
+
+#define LEFT_ANTENNA                            0x0
+#define RIGHT_ANTENNA                           0x1
+
+#define TCHECK_TXSTATUS                         500
+#define TUPDATE_RXCOUNTER                       100
+
+#define REG_UN_USED_REGISTER                    0x01bf
+
+/* WOL bit information */
+#define HAL92C_WOL_PTK_UPDATE_EVENT             BIT(0)
+#define HAL92C_WOL_GTK_UPDATE_EVENT             BIT(1)
+#define HAL92C_WOL_DISASSOC_EVENT               BIT(2)
+#define HAL92C_WOL_DEAUTH_EVENT                 BIT(3)
+#define HAL92C_WOL_FW_DISCONNECT_EVENT          BIT(4)
+
+#define         WOL_REASON_PTK_UPDATE           BIT(0)
+#define         WOL_REASON_GTK_UPDATE           BIT(1)
+#define         WOL_REASON_DISASSOC             BIT(2)
+#define         WOL_REASON_DEAUTH               BIT(3)
+#define         WOL_REASON_FW_DISCONNECT        BIT(4)
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c
new file mode 100644
index 000000000000..4faafdbab9c6
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c
@@ -0,0 +1,467 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+
+void rtl88e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+
+        switch (bandwidth) {
+        case HT_CHANNEL_WIDTH_20:
+                rtlphy->rfreg_chnlval[0] = ((rtlphy->rfreg_chnlval[0] &
+                                             0xfffff3ff) | BIT(10) | BIT(11));
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, RFREG_OFFSET_MASK,
+                              rtlphy->rfreg_chnlval[0]);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                rtlphy->rfreg_chnlval[0] = ((rtlphy->rfreg_chnlval[0] &
+                                             0xfffff3ff) | BIT(10));
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, RFREG_OFFSET_MASK,
+                              rtlphy->rfreg_chnlval[0]);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", bandwidth);
+                break;
+        }
+}
+
+void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
+                                       u8 *plevel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u32 tx_agc[2] = {0, 0}, tmpval;
+        bool turbo_scanoff = false;
+        u8 idx1, idx2;
+        u8 *ptr;
+        u8 direction;
+        u32 pwrtrac_value;
+
+        if (rtlefuse->eeprom_regulatory != 0)
+                turbo_scanoff = true;
+
+        if (mac->act_scanning == true) {
+                tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
+                tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
+
+                if (turbo_scanoff) {
+                        for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+                                tx_agc[idx1] = plevel[idx1] |
+                                               (plevel[idx1] << 8) |
+                                               (plevel[idx1] << 16) |
+                                               (plevel[idx1] << 24);
+                        }
+                }
+        } else {
+                for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+                        tx_agc[idx1] = plevel[idx1] | (plevel[idx1] << 8) |
+                                       (plevel[idx1] << 16) |
+                                       (plevel[idx1] << 24);
+                }
+
+                if (rtlefuse->eeprom_regulatory == 0) {
+                        tmpval = (rtlphy->mcs_offset[0][6]) +
+                                 (rtlphy->mcs_offset[0][7] << 8);
+                        tx_agc[RF90_PATH_A] += tmpval;
+
+                        tmpval = (rtlphy->mcs_offset[0][14]) +
+                                 (rtlphy->mcs_offset[0][15] << 24);
+                        tx_agc[RF90_PATH_B] += tmpval;
+                }
+        }
+
+        for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+                ptr = (u8 *)(&(tx_agc[idx1]));
+                for (idx2 = 0; idx2 < 4; idx2++) {
+                        if (*ptr > RF6052_MAX_TX_PWR)
+                                *ptr = RF6052_MAX_TX_PWR;
+                        ptr++;
+                }
+        }
+        rtl88e_dm_txpower_track_adjust(hw, 1, &direction, &pwrtrac_value);
+        if (direction == 1) {
+                tx_agc[0] += pwrtrac_value;
+                tx_agc[1] += pwrtrac_value;
+        } else if (direction == 2) {
+                tx_agc[0] -= pwrtrac_value;
+                tx_agc[1] -= pwrtrac_value;
+        }
+        tmpval = tx_agc[RF90_PATH_A] & 0xff;
+        rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
+
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
+                RTXAGC_A_CCK1_MCS32);
+
+        tmpval = tx_agc[RF90_PATH_A] >> 8;
+
+        rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
+
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
+                 RTXAGC_B_CCK11_A_CCK2_11);
+
+        tmpval = tx_agc[RF90_PATH_B] >> 24;
+        rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
+
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
+                 RTXAGC_B_CCK11_A_CCK2_11);
+
+        tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
+        rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
+
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
+                 RTXAGC_B_CCK1_55_MCS32);
+}
+
+static void rtl88e_phy_get_power_base(struct ieee80211_hw *hw,
+                                      u8 *pwrlvlofdm, u8 *pwrlvlbw20,
+                                      u8 *pwrlvlbw40, u8 channel,
+                                      u32 *ofdmbase, u32 *mcsbase)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        u32 base0, base1;
+        u8 i, powerlevel[2];
+
+        for (i = 0; i < 2; i++) {
+                base0 = pwrlvlofdm[i];
+
+                base0 = (base0 << 24) | (base0 << 16) |
+                             (base0 << 8) | base0;
+                *(ofdmbase + i) = base0;
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                        "[OFDM power base index rf(%c) = 0x%x]\n",
+                        ((i == 0) ? 'A' : 'B'), *(ofdmbase + i));
+        }
+
+        for (i = 0; i < 2; i++) {
+                if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20)
+                        powerlevel[i] = pwrlvlbw20[i];
+                else
+                        powerlevel[i] = pwrlvlbw40[i];
+                base1 = powerlevel[i];
+                base1 = (base1 << 24) |
+                    (base1 << 16) | (base1 << 8) | base1;
+
+                *(mcsbase + i) = base1;
+
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                        "[MCS power base index rf(%c) = 0x%x]\n",
+                        ((i == 0) ? 'A' : 'B'), *(mcsbase + i));
+        }
+}
+
+static void get_txpwr_by_reg(struct ieee80211_hw *hw, u8 chan, u8 index,
+                             u32 *base0, u32 *base1, u32 *outval)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 i, chg = 0, pwr_lim[4], pwr_diff = 0, cust_pwr_dif;
+        u32 writeval, cust_lim, rf, tmp;
+        u8 ch = chan - 1;
+        u8 j;
+
+        for (rf = 0; rf < 2; rf++) {
+                j = index + (rf ? 8 : 0);
+                tmp = ((index < 2) ? base0[rf] : base1[rf]);
+                switch (rtlefuse->eeprom_regulatory) {
+                case 0:
+                        chg = 0;
+
+                        writeval = rtlphy->mcs_offset[chg][j] + tmp;
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, "
+                                "writeval(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                case 1:
+                        if (rtlphy->pwrgroup_cnt == 1) {
+                                chg = 0;
+                        } else {
+                                chg = chan / 3;
+                                if (chan == 14)
+                                        chg = 5;
+                        }
+                        writeval = rtlphy->mcs_offset[chg][j] + tmp;
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                case 2:
+                        writeval = ((index < 2) ? base0[rf] : base1[rf]);
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Better regulatory, writeval(%c) = 0x%x\n",
+                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                case 3:
+                        chg = 0;
+
+                        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
+                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                         ((rf == 0) ? 'A' : 'B'),
+                                         rtlefuse->pwrgroup_ht40[rf][ch]);
+                        } else {
+                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                         ((rf == 0) ? 'A' : 'B'),
+                                         rtlefuse->pwrgroup_ht20[rf][ch]);
+                        }
+
+                        if (index < 2)
+                                pwr_diff = rtlefuse->txpwr_legacyhtdiff[rf][ch];
+                        else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20)
+                                pwr_diff = rtlefuse->txpwr_ht20diff[rf][ch];
+
+                        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40)
+                                cust_pwr_dif = rtlefuse->pwrgroup_ht40[rf][ch];
+                        else
+                                cust_pwr_dif = rtlefuse->pwrgroup_ht20[rf][ch];
+
+                        if (pwr_diff > cust_pwr_dif)
+                                pwr_diff = 0;
+                        else
+                                pwr_diff = cust_pwr_dif - pwr_diff;
+
+                        for (i = 0; i < 4; i++) {
+                                pwr_lim[i] = (u8)((rtlphy->mcs_offset[chg][j] &
+                                             (0x7f << (i * 8))) >> (i * 8));
+
+                                if (pwr_lim[i] > pwr_diff)
+                                        pwr_lim[i] = pwr_diff;
+                        }
+
+                        cust_lim = (pwr_lim[3] << 24) | (pwr_lim[2] << 16) |
+                                   (pwr_lim[1] << 8) | (pwr_lim[0]);
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), cust_lim);
+
+                        writeval = cust_lim + tmp;
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Customer, writeval rf(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                default:
+                        chg = 0;
+                        writeval = rtlphy->mcs_offset[chg][j] + tmp;
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeval "
+                                "rf(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                }
+
+                if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1)
+                        writeval = writeval - 0x06060606;
+                else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
+                         TXHIGHPWRLEVEL_BT2)
+                        writeval -= 0x0c0c0c0c;
+                *(outval + rf) = writeval;
+        }
+}
+
+static void write_ofdm_pwr(struct ieee80211_hw *hw, u8 index, u32 *pvalue)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 regoffset_a[6] = {
+                RTXAGC_A_RATE18_06, RTXAGC_A_RATE54_24,
+                RTXAGC_A_MCS03_MCS00, RTXAGC_A_MCS07_MCS04,
+                RTXAGC_A_MCS11_MCS08, RTXAGC_A_MCS15_MCS12
+        };
+        u16 regoffset_b[6] = {
+                RTXAGC_B_RATE18_06, RTXAGC_B_RATE54_24,
+                RTXAGC_B_MCS03_MCS00, RTXAGC_B_MCS07_MCS04,
+                RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12
+        };
+        u8 i, rf, pwr_val[4];
+        u32 writeval;
+        u16 regoffset;
+
+        for (rf = 0; rf < 2; rf++) {
+                writeval = pvalue[rf];
+                for (i = 0; i < 4; i++) {
+                        pwr_val[i] = (u8) ((writeval & (0x7f <<
+                                     (i * 8))) >> (i * 8));
+
+                        if (pwr_val[i] > RF6052_MAX_TX_PWR)
+                                pwr_val[i] = RF6052_MAX_TX_PWR;
+                }
+                writeval = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
+                           (pwr_val[1] << 8) | pwr_val[0];
+
+                if (rf == 0)
+                        regoffset = regoffset_a[index];
+                else
+                        regoffset = regoffset_b[index];
+                rtl_set_bbreg(hw, regoffset, MASKDWORD, writeval);
+
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                        "Set 0x%x = %08x\n", regoffset, writeval);
+        }
+}
+
+void rtl88e_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
+                                        u8 *pwrlvlofdm,
+                                        u8 *pwrlvlbw20,
+                                        u8 *pwrlvlbw40, u8 chan)
+{
+        u32 writeval[2], base0[2], base1[2];
+        u8 index;
+        u8 direction;
+        u32 pwrtrac_value;
+
+        rtl88e_phy_get_power_base(hw, pwrlvlofdm, pwrlvlbw20,
+                                  pwrlvlbw40, chan, &base0[0],
+                                  &base1[0]);
+
+        rtl88e_dm_txpower_track_adjust(hw, 1, &direction, &pwrtrac_value);
+
+        for (index = 0; index < 6; index++) {
+                get_txpwr_by_reg(hw, chan, index, &base0[0], &base1[0],
+                                 &writeval[0]);
+                if (direction == 1) {
+                        writeval[0] += pwrtrac_value;
+                        writeval[1] += pwrtrac_value;
+                } else if (direction == 2) {
+                        writeval[0] -= pwrtrac_value;
+                        writeval[1] -= pwrtrac_value;
+                }
+                write_ofdm_pwr(hw, index, &writeval[0]);
+        }
+}
+
+static bool rf6052_conf_para(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        u32 u4val = 0;
+        u8 rfpath;
+        bool rtstatus = true;
+        struct bb_reg_def *pphyreg;
+
+        for (rfpath = 0; rfpath < rtlphy->num_total_rfpath; rfpath++) {
+                pphyreg = &rtlphy->phyreg_def[rfpath];
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                case RF90_PATH_C:
+                        u4val = rtl_get_bbreg(hw, pphyreg->rfintfs,
+                                                    BRFSI_RFENV);
+                        break;
+                case RF90_PATH_B:
+                case RF90_PATH_D:
+                        u4val = rtl_get_bbreg(hw, pphyreg->rfintfs,
+                                                    BRFSI_RFENV << 16);
+                        break;
+                }
+
+                rtl_set_bbreg(hw, pphyreg->rfintfe, BRFSI_RFENV << 16, 0x1);
+                udelay(1);
+
+                rtl_set_bbreg(hw, pphyreg->rfintfo, BRFSI_RFENV, 0x1);
+                udelay(1);
+
+                rtl_set_bbreg(hw, pphyreg->rfhssi_para2,
+                              B3WIREADDREAALENGTH, 0x0);
+                udelay(1);
+
+                rtl_set_bbreg(hw, pphyreg->rfhssi_para2, B3WIREDATALENGTH, 0x0);
+                udelay(1);
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                        rtstatus = rtl88e_phy_config_rf_with_headerfile(hw,
+                                        (enum radio_path)rfpath);
+                        break;
+                case RF90_PATH_B:
+                        rtstatus = rtl88e_phy_config_rf_with_headerfile(hw,
+                                        (enum radio_path)rfpath);
+                        break;
+                case RF90_PATH_C:
+                        break;
+                case RF90_PATH_D:
+                        break;
+                }
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                case RF90_PATH_C:
+                        rtl_set_bbreg(hw, pphyreg->rfintfs, BRFSI_RFENV, u4val);
+                        break;
+                case RF90_PATH_B:
+                case RF90_PATH_D:
+                        rtl_set_bbreg(hw, pphyreg->rfintfs, BRFSI_RFENV << 16,
+                                      u4val);
+                        break;
+                }
+
+                if (rtstatus != true) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                 "Radio[%d] Fail!!", rfpath);
+                        return false;
+                }
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
+        return rtstatus;
+}
+
+bool rtl88e_phy_rf6052_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+
+        if (rtlphy->rf_type == RF_1T1R)
+                rtlphy->num_total_rfpath = 1;
+        else
+                rtlphy->num_total_rfpath = 2;
+
+        return rf6052_conf_para(hw);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
new file mode 100644
index 000000000000..a39a2a3dbcc9
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
@@ -0,0 +1,46 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92C_RF_H__
+#define __RTL92C_RF_H__
+
+#define RF6052_MAX_TX_PWR               0x3F
+#define RF6052_MAX_REG                  0x3F
+
+void rtl88e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
+                                     u8 bandwidth);
+void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
+                                       u8 *ppowerlevel);
+void rtl88e_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
+                                        u8 *ppowerlevel_ofdm,
+                                        u8 *ppowerlevel_bw20,
+                                        u8 *ppowerlevel_bw40, u8 channel);
+bool rtl88e_phy_rf6052_config(struct ieee80211_hw *hw);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
new file mode 100644
index 000000000000..c254693a1e6a
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
@@ -0,0 +1,400 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../core.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "hw.h"
+#include "sw.h"
+#include "trx.h"
+#include "led.h"
+#include "table.h"
+
+#include <linux/vmalloc.h>
+#include <linux/module.h>
+
+static void rtl88e_init_aspm_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        /*close ASPM for AMD defaultly */
+        rtlpci->const_amdpci_aspm = 0;
+
+        /* ASPM PS mode.
+         * 0 - Disable ASPM,
+         * 1 - Enable ASPM without Clock Req,
+         * 2 - Enable ASPM with Clock Req,
+         * 3 - Alwyas Enable ASPM with Clock Req,
+         * 4 - Always Enable ASPM without Clock Req.
+         * set defult to RTL8192CE:3 RTL8192E:2
+         */
+        rtlpci->const_pci_aspm = 3;
+
+        /*Setting for PCI-E device */
+        rtlpci->const_devicepci_aspm_setting = 0x03;
+
+        /*Setting for PCI-E bridge */
+        rtlpci->const_hostpci_aspm_setting = 0x02;
+
+        /* In Hw/Sw Radio Off situation.
+         * 0 - Default,
+         * 1 - From ASPM setting without low Mac Pwr,
+         * 2 - From ASPM setting with low Mac Pwr,
+         * 3 - Bus D3
+         * set default to RTL8192CE:0 RTL8192SE:2
+         */
+        rtlpci->const_hwsw_rfoff_d3 = 0;
+
+        /* This setting works for those device with
+         * backdoor ASPM setting such as EPHY setting.
+         * 0 - Not support ASPM,
+         * 1 - Support ASPM,
+         * 2 - According to chipset.
+         */
+        rtlpci->const_support_pciaspm = 1;
+}
+
+int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
+{
+        int err = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u8 tid;
+
+        rtl8188ee_bt_reg_init(hw);
+
+        rtlpriv->dm.dm_initialgain_enable = 1;
+        rtlpriv->dm.dm_flag = 0;
+        rtlpriv->dm.disable_framebursting = 0;
+        rtlpriv->dm.thermalvalue = 0;
+        rtlpci->transmit_config = CFENDFORM | BIT(15);
+
+        /* compatible 5G band 88ce just 2.4G band & smsp */
+        rtlpriv->rtlhal.current_bandtype = BAND_ON_2_4G;
+        rtlpriv->rtlhal.bandset = BAND_ON_2_4G;
+        rtlpriv->rtlhal.macphymode = SINGLEMAC_SINGLEPHY;
+
+        rtlpci->receive_config = (RCR_APPFCS |
+                                  RCR_APP_MIC |
+                                  RCR_APP_ICV |
+                                  RCR_APP_PHYST_RXFF |
+                                  RCR_HTC_LOC_CTRL |
+                                  RCR_AMF |
+                                  RCR_ACF |
+                                  RCR_ADF |
+                                  RCR_AICV |
+                                  RCR_ACRC32 |
+                                  RCR_AB |
+                                  RCR_AM |
+                                  RCR_APM |
+                                  0);
+
+        rtlpci->irq_mask[0] =
+                                (u32) (IMR_PSTIMEOUT    |
+                                IMR_HSISR_IND_ON_INT    |
+                                IMR_C2HCMD              |
+                                IMR_HIGHDOK             |
+                                IMR_MGNTDOK             |
+                                IMR_BKDOK               |
+                                IMR_BEDOK               |
+                                IMR_VIDOK               |
+                                IMR_VODOK               |
+                                IMR_RDU                 |
+                                IMR_ROK                 |
+                                0);
+        rtlpci->irq_mask[1] = (u32) (IMR_RXFOVW | 0);
+        rtlpci->sys_irq_mask = (u32) (HSIMR_PDN_INT_EN | HSIMR_RON_INT_EN);
+
+        /* for debug level */
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
+        /* for LPS & IPS */
+        rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
+        rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
+        rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        if (!rtlpriv->psc.inactiveps)
+                pr_info("rtl8188ee: Power Save off (module option)\n");
+        if (!rtlpriv->psc.fwctrl_lps)
+                pr_info("rtl8188ee: FW Power Save off (module option)\n");
+        rtlpriv->psc.reg_fwctrl_lps = 3;
+        rtlpriv->psc.reg_max_lps_awakeintvl = 5;
+        /* for ASPM, you can close aspm through
+         * set const_support_pciaspm = 0
+         */
+        rtl88e_init_aspm_vars(hw);
+
+        if (rtlpriv->psc.reg_fwctrl_lps == 1)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_MIN_MODE;
+        else if (rtlpriv->psc.reg_fwctrl_lps == 2)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_MAX_MODE;
+        else if (rtlpriv->psc.reg_fwctrl_lps == 3)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
+
+        /* for firmware buf */
+        rtlpriv->rtlhal.pfirmware = vmalloc(0x8000);
+        if (!rtlpriv->rtlhal.pfirmware) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't alloc buffer for fw.\n");
+                return 1;
+        }
+
+        rtlpriv->cfg->fw_name = "rtlwifi/rtl8188efw.bin";
+        rtlpriv->max_fw_size = 0x8000;
+        pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Failed to request firmware!\n");
+                return 1;
+        }
+
+        /* for early mode */
+        rtlpriv->rtlhal.earlymode_enable = false;
+        rtlpriv->rtlhal.max_earlymode_num = 10;
+        for (tid = 0; tid < 8; tid++)
+                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
+
+        /*low power */
+        rtlpriv->psc.low_power_enable = false;
+        if (rtlpriv->psc.low_power_enable) {
+                init_timer(&rtlpriv->works.fw_clockoff_timer);
+                setup_timer(&rtlpriv->works.fw_clockoff_timer,
+                            rtl88ee_fw_clk_off_timer_callback,
+                            (unsigned long)hw);
+        }
+
+        init_timer(&rtlpriv->works.fast_antenna_training_timer);
+        setup_timer(&rtlpriv->works.fast_antenna_training_timer,
+                    rtl88e_dm_fast_antenna_training_callback,
+                    (unsigned long)hw);
+        return err;
+}
+
+void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->rtlhal.pfirmware) {
+                vfree(rtlpriv->rtlhal.pfirmware);
+                rtlpriv->rtlhal.pfirmware = NULL;
+        }
+
+        if (rtlpriv->psc.low_power_enable)
+                del_timer_sync(&rtlpriv->works.fw_clockoff_timer);
+
+        del_timer_sync(&rtlpriv->works.fast_antenna_training_timer);
+}
+
+static struct rtl_hal_ops rtl8188ee_hal_ops = {
+        .init_sw_vars = rtl88e_init_sw_vars,
+        .deinit_sw_vars = rtl88e_deinit_sw_vars,
+        .read_eeprom_info = rtl88ee_read_eeprom_info,
+        .interrupt_recognized = rtl88ee_interrupt_recognized,/*need check*/
+        .hw_init = rtl88ee_hw_init,
+        .hw_disable = rtl88ee_card_disable,
+        .hw_suspend = rtl88ee_suspend,
+        .hw_resume = rtl88ee_resume,
+        .enable_interrupt = rtl88ee_enable_interrupt,
+        .disable_interrupt = rtl88ee_disable_interrupt,
+        .set_network_type = rtl88ee_set_network_type,
+        .set_chk_bssid = rtl88ee_set_check_bssid,
+        .set_qos = rtl88ee_set_qos,
+        .set_bcn_reg = rtl88ee_set_beacon_related_registers,
+        .set_bcn_intv = rtl88ee_set_beacon_interval,
+        .update_interrupt_mask = rtl88ee_update_interrupt_mask,
+        .get_hw_reg = rtl88ee_get_hw_reg,
+        .set_hw_reg = rtl88ee_set_hw_reg,
+        .update_rate_tbl = rtl88ee_update_hal_rate_tbl,
+        .fill_tx_desc = rtl88ee_tx_fill_desc,
+        .fill_tx_cmddesc = rtl88ee_tx_fill_cmddesc,
+        .query_rx_desc = rtl88ee_rx_query_desc,
+        .set_channel_access = rtl88ee_update_channel_access_setting,
+        .radio_onoff_checking = rtl88ee_gpio_radio_on_off_checking,
+        .set_bw_mode = rtl88e_phy_set_bw_mode,
+        .switch_channel = rtl88e_phy_sw_chnl,
+        .dm_watchdog = rtl88e_dm_watchdog,
+        .scan_operation_backup = rtl88e_phy_scan_operation_backup,
+        .set_rf_power_state = rtl88e_phy_set_rf_power_state,
+        .led_control = rtl88ee_led_control,
+        .set_desc = rtl88ee_set_desc,
+        .get_desc = rtl88ee_get_desc,
+        .tx_polling = rtl88ee_tx_polling,
+        .enable_hw_sec = rtl88ee_enable_hw_security_config,
+        .set_key = rtl88ee_set_key,
+        .init_sw_leds = rtl88ee_init_sw_leds,
+        .allow_all_destaddr = rtl88ee_allow_all_destaddr,
+        .get_bbreg = rtl88e_phy_query_bb_reg,
+        .set_bbreg = rtl88e_phy_set_bb_reg,
+        .get_rfreg = rtl88e_phy_query_rf_reg,
+        .set_rfreg = rtl88e_phy_set_rf_reg,
+};
+
+static struct rtl_mod_params rtl88ee_mod_params = {
+        .sw_crypto = false,
+        .inactiveps = true,
+        .swctrl_lps = false,
+        .fwctrl_lps = true,
+        .debug = DBG_EMERG,
+};
+
+static struct rtl_hal_cfg rtl88ee_hal_cfg = {
+        .bar_id = 2,
+        .write_readback = true,
+        .name = "rtl88e_pci",
+        .ops = &rtl8188ee_hal_ops,
+        .mod_params = &rtl88ee_mod_params,
+
+        .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
+        .maps[SYS_FUNC_EN] = REG_SYS_FUNC_EN,
+        .maps[SYS_CLK] = REG_SYS_CLKR,
+        .maps[MAC_RCR_AM] = AM,
+        .maps[MAC_RCR_AB] = AB,
+        .maps[MAC_RCR_ACRC32] = ACRC32,
+        .maps[MAC_RCR_ACF] = ACF,
+        .maps[MAC_RCR_AAP] = AAP,
+
+        .maps[EFUSE_ACCESS] = REG_EFUSE_ACCESS,
+
+        .maps[EFUSE_TEST] = REG_EFUSE_TEST,
+        .maps[EFUSE_CTRL] = REG_EFUSE_CTRL,
+        .maps[EFUSE_CLK] = 0,
+        .maps[EFUSE_CLK_CTRL] = REG_EFUSE_CTRL,
+        .maps[EFUSE_PWC_EV12V] = PWC_EV12V,
+        .maps[EFUSE_FEN_ELDR] = FEN_ELDR,
+        .maps[EFUSE_LOADER_CLK_EN] = LOADER_CLK_EN,
+        .maps[EFUSE_ANA8M] = ANA8M,
+        .maps[EFUSE_HWSET_MAX_SIZE] = HWSET_MAX_SIZE,
+        .maps[EFUSE_MAX_SECTION_MAP] = EFUSE_MAX_SECTION,
+        .maps[EFUSE_REAL_CONTENT_SIZE] = EFUSE_REAL_CONTENT_LEN,
+        .maps[EFUSE_OOB_PROTECT_BYTES_LEN] = EFUSE_OOB_PROTECT_BYTES,
+
+        .maps[RWCAM] = REG_CAMCMD,
+        .maps[WCAMI] = REG_CAMWRITE,
+        .maps[RCAMO] = REG_CAMREAD,
+        .maps[CAMDBG] = REG_CAMDBG,
+        .maps[SECR] = REG_SECCFG,
+        .maps[SEC_CAM_NONE] = CAM_NONE,
+        .maps[SEC_CAM_WEP40] = CAM_WEP40,
+        .maps[SEC_CAM_TKIP] = CAM_TKIP,
+        .maps[SEC_CAM_AES] = CAM_AES,
+        .maps[SEC_CAM_WEP104] = CAM_WEP104,
+
+        .maps[RTL_IMR_BCNDMAINT6] = IMR_BCNDMAINT6,
+        .maps[RTL_IMR_BCNDMAINT5] = IMR_BCNDMAINT5,
+        .maps[RTL_IMR_BCNDMAINT4] = IMR_BCNDMAINT4,
+        .maps[RTL_IMR_BCNDMAINT3] = IMR_BCNDMAINT3,
+        .maps[RTL_IMR_BCNDMAINT2] = IMR_BCNDMAINT2,
+        .maps[RTL_IMR_BCNDMAINT1] = IMR_BCNDMAINT1,
+/*      .maps[RTL_IMR_BCNDOK8] = IMR_BCNDOK8,     */   /*need check*/
+        .maps[RTL_IMR_BCNDOK7] = IMR_BCNDOK7,
+        .maps[RTL_IMR_BCNDOK6] = IMR_BCNDOK6,
+        .maps[RTL_IMR_BCNDOK5] = IMR_BCNDOK5,
+        .maps[RTL_IMR_BCNDOK4] = IMR_BCNDOK4,
+        .maps[RTL_IMR_BCNDOK3] = IMR_BCNDOK3,
+        .maps[RTL_IMR_BCNDOK2] = IMR_BCNDOK2,
+        .maps[RTL_IMR_BCNDOK1] = IMR_BCNDOK1,
+/*      .maps[RTL_IMR_TIMEOUT2] = IMR_TIMEOUT2,*/
+/*      .maps[RTL_IMR_TIMEOUT1] = IMR_TIMEOUT1,*/
+
+        .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
+        .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNDMAINT0,
+        .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
+        .maps[RTL_IMR_RDU] = IMR_RDU,
+        .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
+        .maps[RTL_IMR_BDOK] = IMR_BCNDOK0,
+        .maps[RTL_IMR_MGNTDOK] = IMR_MGNTDOK,
+        .maps[RTL_IMR_TBDER] = IMR_TBDER,
+        .maps[RTL_IMR_HIGHDOK] = IMR_HIGHDOK,
+        .maps[RTL_IMR_TBDOK] = IMR_TBDOK,
+        .maps[RTL_IMR_BKDOK] = IMR_BKDOK,
+        .maps[RTL_IMR_BEDOK] = IMR_BEDOK,
+        .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
+        .maps[RTL_IMR_VODOK] = IMR_VODOK,
+        .maps[RTL_IMR_ROK] = IMR_ROK,
+        .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNDMAINT0 | IMR_TBDOK | IMR_TBDER),
+
+        .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] = DESC92C_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] = DESC92C_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] = DESC92C_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] = DESC92C_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] = DESC92C_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] = DESC92C_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] = DESC92C_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] = DESC92C_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] = DESC92C_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] = DESC92C_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] = DESC92C_RATE54M,
+
+        .maps[RTL_RC_HT_RATEMCS7] = DESC92C_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
+};
+
+static DEFINE_PCI_DEVICE_TABLE(rtl88ee_pci_ids) = {
+        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8179, rtl88ee_hal_cfg)},
+        {},
+};
+
+MODULE_DEVICE_TABLE(pci, rtl88ee_pci_ids);
+
+MODULE_AUTHOR("zhiyuan_yang     <zhiyuan_yang@realsil.com.cn>");
+MODULE_AUTHOR("Realtek WlanFAE  <wlanfae@realtek.com>");
+MODULE_AUTHOR("Larry Finger     <Larry.Finger@lwfinger.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Realtek 8188E 802.11n PCI wireless");
+MODULE_FIRMWARE("rtlwifi/rtl8188efw.bin");
+
+module_param_named(swenc, rtl88ee_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl88ee_mod_params.debug, int, 0444);
+module_param_named(ips, rtl88ee_mod_params.inactiveps, bool, 0444);
+module_param_named(swlps, rtl88ee_mod_params.swctrl_lps, bool, 0444);
+module_param_named(fwlps, rtl88ee_mod_params.fwctrl_lps, bool, 0444);
+MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
+MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
+MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
+MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+
+static struct pci_driver rtl88ee_driver = {
+        .name = KBUILD_MODNAME,
+        .id_table = rtl88ee_pci_ids,
+        .probe = rtl_pci_probe,
+        .remove = rtl_pci_disconnect,
+        .driver.pm = &rtlwifi_pm_ops,
+};
+
+module_pci_driver(rtl88ee_driver);
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h
new file mode 100644
index 000000000000..85e02b3bdff8
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h
@@ -0,0 +1,36 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92CE_SW_H__
+#define __RTL92CE_SW_H__
+
+int rtl88e_init_sw_vars(struct ieee80211_hw *hw);
+void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/table.c b/drivers/net/wireless/rtlwifi/rtl8188ee/table.c
new file mode 100644
index 000000000000..fad373f97b2c
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/table.c
@@ -0,0 +1,643 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Created on  2010/ 5/18,  1:41
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "table.h"
+
+u32 RTL8188EEPHY_REG_1TARRAY[] = {
+                0x800, 0x80040000,
+                0x804, 0x00000003,
+                0x808, 0x0000FC00,
+                0x80C, 0x0000000A,
+                0x810, 0x10001331,
+                0x814, 0x020C3D10,
+                0x818, 0x02200385,
+                0x81C, 0x00000000,
+                0x820, 0x01000100,
+                0x824, 0x00390204,
+                0x828, 0x00000000,
+                0x82C, 0x00000000,
+                0x830, 0x00000000,
+                0x834, 0x00000000,
+                0x838, 0x00000000,
+                0x83C, 0x00000000,
+                0x840, 0x00010000,
+                0x844, 0x00000000,
+                0x848, 0x00000000,
+                0x84C, 0x00000000,
+                0x850, 0x00000000,
+                0x854, 0x00000000,
+                0x858, 0x569A11A9,
+                0x85C, 0x01000014,
+                0x860, 0x66F60110,
+                0x864, 0x061F0649,
+                0x868, 0x00000000,
+                0x86C, 0x27272700,
+                0x870, 0x07000760,
+                0x874, 0x25004000,
+                0x878, 0x00000808,
+                0x87C, 0x00000000,
+                0x880, 0xB0000C1C,
+                0x884, 0x00000001,
+                0x888, 0x00000000,
+                0x88C, 0xCCC000C0,
+                0x890, 0x00000800,
+                0x894, 0xFFFFFFFE,
+                0x898, 0x40302010,
+                0x89C, 0x00706050,
+                0x900, 0x00000000,
+                0x904, 0x00000023,
+                0x908, 0x00000000,
+                0x90C, 0x81121111,
+                0x910, 0x00000002,
+                0x914, 0x00000201,
+                0xA00, 0x00D047C8,
+                0xA04, 0x80FF000C,
+                0xA08, 0x8C838300,
+                0xA0C, 0x2E7F120F,
+                0xA10, 0x9500BB78,
+                0xA14, 0x1114D028,
+                0xA18, 0x00881117,
+                0xA1C, 0x89140F00,
+                0xA20, 0x1A1B0000,
+                0xA24, 0x090E1317,
+                0xA28, 0x00000204,
+                0xA2C, 0x00D30000,
+                0xA70, 0x101FBF00,
+                0xA74, 0x00000007,
+                0xA78, 0x00000900,
+                0xA7C, 0x225B0606,
+                0xA80, 0x218075B1,
+                0xB2C, 0x80000000,
+                0xC00, 0x48071D40,
+                0xC04, 0x03A05611,
+                0xC08, 0x000000E4,
+                0xC0C, 0x6C6C6C6C,
+                0xC10, 0x08800000,
+                0xC14, 0x40000100,
+                0xC18, 0x08800000,
+                0xC1C, 0x40000100,
+                0xC20, 0x00000000,
+                0xC24, 0x00000000,
+                0xC28, 0x00000000,
+                0xC2C, 0x00000000,
+                0xC30, 0x69E9AC47,
+                0xC34, 0x469652AF,
+                0xC38, 0x49795994,
+                0xC3C, 0x0A97971C,
+                0xC40, 0x1F7C403F,
+                0xC44, 0x000100B7,
+                0xC48, 0xEC020107,
+                0xC4C, 0x007F037F,
+                0xC50, 0x69553420,
+                0xC54, 0x43BC0094,
+                0xC58, 0x00013169,
+                0xC5C, 0x00250492,
+                0xC60, 0x00000000,
+                0xC64, 0x7112848B,
+                0xC68, 0x47C00BFF,
+                0xC6C, 0x00000036,
+                0xC70, 0x2C7F000D,
+                0xC74, 0x020610DB,
+                0xC78, 0x0000001F,
+                0xC7C, 0x00B91612,
+                0xC80, 0x390000E4,
+                0xC84, 0x20F60000,
+                0xC88, 0x40000100,
+                0xC8C, 0x20200000,
+                0xC90, 0x00091521,
+                0xC94, 0x00000000,
+                0xC98, 0x00121820,
+                0xC9C, 0x00007F7F,
+                0xCA0, 0x00000000,
+                0xCA4, 0x000300A0,
+                0xCA8, 0x00000000,
+                0xCAC, 0x00000000,
+                0xCB0, 0x00000000,
+                0xCB4, 0x00000000,
+                0xCB8, 0x00000000,
+                0xCBC, 0x28000000,
+                0xCC0, 0x00000000,
+                0xCC4, 0x00000000,
+                0xCC8, 0x00000000,
+                0xCCC, 0x00000000,
+                0xCD0, 0x00000000,
+                0xCD4, 0x00000000,
+                0xCD8, 0x64B22427,
+                0xCDC, 0x00766932,
+                0xCE0, 0x00222222,
+                0xCE4, 0x00000000,
+                0xCE8, 0x37644302,
+                0xCEC, 0x2F97D40C,
+                0xD00, 0x00000740,
+                0xD04, 0x00020401,
+                0xD08, 0x0000907F,
+                0xD0C, 0x20010201,
+                0xD10, 0xA0633333,
+                0xD14, 0x3333BC43,
+                0xD18, 0x7A8F5B6F,
+                0xD2C, 0xCC979975,
+                0xD30, 0x00000000,
+                0xD34, 0x80608000,
+                0xD38, 0x00000000,
+                0xD3C, 0x00127353,
+                0xD40, 0x00000000,
+                0xD44, 0x00000000,
+                0xD48, 0x00000000,
+                0xD4C, 0x00000000,
+                0xD50, 0x6437140A,
+                0xD54, 0x00000000,
+                0xD58, 0x00000282,
+                0xD5C, 0x30032064,
+                0xD60, 0x4653DE68,
+                0xD64, 0x04518A3C,
+                0xD68, 0x00002101,
+                0xD6C, 0x2A201C16,
+                0xD70, 0x1812362E,
+                0xD74, 0x322C2220,
+                0xD78, 0x000E3C24,
+                0xE00, 0x2D2D2D2D,
+                0xE04, 0x2D2D2D2D,
+                0xE08, 0x0390272D,
+                0xE10, 0x2D2D2D2D,
+                0xE14, 0x2D2D2D2D,
+                0xE18, 0x2D2D2D2D,
+                0xE1C, 0x2D2D2D2D,
+                0xE28, 0x00000000,
+                0xE30, 0x1000DC1F,
+                0xE34, 0x10008C1F,
+                0xE38, 0x02140102,
+                0xE3C, 0x681604C2,
+                0xE40, 0x01007C00,
+                0xE44, 0x01004800,
+                0xE48, 0xFB000000,
+                0xE4C, 0x000028D1,
+                0xE50, 0x1000DC1F,
+                0xE54, 0x10008C1F,
+                0xE58, 0x02140102,
+                0xE5C, 0x28160D05,
+                0xE60, 0x00000008,
+                0xE68, 0x001B25A4,
+                0xE6C, 0x00C00014,
+                0xE70, 0x00C00014,
+                0xE74, 0x01000014,
+                0xE78, 0x01000014,
+                0xE7C, 0x01000014,
+                0xE80, 0x01000014,
+                0xE84, 0x00C00014,
+                0xE88, 0x01000014,
+                0xE8C, 0x00C00014,
+                0xED0, 0x00C00014,
+                0xED4, 0x00C00014,
+                0xED8, 0x00C00014,
+                0xEDC, 0x00000014,
+                0xEE0, 0x00000014,
+                0xEEC, 0x01C00014,
+                0xF14, 0x00000003,
+                0xF4C, 0x00000000,
+                0xF00, 0x00000300,
+
+};
+
+u32 RTL8188EEPHY_REG_ARRAY_PG[] = {
+                0xE00, 0xFFFFFFFF, 0x06070809,
+                0xE04, 0xFFFFFFFF, 0x02020405,
+                0xE08, 0x0000FF00, 0x00000006,
+                0x86C, 0xFFFFFF00, 0x00020400,
+                0xE10, 0xFFFFFFFF, 0x08090A0B,
+                0xE14, 0xFFFFFFFF, 0x01030607,
+                0xE18, 0xFFFFFFFF, 0x08090A0B,
+                0xE1C, 0xFFFFFFFF, 0x01030607,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x02020202,
+                0xE04, 0xFFFFFFFF, 0x00020202,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x04040404,
+                0xE14, 0xFFFFFFFF, 0x00020404,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x02020202,
+                0xE04, 0xFFFFFFFF, 0x00020202,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x04040404,
+                0xE14, 0xFFFFFFFF, 0x00020404,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x02020202,
+                0xE04, 0xFFFFFFFF, 0x00020202,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x04040404,
+                0xE14, 0xFFFFFFFF, 0x00020404,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+                0xE00, 0xFFFFFFFF, 0x00000000,
+                0xE04, 0xFFFFFFFF, 0x00000000,
+                0xE08, 0x0000FF00, 0x00000000,
+                0x86C, 0xFFFFFF00, 0x00000000,
+                0xE10, 0xFFFFFFFF, 0x00000000,
+                0xE14, 0xFFFFFFFF, 0x00000000,
+                0xE18, 0xFFFFFFFF, 0x00000000,
+                0xE1C, 0xFFFFFFFF, 0x00000000,
+
+};
+
+u32 RTL8188EE_RADIOA_1TARRAY[] = {
+                0x000, 0x00030000,
+                0x008, 0x00084000,
+                0x018, 0x00000407,
+                0x019, 0x00000012,
+                0x01E, 0x00080009,
+                0x01F, 0x00000880,
+                0x02F, 0x0001A060,
+                0x03F, 0x00000000,
+                0x042, 0x000060C0,
+                0x057, 0x000D0000,
+                0x058, 0x000BE180,
+                0x067, 0x00001552,
+                0x083, 0x00000000,
+                0x0B0, 0x000FF8FC,
+                0x0B1, 0x00054400,
+                0x0B2, 0x000CCC19,
+                0x0B4, 0x00043003,
+                0x0B6, 0x0004953E,
+                0x0B7, 0x0001C718,
+                0x0B8, 0x000060FF,
+                0x0B9, 0x00080001,
+                0x0BA, 0x00040000,
+                0x0BB, 0x00000400,
+                0x0BF, 0x000C0000,
+                0x0C2, 0x00002400,
+                0x0C3, 0x00000009,
+                0x0C4, 0x00040C91,
+                0x0C5, 0x00099999,
+                0x0C6, 0x000000A3,
+                0x0C7, 0x00088820,
+                0x0C8, 0x00076C06,
+                0x0C9, 0x00000000,
+                0x0CA, 0x00080000,
+                0x0DF, 0x00000180,
+                0x0EF, 0x000001A0,
+                0x051, 0x0006B27D,
+                0x052, 0x0007E49D,
+                0x053, 0x00000073,
+                0x056, 0x00051FF3,
+                0x035, 0x00000086,
+                0x035, 0x00000186,
+                0x035, 0x00000286,
+                0x036, 0x00001C25,
+                0x036, 0x00009C25,
+                0x036, 0x00011C25,
+                0x036, 0x00019C25,
+                0x0B6, 0x00048538,
+                0x018, 0x00000C07,
+                0x05A, 0x0004BD00,
+                0x019, 0x000739D0,
+                0x034, 0x0000ADF3,
+                0x034, 0x00009DF0,
+                0x034, 0x00008DED,
+                0x034, 0x00007DEA,
+                0x034, 0x00006DE7,
+                0x034, 0x000054EE,
+                0x034, 0x000044EB,
+                0x034, 0x000034E8,
+                0x034, 0x0000246B,
+                0x034, 0x00001468,
+                0x034, 0x0000006D,
+                0x000, 0x00030159,
+                0x084, 0x00068200,
+                0x086, 0x000000CE,
+                0x087, 0x00048A00,
+                0x08E, 0x00065540,
+                0x08F, 0x00088000,
+                0x0EF, 0x000020A0,
+                0x03B, 0x000F02B0,
+                0x03B, 0x000EF7B0,
+                0x03B, 0x000D4FB0,
+                0x03B, 0x000CF060,
+                0x03B, 0x000B0090,
+                0x03B, 0x000A0080,
+                0x03B, 0x00090080,
+                0x03B, 0x0008F780,
+                0x03B, 0x000722B0,
+                0x03B, 0x0006F7B0,
+                0x03B, 0x00054FB0,
+                0x03B, 0x0004F060,
+                0x03B, 0x00030090,
+                0x03B, 0x00020080,
+                0x03B, 0x00010080,
+                0x03B, 0x0000F780,
+                0x0EF, 0x000000A0,
+                0x000, 0x00010159,
+                0x018, 0x0000F407,
+                0xFFE, 0x00000000,
+                0xFFE, 0x00000000,
+                0x01F, 0x00080003,
+                0xFFE, 0x00000000,
+                0xFFE, 0x00000000,
+                0x01E, 0x00000001,
+                0x01F, 0x00080000,
+                0x000, 0x00033E60,
+
+};
+
+u32 RTL8188EEMAC_1T_ARRAY[] = {
+                0x026, 0x00000041,
+                0x027, 0x00000035,
+                0x428, 0x0000000A,
+                0x429, 0x00000010,
+                0x430, 0x00000000,
+                0x431, 0x00000001,
+                0x432, 0x00000002,
+                0x433, 0x00000004,
+                0x434, 0x00000005,
+                0x435, 0x00000006,
+                0x436, 0x00000007,
+                0x437, 0x00000008,
+                0x438, 0x00000000,
+                0x439, 0x00000000,
+                0x43A, 0x00000001,
+                0x43B, 0x00000002,
+                0x43C, 0x00000004,
+                0x43D, 0x00000005,
+                0x43E, 0x00000006,
+                0x43F, 0x00000007,
+                0x440, 0x0000005D,
+                0x441, 0x00000001,
+                0x442, 0x00000000,
+                0x444, 0x00000015,
+                0x445, 0x000000F0,
+                0x446, 0x0000000F,
+                0x447, 0x00000000,
+                0x458, 0x00000041,
+                0x459, 0x000000A8,
+                0x45A, 0x00000072,
+                0x45B, 0x000000B9,
+                0x460, 0x00000066,
+                0x461, 0x00000066,
+                0x480, 0x00000008,
+                0x4C8, 0x000000FF,
+                0x4C9, 0x00000008,
+                0x4CC, 0x000000FF,
+                0x4CD, 0x000000FF,
+                0x4CE, 0x00000001,
+                0x4D3, 0x00000001,
+                0x500, 0x00000026,
+                0x501, 0x000000A2,
+                0x502, 0x0000002F,
+                0x503, 0x00000000,
+                0x504, 0x00000028,
+                0x505, 0x000000A3,
+                0x506, 0x0000005E,
+                0x507, 0x00000000,
+                0x508, 0x0000002B,
+                0x509, 0x000000A4,
+                0x50A, 0x0000005E,
+                0x50B, 0x00000000,
+                0x50C, 0x0000004F,
+                0x50D, 0x000000A4,
+                0x50E, 0x00000000,
+                0x50F, 0x00000000,
+                0x512, 0x0000001C,
+                0x514, 0x0000000A,
+                0x516, 0x0000000A,
+                0x525, 0x0000004F,
+                0x550, 0x00000010,
+                0x551, 0x00000010,
+                0x559, 0x00000002,
+                0x55D, 0x000000FF,
+                0x605, 0x00000030,
+                0x608, 0x0000000E,
+                0x609, 0x0000002A,
+                0x620, 0x000000FF,
+                0x621, 0x000000FF,
+                0x622, 0x000000FF,
+                0x623, 0x000000FF,
+                0x624, 0x000000FF,
+                0x625, 0x000000FF,
+                0x626, 0x000000FF,
+                0x627, 0x000000FF,
+                0x652, 0x00000020,
+                0x63C, 0x0000000A,
+                0x63D, 0x0000000A,
+                0x63E, 0x0000000E,
+                0x63F, 0x0000000E,
+                0x640, 0x00000040,
+                0x66E, 0x00000005,
+                0x700, 0x00000021,
+                0x701, 0x00000043,
+                0x702, 0x00000065,
+                0x703, 0x00000087,
+                0x708, 0x00000021,
+                0x709, 0x00000043,
+                0x70A, 0x00000065,
+                0x70B, 0x00000087,
+
+};
+
+u32 RTL8188EEAGCTAB_1TARRAY[] = {
+                0xC78, 0xFB000001,
+                0xC78, 0xFB010001,
+                0xC78, 0xFB020001,
+                0xC78, 0xFB030001,
+                0xC78, 0xFB040001,
+                0xC78, 0xFB050001,
+                0xC78, 0xFA060001,
+                0xC78, 0xF9070001,
+                0xC78, 0xF8080001,
+                0xC78, 0xF7090001,
+                0xC78, 0xF60A0001,
+                0xC78, 0xF50B0001,
+                0xC78, 0xF40C0001,
+                0xC78, 0xF30D0001,
+                0xC78, 0xF20E0001,
+                0xC78, 0xF10F0001,
+                0xC78, 0xF0100001,
+                0xC78, 0xEF110001,
+                0xC78, 0xEE120001,
+                0xC78, 0xED130001,
+                0xC78, 0xEC140001,
+                0xC78, 0xEB150001,
+                0xC78, 0xEA160001,
+                0xC78, 0xE9170001,
+                0xC78, 0xE8180001,
+                0xC78, 0xE7190001,
+                0xC78, 0xE61A0001,
+                0xC78, 0xE51B0001,
+                0xC78, 0xE41C0001,
+                0xC78, 0xE31D0001,
+                0xC78, 0xE21E0001,
+                0xC78, 0xE11F0001,
+                0xC78, 0x8A200001,
+                0xC78, 0x89210001,
+                0xC78, 0x88220001,
+                0xC78, 0x87230001,
+                0xC78, 0x86240001,
+                0xC78, 0x85250001,
+                0xC78, 0x84260001,
+                0xC78, 0x83270001,
+                0xC78, 0x82280001,
+                0xC78, 0x6B290001,
+                0xC78, 0x6A2A0001,
+                0xC78, 0x692B0001,
+                0xC78, 0x682C0001,
+                0xC78, 0x672D0001,
+                0xC78, 0x662E0001,
+                0xC78, 0x652F0001,
+                0xC78, 0x64300001,
+                0xC78, 0x63310001,
+                0xC78, 0x62320001,
+                0xC78, 0x61330001,
+                0xC78, 0x46340001,
+                0xC78, 0x45350001,
+                0xC78, 0x44360001,
+                0xC78, 0x43370001,
+                0xC78, 0x42380001,
+                0xC78, 0x41390001,
+                0xC78, 0x403A0001,
+                0xC78, 0x403B0001,
+                0xC78, 0x403C0001,
+                0xC78, 0x403D0001,
+                0xC78, 0x403E0001,
+                0xC78, 0x403F0001,
+                0xC78, 0xFB400001,
+                0xC78, 0xFB410001,
+                0xC78, 0xFB420001,
+                0xC78, 0xFB430001,
+                0xC78, 0xFB440001,
+                0xC78, 0xFB450001,
+                0xC78, 0xFB460001,
+                0xC78, 0xFB470001,
+                0xC78, 0xFB480001,
+                0xC78, 0xFA490001,
+                0xC78, 0xF94A0001,
+                0xC78, 0xF84B0001,
+                0xC78, 0xF74C0001,
+                0xC78, 0xF64D0001,
+                0xC78, 0xF54E0001,
+                0xC78, 0xF44F0001,
+                0xC78, 0xF3500001,
+                0xC78, 0xF2510001,
+                0xC78, 0xF1520001,
+                0xC78, 0xF0530001,
+                0xC78, 0xEF540001,
+                0xC78, 0xEE550001,
+                0xC78, 0xED560001,
+                0xC78, 0xEC570001,
+                0xC78, 0xEB580001,
+                0xC78, 0xEA590001,
+                0xC78, 0xE95A0001,
+                0xC78, 0xE85B0001,
+                0xC78, 0xE75C0001,
+                0xC78, 0xE65D0001,
+                0xC78, 0xE55E0001,
+                0xC78, 0xE45F0001,
+                0xC78, 0xE3600001,
+                0xC78, 0xE2610001,
+                0xC78, 0xC3620001,
+                0xC78, 0xC2630001,
+                0xC78, 0xC1640001,
+                0xC78, 0x8B650001,
+                0xC78, 0x8A660001,
+                0xC78, 0x89670001,
+                0xC78, 0x88680001,
+                0xC78, 0x87690001,
+                0xC78, 0x866A0001,
+                0xC78, 0x856B0001,
+                0xC78, 0x846C0001,
+                0xC78, 0x676D0001,
+                0xC78, 0x666E0001,
+                0xC78, 0x656F0001,
+                0xC78, 0x64700001,
+                0xC78, 0x63710001,
+                0xC78, 0x62720001,
+                0xC78, 0x61730001,
+                0xC78, 0x60740001,
+                0xC78, 0x46750001,
+                0xC78, 0x45760001,
+                0xC78, 0x44770001,
+                0xC78, 0x43780001,
+                0xC78, 0x42790001,
+                0xC78, 0x417A0001,
+                0xC78, 0x407B0001,
+                0xC78, 0x407C0001,
+                0xC78, 0x407D0001,
+                0xC78, 0x407E0001,
+                0xC78, 0x407F0001,
+};
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/table.h b/drivers/net/wireless/rtlwifi/rtl8188ee/table.h
new file mode 100644
index 000000000000..c1218e835129
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/table.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Created on  2010/ 5/18,  1:41
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92CE_TABLE__H_
+#define __RTL92CE_TABLE__H_
+
+#include <linux/types.h>
+#define  RTL8188EEPHY_REG_1TARRAYLEN    382
+extern u32 RTL8188EEPHY_REG_1TARRAY[];
+#define RTL8188EEPHY_REG_ARRAY_PGLEN    264
+extern u32 RTL8188EEPHY_REG_ARRAY_PG[];
+#define RTL8188EE_RADIOA_1TARRAYLEN     190
+extern u32 RTL8188EE_RADIOA_1TARRAY[];
+#define RTL8188EEMAC_1T_ARRAYLEN        180
+extern u32 RTL8188EEMAC_1T_ARRAY[];
+#define RTL8188EEAGCTAB_1TARRAYLEN      256
+extern u32 RTL8188EEAGCTAB_1TARRAY[];
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
new file mode 100644
index 000000000000..a8871d66d56a
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
@@ -0,0 +1,817 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "../stats.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "trx.h"
+#include "led.h"
+#include "dm.h"
+
+static u8 _rtl88ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
+{
+        __le16 fc = rtl_get_fc(skb);
+
+        if (unlikely(ieee80211_is_beacon(fc)))
+                return QSLT_BEACON;
+        if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
+                return QSLT_MGNT;
+
+        return skb->priority;
+}
+
+static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
+                        struct rtl_stats *pstatus, u8 *pdesc,
+                        struct rx_fwinfo_88e *p_drvinfo,
+                        bool bpacket_match_bssid,
+                        bool bpacket_toself, bool packet_beacon)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
+        struct phy_sts_cck_8192s_t *cck_buf;
+        struct phy_status_rpt *phystrpt = (struct phy_status_rpt *)p_drvinfo;
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        char rx_pwr_all = 0, rx_pwr[4];
+        u8 rf_rx_num = 0, evm, pwdb_all;
+        u8 i, max_spatial_stream;
+        u32 rssi, total_rssi = 0;
+        bool is_cck = pstatus->is_cck;
+        u8 lan_idx, vga_idx;
+
+        /* Record it for next packet processing */
+        pstatus->packet_matchbssid = bpacket_match_bssid;
+        pstatus->packet_toself = bpacket_toself;
+        pstatus->packet_beacon = packet_beacon;
+        pstatus->rx_mimo_sig_qual[0] = -1;
+        pstatus->rx_mimo_sig_qual[1] = -1;
+
+        if (is_cck) {
+                u8 cck_hipwr;
+                u8 cck_agc_rpt;
+                /* CCK Driver info Structure is not the same as OFDM packet. */
+                cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
+                cck_agc_rpt = cck_buf->cck_agc_rpt;
+
+                /* (1)Hardware does not provide RSSI for CCK
+                 * (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                if (ppsc->rfpwr_state == ERFON)
+                        cck_hipwr = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2,
+                                                  BIT(9));
+                else
+                        cck_hipwr = false;
+
+                lan_idx = ((cck_agc_rpt & 0xE0) >> 5);
+                vga_idx = (cck_agc_rpt & 0x1f);
+                switch (lan_idx) {
+                case 7:
+                        if (vga_idx <= 27)
+                                rx_pwr_all = -100 + 2 * (27 - vga_idx);
+                        else
+                                rx_pwr_all = -100;
+                        break;
+                case 6:
+                        rx_pwr_all = -48 + 2 * (2 - vga_idx); /*VGA_idx = 2~0*/
+                        break;
+                case 5:
+                        rx_pwr_all = -42 + 2 * (7 - vga_idx); /*VGA_idx = 7~5*/
+                        break;
+                case 4:
+                        rx_pwr_all = -36 + 2 * (7 - vga_idx); /*VGA_idx = 7~4*/
+                        break;
+                case 3:
+                        rx_pwr_all = -24 + 2 * (7 - vga_idx); /*VGA_idx = 7~0*/
+                        break;
+                case 2:
+                        if (cck_hipwr)
+                                rx_pwr_all = -12 + 2 * (5 - vga_idx);
+                        else
+                                rx_pwr_all = -6 + 2 * (5 - vga_idx);
+                        break;
+                case 1:
+                        rx_pwr_all = 8 - 2 * vga_idx;
+                        break;
+                case 0:
+                        rx_pwr_all = 14 - 2 * vga_idx;
+                        break;
+                default:
+                        break;
+                }
+                rx_pwr_all += 6;
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                /* CCK gain is smaller than OFDM/MCS gain,
+                 * so we add gain diff by experiences,
+                 * the val is 6
+                 */
+                pwdb_all += 6;
+                if (pwdb_all > 100)
+                        pwdb_all = 100;
+                /* modify the offset to make the same
+                 * gain index with OFDM.
+                 */
+                if (pwdb_all > 34 && pwdb_all <= 42)
+                        pwdb_all -= 2;
+                else if (pwdb_all > 26 && pwdb_all <= 34)
+                        pwdb_all -= 6;
+                else if (pwdb_all > 14 && pwdb_all <= 26)
+                        pwdb_all -= 8;
+                else if (pwdb_all > 4 && pwdb_all <= 14)
+                        pwdb_all -= 4;
+                if (cck_hipwr == false) {
+                        if (pwdb_all >= 80)
+                                pwdb_all = ((pwdb_all - 80)<<1) +
+                                           ((pwdb_all - 80)>>1) + 80;
+                        else if ((pwdb_all <= 78) && (pwdb_all >= 20))
+                                pwdb_all += 3;
+                        if (pwdb_all > 100)
+                                pwdb_all = 100;
+                }
+
+                pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->recvsignalpower = rx_pwr_all;
+
+                /* (3) Get Signal Quality (EVM) */
+                if (bpacket_match_bssid) {
+                        u8 sq;
+
+                        if (pstatus->rx_pwdb_all > 40) {
+                                sq = 100;
+                        } else {
+                                sq = cck_buf->sq_rpt;
+                                if (sq > 64)
+                                        sq = 0;
+                                else if (sq < 20)
+                                        sq = 100;
+                                else
+                                        sq = ((64 - sq) * 100) / 44;
+                        }
+
+                        pstatus->signalquality = sq;
+                        pstatus->rx_mimo_sig_qual[0] = sq;
+                        pstatus->rx_mimo_sig_qual[1] = -1;
+                }
+        } else {
+                rtlpriv->dm.rfpath_rxenable[0] =
+                    rtlpriv->dm.rfpath_rxenable[1] = true;
+
+                /* (1)Get RSSI for HT rate */
+                for (i = RF90_PATH_A; i < RF6052_MAX_PATH; i++) {
+                        /* we will judge RF RX path now. */
+                        if (rtlpriv->dm.rfpath_rxenable[i])
+                                rf_rx_num++;
+
+                        rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2)-110;
+
+                        /* Translate DBM to percentage. */
+                        rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
+                        total_rssi += rssi;
+
+                        /* Get Rx snr value in DB */
+                        rtlpriv->stats.rx_snr_db[i] = p_drvinfo->rxsnr[i] / 2;
+
+                        /* Record Signal Strength for next packet */
+                        if (bpacket_match_bssid)
+                                pstatus->rx_mimo_signalstrength[i] = (u8) rssi;
+                }
+
+                /* (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
+
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->rxpower = rx_pwr_all;
+                pstatus->recvsignalpower = rx_pwr_all;
+
+                /* (3)EVM of HT rate */
+                if (pstatus->is_ht && pstatus->rate >= DESC92C_RATEMCS8 &&
+                    pstatus->rate <= DESC92C_RATEMCS15)
+                        max_spatial_stream = 2;
+                else
+                        max_spatial_stream = 1;
+
+                for (i = 0; i < max_spatial_stream; i++) {
+                        evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+
+                        if (bpacket_match_bssid) {
+                                /* Fill value in RFD, Get the first
+                                 * spatial stream only
+                                 */
+                                if (i == 0)
+                                        pstatus->signalquality = evm & 0xff;
+                                pstatus->rx_mimo_sig_qual[i] = evm & 0xff;
+                        }
+                }
+        }
+
+        /* UI BSS List signal strength(in percentage),
+         * make it good looking, from 0~100.
+         */
+        if (is_cck)
+                pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
+                                          pwdb_all));
+        else if (rf_rx_num != 0)
+                pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
+                                          total_rssi /= rf_rx_num));
+        /*HW antenna diversity*/
+        rtldm->fat_table.antsel_rx_keep_0 = phystrpt->ant_sel;
+        rtldm->fat_table.antsel_rx_keep_1 = phystrpt->ant_sel_b;
+        rtldm->fat_table.antsel_rx_keep_2 = phystrpt->antsel_rx_keep_2;
+}
+
+static void _rtl88ee_smart_antenna(struct ieee80211_hw *hw,
+        struct rtl_stats *pstatus)
+{
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 ant_mux;
+        struct fast_ant_training *pfat = &(rtldm->fat_table);
+
+        if (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV) {
+                if (pfat->fat_state == FAT_TRAINING_STATE) {
+                        if (pstatus->packet_toself) {
+                                ant_mux = (pfat->antsel_rx_keep_2 << 2) |
+                                                (pfat->antsel_rx_keep_1 << 1) |
+                                                 pfat->antsel_rx_keep_0;
+                                pfat->ant_sum[ant_mux] += pstatus->rx_pwdb_all;
+                                pfat->ant_cnt[ant_mux]++;
+                        }
+                }
+        } else if ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) ||
+                   (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)) {
+                if (pstatus->packet_toself || pstatus->packet_matchbssid) {
+                        ant_mux = (pfat->antsel_rx_keep_2 << 2) |
+                                  (pfat->antsel_rx_keep_1 << 1) |
+                                   pfat->antsel_rx_keep_0;
+                        rtl88e_dm_ant_sel_statistics(hw, ant_mux, 0,
+                                                     pstatus->rx_pwdb_all);
+                }
+        }
+}
+
+static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw,
+                struct sk_buff *skb, struct rtl_stats *pstatus,
+                u8 *pdesc, struct rx_fwinfo_88e *p_drvinfo)
+{
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct ieee80211_hdr *hdr;
+        u8 *tmp_buf;
+        u8 *praddr;
+        u8 *psaddr;
+        __le16 fc;
+        u16 type, ufc;
+        bool match_bssid, packet_toself, packet_beacon, addr;
+
+        tmp_buf = skb->data + pstatus->rx_drvinfo_size + pstatus->rx_bufshift;
+
+        hdr = (struct ieee80211_hdr *)tmp_buf;
+        fc = hdr->frame_control;
+        ufc = le16_to_cpu(fc);
+        type = WLAN_FC_GET_TYPE(fc);
+        praddr = hdr->addr1;
+        psaddr = ieee80211_get_SA(hdr);
+        memcpy(pstatus->psaddr, psaddr, ETH_ALEN);
+
+        addr = (!compare_ether_addr(mac->bssid, (ufc & IEEE80211_FCTL_TODS) ?
+                hdr->addr1 : (ufc & IEEE80211_FCTL_FROMDS) ?
+                hdr->addr2 : hdr->addr3));
+        match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) &&
+                       (!pstatus->crc) && (!pstatus->icv)) && addr;
+
+        addr = (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+        packet_toself = match_bssid && addr;
+
+        if (ieee80211_is_beacon(fc))
+                packet_beacon = true;
+
+        _rtl88ee_query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
+                                   match_bssid, packet_toself, packet_beacon);
+        _rtl88ee_smart_antenna(hw, pstatus);
+        rtl_process_phyinfo(hw, tmp_buf, pstatus);
+}
+
+static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
+{
+        u32 dwtmp = 0;
+
+        memset(virtualaddress, 0, 8);
+
+        SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
+        if (ptcb_desc->empkt_num == 1) {
+                dwtmp = ptcb_desc->empkt_len[0];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[0];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[1];
+        }
+        SET_EARLYMODE_LEN0(virtualaddress, dwtmp);
+
+        if (ptcb_desc->empkt_num <= 3) {
+                dwtmp = ptcb_desc->empkt_len[2];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[2];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[3];
+        }
+        SET_EARLYMODE_LEN1(virtualaddress, dwtmp);
+        if (ptcb_desc->empkt_num <= 5) {
+                dwtmp = ptcb_desc->empkt_len[4];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[4];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[5];
+        }
+        SET_EARLYMODE_LEN2_1(virtualaddress, dwtmp & 0xF);
+        SET_EARLYMODE_LEN2_2(virtualaddress, dwtmp >> 4);
+        if (ptcb_desc->empkt_num <= 7) {
+                dwtmp = ptcb_desc->empkt_len[6];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[6];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[7];
+        }
+        SET_EARLYMODE_LEN3(virtualaddress, dwtmp);
+        if (ptcb_desc->empkt_num <= 9) {
+                dwtmp = ptcb_desc->empkt_len[8];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[8];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[9];
+        }
+        SET_EARLYMODE_LEN4(virtualaddress, dwtmp);
+}
+
+bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
+                           struct rtl_stats *status,
+                           struct ieee80211_rx_status *rx_status,
+                           u8 *pdesc, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rx_fwinfo_88e *p_drvinfo;
+        struct ieee80211_hdr *hdr;
+
+        u32 phystatus = GET_RX_DESC_PHYST(pdesc);
+        status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
+        if (status->packet_report_type == TX_REPORT2)
+                status->length = (u16) GET_RX_RPT2_DESC_PKT_LEN(pdesc);
+        else
+                status->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
+        status->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
+                                       RX_DRV_INFO_SIZE_UNIT;
+        status->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);
+        status->icv = (u16) GET_RX_DESC_ICV(pdesc);
+        status->crc = (u16) GET_RX_DESC_CRC32(pdesc);
+        status->hwerror = (status->crc | status->icv);
+        status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
+        status->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
+        status->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
+        status->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
+        status->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1) &&
+                                        (GET_RX_DESC_FAGGR(pdesc) == 1));
+        if (status->packet_report_type == NORMAL_RX)
+                status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
+        status->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
+        status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
+
+        status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);
+
+        status->macid = GET_RX_DESC_MACID(pdesc);
+        if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
+                status->wake_match = BIT(2);
+        else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
+                status->wake_match = BIT(1);
+        else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))
+                status->wake_match = BIT(0);
+        else
+                status->wake_match = 0;
+        if (status->wake_match)
+                RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
+                         "Get Wakeup Packet!! WakeMatch =%d\n",
+                         status->wake_match);
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
+
+        if (status->crc)
+                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
+
+        if (status->rx_is40Mhzpacket)
+                rx_status->flag |= RX_FLAG_40MHZ;
+
+        if (status->is_ht)
+                rx_status->flag |= RX_FLAG_HT;
+
+        rx_status->flag |= RX_FLAG_MACTIME_START;
+
+        /* hw will set status->decrypted true, if it finds the
+         * frame is open data frame or mgmt frame.
+         * So hw will not decryption robust managment frame
+         * for IEEE80211w but still set status->decrypted
+         * true, so here we should set it back to undecrypted
+         * for IEEE80211w frame, and mac80211 sw will help
+         * to decrypt it
+         */
+        if (status->decrypted) {
+                hdr = (struct ieee80211_hdr *)(skb->data +
+                       status->rx_drvinfo_size + status->rx_bufshift);
+
+                if (!hdr) {
+                        /* During testing, hdr was NULL */
+                        return false;
+                }
+                if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
+                    (ieee80211_has_protected(hdr->frame_control)))
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag |= RX_FLAG_DECRYPTED;
+        }
+
+        /* rate_idx: index of data rate into band's
+         * supported rates or MCS index if HT rates
+         * are use (RX_FLAG_HT)
+         * Notice: this is diff with windows define
+         */
+        rx_status->rate_idx = rtlwifi_rate_mapping(hw, status->is_ht,
+                                                   status->rate, false);
+
+        rx_status->mactime = status->timestamp_low;
+        if (phystatus == true) {
+                p_drvinfo = (struct rx_fwinfo_88e *)(skb->data +
+                                                     status->rx_bufshift);
+
+                _rtl88ee_translate_rx_signal_stuff(hw, skb, status, pdesc,
+                                                   p_drvinfo);
+        }
+
+        /*rx_status->qual = status->signal; */
+        rx_status->signal = status->recvsignalpower + 10;
+        /*rx_status->noise = -status->noise; */
+        if (status->packet_report_type == TX_REPORT2) {
+                status->macid_valid_entry[0] =
+                         GET_RX_RPT2_DESC_MACID_VALID_1(pdesc);
+                status->macid_valid_entry[1] =
+                         GET_RX_RPT2_DESC_MACID_VALID_2(pdesc);
+        }
+        return true;
+}
+
+void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
+                          struct ieee80211_hdr *hdr, u8 *pdesc_tx,
+                          struct ieee80211_tx_info *info,
+                          struct ieee80211_sta *sta,
+                          struct sk_buff *skb,
+                          u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        u8 *pdesc = (u8 *)pdesc_tx;
+        u16 seq_number;
+        __le16 fc = hdr->frame_control;
+        unsigned int buf_len = 0;
+        unsigned int skb_len = skb->len;
+        u8 fw_qsel = _rtl88ee_map_hwqueue_to_fwqueue(skb, hw_queue);
+        bool firstseg = ((hdr->seq_ctrl &
+                            cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
+        bool lastseg = ((hdr->frame_control &
+                           cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
+        dma_addr_t mapping;
+        u8 bw_40 = 0;
+        u8 short_gi = 0;
+
+        if (mac->opmode == NL80211_IFTYPE_STATION) {
+                bw_40 = mac->bw_40;
+        } else if (mac->opmode == NL80211_IFTYPE_AP ||
+                mac->opmode == NL80211_IFTYPE_ADHOC) {
+                if (sta)
+                        bw_40 = sta->ht_cap.cap &
+                                IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+        }
+        seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
+        rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
+        /* reserve 8 byte for AMPDU early mode */
+        if (rtlhal->earlymode_enable) {
+                skb_push(skb, EM_HDR_LEN);
+                memset(skb->data, 0, EM_HDR_LEN);
+        }
+        buf_len = skb->len;
+        mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
+                                 PCI_DMA_TODEVICE);
+        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "DMA mapping error");
+                return;
+        }
+        CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_88e));
+        if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
+                firstseg = true;
+                lastseg = true;
+        }
+        if (firstseg) {
+                if (rtlhal->earlymode_enable) {
+                        SET_TX_DESC_PKT_OFFSET(pdesc, 1);
+                        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN +
+                                           EM_HDR_LEN);
+                        if (ptcb_desc->empkt_num) {
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                                         "Insert 8 byte.pTcb->EMPktNum:%d\n",
+                                         ptcb_desc->empkt_num);
+                                insert_em(ptcb_desc, (u8 *)(skb->data));
+                        }
+                } else {
+                        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+                }
+
+                ptcb_desc->use_driver_rate = true;
+                SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
+                if (ptcb_desc->hw_rate > DESC92C_RATEMCS0)
+                        short_gi = (ptcb_desc->use_shortgi) ? 1 : 0;
+                else
+                        short_gi = (ptcb_desc->use_shortpreamble) ? 1 : 0;
+                SET_TX_DESC_DATA_SHORTGI(pdesc, short_gi);
+
+                if (info->flags & IEEE80211_TX_CTL_AMPDU) {
+                        SET_TX_DESC_AGG_ENABLE(pdesc, 1);
+                        SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);
+                }
+                SET_TX_DESC_SEQ(pdesc, seq_number);
+                SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
+                                              !ptcb_desc->cts_enable) ? 1 : 0));
+                SET_TX_DESC_HW_RTS_ENABLE(pdesc, 0);
+                SET_TX_DESC_CTS2SELF(pdesc, ((ptcb_desc->cts_enable) ? 1 : 0));
+                SET_TX_DESC_RTS_STBC(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
+
+                SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
+                SET_TX_DESC_RTS_BW(pdesc, 0);
+                SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
+                SET_TX_DESC_RTS_SHORT(pdesc,
+                        ((ptcb_desc->rts_rate <= DESC92C_RATE54M) ?
+                        (ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
+                        (ptcb_desc->rts_use_shortgi ? 1 : 0)));
+
+                if (ptcb_desc->btx_enable_sw_calc_duration)
+                        SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
+
+                if (bw_40) {
+                        if (ptcb_desc->packet_bw) {
+                                SET_TX_DESC_DATA_BW(pdesc, 1);
+                                SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
+                        } else {
+                                SET_TX_DESC_DATA_BW(pdesc, 0);
+                                SET_TX_DESC_TX_SUB_CARRIER(pdesc,
+                                                   mac->cur_40_prime_sc);
+                        }
+                } else {
+                        SET_TX_DESC_DATA_BW(pdesc, 0);
+                        SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
+                }
+
+                SET_TX_DESC_LINIP(pdesc, 0);
+                SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb_len);
+                if (sta) {
+                        u8 ampdu_density = sta->ht_cap.ampdu_density;
+                        SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
+                }
+                if (info->control.hw_key) {
+                        struct ieee80211_key_conf *keyconf;
+                        keyconf = info->control.hw_key;
+                        switch (keyconf->cipher) {
+                        case WLAN_CIPHER_SUITE_WEP40:
+                        case WLAN_CIPHER_SUITE_WEP104:
+                        case WLAN_CIPHER_SUITE_TKIP:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
+                                break;
+                        case WLAN_CIPHER_SUITE_CCMP:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
+                                break;
+                        default:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
+                                break;
+                        }
+                }
+
+                SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
+                SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
+                SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
+                SET_TX_DESC_DISABLE_FB(pdesc, ptcb_desc->disable_ratefallback ?
+                                       1 : 0);
+                SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
+
+                /* Set TxRate and RTSRate in TxDesc  */
+                /* This prevent Tx initial rate of new-coming packets */
+                /* from being overwritten by retried  packet rate.*/
+                if (!ptcb_desc->use_driver_rate) {
+                        /*SET_TX_DESC_RTS_RATE(pdesc, 0x08); */
+                        /* SET_TX_DESC_TX_RATE(pdesc, 0x0b); */
+                }
+                if (ieee80211_is_data_qos(fc)) {
+                        if (mac->rdg_en) {
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                                         "Enable RDG function.\n");
+                                SET_TX_DESC_RDG_ENABLE(pdesc, 1);
+                                SET_TX_DESC_HTC(pdesc, 1);
+                        }
+                }
+        }
+
+        SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
+        SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) buf_len);
+        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+        if (rtlpriv->dm.useramask) {
+                SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+        } else {
+                SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->ratr_index);
+        }
+        if (ieee80211_is_data_qos(fc))
+                SET_TX_DESC_QOS(pdesc, 1);
+
+        if (!ieee80211_is_data_qos(fc))
+                SET_TX_DESC_HWSEQ_EN(pdesc, 1);
+        SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
+        if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
+            is_broadcast_ether_addr(ieee80211_get_DA(hdr)))
+                SET_TX_DESC_BMC(pdesc, 1);
+
+        rtl88e_dm_set_tx_ant_by_tx_info(hw, pdesc, ptcb_desc->mac_id);
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
+}
+
+void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
+                             u8 *pdesc, bool firstseg,
+                             bool lastseg, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u8 fw_queue = QSLT_BEACON;
+
+        dma_addr_t mapping = pci_map_single(rtlpci->pdev,
+                                            skb->data, skb->len,
+                                            PCI_DMA_TODEVICE);
+
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
+        __le16 fc = hdr->frame_control;
+
+        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "DMA mapping error");
+                return;
+        }
+        CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
+
+        if (firstseg)
+                SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+
+        SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
+
+        SET_TX_DESC_SEQ(pdesc, 0);
+
+        SET_TX_DESC_LINIP(pdesc, 0);
+
+        SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
+
+        SET_TX_DESC_FIRST_SEG(pdesc, 1);
+        SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
+
+        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+
+        SET_TX_DESC_RATE_ID(pdesc, 7);
+        SET_TX_DESC_MACID(pdesc, 0);
+
+        SET_TX_DESC_OWN(pdesc, 1);
+
+        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
+
+        SET_TX_DESC_FIRST_SEG(pdesc, 1);
+        SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+        SET_TX_DESC_OFFSET(pdesc, 0x20);
+
+        SET_TX_DESC_USE_RATE(pdesc, 1);
+
+        if (!ieee80211_is_data_qos(fc))
+                SET_TX_DESC_HWSEQ_EN(pdesc, 1);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "H2C Tx Cmd Content\n",
+                      pdesc, TX_DESC_SIZE);
+}
+
+void rtl88ee_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
+{
+        if (istx == true) {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        SET_TX_DESC_OWN(pdesc, 1);
+                        break;
+                case HW_DESC_TX_NEXTDESC_ADDR:
+                        SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *)val);
+                        break;
+                default:
+                        RT_ASSERT(false, "ERR txdesc :%d not processed\n",
+                                  desc_name);
+                        break;
+                }
+        } else {
+                switch (desc_name) {
+                case HW_DESC_RXOWN:
+                        SET_RX_DESC_OWN(pdesc, 1);
+                        break;
+                case HW_DESC_RXBUFF_ADDR:
+                        SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *)val);
+                        break;
+                case HW_DESC_RXPKT_LEN:
+                        SET_RX_DESC_PKT_LEN(pdesc, *(u32 *)val);
+                        break;
+                case HW_DESC_RXERO:
+                        SET_RX_DESC_EOR(pdesc, 1);
+                        break;
+                default:
+                        RT_ASSERT(false, "ERR rxdesc :%d not processed\n",
+                                  desc_name);
+                        break;
+                }
+        }
+}
+
+u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name)
+{
+        u32 ret = 0;
+
+        if (istx == true) {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        ret = GET_TX_DESC_OWN(pdesc);
+                        break;
+                case HW_DESC_TXBUFF_ADDR:
+                        ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
+                        break;
+                default:
+                        RT_ASSERT(false, "ERR txdesc :%d not processed\n",
+                                  desc_name);
+                        break;
+                }
+        } else {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        ret = GET_RX_DESC_OWN(pdesc);
+                        break;
+                case HW_DESC_RXPKT_LEN:
+                        ret = GET_RX_DESC_PKT_LEN(pdesc);
+                        break;
+                default:
+                        RT_ASSERT(false, "ERR rxdesc :%d not processed\n",
+                                  desc_name);
+                        break;
+                }
+        }
+        return ret;
+}
+
+void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        if (hw_queue == BEACON_QUEUE) {
+                rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, BIT(4));
+        } else {
+                rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG,
+                               BIT(0) << (hw_queue));
+        }
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h
new file mode 100644
index 000000000000..d3a02e73f53a
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h
@@ -0,0 +1,795 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2013  Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92CE_TRX_H__
+#define __RTL92CE_TRX_H__
+
+#define TX_DESC_SIZE                            64
+#define TX_DESC_AGGR_SUBFRAME_SIZE              32
+
+#define RX_DESC_SIZE                            32
+#define RX_DRV_INFO_SIZE_UNIT                   8
+
+#define TX_DESC_NEXT_DESC_OFFSET                40
+#define USB_HWDESC_HEADER_LEN                   32
+#define CRCLENGTH                               4
+
+#define SET_TX_DESC_PKT_SIZE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val)
+#define SET_TX_DESC_OFFSET(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val)
+#define SET_TX_DESC_BMC(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val)
+#define SET_TX_DESC_HTC(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val)
+#define SET_TX_DESC_LAST_SEG(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val)
+#define SET_TX_DESC_FIRST_SEG(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)
+#define SET_TX_DESC_LINIP(__pdesc, __val)               \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val)
+#define SET_TX_DESC_NO_ACM(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val)
+#define SET_TX_DESC_GF(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
+#define SET_TX_DESC_OWN(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+#define GET_TX_DESC_PKT_SIZE(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 0, 16)
+#define GET_TX_DESC_OFFSET(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc, 16, 8)
+#define GET_TX_DESC_BMC(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 24, 1)
+#define GET_TX_DESC_HTC(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 25, 1)
+#define GET_TX_DESC_LAST_SEG(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 26, 1)
+#define GET_TX_DESC_FIRST_SEG(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc, 27, 1)
+#define GET_TX_DESC_LINIP(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 28, 1)
+#define GET_TX_DESC_NO_ACM(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc, 29, 1)
+#define GET_TX_DESC_GF(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc, 30, 1)
+#define GET_TX_DESC_OWN(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 31, 1)
+
+#define SET_TX_DESC_MACID(__pdesc, __val)               \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 6, __val)
+#define SET_TX_DESC_QUEUE_SEL(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val)
+#define SET_TX_DESC_RDG_NAV_EXT(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val)
+#define SET_TX_DESC_LSIG_TXOP_EN(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val)
+#define SET_TX_DESC_PIFS(__pdesc, __val)                \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)
+#define SET_TX_DESC_RATE_ID(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 4, __val)
+#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 20, 1, __val)
+#define SET_TX_DESC_EN_DESC_ID(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)
+#define SET_TX_DESC_SEC_TYPE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val)
+#define SET_TX_DESC_PKT_OFFSET(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 26, 5, __val)
+#define SET_TX_DESC_PADDING_LEN(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 8, __val)
+
+#define GET_TX_DESC_MACID(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+4, 0, 5)
+#define GET_TX_DESC_AGG_ENABLE(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 5, 1)
+#define GET_TX_DESC_AGG_BREAK(__pdesc)                          \
+        LE_BITS_TO_4BYTE(__pdesc+4, 6, 1)
+#define GET_TX_DESC_RDG_ENABLE(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 7, 1)
+#define GET_TX_DESC_QUEUE_SEL(__pdesc)                          \
+        LE_BITS_TO_4BYTE(__pdesc+4, 8, 5)
+#define GET_TX_DESC_RDG_NAV_EXT(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 13, 1)
+#define GET_TX_DESC_LSIG_TXOP_EN(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
+#define GET_TX_DESC_PIFS(__pdesc)                               \
+        LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
+#define GET_TX_DESC_RATE_ID(__pdesc)                            \
+        LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
+#define GET_TX_DESC_NAV_USE_HDR(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 20, 1)
+#define GET_TX_DESC_EN_DESC_ID(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 21, 1)
+#define GET_TX_DESC_SEC_TYPE(__pdesc)                           \
+        LE_BITS_TO_4BYTE(__pdesc+4, 22, 2)
+#define GET_TX_DESC_PKT_OFFSET(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 24, 8)
+
+#define SET_TX_DESC_RTS_RC(__pdesc, __val)                      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 6, __val)
+#define SET_TX_DESC_DATA_RC(__pdesc, __val)                     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 6, 6, __val)
+#define SET_TX_DESC_AGG_ENABLE(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 12, 1, __val)
+#define SET_TX_DESC_RDG_ENABLE(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 13, 1, __val)
+#define SET_TX_DESC_BAR_RTY_TH(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 14, 2, __val)
+#define SET_TX_DESC_AGG_BREAK(__pdesc, __val)                   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 16, 1, __val)
+#define SET_TX_DESC_MORE_FRAG(__pdesc, __val)                   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val)
+#define SET_TX_DESC_RAW(__pdesc, __val)                         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __val)
+#define SET_TX_DESC_CCX(__pdesc, __val)                         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 19, 1, __val)
+#define SET_TX_DESC_AMPDU_DENSITY(__pdesc, __val)               \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val)
+#define SET_TX_DESC_BT_INT(__pdesc, __val)                      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 23, 1, __val)
+#define SET_TX_DESC_ANTSEL_A(__pdesc, __val)                    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 24, 1, __val)
+#define SET_TX_DESC_ANTSEL_B(__pdesc, __val)                    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 25, 1, __val)
+#define SET_TX_DESC_TX_ANT_CCK(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 26, 2, __val)
+#define SET_TX_DESC_TX_ANTL(__pdesc, __val)                     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 28, 2, __val)
+#define SET_TX_DESC_TX_ANT_HT(__pdesc, __val)                   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 30, 2, __val)
+
+#define GET_TX_DESC_RTS_RC(__pdesc)                             \
+        LE_BITS_TO_4BYTE(__pdesc+8, 0, 6)
+#define GET_TX_DESC_DATA_RC(__pdesc)                            \
+        LE_BITS_TO_4BYTE(__pdesc+8, 6, 6)
+#define GET_TX_DESC_BAR_RTY_TH(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+8, 14, 2)
+#define GET_TX_DESC_MORE_FRAG(__pdesc)                          \
+        LE_BITS_TO_4BYTE(__pdesc+8, 17, 1)
+#define GET_TX_DESC_RAW(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+8, 18, 1)
+#define GET_TX_DESC_CCX(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+8, 19, 1)
+#define GET_TX_DESC_AMPDU_DENSITY(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+8, 20, 3)
+#define GET_TX_DESC_ANTSEL_A(__pdesc)                           \
+        LE_BITS_TO_4BYTE(__pdesc+8, 24, 1)
+#define GET_TX_DESC_ANTSEL_B(__pdesc)                           \
+        LE_BITS_TO_4BYTE(__pdesc+8, 25, 1)
+#define GET_TX_DESC_TX_ANT_CCK(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+8, 26, 2)
+#define GET_TX_DESC_TX_ANTL(__pdesc)                            \
+        LE_BITS_TO_4BYTE(__pdesc+8, 28, 2)
+#define GET_TX_DESC_TX_ANT_HT(__pdesc)                          \
+        LE_BITS_TO_4BYTE(__pdesc+8, 30, 2)
+
+#define SET_TX_DESC_NEXT_HEAP_PAGE(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 8, __val)
+#define SET_TX_DESC_TAIL_PAGE(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 8, __val)
+#define SET_TX_DESC_SEQ(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 12, __val)
+#define SET_TX_DESC_CPU_HANDLE(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 28, 1, __val)
+#define SET_TX_DESC_TAG1(__pdesc, __val)                        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 29, 1, __val)
+#define SET_TX_DESC_TRIGGER_INT(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 30, 1, __val)
+#define SET_TX_DESC_HWSEQ_EN(__pdesc, __val)                    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 31, 1, __val)
+
+
+#define GET_TX_DESC_NEXT_HEAP_PAGE(__pdesc)             \
+        LE_BITS_TO_4BYTE(__pdesc+12, 0, 8)
+#define GET_TX_DESC_TAIL_PAGE(__pdesc)                          \
+        LE_BITS_TO_4BYTE(__pdesc+12, 8, 8)
+#define GET_TX_DESC_SEQ(__pdesc)                                        \
+        LE_BITS_TO_4BYTE(__pdesc+12, 16, 12)
+
+
+#define SET_TX_DESC_RTS_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 5, __val)
+#define SET_TX_DESC_AP_DCFE(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 5, 1, __val)
+#define SET_TX_DESC_QOS(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 6, 1, __val)
+#define SET_TX_DESC_HWSEQ_SSN(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 7, 1, __val)
+#define SET_TX_DESC_USE_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 1, __val)
+#define SET_TX_DESC_DISABLE_RTS_FB(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 9, 1, __val)
+#define SET_TX_DESC_DISABLE_FB(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 10, 1, __val)
+#define SET_TX_DESC_CTS2SELF(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 11, 1, __val)
+#define SET_TX_DESC_RTS_ENABLE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 12, 1, __val)
+#define SET_TX_DESC_HW_RTS_ENABLE(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 1, __val)
+#define SET_TX_DESC_PORT_ID(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 14, 1, __val)
+#define SET_TX_DESC_PWR_STATUS(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 15, 3, __val)
+#define SET_TX_DESC_WAIT_DCTS(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 18, 1, __val)
+#define SET_TX_DESC_CTS2AP_EN(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 19, 1, __val)
+#define SET_TX_DESC_TX_SUB_CARRIER(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 20, 2, __val)
+#define SET_TX_DESC_TX_STBC(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 22, 2, __val)
+#define SET_TX_DESC_DATA_SHORT(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 1, __val)
+#define SET_TX_DESC_DATA_BW(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 25, 1, __val)
+#define SET_TX_DESC_RTS_SHORT(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 26, 1, __val)
+#define SET_TX_DESC_RTS_BW(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 27, 1, __val)
+#define SET_TX_DESC_RTS_SC(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 28, 2, __val)
+#define SET_TX_DESC_RTS_STBC(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 30, 2, __val)
+
+#define GET_TX_DESC_RTS_RATE(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+16, 0, 5)
+#define GET_TX_DESC_AP_DCFE(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+16, 5, 1)
+#define GET_TX_DESC_QOS(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+16, 6, 1)
+#define GET_TX_DESC_HWSEQ_EN(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+16, 7, 1)
+#define GET_TX_DESC_USE_RATE(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+16, 8, 1)
+#define GET_TX_DESC_DISABLE_RTS_FB(__pdesc)             \
+        LE_BITS_TO_4BYTE(__pdesc+16, 9, 1)
+#define GET_TX_DESC_DISABLE_FB(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+16, 10, 1)
+#define GET_TX_DESC_CTS2SELF(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+16, 11, 1)
+#define GET_TX_DESC_RTS_ENABLE(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+16, 12, 1)
+#define GET_TX_DESC_HW_RTS_ENABLE(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc+16, 13, 1)
+#define GET_TX_DESC_PORT_ID(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+16, 14, 1)
+#define GET_TX_DESC_WAIT_DCTS(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+16, 18, 1)
+#define GET_TX_DESC_CTS2AP_EN(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+16, 19, 1)
+#define GET_TX_DESC_TX_SUB_CARRIER(__pdesc)             \
+        LE_BITS_TO_4BYTE(__pdesc+16, 20, 2)
+#define GET_TX_DESC_TX_STBC(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+16, 22, 2)
+#define GET_TX_DESC_DATA_SHORT(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+16, 24, 1)
+#define GET_TX_DESC_DATA_BW(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+16, 25, 1)
+#define GET_TX_DESC_RTS_SHORT(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+16, 26, 1)
+#define GET_TX_DESC_RTS_BW(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+16, 27, 1)
+#define GET_TX_DESC_RTS_SC(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+16, 28, 2)
+#define GET_TX_DESC_RTS_STBC(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+16, 30, 2)
+
+#define SET_TX_DESC_TX_RATE(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 6, __val)
+#define SET_TX_DESC_DATA_SHORTGI(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 6, 1, __val)
+#define SET_TX_DESC_CCX_TAG(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 7, 1, __val)
+#define SET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 5, __val)
+#define SET_TX_DESC_RTS_RATE_FB_LIMIT(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val)
+#define SET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 17, 1, __val)
+#define SET_TX_DESC_DATA_RETRY_LIMIT(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 18, 6, __val)
+#define SET_TX_DESC_USB_TXAGG_NUM(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 24, 8, __val)
+
+#define GET_TX_DESC_TX_RATE(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+20, 0, 6)
+#define GET_TX_DESC_DATA_SHORTGI(__pdesc)               \
+        LE_BITS_TO_4BYTE(__pdesc+20, 6, 1)
+#define GET_TX_DESC_CCX_TAG(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+20, 7, 1)
+#define GET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc)         \
+        LE_BITS_TO_4BYTE(__pdesc+20, 8, 5)
+#define GET_TX_DESC_RTS_RATE_FB_LIMIT(__pdesc)          \
+        LE_BITS_TO_4BYTE(__pdesc+20, 13, 4)
+#define GET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc)         \
+        LE_BITS_TO_4BYTE(__pdesc+20, 17, 1)
+#define GET_TX_DESC_DATA_RETRY_LIMIT(__pdesc)           \
+        LE_BITS_TO_4BYTE(__pdesc+20, 18, 6)
+#define GET_TX_DESC_USB_TXAGG_NUM(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc+20, 24, 8)
+
+#define SET_TX_DESC_TXAGC_A(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 5, __val)
+#define SET_TX_DESC_TXAGC_B(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 5, 5, __val)
+#define SET_TX_DESC_USE_MAX_LEN(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 10, 1, __val)
+#define SET_TX_DESC_MAX_AGG_NUM(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 11, 5, __val)
+#define SET_TX_DESC_MCSG1_MAX_LEN(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 16, 4, __val)
+#define SET_TX_DESC_MCSG2_MAX_LEN(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 20, 4, __val)
+#define SET_TX_DESC_MCSG3_MAX_LEN(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 24, 4, __val)
+#define SET_TX_DESC_MCS7_SGI_MAX_LEN(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 28, 4, __val)
+
+#define GET_TX_DESC_TXAGC_A(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+24, 0, 5)
+#define GET_TX_DESC_TXAGC_B(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+24, 5, 5)
+#define GET_TX_DESC_USE_MAX_LEN(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+24, 10, 1)
+#define GET_TX_DESC_MAX_AGG_NUM(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+24, 11, 5)
+#define GET_TX_DESC_MCSG1_MAX_LEN(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc+24, 16, 4)
+#define GET_TX_DESC_MCSG2_MAX_LEN(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc+24, 20, 4)
+#define GET_TX_DESC_MCSG3_MAX_LEN(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc+24, 24, 4)
+#define GET_TX_DESC_MCS7_SGI_MAX_LEN(__pdesc)           \
+        LE_BITS_TO_4BYTE(__pdesc+24, 28, 4)
+
+#define SET_TX_DESC_TX_BUFFER_SIZE(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val)
+#define SET_TX_DESC_SW_OFFSET30(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 16, 8, __val)
+#define SET_TX_DESC_SW_OFFSET31(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 24, 4, __val)
+#define SET_TX_DESC_ANTSEL_C(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 29, 1, __val)
+#define SET_TX_DESC_NULL_0(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 30, 1, __val)
+#define SET_TX_DESC_NULL_1(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 30, 1, __val)
+
+#define GET_TX_DESC_TX_BUFFER_SIZE(__pdesc)             \
+        LE_BITS_TO_4BYTE(__pdesc+28, 0, 16)
+
+
+#define SET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 0, 32, __val)
+#define SET_TX_DESC_TX_BUFFER_ADDRESS64(__pdesc, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 0, 32, __val)
+
+#define GET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc)          \
+        LE_BITS_TO_4BYTE(__pdesc+32, 0, 32)
+#define GET_TX_DESC_TX_BUFFER_ADDRESS64(__pdesc)        \
+        LE_BITS_TO_4BYTE(__pdesc+36, 0, 32)
+
+#define SET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val)
+#define SET_TX_DESC_NEXT_DESC_ADDRESS64(__pdesc, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+44, 0, 32, __val)
+
+#define GET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc)          \
+        LE_BITS_TO_4BYTE(__pdesc+40, 0, 32)
+#define GET_TX_DESC_NEXT_DESC_ADDRESS64(__pdesc)        \
+        LE_BITS_TO_4BYTE(__pdesc+44, 0, 32)
+
+#define GET_RX_DESC_PKT_LEN(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc, 0, 14)
+#define GET_RX_DESC_CRC32(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 14, 1)
+#define GET_RX_DESC_ICV(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 15, 1)
+#define GET_RX_DESC_DRV_INFO_SIZE(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc, 16, 4)
+#define GET_RX_DESC_SECURITY(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 20, 3)
+#define GET_RX_DESC_QOS(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 23, 1)
+#define GET_RX_DESC_SHIFT(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 24, 2)
+#define GET_RX_DESC_PHYST(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 26, 1)
+#define GET_RX_DESC_SWDEC(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 27, 1)
+#define GET_RX_DESC_LS(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc, 28, 1)
+#define GET_RX_DESC_FS(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc, 29, 1)
+#define GET_RX_DESC_EOR(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 30, 1)
+#define GET_RX_DESC_OWN(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 31, 1)
+
+#define SET_RX_DESC_PKT_LEN(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val)
+#define SET_RX_DESC_EOR(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
+#define SET_RX_DESC_OWN(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+#define GET_RX_DESC_MACID(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 0, 6)
+#define GET_RX_DESC_PAGGR(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
+#define GET_RX_DESC_FAGGR(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
+#define GET_RX_DESC_A1_FIT(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
+#define GET_RX_DESC_A2_FIT(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+4, 20, 4)
+#define GET_RX_DESC_PAM(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 24, 1)
+#define GET_RX_DESC_PWR(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 25, 1)
+#define GET_RX_DESC_MD(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 26, 1)
+#define GET_RX_DESC_MF(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 27, 1)
+#define GET_RX_DESC_TYPE(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+4, 28, 2)
+#define GET_RX_DESC_MC(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 30, 1)
+#define GET_RX_DESC_BC(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 31, 1)
+#define GET_RX_DESC_SEQ(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+8, 0, 12)
+#define GET_RX_DESC_FRAG(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+8, 12, 4)
+
+#define GET_RX_DESC_RXMCS(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+12, 0, 6)
+#define GET_RX_DESC_RXHT(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 6, 1)
+#define GET_RX_STATUS_DESC_RX_GF(__pdesc)               \
+        LE_BITS_TO_4BYTE(__pdesc+12, 7, 1)
+#define GET_RX_DESC_SPLCP(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+12, 8, 1)
+#define GET_RX_DESC_BW(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+12, 9, 1)
+#define GET_RX_DESC_HTC(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+12, 10, 1)
+#define GET_RX_STATUS_DESC_EOSP(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+12, 11, 1)
+#define GET_RX_STATUS_DESC_BSSID_FIT(__pdesc)           \
+        LE_BITS_TO_4BYTE(__pdesc+12, 12, 2)
+#define GET_RX_STATUS_DESC_RPT_SEL(__pdesc)             \
+        LE_BITS_TO_4BYTE(__pdesc+12, 14, 2)
+
+#define GET_RX_STATUS_DESC_PATTERN_MATCH(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 29, 1)
+#define GET_RX_STATUS_DESC_UNICAST_MATCH(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 30, 1)
+#define GET_RX_STATUS_DESC_MAGIC_MATCH(__pdesc)         \
+        LE_BITS_TO_4BYTE(__pdesc+12, 31, 1)
+
+#define GET_RX_DESC_IV1(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+16, 0, 32)
+#define GET_RX_DESC_TSFL(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+20, 0, 32)
+
+#define GET_RX_DESC_BUFF_ADDR(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+24, 0, 32)
+#define GET_RX_DESC_BUFF_ADDR64(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+28, 0, 32)
+
+#define SET_RX_DESC_BUFF_ADDR(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val)
+#define SET_RX_DESC_BUFF_ADDR64(__pdesc, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val)
+
+/* TX report 2 format in Rx desc*/
+
+#define GET_RX_RPT2_DESC_PKT_LEN(__status)      \
+        LE_BITS_TO_4BYTE(__status, 0, 9)
+#define GET_RX_RPT2_DESC_MACID_VALID_1(__status)        \
+        LE_BITS_TO_4BYTE(__status+16, 0, 32)
+#define GET_RX_RPT2_DESC_MACID_VALID_2(__status)        \
+        LE_BITS_TO_4BYTE(__status+20, 0, 32)
+
+#define SET_EARLYMODE_PKTNUM(__paddr, __value)  \
+        SET_BITS_TO_LE_4BYTE(__paddr, 0, 4, __value)
+#define SET_EARLYMODE_LEN0(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr, 4, 12, __value)
+#define SET_EARLYMODE_LEN1(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr, 16, 12, __value)
+#define SET_EARLYMODE_LEN2_1(__paddr, __value)  \
+        SET_BITS_TO_LE_4BYTE(__paddr, 28, 4, __value)
+#define SET_EARLYMODE_LEN2_2(__paddr, __value)  \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 0, 8, __value)
+#define SET_EARLYMODE_LEN3(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 8, 12, __value)
+#define SET_EARLYMODE_LEN4(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 20, 12, __value)
+
+#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)               \
+do {                                                            \
+        if (_size > TX_DESC_NEXT_DESC_OFFSET)                   \
+                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
+        else                                                    \
+                memset(__pdesc, 0, _size);                      \
+} while (0)
+
+#define RTL8188_RX_HAL_IS_CCK_RATE(rxmcs)\
+        (rxmcs == DESC92C_RATE1M ||\
+         rxmcs == DESC92C_RATE2M ||\
+         rxmcs == DESC92C_RATE5_5M ||\
+         rxmcs == DESC92C_RATE11M)
+
+struct phy_rx_agc_info_t {
+        #if __LITTLE_ENDIAN
+                u8      gain:7, trsw:1;
+        #else
+                u8      trsw:1, gain:7;
+        #endif
+};
+struct phy_status_rpt {
+        struct phy_rx_agc_info_t path_agc[2];
+        u8      ch_corr[2];
+        u8      cck_sig_qual_ofdm_pwdb_all;
+        u8      cck_agc_rpt_ofdm_cfosho_a;
+        u8      cck_rpt_b_ofdm_cfosho_b;
+        u8      rsvd_1;
+        u8      noise_power_db_msb;
+        u8      path_cfotail[2];
+        u8      pcts_mask[2];
+        u8      stream_rxevm[2];
+        u8      path_rxsnr[2];
+        u8      noise_power_db_lsb;
+        u8      rsvd_2[3];
+        u8      stream_csi[2];
+        u8      stream_target_csi[2];
+        u8      sig_evm;
+        u8      rsvd_3;
+#if __LITTLE_ENDIAN
+        u8      antsel_rx_keep_2:1;     /*ex_intf_flg:1;*/
+        u8      sgi_en:1;
+        u8      rxsc:2;
+        u8      idle_long:1;
+        u8      r_ant_train_en:1;
+        u8      ant_sel_b:1;
+        u8      ant_sel:1;
+#else   /* _BIG_ENDIAN_ */
+        u8      ant_sel:1;
+        u8      ant_sel_b:1;
+        u8      r_ant_train_en:1;
+        u8      idle_long:1;
+        u8      rxsc:2;
+        u8      sgi_en:1;
+        u8      antsel_rx_keep_2:1;     /*ex_intf_flg:1;*/
+#endif
+} __packed;
+
+struct rx_fwinfo_88e {
+        u8 gain_trsw[4];
+        u8 pwdb_all;
+        u8 cfosho[4];
+        u8 cfotail[4];
+        char rxevm[2];
+        char rxsnr[4];
+        u8 pdsnr[2];
+        u8 csi_current[2];
+        u8 csi_target[2];
+        u8 sigevm;
+        u8 max_ex_pwr;
+        u8 ex_intf_flag:1;
+        u8 sgi_en:1;
+        u8 rxsc:2;
+        u8 reserve:4;
+} __packed;
+
+struct tx_desc_88e {
+        u32 pktsize:16;
+        u32 offset:8;
+        u32 bmc:1;
+        u32 htc:1;
+        u32 lastseg:1;
+        u32 firstseg:1;
+        u32 linip:1;
+        u32 noacm:1;
+        u32 gf:1;
+        u32 own:1;
+
+        u32 macid:6;
+        u32 rsvd0:2;
+        u32 queuesel:5;
+        u32 rd_nav_ext:1;
+        u32 lsig_txop_en:1;
+        u32 pifs:1;
+        u32 rateid:4;
+        u32 nav_usehdr:1;
+        u32 en_descid:1;
+        u32 sectype:2;
+        u32 pktoffset:8;
+
+        u32 rts_rc:6;
+        u32 data_rc:6;
+        u32 agg_en:1;
+        u32 rdg_en:1;
+        u32 bar_retryht:2;
+        u32 agg_break:1;
+        u32 morefrag:1;
+        u32 raw:1;
+        u32 ccx:1;
+        u32 ampdudensity:3;
+        u32 bt_int:1;
+        u32 ant_sela:1;
+        u32 ant_selb:1;
+        u32 txant_cck:2;
+        u32 txant_l:2;
+        u32 txant_ht:2;
+
+        u32 nextheadpage:8;
+        u32 tailpage:8;
+        u32 seq:12;
+        u32 cpu_handle:1;
+        u32 tag1:1;
+        u32 trigger_int:1;
+        u32 hwseq_en:1;
+
+        u32 rtsrate:5;
+        u32 apdcfe:1;
+        u32 qos:1;
+        u32 hwseq_ssn:1;
+        u32 userrate:1;
+        u32 dis_rtsfb:1;
+        u32 dis_datafb:1;
+        u32 cts2self:1;
+        u32 rts_en:1;
+        u32 hwrts_en:1;
+        u32 portid:1;
+        u32 pwr_status:3;
+        u32 waitdcts:1;
+        u32 cts2ap_en:1;
+        u32 txsc:2;
+        u32 stbc:2;
+        u32 txshort:1;
+        u32 txbw:1;
+        u32 rtsshort:1;
+        u32 rtsbw:1;
+        u32 rtssc:2;
+        u32 rtsstbc:2;
+
+        u32 txrate:6;
+        u32 shortgi:1;
+        u32 ccxt:1;
+        u32 txrate_fb_lmt:5;
+        u32 rtsrate_fb_lmt:4;
+        u32 retrylmt_en:1;
+        u32 txretrylmt:6;
+        u32 usb_txaggnum:8;
+
+        u32 txagca:5;
+        u32 txagcb:5;
+        u32 usemaxlen:1;
+        u32 maxaggnum:5;
+        u32 mcsg1maxlen:4;
+        u32 mcsg2maxlen:4;
+        u32 mcsg3maxlen:4;
+        u32 mcs7sgimaxlen:4;
+
+        u32 txbuffersize:16;
+        u32 sw_offset30:8;
+        u32 sw_offset31:4;
+        u32 rsvd1:1;
+        u32 antsel_c:1;
+        u32 null_0:1;
+        u32 null_1:1;
+
+        u32 txbuffaddr;
+        u32 txbufferaddr64;
+        u32 nextdescaddress;
+        u32 nextdescaddress64;
+
+        u32 reserve_pass_pcie_mm_limit[4];
+} __packed;
+
+struct rx_desc_88e {
+        u32 length:14;
+        u32 crc32:1;
+        u32 icverror:1;
+        u32 drv_infosize:4;
+        u32 security:3;
+        u32 qos:1;
+        u32 shift:2;
+        u32 phystatus:1;
+        u32 swdec:1;
+        u32 lastseg:1;
+        u32 firstseg:1;
+        u32 eor:1;
+        u32 own:1;
+
+        u32 macid:6;
+        u32 tid:4;
+        u32 hwrsvd:5;
+        u32 paggr:1;
+        u32 faggr:1;
+        u32 a1_fit:4;
+        u32 a2_fit:4;
+        u32 pam:1;
+        u32 pwr:1;
+        u32 moredata:1;
+        u32 morefrag:1;
+        u32 type:2;
+        u32 mc:1;
+        u32 bc:1;
+
+        u32 seq:12;
+        u32 frag:4;
+        u32 nextpktlen:14;
+        u32 nextind:1;
+        u32 rsvd:1;
+
+        u32 rxmcs:6;
+        u32 rxht:1;
+        u32 amsdu:1;
+        u32 splcp:1;
+        u32 bandwidth:1;
+        u32 htc:1;
+        u32 tcpchk_rpt:1;
+        u32 ipcchk_rpt:1;
+        u32 tcpchk_valid:1;
+        u32 hwpcerr:1;
+        u32 hwpcind:1;
+        u32 iv0:16;
+
+        u32 iv1;
+
+        u32 tsfl;
+
+        u32 bufferaddress;
+        u32 bufferaddress64;
+
+} __packed;
+
+void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
+                          struct ieee80211_hdr *hdr, u8 *pdesc_tx,
+                          struct ieee80211_tx_info *info,
+                          struct ieee80211_sta *sta,
+                          struct sk_buff *skb,
+                          u8 hw_queue, struct rtl_tcb_desc *ptcb_desc);
+bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
+                           struct rtl_stats *status,
+                           struct ieee80211_rx_status *rx_status,
+                           u8 *pdesc, struct sk_buff *skb);
+void rtl88ee_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val);
+u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name);
+void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
+void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
+                             bool b_firstseg, bool b_lastseg,
+                             struct sk_buff *skb);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index b793a659a465..d2d57a27a7c1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -174,8 +174,8 @@ static void rtl92c_dm_diginit(struct ieee80211_hw *hw)
         dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
         dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
         dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
-        dm_digtable->rx_gain_range_max = DM_DIG_MAX;
-        dm_digtable->rx_gain_range_min = DM_DIG_MIN;
+        dm_digtable->rx_gain_max = DM_DIG_MAX;
+        dm_digtable->rx_gain_min = DM_DIG_MIN;
         dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
         dm_digtable->back_range_max = DM_DIG_BACKOFF_MAX;
         dm_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
@@ -300,11 +300,11 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw)
         }
 
         if ((digtable->rssi_val_min + 10 - digtable->back_val) >
-            digtable->rx_gain_range_max)
-                digtable->cur_igvalue = digtable->rx_gain_range_max;
+            digtable->rx_gain_max)
+                digtable->cur_igvalue = digtable->rx_gain_max;
         else if ((digtable->rssi_val_min + 10 -
-                  digtable->back_val) < digtable->rx_gain_range_min)
-                digtable->cur_igvalue = digtable->rx_gain_range_min;
+                  digtable->back_val) < digtable->rx_gain_min)
+                digtable->cur_igvalue = digtable->rx_gain_min;
         else
                 digtable->cur_igvalue = digtable->rssi_val_min + 10 -
                     digtable->back_val;
@@ -669,7 +669,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
         u8 thermalvalue, delta, delta_lck, delta_iqk;
         long ele_a, ele_d, temp_cck, val_x, value32;
         long val_y, ele_c = 0;
-        u8 ofdm_index[2], ofdm_index_old[2], cck_index_old = 0;
+        u8 ofdm_index[2], ofdm_index_old[2] = {0, 0}, cck_index_old = 0;
         s8 cck_index = 0;
         int i;
         bool is2t = IS_92C_SERIAL(rtlhal->version);
@@ -717,7 +717,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                         for (i = 0; i < OFDM_TABLE_LENGTH; i++) {
                                 if (ele_d == (ofdmswing_table[i] &
                                     MASKOFDM_D)) {
-
+                                        ofdm_index_old[1] = (u8) i;
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
                                                  "Initial pathB ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
@@ -1147,75 +1147,6 @@ void rtl92c_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL(rtl92c_dm_init_rate_adaptive_mask);
 
-static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rate_adaptive *p_ra = &(rtlpriv->ra);
-        u32 low_rssi_thresh, high_rssi_thresh;
-        struct ieee80211_sta *sta = NULL;
-
-        if (is_hal_stop(rtlhal)) {
-                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                         "<---- driver is going to unload\n");
-                return;
-        }
-
-        if (!rtlpriv->dm.useramask) {
-                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                         "<---- driver does not control rate adaptive mask\n");
-                return;
-        }
-
-        if (mac->link_state == MAC80211_LINKED &&
-            mac->opmode == NL80211_IFTYPE_STATION) {
-                switch (p_ra->pre_ratr_state) {
-                case DM_RATR_STA_HIGH:
-                        high_rssi_thresh = 50;
-                        low_rssi_thresh = 20;
-                        break;
-                case DM_RATR_STA_MIDDLE:
-                        high_rssi_thresh = 55;
-                        low_rssi_thresh = 20;
-                        break;
-                case DM_RATR_STA_LOW:
-                        high_rssi_thresh = 50;
-                        low_rssi_thresh = 25;
-                        break;
-                default:
-                        high_rssi_thresh = 50;
-                        low_rssi_thresh = 20;
-                        break;
-                }
-
-                if (rtlpriv->dm.undec_sm_pwdb > (long)high_rssi_thresh)
-                        p_ra->ratr_state = DM_RATR_STA_HIGH;
-                else if (rtlpriv->dm.undec_sm_pwdb > (long)low_rssi_thresh)
-                        p_ra->ratr_state = DM_RATR_STA_MIDDLE;
-                else
-                        p_ra->ratr_state = DM_RATR_STA_LOW;
-
-                if (p_ra->pre_ratr_state != p_ra->ratr_state) {
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, "RSSI = %ld\n",
-                                 rtlpriv->dm.undec_sm_pwdb);
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 "PreState = %d, CurState = %d\n",
-                                 p_ra->pre_ratr_state, p_ra->ratr_state);
-
-                        rcu_read_lock();
-                        sta = ieee80211_find_sta(mac->vif, mac->bssid);
-                        rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
-                                        p_ra->ratr_state);
-
-                        p_ra->pre_ratr_state = p_ra->ratr_state;
-                        rcu_read_unlock();
-                }
-        }
-}
-
 static void rtl92c_dm_init_dynamic_bb_powersaving(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1437,6 +1368,9 @@ void rtl92c_dm_watchdog(struct ieee80211_hw *hw)
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
                                       (u8 *) (&fw_ps_awake));
 
+        if (ppsc->p2p_ps_info.p2p_ps_mode)
+                fw_ps_awake = false;
+
         if ((ppsc->rfpwr_state == ERFON) && ((!fw_current_inpsmode) &&
                                              fw_ps_awake)
             && (!ppsc->rfchange_inprogress)) {
@@ -1446,7 +1380,7 @@ void rtl92c_dm_watchdog(struct ieee80211_hw *hw)
                 rtl92c_dm_dynamic_bb_powersaving(hw);
                 rtl92c_dm_dynamic_txpower(hw);
                 rtl92c_dm_check_txpower_tracking(hw);
-                rtl92c_dm_refresh_rate_adaptive_mask(hw);
+                /* rtl92c_dm_refresh_rate_adaptive_mask(hw); */
                 rtl92c_dm_bt_coexist(hw);
                 rtl92c_dm_check_edca_turbo(hw);
         }
@@ -1651,7 +1585,7 @@ static void rtl92c_bt_set_normal(struct ieee80211_hw *hw)
         }
 }
 
-static void rtl92c_bt_ant_isolation(struct ieee80211_hw *hw)
+static void rtl92c_bt_ant_isolation(struct ieee80211_hw *hw, u8 tmp1byte)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
@@ -1673,9 +1607,9 @@ static void rtl92c_bt_ant_isolation(struct ieee80211_hw *hw)
                             BT_RSSI_STATE_SPECIAL_LOW)) {
                         rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);
                 } else if (rtlpcipriv->bt_coexist.bt_service == BT_PAN) {
-                        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0x00);
+                        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, tmp1byte);
                 } else {
-                        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0x00);
+                        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, tmp1byte);
                 }
         }
 
@@ -1726,12 +1660,17 @@ static void rtl92c_check_bt_change(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp1byte = 0;
 
+        if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version) &&
+            rtlpcipriv->bt_coexist.bt_coexistence)
+                tmp1byte |= BIT(5);
         if (rtlpcipriv->bt_coexist.bt_cur_state) {
                 if (rtlpcipriv->bt_coexist.bt_ant_isolation)
-                        rtl92c_bt_ant_isolation(hw);
+                        rtl92c_bt_ant_isolation(hw, tmp1byte);
         } else {
-                rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0x00);
+                rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, tmp1byte);
                 rtlpriv->cfg->ops->set_rfreg(hw, RF90_PATH_A, 0x1e, 0xf0,
                                 rtlpcipriv->bt_coexist.bt_rfreg_origin_1e);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 883f23ae9519..04a41628ceed 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -552,7 +552,9 @@ void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
-        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode, 1);
+        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
+                                         (rtlpriv->mac80211.p2p) ?
+                                         ppsc->smart_ps : 1);
         SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
                                               ppsc->reg_max_lps_awakeintvl);
 
@@ -808,3 +810,98 @@ void rtl92c_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
         rtl92c_fill_h2c_cmd(hw, H2C_JOINBSSRPT, 1, u1_joinbssrpt_parm);
 }
 EXPORT_SYMBOL(rtl92c_set_fw_joinbss_report_cmd);
+
+static void rtl92c_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw, u8 ctwindow)
+{
+        u8 u1_ctwindow_period[1] = {ctwindow};
+
+        rtl92c_fill_h2c_cmd(hw, H2C_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
+}
+
+void rtl92c_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_p2p_ps_info *p2pinfo = &(rtlps->p2p_ps_info);
+        struct p2p_ps_offload_t *p2p_ps_offload = &rtlhal->p2p_ps_offload;
+        u8      i;
+        u16     ctwindow;
+        u32     start_time, tsf_low;
+
+        switch (p2p_ps_state) {
+        case P2P_PS_DISABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
+                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
+                break;
+        case P2P_PS_ENABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
+                /* update CTWindow value. */
+                if (p2pinfo->ctwindow > 0) {
+                        p2p_ps_offload->ctwindow_en = 1;
+                        ctwindow = p2pinfo->ctwindow;
+                        rtl92c_set_p2p_ctw_period_cmd(hw, ctwindow);
+                }
+                /* hw only support 2 set of NoA */
+                for (i = 0; i < p2pinfo->noa_num; i++) {
+                        /* To control the register setting for which NOA*/
+                        rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
+                        if (i == 0)
+                                p2p_ps_offload->noa0_en = 1;
+                        else
+                                p2p_ps_offload->noa1_en = 1;
+
+                        /* config P2P NoA Descriptor Register */
+                        rtl_write_dword(rtlpriv, 0x5E0,
+                                        p2pinfo->noa_duration[i]);
+                        rtl_write_dword(rtlpriv, 0x5E4,
+                                        p2pinfo->noa_interval[i]);
+
+                        /*Get Current TSF value */
+                        tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                        start_time = p2pinfo->noa_start_time[i];
+                        if (p2pinfo->noa_count_type[i] != 1) {
+                                while (start_time <= (tsf_low+(50*1024))) {
+                                        start_time += p2pinfo->noa_interval[i];
+                                        if (p2pinfo->noa_count_type[i] != 255)
+                                                p2pinfo->noa_count_type[i]--;
+                                }
+                        }
+                        rtl_write_dword(rtlpriv, 0x5E8, start_time);
+                        rtl_write_dword(rtlpriv, 0x5EC,
+                                        p2pinfo->noa_count_type[i]);
+                }
+
+                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                        /* rst p2p circuit */
+                        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
+
+                        p2p_ps_offload->offload_en = 1;
+
+                        if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
+                                p2p_ps_offload->role = 1;
+                                p2p_ps_offload->allstasleep = 0;
+                        } else {
+                                p2p_ps_offload->role = 0;
+                        }
+
+                        p2p_ps_offload->discovery = 0;
+                }
+                break;
+        case P2P_PS_SCAN:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
+                p2p_ps_offload->discovery = 1;
+                break;
+        case P2P_PS_SCAN_DONE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
+                p2p_ps_offload->discovery = 0;
+                p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
+                break;
+        default:
+                break;
+        }
+
+        rtl92c_fill_h2c_cmd(hw, H2C_P2P_PS_OFFLOAD, 1, (u8 *)p2p_ps_offload);
+}
+EXPORT_SYMBOL_GPL(rtl92c_set_p2p_ps_offload_cmd);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
index 780ea5b1e24c..15b2055e6212 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
@@ -67,6 +67,9 @@ enum rtl8192c_h2c_cmd {
         H2C_RSVDPAGE = 3,
         H2C_RSSI_REPORT = 5,
         H2C_RA_MASK = 6,
+        H2C_MACID_PS_MODE = 7,
+        H2C_P2P_PS_OFFLOAD = 8,
+        H2C_P2P_PS_CTW_CMD = 32,
         MAX_H2CCMD
 };
 
@@ -95,5 +98,6 @@ void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
 void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl92c_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
 void usb_writeN_async(struct rtl_priv *rtlpriv, u32 addr, void *data, u16 len);
+void rtl92c_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 1b65db7fd651..a82b30a1996c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -475,6 +475,9 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         break;
                 }
+        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
+                rtl92c_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
+                break;
         case HW_VAR_AID:{
                         u16 u2btmp;
                         u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
@@ -505,6 +508,40 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
 
                 }
+        case HW_VAR_FW_LPS_ACTION: {
+                        bool enter_fwlps = *((bool *)val);
+                        u8 rpwm_val, fw_pwrmode;
+                        bool fw_current_inps;
+
+                        if (enter_fwlps) {
+                                rpwm_val = 0x02;        /* RF off */
+                                fw_current_inps = true;
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_FW_PSMODE_STATUS,
+                                                (u8 *)(&fw_current_inps));
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_H2C_FW_PWRMODE,
+                                                (u8 *)(&ppsc->fwctrl_psmode));
+
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_SET_RPWM,
+                                                (u8 *)(&rpwm_val));
+                        } else {
+                                rpwm_val = 0x0C;        /* RF on */
+                                fw_pwrmode = FW_PS_ACTIVE_MODE;
+                                fw_current_inps = false;
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_SET_RPWM,
+                                                (u8 *)(&rpwm_val));
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_H2C_FW_PWRMODE,
+                                                (u8 *)(&fw_pwrmode));
+
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_FW_PSMODE_STATUS,
+                                                (u8 *)(&fw_current_inps));
+                        }
+                break; }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "switch case not processed\n");
@@ -1105,7 +1142,8 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
             type == NL80211_IFTYPE_STATION) {
                 _rtl92ce_stop_tx_beacon(hw);
                 _rtl92ce_enable_bcn_sub_func(hw);
-        } else if (type == NL80211_IFTYPE_ADHOC || type == NL80211_IFTYPE_AP) {
+        } else if (type == NL80211_IFTYPE_ADHOC || type == NL80211_IFTYPE_AP ||
+                   type == NL80211_IFTYPE_MESH_POINT) {
                 _rtl92ce_resume_tx_beacon(hw);
                 _rtl92ce_disable_bcn_sub_func(hw);
         } else {
@@ -1137,6 +1175,11 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to AP!\n");
                 break;
+        case NL80211_IFTYPE_MESH_POINT:
+                bt_msr |= MSR_ADHOC;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to Mesh Point!\n");
+                break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Network type %d not supported!\n", type);
@@ -1184,7 +1227,8 @@ int rtl92ce_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
                 return -EOPNOTSUPP;
 
         if (rtlpriv->mac80211.link_state == MAC80211_LINKED) {
-                if (type != NL80211_IFTYPE_AP)
+                if (type != NL80211_IFTYPE_AP &&
+                    type != NL80211_IFTYPE_MESH_POINT)
                         rtl92ce_set_check_bssid(hw, true);
         } else {
                 rtl92ce_set_check_bssid(hw, false);
@@ -1459,7 +1503,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 }
 
                 for (i = 0; i < 14; i++) {
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
                                 rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
@@ -1500,11 +1544,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                       & 0xf0) >> 4);
                         }
 
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->pwrgroup_ht20[rf_path][i]);
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->pwrgroup_ht40[rf_path][i]);
@@ -1545,19 +1589,19 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
             rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
 
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
@@ -1565,7 +1609,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         if (!autoload_fail) {
@@ -1575,7 +1619,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
                 rtlefuse->eeprom_tssi[RF90_PATH_A],
                 rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
@@ -1589,7 +1633,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->apk_thermalmeterignore = true;
 
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
@@ -1629,6 +1673,21 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
         if (rtlefuse->autoload_failflag)
                 return;
 
+        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
+        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
+        rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROMId = 0x%4x\n", eeprom_id);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
+
         for (i = 0; i < 6; i += 2) {
                 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
                 *((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
@@ -1766,6 +1825,9 @@ static void rtl92ce_update_hal_rate_table(struct ieee80211_hw *hw,
                 ratr_value = sta->supp_rates[1] << 4;
         else
                 ratr_value = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_value = 0xfff;
+
         ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
                         sta->ht_cap.mcs.rx_mask[0] << 12);
         switch (wirelessmode) {
@@ -1860,7 +1922,8 @@ static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw,
 
         sta_entry = (struct rtl_sta_info *) sta->drv_priv;
         wirelessmode = sta_entry->wireless_mode;
-        if (mac->opmode == NL80211_IFTYPE_STATION)
+        if (mac->opmode == NL80211_IFTYPE_STATION ||
+            mac->opmode == NL80211_IFTYPE_MESH_POINT)
                 curtxbw_40mhz = mac->bw_40;
         else if (mac->opmode == NL80211_IFTYPE_AP ||
                 mac->opmode == NL80211_IFTYPE_ADHOC)
@@ -1870,6 +1933,8 @@ static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw,
                 ratr_bitmap = sta->supp_rates[1] << 4;
         else
                 ratr_bitmap = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_bitmap = 0xfff;
         ratr_bitmap |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
                         sta->ht_cap.mcs.rx_mask[0] << 12);
         switch (wirelessmode) {
@@ -2135,7 +2200,8 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                                 macaddr = cam_const_broad;
                                 entry_id = key_index;
                         } else {
-                                if (mac->opmode == NL80211_IFTYPE_AP) {
+                                if (mac->opmode == NL80211_IFTYPE_AP ||
+                                    mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                                         entry_id = rtl_cam_get_free_entry(hw,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
@@ -2157,7 +2223,8 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                                  "delete one entry, entry_id is %d\n",
                                  entry_id);
-                        if (mac->opmode == NL80211_IFTYPE_AP)
+                        if (mac->opmode == NL80211_IFTYPE_AP ||
+                            mac->opmode == NL80211_IFTYPE_MESH_POINT)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
@@ -2338,3 +2405,24 @@ void rtl92ce_suspend(struct ieee80211_hw *hw)
 void rtl92ce_resume(struct ieee80211_hw *hw)
 {
 }
+
+/* Turn on AAP (RCR:bit 0) for promicuous mode. */
+void rtl92ce_allow_all_destaddr(struct ieee80211_hw *hw,
+        bool allow_all_da, bool write_into_reg)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        if (allow_all_da) {/* Set BIT0 */
+                rtlpci->receive_config |= RCR_AAP;
+        } else {/* Clear BIT0 */
+                rtlpci->receive_config &= ~RCR_AAP;
+        }
+
+        if (write_into_reg)
+                rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+
+        RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
+                 "receive_config=0x%08X, write_into_reg=%d\n",
+                 rtlpci->receive_config, write_into_reg);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
index 52a3aea9b3de..2d063b0c7760 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
@@ -61,6 +61,8 @@ void rtl92ce_update_interrupt_mask(struct ieee80211_hw *hw,
 void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
 void rtl92ce_update_hal_rate_tbl(struct ieee80211_hw *hw,
                                  struct ieee80211_sta *sta, u8 rssi_level);
+void rtl92ce_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                 struct ieee80211_sta *sta, u8 rssi_level);
 void rtl92ce_update_channel_access_setting(struct ieee80211_hw *hw);
 bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid);
 void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw);
@@ -74,5 +76,7 @@ void rtl8192ce_bt_reg_init(struct ieee80211_hw *hw);
 void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw);
 void rtl92ce_suspend(struct ieee80211_hw *hw);
 void rtl92ce_resume(struct ieee80211_hw *hw);
+void rtl92ce_allow_all_destaddr(struct ieee80211_hw *hw,
+                                bool allow_all_da, bool write_into_reg);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
index e4d738f6166d..bd4aef74c056 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
@@ -544,6 +544,7 @@
 #define IMR_WLANOFF                             BIT(0)
 
 #define EFUSE_REAL_CONTENT_LEN                  512
+#define EFUSE_OOB_PROTECT_BYTES                 15
 
 #define EEPROM_DEFAULT_TSSI                     0x0
 #define EEPROM_DEFAULT_TXPOWERDIFF              0x0
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 49f663bd93ff..14203561b6ee 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -228,6 +228,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = {
         .enable_hw_sec = rtl92ce_enable_hw_security_config,
         .set_key = rtl92ce_set_key,
         .init_sw_leds = rtl92ce_init_sw_leds,
+        .allow_all_destaddr = rtl92ce_allow_all_destaddr,
         .get_bbreg = rtl92c_phy_query_bb_reg,
         .set_bbreg = rtl92c_phy_set_bb_reg,
         .set_rfreg = rtl92ce_phy_set_rf_reg,
@@ -278,6 +279,7 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = {
         .maps[EFUSE_HWSET_MAX_SIZE] = HWSET_MAX_SIZE,
         .maps[EFUSE_MAX_SECTION_MAP] = EFUSE_MAX_SECTION,
         .maps[EFUSE_REAL_CONTENT_SIZE] = EFUSE_REAL_CONTENT_LEN,
+        .maps[EFUSE_OOB_PROTECT_BYTES_LEN] = EFUSE_OOB_PROTECT_BYTES,
 
         .maps[RWCAM] = REG_CAMCMD,
         .maps[WCAMI] = REG_CAMWRITE,
@@ -309,7 +311,7 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = {
 
         .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
-        .maps[RTL_IMR_BcnInt] = IMR_BCNINT,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNINT,
         .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
         .maps[RTL_IMR_RDU] = IMR_RDU,
         .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index b9b1a6e0b16e..6ad23b413eb3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -30,6 +30,7 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../stats.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -42,7 +43,7 @@ static u8 _rtl92ce_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 
         if (unlikely(ieee80211_is_beacon(fc)))
                 return QSLT_BEACON;
-        if (ieee80211_is_mgmt(fc))
+        if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
                 return QSLT_MGNT;
 
         return skb->priority;
@@ -78,16 +79,6 @@ static u8 _rtl92c_evm_db_to_percentage(char value)
         return ret_val;
 }
 
-static long _rtl92ce_translate_todbm(struct ieee80211_hw *hw,
-                                     u8 signal_strength_index)
-{
-        long signal_power;
-
-        signal_power = (long)((signal_strength_index + 1) >> 1);
-        signal_power -= 95;
-        return signal_power;
-}
-
 static long _rtl92ce_signal_scale_mapping(struct ieee80211_hw *hw,
                 long currsig)
 {
@@ -139,7 +130,6 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
         pstats->packet_toself = packet_toself;
         pstats->is_cck = is_cck_rate;
         pstats->packet_beacon = packet_beacon;
-        pstats->is_cck = is_cck_rate;
         pstats->rx_mimo_sig_qual[0] = -1;
         pstats->rx_mimo_sig_qual[1] = -1;
 
@@ -192,10 +182,30 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                         }
                 }
 
-                pwdb_all = _rtl92c_query_rxpwrpercentage(rx_pwr_all);
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                /* CCK gain is smaller than OFDM/MCS gain,
+                 * so we add gain diff by experiences,
+                 * the val is 6
+                 */
+                pwdb_all += 6;
+                if (pwdb_all > 100)
+                        pwdb_all = 100;
+                /* modify the offset to make the same
+                 * gain index with OFDM.
+                 */
+                if (pwdb_all > 34 && pwdb_all <= 42)
+                        pwdb_all -= 2;
+                else if (pwdb_all > 26 && pwdb_all <= 34)
+                        pwdb_all -= 6;
+                else if (pwdb_all > 14 && pwdb_all <= 26)
+                        pwdb_all -= 8;
+                else if (pwdb_all > 4 && pwdb_all <= 14)
+                        pwdb_all -= 4;
+
                 pstats->rx_pwdb_all = pwdb_all;
                 pstats->recvsignalpower = rx_pwr_all;
 
+                /* (3) Get Signal Quality (EVM) */
                 if (packet_match_bssid) {
                         u8 sq;
                         if (pstats->rx_pwdb_all > 40)
@@ -217,29 +227,38 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
         } else {
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
+                /* (1)Get RSSI for HT rate */
                 for (i = RF90_PATH_A; i < RF90_PATH_MAX; i++) {
+                        /* we will judge RF RX path now. */
                         if (rtlpriv->dm.rfpath_rxenable[i])
                                 rf_rx_num++;
 
                         rx_pwr[i] =
                             ((p_drvinfo->gain_trsw[i] & 0x3f) * 2) - 110;
+                        /* Translate DBM to percentage. */
                         rssi = _rtl92c_query_rxpwrpercentage(rx_pwr[i]);
                         total_rssi += rssi;
+                        /* Get Rx snr value in DB */
                         rtlpriv->stats.rx_snr_db[i] =
                             (long)(p_drvinfo->rxsnr[i] / 2);
 
+                        /* Record Signal Strength for next packet */
                         if (packet_match_bssid)
                                 pstats->rx_mimo_signalstrength[i] = (u8) rssi;
                 }
 
+                /* (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
                 rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
                 pwdb_all = _rtl92c_query_rxpwrpercentage(rx_pwr_all);
                 pstats->rx_pwdb_all = pwdb_all;
                 pstats->rxpower = rx_pwr_all;
                 pstats->recvsignalpower = rx_pwr_all;
 
-                if (pdesc->rxht && pdesc->rxmcs >= DESC92_RATEMCS8 &&
-                    pdesc->rxmcs <= DESC92_RATEMCS15)
+                /* (3)EVM of HT rate */
+                if (pstats->is_ht && pstats->rate >= DESC92_RATEMCS8 &&
+                    pstats->rate <= DESC92_RATEMCS15)
                         max_spatial_stream = 2;
                 else
                         max_spatial_stream = 1;
@@ -248,6 +267,9 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                         evm = _rtl92c_evm_db_to_percentage(p_drvinfo->rxevm[i]);
 
                         if (packet_match_bssid) {
+                                /* Fill value in RFD, Get the first
+                                 * spatial stream only
+                                 */
                                 if (i == 0)
                                         pstats->signalquality =
                                             (u8) (evm & 0xff);
@@ -256,6 +278,9 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                 }
         }
 
+        /* UI BSS List signal strength(in percentage),
+         * make it good looking, from 0~100.
+         */
         if (is_cck_rate)
                 pstats->signalstrength =
                     (u8) (_rtl92ce_signal_scale_mapping(hw, pwdb_all));
@@ -265,215 +290,6 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                           (hw, total_rssi /= rf_rx_num));
 }
 
-static void _rtl92ce_process_ui_rssi(struct ieee80211_hw *hw,
-                struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u8 rfpath;
-        u32 last_rssi, tmpval;
-
-        if (pstats->packet_toself || pstats->packet_beacon) {
-                rtlpriv->stats.rssi_calculate_cnt++;
-
-                if (rtlpriv->stats.ui_rssi.total_num++ >=
-                    PHY_RSSI_SLID_WIN_MAX) {
-
-                        rtlpriv->stats.ui_rssi.total_num =
-                            PHY_RSSI_SLID_WIN_MAX;
-                        last_rssi =
-                            rtlpriv->stats.ui_rssi.elements[rtlpriv->
-                                                    stats.ui_rssi.index];
-                        rtlpriv->stats.ui_rssi.total_val -= last_rssi;
-                }
-
-                rtlpriv->stats.ui_rssi.total_val += pstats->signalstrength;
-                rtlpriv->stats.ui_rssi.elements[rtlpriv->stats.ui_rssi.
-                                                index++] =
-                    pstats->signalstrength;
-
-                if (rtlpriv->stats.ui_rssi.index >= PHY_RSSI_SLID_WIN_MAX)
-                        rtlpriv->stats.ui_rssi.index = 0;
-
-                tmpval = rtlpriv->stats.ui_rssi.total_val /
-                    rtlpriv->stats.ui_rssi.total_num;
-                rtlpriv->stats.signal_strength =
-                    _rtl92ce_translate_todbm(hw, (u8) tmpval);
-                pstats->rssi = rtlpriv->stats.signal_strength;
-        }
-
-        if (!pstats->is_cck && pstats->packet_toself) {
-                for (rfpath = RF90_PATH_A; rfpath < rtlphy->num_total_rfpath;
-                     rfpath++) {
-                        if (rtlpriv->stats.rx_rssi_percentage[rfpath] == 0) {
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    pstats->rx_mimo_signalstrength[rfpath];
-
-                        }
-
-                        if (pstats->rx_mimo_signalstrength[rfpath] >
-                            rtlpriv->stats.rx_rssi_percentage[rfpath]) {
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    ((rtlpriv->stats.
-                                      rx_rssi_percentage[rfpath] *
-                                      (RX_SMOOTH_FACTOR - 1)) +
-                                     (pstats->rx_mimo_signalstrength[rfpath])) /
-                                    (RX_SMOOTH_FACTOR);
-
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    rtlpriv->stats.rx_rssi_percentage[rfpath] +
-                                    1;
-                        } else {
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    ((rtlpriv->stats.
-                                      rx_rssi_percentage[rfpath] *
-                                      (RX_SMOOTH_FACTOR - 1)) +
-                                     (pstats->rx_mimo_signalstrength[rfpath])) /
-                                    (RX_SMOOTH_FACTOR);
-                        }
-
-                }
-        }
-}
-
-static void _rtl92ce_update_rxsignalstatistics(struct ieee80211_hw *hw,
-                                               struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        int weighting = 0;
-
-        if (rtlpriv->stats.recv_signal_power == 0)
-                rtlpriv->stats.recv_signal_power = pstats->recvsignalpower;
-
-        if (pstats->recvsignalpower > rtlpriv->stats.recv_signal_power)
-                weighting = 5;
-
-        else if (pstats->recvsignalpower < rtlpriv->stats.recv_signal_power)
-                weighting = (-5);
-
-        rtlpriv->stats.recv_signal_power =
-            (rtlpriv->stats.recv_signal_power * 5 +
-             pstats->recvsignalpower + weighting) / 6;
-}
-
-static void _rtl92ce_process_pwdb(struct ieee80211_hw *hw,
-                struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        long undec_sm_pwdb;
-
-        if (mac->opmode == NL80211_IFTYPE_ADHOC) {
-                return;
-        } else {
-                undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
-        }
-
-        if (pstats->packet_toself || pstats->packet_beacon) {
-                if (undec_sm_pwdb < 0)
-                        undec_sm_pwdb = pstats->rx_pwdb_all;
-
-                if (pstats->rx_pwdb_all > (u32) undec_sm_pwdb) {
-                        undec_sm_pwdb = (((undec_sm_pwdb) *
-                              (RX_SMOOTH_FACTOR - 1)) +
-                             (pstats->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
-
-                        undec_sm_pwdb += 1;
-                } else {
-                        undec_sm_pwdb = (((undec_sm_pwdb) *
-                              (RX_SMOOTH_FACTOR - 1)) +
-                             (pstats->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
-                }
-
-                rtlpriv->dm.undec_sm_pwdb = undec_sm_pwdb;
-                _rtl92ce_update_rxsignalstatistics(hw, pstats);
-        }
-}
-
-static void _rtl92ce_process_ui_link_quality(struct ieee80211_hw *hw,
-                                             struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 last_evm, n_spatialstream, tmpval;
-
-        if (pstats->signalquality != 0) {
-                if (pstats->packet_toself || pstats->packet_beacon) {
-
-                        if (rtlpriv->stats.ui_link_quality.total_num++ >=
-                            PHY_LINKQUALITY_SLID_WIN_MAX) {
-                                rtlpriv->stats.ui_link_quality.total_num =
-                                    PHY_LINKQUALITY_SLID_WIN_MAX;
-                                last_evm =
-                                    rtlpriv->stats.
-                                    ui_link_quality.elements[rtlpriv->
-                                                          stats.ui_link_quality.
-                                                          index];
-                                rtlpriv->stats.ui_link_quality.total_val -=
-                                    last_evm;
-                        }
-
-                        rtlpriv->stats.ui_link_quality.total_val +=
-                            pstats->signalquality;
-                        rtlpriv->stats.ui_link_quality.elements[rtlpriv->stats.
-                                                                ui_link_quality.
-                                                                index++] =
-                            pstats->signalquality;
-
-                        if (rtlpriv->stats.ui_link_quality.index >=
-                            PHY_LINKQUALITY_SLID_WIN_MAX)
-                                rtlpriv->stats.ui_link_quality.index = 0;
-
-                        tmpval = rtlpriv->stats.ui_link_quality.total_val /
-                            rtlpriv->stats.ui_link_quality.total_num;
-                        rtlpriv->stats.signal_quality = tmpval;
-
-                        rtlpriv->stats.last_sigstrength_inpercent = tmpval;
-
-                        for (n_spatialstream = 0; n_spatialstream < 2;
-                             n_spatialstream++) {
-                                if (pstats->
-                                    rx_mimo_sig_qual[n_spatialstream] != -1) {
-                                        if (rtlpriv->stats.
-                                            rx_evm_percentage[n_spatialstream]
-                                            == 0) {
-                                                rtlpriv->stats.
-                                                   rx_evm_percentage
-                                                   [n_spatialstream] =
-                                                   pstats->rx_mimo_sig_qual
-                                                   [n_spatialstream];
-                                        }
-
-                                        rtlpriv->stats.
-                                            rx_evm_percentage[n_spatialstream] =
-                                            ((rtlpriv->
-                                              stats.rx_evm_percentage
-                                              [n_spatialstream] *
-                                              (RX_SMOOTH_FACTOR - 1)) +
-                                             (pstats->rx_mimo_sig_qual
-                                              [n_spatialstream] * 1)) /
-                                            (RX_SMOOTH_FACTOR);
-                                }
-                        }
-                }
-        } else {
-                ;
-        }
-}
-
-static void _rtl92ce_process_phyinfo(struct ieee80211_hw *hw,
-                                     u8 *buffer,
-                                     struct rtl_stats *pcurrent_stats)
-{
-
-        if (!pcurrent_stats->packet_matchbssid &&
-            !pcurrent_stats->packet_beacon)
-                return;
-
-        _rtl92ce_process_ui_rssi(hw, pcurrent_stats);
-        _rtl92ce_process_pwdb(hw, pcurrent_stats);
-        _rtl92ce_process_ui_link_quality(hw, pcurrent_stats);
-}
-
 static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw,
                                                struct sk_buff *skb,
                                                struct rtl_stats *pstats,
@@ -516,7 +332,7 @@ static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw,
                                    packet_matchbssid, packet_toself,
                                    packet_beacon);
 
-        _rtl92ce_process_phyinfo(hw, tmp_buf, pstats);
+        rtl_process_phyinfo(hw, tmp_buf, pstats);
 }
 
 bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
@@ -526,7 +342,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
 {
         struct rx_fwinfo_92c *p_drvinfo;
         struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;
-
+        struct ieee80211_hdr *hdr;
         u32 phystatus = GET_RX_DESC_PHYST(pdesc);
         stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
         stats->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
@@ -539,37 +355,60 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
         stats->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
         stats->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
         stats->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
-        stats->isampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
+        stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
                                    && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
         stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
+        stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->band = hw->conf.channel->band;
+        stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc);
 
-        if (GET_RX_DESC_CRC32(pdesc))
-                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
 
-        if (!GET_RX_DESC_SWDEC(pdesc))
-                rx_status->flag |= RX_FLAG_DECRYPTED;
+        hdr = (struct ieee80211_hdr *)(skb->data + stats->rx_drvinfo_size
+                        + stats->rx_bufshift);
+
+        if (stats->crc)
+                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (GET_RX_DESC_BW(pdesc))
+        if (stats->rx_is40Mhzpacket)
                 rx_status->flag |= RX_FLAG_40MHZ;
 
-        if (GET_RX_DESC_RXHT(pdesc))
+        if (stats->is_ht)
                 rx_status->flag |= RX_FLAG_HT;
 
         rx_status->flag |= RX_FLAG_MACTIME_START;
 
-        if (stats->decrypted)
-                rx_status->flag |= RX_FLAG_DECRYPTED;
-
+        /* hw will set stats->decrypted true, if it finds the
+         * frame is open data frame or mgmt frame.
+         * So hw will not decryption robust managment frame
+         * for IEEE80211w but still set status->decrypted
+         * true, so here we should set it back to undecrypted
+         * for IEEE80211w frame, and mac80211 sw will help
+         * to decrypt it
+         */
+        if (stats->decrypted) {
+                if (!hdr) {
+                        /* In testing, hdr was NULL here */
+                        return false;
+                }
+                if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
+                    (ieee80211_has_protected(hdr->frame_control)))
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag |= RX_FLAG_DECRYPTED;
+        }
+        /* rate_idx: index of data rate into band's
+         * supported rates or MCS index if HT rates
+         * are use (RX_FLAG_HT)
+         * Notice: this is diff with windows define
+         */
         rx_status->rate_idx = rtlwifi_rate_mapping(hw,
-                                (bool)GET_RX_DESC_RXHT(pdesc),
-                                (u8)GET_RX_DESC_RXMCS(pdesc),
-                                (bool)GET_RX_DESC_PAGGR(pdesc));
+                                stats->is_ht, stats->rate,
+                                stats->isfirst_ampdu);
 
-        rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
+        rx_status->mactime = stats->timestamp_low;
         if (phystatus) {
                 p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +
                                                      stats->rx_bufshift);
@@ -580,7 +419,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
         }
 
         /*rx_status->qual = stats->signal; */
-        rx_status->signal = stats->rssi + 10;
+        rx_status->signal = stats->recvsignalpower + 10;
         /*rx_status->noise = -stats->noise; */
 
         return true;
@@ -624,7 +463,8 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
         if (mac->opmode == NL80211_IFTYPE_STATION) {
                 bw_40 = mac->bw_40;
         } else if (mac->opmode == NL80211_IFTYPE_AP ||
-                mac->opmode == NL80211_IFTYPE_ADHOC) {
+                   mac->opmode == NL80211_IFTYPE_ADHOC ||
+                   mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                 if (sta)
                         bw_40 = sta->bandwidth >= IEEE80211_STA_RX_BW_40;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index c08d0f4c5f3d..3d0498e69c8c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -202,7 +202,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                         }
                 }
                 for (i = 0; i < 14; i++) {
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
@@ -238,11 +238,11 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                     ((rtlefuse->eeprom_pwrlimit_ht40[index]
                                       & 0xf0) >> 4);
                         }
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->pwrgroup_ht20[rf_path][i]);
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->pwrgroup_ht40[rf_path][i]);
@@ -273,26 +273,26 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         rtlefuse->legacy_ht_txpowerdiff =
             rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
         if (!autoload_fail) {
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
@@ -301,7 +301,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
                 rtlefuse->eeprom_tssi[RF90_PATH_A],
                 rtlefuse->eeprom_tssi[RF90_PATH_B]);
@@ -316,7 +316,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         if (rtlefuse->eeprom_thermalmeter == 0x1f || autoload_fail)
                 rtlefuse->apk_thermalmeterignore = true;
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index a73a17bc56dd..23d640a4debd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -223,7 +223,7 @@ static struct rtl_hal_cfg rtl92cu_hal_cfg = {
 
         .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
-        .maps[RTL_IMR_BcnInt] = IMR_BCNINT,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNINT,
         .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
         .maps[RTL_IMR_RDU] = IMR_RDU,
         .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index b6222eedb835..763cf1defab5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -324,8 +324,8 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
                                    && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
         stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->band = hw->conf.channel->band;
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
         if (GET_RX_DESC_CRC32(pdesc))
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
         if (!GET_RX_DESC_SWDEC(pdesc))
@@ -395,8 +395,8 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
         stats.rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(rxdesc);
         /* TODO: is center_freq changed when doing scan? */
         /* TODO: Shall we add protection or just skip those two step? */
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->band = hw->conf.channel->band;
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
         if (GET_RX_DESC_CRC32(rxdesc))
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
         if (!GET_RX_DESC_SWDEC(rxdesc))
@@ -434,7 +434,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
                  (u32)hdr->addr1[2], (u32)hdr->addr1[3],
                  (u32)hdr->addr1[4], (u32)hdr->addr1[5]);
         memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status));
-        ieee80211_rx_irqsafe(hw, skb);
+        ieee80211_rx(hw, skb);
 }
 
 void  rtl8192cu_rx_hdl(struct ieee80211_hw *hw, struct sk_buff * skb)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 5251fb8a111e..19a765532603 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -171,8 +171,8 @@ static void rtl92d_dm_diginit(struct ieee80211_hw *hw)
         de_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
         de_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
         de_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
-        de_digtable->rx_gain_range_max = DM_DIG_FA_UPPER;
-        de_digtable->rx_gain_range_min = DM_DIG_FA_LOWER;
+        de_digtable->rx_gain_max = DM_DIG_FA_UPPER;
+        de_digtable->rx_gain_min = DM_DIG_FA_LOWER;
         de_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
         de_digtable->back_range_max = DM_DIG_BACKOFF_MAX;
         de_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
@@ -444,8 +444,8 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                  "dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
                  de_digtable->large_fa_hit, de_digtable->forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 "dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable->recover_cnt, de_digtable->rx_gain_range_min);
+                 "dm_DIG() Before: Recover_cnt=%d, rx_gain_min=%x\n",
+                 de_digtable->recover_cnt, de_digtable->rx_gain_min);
 
         /* deal with abnorally large false alarm */
         if (falsealm_cnt->cnt_all > 10000) {
@@ -459,9 +459,9 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                 }
                 if (de_digtable->large_fa_hit >= 3) {
                         if ((de_digtable->forbidden_igi + 1) > DM_DIG_MAX)
-                                de_digtable->rx_gain_range_min = DM_DIG_MAX;
+                                de_digtable->rx_gain_min = DM_DIG_MAX;
                         else
-                                de_digtable->rx_gain_range_min =
+                                de_digtable->rx_gain_min =
                                     (de_digtable->forbidden_igi + 1);
                         de_digtable->recover_cnt = 3600;        /* 3600=2hr */
                 }
@@ -475,12 +475,12 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                                     DM_DIG_FA_LOWER) {
                                         de_digtable->forbidden_igi =
                                                          DM_DIG_FA_LOWER;
-                                        de_digtable->rx_gain_range_min =
+                                        de_digtable->rx_gain_min =
                                                          DM_DIG_FA_LOWER;
 
                                 } else {
                                         de_digtable->forbidden_igi--;
-                                        de_digtable->rx_gain_range_min =
+                                        de_digtable->rx_gain_min =
                                             (de_digtable->forbidden_igi + 1);
                                 }
                         } else if (de_digtable->large_fa_hit == 3) {
@@ -492,13 +492,13 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                  "dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
                  de_digtable->large_fa_hit, de_digtable->forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 "dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable->recover_cnt, de_digtable->rx_gain_range_min);
+                 "dm_DIG() After: recover_cnt=%d, rx_gain_min=%x\n",
+                 de_digtable->recover_cnt, de_digtable->rx_gain_min);
 
         if (value_igi > DM_DIG_MAX)
                 value_igi = DM_DIG_MAX;
-        else if (value_igi < de_digtable->rx_gain_range_min)
-                value_igi = de_digtable->rx_gain_range_min;
+        else if (value_igi < de_digtable->rx_gain_min)
+                value_igi = de_digtable->rx_gain_min;
         de_digtable->cur_igvalue = value_igi;
         rtl92d_dm_write_dig(hw);
         if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G)
@@ -1071,9 +1071,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
                         ele_d = (ofdmswing_table[(u8) ofdm_index[0]] &
                                                  0xFFC00000) >> 22;
-                        val_x = rtlphy->iqk_matrix_regsetting
+                        val_x = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][0];
-                        val_y = rtlphy->iqk_matrix_regsetting
+                        val_y = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][1];
                         if (val_x != 0) {
                                 if ((val_x & 0x00000200) != 0)
@@ -1175,9 +1175,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         if (is2t) {
                                 ele_d = (ofdmswing_table[(u8) ofdm_index[1]] &
                                                 0xFFC00000) >> 22;
-                                val_x = rtlphy->iqk_matrix_regsetting
+                                val_x = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][4];
-                                val_y = rtlphy->iqk_matrix_regsetting
+                                val_y = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][5];
                                 if (val_x != 0) {
                                         if ((val_x & 0x00000200) != 0)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index aa5b42521bb4..7dd8f6de0550 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1183,7 +1183,7 @@ void rtl92d_linked_set_reg(struct ieee80211_hw *hw)
         u8 channel = rtlphy->current_channel;
 
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
-        if (!rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done) {
+        if (!rtlphy->iqk_matrix[indexforchannel].iqk_done) {
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_DMESG,
                          "Do IQK for channel:%d\n", channel);
                 rtl92d_phy_iq_calibrate(hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 33041bd4da81..840bac5fa2f8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -2479,9 +2479,9 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                                   rtlphy->current_channel);
 
                 for (i = 0; i < IQK_MATRIX_REG_NUM; i++)
-                        rtlphy->iqk_matrix_regsetting[indexforchannel].
+                        rtlphy->iqk_matrix[indexforchannel].
                                 value[0][i] = result[final_candidate][i];
-                rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done =
+                rtlphy->iqk_matrix[indexforchannel].iqk_done =
                         true;
 
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_MLME, DBG_LOUD,
@@ -2501,8 +2501,8 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "indexforchannel %d done %d\n",
                  indexforchannel,
-                 rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done);
-        if (0 && !rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done &&
+                 rtlphy->iqk_matrix[indexforchannel].iqk_done);
+        if (0 && !rtlphy->iqk_matrix[indexforchannel].iqk_done &&
                 rtlphy->need_iqk) {
                 /* Re Do IQK. */
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_LOUD,
@@ -2516,23 +2516,23 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
                         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
                                  "Just Read IQK Matrix reg for channel:%d....\n",
                                  channel);
-                        if ((rtlphy->iqk_matrix_regsetting[indexforchannel].
+                        if ((rtlphy->iqk_matrix[indexforchannel].
                              value[0] != NULL)
                                 /*&&(regea4 != 0) */)
                                 _rtl92d_phy_patha_fill_iqk_matrix(hw, true,
-                                        rtlphy->iqk_matrix_regsetting[
+                                        rtlphy->iqk_matrix[
                                         indexforchannel].value, 0,
-                                        (rtlphy->iqk_matrix_regsetting[
+                                        (rtlphy->iqk_matrix[
                                         indexforchannel].value[0][2] == 0));
                         if (IS_92D_SINGLEPHY(rtlhal->version)) {
-                                if ((rtlphy->iqk_matrix_regsetting[
+                                if ((rtlphy->iqk_matrix[
                                         indexforchannel].value[0][4] != 0)
                                         /*&&(regec4 != 0) */)
                                         _rtl92d_phy_pathb_fill_iqk_matrix(hw,
                                                 true,
-                                                rtlphy->iqk_matrix_regsetting[
+                                                rtlphy->iqk_matrix[
                                                 indexforchannel].value, 0,
-                                                (rtlphy->iqk_matrix_regsetting[
+                                                (rtlphy->iqk_matrix[
                                                 indexforchannel].value[0][6]
                                                 == 0));
                         }
@@ -2830,20 +2830,20 @@ void rtl92d_phy_reset_iqk_result(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "settings regs %d default regs %d\n",
-                 (int)(sizeof(rtlphy->iqk_matrix_regsetting) /
+                 (int)(sizeof(rtlphy->iqk_matrix) /
                        sizeof(struct iqk_matrix_regs)),
                  IQK_MATRIX_REG_NUM);
         /* 0xe94, 0xe9c, 0xea4, 0xeac, 0xeb4, 0xebc, 0xec4, 0xecc */
         for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
-                rtlphy->iqk_matrix_regsetting[i].value[0][0] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][2] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][4] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][6] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][1] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].value[0][3] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].value[0][5] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].value[0][7] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].iqk_done = false;
+                rtlphy->iqk_matrix[i].value[0][0] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][2] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][4] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][6] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][1] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][3] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][5] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][7] = 0x0;
+                rtlphy->iqk_matrix[i].iqk_done = false;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
index ebb1d5f5e7b5..b7498c5bafc5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
@@ -543,7 +543,7 @@
 #define IMR_TIMEOUT1                    BIT(16)
 #define IMR_TXFOVW                      BIT(15)
 #define IMR_PSTIMEOUT                   BIT(14)
-#define IMR_BcnInt                      BIT(13)
+#define IMR_BCNINT                      BIT(13)
 #define IMR_RXFOVW                      BIT(12)
 #define IMR_RDU                         BIT(11)
 #define IMR_ATIMEND                     BIT(10)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 03c6d18b2e07..c18c04bf0c13 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -166,7 +166,7 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
         /* for early mode */
-        rtlpriv->rtlhal.earlymode_enable = true;
+        rtlpriv->rtlhal.earlymode_enable = false;
         for (tid = 0; tid < 8; tid++)
                 skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
 
@@ -319,7 +319,7 @@ static struct rtl_hal_cfg rtl92de_hal_cfg = {
 
         .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
-        .maps[RTL_IMR_BcnInt] = IMR_BcnInt,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNINT,
         .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
         .maps[RTL_IMR_RDU] = IMR_RDU,
         .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
@@ -333,7 +333,7 @@ static struct rtl_hal_cfg rtl92de_hal_cfg = {
         .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
         .maps[RTL_IMR_VODOK] = IMR_VODOK,
         .maps[RTL_IMR_ROK] = IMR_ROK,
-        .maps[RTL_IBSS_INT_MASKS] = (IMR_BcnInt | IMR_TBDOK | IMR_TBDER),
+        .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),
 
         .maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,
         .maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index 941080e03c06..b8ec718a0fab 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -499,8 +499,8 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw,	struct rtl_stats *stats,
                                          && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
         stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->band = hw->conf.channel->band;
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
         if (GET_RX_DESC_CRC32(pdesc))
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
         if (!GET_RX_DESC_SWDEC(pdesc))
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
index 2d255e02d795..83c98674bfd3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
@@ -36,9 +36,6 @@
 #define SHORT_SLOT_TIME                         9
 #define NON_SHORT_SLOT_TIME                     20
 
-/* Rx smooth factor */
-#define RX_SMOOTH_FACTOR                        20
-
 /* Queue Select Value in TxDesc */
 #define QSLT_BK                                 0x2
 #define QSLT_BE                                 0x0
@@ -49,10 +46,6 @@
 #define QSLT_MGNT                               0x12
 #define QSLT_CMD                                0x13
 
-#define PHY_RSSI_SLID_WIN_MAX                   100
-#define PHY_LINKQUALITY_SLID_WIN_MAX            20
-#define PHY_BEACON_RSSI_SLID_WIN_MAX            10
-
 /* Tx Desc */
 #define TX_DESC_SIZE_RTL8192S                   (16 * 4)
 #define TX_CMDDESC_SIZE_RTL8192S                (16 * 4)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index e551fe5f9ccd..b3a2d5ec59e6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -163,6 +163,7 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter(
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 thermalvalue = 0;
+        u32 fw_cmd = 0;
 
         rtlpriv->dm.txpower_trackinginit = true;
 
@@ -175,7 +176,19 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter(
 
         if (thermalvalue) {
                 rtlpriv->dm.thermalvalue = thermalvalue;
-                rtl92s_phy_set_fw_cmd(hw, FW_CMD_TXPWR_TRACK_THERMAL);
+                if (hal_get_firmwareversion(rtlpriv) >= 0x35) {
+                        rtl92s_phy_set_fw_cmd(hw, FW_CMD_TXPWR_TRACK_THERMAL);
+                } else {
+                        fw_cmd = (FW_TXPWR_TRACK_THERMAL |
+                                 (rtlpriv->efuse.thermalmeter[0] << 8) |
+                                 (thermalvalue << 16));
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Write to FW Thermal Val = 0x%x\n", fw_cmd);
+
+                        rtl_write_dword(rtlpriv, WFM5, fw_cmd);
+                        rtl92s_phy_chk_fwcmd_iodone(hw);
+                }
         }
 
         rtlpriv->dm.txpowercount = 0;
@@ -217,11 +230,10 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rate_adaptive *ra = &(rtlpriv->ra);
-
+        struct ieee80211_sta *sta = NULL;
         u32 low_rssi_thresh = 0;
         u32 middle_rssi_thresh = 0;
         u32 high_rssi_thresh = 0;
-        struct ieee80211_sta *sta = NULL;
 
         if (is_hal_stop(rtlhal))
                 return;
@@ -229,14 +241,12 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
         if (!rtlpriv->dm.useramask)
                 return;
 
-        if (!rtlpriv->dm.inform_fw_driverctrldm) {
+        if (hal_get_firmwareversion(rtlpriv) >= 61 &&
+            !rtlpriv->dm.inform_fw_driverctrldm) {
                 rtl92s_phy_set_fw_cmd(hw, FW_CMD_CTRL_DM_BY_DRIVER);
                 rtlpriv->dm.inform_fw_driverctrldm = true;
         }
 
-        rcu_read_lock();
-        if (mac->opmode == NL80211_IFTYPE_STATION)
-                sta = get_sta(hw, mac->vif, mac->bssid);
         if ((mac->link_state == MAC80211_LINKED) &&
             (mac->opmode == NL80211_IFTYPE_STATION)) {
                 switch (ra->pre_ratr_state) {
@@ -285,12 +295,16 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
                                  rtlpriv->dm.undec_sm_pwdb, ra->ratr_state,
                                  ra->pre_ratr_state, ra->ratr_state);
 
-                        rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
+                        rcu_read_lock();
+                        sta = rtl_find_sta(hw, mac->bssid);
+                        if (sta)
+                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
                                                            ra->ratr_state);
+                        rcu_read_unlock();
+
                         ra->pre_ratr_state = ra->ratr_state;
                 }
         }
-        rcu_read_unlock();
 }
 
 static void _rtl92s_dm_switch_baseband_mrc(struct ieee80211_hw *hw)
@@ -370,7 +384,8 @@ static void _rtl92s_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
         ra->ratr_state = DM_RATR_STA_MAX;
         ra->pre_ratr_state = DM_RATR_STA_MAX;
 
-        if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
+        if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER &&
+            hal_get_firmwareversion(rtlpriv) >= 60)
                 rtlpriv->dm.useramask = true;
         else
                 rtlpriv->dm.useramask = false;
@@ -457,13 +472,13 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw)
                                 digtable->back_val = DM_DIG_BACKOFF;
 
                         if ((digtable->rssi_val + 10 - digtable->back_val) >
-                                digtable->rx_gain_range_max)
+                                digtable->rx_gain_max)
                                 digtable->cur_igvalue =
-                                                digtable->rx_gain_range_max;
+                                                digtable->rx_gain_max;
                         else if ((digtable->rssi_val + 10 - digtable->back_val)
-                                 < digtable->rx_gain_range_min)
+                                 < digtable->rx_gain_min)
                                 digtable->cur_igvalue =
-                                                digtable->rx_gain_range_min;
+                                                digtable->rx_gain_min;
                         else
                                 digtable->cur_igvalue = digtable->rssi_val + 10
                                         - digtable->back_val;
@@ -475,7 +490,7 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw)
 
                         if (falsealm_cnt->cnt_all > 16000)
                                 digtable->cur_igvalue =
-                                                 digtable->rx_gain_range_max;
+                                                 digtable->rx_gain_max;
                 /* connected -> connected or disconnected -> disconnected  */
                 } else {
                         /* Firmware control DIG, do nothing in driver dm */
@@ -677,9 +692,9 @@ static void _rtl92s_dm_init_dig(struct ieee80211_hw *hw)
         /* for dig debug rssi value */
         digtable->rssi_val = 50;
         digtable->back_val = DM_DIG_BACKOFF;
-        digtable->rx_gain_range_max = DM_DIG_MAX;
+        digtable->rx_gain_max = DM_DIG_MAX;
 
-        digtable->rx_gain_range_min = DM_DIG_MIN;
+        digtable->rx_gain_min = DM_DIG_MIN;
 
         digtable->backoffval_range_max = DM_DIG_BACKOFF_MAX;
         digtable->backoffval_range_min = DM_DIG_BACKOFF_MIN;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 084e7773bce2..4f461786a7eb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -400,6 +400,39 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         break;
                 }
+        case HW_VAR_FW_LPS_ACTION: {
+                bool enter_fwlps = *((bool *)val);
+                u8 rpwm_val, fw_pwrmode;
+                bool fw_current_inps;
+
+                if (enter_fwlps) {
+                        rpwm_val = 0x02;        /* RF off */
+                        fw_current_inps = true;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_FW_PSMODE_STATUS,
+                                        (u8 *)(&fw_current_inps));
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_H2C_FW_PWRMODE,
+                                        (u8 *)(&ppsc->fwctrl_psmode));
+
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_SET_RPWM,
+                                        (u8 *)(&rpwm_val));
+                } else {
+                        rpwm_val = 0x0C;        /* RF on */
+                        fw_pwrmode = FW_PS_ACTIVE_MODE;
+                        fw_current_inps = false;
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                        (u8 *)(&rpwm_val));
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_H2C_FW_PWRMODE,
+                                        (u8 *)(&fw_pwrmode));
+
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_FW_PSMODE_STATUS,
+                                        (u8 *)(&fw_current_inps));
+                }
+                break; }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "switch case not processed\n");
@@ -438,7 +471,7 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
 
 }
 
-static u8 _rtl92ce_halset_sysclk(struct ieee80211_hw *hw, u8 data)
+static u8 _rtl92se_halset_sysclk(struct ieee80211_hw *hw, u8 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 waitcount = 100;
@@ -547,7 +580,7 @@ static void _rtl92se_macconfig_before_fwdownload(struct ieee80211_hw *hw)
                 tmpu1b &= ~(BIT(6) | BIT(7));
 
                 /* Set failed, return to prevent hang. */
-                if (!_rtl92ce_halset_sysclk(hw, tmpu1b))
+                if (!_rtl92se_halset_sysclk(hw, tmpu1b))
                         return;
         }
 
@@ -650,7 +683,7 @@ static void _rtl92se_macconfig_before_fwdownload(struct ieee80211_hw *hw)
 
         tmpu1b = rtl_read_byte(rtlpriv, (SYS_CLKR + 1));
         tmpu1b = ((tmpu1b | BIT(7)) & (~BIT(6)));
-        if (!_rtl92ce_halset_sysclk(hw, tmpu1b))
+        if (!_rtl92se_halset_sysclk(hw, tmpu1b))
                 return; /* Set failed, return to prevent hang. */
 
         rtl_write_word(rtlpriv, CMDR, 0x07FC);
@@ -967,6 +1000,15 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
                 return rtstatus;
         }
 
+        /* because last function modify RCR, so we update
+         * rcr var here, or TP will unstable for receive_config
+         * is wrong, RX RCR_ACRC32 will cause TP unstabel & Rx
+         * RCR_APP_ICV will cause mac80211 unassoc for cisco 1252
+         */
+        rtlpci->receive_config = rtl_read_dword(rtlpriv, RCR);
+        rtlpci->receive_config &= ~(RCR_ACRC32 | RCR_AICV);
+        rtl_write_dword(rtlpriv, RCR, rtlpci->receive_config);
+
         /* Make sure BB/RF write OK. We should prevent enter IPS. radio off. */
         /* We must set flag avoid BB/RF config period later!! */
         rtl_write_dword(rtlpriv, CMDR, 0x37FC);
@@ -982,25 +1024,6 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         rtlphy->rf_mode = RF_OP_BY_SW_3WIRE;
 
-        /* RF Power Save */
-#if 0
-        /* H/W or S/W RF OFF before sleep. */
-        if (rtlpriv->psc.rfoff_reason > RF_CHANGE_BY_PS) {
-                u32 rfoffreason = rtlpriv->psc.rfoff_reason;
-
-                rtlpriv->psc.rfoff_reason = RF_CHANGE_BY_INIT;
-                rtlpriv->psc.rfpwr_state = ERFON;
-                /* FIXME: check spinlocks if this block is uncommented */
-                rtl_ps_set_rf_state(hw, ERFOFF, rfoffreason);
-        } else {
-                /* gpio radio on/off is out of adapter start */
-                if (rtlpriv->psc.hwradiooff == false) {
-                        rtlpriv->psc.rfpwr_state = ERFON;
-                        rtlpriv->psc.rfoff_reason = 0;
-                }
-        }
-#endif
-
         /* Before RF-R/W we must execute the IO from Scott's suggestion. */
         rtl_write_byte(rtlpriv, AFE_XTAL_CTRL + 1, 0xDB);
         if (rtlhal->version == VERSION_8192S_ACUT)
@@ -1058,7 +1081,22 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         /* We enable high power and RA related mechanism after NIC
          * initialized. */
-        rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_INIT);
+        if (hal_get_firmwareversion(rtlpriv) >= 0x35) {
+                /* Fw v.53 and later. */
+                rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_INIT);
+        } else if (hal_get_firmwareversion(rtlpriv) == 0x34) {
+                /* Fw v.52. */
+                rtl_write_dword(rtlpriv, WFM5, FW_RA_INIT);
+                rtl92s_phy_chk_fwcmd_iodone(hw);
+        } else {
+                /* Compatible earlier FW version. */
+                rtl_write_dword(rtlpriv, WFM5, FW_RA_RESET);
+                rtl92s_phy_chk_fwcmd_iodone(hw);
+                rtl_write_dword(rtlpriv, WFM5, FW_RA_ACTIVE);
+                rtl92s_phy_chk_fwcmd_iodone(hw);
+                rtl_write_dword(rtlpriv, WFM5, FW_RA_REFRESH);
+                rtl92s_phy_chk_fwcmd_iodone(hw);
+        }
 
         /* Add to prevent ASPM bug. */
         /* Always enable hst and NIC clock request. */
@@ -1229,7 +1267,6 @@ void rtl92se_disable_interrupt(struct ieee80211_hw *hw)
         synchronize_irq(rtlpci->pdev->irq);
 }
 
-
 static u8 _rtl92s_set_sysclk(struct ieee80211_hw *hw, u8 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1754,7 +1791,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 }
 
                 for (i = 0; i < 14; i++) {
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
                                 rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
@@ -1791,11 +1828,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                 ((rtlefuse->eeprom_pwrgroup[rf_path][index] &
                                 0xf0) >> 4);
 
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->pwrgroup_ht20[rf_path][i]);
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->pwrgroup_ht40[rf_path][i]);
@@ -1850,27 +1887,27 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                         rtlefuse->eeprom_regulatory =
                                  (hwinfo[EEPROM_REGULATORY] & 0x1);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
                         i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "TxPwrSafetyFlag = %d\n", rtlefuse->txpwr_safetyflag);
 
         /* Read RF-indication and Tx Power gain
@@ -1880,7 +1917,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->legacy_httxpowerdiff =
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "TxPowerDiff = %#x\n", rtlefuse->eeprom_txpowerdiff);
 
         /* Get TSSI value for each path. */
@@ -1889,7 +1926,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         usvalue = hwinfo[EEPROM_TSSI_B];
         rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
                 rtlefuse->eeprom_tssi[RF90_PATH_A],
                 rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
@@ -1897,7 +1934,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* and read ThermalMeter from EEPROM */
         tempval = hwinfo[EEPROM_THERMALMETER];
         rtlefuse->eeprom_thermalmeter = tempval;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 
         /* ThermalMeter, BIT(0)~3 for RFIC1, BIT(4)~7 for RFIC2 */
@@ -1914,7 +1951,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* Version ID, Channel plan */
         rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->txpwr_fromeprom = true;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
 
         /* Read Customer ID or Board Type!!! */
@@ -1999,6 +2036,8 @@ static void rtl92se_update_hal_rate_table(struct ieee80211_hw *hw,
                 ratr_value = sta->supp_rates[1] << 4;
         else
                 ratr_value = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_value = 0xfff;
         ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
                         sta->ht_cap.mcs.rx_mask[0] << 12);
         switch (wirelessmode) {
@@ -2112,6 +2151,8 @@ static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
                 ratr_bitmap = sta->supp_rates[1] << 4;
         else
                 ratr_bitmap = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_bitmap = 0xfff;
         ratr_bitmap |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
                         sta->ht_cap.mcs.rx_mask[0] << 12);
         switch (wirelessmode) {
@@ -2200,6 +2241,7 @@ static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
                         ratr_bitmap &= 0x0f8ff0ff;
                 break;
         }
+        sta_entry->ratr_index = ratr_index;
 
         if (rtlpriv->rtlhal.version >= VERSION_8192S_BCUT)
                 ratr_bitmap &= 0x0FFFFFFF;
@@ -2438,23 +2480,9 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 "The insert KEY length is %d\n",
-                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 "The insert KEY is %x %x\n",
-                                 rtlpriv->sec.key_buf[0][0],
-                                 rtlpriv->sec.key_buf[0][1]);
-
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                                  "add one entry\n");
                         if (is_pairwise) {
-                                RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwise Key content",
-                                              rtlpriv->sec.pairwise_key,
-                                              rtlpriv->sec.
-                                              key_len[PAIRWISE_KEYIDX]);
-
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                                          "set Pairwise key\n");
 
@@ -2502,3 +2530,23 @@ void rtl92se_resume(struct ieee80211_hw *hw)
                 pci_write_config_dword(rtlpci->pdev, 0x40,
                         val & 0xffff00ff);
 }
+
+/* Turn on AAP (RCR:bit 0) for promicuous mode. */
+void rtl92se_allow_all_destaddr(struct ieee80211_hw *hw,
+                                bool allow_all_da, bool write_into_reg)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        if (allow_all_da) /* Set BIT0 */
+                rtlpci->receive_config |= RCR_AAP;
+        else /* Clear BIT0 */
+                rtlpci->receive_config &= ~RCR_AAP;
+
+        if (write_into_reg)
+                rtl_write_dword(rtlpriv, RCR, rtlpci->receive_config);
+
+        RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
+                 "receive_config=0x%08X, write_into_reg=%d\n",
+                 rtlpci->receive_config, write_into_reg);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.h b/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
index a8e068c76e47..da48aa8cbe6f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
@@ -74,6 +74,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw,
                      u8 enc_algo, bool is_wepkey, bool clear_all);
 void rtl92se_suspend(struct ieee80211_hw *hw);
 void rtl92se_resume(struct ieee80211_hw *hw);
+void rtl92se_allow_all_destaddr(struct ieee80211_hw *hw,
+                                bool allow_all_da, bool write_into_reg);
 
 #endif
-
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 67404975e00b..9c092e6eb3fe 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -1307,6 +1307,8 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
         if (is_hal_stop(rtlhal))
                 return;
 
+        if (hal_get_firmwareversion(rtlpriv) < 0x34)
+                goto skip;
         /* We re-map RA related CMD IO to combinational ones */
         /* if FW version is v.52 or later. */
         switch (rtlhal->current_fwcmd_io) {
@@ -1320,6 +1322,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 break;
         }
 
+skip:
         switch (rtlhal->current_fwcmd_io) {
         case FW_CMD_RA_RESET:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_RESET\n");
@@ -1440,7 +1443,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u32     fw_param = FW_CMD_IO_PARA_QUERY(rtlpriv);
         u16     fw_cmdmap = FW_CMD_IO_QUERY(rtlpriv);
-        bool bPostProcessing = false;
+        bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                  "Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
@@ -1449,15 +1452,24 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
         do {
                 /* We re-map to combined FW CMD ones if firmware version */
                 /* is v.53 or later. */
-                switch (fw_cmdio) {
-                case FW_CMD_RA_REFRESH_N:
-                        fw_cmdio = FW_CMD_RA_REFRESH_N_COMB;
-                        break;
-                case FW_CMD_RA_REFRESH_BG:
-                        fw_cmdio = FW_CMD_RA_REFRESH_BG_COMB;
-                        break;
-                default:
-                        break;
+                if (hal_get_firmwareversion(rtlpriv) >= 0x35) {
+                        switch (fw_cmdio) {
+                        case FW_CMD_RA_REFRESH_N:
+                                fw_cmdio = FW_CMD_RA_REFRESH_N_COMB;
+                                break;
+                        case FW_CMD_RA_REFRESH_BG:
+                                fw_cmdio = FW_CMD_RA_REFRESH_BG_COMB;
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        if ((fw_cmdio == FW_CMD_IQK_ENABLE) ||
+                            (fw_cmdio == FW_CMD_RA_REFRESH_N) ||
+                            (fw_cmdio == FW_CMD_RA_REFRESH_BG)) {
+                                postprocessing = true;
+                                break;
+                        }
                 }
 
                 /* If firmware version is v.62 or later,
@@ -1588,19 +1600,19 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                                 fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
 
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
-                        bPostProcessing = true;
+                        postprocessing = true;
                         break;
                 case FW_CMD_PAUSE_DM_BY_SCAN:
                         fw_cmdmap &= ~(FW_DIG_ENABLE_CTL |
                                        FW_HIGH_PWR_ENABLE_CTL |
                                        FW_SS_CTL);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
-                        bPostProcessing = true;
+                        postprocessing = true;
                         break;
                 case FW_CMD_HIGH_PWR_DISABLE:
                         fw_cmdmap &= ~FW_HIGH_PWR_ENABLE_CTL;
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
-                        bPostProcessing = true;
+                        postprocessing = true;
                         break;
                 case FW_CMD_HIGH_PWR_ENABLE:
                         if (!(rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) &&
@@ -1608,7 +1620,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                                 fw_cmdmap |= (FW_HIGH_PWR_ENABLE_CTL |
                                               FW_SS_CTL);
                                 FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
-                                bPostProcessing = true;
+                                postprocessing = true;
                         }
                         break;
                 case FW_CMD_DIG_MODE_FA:
@@ -1629,14 +1641,15 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                 default:
                         /* Pass to original FW CMD processing callback
                          * routine. */
-                        bPostProcessing = true;
+                        postprocessing = true;
                         break;
                 }
         } while (false);
 
         /* We shall post processing these FW CMD if
-         * variable bPostProcessing is set. */
-        if (bPostProcessing && !rtlhal->set_fwcmd_inprogress) {
+         * variable postprocessing is set.
+         */
+        if (postprocessing && !rtlhal->set_fwcmd_inprogress) {
                 rtlhal->set_fwcmd_inprogress = true;
                 /* Update current FW Cmd for callback use. */
                 rtlhal->current_fwcmd_io = fw_cmdio;
@@ -1697,8 +1710,18 @@ void rtl92s_phy_switch_ephy_parameter(struct ieee80211_hw *hw)
 
 }
 
-void rtl92s_phy_set_beacon_hwreg(struct ieee80211_hw *hw, u16 BeaconInterval)
+void rtl92s_phy_set_beacon_hwreg(struct ieee80211_hw *hw, u16 beaconinterval)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        rtl_write_dword(rtlpriv, WFM5, 0xF1000000 | (BeaconInterval << 8));
+        u32 new_bcn_num = 0;
+
+        if (hal_get_firmwareversion(rtlpriv) >= 0x33) {
+                /* Fw v.51 and later. */
+                rtl_write_dword(rtlpriv, WFM5, 0xF1000000 |
+                                (beaconinterval << 8));
+        } else {
+                new_bcn_num = beaconinterval * 32 - 64;
+                rtl_write_dword(rtlpriv, WFM3 + 4, new_bcn_num);
+                rtl_write_dword(rtlpriv, WFM3, 0xB026007C);
+        }
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.h b/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
index ac0387770630..8acf4765a7a6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
@@ -39,6 +39,7 @@
 #define MAX_POSTCMD_CNT                 16
 
 #define RF90_PATH_MAX                   4
+#define RF6052_MAX_PATH                 2
 
 enum version_8192s {
         VERSION_8192S_ACUT,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index cecc377e9e61..2e8e6f8d2d51 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -290,6 +290,7 @@ static struct rtl_hal_ops rtl8192se_hal_ops = {
         .enable_hw_sec = rtl92se_enable_hw_security_config,
         .set_key = rtl92se_set_key,
         .init_sw_leds = rtl92se_init_sw_leds,
+        .allow_all_destaddr = rtl92se_allow_all_destaddr,
         .get_bbreg = rtl92s_phy_query_bb_reg,
         .set_bbreg = rtl92s_phy_set_bb_reg,
         .get_rfreg = rtl92s_phy_query_rf_reg,
@@ -366,7 +367,7 @@ static struct rtl_hal_cfg rtl92se_hal_cfg = {
 
         .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
-        .maps[RTL_IMR_BcnInt] = IMR_BCNINT,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNINT,
         .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
         .maps[RTL_IMR_RDU] = IMR_RDU,
         .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 7b0a2e75b8b8..c7095118de6e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -30,6 +30,7 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../stats.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -43,7 +44,7 @@ static u8 _rtl92se_map_hwqueue_to_fwqueue(struct sk_buff *skb,	u8 skb_queue)
 
         if (unlikely(ieee80211_is_beacon(fc)))
                 return QSLT_BEACON;
-        if (ieee80211_is_mgmt(fc))
+        if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
                 return QSLT_MGNT;
         if (ieee80211_is_nullfunc(fc))
                 return QSLT_HIGH;
@@ -51,65 +52,6 @@ static u8 _rtl92se_map_hwqueue_to_fwqueue(struct sk_buff *skb,	u8 skb_queue)
         return skb->priority;
 }
 
-static u8 _rtl92s_query_rxpwrpercentage(char antpower)
-{
-        if ((antpower <= -100) || (antpower >= 20))
-                return 0;
-        else if (antpower >= 0)
-                return 100;
-        else
-                return 100 + antpower;
-}
-
-static u8 _rtl92s_evm_db_to_percentage(char value)
-{
-        char ret_val;
-        ret_val = value;
-
-        if (ret_val >= 0)
-                ret_val = 0;
-
-        if (ret_val <= -33)
-                ret_val = -33;
-
-        ret_val = 0 - ret_val;
-        ret_val *= 3;
-
-        if (ret_val == 99)
-                ret_val = 100;
-
-        return ret_val;
-}
-
-static long _rtl92se_translate_todbm(struct ieee80211_hw *hw,
-                                     u8 signal_strength_index)
-{
-        long signal_power;
-
-        signal_power = (long)((signal_strength_index + 1) >> 1);
-        signal_power -= 95;
-        return signal_power;
-}
-
-static long _rtl92se_signal_scale_mapping(struct ieee80211_hw *hw,
-                long currsig)
-{
-        long retsig = 0;
-
-        /* Step 1. Scale mapping. */
-        if (currsig > 47)
-                retsig = 100;
-        else if (currsig > 14 && currsig <= 47)
-                retsig = 100 - ((47 - currsig) * 3) / 2;
-        else if (currsig > 2 && currsig <= 14)
-                retsig = 48 - ((14 - currsig) * 15) / 7;
-        else if (currsig >= 0)
-                retsig = currsig * 9 + 1;
-
-        return retsig;
-}
-
-
 static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                                        struct rtl_stats *pstats, u8 *pdesc,
                                        struct rx_fwinfo *p_drvinfo,
@@ -119,11 +61,11 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct phy_sts_cck_8192s_t *cck_buf;
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
         s8 rx_pwr_all = 0, rx_pwr[4];
         u8 rf_rx_num = 0, evm, pwdb_all;
         u8 i, max_spatial_stream;
         u32 rssi, total_rssi = 0;
-        bool in_powersavemode = false;
         bool is_cck = pstats->is_cck;
 
         pstats->packet_matchbssid = packet_match_bssid;
@@ -136,7 +78,7 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                 u8 report, cck_highpwr;
                 cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
 
-                if (!in_powersavemode)
+                if (ppsc->rfpwr_state == ERFON)
                         cck_highpwr = (u8) rtl_get_bbreg(hw,
                                                 RFPGA0_XA_HSSIPARAMETER2,
                                                 0x200);
@@ -181,7 +123,7 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                         }
                 }
 
-                pwdb_all = _rtl92s_query_rxpwrpercentage(rx_pwr_all);
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
 
                 /* CCK gain is smaller than OFDM/MCS gain,  */
                 /* so we add gain diff by experiences, the val is 6 */
@@ -222,13 +164,13 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
         } else {
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
-                for (i = RF90_PATH_A; i < RF90_PATH_MAX; i++) {
+                for (i = RF90_PATH_A; i < RF6052_MAX_PATH; i++) {
                         if (rtlpriv->dm.rfpath_rxenable[i])
                                 rf_rx_num++;
 
                         rx_pwr[i] = ((p_drvinfo->gain_trsw[i] &
                                     0x3f) * 2) - 110;
-                        rssi = _rtl92s_query_rxpwrpercentage(rx_pwr[i]);
+                        rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
                         total_rssi += rssi;
                         rtlpriv->stats.rx_snr_db[i] =
                                          (long)(p_drvinfo->rxsnr[i] / 2);
@@ -238,7 +180,7 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                 }
 
                 rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
-                pwdb_all = _rtl92s_query_rxpwrpercentage(rx_pwr_all);
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
                 pstats->rx_pwdb_all = pwdb_all;
                 pstats->rxpower = rx_pwr_all;
                 pstats->recvsignalpower = rx_pwr_all;
@@ -250,7 +192,7 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                         max_spatial_stream = 1;
 
                 for (i = 0; i < max_spatial_stream; i++) {
-                        evm = _rtl92s_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+                        evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
 
                         if (packet_match_bssid) {
                                 if (i == 0)
@@ -262,212 +204,13 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
         }
 
         if (is_cck)
-                pstats->signalstrength = (u8)(_rtl92se_signal_scale_mapping(hw,
+                pstats->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
                                          pwdb_all));
         else if (rf_rx_num != 0)
-                pstats->signalstrength = (u8) (_rtl92se_signal_scale_mapping(hw,
+                pstats->signalstrength = (u8) (rtl_signal_scale_mapping(hw,
                                 total_rssi /= rf_rx_num));
 }
 
-static void _rtl92se_process_ui_rssi(struct ieee80211_hw *hw,
-                                     struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u8 rfpath;
-        u32 last_rssi, tmpval;
-
-        if (pstats->packet_toself || pstats->packet_beacon) {
-                rtlpriv->stats.rssi_calculate_cnt++;
-
-                if (rtlpriv->stats.ui_rssi.total_num++ >=
-                    PHY_RSSI_SLID_WIN_MAX) {
-                        rtlpriv->stats.ui_rssi.total_num =
-                                         PHY_RSSI_SLID_WIN_MAX;
-                        last_rssi = rtlpriv->stats.ui_rssi.elements[
-                                rtlpriv->stats.ui_rssi.index];
-                        rtlpriv->stats.ui_rssi.total_val -= last_rssi;
-                }
-
-                rtlpriv->stats.ui_rssi.total_val += pstats->signalstrength;
-                rtlpriv->stats.ui_rssi.elements[rtlpriv->stats.ui_rssi.index++]
-                         = pstats->signalstrength;
-
-                if (rtlpriv->stats.ui_rssi.index >= PHY_RSSI_SLID_WIN_MAX)
-                        rtlpriv->stats.ui_rssi.index = 0;
-
-                tmpval = rtlpriv->stats.ui_rssi.total_val /
-                        rtlpriv->stats.ui_rssi.total_num;
-                rtlpriv->stats.signal_strength = _rtl92se_translate_todbm(hw,
-                                                                (u8) tmpval);
-                pstats->rssi = rtlpriv->stats.signal_strength;
-        }
-
-        if (!pstats->is_cck && pstats->packet_toself) {
-                for (rfpath = RF90_PATH_A; rfpath < rtlphy->num_total_rfpath;
-                     rfpath++) {
-                        if (rtlpriv->stats.rx_rssi_percentage[rfpath] == 0) {
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    pstats->rx_mimo_signalstrength[rfpath];
-
-                        }
-
-                        if (pstats->rx_mimo_signalstrength[rfpath] >
-                            rtlpriv->stats.rx_rssi_percentage[rfpath]) {
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    ((rtlpriv->stats.rx_rssi_percentage[rfpath]
-                                    * (RX_SMOOTH_FACTOR - 1)) +
-                                    (pstats->rx_mimo_signalstrength[rfpath])) /
-                                    (RX_SMOOTH_FACTOR);
-
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    rtlpriv->stats.rx_rssi_percentage[rfpath]
-                                    + 1;
-                        } else {
-                                rtlpriv->stats.rx_rssi_percentage[rfpath] =
-                                    ((rtlpriv->stats.rx_rssi_percentage[rfpath]
-                                    * (RX_SMOOTH_FACTOR - 1)) +
-                                    (pstats->rx_mimo_signalstrength[rfpath])) /
-                                    (RX_SMOOTH_FACTOR);
-                        }
-
-                }
-        }
-}
-
-static void _rtl92se_update_rxsignalstatistics(struct ieee80211_hw *hw,
-                                               struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        int weighting = 0;
-
-        if (rtlpriv->stats.recv_signal_power == 0)
-                rtlpriv->stats.recv_signal_power = pstats->recvsignalpower;
-
-        if (pstats->recvsignalpower > rtlpriv->stats.recv_signal_power)
-                weighting = 5;
-        else if (pstats->recvsignalpower < rtlpriv->stats.recv_signal_power)
-                weighting = (-5);
-
-        rtlpriv->stats.recv_signal_power = (rtlpriv->stats.recv_signal_power * 5
-                                           + pstats->recvsignalpower +
-                                           weighting) / 6;
-}
-
-static void _rtl92se_process_pwdb(struct ieee80211_hw *hw,
-                                  struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        long undec_sm_pwdb = 0;
-
-        if (mac->opmode == NL80211_IFTYPE_ADHOC) {
-                return;
-        } else {
-                undec_sm_pwdb =
-                    rtlpriv->dm.undec_sm_pwdb;
-        }
-
-        if (pstats->packet_toself || pstats->packet_beacon) {
-                if (undec_sm_pwdb < 0)
-                        undec_sm_pwdb = pstats->rx_pwdb_all;
-
-                if (pstats->rx_pwdb_all > (u32) undec_sm_pwdb) {
-                        undec_sm_pwdb =
-                            (((undec_sm_pwdb) *
-                            (RX_SMOOTH_FACTOR - 1)) +
-                            (pstats->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
-
-                        undec_sm_pwdb = undec_sm_pwdb + 1;
-                } else {
-                        undec_sm_pwdb = (((undec_sm_pwdb) *
-                              (RX_SMOOTH_FACTOR - 1)) + (pstats->rx_pwdb_all)) /
-                              (RX_SMOOTH_FACTOR);
-                }
-
-                rtlpriv->dm.undec_sm_pwdb = undec_sm_pwdb;
-                _rtl92se_update_rxsignalstatistics(hw, pstats);
-        }
-}
-
-static void rtl_92s_process_streams(struct ieee80211_hw *hw,
-                                    struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 stream;
-
-        for (stream = 0; stream < 2; stream++) {
-                if (pstats->rx_mimo_sig_qual[stream] != -1) {
-                        if (rtlpriv->stats.rx_evm_percentage[stream] == 0) {
-                                rtlpriv->stats.rx_evm_percentage[stream] =
-                                    pstats->rx_mimo_sig_qual[stream];
-                        }
-
-                        rtlpriv->stats.rx_evm_percentage[stream] =
-                            ((rtlpriv->stats.rx_evm_percentage[stream] *
-                                        (RX_SMOOTH_FACTOR - 1)) +
-                             (pstats->rx_mimo_sig_qual[stream] *
-                                        1)) / (RX_SMOOTH_FACTOR);
-                }
-        }
-}
-
-static void _rtl92se_process_ui_link_quality(struct ieee80211_hw *hw,
-                                             struct rtl_stats *pstats)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 last_evm = 0, tmpval;
-
-        if (pstats->signalquality != 0) {
-                if (pstats->packet_toself || pstats->packet_beacon) {
-
-                        if (rtlpriv->stats.ui_link_quality.total_num++ >=
-                            PHY_LINKQUALITY_SLID_WIN_MAX) {
-                                rtlpriv->stats.ui_link_quality.total_num =
-                                    PHY_LINKQUALITY_SLID_WIN_MAX;
-                                last_evm =
-                                    rtlpriv->stats.ui_link_quality.elements[
-                                    rtlpriv->stats.ui_link_quality.index];
-                                rtlpriv->stats.ui_link_quality.total_val -=
-                                    last_evm;
-                        }
-
-                        rtlpriv->stats.ui_link_quality.total_val +=
-                            pstats->signalquality;
-                        rtlpriv->stats.ui_link_quality.elements[
-                                rtlpriv->stats.ui_link_quality.index++] =
-                            pstats->signalquality;
-
-                        if (rtlpriv->stats.ui_link_quality.index >=
-                            PHY_LINKQUALITY_SLID_WIN_MAX)
-                                rtlpriv->stats.ui_link_quality.index = 0;
-
-                        tmpval = rtlpriv->stats.ui_link_quality.total_val /
-                            rtlpriv->stats.ui_link_quality.total_num;
-                        rtlpriv->stats.signal_quality = tmpval;
-
-                        rtlpriv->stats.last_sigstrength_inpercent = tmpval;
-
-                        rtl_92s_process_streams(hw, pstats);
-
-                }
-        }
-}
-
-static void _rtl92se_process_phyinfo(struct ieee80211_hw *hw,
-                                     u8 *buffer,
-                                     struct rtl_stats *pcurrent_stats)
-{
-
-        if (!pcurrent_stats->packet_matchbssid &&
-            !pcurrent_stats->packet_beacon)
-                return;
-
-        _rtl92se_process_ui_rssi(hw, pcurrent_stats);
-        _rtl92se_process_pwdb(hw, pcurrent_stats);
-        _rtl92se_process_ui_link_quality(hw, pcurrent_stats);
-}
-
 static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
                 struct sk_buff *skb, struct rtl_stats *pstats,
                 u8 *pdesc, struct rx_fwinfo *p_drvinfo)
@@ -505,7 +248,7 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
 
         _rtl92se_query_rxphystatus(hw, pstats, pdesc, p_drvinfo,
                         packet_matchbssid, packet_toself, packet_beacon);
-        _rtl92se_process_phyinfo(hw, tmp_buf, pstats);
+        rtl_process_phyinfo(hw, tmp_buf, pstats);
 }
 
 bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
@@ -538,11 +281,8 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
         if (stats->hwerror)
                 return false;
 
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->band = hw->conf.channel->band;
-
-        hdr = (struct ieee80211_hdr *)(skb->data + stats->rx_drvinfo_size
-              + stats->rx_bufshift);
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
 
         if (stats->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
@@ -563,6 +303,13 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
          * for IEEE80211w frame, and mac80211 sw will help
          * to decrypt it */
         if (stats->decrypted) {
+                hdr = (struct ieee80211_hdr *)(skb->data +
+                       stats->rx_drvinfo_size + stats->rx_bufshift);
+
+                if (!hdr) {
+                        /* during testing, hdr was NULL here */
+                        return false;
+                }
                 if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
                         (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
@@ -630,6 +377,11 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
 
         CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE_RTL8192S);
 
+        if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
+                firstseg = true;
+                lastseg = true;
+        }
+
         if (firstseg) {
                 if (rtlpriv->dm.useramask) {
                         /* set txdesc macId */
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
index 12e2a3cb0701..a36eee28f9e7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
@@ -166,8 +166,8 @@ static void rtl8723ae_dm_diginit(struct ieee80211_hw *hw)
         dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
         dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
         dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
-        dm_digtable->rx_gain_range_max = DM_DIG_MAX;
-        dm_digtable->rx_gain_range_min = DM_DIG_MIN;
+        dm_digtable->rx_gain_max = DM_DIG_MAX;
+        dm_digtable->rx_gain_min = DM_DIG_MIN;
         dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
         dm_digtable->back_range_max = DM_DIG_BACKOFF_MAX;
         dm_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
@@ -291,11 +291,11 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw)
         }
 
         if ((dgtbl->rssi_val_min + 10 - dgtbl->back_val) >
-            dgtbl->rx_gain_range_max)
-                dgtbl->cur_igvalue = dgtbl->rx_gain_range_max;
+            dgtbl->rx_gain_max)
+                dgtbl->cur_igvalue = dgtbl->rx_gain_max;
         else if ((dgtbl->rssi_val_min + 10 -
-                  dgtbl->back_val) < dgtbl->rx_gain_range_min)
-                dgtbl->cur_igvalue = dgtbl->rx_gain_range_min;
+                  dgtbl->back_val) < dgtbl->rx_gain_min)
+                dgtbl->cur_igvalue = dgtbl->rx_gain_min;
         else
                 dgtbl->cur_igvalue = dgtbl->rssi_val_min + 10 - dgtbl->back_val;
 
@@ -707,6 +707,77 @@ void rtl8723ae_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
                 rtlpriv->dm.useramask = false;
 }
 
+static void rtl8723ae_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rate_adaptive *p_ra = &(rtlpriv->ra);
+        u32 low_rssithresh_for_ra, high_rssithresh_for_ra;
+        struct ieee80211_sta *sta = NULL;
+
+        if (is_hal_stop(rtlhal)) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         " driver is going to unload\n");
+                return;
+        }
+
+        if (!rtlpriv->dm.useramask) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         " driver does not control rate adaptive mask\n");
+                return;
+        }
+
+        if (mac->link_state == MAC80211_LINKED &&
+            mac->opmode == NL80211_IFTYPE_STATION) {
+                switch (p_ra->pre_ratr_state) {
+                case DM_RATR_STA_HIGH:
+                        high_rssithresh_for_ra = 50;
+                        low_rssithresh_for_ra = 20;
+                        break;
+                case DM_RATR_STA_MIDDLE:
+                        high_rssithresh_for_ra = 55;
+                        low_rssithresh_for_ra = 20;
+                        break;
+                case DM_RATR_STA_LOW:
+                        high_rssithresh_for_ra = 50;
+                        low_rssithresh_for_ra = 25;
+                        break;
+                default:
+                        high_rssithresh_for_ra = 50;
+                        low_rssithresh_for_ra = 20;
+                        break;
+                }
+
+                if (rtlpriv->dm.undec_sm_pwdb > high_rssithresh_for_ra)
+                        p_ra->ratr_state = DM_RATR_STA_HIGH;
+                else if (rtlpriv->dm.undec_sm_pwdb > low_rssithresh_for_ra)
+                        p_ra->ratr_state = DM_RATR_STA_MIDDLE;
+                else
+                        p_ra->ratr_state = DM_RATR_STA_LOW;
+
+                if (p_ra->pre_ratr_state != p_ra->ratr_state) {
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI = %ld\n",
+                                 rtlpriv->dm.undec_sm_pwdb);
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "PreState = %d, CurState = %d\n",
+                                 p_ra->pre_ratr_state, p_ra->ratr_state);
+
+                        rcu_read_lock();
+                        sta = rtl_find_sta(hw, mac->bssid);
+                        if (sta)
+                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
+                                                           p_ra->ratr_state);
+                        rcu_read_unlock();
+
+                        p_ra->pre_ratr_state = p_ra->ratr_state;
+                }
+        }
+}
+
 static void rtl8723ae_dm_init_dynamic_bpowersaving(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -853,6 +924,9 @@ void rtl8723ae_dm_watchdog(struct ieee80211_hw *hw)
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
                                       (u8 *) (&fw_ps_awake));
 
+        if (ppsc->p2p_ps_info.p2p_ps_mode)
+                fw_ps_awake = false;
+
         if ((ppsc->rfpwr_state == ERFON) &&
             ((!fw_current_inpsmode) && fw_ps_awake) &&
             (!ppsc->rfchange_inprogress)) {
@@ -861,7 +935,7 @@ void rtl8723ae_dm_watchdog(struct ieee80211_hw *hw)
                 rtl8723ae_dm_false_alarm_counter_statistics(hw);
                 rtl8723ae_dm_dynamic_bpowersaving(hw);
                 rtl8723ae_dm_dynamic_txpower(hw);
-                /* rtl92c_dm_refresh_rate_adaptive_mask(hw); */
+                rtl8723ae_dm_refresh_rate_adaptive_mask(hw);
                 rtl8723ae_dm_bt_coexist(hw);
                 rtl8723ae_dm_check_edca_turbo(hw);
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
index 39d246196247..a372b0204456 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
@@ -55,7 +55,13 @@
 #define DM_DIG_BACKOFF_MIN                      -4
 #define DM_DIG_BACKOFF_DEFAULT                  10
 
+#define RXPATHSELECTION_SS_TH_LOW               30
+#define RXPATHSELECTION_DIFF_TH                 18
+
 #define DM_RATR_STA_INIT                        0
+#define DM_RATR_STA_HIGH                        1
+#define DM_RATR_STA_MIDDLE                      2
+#define DM_RATR_STA_LOW                         3
 
 #define TXHIGHPWRLEVEL_NORMAL                   0
 #define TXHIGHPWRLEVEL_LEVEL1                   1
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
index 35cb8f83eed4..dedfa1ed3e02 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
@@ -494,7 +494,9 @@ void rtl8723ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
-        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode, 1);
+        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
+                                         (rtlpriv->mac80211.p2p) ?
+                                         ppsc->smart_ps : 1);
         SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
                                               ppsc->reg_max_lps_awakeintvl);
 
@@ -741,3 +743,96 @@ void rtl8723ae_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
 
         rtl8723ae_fill_h2c_cmd(hw, H2C_JOINBSSRPT, 1, u1_joinbssrpt_parm);
 }
+
+static void rtl8723e_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw,
+                                            u8 ctwindow)
+{
+        u8 u1_ctwindow_period[1] = {ctwindow};
+
+        rtl8723ae_fill_h2c_cmd(hw, H2C_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
+}
+
+void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_p2p_ps_info *p2pinfo = &(rtlps->p2p_ps_info);
+        struct p2p_ps_offload_t *p2p_ps_offload = &rtlhal->p2p_ps_offload;
+        u8      i;
+        u16     ctwindow;
+        u32     start_time, tsf_low;
+
+        switch (p2p_ps_state) {
+        case P2P_PS_DISABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
+                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
+                break;
+        case P2P_PS_ENABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
+                /* update CTWindow value. */
+                if (p2pinfo->ctwindow > 0) {
+                        p2p_ps_offload->ctwindow_en = 1;
+                        ctwindow = p2pinfo->ctwindow;
+                        rtl8723e_set_p2p_ctw_period_cmd(hw, ctwindow);
+                }
+
+                /* hw only support 2 set of NoA */
+                for (i = 0; i < p2pinfo->noa_num; i++) {
+                        /* To control the register setting for which NOA*/
+                        rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
+                        if (i == 0)
+                                p2p_ps_offload->noa0_en = 1;
+                        else
+                                p2p_ps_offload->noa1_en = 1;
+
+                        /* config P2P NoA Descriptor Register */
+                        rtl_write_dword(rtlpriv, 0x5E0,
+                                        p2pinfo->noa_duration[i]);
+                        rtl_write_dword(rtlpriv, 0x5E4,
+                                        p2pinfo->noa_interval[i]);
+
+                        /*Get Current TSF value */
+                        tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                        start_time = p2pinfo->noa_start_time[i];
+                        if (p2pinfo->noa_count_type[i] != 1) {
+                                while (start_time <= (tsf_low+(50*1024))) {
+                                        start_time += p2pinfo->noa_interval[i];
+                                        if (p2pinfo->noa_count_type[i] != 255)
+                                                p2pinfo->noa_count_type[i]--;
+                                }
+                        }
+                        rtl_write_dword(rtlpriv, 0x5E8, start_time);
+                        rtl_write_dword(rtlpriv, 0x5EC,
+                                        p2pinfo->noa_count_type[i]);
+                }
+                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                        /* rst p2p circuit */
+                        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
+
+                        p2p_ps_offload->offload_en = 1;
+
+                        if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
+                                p2p_ps_offload->role = 1;
+                                p2p_ps_offload->allstasleep = 0;
+                        } else {
+                                p2p_ps_offload->role = 0;
+                        }
+                        p2p_ps_offload->discovery = 0;
+                }
+                break;
+        case P2P_PS_SCAN:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
+                p2p_ps_offload->discovery = 1;
+                break;
+        case P2P_PS_SCAN_DONE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
+                p2p_ps_offload->discovery = 0;
+                p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
+                break;
+        default:
+                break;
+        }
+        rtl8723ae_fill_h2c_cmd(hw, H2C_P2P_PS_OFFLOAD, 1, (u8 *)p2p_ps_offload);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
index 89994e16dc83..ed3b795e6980 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
@@ -70,8 +70,10 @@ enum rtl8192c_h2c_cmd {
         H2C_SETPWRMODE = 1,
         H2C_JOINBSSRPT = 2,
         H2C_RSVDPAGE = 3,
-        H2C_RSSI_REPORT = 5,
-        H2C_RA_MASK = 6,
+        H2C_RSSI_REPORT = 4,
+        H2C_P2P_PS_CTW_CMD = 5,
+        H2C_P2P_PS_OFFLOAD = 6,
+        H2C_RA_MASK = 7,
         MAX_H2CCMD
 };
 
@@ -97,5 +99,6 @@ void rtl8723ae_firmware_selfreset(struct ieee80211_hw *hw);
 void rtl8723ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
 void rtl8723ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl8723ae_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 9a0c71c2e15e..c333dfd116b8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -449,6 +449,9 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtl8723ae_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
 
                 break; }
+        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
+                rtl8723ae_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
+                break;
         case HW_VAR_AID:{
                 u16 u2btmp;
                 u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
@@ -474,6 +477,39 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 if (btype_ibss == true)
                         _rtl8723ae_resume_tx_beacon(hw);
                 break; }
+        case HW_VAR_FW_LPS_ACTION: {
+                bool enter_fwlps = *((bool *)val);
+                u8 rpwm_val, fw_pwrmode;
+                bool fw_current_inps;
+
+                if (enter_fwlps) {
+                        rpwm_val = 0x02;        /* RF off */
+                        fw_current_inps = true;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_FW_PSMODE_STATUS,
+                                        (u8 *)(&fw_current_inps));
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_H2C_FW_PWRMODE,
+                                        (u8 *)(&ppsc->fwctrl_psmode));
+
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_SET_RPWM,
+                                        (u8 *)(&rpwm_val));
+                } else {
+                        rpwm_val = 0x0C;        /* RF on */
+                        fw_pwrmode = FW_PS_ACTIVE_MODE;
+                        fw_current_inps = false;
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                        (u8 *)(&rpwm_val));
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_H2C_FW_PWRMODE,
+                                        (u8 *)(&fw_pwrmode));
+
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                        HW_VAR_FW_PSMODE_STATUS,
+                                        (u8 *)(&fw_current_inps));
+                }
+                break; }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "switch case not processed\n");
@@ -1379,7 +1415,7 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 }
 
                 for (i = 0; i < 14; i++) {
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
@@ -1420,10 +1456,10 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                     0xf0) >> 4);
                         }
 
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht20[%d] = 0x%x\n", rf_path, i,
                                 rtlefuse->pwrgroup_ht20[rf_path][i]);
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht40[%d] = 0x%x\n", rf_path, i,
                                 rtlefuse->pwrgroup_ht40[rf_path][i]);
                 }
@@ -1463,19 +1499,19 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
             rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
 
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
@@ -1483,14 +1519,14 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         if (!autoload_fail)
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
         else
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
                 rtlefuse->eeprom_tssi[RF90_PATH_A],
                 rtlefuse->eeprom_tssi[RF90_PATH_B]);
@@ -1505,7 +1541,7 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->apk_thermalmeterignore = true;
 
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
@@ -1713,19 +1749,7 @@ static void _rtl8723ae_hal_customized_behavior(struct ieee80211_hw *hw)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-        switch (rtlhal->oem_id) {
-        case RT_CID_819x_HP:
-                pcipriv->ledctl.led_opendrain = true;
-                break;
-        case RT_CID_819x_Lenovo:
-        case RT_CID_DEFAULT:
-        case RT_CID_TOSHIBA:
-        case RT_CID_CCX:
-        case RT_CID_819x_Acer:
-        case RT_CID_WHQL:
-        default:
-                break;
-        }
+        pcipriv->ledctl.led_opendrain = true;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/led.c b/drivers/net/wireless/rtlwifi/rtl8723ae/led.c
index 9c4e1d811187..061526fe6e2d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/led.c
@@ -54,8 +54,9 @@ void rtl8723ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         case LED_PIN_GPIO0:
                 break;
         case LED_PIN_LED0:
+                ledcfg &= ~BIT(6);
                 rtl_write_byte(rtlpriv,
-                               REG_LEDCFG2, (ledcfg & 0xf0) | BIT(5) | BIT(6));
+                               REG_LEDCFG2, (ledcfg & 0xf0) | BIT(5));
                 break;
         case LED_PIN_LED1:
                 rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg & 0x0f) | BIT(5));
@@ -84,16 +85,21 @@ void rtl8723ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         case LED_PIN_LED0:
                 ledcfg &= 0xf0;
-                if (pcipriv->ledctl.led_opendrain)
+                if (pcipriv->ledctl.led_opendrain) {
+                        ledcfg &= 0x90;
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg|BIT(3)));
+                        ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
+                        ledcfg &= 0xFE;
+                        rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, ledcfg);
+                } else {
+                        ledcfg &= ~BIT(6);
                         rtl_write_byte(rtlpriv, REG_LEDCFG2,
-                                       (ledcfg | BIT(1) | BIT(5) | BIT(6)));
-                else
-                        rtl_write_byte(rtlpriv, REG_LEDCFG2,
-                                       (ledcfg | BIT(3) | BIT(5) | BIT(6)));
+                                       (ledcfg | BIT(3) | BIT(5)));
+                }
                 break;
         case LED_PIN_LED1:
-                ledcfg &= 0x0f;
-                rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg | BIT(3)));
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1) & 0x10;
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, (ledcfg | BIT(3)));
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
index bb7cc90bafb2..e4c4cdc3eb67 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
@@ -305,7 +305,7 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
 
         .maps[RTL_IMR_TXFOVW] = PHIMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = PHIMR_PSTIMEOUT,
-        .maps[RTL_IMR_BcnInt] = PHIMR_BCNDMAINT0,
+        .maps[RTL_IMR_BCNINT] = PHIMR_BCNDMAINT0,
         .maps[RTL_IMR_RXFOVW] = PHIMR_RXFOVW,
         .maps[RTL_IMR_RDU] = PHIMR_RDU,
         .maps[RTL_IMR_ATIMEND] = PHIMR_ATIMEND_E,
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index ac081297db50..c72758d8f4ed 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@ -304,11 +304,8 @@ bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
 
         status->is_cck = RTL8723E_RX_HAL_IS_CCK_RATE(status->rate);
 
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->band = hw->conf.channel->band;
-
-        hdr = (struct ieee80211_hdr *)(skb->data + status->rx_drvinfo_size
-                + status->rx_bufshift);
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
 
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
@@ -330,6 +327,13 @@ bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
+                hdr = (struct ieee80211_hdr *)(skb->data +
+                       status->rx_drvinfo_size + status->rx_bufshift);
+
+                if (!hdr) {
+                        /* during testing, hdr could be NULL here */
+                        return false;
+                }
                 if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
                         (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index 5847d6d0881e..76732b0cd221 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -224,10 +224,9 @@ static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
         u8 *buffer;
 
         wvalue = (u16)(addr & 0x0000ffff);
-        buffer = kmalloc(len, GFP_ATOMIC);
+        buffer = kmemdup(data, len, GFP_ATOMIC);
         if (!buffer)
                 return;
-        memcpy(buffer, data, len);
         usb_control_msg(udev, pipe, request, reqtype, wvalue,
                         index, buffer, len, 50);
 
@@ -309,6 +308,8 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw)
         return 0;
 }
 
+static void _rtl_rx_work(unsigned long param);
+
 static int _rtl_usb_init_rx(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -325,6 +326,12 @@ static int _rtl_usb_init_rx(struct ieee80211_hw *hw)
         pr_info("rx_max_size %d, rx_urb_num %d, in_ep %d\n",
                 rtlusb->rx_max_size, rtlusb->rx_urb_num, rtlusb->in_ep);
         init_usb_anchor(&rtlusb->rx_submitted);
+        init_usb_anchor(&rtlusb->rx_cleanup_urbs);
+
+        skb_queue_head_init(&rtlusb->rx_queue);
+        rtlusb->rx_work_tasklet.func = _rtl_rx_work;
+        rtlusb->rx_work_tasklet.data = (unsigned long)rtlusb;
+
         return 0;
 }
 
@@ -406,40 +413,30 @@ static void rtl_usb_init_sw(struct ieee80211_hw *hw)
         rtlusb->disableHWSM =  true;
 }
 
-#define __RADIO_TAP_SIZE_RSV    32
-
 static void _rtl_rx_completed(struct urb *urb);
 
-static struct sk_buff *_rtl_prep_rx_urb(struct ieee80211_hw *hw,
-                                        struct rtl_usb *rtlusb,
-                                        struct urb *urb,
-                                        gfp_t gfp_mask)
+static int _rtl_prep_rx_urb(struct ieee80211_hw *hw, struct rtl_usb *rtlusb,
+                              struct urb *urb, gfp_t gfp_mask)
 {
-        struct sk_buff *skb;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        void *buf;
 
-        skb = __dev_alloc_skb((rtlusb->rx_max_size + __RADIO_TAP_SIZE_RSV),
-                               gfp_mask);
-        if (!skb) {
+        buf = usb_alloc_coherent(rtlusb->udev, rtlusb->rx_max_size, gfp_mask,
+                                 &urb->transfer_dma);
+        if (!buf) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         "Failed to __dev_alloc_skb!!\n");
-                return ERR_PTR(-ENOMEM);
+                         "Failed to usb_alloc_coherent!!\n");
+                return -ENOMEM;
         }
 
-        /* reserve some space for mac80211's radiotap */
-        skb_reserve(skb, __RADIO_TAP_SIZE_RSV);
         usb_fill_bulk_urb(urb, rtlusb->udev,
                           usb_rcvbulkpipe(rtlusb->udev, rtlusb->in_ep),
-                          skb->data, min(skb_tailroom(skb),
-                          (int)rtlusb->rx_max_size),
-                          _rtl_rx_completed, skb);
+                          buf, rtlusb->rx_max_size, _rtl_rx_completed, rtlusb);
+        urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        _rtl_install_trx_info(rtlusb, skb, rtlusb->in_ep);
-        return skb;
+        return 0;
 }
 
-#undef __RADIO_TAP_SIZE_RSV
-
 static void _rtl_usb_rx_process_agg(struct ieee80211_hw *hw,
                                     struct sk_buff *skb)
 {
@@ -523,22 +520,14 @@ static void _rtl_usb_rx_process_noagg(struct ieee80211_hw *hw,
                         if (unicast)
                                 rtlpriv->link_info.num_rx_inperiod++;
                 }
-                if (likely(rtl_action_proc(hw, skb, false))) {
-                        struct sk_buff *uskb = NULL;
-                        u8 *pdata;
-
-                        uskb = dev_alloc_skb(skb->len + 128);
-                        if (uskb) {     /* drop packet on allocation failure */
-                                memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
-                                       sizeof(rx_status));
-                                pdata = (u8 *)skb_put(uskb, skb->len);
-                                memcpy(pdata, skb->data, skb->len);
-                                ieee80211_rx_irqsafe(hw, uskb);
-                        }
-                        dev_kfree_skb_any(skb);
-                } else {
+
+                /* static bcn for roaming */
+                rtl_beacon_statistic(hw, skb);
+
+                if (likely(rtl_action_proc(hw, skb, false)))
+                        ieee80211_rx(hw, skb);
+                else
                         dev_kfree_skb_any(skb);
-                }
         }
 }
 
@@ -555,15 +544,70 @@ static void _rtl_rx_pre_process(struct ieee80211_hw *hw, struct sk_buff *skb)
         while (!skb_queue_empty(&rx_queue)) {
                 _skb = skb_dequeue(&rx_queue);
                 _rtl_usb_rx_process_agg(hw, _skb);
-                ieee80211_rx_irqsafe(hw, _skb);
+                ieee80211_rx(hw, _skb);
+        }
+}
+
+#define __RX_SKB_MAX_QUEUED     32
+
+static void _rtl_rx_work(unsigned long param)
+{
+        struct rtl_usb *rtlusb = (struct rtl_usb *)param;
+        struct ieee80211_hw *hw = usb_get_intfdata(rtlusb->intf);
+        struct sk_buff *skb;
+
+        while ((skb = skb_dequeue(&rtlusb->rx_queue))) {
+                if (unlikely(IS_USB_STOP(rtlusb))) {
+                        dev_kfree_skb_any(skb);
+                        continue;
+                }
+
+                if (likely(!rtlusb->usb_rx_segregate_hdl)) {
+                        _rtl_usb_rx_process_noagg(hw, skb);
+                } else {
+                        /* TO DO */
+                        _rtl_rx_pre_process(hw, skb);
+                        pr_err("rx agg not supported\n");
+                }
+        }
+}
+
+static unsigned int _rtl_rx_get_padding(struct ieee80211_hdr *hdr,
+                                        unsigned int len)
+{
+        unsigned int padding = 0;
+
+        /* make function no-op when possible */
+        if (NET_IP_ALIGN == 0 || len < sizeof(*hdr))
+                return 0;
+
+        /* alignment calculation as in lbtf_rx() / carl9170_rx_copy_data() */
+        /* TODO: deduplicate common code, define helper function instead? */
+
+        if (ieee80211_is_data_qos(hdr->frame_control)) {
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
+
+                padding ^= NET_IP_ALIGN;
+
+                /* Input might be invalid, avoid accessing memory outside
+                 * the buffer.
+                 */
+                if ((unsigned long)qc - (unsigned long)hdr < len &&
+                    *qc & IEEE80211_QOS_CTL_A_MSDU_PRESENT)
+                        padding ^= NET_IP_ALIGN;
         }
+
+        if (ieee80211_has_a4(hdr->frame_control))
+                padding ^= NET_IP_ALIGN;
+
+        return padding;
 }
 
+#define __RADIO_TAP_SIZE_RSV    32
+
 static void _rtl_rx_completed(struct urb *_urb)
 {
-        struct sk_buff *skb = (struct sk_buff *)_urb->context;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct rtl_usb *rtlusb = (struct rtl_usb *)info->rate_driver_data[0];
+        struct rtl_usb *rtlusb = (struct rtl_usb *)_urb->context;
         struct ieee80211_hw *hw = usb_get_intfdata(rtlusb->intf);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         int err = 0;
@@ -572,28 +616,50 @@ static void _rtl_rx_completed(struct urb *_urb)
                 goto free;
 
         if (likely(0 == _urb->status)) {
-                /* If this code were moved to work queue, would CPU
-                 * utilization be improved?  NOTE: We shall allocate another skb
-                 * and reuse the original one.
-                 */
-                skb_put(skb, _urb->actual_length);
+                unsigned int padding;
+                struct sk_buff *skb;
+                unsigned int qlen;
+                unsigned int size = _urb->actual_length;
+                struct ieee80211_hdr *hdr;
 
-                if (likely(!rtlusb->usb_rx_segregate_hdl)) {
-                        struct sk_buff *_skb;
-                        _rtl_usb_rx_process_noagg(hw, skb);
-                        _skb = _rtl_prep_rx_urb(hw, rtlusb, _urb, GFP_ATOMIC);
-                        if (IS_ERR(_skb)) {
-                                err = PTR_ERR(_skb);
-                                RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                         "Can't allocate skb for bulk IN!\n");
-                                return;
-                        }
-                        skb = _skb;
-                } else{
-                        /* TO DO */
-                        _rtl_rx_pre_process(hw, skb);
-                        pr_err("rx agg not supported\n");
+                if (size < RTL_RX_DESC_SIZE + sizeof(struct ieee80211_hdr)) {
+                        RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
+                                 "Too short packet from bulk IN! (len: %d)\n",
+                                 size);
+                        goto resubmit;
+                }
+
+                qlen = skb_queue_len(&rtlusb->rx_queue);
+                if (qlen >= __RX_SKB_MAX_QUEUED) {
+                        RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
+                                 "Pending RX skbuff queue full! (qlen: %d)\n",
+                                 qlen);
+                        goto resubmit;
                 }
+
+                hdr = (void *)(_urb->transfer_buffer + RTL_RX_DESC_SIZE);
+                padding = _rtl_rx_get_padding(hdr, size - RTL_RX_DESC_SIZE);
+
+                skb = dev_alloc_skb(size + __RADIO_TAP_SIZE_RSV + padding);
+                if (!skb) {
+                        RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
+                                 "Can't allocate skb for bulk IN!\n");
+                        goto resubmit;
+                }
+
+                _rtl_install_trx_info(rtlusb, skb, rtlusb->in_ep);
+
+                /* Make sure the payload data is 4 byte aligned. */
+                skb_reserve(skb, padding);
+
+                /* reserve some space for mac80211's radiotap */
+                skb_reserve(skb, __RADIO_TAP_SIZE_RSV);
+
+                memcpy(skb_put(skb, size), _urb->transfer_buffer, size);
+
+                skb_queue_tail(&rtlusb->rx_queue, skb);
+                tasklet_schedule(&rtlusb->rx_work_tasklet);
+
                 goto resubmit;
         }
 
@@ -609,9 +675,6 @@ static void _rtl_rx_completed(struct urb *_urb)
         }
 
 resubmit:
-        skb_reset_tail_pointer(skb);
-        skb_trim(skb, 0);
-
         usb_anchor_urb(_urb, &rtlusb->rx_submitted);
         err = usb_submit_urb(_urb, GFP_ATOMIC);
         if (unlikely(err)) {
@@ -621,13 +684,34 @@ resubmit:
         return;
 
 free:
-        dev_kfree_skb_irq(skb);
+        /* On some architectures, usb_free_coherent must not be called from
+         * hardirq context. Queue urb to cleanup list.
+         */
+        usb_anchor_urb(_urb, &rtlusb->rx_cleanup_urbs);
+}
+
+#undef __RADIO_TAP_SIZE_RSV
+
+static void _rtl_usb_cleanup_rx(struct ieee80211_hw *hw)
+{
+        struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
+        struct urb *urb;
+
+        usb_kill_anchored_urbs(&rtlusb->rx_submitted);
+
+        tasklet_kill(&rtlusb->rx_work_tasklet);
+        skb_queue_purge(&rtlusb->rx_queue);
+
+        while ((urb = usb_get_from_anchor(&rtlusb->rx_cleanup_urbs))) {
+                usb_free_coherent(urb->dev, urb->transfer_buffer_length,
+                                urb->transfer_buffer, urb->transfer_dma);
+                usb_free_urb(urb);
+        }
 }
 
 static int _rtl_usb_receive(struct ieee80211_hw *hw)
 {
         struct urb *urb;
-        struct sk_buff *skb;
         int err;
         int i;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -646,11 +730,10 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)
                         goto err_out;
                 }
 
-                skb = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL);
-                if (IS_ERR(skb)) {
+                err = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL);
+                if (err < 0) {
                         RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
                                  "Failed to prep_rx_urb!!\n");
-                        err = PTR_ERR(skb);
                         usb_free_urb(urb);
                         goto err_out;
                 }
@@ -665,6 +748,7 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)
 
 err_out:
         usb_kill_anchored_urbs(&rtlusb->rx_submitted);
+        _rtl_usb_cleanup_rx(hw);
         return err;
 }
 
@@ -706,7 +790,7 @@ static void rtl_usb_cleanup(struct ieee80211_hw *hw)
         SET_USB_STOP(rtlusb);
 
         /* clean up rx stuff. */
-        usb_kill_anchored_urbs(&rtlusb->rx_submitted);
+        _rtl_usb_cleanup_rx(hw);
 
         /* clean up tx stuff */
         for (i = 0; i < RTL_USB_MAX_EP_NUM; i++) {
diff --git a/drivers/net/wireless/rtlwifi/usb.h b/drivers/net/wireless/rtlwifi/usb.h
index fb986f98d1df..685273ca9561 100644
--- a/drivers/net/wireless/rtlwifi/usb.h
+++ b/drivers/net/wireless/rtlwifi/usb.h
@@ -136,11 +136,14 @@ struct rtl_usb {
         void (*usb_tx_cleanup)(struct ieee80211_hw *, struct sk_buff *);
 
         /* Rx */
-        u8 in_ep_nums ;
+        u8 in_ep_nums;
         u32 in_ep;              /* Bulk IN endpoint number */
         u32 rx_max_size;        /* Bulk IN max buffer size */
         u32 rx_urb_num;         /* How many Bulk INs are submitted to host. */
         struct usb_anchor       rx_submitted;
+        struct usb_anchor       rx_cleanup_urbs;
+        struct tasklet_struct   rx_work_tasklet;
+        struct sk_buff_head     rx_queue;
         void (*usb_rx_segregate_hdl)(struct ieee80211_hw *, struct sk_buff *,
                                      struct sk_buff_head *);
         void (*usb_rx_hdl)(struct ieee80211_hw *, struct sk_buff *);
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index f13258a8d995..44328baa6389 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -99,11 +99,36 @@
 #define CHANNEL_GROUP_MAX_5G            9
 #define CHANNEL_MAX_NUMBER_2G           14
 #define AVG_THERMAL_NUM                 8
+#define AVG_THERMAL_NUM_88E             4
 #define MAX_TID_COUNT                   9
 
 /* for early mode */
 #define FCS_LEN                         4
 #define EM_HDR_LEN                      8
+
+#define MAX_TX_COUNT                    4
+#define MAX_RF_PATH                     4
+#define MAX_CHNL_GROUP_24G              6
+#define MAX_CHNL_GROUP_5G               14
+
+struct txpower_info_2g {
+        u8 index_cck_base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
+        u8 index_bw40_base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
+        /*If only one tx, only BW20 and OFDM are used.*/
+        u8 cck_diff[MAX_RF_PATH][MAX_TX_COUNT];
+        u8 ofdm_diff[MAX_RF_PATH][MAX_TX_COUNT];
+        u8 bw20_diff[MAX_RF_PATH][MAX_TX_COUNT];
+        u8 bw40_diff[MAX_RF_PATH][MAX_TX_COUNT];
+};
+
+struct txpower_info_5g {
+        u8 index_bw40_base[MAX_RF_PATH][MAX_CHNL_GROUP_5G];
+        /*If only one tx, only BW20, OFDM, BW80 and BW160 are used.*/
+        u8 ofdm_diff[MAX_RF_PATH][MAX_TX_COUNT];
+        u8 bw20_diff[MAX_RF_PATH][MAX_TX_COUNT];
+        u8 bw40_diff[MAX_RF_PATH][MAX_TX_COUNT];
+};
+
 enum intf_type {
         INTF_PCI = 0,
         INTF_USB = 1,
@@ -137,6 +162,7 @@ enum hardware_type {
         HARDWARE_TYPE_RTL8192DU,
         HARDWARE_TYPE_RTL8723AE,
         HARDWARE_TYPE_RTL8723U,
+        HARDWARE_TYPE_RTL8188EE,
 
         /* keep it last */
         HARDWARE_TYPE_NUM
@@ -263,7 +289,7 @@ enum hw_variables {
         HW_VAR_RATR_0,
         HW_VAR_RRSR,
         HW_VAR_CPU_RST,
-        HW_VAR_CECHK_BSSID,
+        HW_VAR_CHECK_BSSID,
         HW_VAR_LBK_MODE,
         HW_VAR_AES_11N_FIX,
         HW_VAR_USB_RX_AGGR,
@@ -278,7 +304,10 @@ enum hw_variables {
         HW_VAR_SET_RPWM,
         HW_VAR_H2C_FW_PWRMODE,
         HW_VAR_H2C_FW_JOINBSSRPT,
+        HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
         HW_VAR_FW_PSMODE_STATUS,
+        HW_VAR_RESUME_CLK_ON,
+        HW_VAR_FW_LPS_ACTION,
         HW_VAR_1X1_RECV_COMBINE,
         HW_VAR_STOP_SEND_BEACON,
         HW_VAR_TSF_TIMER,
@@ -305,6 +334,7 @@ enum hw_variables {
         HW_VAR_INT_AC,
         HW_VAR_RF_TIMING,
 
+        HAL_DEF_WOWLAN,
         HW_VAR_MRC,
 
         HW_VAR_MGT_FILTER,
@@ -461,6 +491,7 @@ enum rtl_var_map {
         EFUSE_MAX_SECTION_MAP,
         EFUSE_REAL_CONTENT_SIZE,
         EFUSE_OOB_PROTECT_BYTES_LEN,
+        EFUSE_ACCESS,
 
         /*CAM map */
         RWCAM,
@@ -493,7 +524,7 @@ enum rtl_var_map {
         RTL_IMR_TIMEOUT1,       /*Timeout interrupt 1 */
         RTL_IMR_TXFOVW,         /*Transmit FIFO Overflow */
         RTL_IMR_PSTIMEOUT,      /*Power save time out interrupt */
-        RTL_IMR_BcnInt,         /*Beacon DMA Interrupt 0 */
+        RTL_IMR_BCNINT,         /*Beacon DMA Interrupt 0 */
         RTL_IMR_RXFOVW,         /*Receive FIFO Overflow */
         RTL_IMR_RDU,            /*Receive Descriptor Unavailable */
         RTL_IMR_ATIMEND,        /*For 92C,ATIM Window End Interrupt */
@@ -508,7 +539,7 @@ enum rtl_var_map {
         RTL_IMR_VIDOK,          /*AC_VI DMA OK Interrupt */
         RTL_IMR_VODOK,          /*AC_VO DMA Interrupt */
         RTL_IMR_ROK,            /*Receive DMA OK Interrupt */
-        RTL_IBSS_INT_MASKS,     /*(RTL_IMR_BcnInt | RTL_IMR_TBDOK |
+        RTL_IBSS_INT_MASKS,     /*(RTL_IMR_BCNINT | RTL_IMR_TBDOK |
                                  * RTL_IMR_TBDER) */
         RTL_IMR_C2HCMD,         /*fw interrupt*/
 
@@ -742,6 +773,11 @@ struct false_alarm_statistics {
         u32 cnt_ofdm_fail;
         u32 cnt_cck_fail;
         u32 cnt_all;
+        u32 cnt_ofdm_cca;
+        u32 cnt_cck_cca;
+        u32 cnt_cca_all;
+        u32 cnt_bw_usc;
+        u32 cnt_bw_lsc;
 };
 
 struct init_gain {
@@ -826,8 +862,67 @@ struct rtl_rfkill {
         bool rfkill_state;      /*0 is off, 1 is on */
 };
 
+/*for P2P PS**/
+#define P2P_MAX_NOA_NUM         2
+
+enum p2p_role {
+        P2P_ROLE_DISABLE = 0,
+        P2P_ROLE_DEVICE = 1,
+        P2P_ROLE_CLIENT = 2,
+        P2P_ROLE_GO = 3
+};
+
+enum p2p_ps_state {
+        P2P_PS_DISABLE = 0,
+        P2P_PS_ENABLE = 1,
+        P2P_PS_SCAN = 2,
+        P2P_PS_SCAN_DONE = 3,
+        P2P_PS_ALLSTASLEEP = 4, /* for P2P GO */
+};
+
+enum p2p_ps_mode {
+        P2P_PS_NONE = 0,
+        P2P_PS_CTWINDOW = 1,
+        P2P_PS_NOA       = 2,
+        P2P_PS_MIX = 3, /* CTWindow and NoA */
+};
+
+struct rtl_p2p_ps_info {
+        enum p2p_ps_mode p2p_ps_mode; /* indicate p2p ps mode */
+        enum p2p_ps_state p2p_ps_state; /*  indicate p2p ps state */
+        u8 noa_index; /*  Identifies instance of Notice of Absence timing. */
+        /*  Client traffic window. A period of time in TU after TBTT. */
+        u8 ctwindow;
+        u8 opp_ps; /*  opportunistic power save. */
+        u8 noa_num; /*  number of NoA descriptor in P2P IE. */
+        /*  Count for owner, Type of client. */
+        u8 noa_count_type[P2P_MAX_NOA_NUM];
+        /*  Max duration for owner, preferred or min acceptable duration
+         * for client.
+         */
+        u32 noa_duration[P2P_MAX_NOA_NUM];
+        /*  Length of interval for owner, preferred or max acceptable intervali
+         * of client.
+         */
+        u32 noa_interval[P2P_MAX_NOA_NUM];
+        /*  schedule in terms of the lower 4 bytes of the TSF timer. */
+        u32 noa_start_time[P2P_MAX_NOA_NUM];
+};
+
+struct p2p_ps_offload_t {
+        u8 offload_en:1;
+        u8 role:1; /* 1: Owner, 0: Client */
+        u8 ctwindow_en:1;
+        u8 noa0_en:1;
+        u8 noa1_en:1;
+        u8 allstasleep:1;
+        u8 discovery:1;
+        u8 reserved:1;
+};
+
 #define IQK_MATRIX_REG_NUM      8
 #define IQK_MATRIX_SETTINGS_NUM (1 + 24 + 21)
+
 struct iqk_matrix_regs {
         bool iqk_done;
         long value[1][IQK_MATRIX_REG_NUM];
@@ -889,7 +984,7 @@ struct rtl_phy {
 
         /* Dual mac */
         bool need_iqk;
-        struct iqk_matrix_regs iqk_matrix_regsetting[IQK_MATRIX_SETTINGS_NUM];
+        struct iqk_matrix_regs iqk_matrix[IQK_MATRIX_SETTINGS_NUM];
 
         bool rfpi_enable;
 
@@ -902,6 +997,8 @@ struct rtl_phy {
         /* the current Tx power level */
         u8 cur_cck_txpwridx;
         u8 cur_ofdm24g_txpwridx;
+        u8 cur_bw20_txpwridx;
+        u8 cur_bw40_txpwridx;
 
         u32 rfreg_chnlval[2];
         bool apk_done;
@@ -940,20 +1037,21 @@ struct rtl_ht_agg {
         u8 rx_agg_state;
 };
 
+struct rssi_sta {
+        long undec_sm_pwdb;
+};
+
 struct rtl_tid_data {
         u16 seq_number;
         struct rtl_ht_agg agg;
 };
 
-struct rssi_sta {
-        long undec_sm_pwdb;
-};
-
 struct rtl_sta_info {
         struct list_head list;
         u8 ratr_index;
         u8 wireless_mode;
         u8 mimo_ps;
+        u8 mac_addr[ETH_ALEN];
         struct rtl_tid_data tids[MAX_TID_COUNT];
 
         /* just used for ap adhoc or mesh*/
@@ -1005,6 +1103,8 @@ struct rtl_mac {
         int n_bitrates;
 
         bool offchan_delay;
+        u8 p2p; /*using p2p role*/
+        bool p2p_in_use;
 
         /*filters */
         u32 rx_conf;
@@ -1014,11 +1114,11 @@ struct rtl_mac {
 
         bool act_scanning;
         u8 cnt_after_linked;
+        bool skip_scan;
 
         /* early mode */
         /* skb wait queue */
         struct sk_buff_head skb_waitq[MAX_TID_COUNT];
-        u8 earlymode_threshold;
 
         /*RDG*/
         bool rdg_en;
@@ -1042,6 +1142,7 @@ struct rtl_mac {
         u8 retry_short;
         u8 retry_long;
         u16 assoc_id;
+        bool hiddenssid;
 
         /*IBSS*/
         int beacon_interval;
@@ -1111,10 +1212,13 @@ struct bt_coexist_8723 {
 
 struct rtl_hal {
         struct ieee80211_hw *hw;
-        struct bt_coexist_8723 hal_coex_8723;
+        bool driver_is_goingto_unload;
         bool up_first_time;
+        bool first_init;
         bool being_init_adapter;
         bool bbrf_ready;
+        bool mac_func_enable;
+        struct bt_coexist_8723 hal_coex_8723;
 
         enum intf_type interface;
         u16 hw_type;            /*92c or 92d or 92s and so on */
@@ -1122,6 +1226,7 @@ struct rtl_hal {
         u8 oem_id;
         u32 version;            /*version of chip */
         u8 state;               /*stop 0, start 1 */
+        u8 board_type;
 
         /*firmware */
         u32 fwsize;
@@ -1141,6 +1246,10 @@ struct rtl_hal {
         bool set_fwcmd_inprogress;
         u8 current_fwcmd_io;
 
+        struct p2p_ps_offload_t p2p_ps_offload;
+        bool fw_clk_change_in_progress;
+        bool allow_sw_to_change_hwclc;
+        u8 fw_ps_state;
         /**/
         bool driver_going2unload;
 
@@ -1157,6 +1266,7 @@ struct rtl_hal {
         /* just for DualMac S3S4 */
         u8 macphyctl_reg;
         bool earlymode_enable;
+        u8 max_earlymode_num;
         /* Dual mac*/
         bool during_mac0init_radiob;
         bool during_mac1init_radioa;
@@ -1193,6 +1303,29 @@ struct rtl_security {
         u8 *pairwise_key;
 };
 
+#define ASSOCIATE_ENTRY_NUM     33
+
+struct fast_ant_training {
+        u8      bssid[6];
+        u8      antsel_rx_keep_0;
+        u8      antsel_rx_keep_1;
+        u8      antsel_rx_keep_2;
+        u32     ant_sum[7];
+        u32     ant_cnt[7];
+        u32     ant_ave[7];
+        u8      fat_state;
+        u32     train_idx;
+        u8      antsel_a[ASSOCIATE_ENTRY_NUM];
+        u8      antsel_b[ASSOCIATE_ENTRY_NUM];
+        u8      antsel_c[ASSOCIATE_ENTRY_NUM];
+        u32     main_ant_sum[ASSOCIATE_ENTRY_NUM];
+        u32     aux_ant_sum[ASSOCIATE_ENTRY_NUM];
+        u32     main_ant_cnt[ASSOCIATE_ENTRY_NUM];
+        u32     aux_ant_cnt[ASSOCIATE_ENTRY_NUM];
+        u8      rx_idle_ant;
+        bool    becomelinked;
+};
+
 struct rtl_dm {
         /*PHY status for Dynamic Management */
         long entry_min_undec_sm_pwdb;
@@ -1229,9 +1362,24 @@ struct rtl_dm {
         bool disable_tx_int;
         char ofdm_index[2];
         char cck_index;
+        char delta_power_index;
+        char delta_power_index_last;
+        char power_index_offset;
+
+        /*88e tx power tracking*/
+        u8      swing_idx_ofdm[2];
+        u8      swing_idx_ofdm_cur;
+        u8      swing_idx_ofdm_base;
+        bool    swing_flag_ofdm;
+        u8      swing_idx_cck;
+        u8      swing_idx_cck_cur;
+        u8      swing_idx_cck_base;
+        bool    swing_flag_cck;
 
         /* DMSP */
         bool supp_phymode_switch;
+
+        struct fast_ant_training fat_table;
 };
 
 #define EFUSE_MAX_LOGICAL_SIZE                  256
@@ -1264,6 +1412,9 @@ struct rtl_efuse {
         u8 external_pa;
 
         u8 dev_addr[6];
+        u8 wowlan_enable;
+        u8 antenna_div_cfg;
+        u8 antenna_div_type;
 
         bool txpwr_fromeprom;
         u8 eeprom_crystalcap;
@@ -1319,14 +1470,12 @@ struct rtl_ps_ctl {
         bool rfchange_inprogress;
         bool swrf_processing;
         bool hwradiooff;
-
         /*
          * just for PCIE ASPM
          * If it supports ASPM, Offset[560h] = 0x40,
          * otherwise Offset[560h] = 0x00.
          * */
         bool support_aspm;
-
         bool support_backdoor;
 
         /*for LPS */
@@ -1341,6 +1490,7 @@ struct rtl_ps_ctl {
         bool fw_current_inpsmode;
         u8 reg_max_lps_awakeintvl;
         bool report_linked;
+        bool low_power_enable;/*for 32k*/
 
         /*for IPS */
         bool inactiveps;
@@ -1373,6 +1523,11 @@ struct rtl_ps_ctl {
         unsigned long last_beacon;
         unsigned long last_action;
         unsigned long last_slept;
+
+        /*For P2P PS */
+        struct rtl_p2p_ps_info p2p_ps_info;
+        u8 pwr_mode;
+        u8 smart_ps;
 };
 
 struct rtl_stats {
@@ -1381,7 +1536,7 @@ struct rtl_stats {
         s8 rssi;
         u8 signal;
         u8 noise;
-        u16 rate;               /*in 100 kbps */
+        u8 rate;                /* hw desc rate */
         u8 received_channel;
         u8 control;
         u8 mask;
@@ -1423,8 +1578,16 @@ struct rtl_stats {
         bool packet_toself;
         bool packet_beacon;     /*for rssi */
         char cck_adc_pwdb[4];   /*for rx path selection */
+
+        u8 packet_report_type;
+
+        u32 macid;
+        u8 wake_match;
+        u32 bt_rx_rssi_percentage;
+        u32 macid_valid_entry[2];
 };
 
+
 struct rt_link_detect {
         /* count for roaming */
         u32 bcn_rx_inperiod;
@@ -1477,7 +1640,8 @@ struct rtl_tcb_desc {
         /* early mode */
         u8 empkt_num;
         /* The max value by HW */
-        u32 empkt_len[5];
+        u32 empkt_len[10];
+        bool btx_enable_sw_calc_duration;
 };
 
 struct rtl_hal_ops {
@@ -1553,7 +1717,7 @@ struct rtl_hal_ops {
         void (*allow_all_destaddr)(struct ieee80211_hw *hw,
                 bool allow_all_da, bool write_into_reg);
         void (*linked_set_reg) (struct ieee80211_hw *hw);
-        void (*check_switch_to_dmdp) (struct ieee80211_hw *hw);
+        void (*chk_switch_dmdp) (struct ieee80211_hw *hw);
         void (*dualmac_easy_concurrent) (struct ieee80211_hw *hw);
         void (*dualmac_switch_to_dmdp) (struct ieee80211_hw *hw);
         bool (*phy_rf6052_config) (struct ieee80211_hw *hw);
@@ -1662,6 +1826,8 @@ struct rtl_locks {
         /*spin lock */
         spinlock_t ips_lock;
         spinlock_t irq_th_lock;
+        spinlock_t irq_pci_lock;
+        spinlock_t tx_lock;
         spinlock_t h2c_lock;
         spinlock_t rf_ps_lock;
         spinlock_t rf_lock;
@@ -1670,6 +1836,9 @@ struct rtl_locks {
         spinlock_t entry_list_lock;
         spinlock_t usb_lock;
 
+        /*FW clock change */
+        spinlock_t fw_ps_lock;
+
         /*Dual mac*/
         spinlock_t cck_and_rw_pagea_lock;
 
@@ -1683,7 +1852,8 @@ struct rtl_works {
         /*timer */
         struct timer_list watchdog_timer;
         struct timer_list dualmac_easyconcurrent_retrytimer;
-
+        struct timer_list fw_clockoff_timer;
+        struct timer_list fast_antenna_training_timer;
         /*task */
         struct tasklet_struct irq_tasklet;
         struct tasklet_struct irq_prepare_bcn_tasklet;
@@ -1696,8 +1866,9 @@ struct rtl_works {
         /* For SW LPS */
         struct delayed_work ps_work;
         struct delayed_work ps_rfon_wq;
+        struct delayed_work fwevt_wq;
 
-        struct work_struct lps_leave_work;
+        struct work_struct lps_change_work;
 };
 
 struct rtl_debug {
@@ -1767,10 +1938,12 @@ struct dig_t {
         char back_val;
         char back_range_max;
         char back_range_min;
-        u8 rx_gain_range_max;
-        u8 rx_gain_range_min;
+        u8 rx_gain_max;
+        u8 rx_gain_min;
         u8 min_undec_pwdb_for_dm;
         u8 rssi_val_min;
+        u8 pre_cck_cca_thres;
+        u8 cur_cck_cca_thres;
         u8 pre_cck_pd_state;
         u8 cur_cck_pd_state;
         u8 pre_cck_fa_state;
@@ -1792,6 +1965,13 @@ struct dig_t {
         u8 backoff_enable_flag;
         char backoffval_range_max;
         char backoffval_range_min;
+        u8 dig_min_0;
+        u8 dig_min_1;
+        bool media_connect_0;
+        bool media_connect_1;
+
+        u32 antdiv_rssi_max;
+        u32 rssi_max;
 };
 
 struct rtl_global_var {
@@ -1802,6 +1982,7 @@ struct rtl_global_var {
 };
 
 struct rtl_priv {
+        struct ieee80211_hw *hw;
         struct completion firmware_loading_complete;
         struct list_head list;
         struct rtl_priv *buddy_priv;
@@ -1866,6 +2047,7 @@ struct rtl_priv {
                         bool bt_operation_on;
                 };
         };
+        bool enter_ps;  /* true when entering PS */
 
         /*This must be the last item so
            that it points to the data allocated
@@ -2127,9 +2309,7 @@ value to host byte ordering.*/
 #define WLAN_FC_GET_TYPE(fc)    (le16_to_cpu(fc) & IEEE80211_FCTL_FTYPE)
 #define WLAN_FC_GET_STYPE(fc)   (le16_to_cpu(fc) & IEEE80211_FCTL_STYPE)
 #define WLAN_FC_MORE_DATA(fc)   (le16_to_cpu(fc) & IEEE80211_FCTL_MOREDATA)
-#define SEQ_TO_SN(seq)          (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-#define SN_TO_SEQ(ssn)          (((ssn) << 4) & IEEE80211_SCTL_SEQ)
-#define MAX_SN                  ((IEEE80211_SCTL_SEQ) >> 4)
+#define rtl_dm(rtlpriv)         (&((rtlpriv)->dm))
 
 #define RT_RF_OFF_LEVL_ASPM             BIT(0)  /*PCI ASPM */
 #define RT_RF_OFF_LEVL_CLK_REQ          BIT(1)  /*PCI clock request */
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index bbbf68cf50a7..3291ffa95273 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -572,7 +572,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
         struct ieee80211_conf *conf = &hw->conf;
         int channel, ret = 0;
 
-        channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+        channel = ieee80211_frequency_to_channel(
+                        conf->chandef.chan->center_freq);
 
         wl1251_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d",
                      channel,
@@ -1223,7 +1224,7 @@ static int wl1251_op_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
  
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = SURVEY_INFO_NOISE_DBM;
         survey->noise = wl->noise;
  
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index e57ee48edff6..e2b3d9c541e8 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -186,8 +186,10 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable)
                         wl->set_power(true);
 
                 ret = pm_runtime_get_sync(&func->dev);
-                if (ret < 0)
+                if (ret < 0) {
+                        pm_runtime_put_sync(&func->dev);
                         goto out;
+                }
 
                 sdio_claim_host(func);
                 sdio_enable_func(func);
diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 3b266d3231a3..4c67c2f9ea71 100644
--- a/drivers/net/wireless/ti/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
@@ -257,7 +257,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
         wl = hw->priv;
 
         SET_IEEE80211_DEV(hw, &spi->dev);
-        dev_set_drvdata(&spi->dev, wl);
+        spi_set_drvdata(spi, wl);
         wl->if_priv = spi;
         wl->if_ops = &wl1251_spi_ops;
 
@@ -311,7 +311,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
 
 static int wl1251_spi_remove(struct spi_device *spi)
 {
-        struct wl1251 *wl = dev_get_drvdata(&spi->dev);
+        struct wl1251 *wl = spi_get_drvdata(spi);
 
         free_irq(wl->irq, wl);
         wl1251_free_hw(wl);
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c
index 7dc9f965037d..7485dbae8c4b 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wl12xx/cmd.c
@@ -301,7 +301,7 @@ int wl12xx_cmd_channel_switch(struct wl1271 *wl,
         }
 
         cmd->role_id = wlvif->role_id;
-        cmd->channel = ch_switch->channel->hw_value;
+        cmd->channel = ch_switch->chandef.chan->hw_value;
         cmd->switch_time = ch_switch->count;
         cmd->stop_tx = ch_switch->block_tx;
 
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index 09694e39bb14..1c627da85083 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -723,6 +723,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
         wl->sched_scan_templ_id_2_4 = CMD_TEMPL_CFG_PROBE_REQ_2_4;
         wl->sched_scan_templ_id_5 = CMD_TEMPL_CFG_PROBE_REQ_5;
         wl->max_channels_5 = WL12XX_MAX_CHANNELS_5GHZ;
+        wl->ba_rx_session_count_max = WL12XX_RX_BA_MAX_SESSIONS;
 out:
         return ret;
 }
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
index d4552857480c..222d03540200 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -63,6 +63,8 @@
 
 #define WL12XX_NUM_MAC_ADDRESSES 2
 
+#define WL12XX_RX_BA_MAX_SESSIONS 3
+
 struct wl127x_rx_mem_pool_addr {
         u32 addr;
         u32 addr_extra;
diff --git a/drivers/net/wireless/ti/wl18xx/cmd.c b/drivers/net/wireless/ti/wl18xx/cmd.c
index 1d1f6cc7a50a..7649c75cd68d 100644
--- a/drivers/net/wireless/ti/wl18xx/cmd.c
+++ b/drivers/net/wireless/ti/wl18xx/cmd.c
@@ -42,11 +42,11 @@ int wl18xx_cmd_channel_switch(struct wl1271 *wl,
         }
 
         cmd->role_id = wlvif->role_id;
-        cmd->channel = ch_switch->channel->hw_value;
+        cmd->channel = ch_switch->chandef.chan->hw_value;
         cmd->switch_time = ch_switch->count;
         cmd->stop_tx = ch_switch->block_tx;
 
-        switch (ch_switch->channel->band) {
+        switch (ch_switch->chandef.chan->band) {
         case IEEE80211_BAND_2GHZ:
                 cmd->band = WLCORE_BAND_2_4GHZ;
                 break;
@@ -55,7 +55,7 @@ int wl18xx_cmd_channel_switch(struct wl1271 *wl,
                 break;
         default:
                 wl1271_error("invalid channel switch band: %d",
-                             ch_switch->channel->band);
+                             ch_switch->chandef.chan->band);
                 ret = -EINVAL;
                 goto out_free;
         }
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index da3ef1b10a9c..9fa692d11025 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -678,6 +678,7 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
         wl->sched_scan_templ_id_2_4 = CMD_TEMPL_PROBE_REQ_2_4_PERIODIC;
         wl->sched_scan_templ_id_5 = CMD_TEMPL_PROBE_REQ_5_PERIODIC;
         wl->max_channels_5 = WL18XX_MAX_CHANNELS_5GHZ;
+        wl->ba_rx_session_count_max = WL18XX_RX_BA_MAX_SESSIONS;
 out:
         return ret;
 }
@@ -1144,6 +1145,7 @@ static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
 static int wl18xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
 {
         u32 fuse;
+        s8 rom = 0, metal = 0, pg_ver = 0, rdl_ver = 0;
         int ret;
 
         ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
@@ -1154,8 +1156,29 @@ static int wl18xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
         if (ret < 0)
                 goto out;
 
+        pg_ver = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
+        rom = (fuse & WL18XX_ROM_VER_MASK) >> WL18XX_ROM_VER_OFFSET;
+
+        if (rom <= 0xE)
+                metal = (fuse & WL18XX_METAL_VER_MASK) >>
+                        WL18XX_METAL_VER_OFFSET;
+        else
+                metal = (fuse & WL18XX_NEW_METAL_VER_MASK) >>
+                        WL18XX_NEW_METAL_VER_OFFSET;
+
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_DATA_2_3, &fuse);
+        if (ret < 0)
+                goto out;
+
+        rdl_ver = (fuse & WL18XX_RDL_VER_MASK) >> WL18XX_RDL_VER_OFFSET;
+        if (rdl_ver > RDL_MAX)
+                rdl_ver = RDL_NONE;
+
+        wl1271_info("wl18xx HW: RDL %d, %s, PG %x.%x (ROM %x)",
+                    rdl_ver, rdl_names[rdl_ver], pg_ver, metal, rom);
+
         if (ver)
-                *ver = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
+                *ver = pg_ver;
 
         ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
 
diff --git a/drivers/net/wireless/ti/wl18xx/reg.h b/drivers/net/wireless/ti/wl18xx/reg.h
index 937b71d8783f..6306e04cd258 100644
--- a/drivers/net/wireless/ti/wl18xx/reg.h
+++ b/drivers/net/wireless/ti/wl18xx/reg.h
@@ -131,6 +131,16 @@
 #define WL18XX_REG_FUSE_DATA_1_3        0xA0260C
 #define WL18XX_PG_VER_MASK              0x70
 #define WL18XX_PG_VER_OFFSET            4
+#define WL18XX_ROM_VER_MASK             0x3
+#define WL18XX_ROM_VER_OFFSET           0
+#define WL18XX_METAL_VER_MASK           0xC
+#define WL18XX_METAL_VER_OFFSET         2
+#define WL18XX_NEW_METAL_VER_MASK       0x180
+#define WL18XX_NEW_METAL_VER_OFFSET     7
+
+#define WL18XX_REG_FUSE_DATA_2_3        0xA02614
+#define WL18XX_RDL_VER_MASK             0x1f00
+#define WL18XX_RDL_VER_OFFSET           8
 
 #define WL18XX_REG_FUSE_BD_ADDR_1       0xA02602
 #define WL18XX_REG_FUSE_BD_ADDR_2       0xA02606
@@ -188,4 +198,23 @@ enum {
         NUM_BOARD_TYPES,
 };
 
+enum {
+        RDL_NONE        = 0,
+        RDL_1_HP        = 1,
+        RDL_2_SP        = 2,
+        RDL_3_HP        = 3,
+        RDL_4_SP        = 4,
+
+        _RDL_LAST,
+        RDL_MAX = _RDL_LAST - 1,
+};
+
+static const char * const rdl_names[] = {
+        [RDL_NONE]      = "",
+        [RDL_1_HP]      = "1853 SISO",
+        [RDL_2_SP]      = "1857 MIMO",
+        [RDL_3_HP]      = "1893 SISO",
+        [RDL_4_SP]      = "1897 MIMO",
+};
+
 #endif /* __REG_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h
index b6739e79efcf..9204e07ee432 100644
--- a/drivers/net/wireless/ti/wl18xx/wl18xx.h
+++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h
@@ -29,7 +29,7 @@
 #define WL18XX_IFTYPE_VER       5
 #define WL18XX_MAJOR_VER        WLCORE_FW_VER_IGNORE
 #define WL18XX_SUBTYPE_VER      WLCORE_FW_VER_IGNORE
-#define WL18XX_MINOR_VER        28
+#define WL18XX_MINOR_VER        39
 
 #define WL18XX_CMD_MAX_SIZE          740
 
@@ -40,6 +40,8 @@
 
 #define WL18XX_NUM_MAC_ADDRESSES 3
 
+#define WL18XX_RX_BA_MAX_SESSIONS 5
+
 struct wl18xx_priv {
         /* buffer for sending commands to FW */
         u8 cmd_buf[WL18XX_CMD_MAX_SIZE];
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index c79654323396..7a970cd9c555 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -1736,6 +1736,35 @@ out:
 
 }
 
+int wlcore_acx_average_rssi(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                            s8 *avg_rssi)
+{
+        struct acx_roaming_stats *acx;
+        int ret = 0;
+
+        wl1271_debug(DEBUG_ACX, "acx roaming statistics");
+
+        acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+        if (!acx) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        acx->role_id = wlvif->role_id;
+        ret = wl1271_cmd_interrogate(wl, ACX_ROAMING_STATISTICS_TBL,
+                                     acx, sizeof(*acx));
+        if (ret < 0) {
+                wl1271_warning("acx roaming statistics failed: %d", ret);
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        *avg_rssi = acx->rssi_beacon;
+out:
+        kfree(acx);
+        return ret;
+}
+
 #ifdef CONFIG_PM
 /* Set the global behaviour of RX filters - On/Off + default action */
 int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
diff --git a/drivers/net/wireless/ti/wlcore/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index 126536c6a393..6dcfad9b0472 100644
--- a/drivers/net/wireless/ti/wlcore/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -728,8 +728,6 @@ struct wl1271_acx_ht_information {
         u8 padding[2];
 } __packed;
 
-#define RX_BA_MAX_SESSIONS 3
-
 struct wl1271_acx_ba_initiator_policy {
         struct acx_header header;
 
@@ -955,6 +953,18 @@ struct acx_rx_filter_cfg {
         u8 fields[0];
 } __packed;
 
+struct acx_roaming_stats {
+        struct acx_header header;
+
+        u8      role_id;
+        u8      pad[3];
+        u32     missed_beacons;
+        u8      snr_data;
+        u8      snr_bacon;
+        s8      rssi_data;
+        s8      rssi_beacon;
+} __packed;
+
 enum {
         ACX_WAKE_UP_CONDITIONS           = 0x0000,
         ACX_MEM_CFG                      = 0x0001,
@@ -1112,6 +1122,8 @@ int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);
 int wl1271_acx_fm_coex(struct wl1271 *wl);
 int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);
 int wl12xx_acx_config_hangover(struct wl1271 *wl);
+int wlcore_acx_average_rssi(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                            s8 *avg_rssi);
 
 #ifdef CONFIG_PM
 int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 6331f9e1cb39..c9e060795d13 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -327,6 +327,14 @@ int wl12xx_allocate_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)
         wl->links[link].prev_freed_pkts =
                         wl->fw_status_2->counters.tx_lnk_free_pkts[link];
         wl->links[link].wlvif = wlvif;
+
+        /*
+         * Take saved value for total freed packets from wlvif, in case this is
+         * recovery/resume
+         */
+        if (wlvif->bss_type != BSS_TYPE_AP_BSS)
+                wl->links[link].total_freed_pkts = wlvif->total_freed_pkts;
+
         *hlid = link;
 
         wl->active_link_count++;
@@ -358,6 +366,26 @@ void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)
         wl1271_tx_reset_link_queues(wl, *hlid);
         wl->links[*hlid].wlvif = NULL;
 
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+            (wlvif->bss_type == BSS_TYPE_AP_BSS &&
+             *hlid == wlvif->ap.bcast_hlid)) {
+                /*
+                 * save the total freed packets in the wlvif, in case this is
+                 * recovery or suspend
+                 */
+                wlvif->total_freed_pkts = wl->links[*hlid].total_freed_pkts;
+
+                /*
+                 * increment the initial seq number on recovery to account for
+                 * transmitted packets that we haven't yet got in the FW status
+                 */
+                if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))
+                        wlvif->total_freed_pkts +=
+                                        WL1271_TX_SQN_POST_RECOVERY_PADDING;
+        }
+
+        wl->links[*hlid].total_freed_pkts = 0;
+
         *hlid = WL12XX_INVALID_LINK_ID;
         wl->active_link_count--;
         WARN_ON_ONCE(wl->active_link_count < 0);
@@ -609,6 +637,10 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         if (ret < 0)
                 goto out_free_global;
 
+        /* use the previous security seq, if this is a recovery/resume */
+        wl->links[wlvif->ap.bcast_hlid].total_freed_pkts =
+                                                wlvif->total_freed_pkts;
+
         cmd->role_id = wlvif->role_id;
         cmd->ap.aging_period = cpu_to_le16(wl->conf.tx.ap_aging_period);
         cmd->ap.bss_index = WL1271_AP_BSS_INDEX;
diff --git a/drivers/net/wireless/ti/wlcore/debug.h b/drivers/net/wireless/ti/wlcore/debug.h
index db4bf5a68ce2..0420bd45e4ee 100644
--- a/drivers/net/wireless/ti/wlcore/debug.h
+++ b/drivers/net/wireless/ti/wlcore/debug.h
@@ -89,25 +89,24 @@ extern u32 wl12xx_debug_level;
         } while (0)
 #endif
 
-/* TODO: use pr_debug_hex_dump when it becomes available */
-#define wl1271_dump(level, prefix, buf, len)    \
-        do { \
-                if (level & wl12xx_debug_level) \
-                        print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
-                                       DUMP_PREFIX_OFFSET, 16, 1,       \
-                                       buf,                             \
-                                       min_t(size_t, len, DEBUG_DUMP_LIMIT), \
-                                       0);                              \
+#define wl1271_dump(level, prefix, buf, len)                                  \
+        do {                                                                  \
+                if (level & wl12xx_debug_level)                               \
+                        print_hex_dump_debug(DRIVER_PREFIX prefix,            \
+                                        DUMP_PREFIX_OFFSET, 16, 1,            \
+                                        buf,                                  \
+                                        min_t(size_t, len, DEBUG_DUMP_LIMIT), \
+                                        0);                                   \
         } while (0)
 
-#define wl1271_dump_ascii(level, prefix, buf, len)      \
-        do { \
-                if (level & wl12xx_debug_level) \
-                        print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
-                                       DUMP_PREFIX_OFFSET, 16, 1,       \
-                                       buf,                             \
-                                       min_t(size_t, len, DEBUG_DUMP_LIMIT), \
-                                       true);                           \
+#define wl1271_dump_ascii(level, prefix, buf, len)                            \
+        do {                                                                  \
+                if (level & wl12xx_debug_level)                               \
+                        print_hex_dump_debug(DRIVER_PREFIX prefix,            \
+                                        DUMP_PREFIX_OFFSET, 16, 1,            \
+                                        buf,                                  \
+                                        min_t(size_t, len, DEBUG_DUMP_LIMIT), \
+                                        true);                                \
         } while (0)
 
 #endif /* __DEBUG_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index e70a7c864865..c3e1f79c7856 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@ -598,8 +598,7 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
                 VIF_STATE_PRINT_INT(last_rssi_event);
                 VIF_STATE_PRINT_INT(ba_support);
                 VIF_STATE_PRINT_INT(ba_allowed);
-                VIF_STATE_PRINT_LLHEX(tx_security_seq);
-                VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);
+                VIF_STATE_PRINT_LLHEX(total_freed_pkts);
         }
 
 #undef VIF_STATE_PRINT_INT
diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 70f289aa1bc6..67f61689b49e 100644
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -237,6 +237,14 @@ void wlcore_event_beacon_loss(struct wl1271 *wl, unsigned long roles_bitmap)
                     !test_bit(wlvif->role_id , &roles_bitmap))
                         continue;
 
+                vif = wl12xx_wlvif_to_vif(wlvif);
+
+                /* don't attempt roaming in case of p2p */
+                if (wlvif->p2p) {
+                        ieee80211_connection_loss(vif);
+                        continue;
+                }
+
                 /*
                  * if the work is already queued, it should take place.
                  * We don't want to delay the connection loss
@@ -246,7 +254,6 @@ void wlcore_event_beacon_loss(struct wl1271 *wl, unsigned long roles_bitmap)
                                              &wlvif->connection_loss_work,
                                              msecs_to_jiffies(delay));
 
-                vif = wl12xx_wlvif_to_vif(wlvif);
                 ieee80211_cqm_rssi_notify(
                                 vif,
                                 NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 2c2ff3e1f849..953111a502ee 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -108,8 +108,7 @@ static void wl1271_reg_notify(struct wiphy *wiphy,
 
         }
 
-        if (likely(wl->state == WLCORE_STATE_ON))
-                wlcore_regdomain_config(wl);
+        wlcore_regdomain_config(wl);
 }
 
 static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
@@ -332,10 +331,9 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
                                         struct wl12xx_vif *wlvif,
                                         u8 hlid, u8 tx_pkts)
 {
-        bool fw_ps, single_link;
+        bool fw_ps;
 
         fw_ps = test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);
-        single_link = (wl->active_link_count == 1);
 
         /*
          * Wake up from high level PS if the STA is asleep with too little
@@ -348,8 +346,13 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
          * Start high-level PS if the STA is asleep with enough blocks in FW.
          * Make an exception if this is the only connected link. In this
          * case FW-memory congestion is less of a problem.
+         * Note that a single connected STA means 3 active links, since we must
+         * account for the global and broadcast AP links. The "fw_ps" check
+         * assures us the third link is a STA connected to the AP. Otherwise
+         * the FW would not set the PSM bit.
          */
-        else if (!single_link && fw_ps && tx_pkts >= WL1271_PS_STA_MAX_PACKETS)
+        else if (wl->active_link_count > 3 && fw_ps &&
+                 tx_pkts >= WL1271_PS_STA_MAX_PACKETS)
                 wl12xx_ps_link_start(wl, wlvif, hlid, true);
 }
 
@@ -414,13 +417,21 @@ static int wlcore_fw_status(struct wl1271 *wl,
 
 
         for_each_set_bit(i, wl->links_map, WL12XX_MAX_LINKS) {
+                u8 diff;
                 lnk = &wl->links[i];
+
                 /* prevent wrap-around in freed-packets counter */
-                lnk->allocated_pkts -=
-                        (status_2->counters.tx_lnk_free_pkts[i] -
-                         lnk->prev_freed_pkts) & 0xff;
+                diff = (status_2->counters.tx_lnk_free_pkts[i] -
+                       lnk->prev_freed_pkts) & 0xff;
+
+                if (diff == 0)
+                        continue;
 
+                lnk->allocated_pkts -= diff;
                 lnk->prev_freed_pkts = status_2->counters.tx_lnk_free_pkts[i];
+
+                /* accumulate the prev_freed_pkts counter */
+                lnk->total_freed_pkts += diff;
         }
 
         /* prevent wrap-around in total blocks counter */
@@ -640,6 +651,25 @@ static irqreturn_t wlcore_irq(int irq, void *cookie)
         unsigned long flags;
         struct wl1271 *wl = cookie;
 
+        /* complete the ELP completion */
+        spin_lock_irqsave(&wl->wl_lock, flags);
+        set_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
+        if (wl->elp_compl) {
+                complete(wl->elp_compl);
+                wl->elp_compl = NULL;
+        }
+
+        if (test_bit(WL1271_FLAG_SUSPENDED, &wl->flags)) {
+                /* don't enqueue a work right now. mark it as pending */
+                set_bit(WL1271_FLAG_PENDING_WORK, &wl->flags);
+                wl1271_debug(DEBUG_IRQ, "should not enqueue work");
+                disable_irq_nosync(wl->irq);
+                pm_wakeup_event(wl->dev, 0);
+                spin_unlock_irqrestore(&wl->wl_lock, flags);
+                return IRQ_HANDLED;
+        }
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+
         /* TX might be handled here, avoid redundant work */
         set_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
         cancel_work_sync(&wl->tx_work);
@@ -919,18 +949,6 @@ static void wl1271_recovery_work(struct work_struct *work)
                 goto out_unlock;
         }
 
-        /*
-         * Advance security sequence number to overcome potential progress
-         * in the firmware during recovery. This doens't hurt if the network is
-         * not encrypted.
-         */
-        wl12xx_for_each_wlvif(wl, wlvif) {
-                if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) ||
-                    test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags))
-                        wlvif->tx_security_seq +=
-                                WL1271_TX_SQN_POST_RECOVERY_PADDING;
-        }
-
         /* Prevent spurious TX during FW restart */
         wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
 
@@ -2523,6 +2541,8 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
                 wl1271_ps_elp_sleep(wl);
         }
 deinit:
+        wl12xx_tx_reset_wlvif(wl, wlvif);
+
         /* clear all hlids (except system_hlid) */
         wlvif->dev_hlid = WL12XX_INVALID_LINK_ID;
 
@@ -2546,7 +2566,6 @@ deinit:
 
         dev_kfree_skb(wlvif->probereq);
         wlvif->probereq = NULL;
-        wl12xx_tx_reset_wlvif(wl, wlvif);
         if (wl->last_wlvif == wlvif)
                 wl->last_wlvif = NULL;
         list_del(&wlvif->list);
@@ -2860,10 +2879,6 @@ static int wlcore_unset_assoc(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                                      wlvif->sta.klv_template_id,
                                      ACX_KEEP_ALIVE_TPL_INVALID);
 
-        /* reset TX security counters on a clean disconnect */
-        wlvif->tx_security_last_seq_lsb = 0;
-        wlvif->tx_security_seq = 0;
-
         return 0;
 }
 
@@ -3262,6 +3277,7 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
         u32 tx_seq_32 = 0;
         u16 tx_seq_16 = 0;
         u8 key_type;
+        u8 hlid;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 set key");
 
@@ -3271,6 +3287,22 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
                      key_conf->keylen, key_conf->flags);
         wl1271_dump(DEBUG_CRYPT, "KEY: ", key_conf->key, key_conf->keylen);
 
+        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+                if (sta) {
+                        struct wl1271_station *wl_sta = (void *)sta->drv_priv;
+                        hlid = wl_sta->hlid;
+                } else {
+                        hlid = wlvif->ap.bcast_hlid;
+                }
+        else
+                hlid = wlvif->sta.hlid;
+
+        if (hlid != WL12XX_INVALID_LINK_ID) {
+                u64 tx_seq = wl->links[hlid].total_freed_pkts;
+                tx_seq_32 = WL1271_TX_SECURITY_HI32(tx_seq);
+                tx_seq_16 = WL1271_TX_SECURITY_LO16(tx_seq);
+        }
+
         switch (key_conf->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
@@ -3280,22 +3312,14 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
                 key_type = KEY_TKIP;
-
                 key_conf->hw_key_idx = key_conf->keyidx;
-                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
-                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key_type = KEY_AES;
-
                 key_conf->flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;
-                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
-                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                 break;
         case WL1271_CIPHER_SUITE_GEM:
                 key_type = KEY_GEM;
-                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
-                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                 break;
         default:
                 wl1271_error("Unknown key algo 0x%x", key_conf->cipher);
@@ -3358,6 +3382,10 @@ void wlcore_regdomain_config(struct wl1271 *wl)
                 return;
 
         mutex_lock(&wl->mutex);
+
+        if (unlikely(wl->state != WLCORE_STATE_ON))
+                goto out;
+
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out;
@@ -4474,7 +4502,7 @@ static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = 0;
         return 0;
 }
@@ -4499,6 +4527,9 @@ static int wl1271_allocate_sta(struct wl1271 *wl,
                 return -EBUSY;
         }
 
+        /* use the previous security seq, if this is a recovery/resume */
+        wl->links[wl_sta->hlid].total_freed_pkts = wl_sta->total_freed_pkts;
+
         set_bit(wl_sta->hlid, wlvif->ap.sta_hlid_map);
         memcpy(wl->links[wl_sta->hlid].addr, sta->addr, ETH_ALEN);
         wl->active_sta_count++;
@@ -4507,12 +4538,37 @@ static int wl1271_allocate_sta(struct wl1271 *wl,
 
 void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)
 {
+        struct wl1271_station *wl_sta;
+        struct ieee80211_sta *sta;
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+
         if (!test_bit(hlid, wlvif->ap.sta_hlid_map))
                 return;
 
         clear_bit(hlid, wlvif->ap.sta_hlid_map);
         __clear_bit(hlid, &wl->ap_ps_map);
         __clear_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);
+
+        /*
+         * save the last used PN in the private part of iee80211_sta,
+         * in case of recovery/suspend
+         */
+        rcu_read_lock();
+        sta = ieee80211_find_sta(vif, wl->links[hlid].addr);
+        if (sta) {
+                wl_sta = (void *)sta->drv_priv;
+                wl_sta->total_freed_pkts = wl->links[hlid].total_freed_pkts;
+
+                /*
+                 * increment the initial seq number on recovery to account for
+                 * transmitted packets that we haven't yet got in the FW status
+                 */
+                if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))
+                        wl_sta->total_freed_pkts +=
+                                        WL1271_TX_SQN_POST_RECOVERY_PADDING;
+        }
+        rcu_read_unlock();
+
         wl12xx_free_link(wl, wlvif, &hlid);
         wl->active_sta_count--;
 
@@ -4616,13 +4672,11 @@ static int wl12xx_update_sta_state(struct wl1271 *wl,
                                    enum ieee80211_sta_state new_state)
 {
         struct wl1271_station *wl_sta;
-        u8 hlid;
         bool is_ap = wlvif->bss_type == BSS_TYPE_AP_BSS;
         bool is_sta = wlvif->bss_type == BSS_TYPE_STA_BSS;
         int ret;
 
         wl_sta = (struct wl1271_station *)sta->drv_priv;
-        hlid = wl_sta->hlid;
 
         /* Add station (AP mode) */
         if (is_ap &&
@@ -4648,12 +4702,12 @@ static int wl12xx_update_sta_state(struct wl1271 *wl,
         /* Authorize station (AP mode) */
         if (is_ap &&
             new_state == IEEE80211_STA_AUTHORIZED) {
-                ret = wl12xx_cmd_set_peer_state(wl, wlvif, hlid);
+                ret = wl12xx_cmd_set_peer_state(wl, wlvif, wl_sta->hlid);
                 if (ret < 0)
                         return ret;
 
                 ret = wl1271_acx_set_ht_capabilities(wl, &sta->ht_cap, true,
-                                                     hlid);
+                                                     wl_sta->hlid);
                 if (ret)
                         return ret;
 
@@ -4784,7 +4838,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
                         break;
                 }
 
-                if (wl->ba_rx_session_count >= RX_BA_MAX_SESSIONS) {
+                if (wl->ba_rx_session_count >= wl->ba_rx_session_count_max) {
                         ret = -EBUSY;
                         wl1271_error("exceeded max RX BA sessions");
                         break;
@@ -4946,7 +5000,7 @@ out:
         mutex_unlock(&wl->mutex);
 }
 
-static void wlcore_op_flush(struct ieee80211_hw *hw, bool drop)
+static void wlcore_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct wl1271 *wl = hw->priv;
 
@@ -4956,7 +5010,8 @@ static void wlcore_op_flush(struct ieee80211_hw *hw, bool drop)
 static int wlcore_op_remain_on_channel(struct ieee80211_hw *hw,
                                        struct ieee80211_vif *vif,
                                        struct ieee80211_channel *chan,
-                                       int duration)
+                                       int duration,
+                                       enum ieee80211_roc_type type)
 {
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct wl1271 *wl = hw->priv;
@@ -5091,6 +5146,39 @@ static void wlcore_op_sta_rc_update(struct ieee80211_hw *hw,
         wlcore_hw_sta_rc_update(wl, wlvif, sta, changed);
 }
 
+static int wlcore_op_get_rssi(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct ieee80211_sta *sta,
+                               s8 *rssi_dbm)
+{
+        struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        int ret = 0;
+
+        wl1271_debug(DEBUG_MAC80211, "mac80211 get_rssi");
+
+        mutex_lock(&wl->mutex);
+
+        if (unlikely(wl->state != WLCORE_STATE_ON))
+                goto out;
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out_sleep;
+
+        ret = wlcore_acx_average_rssi(wl, wlvif, rssi_dbm);
+        if (ret < 0)
+                goto out_sleep;
+
+out_sleep:
+        wl1271_ps_elp_sleep(wl);
+
+out:
+        mutex_unlock(&wl->mutex);
+
+        return ret;
+}
+
 static bool wl1271_tx_frames_pending(struct ieee80211_hw *hw)
 {
         struct wl1271 *wl = hw->priv;
@@ -5290,6 +5378,7 @@ static const struct ieee80211_ops wl1271_ops = {
         .assign_vif_chanctx = wlcore_op_assign_vif_chanctx,
         .unassign_vif_chanctx = wlcore_op_unassign_vif_chanctx,
         .sta_rc_update = wlcore_op_sta_rc_update,
+        .get_rssi = wlcore_op_get_rssi,
         CFG80211_TESTMODE_CMD(wl1271_tm_cmd)
 };
 
@@ -5929,35 +6018,6 @@ int wlcore_free_hw(struct wl1271 *wl)
 }
 EXPORT_SYMBOL_GPL(wlcore_free_hw);
 
-static irqreturn_t wl12xx_hardirq(int irq, void *cookie)
-{
-        struct wl1271 *wl = cookie;
-        unsigned long flags;
-
-        wl1271_debug(DEBUG_IRQ, "IRQ");
-
-        /* complete the ELP completion */
-        spin_lock_irqsave(&wl->wl_lock, flags);
-        set_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
-        if (wl->elp_compl) {
-                complete(wl->elp_compl);
-                wl->elp_compl = NULL;
-        }
-
-        if (test_bit(WL1271_FLAG_SUSPENDED, &wl->flags)) {
-                /* don't enqueue a work right now. mark it as pending */
-                set_bit(WL1271_FLAG_PENDING_WORK, &wl->flags);
-                wl1271_debug(DEBUG_IRQ, "should not enqueue work");
-                disable_irq_nosync(wl->irq);
-                pm_wakeup_event(wl->dev, 0);
-                spin_unlock_irqrestore(&wl->wl_lock, flags);
-                return IRQ_HANDLED;
-        }
-        spin_unlock_irqrestore(&wl->wl_lock, flags);
-
-        return IRQ_WAKE_THREAD;
-}
-
 static void wlcore_nvs_cb(const struct firmware *fw, void *context)
 {
         struct wl1271 *wl = context;
@@ -5999,9 +6059,8 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
         else
                 irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
 
-        ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wlcore_irq,
-                                   irqflags,
-                                   pdev->name, wl);
+        ret = request_threaded_irq(wl->irq, NULL, wlcore_irq,
+                                   irqflags, pdev->name, wl);
         if (ret < 0) {
                 wl1271_error("request_irq() failed: %d", ret);
                 goto out_free_nvs;
diff --git a/drivers/net/wireless/ti/wlcore/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
index 9b7b6e2e4fbc..9654577efd01 100644
--- a/drivers/net/wireless/ti/wlcore/ps.c
+++ b/drivers/net/wireless/ti/wlcore/ps.c
@@ -29,6 +29,7 @@
 #define WL1271_WAKEUP_TIMEOUT 500
 
 #define ELP_ENTRY_DELAY  30
+#define ELP_ENTRY_DELAY_FORCE_PS  5
 
 void wl1271_elp_work(struct work_struct *work)
 {
@@ -98,7 +99,8 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
                         return;
         }
 
-        timeout = ELP_ENTRY_DELAY;
+        timeout = wl->conf.conn.forced_ps ?
+                        ELP_ENTRY_DELAY_FORCE_PS : ELP_ENTRY_DELAY;
         ieee80211_queue_delayed_work(wl->hw, &wl->elp_work,
                                      msecs_to_jiffies(timeout));
 }
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index ece392c54d9c..004d02e71f01 100644
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/etherdevice.h>
+#include <linux/spinlock.h>
 
 #include "wlcore.h"
 #include "debug.h"
@@ -104,7 +105,7 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl,
                                     struct wl12xx_vif *wlvif,
                                     u8 hlid)
 {
-        bool fw_ps, single_link;
+        bool fw_ps;
         u8 tx_pkts;
 
         if (WARN_ON(!test_bit(hlid, wlvif->links_map)))
@@ -112,15 +113,19 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl,
 
         fw_ps = test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);
         tx_pkts = wl->links[hlid].allocated_pkts;
-        single_link = (wl->active_link_count == 1);
 
         /*
          * if in FW PS and there is enough data in FW we can put the link
          * into high-level PS and clean out its TX queues.
          * Make an exception if this is the only connected link. In this
          * case FW-memory congestion is less of a problem.
+         * Note that a single connected STA means 3 active links, since we must
+         * account for the global and broadcast AP links. The "fw_ps" check
+         * assures us the third link is a STA connected to the AP. Otherwise
+         * the FW would not set the PSM bit.
          */
-        if (!single_link && fw_ps && tx_pkts >= WL1271_PS_STA_MAX_PACKETS)
+        if (wl->active_link_count > 3 && fw_ps &&
+            tx_pkts >= WL1271_PS_STA_MAX_PACKETS)
                 wl12xx_ps_link_start(wl, wlvif, hlid, true);
 }
 
@@ -639,6 +644,7 @@ next:
 
         }
 
+out:
         if (!skb &&
             test_and_clear_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &wl->flags)) {
                 int q;
@@ -652,7 +658,6 @@ next:
                 spin_unlock_irqrestore(&wl->wl_lock, flags);
         }
 
-out:
         return skb;
 }
 
@@ -928,25 +933,6 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 
         wl->stats.retry_count += result->ack_failures;
 
-        /*
-         * update sequence number only when relevant, i.e. only in
-         * sessions of TKIP, AES and GEM (not in open or WEP sessions)
-         */
-        if (info->control.hw_key &&
-            (info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP ||
-             info->control.hw_key->cipher == WLAN_CIPHER_SUITE_CCMP ||
-             info->control.hw_key->cipher == WL1271_CIPHER_SUITE_GEM)) {
-                u8 fw_lsb = result->tx_security_sequence_number_lsb;
-                u8 cur_lsb = wlvif->tx_security_last_seq_lsb;
-
-                /*
-                 * update security sequence number, taking care of potential
-                 * wrap-around
-                 */
-                wlvif->tx_security_seq += (fw_lsb - cur_lsb) & 0xff;
-                wlvif->tx_security_last_seq_lsb = fw_lsb;
-        }
-
         /* remove private header from packet */
         skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
 
@@ -1061,7 +1047,8 @@ void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
         /* TX failure */
         for_each_set_bit(i, wlvif->links_map, WL12XX_MAX_LINKS) {
-                if (wlvif->bss_type == BSS_TYPE_AP_BSS) {
+                if (wlvif->bss_type == BSS_TYPE_AP_BSS &&
+                    i != wlvif->ap.bcast_hlid && i != wlvif->ap.global_hlid) {
                         /* this calls wl12xx_free_link */
                         wl1271_free_sta(wl, wlvif, i);
                 } else {
@@ -1304,7 +1291,7 @@ bool wlcore_is_queue_stopped_by_reason_locked(struct wl1271 *wl,
 {
         int hwq = wlcore_tx_get_mac80211_queue(wlvif, queue);
 
-        WARN_ON_ONCE(!spin_is_locked(&wl->wl_lock));
+        assert_spin_locked(&wl->wl_lock);
         return test_bit(reason, &wl->queue_stop_reasons[hwq]);
 }
 
@@ -1313,6 +1300,6 @@ bool wlcore_is_queue_stopped_locked(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 {
         int hwq = wlcore_tx_get_mac80211_queue(wlvif, queue);
 
-        WARN_ON_ONCE(!spin_is_locked(&wl->wl_lock));
+        assert_spin_locked(&wl->wl_lock);
         return !!wl->queue_stop_reasons[hwq];
 }
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index af9fecaefc30..0034979e97cb 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -390,6 +390,9 @@ struct wl1271 {
         /* number of currently active RX BA sessions */
         int ba_rx_session_count;
 
+        /* Maximum number of supported RX BA sessions */
+        int ba_rx_session_count_max;
+
         /* AP-mode - number of currently connected stations */
         int active_sta_count;
 
diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index 508f5b0f8a70..e5e146435fe7 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -274,6 +274,13 @@ struct wl1271_link {
 
         /* The wlvif this link belongs to. Might be null for global links */
         struct wl12xx_vif *wlvif;
+
+        /*
+         * total freed FW packets on the link - used for tracking the
+         * AES/TKIP PN across recoveries. Re-initialized each time
+         * from the wl1271_station structure.
+         */
+        u64 total_freed_pkts;
 };
 
 #define WL1271_MAX_RX_FILTERS 5
@@ -318,6 +325,13 @@ struct wl12xx_rx_filter {
 struct wl1271_station {
         u8 hlid;
         bool in_connection;
+
+        /*
+         * total freed FW packets on the link to the STA - used for tracking the
+         * AES/TKIP PN across recoveries. Re-initialized each time from the
+         * wl1271_station structure.
+         */
+        u64 total_freed_pkts;
 };
 
 struct wl12xx_vif {
@@ -449,16 +463,15 @@ struct wl12xx_vif {
          */
         struct {
                 u8 persistent[0];
+
                 /*
-                 * Security sequence number
-                 *     bits 0-15: lower 16 bits part of sequence number
-                 *     bits 16-47: higher 32 bits part of sequence number
-                 *     bits 48-63: not in use
+                 * total freed FW packets on the link - used for
+                 * storing the AES/TKIP PN during recovery, as this
+                 * structure is not zeroed out.
+                 * For STA this holds the PN of the link to the AP.
+                 * For AP this holds the PN of the broadcast link.
                  */
-                u64 tx_security_seq;
-
-                /* 8 bits of the last sequence number in use */
-                u8 tx_security_last_seq_lsb;
+                u64 total_freed_pkts;
         };
 };
 
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 114364b5d466..c6208a7988e4 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -1156,10 +1156,10 @@ static int zd_op_config(struct ieee80211_hw *hw, u32 changed)
         struct ieee80211_conf *conf = &hw->conf;
 
         spin_lock_irq(&mac->lock);
-        mac->channel = conf->channel->hw_value;
+        mac->channel = conf->chandef.chan->hw_value;
         spin_unlock_irq(&mac->lock);
 
-        return zd_chip_set_channel(&mac->chip, conf->channel->hw_value);
+        return zd_chip_set_channel(&mac->chip, conf->chandef.chan->hw_value);
 }
 
 static void zd_beacon_done(struct zd_mac *mac)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index cd49ba949636..a2865f17c667 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -47,11 +47,25 @@
 #include <asm/xen/hypercall.h>
 #include <asm/xen/page.h>
 
+/*
+ * This is the maximum slots a skb can have. If a guest sends a skb
+ * which exceeds this limit it is considered malicious.
+ */
+#define MAX_SKB_SLOTS_DEFAULT 20
+static unsigned int max_skb_slots = MAX_SKB_SLOTS_DEFAULT;
+module_param(max_skb_slots, uint, 0444);
+
+typedef unsigned int pending_ring_idx_t;
+#define INVALID_PENDING_RING_IDX (~0U)
+
 struct pending_tx_info {
-        struct xen_netif_tx_request req;
+        struct xen_netif_tx_request req; /* coalesced tx request */
         struct xenvif *vif;
+        pending_ring_idx_t head; /* head != INVALID_PENDING_RING_IDX
+                                  * if it is head of one or more tx
+                                  * reqs
+                                  */
 };
-typedef unsigned int pending_ring_idx_t;
 
 struct netbk_rx_meta {
         int id;
@@ -102,7 +116,11 @@ struct xen_netbk {
         atomic_t netfront_count;
 
         struct pending_tx_info pending_tx_info[MAX_PENDING_REQS];
-        struct gnttab_copy tx_copy_ops[MAX_PENDING_REQS];
+        /* Coalescing tx requests before copying makes number of grant
+         * copy ops greater or equal to number of slots required. In
+         * worst case a tx request consumes 2 gnttab_copy.
+         */
+        struct gnttab_copy tx_copy_ops[2*MAX_PENDING_REQS];
 
         u16 pending_ring[MAX_PENDING_REQS];
 
@@ -118,6 +136,16 @@ struct xen_netbk {
 static struct xen_netbk *xen_netbk;
 static int xen_netbk_group_nr;
 
+/*
+ * If head != INVALID_PENDING_RING_IDX, it means this tx request is head of
+ * one or more merged tx requests, otherwise it is the continuation of
+ * previous tx request.
+ */
+static inline int pending_tx_is_head(struct xen_netbk *netbk, RING_IDX idx)
+{
+        return netbk->pending_tx_info[idx].head != INVALID_PENDING_RING_IDX;
+}
+
 void xen_netbk_add_xenvif(struct xenvif *vif)
 {
         int i;
@@ -250,6 +278,7 @@ static int max_required_rx_slots(struct xenvif *vif)
 {
         int max = DIV_ROUND_UP(vif->dev->mtu, PAGE_SIZE);
 
+        /* XXX FIXME: RX path dependent on MAX_SKB_FRAGS */
         if (vif->can_sg || vif->gso || vif->gso_prefix)
                 max += MAX_SKB_FRAGS + 1; /* extra_info + frags */
 
@@ -657,6 +686,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
                 __skb_queue_tail(&rxq, skb);
 
                 /* Filled the batch queue? */
+                /* XXX FIXME: RX path dependent on MAX_SKB_FRAGS */
                 if (count + MAX_SKB_FRAGS >= XEN_NETIF_RX_RING_SIZE)
                         break;
         }
@@ -898,51 +928,91 @@ static void netbk_fatal_tx_err(struct xenvif *vif)
 
 static int netbk_count_requests(struct xenvif *vif,
                                 struct xen_netif_tx_request *first,
+                                RING_IDX first_idx,
                                 struct xen_netif_tx_request *txp,
                                 int work_to_do)
 {
         RING_IDX cons = vif->tx.req_cons;
-        int frags = 0;
+        int slots = 0;
+        int drop_err = 0;
 
         if (!(first->flags & XEN_NETTXF_more_data))
                 return 0;
 
         do {
-                if (frags >= work_to_do) {
-                        netdev_err(vif->dev, "Need more frags\n");
+                if (slots >= work_to_do) {
+                        netdev_err(vif->dev,
+                                   "Asked for %d slots but exceeds this limit\n",
+                                   work_to_do);
                         netbk_fatal_tx_err(vif);
                         return -ENODATA;
                 }
 
-                if (unlikely(frags >= MAX_SKB_FRAGS)) {
-                        netdev_err(vif->dev, "Too many frags\n");
+                /* This guest is really using too many slots and
+                 * considered malicious.
+                 */
+                if (unlikely(slots >= max_skb_slots)) {
+                        netdev_err(vif->dev,
+                                   "Malicious frontend using %d slots, threshold %u\n",
+                                   slots, max_skb_slots);
                         netbk_fatal_tx_err(vif);
                         return -E2BIG;
                 }
 
-                memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
+                /* Xen network protocol had implicit dependency on
+                 * MAX_SKB_FRAGS. XEN_NETIF_NR_SLOTS_MIN is set to the
+                 * historical MAX_SKB_FRAGS value 18 to honor the same
+                 * behavior as before. Any packet using more than 18
+                 * slots but less than max_skb_slots slots is dropped
+                 */
+                if (!drop_err && slots >= XEN_NETIF_NR_SLOTS_MIN) {
+                        if (net_ratelimit())
+                                netdev_dbg(vif->dev,
+                                           "Too many slots (%d) exceeding limit (%d), dropping packet\n",
+                                           slots, XEN_NETIF_NR_SLOTS_MIN);
+                        drop_err = -E2BIG;
+                }
+
+                memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + slots),
                        sizeof(*txp));
-                if (txp->size > first->size) {
-                        netdev_err(vif->dev, "Frag is bigger than frame.\n");
-                        netbk_fatal_tx_err(vif);
-                        return -EIO;
+
+                /* If the guest submitted a frame >= 64 KiB then
+                 * first->size overflowed and following slots will
+                 * appear to be larger than the frame.
+                 *
+                 * This cannot be fatal error as there are buggy
+                 * frontends that do this.
+                 *
+                 * Consume all slots and drop the packet.
+                 */
+                if (!drop_err && txp->size > first->size) {
+                        if (net_ratelimit())
+                                netdev_dbg(vif->dev,
+                                           "Invalid tx request, slot size %u > remaining size %u\n",
+                                           txp->size, first->size);
+                        drop_err = -EIO;
                 }
 
                 first->size -= txp->size;
-                frags++;
+                slots++;
 
                 if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
-                        netdev_err(vif->dev, "txp->offset: %x, size: %u\n",
+                        netdev_err(vif->dev, "Cross page boundary, txp->offset: %x, size: %u\n",
                                  txp->offset, txp->size);
                         netbk_fatal_tx_err(vif);
                         return -EINVAL;
                 }
         } while ((txp++)->flags & XEN_NETTXF_more_data);
-        return frags;
+
+        if (drop_err) {
+                netbk_tx_err(vif, first, first_idx + slots);
+                return drop_err;
+        }
+
+        return slots;
 }
 
 static struct page *xen_netbk_alloc_page(struct xen_netbk *netbk,
-                                         struct sk_buff *skb,
                                          u16 pending_idx)
 {
         struct page *page;
@@ -963,48 +1033,114 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
         struct skb_shared_info *shinfo = skb_shinfo(skb);
         skb_frag_t *frags = shinfo->frags;
         u16 pending_idx = *((u16 *)skb->data);
-        int i, start;
+        u16 head_idx = 0;
+        int slot, start;
+        struct page *page;
+        pending_ring_idx_t index, start_idx = 0;
+        uint16_t dst_offset;
+        unsigned int nr_slots;
+        struct pending_tx_info *first = NULL;
+
+        /* At this point shinfo->nr_frags is in fact the number of
+         * slots, which can be as large as XEN_NETIF_NR_SLOTS_MIN.
+         */
+        nr_slots = shinfo->nr_frags;
 
         /* Skip first skb fragment if it is on same page as header fragment. */
         start = (frag_get_pending_idx(&shinfo->frags[0]) == pending_idx);
 
-        for (i = start; i < shinfo->nr_frags; i++, txp++) {
-                struct page *page;
-                pending_ring_idx_t index;
+        /* Coalesce tx requests, at this point the packet passed in
+         * should be <= 64K. Any packets larger than 64K have been
+         * handled in netbk_count_requests().
+         */
+        for (shinfo->nr_frags = slot = start; slot < nr_slots;
+             shinfo->nr_frags++) {
                 struct pending_tx_info *pending_tx_info =
                         netbk->pending_tx_info;
 
-                index = pending_index(netbk->pending_cons++);
-                pending_idx = netbk->pending_ring[index];
-                page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+                page = alloc_page(GFP_KERNEL|__GFP_COLD);
                 if (!page)
                         goto err;
 
-                gop->source.u.ref = txp->gref;
-                gop->source.domid = vif->domid;
-                gop->source.offset = txp->offset;
-
-                gop->dest.u.gmfn = virt_to_mfn(page_address(page));
-                gop->dest.domid = DOMID_SELF;
-                gop->dest.offset = txp->offset;
-
-                gop->len = txp->size;
-                gop->flags = GNTCOPY_source_gref;
+                dst_offset = 0;
+                first = NULL;
+                while (dst_offset < PAGE_SIZE && slot < nr_slots) {
+                        gop->flags = GNTCOPY_source_gref;
+
+                        gop->source.u.ref = txp->gref;
+                        gop->source.domid = vif->domid;
+                        gop->source.offset = txp->offset;
+
+                        gop->dest.domid = DOMID_SELF;
+
+                        gop->dest.offset = dst_offset;
+                        gop->dest.u.gmfn = virt_to_mfn(page_address(page));
+
+                        if (dst_offset + txp->size > PAGE_SIZE) {
+                                /* This page can only merge a portion
+                                 * of tx request. Do not increment any
+                                 * pointer / counter here. The txp
+                                 * will be dealt with in future
+                                 * rounds, eventually hitting the
+                                 * `else` branch.
+                                 */
+                                gop->len = PAGE_SIZE - dst_offset;
+                                txp->offset += gop->len;
+                                txp->size -= gop->len;
+                                dst_offset += gop->len; /* quit loop */
+                        } else {
+                                /* This tx request can be merged in the page */
+                                gop->len = txp->size;
+                                dst_offset += gop->len;
+
+                                index = pending_index(netbk->pending_cons++);
+
+                                pending_idx = netbk->pending_ring[index];
+
+                                memcpy(&pending_tx_info[pending_idx].req, txp,
+                                       sizeof(*txp));
+                                xenvif_get(vif);
+
+                                pending_tx_info[pending_idx].vif = vif;
+
+                                /* Poison these fields, corresponding
+                                 * fields for head tx req will be set
+                                 * to correct values after the loop.
+                                 */
+                                netbk->mmap_pages[pending_idx] = (void *)(~0UL);
+                                pending_tx_info[pending_idx].head =
+                                        INVALID_PENDING_RING_IDX;
+
+                                if (!first) {
+                                        first = &pending_tx_info[pending_idx];
+                                        start_idx = index;
+                                        head_idx = pending_idx;
+                                }
+
+                                txp++;
+                                slot++;
+                        }
 
-                gop++;
+                        gop++;
+                }
 
-                memcpy(&pending_tx_info[pending_idx].req, txp, sizeof(*txp));
-                xenvif_get(vif);
-                pending_tx_info[pending_idx].vif = vif;
-                frag_set_pending_idx(&frags[i], pending_idx);
+                first->req.offset = 0;
+                first->req.size = dst_offset;
+                first->head = start_idx;
+                set_page_ext(page, netbk, head_idx);
+                netbk->mmap_pages[head_idx] = page;
+                frag_set_pending_idx(&frags[shinfo->nr_frags], head_idx);
         }
 
+        BUG_ON(shinfo->nr_frags > MAX_SKB_FRAGS);
+
         return gop;
 err:
         /* Unwind, freeing all pages and sending error responses. */
-        while (i-- > start) {
-                xen_netbk_idx_release(netbk, frag_get_pending_idx(&frags[i]),
-                                      XEN_NETIF_RSP_ERROR);
+        while (shinfo->nr_frags-- > start) {
+                xen_netbk_idx_release(netbk,
+                                frag_get_pending_idx(&frags[shinfo->nr_frags]),
+                                XEN_NETIF_RSP_ERROR);
         }
         /* The head too, if necessary. */
         if (start)
@@ -1020,8 +1156,10 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
         struct gnttab_copy *gop = *gopp;
         u16 pending_idx = *((u16 *)skb->data);
         struct skb_shared_info *shinfo = skb_shinfo(skb);
+        struct pending_tx_info *tx_info;
         int nr_frags = shinfo->nr_frags;
         int i, err, start;
+        u16 peek; /* peek into next tx request */
 
         /* Check status of header. */
         err = gop->status;
@@ -1033,11 +1171,20 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
 
         for (i = start; i < nr_frags; i++) {
                 int j, newerr;
+                pending_ring_idx_t head;
 
                 pending_idx = frag_get_pending_idx(&shinfo->frags[i]);
+                tx_info = &netbk->pending_tx_info[pending_idx];
+                head = tx_info->head;
 
                 /* Check error status: if okay then remember grant handle. */
-                newerr = (++gop)->status;
+                do {
+                        newerr = (++gop)->status;
+                        if (newerr)
+                                break;
+                        peek = netbk->pending_ring[pending_index(++head)];
+                } while (!pending_tx_is_head(netbk, peek));
+
                 if (likely(!newerr)) {
                         /* Had a previous error? Invalidate this fragment. */
                         if (unlikely(err))
@@ -1157,7 +1304,6 @@ static int netbk_set_skb_gso(struct xenvif *vif,
 static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
 {
         struct iphdr *iph;
-        unsigned char *th;
         int err = -EPROTO;
         int recalculate_partial_csum = 0;
 
@@ -1181,27 +1327,26 @@ static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
                 goto out;
 
         iph = (void *)skb->data;
-        th = skb->data + 4 * iph->ihl;
-        if (th >= skb_tail_pointer(skb))
-                goto out;
-
-        skb->csum_start = th - skb->head;
         switch (iph->protocol) {
         case IPPROTO_TCP:
-                skb->csum_offset = offsetof(struct tcphdr, check);
+                if (!skb_partial_csum_set(skb, 4 * iph->ihl,
+                                          offsetof(struct tcphdr, check)))
+                        goto out;
 
                 if (recalculate_partial_csum) {
-                        struct tcphdr *tcph = (struct tcphdr *)th;
+                        struct tcphdr *tcph = tcp_hdr(skb);
                         tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
                                                          skb->len - iph->ihl*4,
                                                          IPPROTO_TCP, 0);
                 }
                 break;
         case IPPROTO_UDP:
-                skb->csum_offset = offsetof(struct udphdr, check);
+                if (!skb_partial_csum_set(skb, 4 * iph->ihl,
+                                          offsetof(struct udphdr, check)))
+                        goto out;
 
                 if (recalculate_partial_csum) {
-                        struct udphdr *udph = (struct udphdr *)th;
+                        struct udphdr *udph = udp_hdr(skb);
                         udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
                                                          skb->len - iph->ihl*4,
                                                          IPPROTO_UDP, 0);
@@ -1215,9 +1360,6 @@ static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
                 goto out;
         }
 
-        if ((th + skb->csum_offset + 2) > skb_tail_pointer(skb))
-                goto out;
-
         err = 0;
 
 out:
@@ -1262,11 +1404,12 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
         struct sk_buff *skb;
         int ret;
 
-        while (((nr_pending_reqs(netbk) + MAX_SKB_FRAGS) < MAX_PENDING_REQS) &&
+        while ((nr_pending_reqs(netbk) + XEN_NETIF_NR_SLOTS_MIN
+                < MAX_PENDING_REQS) &&
                 !list_empty(&netbk->net_schedule_list)) {
                 struct xenvif *vif;
                 struct xen_netif_tx_request txreq;
-                struct xen_netif_tx_request txfrags[MAX_SKB_FRAGS];
+                struct xen_netif_tx_request txfrags[max_skb_slots];
                 struct page *page;
                 struct xen_netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX-1];
                 u16 pending_idx;
@@ -1327,7 +1470,8 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                                 continue;
                 }
 
-                ret = netbk_count_requests(vif, &txreq, txfrags, work_to_do);
+                ret = netbk_count_requests(vif, &txreq, idx,
+                                           txfrags, work_to_do);
                 if (unlikely(ret < 0))
                         continue;
 
@@ -1354,7 +1498,7 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                 pending_idx = netbk->pending_ring[index];
 
                 data_len = (txreq.size > PKT_PROT_LEN &&
-                            ret < MAX_SKB_FRAGS) ?
+                            ret < XEN_NETIF_NR_SLOTS_MIN) ?
                         PKT_PROT_LEN : txreq.size;
 
                 skb = alloc_skb(data_len + NET_SKB_PAD + NET_IP_ALIGN,
@@ -1381,7 +1525,7 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                 }
 
                 /* XXX could copy straight to head */
-                page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+                page = xen_netbk_alloc_page(netbk, pending_idx);
                 if (!page) {
                         kfree_skb(skb);
                         netbk_tx_err(vif, &txreq, idx);
@@ -1404,6 +1548,7 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                 memcpy(&netbk->pending_tx_info[pending_idx].req,
                        &txreq, sizeof(txreq));
                 netbk->pending_tx_info[pending_idx].vif = vif;
+                netbk->pending_tx_info[pending_idx].head = index;
                 *((u16 *)skb->data) = pending_idx;
 
                 __skb_put(skb, data_len);
@@ -1496,6 +1641,7 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
 
                 skb->dev      = vif->dev;
                 skb->protocol = eth_type_trans(skb, skb->dev);
+                skb_reset_network_header(skb);
 
                 if (checksum_setup(vif, skb)) {
                         netdev_dbg(vif->dev,
@@ -1504,6 +1650,8 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
                         continue;
                 }
 
+                skb_probe_transport_header(skb, 0);
+
                 vif->dev->stats.rx_bytes += skb->len;
                 vif->dev->stats.rx_packets++;
 
@@ -1531,7 +1679,10 @@ static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx,
 {
         struct xenvif *vif;
         struct pending_tx_info *pending_tx_info;
-        pending_ring_idx_t index;
+        pending_ring_idx_t head;
+        u16 peek; /* peek into next tx request */
+
+        BUG_ON(netbk->mmap_pages[pending_idx] == (void *)(~0UL));
 
         /* Already complete? */
         if (netbk->mmap_pages[pending_idx] == NULL)
@@ -1540,19 +1691,40 @@ static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx,
         pending_tx_info = &netbk->pending_tx_info[pending_idx];
 
         vif = pending_tx_info->vif;
+        head = pending_tx_info->head;
+
+        BUG_ON(!pending_tx_is_head(netbk, head));
+        BUG_ON(netbk->pending_ring[pending_index(head)] != pending_idx);
+
+        do {
+                pending_ring_idx_t index;
+                pending_ring_idx_t idx = pending_index(head);
+                u16 info_idx = netbk->pending_ring[idx];
 
-        make_tx_response(vif, &pending_tx_info->req, status);
+                pending_tx_info = &netbk->pending_tx_info[info_idx];
+                make_tx_response(vif, &pending_tx_info->req, status);
 
-        index = pending_index(netbk->pending_prod++);
-        netbk->pending_ring[index] = pending_idx;
+                /* Setting any number other than
+                 * INVALID_PENDING_RING_IDX indicates this slot is
+                 * starting a new packet / ending a previous packet.
+                 */
+                pending_tx_info->head = 0;
 
-        xenvif_put(vif);
+                index = pending_index(netbk->pending_prod++);
+                netbk->pending_ring[index] = netbk->pending_ring[info_idx];
+
+                xenvif_put(vif);
+
+                peek = netbk->pending_ring[pending_index(++head)];
+
+        } while (!pending_tx_is_head(netbk, peek));
 
         netbk->mmap_pages[pending_idx]->mapping = 0;
         put_page(netbk->mmap_pages[pending_idx]);
         netbk->mmap_pages[pending_idx] = NULL;
 }
 
+
 static void make_tx_response(struct xenvif *vif,
                              struct xen_netif_tx_request *txp,
                              s8       st)
@@ -1605,8 +1777,9 @@ static inline int rx_work_todo(struct xen_netbk *netbk)
 static inline int tx_work_todo(struct xen_netbk *netbk)
 {
 
-        if (((nr_pending_reqs(netbk) + MAX_SKB_FRAGS) < MAX_PENDING_REQS) &&
-                        !list_empty(&netbk->net_schedule_list))
+        if ((nr_pending_reqs(netbk) + XEN_NETIF_NR_SLOTS_MIN
+             < MAX_PENDING_REQS) &&
+             !list_empty(&netbk->net_schedule_list))
                 return 1;
 
         return 0;
@@ -1689,6 +1862,13 @@ static int __init netback_init(void)
         if (!xen_domain())
                 return -ENODEV;
 
+        if (max_skb_slots < XEN_NETIF_NR_SLOTS_MIN) {
+                printk(KERN_INFO
+                       "xen-netback: max_skb_slots too small (%d), bump it to XEN_NETIF_NR_SLOTS_MIN (%d)\n",
+                       max_skb_slots, XEN_NETIF_NR_SLOTS_MIN);
+                max_skb_slots = XEN_NETIF_NR_SLOTS_MIN;
+        }
+
         xen_netbk_group_nr = num_online_cpus();
         xen_netbk = vzalloc(sizeof(struct xen_netbk) * xen_netbk_group_nr);
         if (!xen_netbk)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 7ffa43bd7cf9..1db101415069 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -36,7 +36,7 @@
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
 #include <linux/if_ether.h>
-#include <linux/tcp.h>
+#include <net/tcp.h>
 #include <linux/udp.h>
 #include <linux/moduleparam.h>
 #include <linux/mm.h>
@@ -537,7 +537,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct netfront_info *np = netdev_priv(dev);
         struct netfront_stats *stats = this_cpu_ptr(np->stats);
         struct xen_netif_tx_request *tx;
-        struct xen_netif_extra_info *extra;
         char *data = skb->data;
         RING_IDX i;
         grant_ref_t ref;
@@ -548,6 +547,16 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned int len = skb_headlen(skb);
         unsigned long flags;
 
+        /* If skb->len is too big for wire format, drop skb and alert
+         * user about misconfiguration.
+         */
+        if (unlikely(skb->len > XEN_NETIF_MAX_TX_SIZE)) {
+                net_alert_ratelimited(
+                        "xennet: skb->len = %u, too big for wire format\n",
+                        skb->len);
+                goto drop;
+        }
+
         slots = DIV_ROUND_UP(offset + len, PAGE_SIZE) +
                 xennet_count_skb_frag_slots(skb);
         if (unlikely(slots > MAX_SKB_FRAGS + 1)) {
@@ -581,7 +590,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx->gref = np->grant_tx_ref[id] = ref;
         tx->offset = offset;
         tx->size = len;
-        extra = NULL;
 
         tx->flags = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL)
@@ -597,10 +605,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 gso = (struct xen_netif_extra_info *)
                         RING_GET_REQUEST(&np->tx, ++i);
 
-                if (extra)
-                        extra->flags |= XEN_NETIF_EXTRA_FLAG_MORE;
-                else
-                        tx->flags |= XEN_NETTXF_extra_info;
+                tx->flags |= XEN_NETTXF_extra_info;
 
                 gso->u.gso.size = skb_shinfo(skb)->gso_size;
                 gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
@@ -609,7 +614,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 gso->type = XEN_NETIF_EXTRA_TYPE_GSO;
                 gso->flags = 0;
-                extra = gso;
         }
 
         np->tx.req_prod_pvt = i + 1;
@@ -718,7 +722,7 @@ static int xennet_get_responses(struct netfront_info *np,
         struct sk_buff *skb = xennet_get_rx_skb(np, cons);
         grant_ref_t ref = xennet_get_rx_ref(np, cons);
         int max = MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD);
-        int frags = 1;
+        int slots = 1;
         int err = 0;
         unsigned long ret;
 
@@ -741,7 +745,7 @@ static int xennet_get_responses(struct netfront_info *np,
                 /*
                  * This definitely indicates a bug, either in this driver or in
                  * the backend driver. In future this should flag the bad
-                 * situation to the system controller to reboot the backed.
+                 * situation to the system controller to reboot the backend.
                  */
                 if (ref == GRANT_INVALID_REF) {
                         if (net_ratelimit())
@@ -762,27 +766,27 @@ next:
                 if (!(rx->flags & XEN_NETRXF_more_data))
                         break;
 
-                if (cons + frags == rp) {
+                if (cons + slots == rp) {
                         if (net_ratelimit())
-                                dev_warn(dev, "Need more frags\n");
+                                dev_warn(dev, "Need more slots\n");
                         err = -ENOENT;
                         break;
                 }
 
-                rx = RING_GET_RESPONSE(&np->rx, cons + frags);
-                skb = xennet_get_rx_skb(np, cons + frags);
-                ref = xennet_get_rx_ref(np, cons + frags);
-                frags++;
+                rx = RING_GET_RESPONSE(&np->rx, cons + slots);
+                skb = xennet_get_rx_skb(np, cons + slots);
+                ref = xennet_get_rx_ref(np, cons + slots);
+                slots++;
         }
 
-        if (unlikely(frags > max)) {
+        if (unlikely(slots > max)) {
                 if (net_ratelimit())
-                        dev_warn(dev, "Too many frags\n");
+                        dev_warn(dev, "Too many slots\n");
                 err = -E2BIG;
         }
 
         if (unlikely(err))
-                np->rx.rsp_cons = cons + frags;
+                np->rx.rsp_cons = cons + slots;
 
         return err;
 }
@@ -1064,7 +1068,8 @@ err:
 
 static int xennet_change_mtu(struct net_device *dev, int mtu)
 {
-        int max = xennet_can_sg(dev) ? 65535 - ETH_HLEN : ETH_DATA_LEN;
+        int max = xennet_can_sg(dev) ?
+                XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER : ETH_DATA_LEN;
 
         if (mtu > max)
                 return -EINVAL;
@@ -1368,6 +1373,8 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
         SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops);
         SET_NETDEV_DEV(netdev, &dev->dev);
 
+        netif_set_gso_max_size(netdev, XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER);
+
         np->netdev = netdev;
 
         netif_carrier_off(netdev);
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index e57034971ccc..4775d4e61b88 100644
--- a/drivers/nfc/Kconfig
+++ b/drivers/nfc/Kconfig
@@ -26,6 +26,16 @@ config NFC_WILINK
           Say Y here to compile support for Texas Instrument's NFC WiLink driver
           into the kernel or say M to compile it as module.
 
+config NFC_MEI_PHY
+        tristate "MEI bus NFC device support"
+        depends on INTEL_MEI_BUS_NFC && NFC_HCI
+        help
+          This adds support to use an mei bus nfc device. Select this if you
+          will use an HCI NFC driver for an NFC chip connected behind an
+          Intel's Management Engine chip.
+
+          If unsure, say N.
+
 source "drivers/nfc/pn544/Kconfig"
 source "drivers/nfc/microread/Kconfig"
 
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile
index a189ada0926a..aa6bd657ef40 100644
--- a/drivers/nfc/Makefile
+++ b/drivers/nfc/Makefile
@@ -6,5 +6,6 @@ obj-$(CONFIG_NFC_PN544)		+= pn544/
 obj-$(CONFIG_NFC_MICROREAD)     += microread/
 obj-$(CONFIG_NFC_PN533)         += pn533.o
 obj-$(CONFIG_NFC_WILINK)        += nfcwilink.o
+obj-$(CONFIG_NFC_MEI_PHY)       += mei_phy.o
 
 ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG
diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
new file mode 100644
index 000000000000..b8f8abc422f0
--- /dev/null
+++ b/drivers/nfc/mei_phy.c
@@ -0,0 +1,164 @@
+/*
+ * MEI Library for mei bus nfc device access
+ *
+ * Copyright (C) 2013  Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/nfc.h>
+
+#include "mei_phy.h"
+
+struct mei_nfc_hdr {
+        u8 cmd;
+        u8 status;
+        u16 req_id;
+        u32 reserved;
+        u16 data_size;
+} __attribute__((packed));
+
+#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)
+
+#define MEI_DUMP_SKB_IN(info, skb)                              \
+do {                                                            \
+        pr_debug("%s:\n", info);                                \
+        print_hex_dump_debug("mei in : ", DUMP_PREFIX_OFFSET,   \
+                        16, 1, (skb)->data, (skb)->len, false); \
+} while (0)
+
+#define MEI_DUMP_SKB_OUT(info, skb)                             \
+do {                                                            \
+        pr_debug("%s:\n", info);                                \
+        print_hex_dump_debug("mei out: ", DUMP_PREFIX_OFFSET,   \
+                       16, 1, (skb)->data, (skb)->len, false);  \
+} while (0)
+
+int nfc_mei_phy_enable(void *phy_id)
+{
+        int r;
+        struct nfc_mei_phy *phy = phy_id;
+
+        pr_info("%s\n", __func__);
+
+        if (phy->powered == 1)
+                return 0;
+
+        r = mei_cl_enable_device(phy->device);
+        if (r < 0) {
+                pr_err("MEI_PHY: Could not enable device\n");
+                return r;
+        }
+
+        phy->powered = 1;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(nfc_mei_phy_enable);
+
+void nfc_mei_phy_disable(void *phy_id)
+{
+        struct nfc_mei_phy *phy = phy_id;
+
+        pr_info("%s\n", __func__);
+
+        mei_cl_disable_device(phy->device);
+
+        phy->powered = 0;
+}
+EXPORT_SYMBOL_GPL(nfc_mei_phy_disable);
+
+/*
+ * Writing a frame must not return the number of written bytes.
+ * It must return either zero for success, or <0 for error.
+ * In addition, it must not alter the skb
+ */
+static int nfc_mei_phy_write(void *phy_id, struct sk_buff *skb)
+{
+        struct nfc_mei_phy *phy = phy_id;
+        int r;
+
+        MEI_DUMP_SKB_OUT("mei frame sent", skb);
+
+        r = mei_cl_send(phy->device, skb->data, skb->len);
+        if (r > 0)
+                r = 0;
+
+        return r;
+}
+
+void nfc_mei_event_cb(struct mei_cl_device *device, u32 events, void *context)
+{
+        struct nfc_mei_phy *phy = context;
+
+        if (phy->hard_fault != 0)
+                return;
+
+        if (events & BIT(MEI_CL_EVENT_RX)) {
+                struct sk_buff *skb;
+                int reply_size;
+
+                skb = alloc_skb(MEI_NFC_MAX_READ, GFP_KERNEL);
+                if (!skb)
+                        return;
+
+                reply_size = mei_cl_recv(device, skb->data, MEI_NFC_MAX_READ);
+                if (reply_size < MEI_NFC_HEADER_SIZE) {
+                        kfree(skb);
+                        return;
+                }
+
+                skb_put(skb, reply_size);
+                skb_pull(skb, MEI_NFC_HEADER_SIZE);
+
+                MEI_DUMP_SKB_IN("mei frame read", skb);
+
+                nfc_hci_recv_frame(phy->hdev, skb);
+        }
+}
+EXPORT_SYMBOL_GPL(nfc_mei_event_cb);
+
+struct nfc_phy_ops mei_phy_ops = {
+        .write = nfc_mei_phy_write,
+        .enable = nfc_mei_phy_enable,
+        .disable = nfc_mei_phy_disable,
+};
+EXPORT_SYMBOL_GPL(mei_phy_ops);
+
+struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *device)
+{
+        struct nfc_mei_phy *phy;
+
+        phy = kzalloc(sizeof(struct nfc_mei_phy), GFP_KERNEL);
+        if (!phy)
+                return NULL;
+
+        phy->device = device;
+        mei_cl_set_drvdata(device, phy);
+
+        return phy;
+}
+EXPORT_SYMBOL_GPL(nfc_mei_phy_alloc);
+
+void nfc_mei_phy_free(struct nfc_mei_phy *phy)
+{
+        kfree(phy);
+}
+EXPORT_SYMBOL_GPL(nfc_mei_phy_free);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("mei bus NFC device interface");
diff --git a/drivers/nfc/mei_phy.h b/drivers/nfc/mei_phy.h
new file mode 100644
index 000000000000..d669900f8278
--- /dev/null
+++ b/drivers/nfc/mei_phy.h
@@ -0,0 +1,30 @@
+#ifndef __LOCAL_MEI_PHY_H_
+#define __LOCAL_MEI_PHY_H_
+
+#include <linux/mei_cl_bus.h>
+#include <net/nfc/hci.h>
+
+#define MEI_NFC_HEADER_SIZE 10
+#define MEI_NFC_MAX_HCI_PAYLOAD 300
+
+struct nfc_mei_phy {
+        struct mei_cl_device *device;
+        struct nfc_hci_dev *hdev;
+
+        int powered;
+
+        int hard_fault;         /*
+                                 * < 0 if hardware error occured
+                                 * and prevents normal operation.
+                                 */
+};
+
+extern struct nfc_phy_ops mei_phy_ops;
+
+int nfc_mei_phy_enable(void *phy_id);
+void nfc_mei_phy_disable(void *phy_id);
+void nfc_mei_event_cb(struct mei_cl_device *device, u32 events, void *context);
+struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *device);
+void nfc_mei_phy_free(struct nfc_mei_phy *phy);
+
+#endif /* __LOCAL_MEI_PHY_H_ */
diff --git a/drivers/nfc/microread/Kconfig b/drivers/nfc/microread/Kconfig
index 572305be6e37..951d5542f6bc 100644
--- a/drivers/nfc/microread/Kconfig
+++ b/drivers/nfc/microread/Kconfig
@@ -25,7 +25,7 @@ config NFC_MICROREAD_I2C
 
 config NFC_MICROREAD_MEI
         tristate "NFC Microread MEI support"
-        depends on NFC_MICROREAD && INTEL_MEI_BUS_NFC
+        depends on NFC_MICROREAD && NFC_MEI_PHY
         ---help---
           This module adds support for the mei interface of adapters using
           Inside microread chipsets.  Select this if your microread chipset
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index ca33ae193935..1ad044dce7b6 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -19,151 +19,31 @@
  */
 
 #include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/gpio.h>
-#include <linux/mei_cl_bus.h>
-
+#include <linux/mod_devicetable.h>
 #include <linux/nfc.h>
 #include <net/nfc/hci.h>
 #include <net/nfc/llc.h>
 
+#include "../mei_phy.h"
 #include "microread.h"
 
 #define MICROREAD_DRIVER_NAME "microread"
 
-struct mei_nfc_hdr {
-        u8 cmd;
-        u8 status;
-        u16 req_id;
-        u32 reserved;
-        u16 data_size;
-} __attribute__((packed));
-
-#define MEI_NFC_HEADER_SIZE 10
-#define MEI_NFC_MAX_HCI_PAYLOAD 300
-#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)
-
-struct microread_mei_phy {
-        struct mei_cl_device *device;
-        struct nfc_hci_dev *hdev;
-
-        int powered;
-
-        int hard_fault;         /*
-                                 * < 0 if hardware error occured (e.g. i2c err)
-                                 * and prevents normal operation.
-                                 */
-};
-
-#define MEI_DUMP_SKB_IN(info, skb)                                      \
-do {                                                            \
-        pr_debug("%s:\n", info);                                \
-        print_hex_dump(KERN_DEBUG, "mei in : ", DUMP_PREFIX_OFFSET,     \
-                       16, 1, (skb)->data, (skb)->len, 0);      \
-} while (0)
-
-#define MEI_DUMP_SKB_OUT(info, skb)                                     \
-do {                                                            \
-        pr_debug("%s:\n", info);                                \
-        print_hex_dump(KERN_DEBUG, "mei out: ", DUMP_PREFIX_OFFSET,     \
-                       16, 1, (skb)->data, (skb)->len, 0);      \
-} while (0)
-
-static int microread_mei_enable(void *phy_id)
-{
-        struct microread_mei_phy *phy = phy_id;
-
-        pr_info(DRIVER_DESC ": %s\n", __func__);
-
-        phy->powered = 1;
-
-        return 0;
-}
-
-static void microread_mei_disable(void *phy_id)
-{
-        struct microread_mei_phy *phy = phy_id;
-
-        pr_info(DRIVER_DESC ": %s\n", __func__);
-
-        phy->powered = 0;
-}
-
-/*
- * Writing a frame must not return the number of written bytes.
- * It must return either zero for success, or <0 for error.
- * In addition, it must not alter the skb
- */
-static int microread_mei_write(void *phy_id, struct sk_buff *skb)
-{
-        struct microread_mei_phy *phy = phy_id;
-        int r;
-
-        MEI_DUMP_SKB_OUT("mei frame sent", skb);
-
-        r = mei_cl_send(phy->device, skb->data, skb->len);
-        if (r > 0)
-                r = 0;
-
-        return r;
-}
-
-static void microread_event_cb(struct mei_cl_device *device, u32 events,
-                               void *context)
-{
-        struct microread_mei_phy *phy = context;
-
-        if (phy->hard_fault != 0)
-                return;
-
-        if (events & BIT(MEI_CL_EVENT_RX)) {
-                struct sk_buff *skb;
-                int reply_size;
-
-                skb = alloc_skb(MEI_NFC_MAX_READ, GFP_KERNEL);
-                if (!skb)
-                        return;
-
-                reply_size = mei_cl_recv(device, skb->data, MEI_NFC_MAX_READ);
-                if (reply_size < MEI_NFC_HEADER_SIZE) {
-                        kfree(skb);
-                        return;
-                }
-
-                skb_put(skb, reply_size);
-                skb_pull(skb, MEI_NFC_HEADER_SIZE);
-
-                MEI_DUMP_SKB_IN("mei frame read", skb);
-
-                nfc_hci_recv_frame(phy->hdev, skb);
-        }
-}
-
-static struct nfc_phy_ops mei_phy_ops = {
-        .write = microread_mei_write,
-        .enable = microread_mei_enable,
-        .disable = microread_mei_disable,
-};
-
 static int microread_mei_probe(struct mei_cl_device *device,
                                const struct mei_cl_device_id *id)
 {
-        struct microread_mei_phy *phy;
+        struct nfc_mei_phy *phy;
         int r;
 
         pr_info("Probing NFC microread\n");
 
-        phy = kzalloc(sizeof(struct microread_mei_phy), GFP_KERNEL);
+        phy = nfc_mei_phy_alloc(device);
         if (!phy) {
                 pr_err("Cannot allocate memory for microread mei phy.\n");
                 return -ENOMEM;
         }
 
-        phy->device = device;
-        mei_cl_set_drvdata(device, phy);
-
-        r = mei_cl_register_event_cb(device, microread_event_cb, phy);
+        r = mei_cl_register_event_cb(device, nfc_mei_event_cb, phy);
         if (r) {
                 pr_err(MICROREAD_DRIVER_NAME ": event cb registration failed\n");
                 goto err_out;
@@ -178,23 +58,22 @@ static int microread_mei_probe(struct mei_cl_device *device,
         return 0;
 
 err_out:
-        kfree(phy);
+        nfc_mei_phy_free(phy);
 
         return r;
 }
 
 static int microread_mei_remove(struct mei_cl_device *device)
 {
-        struct microread_mei_phy *phy = mei_cl_get_drvdata(device);
+        struct nfc_mei_phy *phy = mei_cl_get_drvdata(device);
 
         pr_info("Removing microread\n");
 
         microread_remove(phy->hdev);
 
-        if (phy->powered)
-                microread_mei_disable(phy);
+        nfc_mei_phy_disable(phy);
 
-        kfree(phy);
+        nfc_mei_phy_free(phy);
 
         return 0;
 }
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index f0f6763d67ae..8f6f2baa930d 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -1,9 +1,6 @@
 /*
  * Copyright (C) 2011 Instituto Nokia de Tecnologia
- *
- * Authors:
- *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
- *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+ * Copyright (C) 2012-2013 Tieto Poland
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +27,7 @@
 #include <linux/netdevice.h>
 #include <net/nfc/nfc.h>
 
-#define VERSION "0.1"
+#define VERSION "0.2"
 
 #define PN533_VENDOR_ID 0x4CC
 #define PN533_PRODUCT_ID 0x2533
@@ -41,8 +38,12 @@
 #define SONY_VENDOR_ID         0x054c
 #define PASORI_PRODUCT_ID      0x02e1
 
-#define PN533_DEVICE_STD    0x1
-#define PN533_DEVICE_PASORI 0x2
+#define ACS_VENDOR_ID 0x072f
+#define ACR122U_PRODUCT_ID 0x2200
+
+#define PN533_DEVICE_STD     0x1
+#define PN533_DEVICE_PASORI  0x2
+#define PN533_DEVICE_ACR122U 0x3
 
 #define PN533_ALL_PROTOCOLS (NFC_PROTO_JEWEL_MASK | NFC_PROTO_MIFARE_MASK |\
                              NFC_PROTO_FELICA_MASK | NFC_PROTO_ISO14443_MASK |\
@@ -71,6 +72,11 @@ static const struct usb_device_id pn533_table[] = {
           .idProduct            = PASORI_PRODUCT_ID,
           .driver_info          = PN533_DEVICE_PASORI,
         },
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE,
+          .idVendor             = ACS_VENDOR_ID,
+          .idProduct            = ACR122U_PRODUCT_ID,
+          .driver_info          = PN533_DEVICE_ACR122U,
+        },
         { }
 };
 MODULE_DEVICE_TABLE(usb, pn533_table);
@@ -78,32 +84,47 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 /* How much time we spend listening for initiators */
 #define PN533_LISTEN_TIME 2
 
-/* frame definitions */
-#define PN533_FRAME_HEADER_LEN (sizeof(struct pn533_frame) \
+/* Standard pn533 frame definitions */
+#define PN533_STD_FRAME_HEADER_LEN (sizeof(struct pn533_std_frame) \
                                         + 2) /* data[0] TFI, data[1] CC */
-#define PN533_FRAME_TAIL_LEN 2 /* data[len] DCS, data[len + 1] postamble*/
+#define PN533_STD_FRAME_TAIL_LEN 2 /* data[len] DCS, data[len + 1] postamble*/
 
 /*
  * Max extended frame payload len, excluding TFI and CC
  * which are already in PN533_FRAME_HEADER_LEN.
  */
-#define PN533_FRAME_MAX_PAYLOAD_LEN 263
+#define PN533_STD_FRAME_MAX_PAYLOAD_LEN 263
 
-#define PN533_FRAME_ACK_SIZE 6 /* Preamble (1), SoPC (2), ACK Code (2),
+#define PN533_STD_FRAME_ACK_SIZE 6 /* Preamble (1), SoPC (2), ACK Code (2),
                                   Postamble (1) */
-#define PN533_FRAME_CHECKSUM(f) (f->data[f->datalen])
-#define PN533_FRAME_POSTAMBLE(f) (f->data[f->datalen + 1])
+#define PN533_STD_FRAME_CHECKSUM(f) (f->data[f->datalen])
+#define PN533_STD_FRAME_POSTAMBLE(f) (f->data[f->datalen + 1])
 
 /* start of frame */
-#define PN533_SOF 0x00FF
+#define PN533_STD_FRAME_SOF 0x00FF
+
+/* standard frame identifier: in/out/error */
+#define PN533_STD_FRAME_IDENTIFIER(f) (f->data[0]) /* TFI */
+#define PN533_STD_FRAME_DIR_OUT 0xD4
+#define PN533_STD_FRAME_DIR_IN 0xD5
+
+/* ACS ACR122 pn533 frame definitions */
+#define PN533_ACR122_TX_FRAME_HEADER_LEN (sizeof(struct pn533_acr122_tx_frame) \
+                                          + 2)
+#define PN533_ACR122_TX_FRAME_TAIL_LEN 0
+#define PN533_ACR122_RX_FRAME_HEADER_LEN (sizeof(struct pn533_acr122_rx_frame) \
+                                          + 2)
+#define PN533_ACR122_RX_FRAME_TAIL_LEN 2
+#define PN533_ACR122_FRAME_MAX_PAYLOAD_LEN PN533_STD_FRAME_MAX_PAYLOAD_LEN
+
+/* CCID messages types */
+#define PN533_ACR122_PC_TO_RDR_ICCPOWERON 0x62
+#define PN533_ACR122_PC_TO_RDR_ESCAPE 0x6B
 
-/* frame identifier: in/out/error */
-#define PN533_FRAME_IDENTIFIER(f) (f->data[0])
-#define PN533_DIR_OUT 0xD4
-#define PN533_DIR_IN 0xD5
+#define PN533_ACR122_RDR_TO_PC_ESCAPE 0x83
 
 /* PN533 Commands */
-#define PN533_FRAME_CMD(f) (f->data[1])
+#define PN533_STD_FRAME_CMD(f) (f->data[1])
 
 #define PN533_CMD_GET_FIRMWARE_VERSION 0x02
 #define PN533_CMD_RF_CONFIGURATION 0x32
@@ -128,8 +149,6 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 
 struct pn533;
 
-typedef int (*pn533_cmd_complete_t) (struct pn533 *dev, void *arg, int status);
-
 typedef int (*pn533_send_async_complete_t) (struct pn533 *dev, void *arg,
                                         struct sk_buff *resp);
 
@@ -144,9 +163,13 @@ struct pn533_fw_version {
 };
 
 /* PN533_CMD_RF_CONFIGURATION */
-#define PN533_CFGITEM_TIMING 0x02
+#define PN533_CFGITEM_RF_FIELD    0x01
+#define PN533_CFGITEM_TIMING      0x02
 #define PN533_CFGITEM_MAX_RETRIES 0x05
-#define PN533_CFGITEM_PASORI 0x82
+#define PN533_CFGITEM_PASORI      0x82
+
+#define PN533_CFGITEM_RF_FIELD_ON  0x1
+#define PN533_CFGITEM_RF_FIELD_OFF 0x0
 
 #define PN533_CONFIG_TIMING_102 0xb
 #define PN533_CONFIG_TIMING_204 0xc
@@ -313,10 +336,17 @@ struct pn533_cmd_jump_dep_response {
 #define PN533_INIT_TARGET_RESP_ACTIVE     0x1
 #define PN533_INIT_TARGET_RESP_DEP        0x4
 
+enum  pn533_protocol_type {
+        PN533_PROTO_REQ_ACK_RESP = 0,
+        PN533_PROTO_REQ_RESP
+};
+
 struct pn533 {
         struct usb_device *udev;
         struct usb_interface *interface;
         struct nfc_dev *nfc_dev;
+        u32 device_type;
+        enum pn533_protocol_type protocol_type;
 
         struct urb *out_urb;
         struct urb *in_urb;
@@ -329,21 +359,21 @@ struct pn533 {
         struct work_struct poll_work;
         struct work_struct mi_work;
         struct work_struct tg_work;
-        struct timer_list listen_timer;
-        int wq_in_error;
-        int cancel_listen;
 
-        pn533_cmd_complete_t cmd_complete;
-        void *cmd_complete_arg;
+        struct list_head cmd_queue;
+        struct pn533_cmd *cmd;
+        u8 cmd_pending;
+        struct mutex cmd_lock;  /* protects cmd queue */
+
         void *cmd_complete_mi_arg;
-        struct mutex cmd_lock;
-        u8 cmd;
 
         struct pn533_poll_modulations *poll_mod_active[PN533_POLL_MOD_MAX + 1];
         u8 poll_mod_count;
         u8 poll_mod_curr;
         u32 poll_protocols;
         u32 listen_protocols;
+        struct timer_list listen_timer;
+        int cancel_listen;
 
         u8 *gb;
         size_t gb_len;
@@ -352,24 +382,21 @@ struct pn533 {
         u8 tgt_active_prot;
         u8 tgt_mode;
 
-        u32 device_type;
-
-        struct list_head cmd_queue;
-        u8 cmd_pending;
-
         struct pn533_frame_ops *ops;
 };
 
 struct pn533_cmd {
         struct list_head queue;
-        u8 cmd_code;
+        u8 code;
+        int status;
         struct sk_buff *req;
         struct sk_buff *resp;
         int resp_len;
-        void *arg;
+        pn533_send_async_complete_t  complete_cb;
+        void *complete_cb_context;
 };
 
-struct pn533_frame {
+struct pn533_std_frame {
         u8 preamble;
         __be16 start_frame;
         u8 datalen;
@@ -393,14 +420,124 @@ struct pn533_frame_ops {
         u8 (*get_cmd_code)(void *frame);
 };
 
+struct pn533_acr122_ccid_hdr {
+        u8 type;
+        u32 datalen;
+        u8 slot;
+        u8 seq;
+        u8 params[3]; /* 3 msg specific bytes or status, error and 1 specific
+                         byte for reposnse msg */
+        u8 data[]; /* payload */
+} __packed;
+
+struct pn533_acr122_apdu_hdr {
+        u8 class;
+        u8 ins;
+        u8 p1;
+        u8 p2;
+} __packed;
+
+struct pn533_acr122_tx_frame {
+        struct pn533_acr122_ccid_hdr ccid;
+        struct pn533_acr122_apdu_hdr apdu;
+        u8 datalen;
+        u8 data[]; /* pn533 frame: TFI ... */
+} __packed;
+
+struct pn533_acr122_rx_frame {
+        struct pn533_acr122_ccid_hdr ccid;
+        u8 data[]; /* pn533 frame : TFI ... */
+} __packed;
+
+static void pn533_acr122_tx_frame_init(void *_frame, u8 cmd_code)
+{
+        struct pn533_acr122_tx_frame *frame = _frame;
+
+        frame->ccid.type = PN533_ACR122_PC_TO_RDR_ESCAPE;
+        frame->ccid.datalen = sizeof(frame->apdu) + 1; /* sizeof(apdu_hdr) +
+                                                          sizeof(datalen) */
+        frame->ccid.slot = 0;
+        frame->ccid.seq = 0;
+        frame->ccid.params[0] = 0;
+        frame->ccid.params[1] = 0;
+        frame->ccid.params[2] = 0;
+
+        frame->data[0] = PN533_STD_FRAME_DIR_OUT;
+        frame->data[1] = cmd_code;
+        frame->datalen = 2;  /* data[0] + data[1] */
+
+        frame->apdu.class = 0xFF;
+        frame->apdu.ins = 0;
+        frame->apdu.p1 = 0;
+        frame->apdu.p2 = 0;
+}
+
+static void pn533_acr122_tx_frame_finish(void *_frame)
+{
+        struct pn533_acr122_tx_frame *frame = _frame;
+
+        frame->ccid.datalen += frame->datalen;
+}
+
+static void pn533_acr122_tx_update_payload_len(void *_frame, int len)
+{
+        struct pn533_acr122_tx_frame *frame = _frame;
+
+        frame->datalen += len;
+}
+
+static bool pn533_acr122_is_rx_frame_valid(void *_frame)
+{
+        struct pn533_acr122_rx_frame *frame = _frame;
+
+        if (frame->ccid.type != 0x83)
+                return false;
+
+        if (frame->data[frame->ccid.datalen - 2] == 0x63)
+                return false;
+
+        return true;
+}
+
+static int pn533_acr122_rx_frame_size(void *frame)
+{
+        struct pn533_acr122_rx_frame *f = frame;
+
+        /* f->ccid.datalen already includes tail length */
+        return sizeof(struct pn533_acr122_rx_frame) + f->ccid.datalen;
+}
+
+static u8 pn533_acr122_get_cmd_code(void *frame)
+{
+        struct pn533_acr122_rx_frame *f = frame;
+
+        return PN533_STD_FRAME_CMD(f);
+}
+
+static struct pn533_frame_ops pn533_acr122_frame_ops = {
+        .tx_frame_init = pn533_acr122_tx_frame_init,
+        .tx_frame_finish = pn533_acr122_tx_frame_finish,
+        .tx_update_payload_len = pn533_acr122_tx_update_payload_len,
+        .tx_header_len = PN533_ACR122_TX_FRAME_HEADER_LEN,
+        .tx_tail_len = PN533_ACR122_TX_FRAME_TAIL_LEN,
+
+        .rx_is_frame_valid = pn533_acr122_is_rx_frame_valid,
+        .rx_header_len = PN533_ACR122_RX_FRAME_HEADER_LEN,
+        .rx_tail_len = PN533_ACR122_RX_FRAME_TAIL_LEN,
+        .rx_frame_size = pn533_acr122_rx_frame_size,
+
+        .max_payload_len = PN533_ACR122_FRAME_MAX_PAYLOAD_LEN,
+        .get_cmd_code = pn533_acr122_get_cmd_code,
+};
+
 /* The rule: value + checksum = 0 */
-static inline u8 pn533_checksum(u8 value)
+static inline u8 pn533_std_checksum(u8 value)
 {
         return ~value + 1;
 }
 
 /* The rule: sum(data elements) + checksum = 0 */
-static u8 pn533_data_checksum(u8 *data, int datalen)
+static u8 pn533_std_data_checksum(u8 *data, int datalen)
 {
         u8 sum = 0;
         int i;
@@ -408,61 +545,61 @@ static u8 pn533_data_checksum(u8 *data, int datalen)
         for (i = 0; i < datalen; i++)
                 sum += data[i];
 
-        return pn533_checksum(sum);
+        return pn533_std_checksum(sum);
 }
 
-static void pn533_tx_frame_init(void *_frame, u8 cmd_code)
+static void pn533_std_tx_frame_init(void *_frame, u8 cmd_code)
 {
-        struct pn533_frame *frame = _frame;
+        struct pn533_std_frame *frame = _frame;
 
         frame->preamble = 0;
-        frame->start_frame = cpu_to_be16(PN533_SOF);
-        PN533_FRAME_IDENTIFIER(frame) = PN533_DIR_OUT;
-        PN533_FRAME_CMD(frame) = cmd_code;
+        frame->start_frame = cpu_to_be16(PN533_STD_FRAME_SOF);
+        PN533_STD_FRAME_IDENTIFIER(frame) = PN533_STD_FRAME_DIR_OUT;
+        PN533_STD_FRAME_CMD(frame) = cmd_code;
         frame->datalen = 2;
 }
 
-static void pn533_tx_frame_finish(void *_frame)
+static void pn533_std_tx_frame_finish(void *_frame)
 {
-        struct pn533_frame *frame = _frame;
+        struct pn533_std_frame *frame = _frame;
 
-        frame->datalen_checksum = pn533_checksum(frame->datalen);
+        frame->datalen_checksum = pn533_std_checksum(frame->datalen);
 
-        PN533_FRAME_CHECKSUM(frame) =
-                pn533_data_checksum(frame->data, frame->datalen);
+        PN533_STD_FRAME_CHECKSUM(frame) =
+                pn533_std_data_checksum(frame->data, frame->datalen);
 
-        PN533_FRAME_POSTAMBLE(frame) = 0;
+        PN533_STD_FRAME_POSTAMBLE(frame) = 0;
 }
 
-static void pn533_tx_update_payload_len(void *_frame, int len)
+static void pn533_std_tx_update_payload_len(void *_frame, int len)
 {
-        struct pn533_frame *frame = _frame;
+        struct pn533_std_frame *frame = _frame;
 
         frame->datalen += len;
 }
 
-static bool pn533_rx_frame_is_valid(void *_frame)
+static bool pn533_std_rx_frame_is_valid(void *_frame)
 {
         u8 checksum;
-        struct pn533_frame *frame = _frame;
+        struct pn533_std_frame *frame = _frame;
 
-        if (frame->start_frame != cpu_to_be16(PN533_SOF))
+        if (frame->start_frame != cpu_to_be16(PN533_STD_FRAME_SOF))
                 return false;
 
-        checksum = pn533_checksum(frame->datalen);
+        checksum = pn533_std_checksum(frame->datalen);
         if (checksum != frame->datalen_checksum)
                 return false;
 
-        checksum = pn533_data_checksum(frame->data, frame->datalen);
-        if (checksum != PN533_FRAME_CHECKSUM(frame))
+        checksum = pn533_std_data_checksum(frame->data, frame->datalen);
+        if (checksum != PN533_STD_FRAME_CHECKSUM(frame))
                 return false;
 
         return true;
 }
 
-static bool pn533_rx_frame_is_ack(struct pn533_frame *frame)
+static bool pn533_std_rx_frame_is_ack(struct pn533_std_frame *frame)
 {
-        if (frame->start_frame != cpu_to_be16(PN533_SOF))
+        if (frame->start_frame != cpu_to_be16(PN533_STD_FRAME_SOF))
                 return false;
 
         if (frame->datalen != 0 || frame->datalen_checksum != 0xFF)
@@ -471,57 +608,51 @@ static bool pn533_rx_frame_is_ack(struct pn533_frame *frame)
         return true;
 }
 
-static inline int pn533_rx_frame_size(void *frame)
+static inline int pn533_std_rx_frame_size(void *frame)
 {
-        struct pn533_frame *f = frame;
+        struct pn533_std_frame *f = frame;
 
-        return sizeof(struct pn533_frame) + f->datalen + PN533_FRAME_TAIL_LEN;
+        return sizeof(struct pn533_std_frame) + f->datalen +
+               PN533_STD_FRAME_TAIL_LEN;
 }
 
-static u8 pn533_get_cmd_code(void *frame)
+static u8 pn533_std_get_cmd_code(void *frame)
 {
-        struct pn533_frame *f = frame;
+        struct pn533_std_frame *f = frame;
 
-        return PN533_FRAME_CMD(f);
+        return PN533_STD_FRAME_CMD(f);
 }
 
 static struct pn533_frame_ops pn533_std_frame_ops = {
-        .tx_frame_init = pn533_tx_frame_init,
-        .tx_frame_finish = pn533_tx_frame_finish,
-        .tx_update_payload_len = pn533_tx_update_payload_len,
-        .tx_header_len = PN533_FRAME_HEADER_LEN,
-        .tx_tail_len = PN533_FRAME_TAIL_LEN,
-
-        .rx_is_frame_valid = pn533_rx_frame_is_valid,
-        .rx_frame_size = pn533_rx_frame_size,
-        .rx_header_len = PN533_FRAME_HEADER_LEN,
-        .rx_tail_len = PN533_FRAME_TAIL_LEN,
-
-        .max_payload_len =  PN533_FRAME_MAX_PAYLOAD_LEN,
-        .get_cmd_code = pn533_get_cmd_code,
+        .tx_frame_init = pn533_std_tx_frame_init,
+        .tx_frame_finish = pn533_std_tx_frame_finish,
+        .tx_update_payload_len = pn533_std_tx_update_payload_len,
+        .tx_header_len = PN533_STD_FRAME_HEADER_LEN,
+        .tx_tail_len = PN533_STD_FRAME_TAIL_LEN,
+
+        .rx_is_frame_valid = pn533_std_rx_frame_is_valid,
+        .rx_frame_size = pn533_std_rx_frame_size,
+        .rx_header_len = PN533_STD_FRAME_HEADER_LEN,
+        .rx_tail_len = PN533_STD_FRAME_TAIL_LEN,
+
+        .max_payload_len =  PN533_STD_FRAME_MAX_PAYLOAD_LEN,
+        .get_cmd_code = pn533_std_get_cmd_code,
 };
 
 static bool pn533_rx_frame_is_cmd_response(struct pn533 *dev, void *frame)
 {
-        return (dev->ops->get_cmd_code(frame) == PN533_CMD_RESPONSE(dev->cmd));
-}
-
-
-static void pn533_wq_cmd_complete(struct work_struct *work)
-{
-        struct pn533 *dev = container_of(work, struct pn533, cmd_complete_work);
-        int rc;
-
-        rc = dev->cmd_complete(dev, dev->cmd_complete_arg, dev->wq_in_error);
-        if (rc != -EINPROGRESS)
-                queue_work(dev->wq, &dev->cmd_work);
+        return (dev->ops->get_cmd_code(frame) ==
+                                PN533_CMD_RESPONSE(dev->cmd->code));
 }
 
 static void pn533_recv_response(struct urb *urb)
 {
         struct pn533 *dev = urb->context;
+        struct pn533_cmd *cmd = dev->cmd;
         u8 *in_frame;
 
+        cmd->status = urb->status;
+
         switch (urb->status) {
         case 0:
                 break; /* success */
@@ -530,37 +661,33 @@ static void pn533_recv_response(struct urb *urb)
                 nfc_dev_dbg(&dev->interface->dev,
                             "The urb has been canceled (status %d)",
                             urb->status);
-                dev->wq_in_error = urb->status;
                 goto sched_wq;
         case -ESHUTDOWN:
         default:
                 nfc_dev_err(&dev->interface->dev,
                             "Urb failure (status %d)", urb->status);
-                dev->wq_in_error = urb->status;
                 goto sched_wq;
         }
 
         in_frame = dev->in_urb->transfer_buffer;
 
         nfc_dev_dbg(&dev->interface->dev, "Received a frame.");
-        print_hex_dump(KERN_DEBUG, "PN533 RX: ", DUMP_PREFIX_NONE, 16, 1,
-                       in_frame, dev->ops->rx_frame_size(in_frame), false);
+        print_hex_dump_debug("PN533 RX: ", DUMP_PREFIX_NONE, 16, 1, in_frame,
+                             dev->ops->rx_frame_size(in_frame), false);
 
         if (!dev->ops->rx_is_frame_valid(in_frame)) {
                 nfc_dev_err(&dev->interface->dev, "Received an invalid frame");
-                dev->wq_in_error = -EIO;
+                cmd->status = -EIO;
                 goto sched_wq;
         }
 
         if (!pn533_rx_frame_is_cmd_response(dev, in_frame)) {
                 nfc_dev_err(&dev->interface->dev,
                             "It it not the response to the last command");
-                dev->wq_in_error = -EIO;
+                cmd->status = -EIO;
                 goto sched_wq;
         }
 
-        dev->wq_in_error = 0;
-
 sched_wq:
         queue_work(dev->wq, &dev->cmd_complete_work);
 }
@@ -575,9 +702,12 @@ static int pn533_submit_urb_for_response(struct pn533 *dev, gfp_t flags)
 static void pn533_recv_ack(struct urb *urb)
 {
         struct pn533 *dev = urb->context;
-        struct pn533_frame *in_frame;
+        struct pn533_cmd *cmd = dev->cmd;
+        struct pn533_std_frame *in_frame;
         int rc;
 
+        cmd->status = urb->status;
+
         switch (urb->status) {
         case 0:
                 break; /* success */
@@ -586,21 +716,19 @@ static void pn533_recv_ack(struct urb *urb)
                 nfc_dev_dbg(&dev->interface->dev,
                             "The urb has been stopped (status %d)",
                             urb->status);
-                dev->wq_in_error = urb->status;
                 goto sched_wq;
         case -ESHUTDOWN:
         default:
                 nfc_dev_err(&dev->interface->dev,
                             "Urb failure (status %d)", urb->status);
-                dev->wq_in_error = urb->status;
                 goto sched_wq;
         }
 
         in_frame = dev->in_urb->transfer_buffer;
 
-        if (!pn533_rx_frame_is_ack(in_frame)) {
+        if (!pn533_std_rx_frame_is_ack(in_frame)) {
                 nfc_dev_err(&dev->interface->dev, "Received an invalid ack");
-                dev->wq_in_error = -EIO;
+                cmd->status = -EIO;
                 goto sched_wq;
         }
 
@@ -608,7 +736,7 @@ static void pn533_recv_ack(struct urb *urb)
         if (rc) {
                 nfc_dev_err(&dev->interface->dev,
                             "usb_submit_urb failed with result %d", rc);
-                dev->wq_in_error = rc;
+                cmd->status = rc;
                 goto sched_wq;
         }
 
@@ -627,7 +755,7 @@ static int pn533_submit_urb_for_ack(struct pn533 *dev, gfp_t flags)
 
 static int pn533_send_ack(struct pn533 *dev, gfp_t flags)
 {
-        u8 ack[PN533_FRAME_ACK_SIZE] = {0x00, 0x00, 0xff, 0x00, 0xff, 0x00};
+        u8 ack[PN533_STD_FRAME_ACK_SIZE] = {0x00, 0x00, 0xff, 0x00, 0xff, 0x00};
         /* spec 7.1.1.3:  Preamble, SoPC (2), ACK Code (2), Postamble */
         int rc;
 
@@ -643,32 +771,34 @@ static int pn533_send_ack(struct pn533 *dev, gfp_t flags)
 static int __pn533_send_frame_async(struct pn533 *dev,
                                         struct sk_buff *out,
                                         struct sk_buff *in,
-                                        int in_len,
-                                        pn533_cmd_complete_t cmd_complete,
-                                        void *arg)
+                                        int in_len)
 {
         int rc;
 
-        dev->cmd = dev->ops->get_cmd_code(out->data);
-        dev->cmd_complete = cmd_complete;
-        dev->cmd_complete_arg = arg;
-
         dev->out_urb->transfer_buffer = out->data;
         dev->out_urb->transfer_buffer_length = out->len;
 
         dev->in_urb->transfer_buffer = in->data;
         dev->in_urb->transfer_buffer_length = in_len;
 
-        print_hex_dump(KERN_DEBUG, "PN533 TX: ", DUMP_PREFIX_NONE, 16, 1,
-                       out->data, out->len, false);
+        print_hex_dump_debug("PN533 TX: ", DUMP_PREFIX_NONE, 16, 1,
+                             out->data, out->len, false);
 
         rc = usb_submit_urb(dev->out_urb, GFP_KERNEL);
         if (rc)
                 return rc;
 
-        rc = pn533_submit_urb_for_ack(dev, GFP_KERNEL);
-        if (rc)
-                goto error;
+        if (dev->protocol_type == PN533_PROTO_REQ_RESP) {
+                /* request for response for sent packet directly */
+                rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC);
+                if (rc)
+                        goto error;
+        } else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) {
+                /* request for ACK if that's the case */
+                rc = pn533_submit_urb_for_ack(dev, GFP_KERNEL);
+                if (rc)
+                        goto error;
+        }
 
         return 0;
 
@@ -693,39 +823,34 @@ static void pn533_build_cmd_frame(struct pn533 *dev, u8 cmd_code,
         ops->tx_frame_finish(skb->data);
 }
 
-struct pn533_send_async_complete_arg {
-        pn533_send_async_complete_t  complete_cb;
-        void *complete_cb_context;
-        struct sk_buff *resp;
-        struct sk_buff *req;
-};
-
-static int pn533_send_async_complete(struct pn533 *dev, void *_arg, int status)
+static int pn533_send_async_complete(struct pn533 *dev)
 {
-        struct pn533_send_async_complete_arg *arg = _arg;
+        struct pn533_cmd *cmd = dev->cmd;
+        int status = cmd->status;
 
-        struct sk_buff *req = arg->req;
-        struct sk_buff *resp = arg->resp;
+        struct sk_buff *req = cmd->req;
+        struct sk_buff *resp = cmd->resp;
 
         int rc;
 
         dev_kfree_skb(req);
 
         if (status < 0) {
-                arg->complete_cb(dev, arg->complete_cb_context,
-                                 ERR_PTR(status));
+                rc = cmd->complete_cb(dev, cmd->complete_cb_context,
+                                      ERR_PTR(status));
                 dev_kfree_skb(resp);
-                kfree(arg);
-                return status;
+                goto done;
         }
 
         skb_put(resp, dev->ops->rx_frame_size(resp->data));
         skb_pull(resp, dev->ops->rx_header_len);
         skb_trim(resp, resp->len - dev->ops->rx_tail_len);
 
-        rc = arg->complete_cb(dev, arg->complete_cb_context, resp);
+        rc = cmd->complete_cb(dev, cmd->complete_cb_context, resp);
 
-        kfree(arg);
+done:
+        kfree(cmd);
+        dev->cmd = NULL;
         return rc;
 }
 
@@ -736,56 +861,45 @@ static int __pn533_send_async(struct pn533 *dev, u8 cmd_code,
                               void *complete_cb_context)
 {
         struct pn533_cmd *cmd;
-        struct pn533_send_async_complete_arg *arg;
         int rc = 0;
 
         nfc_dev_dbg(&dev->interface->dev, "Sending command 0x%x", cmd_code);
 
-        arg = kzalloc(sizeof(*arg), GFP_KERNEL);
-        if (!arg)
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (!cmd)
                 return -ENOMEM;
 
-        arg->complete_cb = complete_cb;
-        arg->complete_cb_context = complete_cb_context;
-        arg->resp = resp;
-        arg->req = req;
+        cmd->code = cmd_code;
+        cmd->req = req;
+        cmd->resp = resp;
+        cmd->resp_len = resp_len;
+        cmd->complete_cb = complete_cb;
+        cmd->complete_cb_context = complete_cb_context;
 
         pn533_build_cmd_frame(dev, cmd_code, req);
 
         mutex_lock(&dev->cmd_lock);
 
         if (!dev->cmd_pending) {
-                rc = __pn533_send_frame_async(dev, req, resp, resp_len,
-                                              pn533_send_async_complete, arg);
+                rc = __pn533_send_frame_async(dev, req, resp, resp_len);
                 if (rc)
                         goto error;
 
                 dev->cmd_pending = 1;
+                dev->cmd = cmd;
                 goto unlock;
         }
 
         nfc_dev_dbg(&dev->interface->dev, "%s Queueing command 0x%x", __func__,
                     cmd_code);
 
-        cmd = kzalloc(sizeof(struct pn533_cmd), GFP_KERNEL);
-        if (!cmd) {
-                rc = -ENOMEM;
-                goto error;
-        }
-
         INIT_LIST_HEAD(&cmd->queue);
-        cmd->cmd_code = cmd_code;
-        cmd->req = req;
-        cmd->resp = resp;
-        cmd->resp_len = resp_len;
-        cmd->arg = arg;
-
         list_add_tail(&cmd->queue, &dev->cmd_queue);
 
         goto unlock;
 
 error:
-        kfree(arg);
+        kfree(cmd);
 unlock:
         mutex_unlock(&dev->cmd_lock);
         return rc;
@@ -850,8 +964,8 @@ static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
                                        pn533_send_async_complete_t complete_cb,
                                        void *complete_cb_context)
 {
-        struct pn533_send_async_complete_arg *arg;
         struct sk_buff *resp;
+        struct pn533_cmd *cmd;
         int rc;
         int resp_len = dev->ops->rx_header_len +
                        dev->ops->max_payload_len +
@@ -861,33 +975,47 @@ static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
         if (!resp)
                 return -ENOMEM;
 
-        arg = kzalloc(sizeof(*arg), GFP_KERNEL);
-        if (!arg) {
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (!cmd) {
                 dev_kfree_skb(resp);
                 return -ENOMEM;
         }
 
-        arg->complete_cb = complete_cb;
-        arg->complete_cb_context = complete_cb_context;
-        arg->resp = resp;
-        arg->req = req;
+        cmd->code = cmd_code;
+        cmd->req = req;
+        cmd->resp = resp;
+        cmd->resp_len = resp_len;
+        cmd->complete_cb = complete_cb;
+        cmd->complete_cb_context = complete_cb_context;
 
         pn533_build_cmd_frame(dev, cmd_code, req);
 
-        rc = __pn533_send_frame_async(dev, req, resp, resp_len,
-                                      pn533_send_async_complete, arg);
+        rc = __pn533_send_frame_async(dev, req, resp, resp_len);
         if (rc < 0) {
                 dev_kfree_skb(resp);
-                kfree(arg);
+                kfree(cmd);
+        } else {
+                dev->cmd = cmd;
         }
 
         return rc;
 }
 
+static void pn533_wq_cmd_complete(struct work_struct *work)
+{
+        struct pn533 *dev = container_of(work, struct pn533, cmd_complete_work);
+        int rc;
+
+        rc = pn533_send_async_complete(dev);
+        if (rc != -EINPROGRESS)
+                queue_work(dev->wq, &dev->cmd_work);
+}
+
 static void pn533_wq_cmd(struct work_struct *work)
 {
         struct pn533 *dev = container_of(work, struct pn533, cmd_work);
         struct pn533_cmd *cmd;
+        int rc;
 
         mutex_lock(&dev->cmd_lock);
 
@@ -903,10 +1031,15 @@ static void pn533_wq_cmd(struct work_struct *work)
 
         mutex_unlock(&dev->cmd_lock);
 
-        __pn533_send_frame_async(dev, cmd->req, cmd->resp, cmd->resp_len,
-                                 pn533_send_async_complete, cmd->arg);
+        rc = __pn533_send_frame_async(dev, cmd->req, cmd->resp, cmd->resp_len);
+        if (rc < 0) {
+                dev_kfree_skb(cmd->req);
+                dev_kfree_skb(cmd->resp);
+                kfree(cmd);
+                return;
+        }
 
-        kfree(cmd);
+        dev->cmd = cmd;
 }
 
 struct pn533_sync_cmd_response {
@@ -982,6 +1115,23 @@ static void pn533_send_complete(struct urb *urb)
         }
 }
 
+static void pn533_abort_cmd(struct pn533 *dev, gfp_t flags)
+{
+        /* ACR122U does not support any command which aborts last
+         * issued command i.e. as ACK for standard PN533. Additionally,
+         * it behaves stange, sending broken or incorrect responses,
+         * when we cancel urb before the chip will send response.
+         */
+        if (dev->device_type == PN533_DEVICE_ACR122U)
+                return;
+
+        /* An ack will cancel the last issued command */
+        pn533_send_ack(dev, flags);
+
+        /* cancel the urb request */
+        usb_kill_urb(dev->in_urb);
+}
+
 static struct sk_buff *pn533_alloc_skb(struct pn533 *dev, unsigned int size)
 {
         struct sk_buff *skb;
@@ -1500,9 +1650,6 @@ static void pn533_listen_mode_timer(unsigned long data)
 
         nfc_dev_dbg(&dev->interface->dev, "Listen mode timeout");
 
-        /* An ack will cancel the last issued command (poll) */
-        pn533_send_ack(dev, GFP_ATOMIC);
-
         dev->cancel_listen = 1;
 
         pn533_poll_next_mod(dev);
@@ -1549,6 +1696,11 @@ static int pn533_poll_complete(struct pn533 *dev, void *arg,
         if (!rc)
                 goto done;
 
+        if (!dev->poll_mod_count) {
+                nfc_dev_dbg(&dev->interface->dev, "Polling has been stoped.");
+                goto done;
+        }
+
         pn533_poll_next_mod(dev);
         queue_work(dev->wq, &dev->poll_work);
 
@@ -1627,7 +1779,7 @@ static void pn533_wq_poll(struct work_struct *work)
 
         if (dev->cancel_listen == 1) {
                 dev->cancel_listen = 0;
-                usb_kill_urb(dev->in_urb);
+                pn533_abort_cmd(dev, GFP_ATOMIC);
         }
 
         rc = pn533_send_poll_frame(dev);
@@ -1689,12 +1841,7 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev)
                 return;
         }
 
-        /* An ack will cancel the last issued command (poll) */
-        pn533_send_ack(dev, GFP_KERNEL);
-
-        /* prevent pn533_start_poll_complete to issue a new poll meanwhile */
-        usb_kill_urb(dev->in_urb);
-
+        pn533_abort_cmd(dev, GFP_KERNEL);
         pn533_poll_reset_mod_list(dev);
 }
 
@@ -1723,6 +1870,8 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)
         rsp = (struct pn533_cmd_activate_response *)resp->data;
         rc = rsp->status & PN533_CMD_RET_MASK;
         if (rc != PN533_CMD_RET_SUCCESS) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Target activation failed (error 0x%x)", rc);
                 dev_kfree_skb(resp);
                 return -EIO;
         }
@@ -1850,7 +1999,7 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
         rc = rsp->status & PN533_CMD_RET_MASK;
         if (rc != PN533_CMD_RET_SUCCESS) {
                 nfc_dev_err(&dev->interface->dev,
-                            "Bringing DEP link up failed %d", rc);
+                            "Bringing DEP link up failed (error 0x%x)", rc);
                 goto error;
         }
 
@@ -1985,10 +2134,8 @@ static int pn533_dep_link_down(struct nfc_dev *nfc_dev)
 
         pn533_poll_reset_mod_list(dev);
 
-        if (dev->tgt_mode || dev->tgt_active_prot) {
-                pn533_send_ack(dev, GFP_KERNEL);
-                usb_kill_urb(dev->in_urb);
-        }
+        if (dev->tgt_mode || dev->tgt_active_prot)
+                pn533_abort_cmd(dev, GFP_KERNEL);
 
         dev->tgt_active_prot = 0;
         dev->tgt_mode = 0;
@@ -2064,8 +2211,7 @@ static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
 
         if (ret != PN533_CMD_RET_SUCCESS) {
                 nfc_dev_err(&dev->interface->dev,
-                            "PN533 reported error %d when exchanging data",
-                            ret);
+                            "Exchanging data failed (error 0x%x)", ret);
                 rc = -EIO;
                 goto error;
         }
@@ -2253,7 +2399,7 @@ static void pn533_wq_mi_recv(struct work_struct *work)
                     "Error %d when trying to perform data_exchange", rc);
 
         dev_kfree_skb(skb);
-        kfree(dev->cmd_complete_arg);
+        kfree(dev->cmd_complete_mi_arg);
 
 error:
         pn533_send_ack(dev, GFP_KERNEL);
@@ -2310,7 +2456,7 @@ static int pn533_get_firmware_version(struct pn533 *dev,
         return 0;
 }
 
-static int pn533_fw_reset(struct pn533 *dev)
+static int pn533_pasori_fw_reset(struct pn533 *dev)
 {
         struct sk_buff *skb;
         struct sk_buff *resp;
@@ -2332,9 +2478,102 @@ static int pn533_fw_reset(struct pn533 *dev)
         return 0;
 }
 
+struct pn533_acr122_poweron_rdr_arg {
+        int rc;
+        struct completion done;
+};
+
+static void pn533_acr122_poweron_rdr_resp(struct urb *urb)
+{
+        struct pn533_acr122_poweron_rdr_arg *arg = urb->context;
+
+        nfc_dev_dbg(&urb->dev->dev, "%s", __func__);
+
+        print_hex_dump(KERN_ERR, "ACR122 RX: ", DUMP_PREFIX_NONE, 16, 1,
+                       urb->transfer_buffer, urb->transfer_buffer_length,
+                       false);
+
+        arg->rc = urb->status;
+        complete(&arg->done);
+}
+
+static int pn533_acr122_poweron_rdr(struct pn533 *dev)
+{
+        /* Power on th reader (CCID cmd) */
+        u8 cmd[10] = {PN533_ACR122_PC_TO_RDR_ICCPOWERON,
+                      0, 0, 0, 0, 0, 0, 3, 0, 0};
+        u8 buf[255];
+        int rc;
+        void *cntx;
+        struct pn533_acr122_poweron_rdr_arg arg;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        init_completion(&arg.done);
+        cntx = dev->in_urb->context;  /* backup context */
+
+        dev->in_urb->transfer_buffer = buf;
+        dev->in_urb->transfer_buffer_length = 255;
+        dev->in_urb->complete = pn533_acr122_poweron_rdr_resp;
+        dev->in_urb->context = &arg;
+
+        dev->out_urb->transfer_buffer = cmd;
+        dev->out_urb->transfer_buffer_length = sizeof(cmd);
+
+        print_hex_dump(KERN_ERR, "ACR122 TX: ", DUMP_PREFIX_NONE, 16, 1,
+                       cmd, sizeof(cmd), false);
+
+        rc = usb_submit_urb(dev->out_urb, GFP_KERNEL);
+        if (rc) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Reader power on cmd error %d", rc);
+                return rc;
+        }
+
+        rc =  usb_submit_urb(dev->in_urb, GFP_KERNEL);
+        if (rc) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Can't submit for reader power on cmd response %d",
+                            rc);
+                return rc;
+        }
+
+        wait_for_completion(&arg.done);
+        dev->in_urb->context = cntx; /* restore context */
+
+        return arg.rc;
+}
+
+static int pn533_rf_field(struct nfc_dev *nfc_dev, u8 rf)
+{
+        struct pn533 *dev = nfc_get_drvdata(nfc_dev);
+        u8 rf_field = !!rf;
+        int rc;
+
+        rc = pn533_set_configuration(dev, PN533_CFGITEM_RF_FIELD,
+                                     (u8 *)&rf_field, 1);
+        if (rc) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error on setting RF field");
+                return rc;
+        }
+
+        return rc;
+}
+
+int pn533_dev_up(struct nfc_dev *nfc_dev)
+{
+        return pn533_rf_field(nfc_dev, 1);
+}
+
+int pn533_dev_down(struct nfc_dev *nfc_dev)
+{
+        return pn533_rf_field(nfc_dev, 0);
+}
+
 static struct nfc_ops pn533_nfc_ops = {
-        .dev_up = NULL,
-        .dev_down = NULL,
+        .dev_up = pn533_dev_up,
+        .dev_down = pn533_dev_down,
         .dep_link_up = pn533_dep_link_up,
         .dep_link_down = pn533_dep_link_down,
         .start_poll = pn533_start_poll,
@@ -2366,6 +2605,7 @@ static int pn533_setup(struct pn533 *dev)
                 break;
 
         case PN533_DEVICE_PASORI:
+        case PN533_DEVICE_ACR122U:
                 max_retries.mx_rty_atr = 0x2;
                 max_retries.mx_rty_psl = 0x1;
                 max_retries.mx_rty_passive_act =
@@ -2405,7 +2645,7 @@ static int pn533_setup(struct pn533 *dev)
                 break;
 
         case PN533_DEVICE_PASORI:
-                pn533_fw_reset(dev);
+                pn533_pasori_fw_reset(dev);
 
                 rc = pn533_set_configuration(dev, PN533_CFGITEM_PASORI,
                                              pasori_cfg, 3);
@@ -2415,7 +2655,7 @@ static int pn533_setup(struct pn533 *dev)
                         return rc;
                 }
 
-                pn533_fw_reset(dev);
+                pn533_pasori_fw_reset(dev);
 
                 break;
         }
@@ -2496,6 +2736,7 @@ static int pn533_probe(struct usb_interface *interface,
 
         dev->ops = &pn533_std_frame_ops;
 
+        dev->protocol_type = PN533_PROTO_REQ_ACK_RESP;
         dev->device_type = id->driver_info;
         switch (dev->device_type) {
         case PN533_DEVICE_STD:
@@ -2506,6 +2747,20 @@ static int pn533_probe(struct usb_interface *interface,
                 protocols = PN533_NO_TYPE_B_PROTOCOLS;
                 break;
 
+        case PN533_DEVICE_ACR122U:
+                protocols = PN533_NO_TYPE_B_PROTOCOLS;
+                dev->ops = &pn533_acr122_frame_ops;
+                dev->protocol_type = PN533_PROTO_REQ_RESP,
+
+                rc = pn533_acr122_poweron_rdr(dev);
+                if (rc < 0) {
+                        nfc_dev_err(&dev->interface->dev,
+                                    "Couldn't poweron the reader (error %d)",
+                                    rc);
+                        goto destroy_wq;
+                }
+                break;
+
         default:
                 nfc_dev_err(&dev->interface->dev, "Unknown device type %d\n",
                             dev->device_type);
@@ -2555,6 +2810,7 @@ destroy_wq:
 error:
         usb_free_urb(dev->in_urb);
         usb_free_urb(dev->out_urb);
+        usb_put_dev(dev->udev);
         kfree(dev);
         return rc;
 }
@@ -2600,8 +2856,9 @@ static struct usb_driver pn533_driver = {
 
 module_usb_driver(pn533_driver);
 
-MODULE_AUTHOR("Lauro Ramos Venancio <lauro.venancio@openbossa.org>,"
-                        " Aloisio Almeida Jr <aloisio.almeida@openbossa.org>");
+MODULE_AUTHOR("Lauro Ramos Venancio <lauro.venancio@openbossa.org>");
+MODULE_AUTHOR("Aloisio Almeida Jr <aloisio.almeida@openbossa.org>");
+MODULE_AUTHOR("Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>");
 MODULE_DESCRIPTION("PN533 usb driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
diff --git a/drivers/nfc/pn544/Kconfig b/drivers/nfc/pn544/Kconfig
index c277790ac71c..ccf06f5f6ebb 100644
--- a/drivers/nfc/pn544/Kconfig
+++ b/drivers/nfc/pn544/Kconfig
@@ -20,4 +20,15 @@ config NFC_PN544_I2C
           Select this if your platform is using the i2c bus.
 
           If you choose to build a module, it'll be called pn544_i2c.
-          Say N if unsure.
\ No newline at end of file
+          Say N if unsure.
+
+config NFC_PN544_MEI
+        tristate "NFC PN544 MEI support"
+        depends on NFC_PN544 && NFC_MEI_PHY
+        ---help---
+          This module adds support for the mei interface of adapters using
+          NXP pn544 chipsets.  Select this if your pn544 chipset
+          is handled by Intel's Management Engine Interface on your platform.
+
+          If you choose to build a module, it'll be called pn544_mei.
+          Say N if unsure.
diff --git a/drivers/nfc/pn544/Makefile b/drivers/nfc/pn544/Makefile
index ac076793687d..29fb5a174036 100644
--- a/drivers/nfc/pn544/Makefile
+++ b/drivers/nfc/pn544/Makefile
@@ -3,6 +3,8 @@
 #
 
 pn544_i2c-objs  = i2c.o
+pn544_mei-objs  = mei.o
 
 obj-$(CONFIG_NFC_PN544)     += pn544.o
 obj-$(CONFIG_NFC_PN544_I2C) += pn544_i2c.o
+obj-$(CONFIG_NFC_PN544_MEI) += pn544_mei.o
diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c
new file mode 100644
index 000000000000..1eb48848a35a
--- /dev/null
+++ b/drivers/nfc/pn544/mei.c
@@ -0,0 +1,121 @@
+/*
+ * HCI based Driver for NXP pn544 NFC Chip
+ *
+ * Copyright (C) 2013  Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/nfc.h>
+#include <net/nfc/hci.h>
+#include <net/nfc/llc.h>
+
+#include "../mei_phy.h"
+#include "pn544.h"
+
+#define PN544_DRIVER_NAME "pn544"
+
+static int pn544_mei_probe(struct mei_cl_device *device,
+                               const struct mei_cl_device_id *id)
+{
+        struct nfc_mei_phy *phy;
+        int r;
+
+        pr_info("Probing NFC pn544\n");
+
+        phy = nfc_mei_phy_alloc(device);
+        if (!phy) {
+                pr_err("Cannot allocate memory for pn544 mei phy.\n");
+                return -ENOMEM;
+        }
+
+        r = mei_cl_register_event_cb(device, nfc_mei_event_cb, phy);
+        if (r) {
+                pr_err(PN544_DRIVER_NAME ": event cb registration failed\n");
+                goto err_out;
+        }
+
+        r = pn544_hci_probe(phy, &mei_phy_ops, LLC_NOP_NAME,
+                            MEI_NFC_HEADER_SIZE, 0, MEI_NFC_MAX_HCI_PAYLOAD,
+                            &phy->hdev);
+        if (r < 0)
+                goto err_out;
+
+        return 0;
+
+err_out:
+        nfc_mei_phy_free(phy);
+
+        return r;
+}
+
+static int pn544_mei_remove(struct mei_cl_device *device)
+{
+        struct nfc_mei_phy *phy = mei_cl_get_drvdata(device);
+
+        pr_info("Removing pn544\n");
+
+        pn544_hci_remove(phy->hdev);
+
+        nfc_mei_phy_disable(phy);
+
+        nfc_mei_phy_free(phy);
+
+        return 0;
+}
+
+static struct mei_cl_device_id pn544_mei_tbl[] = {
+        { PN544_DRIVER_NAME },
+
+        /* required last entry */
+        { }
+};
+MODULE_DEVICE_TABLE(mei, pn544_mei_tbl);
+
+static struct mei_cl_driver pn544_driver = {
+        .id_table = pn544_mei_tbl,
+        .name = PN544_DRIVER_NAME,
+
+        .probe = pn544_mei_probe,
+        .remove = pn544_mei_remove,
+};
+
+static int pn544_mei_init(void)
+{
+        int r;
+
+        pr_debug(DRIVER_DESC ": %s\n", __func__);
+
+        r = mei_cl_driver_register(&pn544_driver);
+        if (r) {
+                pr_err(PN544_DRIVER_NAME ": driver registration failed\n");
+                return r;
+        }
+
+        return 0;
+}
+
+static void pn544_mei_exit(void)
+{
+        mei_cl_driver_unregister(&pn544_driver);
+}
+
+module_init(pn544_mei_init);
+module_exit(pn544_mei_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index e3a8b22ef9dd..23049aeca662 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -34,7 +34,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 {
         struct phy_device *phy;
         struct device_node *child;
-        int rc, i;
+        const __be32 *paddr;
+        u32 addr;
+        bool is_c45, scanphys = false;
+        int rc, i, len;
 
         /* Mask out all PHYs from auto probing.  Instead the PHYs listed in
          * the device tree are populated after the bus has been registered */
@@ -54,14 +57,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 
         /* Loop over the child nodes and register a phy_device for each one */
         for_each_available_child_of_node(np, child) {
-                const __be32 *paddr;
-                u32 addr;
-                int len;
-                bool is_c45;
-
                 /* A PHY must have a reg property in the range [0-31] */
                 paddr = of_get_property(child, "reg", &len);
                 if (!paddr || len < sizeof(*paddr)) {
+                        scanphys = true;
                         dev_err(&mdio->dev, "%s has invalid PHY address\n",
                                 child->full_name);
                         continue;
@@ -111,6 +110,59 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                         child->name, addr);
         }
 
+        if (!scanphys)
+                return 0;
+
+        /* auto scan for PHYs with empty reg property */
+        for_each_available_child_of_node(np, child) {
+                /* Skip PHYs with reg property set */
+                paddr = of_get_property(child, "reg", &len);
+                if (paddr)
+                        continue;
+
+                is_c45 = of_device_is_compatible(child,
+                                                 "ethernet-phy-ieee802.3-c45");
+
+                for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
+                        /* skip already registered PHYs */
+                        if (mdio->phy_map[addr])
+                                continue;
+
+                        /* be noisy to encourage people to set reg property */
+                        dev_info(&mdio->dev, "scan phy %s at address %i\n",
+                                 child->name, addr);
+
+                        phy = get_phy_device(mdio, addr, is_c45);
+                        if (!phy || IS_ERR(phy))
+                                continue;
+
+                        if (mdio->irq) {
+                                mdio->irq[addr] =
+                                        irq_of_parse_and_map(child, 0);
+                                if (!mdio->irq[addr])
+                                        mdio->irq[addr] = PHY_POLL;
+                        }
+
+                        /* Associate the OF node with the device structure so it
+                         * can be looked up later */
+                        of_node_get(child);
+                        phy->dev.of_node = child;
+
+                        /* All data is now stored in the phy struct;
+                         * register it */
+                        rc = phy_device_register(phy);
+                        if (rc) {
+                                phy_device_free(phy);
+                                of_node_put(child);
+                                continue;
+                        }
+
+                        dev_info(&mdio->dev, "registered phy %s at address %i\n",
+                                 child->name, addr);
+                        break;
+                }
+        }
+
         return 0;
 }
 EXPORT_SYMBOL(of_mdiobus_register);
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index ee599f274f05..c93071d428f5 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -729,6 +729,47 @@ int pci_num_vf(struct pci_dev *dev)
 EXPORT_SYMBOL_GPL(pci_num_vf);
 
 /**
+ * pci_vfs_assigned - returns number of VFs are assigned to a guest
+ * @dev: the PCI device
+ *
+ * Returns number of VFs belonging to this device that are assigned to a guest.
+ * If device is not a physical function returns -ENODEV.
+ */
+int pci_vfs_assigned(struct pci_dev *dev)
+{
+        struct pci_dev *vfdev;
+        unsigned int vfs_assigned = 0;
+        unsigned short dev_id;
+
+        /* only search if we are a PF */
+        if (!dev->is_physfn)
+                return 0;
+
+        /*
+         * determine the device ID for the VFs, the vendor ID will be the
+         * same as the PF so there is no need to check for that one
+         */
+        pci_read_config_word(dev, dev->sriov->pos + PCI_SRIOV_VF_DID, &dev_id);
+
+        /* loop through all the VFs to see if we own any that are assigned */
+        vfdev = pci_get_device(dev->vendor, dev_id, NULL);
+        while (vfdev) {
+                /*
+                 * It is considered assigned if it is a virtual function with
+                 * our dev as the physical function and the assigned bit is set
+                 */
+                if (vfdev->is_virtfn && (vfdev->physfn == dev) &&
+                    (vfdev->dev_flags & PCI_DEV_FLAGS_ASSIGNED))
+                        vfs_assigned++;
+
+                vfdev = pci_get_device(dev->vendor, dev_id, vfdev);
+        }
+
+        return vfs_assigned;
+}
+EXPORT_SYMBOL_GPL(pci_vfs_assigned);
+
+/**
  * pci_sriov_set_totalvfs -- reduce the TotalVFs available
  * @dev: the PCI PF device
  * @numvfs: number that should be used for TotalVFs supported
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 79f4bce061bd..4a8c388364ca 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <linux/bitops.h>
+#include <linux/idr.h>
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -32,7 +32,6 @@
 #include "ptp_private.h"
 
 #define PTP_MAX_ALARMS 4
-#define PTP_MAX_CLOCKS 8
 #define PTP_PPS_DEFAULTS (PPS_CAPTUREASSERT | PPS_OFFSETASSERT)
 #define PTP_PPS_EVENT PPS_CAPTUREASSERT
 #define PTP_PPS_MODE (PTP_PPS_DEFAULTS | PPS_CANWAIT | PPS_TSFMT_TSPEC)
@@ -42,8 +41,7 @@
 static dev_t ptp_devt;
 static struct class *ptp_class;
 
-static DECLARE_BITMAP(ptp_clocks_map, PTP_MAX_CLOCKS);
-static DEFINE_MUTEX(ptp_clocks_mutex); /* protects 'ptp_clocks_map' */
+static DEFINE_IDA(ptp_clocks_map);
 
 /* time stamp event queue operations */
 
@@ -171,12 +169,7 @@ static void delete_ptp_clock(struct posix_clock *pc)
         struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
 
         mutex_destroy(&ptp->tsevq_mux);
-
-        /* Remove the clock from the bit map. */
-        mutex_lock(&ptp_clocks_mutex);
-        clear_bit(ptp->index, ptp_clocks_map);
-        mutex_unlock(&ptp_clocks_mutex);
-
+        ida_simple_remove(&ptp_clocks_map, ptp->index);
         kfree(ptp);
 }
 
@@ -191,21 +184,18 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
         if (info->n_alarm > PTP_MAX_ALARMS)
                 return ERR_PTR(-EINVAL);
 
-        /* Find a free clock slot and reserve it. */
-        err = -EBUSY;
-        mutex_lock(&ptp_clocks_mutex);
-        index = find_first_zero_bit(ptp_clocks_map, PTP_MAX_CLOCKS);
-        if (index < PTP_MAX_CLOCKS)
-                set_bit(index, ptp_clocks_map);
-        else
-                goto no_slot;
-
         /* Initialize a clock structure. */
         err = -ENOMEM;
         ptp = kzalloc(sizeof(struct ptp_clock), GFP_KERNEL);
         if (ptp == NULL)
                 goto no_memory;
 
+        index = ida_simple_get(&ptp_clocks_map, 0, MINORMASK + 1, GFP_KERNEL);
+        if (index < 0) {
+                err = index;
+                goto no_slot;
+        }
+
         ptp->clock.ops = ptp_clock_ops;
         ptp->clock.release = delete_ptp_clock;
         ptp->info = info;
@@ -248,7 +238,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
                 goto no_clock;
         }
 
-        mutex_unlock(&ptp_clocks_mutex);
         return ptp;
 
 no_clock:
@@ -260,11 +249,9 @@ no_sysfs:
         device_destroy(ptp_class, ptp->devid);
 no_device:
         mutex_destroy(&ptp->tsevq_mux);
+no_slot:
         kfree(ptp);
 no_memory:
-        clear_bit(index, ptp_clocks_map);
-no_slot:
-        mutex_unlock(&ptp_clocks_mutex);
         return ERR_PTR(err);
 }
 EXPORT_SYMBOL(ptp_clock_register);
@@ -323,7 +310,8 @@ EXPORT_SYMBOL(ptp_clock_index);
 static void __exit ptp_exit(void)
 {
         class_destroy(ptp_class);
-        unregister_chrdev_region(ptp_devt, PTP_MAX_CLOCKS);
+        unregister_chrdev_region(ptp_devt, MINORMASK + 1);
+        ida_destroy(&ptp_clocks_map);
 }
 
 static int __init ptp_init(void)
@@ -336,7 +324,7 @@ static int __init ptp_init(void)
                 return PTR_ERR(ptp_class);
         }
 
-        err = alloc_chrdev_region(&ptp_devt, 0, PTP_MAX_CLOCKS, "ptp");
+        err = alloc_chrdev_region(&ptp_devt, 0, MINORMASK + 1, "ptp");
         if (err < 0) {
                 pr_err("ptp: failed to allocate device region\n");
                 goto no_region;
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 1367655eee39..bea94510ad2d 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -118,7 +118,7 @@ struct pch_ts_regs {
  * struct pch_dev - Driver private data
  */
 struct pch_dev {
-        struct pch_ts_regs *regs;
+        struct pch_ts_regs __iomem *regs;
         struct ptp_clock *ptp_clock;
         struct ptp_clock_info caps;
         int exts0_enabled;
@@ -154,7 +154,7 @@ static inline void pch_eth_enable_set(struct pch_dev *chip)
         iowrite32(val, (&chip->regs->ts_sel));
 }
 
-static u64 pch_systime_read(struct pch_ts_regs *regs)
+static u64 pch_systime_read(struct pch_ts_regs __iomem *regs)
 {
         u64 ns;
         u32 lo, hi;
@@ -169,7 +169,7 @@ static u64 pch_systime_read(struct pch_ts_regs *regs)
         return ns;
 }
 
-static void pch_systime_write(struct pch_ts_regs *regs, u64 ns)
+static void pch_systime_write(struct pch_ts_regs __iomem *regs, u64 ns)
 {
         u32 hi, lo;
 
@@ -315,7 +315,7 @@ int pch_set_station_address(u8 *addr, struct pci_dev *pdev)
         struct pch_dev *chip = pci_get_drvdata(pdev);
 
         /* Verify the parameter */
-        if ((chip->regs == 0) || addr == (u8 *)NULL) {
+        if ((chip->regs == NULL) || addr == (u8 *)NULL) {
                 dev_err(&pdev->dev,
                         "invalid params returning PCH_INVALIDPARAM\n");
                 return PCH_INVALIDPARAM;
@@ -361,7 +361,7 @@ EXPORT_SYMBOL(pch_set_station_address);
 static irqreturn_t isr(int irq, void *priv)
 {
         struct pch_dev *pch_dev = priv;
-        struct pch_ts_regs *regs = pch_dev->regs;
+        struct pch_ts_regs __iomem *regs = pch_dev->regs;
         struct ptp_clock_event event;
         u32 ack = 0, lo, hi, val;
 
@@ -415,7 +415,7 @@ static int ptp_pch_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
         u32 diff, addend;
         int neg_adj = 0;
         struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps);
-        struct pch_ts_regs *regs = pch_dev->regs;
+        struct pch_ts_regs __iomem *regs = pch_dev->regs;
 
         if (ppb < 0) {
                 neg_adj = 1;
@@ -438,7 +438,7 @@ static int ptp_pch_adjtime(struct ptp_clock_info *ptp, s64 delta)
         s64 now;
         unsigned long flags;
         struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps);
-        struct pch_ts_regs *regs = pch_dev->regs;
+        struct pch_ts_regs __iomem *regs = pch_dev->regs;
 
         spin_lock_irqsave(&pch_dev->register_lock, flags);
         now = pch_systime_read(regs);
@@ -455,7 +455,7 @@ static int ptp_pch_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
         u32 remainder;
         unsigned long flags;
         struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps);
-        struct pch_ts_regs *regs = pch_dev->regs;
+        struct pch_ts_regs __iomem *regs = pch_dev->regs;
 
         spin_lock_irqsave(&pch_dev->register_lock, flags);
         ns = pch_systime_read(regs);
@@ -472,7 +472,7 @@ static int ptp_pch_settime(struct ptp_clock_info *ptp,
         u64 ns;
         unsigned long flags;
         struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps);
-        struct pch_ts_regs *regs = pch_dev->regs;
+        struct pch_ts_regs __iomem *regs = pch_dev->regs;
 
         ns = ts->tv_sec * 1000000000ULL;
         ns += ts->tv_nsec;
@@ -567,9 +567,9 @@ static void pch_remove(struct pci_dev *pdev)
                 free_irq(pdev->irq, chip);
 
         /* unmap the virtual IO memory space */
-        if (chip->regs != 0) {
+        if (chip->regs != NULL) {
                 iounmap(chip->regs);
-                chip->regs = 0;
+                chip->regs = NULL;
         }
         /* release the reserved IO memory space */
         if (chip->mem_base != 0) {
@@ -670,7 +670,7 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 err_req_irq:
         ptp_clock_unregister(chip->ptp_clock);
         iounmap(chip->regs);
-        chip->regs = 0;
+        chip->regs = NULL;
 
 err_ioremap:
         release_mem_region(chip->mem_base, chip->mem_size);
@@ -723,9 +723,10 @@ static s32 __init ptp_pch_init(void)
 module_init(ptp_pch_init);
 module_exit(ptp_pch_exit);
 
-module_param_string(station, pch_param.station, sizeof pch_param.station, 0444);
+module_param_string(station,
+                    pch_param.station, sizeof(pch_param.station), 0444);
 MODULE_PARM_DESC(station,
-         "IEEE 1588 station address to use - column separated hex values");
+         "IEEE 1588 station address to use - colon separated hex values");
 
 MODULE_AUTHOR("LAPIS SEMICONDUCTOR, <tshimizu818@gmail.com>");
 MODULE_DESCRIPTION("PTP clock using the EG20T timer");
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 2029b6caa595..fb877b59ec57 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -166,7 +166,7 @@ static void virtio_ccw_kvm_notify(struct virtqueue *vq)
 
         vcdev = to_vc_device(info->vq->vdev);
         ccw_device_get_schid(vcdev->cdev, &schid);
-        do_kvm_notify(schid, virtqueue_get_queue_index(vq));
+        do_kvm_notify(schid, vq->index);
 }
 
 static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev,
@@ -188,7 +188,7 @@ static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw)
         unsigned long flags;
         unsigned long size;
         int ret;
-        unsigned int index = virtqueue_get_queue_index(vq);
+        unsigned int index = vq->index;
 
         /* Remove from our list. */
         spin_lock_irqsave(&vcdev->lock, flags);
@@ -610,7 +610,7 @@ static struct virtqueue *virtio_ccw_vq_by_ind(struct virtio_ccw_device *vcdev,
         vq = NULL;
         spin_lock_irqsave(&vcdev->lock, flags);
         list_for_each_entry(info, &vcdev->virtqueues, node) {
-                if (virtqueue_get_queue_index(info->vq) == index) {
+                if (info->vq->index == index) {
                         vq = info->vq;
                         break;
                 }
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 6ccb7457746b..c4f392d5db4c 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -918,7 +918,7 @@ int qeth_send_control_data(struct qeth_card *, int, struct qeth_cmd_buffer *,
         int (*reply_cb)(struct qeth_card *, struct qeth_reply*, unsigned long),
         void *reply_param);
 int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int);
-int qeth_get_elements_no(struct qeth_card *, void *, struct sk_buff *, int);
+int qeth_get_elements_no(struct qeth_card *, struct sk_buff *, int);
 int qeth_get_elements_for_frags(struct sk_buff *);
 int qeth_do_send_packet_fast(struct qeth_card *, struct qeth_qdio_out_q *,
                         struct sk_buff *, struct qeth_hdr *, int, int, int);
@@ -932,7 +932,7 @@ void qeth_core_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
 void qeth_dbf_longtext(debug_info_t *id, int level, char *text, ...);
 int qeth_core_ethtool_get_settings(struct net_device *, struct ethtool_cmd *);
 int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback);
-int qeth_hdr_chk_and_bounce(struct sk_buff *, int);
+int qeth_hdr_chk_and_bounce(struct sk_buff *, struct qeth_hdr **, int);
 int qeth_configure_cq(struct qeth_card *, enum qeth_cq);
 int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);
 int qeth_query_ipassists(struct qeth_card *, enum qeth_prot_versions prot);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 451f92020599..6cd0fc1b203a 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -335,7 +335,7 @@ static inline int qeth_alloc_cq(struct qeth_card *card)
 
                 card->qdio.no_in_queues = 2;
 
-                card->qdio.out_bufstates = (struct qdio_outbuf_state *)
+                card->qdio.out_bufstates =
                         kzalloc(card->qdio.no_out_queues *
                                 QDIO_MAX_BUFFERS_PER_Q *
                                 sizeof(struct qdio_outbuf_state), GFP_KERNEL);
@@ -3717,7 +3717,7 @@ int qeth_get_elements_for_frags(struct sk_buff *skb)
 }
 EXPORT_SYMBOL_GPL(qeth_get_elements_for_frags);
 
-int qeth_get_elements_no(struct qeth_card *card, void *hdr,
+int qeth_get_elements_no(struct qeth_card *card,
                      struct sk_buff *skb, int elems)
 {
         int dlen = skb->len - skb->data_len;
@@ -3736,7 +3736,7 @@ int qeth_get_elements_no(struct qeth_card *card, void *hdr,
 }
 EXPORT_SYMBOL_GPL(qeth_get_elements_no);
 
-int qeth_hdr_chk_and_bounce(struct sk_buff *skb, int len)
+int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len)
 {
         int hroom, inpage, rest;
 
@@ -3749,6 +3749,8 @@ int qeth_hdr_chk_and_bounce(struct sk_buff *skb, int len)
                         return 1;
                 memmove(skb->data - rest, skb->data, skb->len - skb->data_len);
                 skb->data -= rest;
+                skb->tail -= rest;
+                *hdr = (struct qeth_hdr *)skb->data;
                 QETH_DBF_MESSAGE(2, "skb bounce len: %d rest: %d\n", len, rest);
         }
         return 0;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 155b101bd730..ec8ccdae7aba 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -302,7 +302,8 @@ static void qeth_l2_process_vlans(struct qeth_card *card)
         spin_unlock_bh(&card->vlanlock);
 }
 
-static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int qeth_l2_vlan_rx_add_vid(struct net_device *dev,
+                                   __be16 proto, u16 vid)
 {
         struct qeth_card *card = dev->ml_priv;
         struct qeth_vlan_vid *id;
@@ -331,7 +332,8 @@ static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
         return 0;
 }
 
-static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev,
+                                    __be16 proto, u16 vid)
 {
         struct qeth_vlan_vid *id, *tmpid = NULL;
         struct qeth_card *card = dev->ml_priv;
@@ -771,8 +773,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 }
         }
 
-        elements = qeth_get_elements_no(card, (void *)hdr, new_skb,
-                                                elements_needed);
+        elements = qeth_get_elements_no(card, new_skb, elements_needed);
         if (!elements) {
                 if (data_offset >= 0)
                         kmem_cache_free(qeth_core_header_cache, hdr);
@@ -780,7 +781,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (card->info.type != QETH_CARD_TYPE_IQD) {
-                if (qeth_hdr_chk_and_bounce(new_skb,
+                if (qeth_hdr_chk_and_bounce(new_skb, &hdr,
                     sizeof(struct qeth_hdr_layer2)))
                         goto tx_drop;
                 rc = qeth_do_send_packet(card, queue, new_skb, hdr,
@@ -959,7 +960,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
                 SET_ETHTOOL_OPS(card->dev, &qeth_l2_ethtool_ops);
         else
                 SET_ETHTOOL_OPS(card->dev, &qeth_l2_osn_ops);
-        card->dev->features |= NETIF_F_HW_VLAN_FILTER;
+        card->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
         card->info.broadcast_capable = 1;
         qeth_l2_request_initial_mac(card);
         SET_NETDEV_DEV(card->dev, &card->gdev->dev);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 1f7edf1b26c3..c1b0b2761f8d 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1659,7 +1659,8 @@ static void qeth_l3_add_vlan_mc(struct qeth_card *card)
         for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {
                 struct net_device *netdev;
 
-                netdev = __vlan_find_dev_deep(card->dev, vid);
+                netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q),
+                                              vid);
                 if (netdev == NULL ||
                     !(netdev->flags & IFF_UP))
                         continue;
@@ -1720,7 +1721,8 @@ static void qeth_l3_add_vlan_mc6(struct qeth_card *card)
         for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {
                 struct net_device *netdev;
 
-                netdev = __vlan_find_dev_deep(card->dev, vid);
+                netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q),
+                                              vid);
                 if (netdev == NULL ||
                     !(netdev->flags & IFF_UP))
                         continue;
@@ -1764,7 +1766,7 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card,
 
         QETH_CARD_TEXT(card, 4, "frvaddr4");
 
-        netdev = __vlan_find_dev_deep(card->dev, vid);
+        netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), vid);
         if (!netdev)
                 return;
         in_dev = in_dev_get(netdev);
@@ -1794,7 +1796,7 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card,
 
         QETH_CARD_TEXT(card, 4, "frvaddr6");
 
-        netdev = __vlan_find_dev_deep(card->dev, vid);
+        netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), vid);
         if (!netdev)
                 return;
         in6_dev = in6_dev_get(netdev);
@@ -1824,7 +1826,8 @@ static void qeth_l3_free_vlan_addresses(struct qeth_card *card,
         rcu_read_unlock();
 }
 
-static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int qeth_l3_vlan_rx_add_vid(struct net_device *dev,
+                                   __be16 proto, u16 vid)
 {
         struct qeth_card *card = dev->ml_priv;
 
@@ -1832,7 +1835,8 @@ static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
         return 0;
 }
 
-static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev,
+                                    __be16 proto, u16 vid)
 {
         struct qeth_card *card = dev->ml_priv;
         unsigned long flags;
@@ -1975,7 +1979,8 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
                                                       &vlan_tag);
                                 len = skb->len;
                                 if (is_vlan && !card->options.sniffer)
-                                        __vlan_hwaccel_put_tag(skb, vlan_tag);
+                                        __vlan_hwaccel_put_tag(skb,
+                                                htons(ETH_P_8021Q), vlan_tag);
                                 napi_gro_receive(&card->napi, skb);
                         }
                         break;
@@ -2084,7 +2089,8 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev,
                 struct net_device *netdev;
 
                 rcu_read_lock();
-                netdev = __vlan_find_dev_deep(card->dev, vid);
+                netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q),
+                                              vid);
                 rcu_read_unlock();
                 if (netdev == dev) {
                         rc = QETH_VLAN_CARD;
@@ -3031,8 +3037,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         qeth_l3_hdr_csum(card, hdr, new_skb);
         }
 
-        elems = qeth_get_elements_no(card, (void *)hdr, new_skb,
-                                                 elements_needed);
+        elems = qeth_get_elements_no(card, new_skb, elements_needed);
         if (!elems) {
                 if (data_offset >= 0)
                         kmem_cache_free(qeth_core_header_cache, hdr);
@@ -3050,7 +3055,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 else
                         len = sizeof(struct qeth_hdr_layer3);
 
-                if (qeth_hdr_chk_and_bounce(new_skb, len))
+                if (qeth_hdr_chk_and_bounce(new_skb, &hdr, len))
                         goto tx_drop;
                 rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                          elements_needed);
@@ -3294,9 +3299,9 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
         card->dev->watchdog_timeo = QETH_TX_TIMEOUT;
         card->dev->mtu = card->info.initial_mtu;
         SET_ETHTOOL_OPS(card->dev, &qeth_l3_ethtool_ops);
-        card->dev->features |=  NETIF_F_HW_VLAN_TX |
-                                NETIF_F_HW_VLAN_RX |
-                                NETIF_F_HW_VLAN_FILTER;
+        card->dev->features |=  NETIF_F_HW_VLAN_CTAG_TX |
+                                NETIF_F_HW_VLAN_CTAG_RX |
+                                NETIF_F_HW_VLAN_CTAG_FILTER;
         card->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
         card->dev->gso_max_size = 15 * PAGE_SIZE;
 
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 50fcd018d14b..11596b2c4702 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -88,9 +88,6 @@
 
 #define BNX2FC_MAX_NPIV         256
 
-#define BNX2FC_MAX_OUTSTANDING_CMNDS    2048
-#define BNX2FC_CAN_QUEUE                BNX2FC_MAX_OUTSTANDING_CMNDS
-#define BNX2FC_ELSTM_XIDS               BNX2FC_CAN_QUEUE
 #define BNX2FC_MIN_PAYLOAD              256
 #define BNX2FC_MAX_PAYLOAD              2048
 #define BNX2FC_MFS                      \
@@ -108,11 +105,8 @@
 #define BNX2FC_CONFQ_WQE_SIZE           (sizeof(struct fcoe_confqe))
 #define BNX2FC_5771X_DB_PAGE_SIZE       128
 
-#define BNX2FC_MAX_TASKS                \
-                             (BNX2FC_MAX_OUTSTANDING_CMNDS + BNX2FC_ELSTM_XIDS)
 #define BNX2FC_TASK_SIZE                128
 #define BNX2FC_TASKS_PER_PAGE           (PAGE_SIZE/BNX2FC_TASK_SIZE)
-#define BNX2FC_TASK_CTX_ARR_SZ          (BNX2FC_MAX_TASKS/BNX2FC_TASKS_PER_PAGE)
 
 #define BNX2FC_MAX_ROWS_IN_HASH_TBL     8
 #define BNX2FC_HASH_TBL_CHUNK_SIZE      (16 * 1024)
@@ -125,12 +119,9 @@
 #define BNX2FC_WRITE                    (1 << 0)
 
 #define BNX2FC_MIN_XID                  0
-#define BNX2FC_MAX_XID                  \
-                        (BNX2FC_MAX_OUTSTANDING_CMNDS + BNX2FC_ELSTM_XIDS - 1)
 #define FCOE_MAX_NUM_XIDS               0x2000
-#define FCOE_MIN_XID                    (BNX2FC_MAX_XID + 1)
-#define FCOE_MAX_XID                    (FCOE_MIN_XID + FCOE_MAX_NUM_XIDS - 1)
-#define FCOE_XIDS_PER_CPU               (FCOE_MIN_XID + (512 * nr_cpu_ids) - 1)
+#define FCOE_MAX_XID_OFFSET             (FCOE_MAX_NUM_XIDS - 1)
+#define FCOE_XIDS_PER_CPU_OFFSET        ((512 * nr_cpu_ids) - 1)
 #define BNX2FC_MAX_LUN                  0xFFFF
 #define BNX2FC_MAX_FCP_TGT              256
 #define BNX2FC_MAX_CMD_LEN              16
@@ -206,6 +197,13 @@ struct bnx2fc_hba {
                 #define BNX2FC_FLAG_FW_INIT_DONE        0
                 #define BNX2FC_FLAG_DESTROY_CMPL        1
         u32 next_conn_id;
+
+        /* xid resources */
+        u16 max_xid;
+        u32 max_tasks;
+        u32 max_outstanding_cmds;
+        u32 elstm_xids;
+
         struct fcoe_task_ctx_entry **task_ctx;
         dma_addr_t *task_ctx_dma;
         struct regpair *task_ctx_bd_tbl;
@@ -504,8 +502,7 @@ int bnx2fc_setup_task_ctx(struct bnx2fc_hba *hba);
 void bnx2fc_free_task_ctx(struct bnx2fc_hba *hba);
 int bnx2fc_setup_fw_resc(struct bnx2fc_hba *hba);
 void bnx2fc_free_fw_resc(struct bnx2fc_hba *hba);
-struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
-                                                u16 min_xid, u16 max_xid);
+struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba);
 void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr);
 void bnx2fc_get_link_state(struct bnx2fc_hba *hba);
 char *bnx2fc_get_next_rqe(struct bnx2fc_rport *tgt, u8 num_items);
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 90bc7bd00966..7dffec1e5715 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -71,7 +71,7 @@ static void bnx2fc_recv_frame(struct sk_buff *skb);
 static void bnx2fc_start_disc(struct bnx2fc_interface *interface);
 static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev);
 static int bnx2fc_lport_config(struct fc_lport *lport);
-static int bnx2fc_em_config(struct fc_lport *lport);
+static int bnx2fc_em_config(struct fc_lport *lport, struct bnx2fc_hba *hba);
 static int bnx2fc_bind_adapter_devices(struct bnx2fc_hba *hba);
 static void bnx2fc_unbind_adapter_devices(struct bnx2fc_hba *hba);
 static int bnx2fc_bind_pcidev(struct bnx2fc_hba *hba);
@@ -944,16 +944,17 @@ static int bnx2fc_libfc_config(struct fc_lport *lport)
         return 0;
 }
 
-static int bnx2fc_em_config(struct fc_lport *lport)
+static int bnx2fc_em_config(struct fc_lport *lport, struct bnx2fc_hba *hba)
 {
-        int max_xid;
+        int fcoe_min_xid, fcoe_max_xid;
 
+        fcoe_min_xid = hba->max_xid + 1;
         if (nr_cpu_ids <= 2)
-                max_xid = FCOE_XIDS_PER_CPU;
+                fcoe_max_xid = hba->max_xid + FCOE_XIDS_PER_CPU_OFFSET;
         else
-                max_xid = FCOE_MAX_XID;
-        if (!fc_exch_mgr_alloc(lport, FC_CLASS_3, FCOE_MIN_XID,
-                                max_xid, NULL)) {
+                fcoe_max_xid = hba->max_xid + FCOE_MAX_XID_OFFSET;
+        if (!fc_exch_mgr_alloc(lport, FC_CLASS_3, fcoe_min_xid,
+                               fcoe_max_xid, NULL)) {
                 printk(KERN_ERR PFX "em_config:fc_exch_mgr_alloc failed\n");
                 return -ENOMEM;
         }
@@ -1300,6 +1301,12 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
         mutex_init(&hba->hba_mutex);
 
         hba->cnic = cnic;
+
+        hba->max_tasks = cnic->max_fcoe_exchanges;
+        hba->elstm_xids = (hba->max_tasks / 2);
+        hba->max_outstanding_cmds = hba->elstm_xids;
+        hba->max_xid = (hba->max_tasks - 1);
+
         rc = bnx2fc_bind_pcidev(hba);
         if (rc) {
                 printk(KERN_ERR PFX "create_adapter:  bind error\n");
@@ -1318,8 +1325,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
 
         hba->num_ofld_sess = 0;
 
-        hba->cmd_mgr = bnx2fc_cmd_mgr_alloc(hba, BNX2FC_MIN_XID,
-                                                BNX2FC_MAX_XID);
+        hba->cmd_mgr = bnx2fc_cmd_mgr_alloc(hba);
         if (!hba->cmd_mgr) {
                 printk(KERN_ERR PFX "em_config:bnx2fc_cmd_mgr_alloc failed\n");
                 goto cmgr_err;
@@ -1330,13 +1336,13 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
                                         FCOE_IOS_PER_CONNECTION_SHIFT;
         fcoe_cap->capability1 |= BNX2FC_NUM_MAX_SESS <<
                                         FCOE_LOGINS_PER_PORT_SHIFT;
-        fcoe_cap->capability2 = BNX2FC_MAX_OUTSTANDING_CMNDS <<
+        fcoe_cap->capability2 = hba->max_outstanding_cmds <<
                                         FCOE_NUMBER_OF_EXCHANGES_SHIFT;
         fcoe_cap->capability2 |= BNX2FC_MAX_NPIV <<
                                         FCOE_NPIV_WWN_PER_PORT_SHIFT;
         fcoe_cap->capability3 = BNX2FC_NUM_MAX_SESS <<
                                         FCOE_TARGETS_SUPPORTED_SHIFT;
-        fcoe_cap->capability3 |= BNX2FC_MAX_OUTSTANDING_CMNDS <<
+        fcoe_cap->capability3 |= hba->max_outstanding_cmds <<
                                         FCOE_OUTSTANDING_COMMANDS_SHIFT;
         fcoe_cap->capability4 = FCOE_CAPABILITY4_STATEFUL;
 
@@ -1416,7 +1422,7 @@ static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
         struct Scsi_Host        *shost;
         struct fc_vport         *vport = dev_to_vport(parent);
         struct bnx2fc_lport     *blport;
-        struct bnx2fc_hba       *hba;
+        struct bnx2fc_hba       *hba = interface->hba;
         int                     rc = 0;
 
         blport = kzalloc(sizeof(struct bnx2fc_lport), GFP_KERNEL);
@@ -1426,6 +1432,7 @@ static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
         }
 
         /* Allocate Scsi_Host structure */
+        bnx2fc_shost_template.can_queue = hba->max_outstanding_cmds;
         if (!npiv)
                 lport = libfc_host_alloc(&bnx2fc_shost_template, sizeof(*port));
         else
@@ -1477,7 +1484,7 @@ static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
 
         /* Allocate exchange manager */
         if (!npiv)
-                rc = bnx2fc_em_config(lport);
+                rc = bnx2fc_em_config(lport, hba);
         else {
                 shost = vport_to_shost(vport);
                 n_port = shost_priv(shost);
@@ -1491,7 +1498,6 @@ static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
 
         bnx2fc_interface_get(interface);
 
-        hba = interface->hba;
         spin_lock_bh(&hba->hba_lock);
         blport->lport = lport;
         list_add_tail(&blport->list, &hba->vports);
@@ -2706,7 +2712,6 @@ static struct scsi_host_template bnx2fc_shost_template = {
         .change_queue_type      = fc_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
-        .can_queue              = BNX2FC_CAN_QUEUE,
         .use_clustering         = ENABLE_CLUSTERING,
         .sg_tablesize           = BNX2FC_MAX_BDS_PER_CMD,
         .max_sectors            = 1024,
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 85ea98a80f40..50510ffe1bf5 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -77,7 +77,7 @@ int bnx2fc_send_fw_fcoe_init_msg(struct bnx2fc_hba *hba)
         fcoe_init1.hdr.flags = (FCOE_KWQE_LAYER_CODE <<
                                         FCOE_KWQE_HEADER_LAYER_CODE_SHIFT);
 
-        fcoe_init1.num_tasks = BNX2FC_MAX_TASKS;
+        fcoe_init1.num_tasks = hba->max_tasks;
         fcoe_init1.sq_num_wqes = BNX2FC_SQ_WQES_MAX;
         fcoe_init1.rq_num_wqes = BNX2FC_RQ_WQES_MAX;
         fcoe_init1.rq_buffer_log_size = BNX2FC_RQ_BUF_LOG_SZ;
@@ -697,7 +697,7 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
                         err_entry->data.tx_buf_off, err_entry->data.rx_buf_off);
 
 
-                if (xid > BNX2FC_MAX_XID) {
+                if (xid > hba->max_xid) {
                         BNX2FC_TGT_DBG(tgt, "xid(0x%x) out of FW range\n",
                                    xid);
                         goto ret_err_rqe;
@@ -815,7 +815,7 @@ ret_err_rqe:
                 BNX2FC_TGT_DBG(tgt, "buf_offsets - tx = 0x%x, rx = 0x%x",
                         err_entry->data.tx_buf_off, err_entry->data.rx_buf_off);
 
-                if (xid > BNX2FC_MAX_XID) {
+                if (xid > hba->max_xid) {
                         BNX2FC_TGT_DBG(tgt, "xid(0x%x) out of FW range\n", xid);
                         goto ret_warn_rqe;
                 }
@@ -880,7 +880,7 @@ void bnx2fc_process_cq_compl(struct bnx2fc_rport *tgt, u16 wqe)
 
         spin_lock_bh(&tgt->tgt_lock);
         xid = wqe & FCOE_PEND_WQ_CQE_TASK_ID;
-        if (xid >= BNX2FC_MAX_TASKS) {
+        if (xid >= hba->max_tasks) {
                 printk(KERN_ERR PFX "ERROR:xid out of range\n");
                 spin_unlock_bh(&tgt->tgt_lock);
                 return;
@@ -1842,6 +1842,7 @@ int bnx2fc_setup_task_ctx(struct bnx2fc_hba *hba)
         int rc = 0;
         struct regpair *task_ctx_bdt;
         dma_addr_t addr;
+        int task_ctx_arr_sz;
         int i;
 
         /*
@@ -1865,7 +1866,8 @@ int bnx2fc_setup_task_ctx(struct bnx2fc_hba *hba)
          * Allocate task_ctx which is an array of pointers pointing to
          * a page containing 32 task contexts
          */
-        hba->task_ctx = kzalloc((BNX2FC_TASK_CTX_ARR_SZ * sizeof(void *)),
+        task_ctx_arr_sz = (hba->max_tasks / BNX2FC_TASKS_PER_PAGE);
+        hba->task_ctx = kzalloc((task_ctx_arr_sz * sizeof(void *)),
                                  GFP_KERNEL);
         if (!hba->task_ctx) {
                 printk(KERN_ERR PFX "unable to allocate task context array\n");
@@ -1876,7 +1878,7 @@ int bnx2fc_setup_task_ctx(struct bnx2fc_hba *hba)
         /*
          * Allocate task_ctx_dma which is an array of dma addresses
          */
-        hba->task_ctx_dma = kmalloc((BNX2FC_TASK_CTX_ARR_SZ *
+        hba->task_ctx_dma = kmalloc((task_ctx_arr_sz *
                                         sizeof(dma_addr_t)), GFP_KERNEL);
         if (!hba->task_ctx_dma) {
                 printk(KERN_ERR PFX "unable to alloc context mapping array\n");
@@ -1885,7 +1887,7 @@ int bnx2fc_setup_task_ctx(struct bnx2fc_hba *hba)
         }
 
         task_ctx_bdt = (struct regpair *)hba->task_ctx_bd_tbl;
-        for (i = 0; i < BNX2FC_TASK_CTX_ARR_SZ; i++) {
+        for (i = 0; i < task_ctx_arr_sz; i++) {
 
                 hba->task_ctx[i] = dma_alloc_coherent(&hba->pcidev->dev,
                                                       PAGE_SIZE,
@@ -1905,7 +1907,7 @@ int bnx2fc_setup_task_ctx(struct bnx2fc_hba *hba)
         return 0;
 
 out3:
-        for (i = 0; i < BNX2FC_TASK_CTX_ARR_SZ; i++) {
+        for (i = 0; i < task_ctx_arr_sz; i++) {
                 if (hba->task_ctx[i]) {
 
                         dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
@@ -1929,6 +1931,7 @@ out:
 
 void bnx2fc_free_task_ctx(struct bnx2fc_hba *hba)
 {
+        int task_ctx_arr_sz;
         int i;
 
         if (hba->task_ctx_bd_tbl) {
@@ -1938,8 +1941,9 @@ void bnx2fc_free_task_ctx(struct bnx2fc_hba *hba)
                 hba->task_ctx_bd_tbl = NULL;
         }
 
+        task_ctx_arr_sz = (hba->max_tasks / BNX2FC_TASKS_PER_PAGE);
         if (hba->task_ctx) {
-                for (i = 0; i < BNX2FC_TASK_CTX_ARR_SZ; i++) {
+                for (i = 0; i < task_ctx_arr_sz; i++) {
                         if (hba->task_ctx[i]) {
                                 dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
                                                     hba->task_ctx[i],
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 60798e829de6..723a9a8ba5ee 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -239,8 +239,7 @@ static void bnx2fc_scsi_done(struct bnx2fc_cmd *io_req, int err_code)
         sc_cmd->scsi_done(sc_cmd);
 }
 
-struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
-                                                u16 min_xid, u16 max_xid)
+struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
 {
         struct bnx2fc_cmd_mgr *cmgr;
         struct io_bdt *bdt_info;
@@ -252,6 +251,8 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
         int num_ios, num_pri_ios;
         size_t bd_tbl_sz;
         int arr_sz = num_possible_cpus() + 1;
+        u16 min_xid = BNX2FC_MIN_XID;
+        u16 max_xid = hba->max_xid;
 
         if (max_xid <= min_xid || max_xid == FC_XID_UNKNOWN) {
                 printk(KERN_ERR PFX "cmd_mgr_alloc: Invalid min_xid 0x%x \
@@ -298,7 +299,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
          * of slow path requests.
          */
         xid = BNX2FC_MIN_XID;
-        num_pri_ios = num_ios - BNX2FC_ELSTM_XIDS;
+        num_pri_ios = num_ios - hba->elstm_xids;
         for (i = 0; i < num_ios; i++) {
                 io_req = kzalloc(sizeof(*io_req), GFP_KERNEL);
 
@@ -367,7 +368,7 @@ void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr)
         struct bnx2fc_hba *hba = cmgr->hba;
         size_t bd_tbl_sz;
         u16 min_xid = BNX2FC_MIN_XID;
-        u16 max_xid = BNX2FC_MAX_XID;
+        u16 max_xid = hba->max_xid;
         int num_ios;
         int i;
 
diff --git a/drivers/scsi/csiostor/Makefile b/drivers/scsi/csiostor/Makefile
index b581966c88f9..913b9a92fb06 100644
--- a/drivers/scsi/csiostor/Makefile
+++ b/drivers/scsi/csiostor/Makefile
@@ -8,4 +8,5 @@ ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 obj-$(CONFIG_SCSI_CHELSIO_FCOE) += csiostor.o
 
 csiostor-objs := csio_attr.o csio_init.o csio_lnode.o csio_scsi.o \
-                csio_hw.o csio_isr.o csio_mb.o csio_rnode.o csio_wr.o
+                csio_hw.o csio_hw_t4.o csio_hw_t5.o csio_isr.o \
+                csio_mb.o csio_rnode.o csio_wr.o
diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 7dbaf58fab9f..193605519361 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -61,7 +61,7 @@ int csio_msi = 2;
 static int dev_num;
 
 /* FCoE Adapter types & its description */
-static const struct csio_adap_desc csio_fcoe_adapters[] = {
+static const struct csio_adap_desc csio_t4_fcoe_adapters[] = {
         {"T440-Dbg 10G", "Chelsio T440-Dbg 10G [FCoE]"},
         {"T420-CR 10G", "Chelsio T420-CR 10G [FCoE]"},
         {"T422-CR 10G/1G", "Chelsio T422-CR 10G/1G [FCoE]"},
@@ -77,7 +77,38 @@ static const struct csio_adap_desc csio_fcoe_adapters[] = {
         {"B404-BT 1G", "Chelsio B404-BT 1G [FCoE]"},
         {"T480-CR 10G", "Chelsio T480-CR 10G [FCoE]"},
         {"T440-LP-CR 10G", "Chelsio T440-LP-CR 10G [FCoE]"},
-        {"T4 FPGA", "Chelsio T4 FPGA [FCoE]"}
+        {"AMSTERDAM 10G", "Chelsio AMSTERDAM 10G [FCoE]"},
+        {"HUAWEI T480 10G", "Chelsio HUAWEI T480 10G [FCoE]"},
+        {"HUAWEI T440 10G", "Chelsio HUAWEI T440 10G [FCoE]"},
+        {"HUAWEI STG 10G", "Chelsio HUAWEI STG 10G [FCoE]"},
+        {"ACROMAG XAUI 10G", "Chelsio ACROMAG XAUI 10G [FCoE]"},
+        {"ACROMAG SFP+ 10G", "Chelsio ACROMAG SFP+ 10G [FCoE]"},
+        {"QUANTA SFP+ 10G", "Chelsio QUANTA SFP+ 10G [FCoE]"},
+        {"HUAWEI 10Gbase-T", "Chelsio HUAWEI 10Gbase-T [FCoE]"},
+        {"HUAWEI T4TOE 10G", "Chelsio HUAWEI T4TOE 10G [FCoE]"}
+};
+
+static const struct csio_adap_desc csio_t5_fcoe_adapters[] = {
+        {"T580-Dbg 10G", "Chelsio T580-Dbg 10G [FCoE]"},
+        {"T520-CR 10G", "Chelsio T520-CR 10G [FCoE]"},
+        {"T522-CR 10G/1G", "Chelsio T452-CR 10G/1G [FCoE]"},
+        {"T540-CR 10G", "Chelsio T540-CR 10G [FCoE]"},
+        {"T520-BCH 10G", "Chelsio T520-BCH 10G [FCoE]"},
+        {"T540-BCH 10G", "Chelsio T540-BCH 10G [FCoE]"},
+        {"T540-CH 10G", "Chelsio T540-CH 10G [FCoE]"},
+        {"T520-SO 10G", "Chelsio T520-SO 10G [FCoE]"},
+        {"T520-CX4 10G", "Chelsio T520-CX4 10G [FCoE]"},
+        {"T520-BT 10G", "Chelsio T520-BT 10G [FCoE]"},
+        {"T504-BT 1G", "Chelsio T504-BT 1G [FCoE]"},
+        {"B520-SR 10G", "Chelsio B520-SR 10G [FCoE]"},
+        {"B504-BT 1G", "Chelsio B504-BT 1G [FCoE]"},
+        {"T580-CR 10G", "Chelsio T580-CR 10G [FCoE]"},
+        {"T540-LP-CR 10G", "Chelsio T540-LP-CR 10G [FCoE]"},
+        {"AMSTERDAM 10G", "Chelsio AMSTERDAM 10G [FCoE]"},
+        {"T580-LP-CR 40G", "Chelsio T580-LP-CR 40G [FCoE]"},
+        {"T520-LL-CR 10G", "Chelsio T520-LL-CR 10G [FCoE]"},
+        {"T560-CR 40G", "Chelsio T560-CR 40G [FCoE]"},
+        {"T580-CR 40G", "Chelsio T580-CR 40G [FCoE]"}
 };
 
 static void csio_mgmtm_cleanup(struct csio_mgmtm *);
@@ -124,7 +155,7 @@ int csio_is_hw_removing(struct csio_hw *hw)
  *      at the time it indicated completion is stored there.  Returns 0 if the
  *      operation completes and -EAGAIN otherwise.
  */
-static int
+int
 csio_hw_wait_op_done_val(struct csio_hw *hw, int reg, uint32_t mask,
                          int polarity, int attempts, int delay, uint32_t *valp)
 {
@@ -145,6 +176,24 @@ csio_hw_wait_op_done_val(struct csio_hw *hw, int reg, uint32_t mask,
         }
 }
 
+/*
+ *      csio_hw_tp_wr_bits_indirect - set/clear bits in an indirect TP register
+ *      @hw: the adapter
+ *      @addr: the indirect TP register address
+ *      @mask: specifies the field within the register to modify
+ *      @val: new value for the field
+ *
+ *      Sets a field of an indirect TP register to the given value.
+ */
+void
+csio_hw_tp_wr_bits_indirect(struct csio_hw *hw, unsigned int addr,
+                        unsigned int mask, unsigned int val)
+{
+        csio_wr_reg32(hw, addr, TP_PIO_ADDR);
+        val |= csio_rd_reg32(hw, TP_PIO_DATA) & ~mask;
+        csio_wr_reg32(hw, val, TP_PIO_DATA);
+}
+
 void
 csio_set_reg_field(struct csio_hw *hw, uint32_t reg, uint32_t mask,
                    uint32_t value)
@@ -157,242 +206,22 @@ csio_set_reg_field(struct csio_hw *hw, uint32_t reg, uint32_t mask,
 
 }
 
-/*
- *      csio_hw_mc_read - read from MC through backdoor accesses
- *      @hw: the hw module
- *      @addr: address of first byte requested
- *      @data: 64 bytes of data containing the requested address
- *      @ecc: where to store the corresponding 64-bit ECC word
- *
- *      Read 64 bytes of data from MC starting at a 64-byte-aligned address
- *      that covers the requested address @addr.  If @parity is not %NULL it
- *      is assigned the 64-bit ECC word for the read data.
- */
-int
-csio_hw_mc_read(struct csio_hw *hw, uint32_t addr, __be32 *data,
-                uint64_t *ecc)
-{
-        int i;
-
-        if (csio_rd_reg32(hw, MC_BIST_CMD) & START_BIST)
-                return -EBUSY;
-        csio_wr_reg32(hw, addr & ~0x3fU, MC_BIST_CMD_ADDR);
-        csio_wr_reg32(hw, 64, MC_BIST_CMD_LEN);
-        csio_wr_reg32(hw, 0xc, MC_BIST_DATA_PATTERN);
-        csio_wr_reg32(hw, BIST_OPCODE(1) | START_BIST |  BIST_CMD_GAP(1),
-                      MC_BIST_CMD);
-        i = csio_hw_wait_op_done_val(hw, MC_BIST_CMD, START_BIST,
-                 0, 10, 1, NULL);
-        if (i)
-                return i;
-
-#define MC_DATA(i) MC_BIST_STATUS_REG(MC_BIST_STATUS_RDATA, i)
-
-        for (i = 15; i >= 0; i--)
-                *data++ = htonl(csio_rd_reg32(hw, MC_DATA(i)));
-        if (ecc)
-                *ecc = csio_rd_reg64(hw, MC_DATA(16));
-#undef MC_DATA
-        return 0;
-}
-
-/*
- *      csio_hw_edc_read - read from EDC through backdoor accesses
- *      @hw: the hw module
- *      @idx: which EDC to access
- *      @addr: address of first byte requested
- *      @data: 64 bytes of data containing the requested address
- *      @ecc: where to store the corresponding 64-bit ECC word
- *
- *      Read 64 bytes of data from EDC starting at a 64-byte-aligned address
- *      that covers the requested address @addr.  If @parity is not %NULL it
- *      is assigned the 64-bit ECC word for the read data.
- */
-int
-csio_hw_edc_read(struct csio_hw *hw, int idx, uint32_t addr, __be32 *data,
-                uint64_t *ecc)
-{
-        int i;
-
-        idx *= EDC_STRIDE;
-        if (csio_rd_reg32(hw, EDC_BIST_CMD + idx) & START_BIST)
-                return -EBUSY;
-        csio_wr_reg32(hw, addr & ~0x3fU, EDC_BIST_CMD_ADDR + idx);
-        csio_wr_reg32(hw, 64, EDC_BIST_CMD_LEN + idx);
-        csio_wr_reg32(hw, 0xc, EDC_BIST_DATA_PATTERN + idx);
-        csio_wr_reg32(hw, BIST_OPCODE(1) | BIST_CMD_GAP(1) | START_BIST,
-                     EDC_BIST_CMD + idx);
-        i = csio_hw_wait_op_done_val(hw, EDC_BIST_CMD + idx, START_BIST,
-                 0, 10, 1, NULL);
-        if (i)
-                return i;
-
-#define EDC_DATA(i) (EDC_BIST_STATUS_REG(EDC_BIST_STATUS_RDATA, i) + idx)
-
-        for (i = 15; i >= 0; i--)
-                *data++ = htonl(csio_rd_reg32(hw, EDC_DATA(i)));
-        if (ecc)
-                *ecc = csio_rd_reg64(hw, EDC_DATA(16));
-#undef EDC_DATA
-        return 0;
-}
-
-/*
- *      csio_mem_win_rw - read/write memory through PCIE memory window
- *      @hw: the adapter
- *      @addr: address of first byte requested
- *      @data: MEMWIN0_APERTURE bytes of data containing the requested address
- *      @dir: direction of transfer 1 => read, 0 => write
- *
- *      Read/write MEMWIN0_APERTURE bytes of data from MC starting at a
- *      MEMWIN0_APERTURE-byte-aligned address that covers the requested
- *      address @addr.
- */
-static int
-csio_mem_win_rw(struct csio_hw *hw, u32 addr, u32 *data, int dir)
-{
-        int i;
-
-        /*
-         * Setup offset into PCIE memory window.  Address must be a
-         * MEMWIN0_APERTURE-byte-aligned address.  (Read back MA register to
-         * ensure that changes propagate before we attempt to use the new
-         * values.)
-         */
-        csio_wr_reg32(hw, addr & ~(MEMWIN0_APERTURE - 1),
-                        PCIE_MEM_ACCESS_OFFSET);
-        csio_rd_reg32(hw, PCIE_MEM_ACCESS_OFFSET);
-
-        /* Collecting data 4 bytes at a time upto MEMWIN0_APERTURE */
-        for (i = 0; i < MEMWIN0_APERTURE; i = i + sizeof(__be32)) {
-                if (dir)
-                        *data++ = csio_rd_reg32(hw, (MEMWIN0_BASE + i));
-                else
-                        csio_wr_reg32(hw, *data++, (MEMWIN0_BASE + i));
-        }
-
-        return 0;
-}
-
-/*
- *      csio_memory_rw - read/write EDC 0, EDC 1 or MC via PCIE memory window
- *      @hw: the csio_hw
- *      @mtype: memory type: MEM_EDC0, MEM_EDC1 or MEM_MC
- *      @addr: address within indicated memory type
- *      @len: amount of memory to transfer
- *      @buf: host memory buffer
- *      @dir: direction of transfer 1 => read, 0 => write
- *
- *      Reads/writes an [almost] arbitrary memory region in the firmware: the
- *      firmware memory address, length and host buffer must be aligned on
- *      32-bit boudaries.  The memory is transferred as a raw byte sequence
- *      from/to the firmware's memory.  If this memory contains data
- *      structures which contain multi-byte integers, it's the callers
- *      responsibility to perform appropriate byte order conversions.
- */
-static int
-csio_memory_rw(struct csio_hw *hw, int mtype, u32 addr, u32 len,
-                uint32_t *buf, int dir)
-{
-        uint32_t pos, start, end, offset, memoffset;
-        int ret;
-        uint32_t *data;
-
-        /*
-         * Argument sanity checks ...
-         */
-        if ((addr & 0x3) || (len & 0x3))
-                return -EINVAL;
-
-        data = kzalloc(MEMWIN0_APERTURE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        /* Offset into the region of memory which is being accessed
-         * MEM_EDC0 = 0
-         * MEM_EDC1 = 1
-         * MEM_MC   = 2
-         */
-        memoffset = (mtype * (5 * 1024 * 1024));
-
-        /* Determine the PCIE_MEM_ACCESS_OFFSET */
-        addr = addr + memoffset;
-
-        /*
-         * The underlaying EDC/MC read routines read MEMWIN0_APERTURE bytes
-         * at a time so we need to round down the start and round up the end.
-         * We'll start copying out of the first line at (addr - start) a word
-         * at a time.
-         */
-        start = addr & ~(MEMWIN0_APERTURE-1);
-        end = (addr + len + MEMWIN0_APERTURE-1) & ~(MEMWIN0_APERTURE-1);
-        offset = (addr - start)/sizeof(__be32);
-
-        for (pos = start; pos < end; pos += MEMWIN0_APERTURE, offset = 0) {
-                /*
-                 * If we're writing, copy the data from the caller's memory
-                 * buffer
-                 */
-                if (!dir) {
-                        /*
-                         * If we're doing a partial write, then we need to do
-                         * a read-modify-write ...
-                         */
-                        if (offset || len < MEMWIN0_APERTURE) {
-                                ret = csio_mem_win_rw(hw, pos, data, 1);
-                                if (ret) {
-                                        kfree(data);
-                                        return ret;
-                                }
-                        }
-                        while (offset < (MEMWIN0_APERTURE/sizeof(__be32)) &&
-                                                                len > 0) {
-                                data[offset++] = *buf++;
-                                len -= sizeof(__be32);
-                        }
-                }
-
-                /*
-                 * Transfer a block of memory and bail if there's an error.
-                 */
-                ret = csio_mem_win_rw(hw, pos, data, dir);
-                if (ret) {
-                        kfree(data);
-                        return ret;
-                }
-
-                /*
-                 * If we're reading, copy the data into the caller's memory
-                 * buffer.
-                 */
-                if (dir)
-                        while (offset < (MEMWIN0_APERTURE/sizeof(__be32)) &&
-                                                                len > 0) {
-                                *buf++ = data[offset++];
-                                len -= sizeof(__be32);
-                        }
-        }
-
-        kfree(data);
-
-        return 0;
-}
-
 static int
 csio_memory_write(struct csio_hw *hw, int mtype, u32 addr, u32 len, u32 *buf)
 {
-        return csio_memory_rw(hw, mtype, addr, len, buf, 0);
+        return hw->chip_ops->chip_memory_rw(hw, MEMWIN_CSIOSTOR, mtype,
+                                            addr, len, buf, 0);
 }
 
 /*
  * EEPROM reads take a few tens of us while writes can take a bit over 5 ms.
  */
-#define EEPROM_MAX_RD_POLL 40
-#define EEPROM_MAX_WR_POLL 6
-#define EEPROM_STAT_ADDR   0x7bfc
-#define VPD_BASE           0x400
-#define VPD_BASE_OLD       0
-#define VPD_LEN            512
+#define EEPROM_MAX_RD_POLL      40
+#define EEPROM_MAX_WR_POLL      6
+#define EEPROM_STAT_ADDR        0x7bfc
+#define VPD_BASE                0x400
+#define VPD_BASE_OLD            0
+#define VPD_LEN                 1024
 #define VPD_INFO_FLD_HDR_SIZE   3
 
 /*
@@ -817,23 +646,6 @@ out:
         return 0;
 }
 
-/*
- *      csio_hw_flash_cfg_addr - return the address of the flash
- *                              configuration file
- *      @hw: the HW module
- *
- *      Return the address within the flash where the Firmware Configuration
- *      File is stored.
- */
-static unsigned int
-csio_hw_flash_cfg_addr(struct csio_hw *hw)
-{
-        if (hw->params.sf_size == 0x100000)
-                return FPGA_FLASH_CFG_OFFSET;
-        else
-                return FLASH_CFG_OFFSET;
-}
-
 static void
 csio_hw_print_fw_version(struct csio_hw *hw, char *str)
 {
@@ -898,13 +710,13 @@ csio_hw_check_fw_version(struct csio_hw *hw)
         minor = FW_HDR_FW_VER_MINOR_GET(hw->fwrev);
         micro = FW_HDR_FW_VER_MICRO_GET(hw->fwrev);
 
-        if (major != FW_VERSION_MAJOR) {            /* major mismatch - fail */
+        if (major != FW_VERSION_MAJOR(hw)) {    /* major mismatch - fail */
                 csio_err(hw, "card FW has major version %u, driver wants %u\n",
-                         major, FW_VERSION_MAJOR);
+                         major, FW_VERSION_MAJOR(hw));
                 return -EINVAL;
         }
 
-        if (minor == FW_VERSION_MINOR && micro == FW_VERSION_MICRO)
+        if (minor == FW_VERSION_MINOR(hw) && micro == FW_VERSION_MICRO(hw))
                 return 0;        /* perfect match */
 
         /* Minor/micro version mismatch */
@@ -1044,7 +856,7 @@ static void
 csio_set_pcie_completion_timeout(struct csio_hw *hw, u8 range)
 {
         uint16_t val;
-        uint32_t pcie_cap;
+        int pcie_cap;
 
         if (!csio_pci_capability(hw->pdev, PCI_CAP_ID_EXP, &pcie_cap)) {
                 pci_read_config_word(hw->pdev,
@@ -1056,84 +868,6 @@ csio_set_pcie_completion_timeout(struct csio_hw *hw, u8 range)
         }
 }
 
-
-/*
- * Return the specified PCI-E Configuration Space register from our Physical
- * Function.  We try first via a Firmware LDST Command since we prefer to let
- * the firmware own all of these registers, but if that fails we go for it
- * directly ourselves.
- */
-static uint32_t
-csio_read_pcie_cfg4(struct csio_hw *hw, int reg)
-{
-        u32 val = 0;
-        struct csio_mb *mbp;
-        int rv;
-        struct fw_ldst_cmd *ldst_cmd;
-
-        mbp = mempool_alloc(hw->mb_mempool, GFP_ATOMIC);
-        if (!mbp) {
-                CSIO_INC_STATS(hw, n_err_nomem);
-                pci_read_config_dword(hw->pdev, reg, &val);
-                return val;
-        }
-
-        csio_mb_ldst(hw, mbp, CSIO_MB_DEFAULT_TMO, reg);
-
-        rv = csio_mb_issue(hw, mbp);
-
-        /*
-         * If the LDST Command suucceeded, exctract the returned register
-         * value.  Otherwise read it directly ourself.
-         */
-        if (rv == 0) {
-                ldst_cmd = (struct fw_ldst_cmd *)(mbp->mb);
-                val = ntohl(ldst_cmd->u.pcie.data[0]);
-        } else
-                pci_read_config_dword(hw->pdev, reg, &val);
-
-        mempool_free(mbp, hw->mb_mempool);
-
-        return val;
-} /* csio_read_pcie_cfg4 */
-
-static int
-csio_hw_set_mem_win(struct csio_hw *hw)
-{
-        u32 bar0;
-
-        /*
-         * Truncation intentional: we only read the bottom 32-bits of the
-         * 64-bit BAR0/BAR1 ...  We use the hardware backdoor mechanism to
-         * read BAR0 instead of using pci_resource_start() because we could be
-         * operating from within a Virtual Machine which is trapping our
-         * accesses to our Configuration Space and we need to set up the PCI-E
-         * Memory Window decoders with the actual addresses which will be
-         * coming across the PCI-E link.
-         */
-        bar0 = csio_read_pcie_cfg4(hw, PCI_BASE_ADDRESS_0);
-        bar0 &= PCI_BASE_ADDRESS_MEM_MASK;
-
-        /*
-         * Set up memory window for accessing adapter memory ranges.  (Read
-         * back MA register to ensure that changes propagate before we attempt
-         * to use the new values.)
-         */
-        csio_wr_reg32(hw, (bar0 + MEMWIN0_BASE) | BIR(0) |
-                WINDOW(ilog2(MEMWIN0_APERTURE) - 10),
-                PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 0));
-        csio_wr_reg32(hw, (bar0 + MEMWIN1_BASE) | BIR(0) |
-                WINDOW(ilog2(MEMWIN1_APERTURE) - 10),
-                PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 1));
-        csio_wr_reg32(hw, (bar0 + MEMWIN2_BASE) | BIR(0) |
-                WINDOW(ilog2(MEMWIN2_APERTURE) - 10),
-                PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 2));
-        csio_rd_reg32(hw, PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 2));
-        return 0;
-} /* csio_hw_set_mem_win */
-
-
-
 /*****************************************************************************/
 /* HW State machine assists                                                  */
 /*****************************************************************************/
@@ -1234,7 +968,9 @@ retry:
                 for (;;) {
                         uint32_t pcie_fw;
 
+                        spin_unlock_irq(&hw->lock);
                         msleep(50);
+                        spin_lock_irq(&hw->lock);
                         waiting -= 50;
 
                         /*
@@ -2121,9 +1857,9 @@ csio_hw_flash_config(struct csio_hw *hw, u32 *fw_cfg_param, char *path)
         uint32_t *cfg_data;
         int value_to_add = 0;
 
-        if (request_firmware(&cf, CSIO_CF_FNAME, dev) < 0) {
-                csio_err(hw, "could not find config file " CSIO_CF_FNAME
-                         ",err: %d\n", ret);
+        if (request_firmware(&cf, CSIO_CF_FNAME(hw), dev) < 0) {
+                csio_err(hw, "could not find config file %s, err: %d\n",
+                         CSIO_CF_FNAME(hw), ret);
                 return -ENOENT;
         }
 
@@ -2147,9 +1883,24 @@ csio_hw_flash_config(struct csio_hw *hw, u32 *fw_cfg_param, char *path)
 
         ret = csio_memory_write(hw, mtype, maddr,
                                 cf->size + value_to_add, cfg_data);
+
+        if ((ret == 0) && (value_to_add != 0)) {
+                union {
+                        u32 word;
+                        char buf[4];
+                } last;
+                size_t size = cf->size & ~0x3;
+                int i;
+
+                last.word = cfg_data[size >> 2];
+                for (i = value_to_add; i < 4; i++)
+                        last.buf[i] = 0;
+                ret = csio_memory_write(hw, mtype, maddr + size, 4, &last.word);
+        }
         if (ret == 0) {
-                csio_info(hw, "config file upgraded to " CSIO_CF_FNAME "\n");
-                strncpy(path, "/lib/firmware/" CSIO_CF_FNAME, 64);
+                csio_info(hw, "config file upgraded to %s\n",
+                          CSIO_CF_FNAME(hw));
+                snprintf(path, 64, "%s%s", "/lib/firmware/", CSIO_CF_FNAME(hw));
         }
 
 leave:
@@ -2179,7 +1930,7 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 *fw_cfg_param)
 {
         unsigned int mtype, maddr;
         int rv;
-        uint32_t finiver, finicsum, cfcsum;
+        uint32_t finiver = 0, finicsum = 0, cfcsum = 0;
         int using_flash;
         char path[64];
 
@@ -2207,7 +1958,7 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 *fw_cfg_param)
                          * config file from flash.
                          */
                         mtype = FW_MEMTYPE_CF_FLASH;
-                        maddr = csio_hw_flash_cfg_addr(hw);
+                        maddr = hw->chip_ops->chip_flash_cfg_addr(hw);
                         using_flash = 1;
                 } else {
                         /*
@@ -2346,30 +2097,32 @@ csio_hw_flash_fw(struct csio_hw *hw)
         struct pci_dev *pci_dev = hw->pdev;
         struct device *dev = &pci_dev->dev ;
 
-        if (request_firmware(&fw, CSIO_FW_FNAME, dev) < 0) {
-                csio_err(hw, "could not find firmware image " CSIO_FW_FNAME
-                ",err: %d\n", ret);
+        if (request_firmware(&fw, CSIO_FW_FNAME(hw), dev) < 0) {
+                csio_err(hw, "could not find firmware image %s, err: %d\n",
+                         CSIO_FW_FNAME(hw), ret);
                 return -EINVAL;
         }
 
         hdr = (const struct fw_hdr *)fw->data;
         fw_ver = ntohl(hdr->fw_ver);
-        if (FW_HDR_FW_VER_MAJOR_GET(fw_ver) != FW_VERSION_MAJOR)
+        if (FW_HDR_FW_VER_MAJOR_GET(fw_ver) != FW_VERSION_MAJOR(hw))
                 return -EINVAL;      /* wrong major version, won't do */
 
         /*
          * If the flash FW is unusable or we found something newer, load it.
          */
-        if (FW_HDR_FW_VER_MAJOR_GET(hw->fwrev) != FW_VERSION_MAJOR ||
+        if (FW_HDR_FW_VER_MAJOR_GET(hw->fwrev) != FW_VERSION_MAJOR(hw) ||
             fw_ver > hw->fwrev) {
                 ret = csio_hw_fw_upgrade(hw, hw->pfn, fw->data, fw->size,
                                     /*force=*/false);
                 if (!ret)
-                        csio_info(hw, "firmware upgraded to version %pI4 from "
-                                  CSIO_FW_FNAME "\n", &hdr->fw_ver);
+                        csio_info(hw,
+                                  "firmware upgraded to version %pI4 from %s\n",
+                                  &hdr->fw_ver, CSIO_FW_FNAME(hw));
                 else
                         csio_err(hw, "firmware upgrade failed! err=%d\n", ret);
-        }
+        } else
+                ret = -EINVAL;
 
         release_firmware(fw);
 
@@ -2410,7 +2163,7 @@ csio_hw_configure(struct csio_hw *hw)
         /* Set pci completion timeout value to 4 seconds. */
         csio_set_pcie_completion_timeout(hw, 0xd);
 
-        csio_hw_set_mem_win(hw);
+        hw->chip_ops->chip_set_mem_win(hw, MEMWIN_CSIOSTOR);
 
         rv = csio_hw_get_fw_version(hw, &hw->fwrev);
         if (rv != 0)
@@ -2478,6 +2231,8 @@ csio_hw_configure(struct csio_hw *hw)
         } else {
                 if (hw->fw_state == CSIO_DEV_STATE_INIT) {
 
+                        hw->flags |= CSIO_HWF_USING_SOFT_PARAMS;
+
                         /* device parameters */
                         rv = csio_get_device_params(hw);
                         if (rv != 0)
@@ -2651,7 +2406,7 @@ csio_hw_intr_disable(struct csio_hw *hw)
 
 }
 
-static void
+void
 csio_hw_fatal_err(struct csio_hw *hw)
 {
         csio_set_reg_field(hw, SGE_CONTROL, GLOBALENABLE, 0);
@@ -2990,14 +2745,6 @@ csio_hws_pcierr(struct csio_hw *hw, enum csio_hw_ev evt)
 /* END: HW SM                                                                */
 /*****************************************************************************/
 
-/* Slow path handlers */
-struct intr_info {
-        unsigned int mask;       /* bits to check in interrupt status */
-        const char *msg;         /* message to print or NULL */
-        short stat_idx;          /* stat counter to increment or -1 */
-        unsigned short fatal;    /* whether the condition reported is fatal */
-};
-
 /*
  *      csio_handle_intr_status - table driven interrupt handler
  *      @hw: HW instance
@@ -3011,7 +2758,7 @@ struct intr_info {
  *      by an entry specifying mask 0.  Returns the number of fatal interrupt
  *      conditions.
  */
-static int
+int
 csio_handle_intr_status(struct csio_hw *hw, unsigned int reg,
                                  const struct intr_info *acts)
 {
@@ -3038,80 +2785,6 @@ csio_handle_intr_status(struct csio_hw *hw, unsigned int reg,
 }
 
 /*
- * Interrupt handler for the PCIE module.
- */
-static void
-csio_pcie_intr_handler(struct csio_hw *hw)
-{
-        static struct intr_info sysbus_intr_info[] = {
-                { RNPP, "RXNP array parity error", -1, 1 },
-                { RPCP, "RXPC array parity error", -1, 1 },
-                { RCIP, "RXCIF array parity error", -1, 1 },
-                { RCCP, "Rx completions control array parity error", -1, 1 },
-                { RFTP, "RXFT array parity error", -1, 1 },
-                { 0, NULL, 0, 0 }
-        };
-        static struct intr_info pcie_port_intr_info[] = {
-                { TPCP, "TXPC array parity error", -1, 1 },
-                { TNPP, "TXNP array parity error", -1, 1 },
-                { TFTP, "TXFT array parity error", -1, 1 },
-                { TCAP, "TXCA array parity error", -1, 1 },
-                { TCIP, "TXCIF array parity error", -1, 1 },
-                { RCAP, "RXCA array parity error", -1, 1 },
-                { OTDD, "outbound request TLP discarded", -1, 1 },
-                { RDPE, "Rx data parity error", -1, 1 },
-                { TDUE, "Tx uncorrectable data error", -1, 1 },
-                { 0, NULL, 0, 0 }
-        };
-        static struct intr_info pcie_intr_info[] = {
-                { MSIADDRLPERR, "MSI AddrL parity error", -1, 1 },
-                { MSIADDRHPERR, "MSI AddrH parity error", -1, 1 },
-                { MSIDATAPERR, "MSI data parity error", -1, 1 },
-                { MSIXADDRLPERR, "MSI-X AddrL parity error", -1, 1 },
-                { MSIXADDRHPERR, "MSI-X AddrH parity error", -1, 1 },
-                { MSIXDATAPERR, "MSI-X data parity error", -1, 1 },
-                { MSIXDIPERR, "MSI-X DI parity error", -1, 1 },
-                { PIOCPLPERR, "PCI PIO completion FIFO parity error", -1, 1 },
-                { PIOREQPERR, "PCI PIO request FIFO parity error", -1, 1 },
-                { TARTAGPERR, "PCI PCI target tag FIFO parity error", -1, 1 },
-                { CCNTPERR, "PCI CMD channel count parity error", -1, 1 },
-                { CREQPERR, "PCI CMD channel request parity error", -1, 1 },
-                { CRSPPERR, "PCI CMD channel response parity error", -1, 1 },
-                { DCNTPERR, "PCI DMA channel count parity error", -1, 1 },
-                { DREQPERR, "PCI DMA channel request parity error", -1, 1 },
-                { DRSPPERR, "PCI DMA channel response parity error", -1, 1 },
-                { HCNTPERR, "PCI HMA channel count parity error", -1, 1 },
-                { HREQPERR, "PCI HMA channel request parity error", -1, 1 },
-                { HRSPPERR, "PCI HMA channel response parity error", -1, 1 },
-                { CFGSNPPERR, "PCI config snoop FIFO parity error", -1, 1 },
-                { FIDPERR, "PCI FID parity error", -1, 1 },
-                { INTXCLRPERR, "PCI INTx clear parity error", -1, 1 },
-                { MATAGPERR, "PCI MA tag parity error", -1, 1 },
-                { PIOTAGPERR, "PCI PIO tag parity error", -1, 1 },
-                { RXCPLPERR, "PCI Rx completion parity error", -1, 1 },
-                { RXWRPERR, "PCI Rx write parity error", -1, 1 },
-                { RPLPERR, "PCI replay buffer parity error", -1, 1 },
-                { PCIESINT, "PCI core secondary fault", -1, 1 },
-                { PCIEPINT, "PCI core primary fault", -1, 1 },
-                { UNXSPLCPLERR, "PCI unexpected split completion error", -1,
-                  0 },
-                { 0, NULL, 0, 0 }
-        };
-
-        int fat;
-
-        fat = csio_handle_intr_status(hw,
-                                    PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
-                                    sysbus_intr_info) +
-              csio_handle_intr_status(hw,
-                                    PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
-                                    pcie_port_intr_info) +
-              csio_handle_intr_status(hw, PCIE_INT_CAUSE, pcie_intr_info);
-        if (fat)
-                csio_hw_fatal_err(hw);
-}
-
-/*
  * TP interrupt handler.
  */
 static void csio_tp_intr_handler(struct csio_hw *hw)
@@ -3517,7 +3190,7 @@ static void csio_ncsi_intr_handler(struct csio_hw *hw)
  */
 static void csio_xgmac_intr_handler(struct csio_hw *hw, int port)
 {
-        uint32_t v = csio_rd_reg32(hw, PORT_REG(port, XGMAC_PORT_INT_CAUSE));
+        uint32_t v = csio_rd_reg32(hw, CSIO_MAC_INT_CAUSE_REG(hw, port));
 
         v &= TXFIFO_PRTY_ERR | RXFIFO_PRTY_ERR;
         if (!v)
@@ -3527,7 +3200,7 @@ static void csio_xgmac_intr_handler(struct csio_hw *hw, int port)
                 csio_fatal(hw, "XGMAC %d Tx FIFO parity error\n", port);
         if (v & RXFIFO_PRTY_ERR)
                 csio_fatal(hw, "XGMAC %d Rx FIFO parity error\n", port);
-        csio_wr_reg32(hw, v, PORT_REG(port, XGMAC_PORT_INT_CAUSE));
+        csio_wr_reg32(hw, v, CSIO_MAC_INT_CAUSE_REG(hw, port));
         csio_hw_fatal_err(hw);
 }
 
@@ -3596,7 +3269,7 @@ csio_hw_slow_intr_handler(struct csio_hw *hw)
                 csio_xgmac_intr_handler(hw, 3);
 
         if (cause & PCIE)
-                csio_pcie_intr_handler(hw);
+                hw->chip_ops->chip_pcie_intr_handler(hw);
 
         if (cause & MC)
                 csio_mem_intr_handler(hw, MEM_MC);
@@ -4257,6 +3930,7 @@ csio_hw_get_device_id(struct csio_hw *hw)
                              &hw->params.pci.device_id);
 
         csio_dev_id_cached(hw);
+        hw->chip_id = (hw->params.pci.device_id & CSIO_HW_CHIP_MASK);
 
 } /* csio_hw_get_device_id */
 
@@ -4275,19 +3949,21 @@ csio_hw_set_description(struct csio_hw *hw, uint16_t ven_id, uint16_t dev_id)
                 prot_type = (dev_id & CSIO_ASIC_DEVID_PROTO_MASK);
                 adap_type = (dev_id & CSIO_ASIC_DEVID_TYPE_MASK);
 
-                if (prot_type == CSIO_FPGA) {
+                if (prot_type == CSIO_T4_FCOE_ASIC) {
+                        memcpy(hw->hw_ver,
+                               csio_t4_fcoe_adapters[adap_type].model_no, 16);
                         memcpy(hw->model_desc,
-                                csio_fcoe_adapters[13].description, 32);
-                } else if (prot_type == CSIO_T4_FCOE_ASIC) {
+                               csio_t4_fcoe_adapters[adap_type].description,
+                               32);
+                } else if (prot_type == CSIO_T5_FCOE_ASIC) {
                         memcpy(hw->hw_ver,
-                               csio_fcoe_adapters[adap_type].model_no, 16);
+                               csio_t5_fcoe_adapters[adap_type].model_no, 16);
                         memcpy(hw->model_desc,
-                                csio_fcoe_adapters[adap_type].description, 32);
+                               csio_t5_fcoe_adapters[adap_type].description,
+                               32);
                 } else {
                         char tempName[32] = "Chelsio FCoE Controller";
                         memcpy(hw->model_desc, tempName, 32);
-
-                        CSIO_DB_ASSERT(0);
                 }
         }
 } /* csio_hw_set_description */
@@ -4316,6 +3992,9 @@ csio_hw_init(struct csio_hw *hw)
 
         strcpy(hw->name, CSIO_HW_NAME);
 
+        /* Initialize the HW chip ops with T4/T5 specific ops */
+        hw->chip_ops = csio_is_t4(hw->chip_id) ? &t4_ops : &t5_ops;
+
         /* Set the model & its description */
 
         ven_id = hw->params.pci.vendor_id;
diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index 9edcca4c71af..489fc095cb03 100644
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -48,6 +48,7 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_transport_fc.h>
 
+#include "csio_hw_chip.h"
 #include "csio_wr.h"
 #include "csio_mb.h"
 #include "csio_scsi.h"
@@ -60,13 +61,6 @@
  */
 #define FW_HOSTERROR                    255
 
-#define CSIO_FW_FNAME           "cxgb4/t4fw.bin"
-#define CSIO_CF_FNAME           "cxgb4/t4-config.txt"
-
-#define FW_VERSION_MAJOR        1
-#define FW_VERSION_MINOR        2
-#define FW_VERSION_MICRO        8
-
 #define CSIO_HW_NAME            "Chelsio FCoE Adapter"
 #define CSIO_MAX_PFN            8
 #define CSIO_MAX_PPORTS         4
@@ -123,8 +117,6 @@ extern int csio_msi;
 #define CSIO_VENDOR_ID                          0x1425
 #define CSIO_ASIC_DEVID_PROTO_MASK              0xFF00
 #define CSIO_ASIC_DEVID_TYPE_MASK               0x00FF
-#define CSIO_FPGA                               0xA000
-#define CSIO_T4_FCOE_ASIC                       0x4600
 
 #define CSIO_GLBL_INTR_MASK             (CIM | MPS | PL | PCIE | MC | EDC0 | \
                                          EDC1 | LE | TP | MA | PM_TX | PM_RX | \
@@ -207,17 +199,6 @@ enum {
         SF_SIZE = SF_SEC_SIZE * 16,   /* serial flash size */
 };
 
-enum { MEM_EDC0, MEM_EDC1, MEM_MC };
-
-enum {
-        MEMWIN0_APERTURE = 2048,
-        MEMWIN0_BASE     = 0x1b800,
-        MEMWIN1_APERTURE = 32768,
-        MEMWIN1_BASE     = 0x28000,
-        MEMWIN2_APERTURE = 65536,
-        MEMWIN2_BASE     = 0x30000,
-};
-
 /* serial flash and firmware constants */
 enum {
         SF_ATTEMPTS = 10,             /* max retries for SF operations */
@@ -239,9 +220,6 @@ enum {
         FLASH_CFG_MAX_SIZE    = 0x10000 , /* max size of the flash config file*/
         FLASH_CFG_OFFSET      = 0x1f0000,
         FLASH_CFG_START_SEC   = FLASH_CFG_OFFSET / SF_SEC_SIZE,
-        FPGA_FLASH_CFG_OFFSET = 0xf0000 , /* if FPGA mode, then cfg file is
-                                           * at 1MB - 64KB */
-        FPGA_FLASH_CFG_START_SEC  = FPGA_FLASH_CFG_OFFSET / SF_SEC_SIZE,
 };
 
 /*
@@ -259,6 +237,8 @@ enum {
         FLASH_FW_START = FLASH_START(FLASH_FW_START_SEC),
         FLASH_FW_MAX_SIZE = FLASH_MAX_SIZE(FLASH_FW_NSECS),
 
+        /* Location of Firmware Configuration File in FLASH. */
+        FLASH_CFG_START = FLASH_START(FLASH_CFG_START_SEC),
 };
 
 #undef FLASH_START
@@ -310,7 +290,7 @@ struct csio_adap_desc {
 struct pci_params {
         uint16_t   vendor_id;
         uint16_t   device_id;
-        uint32_t   vpd_cap_addr;
+        int        vpd_cap_addr;
         uint16_t   speed;
         uint8_t    width;
 };
@@ -513,6 +493,7 @@ struct csio_hw {
         uint32_t                fwrev;
         uint32_t                tp_vers;
         char                    chip_ver;
+        uint16_t                chip_id;                /* Tells T4/T5 chip */
         uint32_t                cfg_finiver;
         uint32_t                cfg_finicsum;
         uint32_t                cfg_cfcsum;
@@ -556,6 +537,9 @@ struct csio_hw {
                                                          */
 
         struct csio_fcoe_res_info  fres_info;           /* Fcoe resource info */
+        struct csio_hw_chip_ops *chip_ops;              /* T4/T5 Chip specific
+                                                         * Operations
+                                                         */
 
         /* MSIX vectors */
         struct csio_msix_entries msix_entries[CSIO_MAX_MSIX_VECS];
@@ -636,9 +620,16 @@ csio_us_to_core_ticks(struct csio_hw *hw, uint32_t us)
 #define csio_dbg(__hw, __fmt, ...)
 #endif
 
+int csio_hw_wait_op_done_val(struct csio_hw *, int, uint32_t, int,
+                             int, int, uint32_t *);
+void csio_hw_tp_wr_bits_indirect(struct csio_hw *, unsigned int,
+                                 unsigned int, unsigned int);
 int csio_mgmt_req_lookup(struct csio_mgmtm *, struct csio_ioreq *);
 void csio_hw_intr_disable(struct csio_hw *);
-int csio_hw_slow_intr_handler(struct csio_hw *hw);
+int csio_hw_slow_intr_handler(struct csio_hw *);
+int csio_handle_intr_status(struct csio_hw *, unsigned int,
+                            const struct intr_info *);
+
 int csio_hw_start(struct csio_hw *);
 int csio_hw_stop(struct csio_hw *);
 int csio_hw_reset(struct csio_hw *);
@@ -647,19 +638,17 @@ int csio_is_hw_removing(struct csio_hw *);
 
 int csio_fwevtq_handler(struct csio_hw *);
 void csio_evtq_worker(struct work_struct *);
-int csio_enqueue_evt(struct csio_hw *hw, enum csio_evt type,
-                                void *evt_msg, uint16_t len);
+int csio_enqueue_evt(struct csio_hw *, enum csio_evt, void *, uint16_t);
 void csio_evtq_flush(struct csio_hw *hw);
 
 int csio_request_irqs(struct csio_hw *);
 void csio_intr_enable(struct csio_hw *);
 void csio_intr_disable(struct csio_hw *, bool);
+void csio_hw_fatal_err(struct csio_hw *);
 
 struct csio_lnode *csio_lnode_alloc(struct csio_hw *);
 int csio_config_queues(struct csio_hw *);
 
-int csio_hw_mc_read(struct csio_hw *, uint32_t, __be32 *, uint64_t *);
-int csio_hw_edc_read(struct csio_hw *, int, uint32_t, __be32 *, uint64_t *);
 int csio_hw_init(struct csio_hw *);
 void csio_hw_exit(struct csio_hw *);
 #endif /* ifndef __CSIO_HW_H__ */
diff --git a/drivers/scsi/csiostor/csio_hw_chip.h b/drivers/scsi/csiostor/csio_hw_chip.h
new file mode 100644
index 000000000000..bca0de61ae80
--- /dev/null
+++ b/drivers/scsi/csiostor/csio_hw_chip.h
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the Chelsio FCoE driver for Linux.
+ *
+ * Copyright (c) 2008-2013 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef __CSIO_HW_CHIP_H__
+#define __CSIO_HW_CHIP_H__
+
+#include "csio_defs.h"
+
+/* FCoE device IDs for T4 */
+#define CSIO_DEVID_T440DBG_FCOE                 0x4600
+#define CSIO_DEVID_T420CR_FCOE                  0x4601
+#define CSIO_DEVID_T422CR_FCOE                  0x4602
+#define CSIO_DEVID_T440CR_FCOE                  0x4603
+#define CSIO_DEVID_T420BCH_FCOE                 0x4604
+#define CSIO_DEVID_T440BCH_FCOE                 0x4605
+#define CSIO_DEVID_T440CH_FCOE                  0x4606
+#define CSIO_DEVID_T420SO_FCOE                  0x4607
+#define CSIO_DEVID_T420CX_FCOE                  0x4608
+#define CSIO_DEVID_T420BT_FCOE                  0x4609
+#define CSIO_DEVID_T404BT_FCOE                  0x460A
+#define CSIO_DEVID_B420_FCOE                    0x460B
+#define CSIO_DEVID_B404_FCOE                    0x460C
+#define CSIO_DEVID_T480CR_FCOE                  0x460D
+#define CSIO_DEVID_T440LPCR_FCOE                0x460E
+#define CSIO_DEVID_AMSTERDAM_T4_FCOE            0x460F
+#define CSIO_DEVID_HUAWEI_T480_FCOE             0x4680
+#define CSIO_DEVID_HUAWEI_T440_FCOE             0x4681
+#define CSIO_DEVID_HUAWEI_STG310_FCOE           0x4682
+#define CSIO_DEVID_ACROMAG_XMC_XAUI             0x4683
+#define CSIO_DEVID_ACROMAG_XMC_SFP_FCOE         0x4684
+#define CSIO_DEVID_QUANTA_MEZZ_SFP_FCOE         0x4685
+#define CSIO_DEVID_HUAWEI_10GT_FCOE             0x4686
+#define CSIO_DEVID_HUAWEI_T440_TOE_FCOE         0x4687
+
+/* FCoE device IDs for T5 */
+#define CSIO_DEVID_T580DBG_FCOE                 0x5600
+#define CSIO_DEVID_T520CR_FCOE                  0x5601
+#define CSIO_DEVID_T522CR_FCOE                  0x5602
+#define CSIO_DEVID_T540CR_FCOE                  0x5603
+#define CSIO_DEVID_T520BCH_FCOE                 0x5604
+#define CSIO_DEVID_T540BCH_FCOE                 0x5605
+#define CSIO_DEVID_T540CH_FCOE                  0x5606
+#define CSIO_DEVID_T520SO_FCOE                  0x5607
+#define CSIO_DEVID_T520CX_FCOE                  0x5608
+#define CSIO_DEVID_T520BT_FCOE                  0x5609
+#define CSIO_DEVID_T504BT_FCOE                  0x560A
+#define CSIO_DEVID_B520_FCOE                    0x560B
+#define CSIO_DEVID_B504_FCOE                    0x560C
+#define CSIO_DEVID_T580CR2_FCOE                 0x560D
+#define CSIO_DEVID_T540LPCR_FCOE                0x560E
+#define CSIO_DEVID_AMSTERDAM_T5_FCOE            0x560F
+#define CSIO_DEVID_T580LPCR_FCOE                0x5610
+#define CSIO_DEVID_T520LLCR_FCOE                0x5611
+#define CSIO_DEVID_T560CR_FCOE                  0x5612
+#define CSIO_DEVID_T580CR_FCOE                  0x5613
+
+/* Define MACRO values */
+#define CSIO_HW_T4                              0x4000
+#define CSIO_T4_FCOE_ASIC                       0x4600
+#define CSIO_HW_T5                              0x5000
+#define CSIO_T5_FCOE_ASIC                       0x5600
+#define CSIO_HW_CHIP_MASK                       0xF000
+#define T4_REGMAP_SIZE                          (160 * 1024)
+#define T5_REGMAP_SIZE                          (332 * 1024)
+#define FW_FNAME_T4                             "cxgb4/t4fw.bin"
+#define FW_FNAME_T5                             "cxgb4/t5fw.bin"
+#define FW_CFG_NAME_T4                          "cxgb4/t4-config.txt"
+#define FW_CFG_NAME_T5                          "cxgb4/t5-config.txt"
+
+/* Define static functions */
+static inline int csio_is_t4(uint16_t chip)
+{
+        return (chip == CSIO_HW_T4);
+}
+
+static inline int csio_is_t5(uint16_t chip)
+{
+        return (chip == CSIO_HW_T5);
+}
+
+/* Define MACRO DEFINITIONS */
+#define CSIO_DEVICE(devid, idx)                                         \
+        { PCI_VENDOR_ID_CHELSIO, (devid), PCI_ANY_ID, PCI_ANY_ID, 0, 0, (idx) }
+
+#define CSIO_HW_PIDX(hw, index)                                         \
+        (csio_is_t4(hw->chip_id) ? (PIDX(index)) :                      \
+                                        (PIDX_T5(index) | DBTYPE(1U)))
+
+#define CSIO_HW_LP_INT_THRESH(hw, val)                                  \
+        (csio_is_t4(hw->chip_id) ? (LP_INT_THRESH(val)) :               \
+                                        (V_LP_INT_THRESH_T5(val)))
+
+#define CSIO_HW_M_LP_INT_THRESH(hw)                                     \
+        (csio_is_t4(hw->chip_id) ? (LP_INT_THRESH_MASK) : (M_LP_INT_THRESH_T5))
+
+#define CSIO_MAC_INT_CAUSE_REG(hw, port)                                \
+        (csio_is_t4(hw->chip_id) ? (PORT_REG(port, XGMAC_PORT_INT_CAUSE)) : \
+                                (T5_PORT_REG(port, MAC_PORT_INT_CAUSE)))
+
+#define FW_VERSION_MAJOR(hw) (csio_is_t4(hw->chip_id) ? 1 : 0)
+#define FW_VERSION_MINOR(hw) (csio_is_t4(hw->chip_id) ? 2 : 0)
+#define FW_VERSION_MICRO(hw) (csio_is_t4(hw->chip_id) ? 8 : 0)
+
+#define CSIO_FW_FNAME(hw)                                               \
+        (csio_is_t4(hw->chip_id) ? FW_FNAME_T4 : FW_FNAME_T5)
+
+#define CSIO_CF_FNAME(hw)                                               \
+        (csio_is_t4(hw->chip_id) ? FW_CFG_NAME_T4 : FW_CFG_NAME_T5)
+
+/* Declare ENUMS */
+enum { MEM_EDC0, MEM_EDC1, MEM_MC, MEM_MC0 = MEM_MC, MEM_MC1 };
+
+enum {
+        MEMWIN_APERTURE = 2048,
+        MEMWIN_BASE     = 0x1b800,
+        MEMWIN_CSIOSTOR = 6,            /* PCI-e Memory Window access */
+};
+
+/* Slow path handlers */
+struct intr_info {
+        unsigned int mask;       /* bits to check in interrupt status */
+        const char *msg;         /* message to print or NULL */
+        short stat_idx;          /* stat counter to increment or -1 */
+        unsigned short fatal;    /* whether the condition reported is fatal */
+};
+
+/* T4/T5 Chip specific ops */
+struct csio_hw;
+struct csio_hw_chip_ops {
+        int (*chip_set_mem_win)(struct csio_hw *, uint32_t);
+        void (*chip_pcie_intr_handler)(struct csio_hw *);
+        uint32_t (*chip_flash_cfg_addr)(struct csio_hw *);
+        int (*chip_mc_read)(struct csio_hw *, int, uint32_t,
+                                        __be32 *, uint64_t *);
+        int (*chip_edc_read)(struct csio_hw *, int, uint32_t,
+                                        __be32 *, uint64_t *);
+        int (*chip_memory_rw)(struct csio_hw *, u32, int, u32,
+                                        u32, uint32_t *, int);
+        void (*chip_dfs_create_ext_mem)(struct csio_hw *);
+};
+
+extern struct csio_hw_chip_ops t4_ops;
+extern struct csio_hw_chip_ops t5_ops;
+
+#endif /* #ifndef __CSIO_HW_CHIP_H__ */
diff --git a/drivers/scsi/csiostor/csio_hw_t4.c b/drivers/scsi/csiostor/csio_hw_t4.c
new file mode 100644
index 000000000000..89ecbac5478f
--- /dev/null
+++ b/drivers/scsi/csiostor/csio_hw_t4.c
@@ -0,0 +1,403 @@
+/*
+ * This file is part of the Chelsio FCoE driver for Linux.
+ *
+ * Copyright (c) 2008-2013 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "csio_hw.h"
+#include "csio_init.h"
+
+/*
+ * Return the specified PCI-E Configuration Space register from our Physical
+ * Function.  We try first via a Firmware LDST Command since we prefer to let
+ * the firmware own all of these registers, but if that fails we go for it
+ * directly ourselves.
+ */
+static uint32_t
+csio_t4_read_pcie_cfg4(struct csio_hw *hw, int reg)
+{
+        u32 val = 0;
+        struct csio_mb *mbp;
+        int rv;
+        struct fw_ldst_cmd *ldst_cmd;
+
+        mbp = mempool_alloc(hw->mb_mempool, GFP_ATOMIC);
+        if (!mbp) {
+                CSIO_INC_STATS(hw, n_err_nomem);
+                pci_read_config_dword(hw->pdev, reg, &val);
+                return val;
+        }
+
+        csio_mb_ldst(hw, mbp, CSIO_MB_DEFAULT_TMO, reg);
+        rv = csio_mb_issue(hw, mbp);
+
+        /*
+         * If the LDST Command suucceeded, exctract the returned register
+         * value.  Otherwise read it directly ourself.
+         */
+        if (rv == 0) {
+                ldst_cmd = (struct fw_ldst_cmd *)(mbp->mb);
+                val = ntohl(ldst_cmd->u.pcie.data[0]);
+        } else
+                pci_read_config_dword(hw->pdev, reg, &val);
+
+        mempool_free(mbp, hw->mb_mempool);
+
+        return val;
+}
+
+static int
+csio_t4_set_mem_win(struct csio_hw *hw, uint32_t win)
+{
+        u32 bar0;
+        u32 mem_win_base;
+
+        /*
+         * Truncation intentional: we only read the bottom 32-bits of the
+         * 64-bit BAR0/BAR1 ...  We use the hardware backdoor mechanism to
+         * read BAR0 instead of using pci_resource_start() because we could be
+         * operating from within a Virtual Machine which is trapping our
+         * accesses to our Configuration Space and we need to set up the PCI-E
+         * Memory Window decoders with the actual addresses which will be
+         * coming across the PCI-E link.
+         */
+        bar0 = csio_t4_read_pcie_cfg4(hw, PCI_BASE_ADDRESS_0);
+        bar0 &= PCI_BASE_ADDRESS_MEM_MASK;
+
+        mem_win_base = bar0 + MEMWIN_BASE;
+
+        /*
+         * Set up memory window for accessing adapter memory ranges.  (Read
+         * back MA register to ensure that changes propagate before we attempt
+         * to use the new values.)
+         */
+        csio_wr_reg32(hw, mem_win_base | BIR(0) |
+                          WINDOW(ilog2(MEMWIN_APERTURE) - 10),
+                          PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, win));
+        csio_rd_reg32(hw,
+                      PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, win));
+        return 0;
+}
+
+/*
+ * Interrupt handler for the PCIE module.
+ */
+static void
+csio_t4_pcie_intr_handler(struct csio_hw *hw)
+{
+        static struct intr_info sysbus_intr_info[] = {
+                { RNPP, "RXNP array parity error", -1, 1 },
+                { RPCP, "RXPC array parity error", -1, 1 },
+                { RCIP, "RXCIF array parity error", -1, 1 },
+                { RCCP, "Rx completions control array parity error", -1, 1 },
+                { RFTP, "RXFT array parity error", -1, 1 },
+                { 0, NULL, 0, 0 }
+        };
+        static struct intr_info pcie_port_intr_info[] = {
+                { TPCP, "TXPC array parity error", -1, 1 },
+                { TNPP, "TXNP array parity error", -1, 1 },
+                { TFTP, "TXFT array parity error", -1, 1 },
+                { TCAP, "TXCA array parity error", -1, 1 },
+                { TCIP, "TXCIF array parity error", -1, 1 },
+                { RCAP, "RXCA array parity error", -1, 1 },
+                { OTDD, "outbound request TLP discarded", -1, 1 },
+                { RDPE, "Rx data parity error", -1, 1 },
+                { TDUE, "Tx uncorrectable data error", -1, 1 },
+                { 0, NULL, 0, 0 }
+        };
+
+        static struct intr_info pcie_intr_info[] = {
+                { MSIADDRLPERR, "MSI AddrL parity error", -1, 1 },
+                { MSIADDRHPERR, "MSI AddrH parity error", -1, 1 },
+                { MSIDATAPERR, "MSI data parity error", -1, 1 },
+                { MSIXADDRLPERR, "MSI-X AddrL parity error", -1, 1 },
+                { MSIXADDRHPERR, "MSI-X AddrH parity error", -1, 1 },
+                { MSIXDATAPERR, "MSI-X data parity error", -1, 1 },
+                { MSIXDIPERR, "MSI-X DI parity error", -1, 1 },
+                { PIOCPLPERR, "PCI PIO completion FIFO parity error", -1, 1 },
+                { PIOREQPERR, "PCI PIO request FIFO parity error", -1, 1 },
+                { TARTAGPERR, "PCI PCI target tag FIFO parity error", -1, 1 },
+                { CCNTPERR, "PCI CMD channel count parity error", -1, 1 },
+                { CREQPERR, "PCI CMD channel request parity error", -1, 1 },
+                { CRSPPERR, "PCI CMD channel response parity error", -1, 1 },
+                { DCNTPERR, "PCI DMA channel count parity error", -1, 1 },
+                { DREQPERR, "PCI DMA channel request parity error", -1, 1 },
+                { DRSPPERR, "PCI DMA channel response parity error", -1, 1 },
+                { HCNTPERR, "PCI HMA channel count parity error", -1, 1 },
+                { HREQPERR, "PCI HMA channel request parity error", -1, 1 },
+                { HRSPPERR, "PCI HMA channel response parity error", -1, 1 },
+                { CFGSNPPERR, "PCI config snoop FIFO parity error", -1, 1 },
+                { FIDPERR, "PCI FID parity error", -1, 1 },
+                { INTXCLRPERR, "PCI INTx clear parity error", -1, 1 },
+                { MATAGPERR, "PCI MA tag parity error", -1, 1 },
+                { PIOTAGPERR, "PCI PIO tag parity error", -1, 1 },
+                { RXCPLPERR, "PCI Rx completion parity error", -1, 1 },
+                { RXWRPERR, "PCI Rx write parity error", -1, 1 },
+                { RPLPERR, "PCI replay buffer parity error", -1, 1 },
+                { PCIESINT, "PCI core secondary fault", -1, 1 },
+                { PCIEPINT, "PCI core primary fault", -1, 1 },
+                { UNXSPLCPLERR, "PCI unexpected split completion error", -1,
+                  0 },
+                { 0, NULL, 0, 0 }
+        };
+
+        int fat;
+        fat = csio_handle_intr_status(hw,
+                                      PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
+                                      sysbus_intr_info) +
+              csio_handle_intr_status(hw,
+                                      PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
+                                      pcie_port_intr_info) +
+              csio_handle_intr_status(hw, PCIE_INT_CAUSE, pcie_intr_info);
+        if (fat)
+                csio_hw_fatal_err(hw);
+}
+
+/*
+ * csio_t4_flash_cfg_addr - return the address of the flash configuration file
+ * @hw: the HW module
+ *
+ * Return the address within the flash where the Firmware Configuration
+ * File is stored.
+ */
+static unsigned int
+csio_t4_flash_cfg_addr(struct csio_hw *hw)
+{
+        return FLASH_CFG_OFFSET;
+}
+
+/*
+ *      csio_t4_mc_read - read from MC through backdoor accesses
+ *      @hw: the hw module
+ *      @idx: not used for T4 adapter
+ *      @addr: address of first byte requested
+ *      @data: 64 bytes of data containing the requested address
+ *      @ecc: where to store the corresponding 64-bit ECC word
+ *
+ *      Read 64 bytes of data from MC starting at a 64-byte-aligned address
+ *      that covers the requested address @addr.  If @parity is not %NULL it
+ *      is assigned the 64-bit ECC word for the read data.
+ */
+static int
+csio_t4_mc_read(struct csio_hw *hw, int idx, uint32_t addr, __be32 *data,
+                uint64_t *ecc)
+{
+        int i;
+
+        if (csio_rd_reg32(hw, MC_BIST_CMD) & START_BIST)
+                return -EBUSY;
+        csio_wr_reg32(hw, addr & ~0x3fU, MC_BIST_CMD_ADDR);
+        csio_wr_reg32(hw, 64, MC_BIST_CMD_LEN);
+        csio_wr_reg32(hw, 0xc, MC_BIST_DATA_PATTERN);
+        csio_wr_reg32(hw, BIST_OPCODE(1) | START_BIST | BIST_CMD_GAP(1),
+                      MC_BIST_CMD);
+        i = csio_hw_wait_op_done_val(hw, MC_BIST_CMD, START_BIST,
+                                     0, 10, 1, NULL);
+        if (i)
+                return i;
+
+#define MC_DATA(i) MC_BIST_STATUS_REG(MC_BIST_STATUS_RDATA, i)
+
+        for (i = 15; i >= 0; i--)
+                *data++ = htonl(csio_rd_reg32(hw, MC_DATA(i)));
+        if (ecc)
+                *ecc = csio_rd_reg64(hw, MC_DATA(16));
+#undef MC_DATA
+        return 0;
+}
+
+/*
+ *      csio_t4_edc_read - read from EDC through backdoor accesses
+ *      @hw: the hw module
+ *      @idx: which EDC to access
+ *      @addr: address of first byte requested
+ *      @data: 64 bytes of data containing the requested address
+ *      @ecc: where to store the corresponding 64-bit ECC word
+ *
+ *      Read 64 bytes of data from EDC starting at a 64-byte-aligned address
+ *      that covers the requested address @addr.  If @parity is not %NULL it
+ *      is assigned the 64-bit ECC word for the read data.
+ */
+static int
+csio_t4_edc_read(struct csio_hw *hw, int idx, uint32_t addr, __be32 *data,
+                uint64_t *ecc)
+{
+        int i;
+
+        idx *= EDC_STRIDE;
+        if (csio_rd_reg32(hw, EDC_BIST_CMD + idx) & START_BIST)
+                return -EBUSY;
+        csio_wr_reg32(hw, addr & ~0x3fU, EDC_BIST_CMD_ADDR + idx);
+        csio_wr_reg32(hw, 64, EDC_BIST_CMD_LEN + idx);
+        csio_wr_reg32(hw, 0xc, EDC_BIST_DATA_PATTERN + idx);
+        csio_wr_reg32(hw, BIST_OPCODE(1) | BIST_CMD_GAP(1) | START_BIST,
+                      EDC_BIST_CMD + idx);
+        i = csio_hw_wait_op_done_val(hw, EDC_BIST_CMD + idx, START_BIST,
+                                     0, 10, 1, NULL);
+        if (i)
+                return i;
+
+#define EDC_DATA(i) (EDC_BIST_STATUS_REG(EDC_BIST_STATUS_RDATA, i) + idx)
+
+        for (i = 15; i >= 0; i--)
+                *data++ = htonl(csio_rd_reg32(hw, EDC_DATA(i)));
+        if (ecc)
+                *ecc = csio_rd_reg64(hw, EDC_DATA(16));
+#undef EDC_DATA
+        return 0;
+}
+
+/*
+ * csio_t4_memory_rw - read/write EDC 0, EDC 1 or MC via PCIE memory window
+ * @hw: the csio_hw
+ * @win: PCI-E memory Window to use
+ * @mtype: memory type: MEM_EDC0, MEM_EDC1, MEM_MC0 (or MEM_MC) or MEM_MC1
+ * @addr: address within indicated memory type
+ * @len: amount of memory to transfer
+ * @buf: host memory buffer
+ * @dir: direction of transfer 1 => read, 0 => write
+ *
+ * Reads/writes an [almost] arbitrary memory region in the firmware: the
+ * firmware memory address, length and host buffer must be aligned on
+ * 32-bit boudaries.  The memory is transferred as a raw byte sequence
+ * from/to the firmware's memory.  If this memory contains data
+ * structures which contain multi-byte integers, it's the callers
+ * responsibility to perform appropriate byte order conversions.
+ */
+static int
+csio_t4_memory_rw(struct csio_hw *hw, u32 win, int mtype, u32 addr,
+                u32 len, uint32_t *buf, int dir)
+{
+        u32 pos, start, offset, memoffset, bar0;
+        u32 edc_size, mc_size, mem_reg, mem_aperture, mem_base;
+
+        /*
+         * Argument sanity checks ...
+         */
+        if ((addr & 0x3) || (len & 0x3))
+                return -EINVAL;
+
+        /* Offset into the region of memory which is being accessed
+         * MEM_EDC0 = 0
+         * MEM_EDC1 = 1
+         * MEM_MC   = 2 -- T4
+         */
+        edc_size  = EDRAM_SIZE_GET(csio_rd_reg32(hw, MA_EDRAM0_BAR));
+        if (mtype != MEM_MC1)
+                memoffset = (mtype * (edc_size * 1024 * 1024));
+        else {
+                mc_size = EXT_MEM_SIZE_GET(csio_rd_reg32(hw,
+                                                         MA_EXT_MEMORY_BAR));
+                memoffset = (MEM_MC0 * edc_size + mc_size) * 1024 * 1024;
+        }
+
+        /* Determine the PCIE_MEM_ACCESS_OFFSET */
+        addr = addr + memoffset;
+
+        /*
+         * Each PCI-E Memory Window is programmed with a window size -- or
+         * "aperture" -- which controls the granularity of its mapping onto
+         * adapter memory.  We need to grab that aperture in order to know
+         * how to use the specified window.  The window is also programmed
+         * with the base address of the Memory Window in BAR0's address
+         * space.  For T4 this is an absolute PCI-E Bus Address.  For T5
+         * the address is relative to BAR0.
+         */
+        mem_reg = csio_rd_reg32(hw,
+                        PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, win));
+        mem_aperture = 1 << (WINDOW(mem_reg) + 10);
+        mem_base = GET_PCIEOFST(mem_reg) << 10;
+
+        bar0 = csio_t4_read_pcie_cfg4(hw, PCI_BASE_ADDRESS_0);
+        bar0 &= PCI_BASE_ADDRESS_MEM_MASK;
+        mem_base -= bar0;
+
+        start = addr & ~(mem_aperture-1);
+        offset = addr - start;
+
+        csio_dbg(hw, "csio_t4_memory_rw: mem_reg: 0x%x, mem_aperture: 0x%x\n",
+                 mem_reg, mem_aperture);
+        csio_dbg(hw, "csio_t4_memory_rw: mem_base: 0x%x, mem_offset: 0x%x\n",
+                 mem_base, memoffset);
+        csio_dbg(hw, "csio_t4_memory_rw: bar0: 0x%x, start:0x%x, offset:0x%x\n",
+                 bar0, start, offset);
+        csio_dbg(hw, "csio_t4_memory_rw: mtype: %d, addr: 0x%x, len: %d\n",
+                 mtype, addr, len);
+
+        for (pos = start; len > 0; pos += mem_aperture, offset = 0) {
+                /*
+                 * Move PCI-E Memory Window to our current transfer
+                 * position.  Read it back to ensure that changes propagate
+                 * before we attempt to use the new value.
+                 */
+                csio_wr_reg32(hw, pos,
+                        PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET, win));
+                csio_rd_reg32(hw,
+                        PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET, win));
+
+                while (offset < mem_aperture && len > 0) {
+                        if (dir)
+                                *buf++ = csio_rd_reg32(hw, mem_base + offset);
+                        else
+                                csio_wr_reg32(hw, *buf++, mem_base + offset);
+
+                        offset += sizeof(__be32);
+                        len -= sizeof(__be32);
+                }
+        }
+        return 0;
+}
+
+/*
+ * csio_t4_dfs_create_ext_mem - setup debugfs for MC to read the values
+ * @hw: the csio_hw
+ *
+ * This function creates files in the debugfs with external memory region MC.
+ */
+static void
+csio_t4_dfs_create_ext_mem(struct csio_hw *hw)
+{
+        u32 size;
+        int i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE);
+        if (i & EXT_MEM_ENABLE) {
+                size = csio_rd_reg32(hw, MA_EXT_MEMORY_BAR);
+                csio_add_debugfs_mem(hw, "mc", MEM_MC,
+                                     EXT_MEM_SIZE_GET(size));
+        }
+}
+
+/* T4 adapter specific function */
+struct csio_hw_chip_ops t4_ops = {
+        .chip_set_mem_win               = csio_t4_set_mem_win,
+        .chip_pcie_intr_handler         = csio_t4_pcie_intr_handler,
+        .chip_flash_cfg_addr            = csio_t4_flash_cfg_addr,
+        .chip_mc_read                   = csio_t4_mc_read,
+        .chip_edc_read                  = csio_t4_edc_read,
+        .chip_memory_rw                 = csio_t4_memory_rw,
+        .chip_dfs_create_ext_mem        = csio_t4_dfs_create_ext_mem,
+};
diff --git a/drivers/scsi/csiostor/csio_hw_t5.c b/drivers/scsi/csiostor/csio_hw_t5.c
new file mode 100644
index 000000000000..27745c170c24
--- /dev/null
+++ b/drivers/scsi/csiostor/csio_hw_t5.c
@@ -0,0 +1,397 @@
+/*
+ * This file is part of the Chelsio FCoE driver for Linux.
+ *
+ * Copyright (c) 2008-2013 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "csio_hw.h"
+#include "csio_init.h"
+
+static int
+csio_t5_set_mem_win(struct csio_hw *hw, uint32_t win)
+{
+        u32 mem_win_base;
+        /*
+         * Truncation intentional: we only read the bottom 32-bits of the
+         * 64-bit BAR0/BAR1 ...  We use the hardware backdoor mechanism to
+         * read BAR0 instead of using pci_resource_start() because we could be
+         * operating from within a Virtual Machine which is trapping our
+         * accesses to our Configuration Space and we need to set up the PCI-E
+         * Memory Window decoders with the actual addresses which will be
+         * coming across the PCI-E link.
+         */
+
+        /* For T5, only relative offset inside the PCIe BAR is passed */
+        mem_win_base = MEMWIN_BASE;
+
+        /*
+         * Set up memory window for accessing adapter memory ranges.  (Read
+         * back MA register to ensure that changes propagate before we attempt
+         * to use the new values.)
+         */
+        csio_wr_reg32(hw, mem_win_base | BIR(0) |
+                          WINDOW(ilog2(MEMWIN_APERTURE) - 10),
+                          PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, win));
+        csio_rd_reg32(hw,
+                      PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, win));
+
+        return 0;
+}
+
+/*
+ * Interrupt handler for the PCIE module.
+ */
+static void
+csio_t5_pcie_intr_handler(struct csio_hw *hw)
+{
+        static struct intr_info sysbus_intr_info[] = {
+                { RNPP, "RXNP array parity error", -1, 1 },
+                { RPCP, "RXPC array parity error", -1, 1 },
+                { RCIP, "RXCIF array parity error", -1, 1 },
+                { RCCP, "Rx completions control array parity error", -1, 1 },
+                { RFTP, "RXFT array parity error", -1, 1 },
+                { 0, NULL, 0, 0 }
+        };
+        static struct intr_info pcie_port_intr_info[] = {
+                { TPCP, "TXPC array parity error", -1, 1 },
+                { TNPP, "TXNP array parity error", -1, 1 },
+                { TFTP, "TXFT array parity error", -1, 1 },
+                { TCAP, "TXCA array parity error", -1, 1 },
+                { TCIP, "TXCIF array parity error", -1, 1 },
+                { RCAP, "RXCA array parity error", -1, 1 },
+                { OTDD, "outbound request TLP discarded", -1, 1 },
+                { RDPE, "Rx data parity error", -1, 1 },
+                { TDUE, "Tx uncorrectable data error", -1, 1 },
+                { 0, NULL, 0, 0 }
+        };
+
+        static struct intr_info pcie_intr_info[] = {
+                { MSTGRPPERR, "Master Response Read Queue parity error",
+                -1, 1 },
+                { MSTTIMEOUTPERR, "Master Timeout FIFO parity error", -1, 1 },
+                { MSIXSTIPERR, "MSI-X STI SRAM parity error", -1, 1 },
+                { MSIXADDRLPERR, "MSI-X AddrL parity error", -1, 1 },
+                { MSIXADDRHPERR, "MSI-X AddrH parity error", -1, 1 },
+                { MSIXDATAPERR, "MSI-X data parity error", -1, 1 },
+                { MSIXDIPERR, "MSI-X DI parity error", -1, 1 },
+                { PIOCPLGRPPERR, "PCI PIO completion Group FIFO parity error",
+                -1, 1 },
+                { PIOREQGRPPERR, "PCI PIO request Group FIFO parity error",
+                -1, 1 },
+                { TARTAGPERR, "PCI PCI target tag FIFO parity error", -1, 1 },
+                { MSTTAGQPERR, "PCI master tag queue parity error", -1, 1 },
+                { CREQPERR, "PCI CMD channel request parity error", -1, 1 },
+                { CRSPPERR, "PCI CMD channel response parity error", -1, 1 },
+                { DREQWRPERR, "PCI DMA channel write request parity error",
+                -1, 1 },
+                { DREQPERR, "PCI DMA channel request parity error", -1, 1 },
+                { DRSPPERR, "PCI DMA channel response parity error", -1, 1 },
+                { HREQWRPERR, "PCI HMA channel count parity error", -1, 1 },
+                { HREQPERR, "PCI HMA channel request parity error", -1, 1 },
+                { HRSPPERR, "PCI HMA channel response parity error", -1, 1 },
+                { CFGSNPPERR, "PCI config snoop FIFO parity error", -1, 1 },
+                { FIDPERR, "PCI FID parity error", -1, 1 },
+                { VFIDPERR, "PCI INTx clear parity error", -1, 1 },
+                { MAGRPPERR, "PCI MA group FIFO parity error", -1, 1 },
+                { PIOTAGPERR, "PCI PIO tag parity error", -1, 1 },
+                { IPRXHDRGRPPERR, "PCI IP Rx header group parity error",
+                -1, 1 },
+                { IPRXDATAGRPPERR, "PCI IP Rx data group parity error",
+                -1, 1 },
+                { RPLPERR, "PCI IP replay buffer parity error", -1, 1 },
+                { IPSOTPERR, "PCI IP SOT buffer parity error", -1, 1 },
+                { TRGT1GRPPERR, "PCI TRGT1 group FIFOs parity error", -1, 1 },
+                { READRSPERR, "Outbound read error", -1, 0 },
+                { 0, NULL, 0, 0 }
+        };
+
+        int fat;
+        fat = csio_handle_intr_status(hw,
+                                      PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
+                                      sysbus_intr_info) +
+              csio_handle_intr_status(hw,
+                                      PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
+                                      pcie_port_intr_info) +
+              csio_handle_intr_status(hw, PCIE_INT_CAUSE, pcie_intr_info);
+        if (fat)
+                csio_hw_fatal_err(hw);
+}
+
+/*
+ * csio_t5_flash_cfg_addr - return the address of the flash configuration file
+ * @hw: the HW module
+ *
+ * Return the address within the flash where the Firmware Configuration
+ * File is stored.
+ */
+static unsigned int
+csio_t5_flash_cfg_addr(struct csio_hw *hw)
+{
+        return FLASH_CFG_START;
+}
+
+/*
+ *      csio_t5_mc_read - read from MC through backdoor accesses
+ *      @hw: the hw module
+ *      @idx: index to the register
+ *      @addr: address of first byte requested
+ *      @data: 64 bytes of data containing the requested address
+ *      @ecc: where to store the corresponding 64-bit ECC word
+ *
+ *      Read 64 bytes of data from MC starting at a 64-byte-aligned address
+ *      that covers the requested address @addr.  If @parity is not %NULL it
+ *      is assigned the 64-bit ECC word for the read data.
+ */
+static int
+csio_t5_mc_read(struct csio_hw *hw, int idx, uint32_t addr, __be32 *data,
+                uint64_t *ecc)
+{
+        int i;
+        uint32_t mc_bist_cmd_reg, mc_bist_cmd_addr_reg, mc_bist_cmd_len_reg;
+        uint32_t mc_bist_status_rdata_reg, mc_bist_data_pattern_reg;
+
+        mc_bist_cmd_reg = MC_REG(MC_P_BIST_CMD, idx);
+        mc_bist_cmd_addr_reg = MC_REG(MC_P_BIST_CMD_ADDR, idx);
+        mc_bist_cmd_len_reg = MC_REG(MC_P_BIST_CMD_LEN, idx);
+        mc_bist_status_rdata_reg = MC_REG(MC_P_BIST_STATUS_RDATA, idx);
+        mc_bist_data_pattern_reg = MC_REG(MC_P_BIST_DATA_PATTERN, idx);
+
+        if (csio_rd_reg32(hw, mc_bist_cmd_reg) & START_BIST)
+                return -EBUSY;
+        csio_wr_reg32(hw, addr & ~0x3fU, mc_bist_cmd_addr_reg);
+        csio_wr_reg32(hw, 64, mc_bist_cmd_len_reg);
+        csio_wr_reg32(hw, 0xc, mc_bist_data_pattern_reg);
+        csio_wr_reg32(hw, BIST_OPCODE(1) | START_BIST |  BIST_CMD_GAP(1),
+                      mc_bist_cmd_reg);
+        i = csio_hw_wait_op_done_val(hw, mc_bist_cmd_reg, START_BIST,
+                                     0, 10, 1, NULL);
+        if (i)
+                return i;
+
+#define MC_DATA(i) MC_BIST_STATUS_REG(MC_BIST_STATUS_RDATA, i)
+
+        for (i = 15; i >= 0; i--)
+                *data++ = htonl(csio_rd_reg32(hw, MC_DATA(i)));
+        if (ecc)
+                *ecc = csio_rd_reg64(hw, MC_DATA(16));
+#undef MC_DATA
+        return 0;
+}
+
+/*
+ *      csio_t5_edc_read - read from EDC through backdoor accesses
+ *      @hw: the hw module
+ *      @idx: which EDC to access
+ *      @addr: address of first byte requested
+ *      @data: 64 bytes of data containing the requested address
+ *      @ecc: where to store the corresponding 64-bit ECC word
+ *
+ *      Read 64 bytes of data from EDC starting at a 64-byte-aligned address
+ *      that covers the requested address @addr.  If @parity is not %NULL it
+ *      is assigned the 64-bit ECC word for the read data.
+ */
+static int
+csio_t5_edc_read(struct csio_hw *hw, int idx, uint32_t addr, __be32 *data,
+                uint64_t *ecc)
+{
+        int i;
+        uint32_t edc_bist_cmd_reg, edc_bist_cmd_addr_reg, edc_bist_cmd_len_reg;
+        uint32_t edc_bist_cmd_data_pattern, edc_bist_status_rdata_reg;
+
+/*
+ * These macro are missing in t4_regs.h file.
+ */
+#define EDC_STRIDE_T5 (EDC_T51_BASE_ADDR - EDC_T50_BASE_ADDR)
+#define EDC_REG_T5(reg, idx) (reg + EDC_STRIDE_T5 * idx)
+
+        edc_bist_cmd_reg = EDC_REG_T5(EDC_H_BIST_CMD, idx);
+        edc_bist_cmd_addr_reg = EDC_REG_T5(EDC_H_BIST_CMD_ADDR, idx);
+        edc_bist_cmd_len_reg = EDC_REG_T5(EDC_H_BIST_CMD_LEN, idx);
+        edc_bist_cmd_data_pattern = EDC_REG_T5(EDC_H_BIST_DATA_PATTERN, idx);
+        edc_bist_status_rdata_reg = EDC_REG_T5(EDC_H_BIST_STATUS_RDATA, idx);
+#undef EDC_REG_T5
+#undef EDC_STRIDE_T5
+
+        if (csio_rd_reg32(hw, edc_bist_cmd_reg) & START_BIST)
+                return -EBUSY;
+        csio_wr_reg32(hw, addr & ~0x3fU, edc_bist_cmd_addr_reg);
+        csio_wr_reg32(hw, 64, edc_bist_cmd_len_reg);
+        csio_wr_reg32(hw, 0xc, edc_bist_cmd_data_pattern);
+        csio_wr_reg32(hw, BIST_OPCODE(1) | START_BIST |  BIST_CMD_GAP(1),
+                      edc_bist_cmd_reg);
+        i = csio_hw_wait_op_done_val(hw, edc_bist_cmd_reg, START_BIST,
+                                     0, 10, 1, NULL);
+        if (i)
+                return i;
+
+#define EDC_DATA(i) (EDC_BIST_STATUS_REG(EDC_BIST_STATUS_RDATA, i) + idx)
+
+        for (i = 15; i >= 0; i--)
+                *data++ = htonl(csio_rd_reg32(hw, EDC_DATA(i)));
+        if (ecc)
+                *ecc = csio_rd_reg64(hw, EDC_DATA(16));
+#undef EDC_DATA
+        return 0;
+}
+
+/*
+ * csio_t5_memory_rw - read/write EDC 0, EDC 1 or MC via PCIE memory window
+ * @hw: the csio_hw
+ * @win: PCI-E memory Window to use
+ * @mtype: memory type: MEM_EDC0, MEM_EDC1, MEM_MC0 (or MEM_MC) or MEM_MC1
+ * @addr: address within indicated memory type
+ * @len: amount of memory to transfer
+ * @buf: host memory buffer
+ * @dir: direction of transfer 1 => read, 0 => write
+ *
+ * Reads/writes an [almost] arbitrary memory region in the firmware: the
+ * firmware memory address, length and host buffer must be aligned on
+ * 32-bit boudaries.  The memory is transferred as a raw byte sequence
+ * from/to the firmware's memory.  If this memory contains data
+ * structures which contain multi-byte integers, it's the callers
+ * responsibility to perform appropriate byte order conversions.
+ */
+static int
+csio_t5_memory_rw(struct csio_hw *hw, u32 win, int mtype, u32 addr,
+                u32 len, uint32_t *buf, int dir)
+{
+        u32 pos, start, offset, memoffset;
+        u32 edc_size, mc_size, win_pf, mem_reg, mem_aperture, mem_base;
+
+        /*
+         * Argument sanity checks ...
+         */
+        if ((addr & 0x3) || (len & 0x3))
+                return -EINVAL;
+
+        /* Offset into the region of memory which is being accessed
+         * MEM_EDC0 = 0
+         * MEM_EDC1 = 1
+         * MEM_MC   = 2 -- T4
+         * MEM_MC0  = 2 -- For T5
+         * MEM_MC1  = 3 -- For T5
+         */
+        edc_size  = EDRAM_SIZE_GET(csio_rd_reg32(hw, MA_EDRAM0_BAR));
+        if (mtype != MEM_MC1)
+                memoffset = (mtype * (edc_size * 1024 * 1024));
+        else {
+                mc_size = EXT_MEM_SIZE_GET(csio_rd_reg32(hw,
+                                                         MA_EXT_MEMORY_BAR));
+                memoffset = (MEM_MC0 * edc_size + mc_size) * 1024 * 1024;
+        }
+
+        /* Determine the PCIE_MEM_ACCESS_OFFSET */
+        addr = addr + memoffset;
+
+        /*
+         * Each PCI-E Memory Window is programmed with a window size -- or
+         * "aperture" -- which controls the granularity of its mapping onto
+         * adapter memory.  We need to grab that aperture in order to know
+         * how to use the specified window.  The window is also programmed
+         * with the base address of the Memory Window in BAR0's address
+         * space.  For T4 this is an absolute PCI-E Bus Address.  For T5
+         * the address is relative to BAR0.
+         */
+        mem_reg = csio_rd_reg32(hw,
+                        PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, win));
+        mem_aperture = 1 << (WINDOW(mem_reg) + 10);
+        mem_base = GET_PCIEOFST(mem_reg) << 10;
+
+        start = addr & ~(mem_aperture-1);
+        offset = addr - start;
+        win_pf = V_PFNUM(hw->pfn);
+
+        csio_dbg(hw, "csio_t5_memory_rw: mem_reg: 0x%x, mem_aperture: 0x%x\n",
+                 mem_reg, mem_aperture);
+        csio_dbg(hw, "csio_t5_memory_rw: mem_base: 0x%x, mem_offset: 0x%x\n",
+                 mem_base, memoffset);
+        csio_dbg(hw, "csio_t5_memory_rw: start:0x%x, offset:0x%x, win_pf:%d\n",
+                 start, offset, win_pf);
+        csio_dbg(hw, "csio_t5_memory_rw: mtype: %d, addr: 0x%x, len: %d\n",
+                 mtype, addr, len);
+
+        for (pos = start; len > 0; pos += mem_aperture, offset = 0) {
+                /*
+                 * Move PCI-E Memory Window to our current transfer
+                 * position.  Read it back to ensure that changes propagate
+                 * before we attempt to use the new value.
+                 */
+                csio_wr_reg32(hw, pos | win_pf,
+                        PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET, win));
+                csio_rd_reg32(hw,
+                        PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET, win));
+
+                while (offset < mem_aperture && len > 0) {
+                        if (dir)
+                                *buf++ = csio_rd_reg32(hw, mem_base + offset);
+                        else
+                                csio_wr_reg32(hw, *buf++, mem_base + offset);
+
+                        offset += sizeof(__be32);
+                        len -= sizeof(__be32);
+                }
+        }
+        return 0;
+}
+
+/*
+ * csio_t5_dfs_create_ext_mem - setup debugfs for MC0 or MC1 to read the values
+ * @hw: the csio_hw
+ *
+ * This function creates files in the debugfs with external memory region
+ * MC0 & MC1.
+ */
+static void
+csio_t5_dfs_create_ext_mem(struct csio_hw *hw)
+{
+        u32 size;
+        int i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE);
+        if (i & EXT_MEM_ENABLE) {
+                size = csio_rd_reg32(hw, MA_EXT_MEMORY_BAR);
+                csio_add_debugfs_mem(hw, "mc0", MEM_MC0,
+                                     EXT_MEM_SIZE_GET(size));
+        }
+        if (i & EXT_MEM1_ENABLE) {
+                size = csio_rd_reg32(hw, MA_EXT_MEMORY1_BAR);
+                csio_add_debugfs_mem(hw, "mc1", MEM_MC1,
+                                     EXT_MEM_SIZE_GET(size));
+        }
+}
+
+/* T5 adapter specific function */
+struct csio_hw_chip_ops t5_ops = {
+        .chip_set_mem_win               = csio_t5_set_mem_win,
+        .chip_pcie_intr_handler         = csio_t5_pcie_intr_handler,
+        .chip_flash_cfg_addr            = csio_t5_flash_cfg_addr,
+        .chip_mc_read                   = csio_t5_mc_read,
+        .chip_edc_read                  = csio_t5_edc_read,
+        .chip_memory_rw                 = csio_t5_memory_rw,
+        .chip_dfs_create_ext_mem        = csio_t5_dfs_create_ext_mem,
+};
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 0604b5ff3638..00346fe939d5 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -81,9 +81,11 @@ csio_mem_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 __be32 data[16];
 
                 if (mem == MEM_MC)
-                        ret = csio_hw_mc_read(hw, pos, data, NULL);
+                        ret = hw->chip_ops->chip_mc_read(hw, 0, pos,
+                                                         data, NULL);
                 else
-                        ret = csio_hw_edc_read(hw, mem, pos, data, NULL);
+                        ret = hw->chip_ops->chip_edc_read(hw, mem, pos,
+                                                          data, NULL);
                 if (ret)
                         return ret;
 
@@ -108,7 +110,7 @@ static const struct file_operations csio_mem_debugfs_fops = {
         .llseek  = default_llseek,
 };
 
-static void csio_add_debugfs_mem(struct csio_hw *hw, const char *name,
+void csio_add_debugfs_mem(struct csio_hw *hw, const char *name,
                                  unsigned int idx, unsigned int size_mb)
 {
         struct dentry *de;
@@ -131,9 +133,8 @@ static int csio_setup_debugfs(struct csio_hw *hw)
                 csio_add_debugfs_mem(hw, "edc0", MEM_EDC0, 5);
         if (i & EDRAM1_ENABLE)
                 csio_add_debugfs_mem(hw, "edc1", MEM_EDC1, 5);
-        if (i & EXT_MEM_ENABLE)
-                csio_add_debugfs_mem(hw, "mc", MEM_MC,
-                      EXT_MEM_SIZE_GET(csio_rd_reg32(hw, MA_EXT_MEMORY_BAR)));
+
+        hw->chip_ops->chip_dfs_create_ext_mem(hw);
         return 0;
 }
 
@@ -1169,7 +1170,7 @@ static struct pci_error_handlers csio_err_handler = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(csio_pci_tbl) = {
-        CSIO_DEVICE(CSIO_DEVID_T440DBG_FCOE, 0),        /* T440DBG FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T440DBG_FCOE, 0),        /* T4 DEBUG FCOE */
         CSIO_DEVICE(CSIO_DEVID_T420CR_FCOE, 0),         /* T420CR FCOE */
         CSIO_DEVICE(CSIO_DEVID_T422CR_FCOE, 0),         /* T422CR FCOE */
         CSIO_DEVICE(CSIO_DEVID_T440CR_FCOE, 0),         /* T440CR FCOE */
@@ -1184,8 +1185,34 @@ static DEFINE_PCI_DEVICE_TABLE(csio_pci_tbl) = {
         CSIO_DEVICE(CSIO_DEVID_B404_FCOE, 0),           /* B404 FCOE */
         CSIO_DEVICE(CSIO_DEVID_T480CR_FCOE, 0),         /* T480 CR FCOE */
         CSIO_DEVICE(CSIO_DEVID_T440LPCR_FCOE, 0),       /* T440 LP-CR FCOE */
-        CSIO_DEVICE(CSIO_DEVID_PE10K, 0),               /* PE10K FCOE */
-        CSIO_DEVICE(CSIO_DEVID_PE10K_PF1, 0),   /* PE10K FCOE on PF1 */
+        CSIO_DEVICE(CSIO_DEVID_AMSTERDAM_T4_FCOE, 0),   /* AMSTERDAM T4 FCOE */
+        CSIO_DEVICE(CSIO_DEVID_HUAWEI_T480_FCOE, 0),    /* HUAWEI T480 FCOE */
+        CSIO_DEVICE(CSIO_DEVID_HUAWEI_T440_FCOE, 0),    /* HUAWEI T440 FCOE */
+        CSIO_DEVICE(CSIO_DEVID_HUAWEI_STG310_FCOE, 0),  /* HUAWEI STG FCOE */
+        CSIO_DEVICE(CSIO_DEVID_ACROMAG_XMC_XAUI, 0),    /* ACROMAG XAUI FCOE */
+        CSIO_DEVICE(CSIO_DEVID_QUANTA_MEZZ_SFP_FCOE, 0),/* QUANTA MEZZ FCOE */
+        CSIO_DEVICE(CSIO_DEVID_HUAWEI_10GT_FCOE, 0),    /* HUAWEI 10GT FCOE */
+        CSIO_DEVICE(CSIO_DEVID_HUAWEI_T440_TOE_FCOE, 0),/* HUAWEI T4 TOE FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T580DBG_FCOE, 0),        /* T5 DEBUG FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T520CR_FCOE, 0),         /* T520CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T522CR_FCOE, 0),         /* T522CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T540CR_FCOE, 0),         /* T540CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T520BCH_FCOE, 0),        /* T520BCH FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T540BCH_FCOE, 0),        /* T540BCH FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T540CH_FCOE, 0),         /* T540CH FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T520SO_FCOE, 0),         /* T520SO FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T520CX_FCOE, 0),         /* T520CX FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T520BT_FCOE, 0),         /* T520BT FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T504BT_FCOE, 0),         /* T504BT FCOE */
+        CSIO_DEVICE(CSIO_DEVID_B520_FCOE, 0),           /* B520 FCOE */
+        CSIO_DEVICE(CSIO_DEVID_B504_FCOE, 0),           /* B504 FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T580CR2_FCOE, 0),        /* T580 CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T540LPCR_FCOE, 0),       /* T540 LP-CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_AMSTERDAM_T5_FCOE, 0),   /* AMSTERDAM T5 FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T580LPCR_FCOE, 0),       /* T580 LP-CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T520LLCR_FCOE, 0),       /* T520 LL-CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T560CR_FCOE, 0),         /* T560 CR FCOE */
+        CSIO_DEVICE(CSIO_DEVID_T580CR_FCOE, 0),         /* T580 CR FCOE */
         { 0, 0, 0, 0, 0, 0, 0 }
 };
 
@@ -1259,4 +1286,5 @@ MODULE_DESCRIPTION(CSIO_DRV_DESC);
 MODULE_LICENSE(CSIO_DRV_LICENSE);
 MODULE_DEVICE_TABLE(pci, csio_pci_tbl);
 MODULE_VERSION(CSIO_DRV_VERSION);
-MODULE_FIRMWARE(CSIO_FW_FNAME);
+MODULE_FIRMWARE(FW_FNAME_T4);
+MODULE_FIRMWARE(FW_FNAME_T5);
diff --git a/drivers/scsi/csiostor/csio_init.h b/drivers/scsi/csiostor/csio_init.h
index 0838fd7ec9c7..5cc5d317a442 100644
--- a/drivers/scsi/csiostor/csio_init.h
+++ b/drivers/scsi/csiostor/csio_init.h
@@ -52,31 +52,6 @@
 #define CSIO_DRV_DESC                   "Chelsio FCoE driver"
 #define CSIO_DRV_VERSION                "1.0.0"
 
-#define CSIO_DEVICE(devid, idx)                                 \
-{ PCI_VENDOR_ID_CHELSIO, (devid), PCI_ANY_ID, PCI_ANY_ID, 0, 0, (idx) }
-
-#define CSIO_IS_T4_FPGA(_dev)           (((_dev) == CSIO_DEVID_PE10K) ||\
-                                         ((_dev) == CSIO_DEVID_PE10K_PF1))
-
-/* FCoE device IDs */
-#define CSIO_DEVID_PE10K                0xA000
-#define CSIO_DEVID_PE10K_PF1            0xA001
-#define CSIO_DEVID_T440DBG_FCOE         0x4600
-#define CSIO_DEVID_T420CR_FCOE          0x4601
-#define CSIO_DEVID_T422CR_FCOE          0x4602
-#define CSIO_DEVID_T440CR_FCOE          0x4603
-#define CSIO_DEVID_T420BCH_FCOE         0x4604
-#define CSIO_DEVID_T440BCH_FCOE         0x4605
-#define CSIO_DEVID_T440CH_FCOE          0x4606
-#define CSIO_DEVID_T420SO_FCOE          0x4607
-#define CSIO_DEVID_T420CX_FCOE          0x4608
-#define CSIO_DEVID_T420BT_FCOE          0x4609
-#define CSIO_DEVID_T404BT_FCOE          0x460A
-#define CSIO_DEVID_B420_FCOE            0x460B
-#define CSIO_DEVID_B404_FCOE            0x460C
-#define CSIO_DEVID_T480CR_FCOE          0x460D
-#define CSIO_DEVID_T440LPCR_FCOE        0x460E
-
 extern struct fc_function_template csio_fc_transport_funcs;
 extern struct fc_function_template csio_fc_transport_vport_funcs;
 
@@ -100,6 +75,10 @@ struct csio_lnode *csio_shost_init(struct csio_hw *, struct device *, bool,
 void csio_shost_exit(struct csio_lnode *);
 void csio_lnodes_exit(struct csio_hw *, bool);
 
+/* DebugFS helper routines */
+void csio_add_debugfs_mem(struct csio_hw *, const char *,
+                unsigned int, unsigned int);
+
 static inline struct Scsi_Host *
 csio_ln_to_shost(struct csio_lnode *ln)
 {
diff --git a/drivers/scsi/csiostor/csio_lnode.h b/drivers/scsi/csiostor/csio_lnode.h
index 8d84988ab06d..0f9c04175b11 100644
--- a/drivers/scsi/csiostor/csio_lnode.h
+++ b/drivers/scsi/csiostor/csio_lnode.h
@@ -114,7 +114,7 @@ struct csio_lnode_stats {
         uint32_t        n_rnode_match;  /* matched rnode */
         uint32_t        n_dev_loss_tmo; /* Device loss timeout */
         uint32_t        n_fdmi_err;     /* fdmi err */
-        uint32_t        n_evt_fw[RSCN_DEV_LOST];        /* fw events */
+        uint32_t        n_evt_fw[PROTO_ERR_IMPL_LOGO];  /* fw events */
         enum csio_ln_ev n_evt_sm[CSIO_LNE_MAX_EVENT];   /* State m/c events */
         uint32_t        n_rnode_alloc;  /* rnode allocated */
         uint32_t        n_rnode_free;   /* rnode freed */
diff --git a/drivers/scsi/csiostor/csio_rnode.c b/drivers/scsi/csiostor/csio_rnode.c
index 51c6a388de2b..e9c3b045f587 100644
--- a/drivers/scsi/csiostor/csio_rnode.c
+++ b/drivers/scsi/csiostor/csio_rnode.c
@@ -302,7 +302,7 @@ csio_confirm_rnode(struct csio_lnode *ln, uint32_t rdev_flowid,
 {
         uint8_t rport_type;
         struct csio_rnode *rn, *match_rn;
-        uint32_t vnp_flowid;
+        uint32_t vnp_flowid = 0;
         __be32 *port_id;
 
         port_id = (__be32 *)&rdevp->r_id[0];
@@ -350,6 +350,14 @@ csio_confirm_rnode(struct csio_lnode *ln, uint32_t rdev_flowid,
                          * Else, go ahead and alloc a new rnode.
                          */
                         if (!memcmp(csio_rn_wwpn(match_rn), rdevp->wwpn, 8)) {
+                                if (rn == match_rn)
+                                        goto found_rnode;
+                                csio_ln_dbg(ln,
+                                            "nport_id:x%x and wwpn:%llx"
+                                            " match for ssni:x%x\n",
+                                            rn->nport_id,
+                                            wwn_to_u64(rdevp->wwpn),
+                                            rdev_flowid);
                                 if (csio_is_rnode_ready(rn)) {
                                         csio_ln_warn(ln,
                                                      "rnode is already"
diff --git a/drivers/scsi/csiostor/csio_rnode.h b/drivers/scsi/csiostor/csio_rnode.h
index a3b434c801da..65940096a80d 100644
--- a/drivers/scsi/csiostor/csio_rnode.h
+++ b/drivers/scsi/csiostor/csio_rnode.h
@@ -63,7 +63,7 @@ struct csio_rnode_stats {
         uint32_t        n_err_nomem;    /* error nomem */
         uint32_t        n_evt_unexp;    /* unexpected event */
         uint32_t        n_evt_drop;     /* unexpected event */
-        uint32_t        n_evt_fw[RSCN_DEV_LOST];        /* fw events */
+        uint32_t        n_evt_fw[PROTO_ERR_IMPL_LOGO];  /* fw events */
         enum csio_rn_ev n_evt_sm[CSIO_RNFE_MAX_EVENT];  /* State m/c events */
         uint32_t        n_lun_rst;      /* Number of resets of
                                          * of LUNs under this
diff --git a/drivers/scsi/csiostor/csio_wr.c b/drivers/scsi/csiostor/csio_wr.c
index c32df1bdaa97..4255ce264abf 100644
--- a/drivers/scsi/csiostor/csio_wr.c
+++ b/drivers/scsi/csiostor/csio_wr.c
@@ -85,8 +85,8 @@ csio_wr_ring_fldb(struct csio_hw *hw, struct csio_q *flq)
          */
         if (flq->inc_idx >= 8) {
                 csio_wr_reg32(hw, DBPRIO(1) | QID(flq->un.fl.flid) |
-                              PIDX(flq->inc_idx / 8),
-                              MYPF_REG(SGE_PF_KDOORBELL));
+                                  CSIO_HW_PIDX(hw, flq->inc_idx / 8),
+                                  MYPF_REG(SGE_PF_KDOORBELL));
                 flq->inc_idx &= 7;
         }
 }
@@ -989,7 +989,8 @@ csio_wr_issue(struct csio_hw *hw, int qidx, bool prio)
         wmb();
         /* Ring SGE Doorbell writing q->pidx into it */
         csio_wr_reg32(hw, DBPRIO(prio) | QID(q->un.eq.physeqid) |
-                      PIDX(q->inc_idx), MYPF_REG(SGE_PF_KDOORBELL));
+                          CSIO_HW_PIDX(hw, q->inc_idx),
+                          MYPF_REG(SGE_PF_KDOORBELL));
         q->inc_idx = 0;
 
         return 0;
@@ -1331,20 +1332,30 @@ csio_wr_fixup_host_params(struct csio_hw *hw)
 
         /* FL BUFFER SIZE#0 is Page size i,e already aligned to cache line */
         csio_wr_reg32(hw, PAGE_SIZE, SGE_FL_BUFFER_SIZE0);
-        csio_wr_reg32(hw,
-                      (csio_rd_reg32(hw, SGE_FL_BUFFER_SIZE2) +
-                      sge->csio_fl_align - 1) & ~(sge->csio_fl_align - 1),
-                      SGE_FL_BUFFER_SIZE2);
-        csio_wr_reg32(hw,
-                      (csio_rd_reg32(hw, SGE_FL_BUFFER_SIZE3) +
-                      sge->csio_fl_align - 1) & ~(sge->csio_fl_align - 1),
-                      SGE_FL_BUFFER_SIZE3);
+
+        /*
+         * If using hard params, the following will get set correctly
+         * in csio_wr_set_sge().
+         */
+        if (hw->flags & CSIO_HWF_USING_SOFT_PARAMS) {
+                csio_wr_reg32(hw,
+                        (csio_rd_reg32(hw, SGE_FL_BUFFER_SIZE2) +
+                        sge->csio_fl_align - 1) & ~(sge->csio_fl_align - 1),
+                        SGE_FL_BUFFER_SIZE2);
+                csio_wr_reg32(hw,
+                        (csio_rd_reg32(hw, SGE_FL_BUFFER_SIZE3) +
+                        sge->csio_fl_align - 1) & ~(sge->csio_fl_align - 1),
+                        SGE_FL_BUFFER_SIZE3);
+        }
 
         csio_wr_reg32(hw, HPZ0(PAGE_SHIFT - 12), ULP_RX_TDDP_PSZ);
 
         /* default value of rx_dma_offset of the NIC driver */
         csio_set_reg_field(hw, SGE_CONTROL, PKTSHIFT_MASK,
                            PKTSHIFT(CSIO_SGE_RX_DMA_OFFSET));
+
+        csio_hw_tp_wr_bits_indirect(hw, TP_INGRESS_CONFIG,
+                                    CSUM_HAS_PSEUDO_HDR, 0);
 }
 
 static void
@@ -1460,18 +1471,21 @@ csio_wr_set_sge(struct csio_hw *hw)
          * and generate an interrupt when this occurs so we can recover.
          */
         csio_set_reg_field(hw, SGE_DBFIFO_STATUS,
-                           HP_INT_THRESH(HP_INT_THRESH_MASK) |
-                           LP_INT_THRESH(LP_INT_THRESH_MASK),
-                           HP_INT_THRESH(CSIO_SGE_DBFIFO_INT_THRESH) |
-                           LP_INT_THRESH(CSIO_SGE_DBFIFO_INT_THRESH));
+                   HP_INT_THRESH(HP_INT_THRESH_MASK) |
+                   CSIO_HW_LP_INT_THRESH(hw, CSIO_HW_M_LP_INT_THRESH(hw)),
+                   HP_INT_THRESH(CSIO_SGE_DBFIFO_INT_THRESH) |
+                   CSIO_HW_LP_INT_THRESH(hw, CSIO_SGE_DBFIFO_INT_THRESH));
+
         csio_set_reg_field(hw, SGE_DOORBELL_CONTROL, ENABLE_DROP,
                            ENABLE_DROP);
 
         /* SGE_FL_BUFFER_SIZE0 is set up by csio_wr_fixup_host_params(). */
 
         CSIO_SET_FLBUF_SIZE(hw, 1, CSIO_SGE_FLBUF_SIZE1);
-        CSIO_SET_FLBUF_SIZE(hw, 2, CSIO_SGE_FLBUF_SIZE2);
-        CSIO_SET_FLBUF_SIZE(hw, 3, CSIO_SGE_FLBUF_SIZE3);
+        csio_wr_reg32(hw, (CSIO_SGE_FLBUF_SIZE2 + sge->csio_fl_align - 1)
+                      & ~(sge->csio_fl_align - 1), SGE_FL_BUFFER_SIZE2);
+        csio_wr_reg32(hw, (CSIO_SGE_FLBUF_SIZE3 + sge->csio_fl_align - 1)
+                      & ~(sge->csio_fl_align - 1), SGE_FL_BUFFER_SIZE3);
         CSIO_SET_FLBUF_SIZE(hw, 4, CSIO_SGE_FLBUF_SIZE4);
         CSIO_SET_FLBUF_SIZE(hw, 5, CSIO_SGE_FLBUF_SIZE5);
         CSIO_SET_FLBUF_SIZE(hw, 6, CSIO_SGE_FLBUF_SIZE6);
@@ -1522,22 +1536,24 @@ void
 csio_wr_sge_init(struct csio_hw *hw)
 {
         /*
-         * If we are master:
+         * If we are master and chip is not initialized:
          *    - If we plan to use the config file, we need to fixup some
          *      host specific registers, and read the rest of the SGE
          *      configuration.
          *    - If we dont plan to use the config file, we need to initialize
          *      SGE entirely, including fixing the host specific registers.
+         * If we are master and chip is initialized, just read and work off of
+         *      the already initialized SGE values.
          * If we arent the master, we are only allowed to read and work off of
          *      the already initialized SGE values.
          *
          * Therefore, before calling this function, we assume that the master-
-         * ship of the card, and whether to use config file or not, have
-         * already been decided. In other words, CSIO_HWF_USING_SOFT_PARAMS and
-         * CSIO_HWF_MASTER should be set/unset.
+         * ship of the card, state and whether to use config file or not, have
+         * already been decided.
          */
         if (csio_is_hw_master(hw)) {
-                csio_wr_fixup_host_params(hw);
+                if (hw->fw_state != CSIO_DEV_STATE_INIT)
+                        csio_wr_fixup_host_params(hw);
 
                 if (hw->flags & CSIO_HWF_USING_SOFT_PARAMS)
                         csio_wr_get_sge(hw);
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 9bfdc9a3f897..292b24f9bf93 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1655,7 +1655,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
         skb->priority = fcoe->priority;
 
         if (fcoe->netdev->priv_flags & IFF_802_1Q_VLAN &&
-            fcoe->realdev->features & NETIF_F_HW_VLAN_TX) {
+            fcoe->realdev->features & NETIF_F_HW_VLAN_CTAG_TX) {
                 skb->vlan_tci = VLAN_TAG_PRESENT |
                                 vlan_dev_vlan_id(fcoe->netdev);
                 skb->dev = fcoe->realdev;
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 65123a21b97e..fe30ea94ffe6 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -50,7 +50,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
         u32 rlen;
         int err, tport;
 
-        while (skb->len >= NLMSG_SPACE(0)) {
+        while (skb->len >= NLMSG_HDRLEN) {
                 err = 0;
 
                 nlh = nlmsg_hdr(skb);
@@ -70,7 +70,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
                         goto next_msg;
                 }
 
-                hdr = NLMSG_DATA(nlh);
+                hdr = nlmsg_data(nlh);
                 if ((hdr->version != SCSI_NL_VERSION) ||
                     (hdr->magic != SCSI_NL_MAGIC)) {
                         err = -EPROTOTYPE;
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index e894ca7b54c0..e106c276aa00 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -35,7 +35,6 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
 #include <scsi/scsi_cmnd.h>
-#include <linux/netlink.h>
 #include <net/netlink.h>
 #include <scsi/scsi_netlink_fc.h>
 #include <scsi/scsi_bsg_fc.h>
@@ -534,7 +533,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
         struct nlmsghdr *nlh;
         struct fc_nl_event *event;
         const char *name;
-        u32 len, skblen;
+        u32 len;
         int err;
 
         if (!scsi_nl_sock) {
@@ -543,21 +542,19 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
         }
 
         len = FC_NL_MSGALIGN(sizeof(*event));
-        skblen = NLMSG_SPACE(len);
 
-        skb = alloc_skb(skblen, GFP_KERNEL);
+        skb = nlmsg_new(len, GFP_KERNEL);
         if (!skb) {
                 err = -ENOBUFS;
                 goto send_fail;
         }
 
-        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG,
-                                skblen - sizeof(*nlh), 0);
+        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);
         if (!nlh) {
                 err = -ENOBUFS;
                 goto send_fail_skb;
         }
-        event = NLMSG_DATA(nlh);
+        event = nlmsg_data(nlh);
 
         INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC,
                                 FC_NL_ASYNC_EVENT, len);
@@ -604,7 +601,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
         struct sk_buff *skb;
         struct nlmsghdr *nlh;
         struct fc_nl_event *event;
-        u32 len, skblen;
+        u32 len;
         int err;
 
         if (!scsi_nl_sock) {
@@ -613,21 +610,19 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
         }
 
         len = FC_NL_MSGALIGN(sizeof(*event) + data_len);
-        skblen = NLMSG_SPACE(len);
 
-        skb = alloc_skb(skblen, GFP_KERNEL);
+        skb = nlmsg_new(len, GFP_KERNEL);
         if (!skb) {
                 err = -ENOBUFS;
                 goto send_vendor_fail;
         }
 
-        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG,
-                                skblen - sizeof(*nlh), 0);
+        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);
         if (!nlh) {
                 err = -ENOBUFS;
                 goto send_vendor_fail_skb;
         }
-        event = NLMSG_DATA(nlh);
+        event = nlmsg_data(nlh);
 
         INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC,
                                 FC_NL_ASYNC_EVENT, len);
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index ce06e8772f3a..47799a33d6ca 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2028,8 +2028,8 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
         struct iscsi_uevent *ev;
         char *pdu;
         struct iscsi_internal *priv;
-        int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) +
-                              data_size);
+        int len = nlmsg_total_size(sizeof(*ev) + sizeof(struct iscsi_hdr) +
+                                   data_size);
 
         priv = iscsi_if_transport_lookup(conn->transport);
         if (!priv)
@@ -2044,7 +2044,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         memset(ev, 0, sizeof(*ev));
         ev->transport_handle = iscsi_handle(conn->transport);
         ev->type = ISCSI_KEVENT_RECV_PDU;
@@ -2065,7 +2065,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
         struct iscsi_uevent *ev;
-        int len = NLMSG_SPACE(sizeof(*ev) + data_size);
+        int len = nlmsg_total_size(sizeof(*ev) + data_size);
 
         skb = alloc_skb(len, GFP_ATOMIC);
         if (!skb) {
@@ -2074,7 +2074,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         memset(ev, 0, sizeof(*ev));
         ev->type = type;
         ev->transport_handle = iscsi_handle(transport);
@@ -2099,7 +2099,7 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error)
         struct sk_buff  *skb;
         struct iscsi_uevent *ev;
         struct iscsi_internal *priv;
-        int len = NLMSG_SPACE(sizeof(*ev));
+        int len = nlmsg_total_size(sizeof(*ev));
 
         priv = iscsi_if_transport_lookup(conn->transport);
         if (!priv)
@@ -2113,7 +2113,7 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error)
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         ev->transport_handle = iscsi_handle(conn->transport);
         ev->type = ISCSI_KEVENT_CONN_ERROR;
         ev->r.connerror.error = error;
@@ -2134,7 +2134,7 @@ void iscsi_conn_login_event(struct iscsi_cls_conn *conn,
         struct sk_buff  *skb;
         struct iscsi_uevent *ev;
         struct iscsi_internal *priv;
-        int len = NLMSG_SPACE(sizeof(*ev));
+        int len = nlmsg_total_size(sizeof(*ev));
 
         priv = iscsi_if_transport_lookup(conn->transport);
         if (!priv)
@@ -2148,7 +2148,7 @@ void iscsi_conn_login_event(struct iscsi_cls_conn *conn,
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         ev->transport_handle = iscsi_handle(conn->transport);
         ev->type = ISCSI_KEVENT_CONN_LOGIN_STATE;
         ev->r.conn_login.state = state;
@@ -2168,7 +2168,7 @@ void iscsi_post_host_event(uint32_t host_no, struct iscsi_transport *transport,
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
         struct iscsi_uevent *ev;
-        int len = NLMSG_SPACE(sizeof(*ev) + data_size);
+        int len = nlmsg_total_size(sizeof(*ev) + data_size);
 
         skb = alloc_skb(len, GFP_NOIO);
         if (!skb) {
@@ -2178,7 +2178,7 @@ void iscsi_post_host_event(uint32_t host_no, struct iscsi_transport *transport,
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         ev->transport_handle = iscsi_handle(transport);
         ev->type = ISCSI_KEVENT_HOST_EVENT;
         ev->r.host_event.host_no = host_no;
@@ -2199,7 +2199,7 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport,
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
         struct iscsi_uevent *ev;
-        int len = NLMSG_SPACE(sizeof(*ev) + data_size);
+        int len = nlmsg_total_size(sizeof(*ev) + data_size);
 
         skb = alloc_skb(len, GFP_NOIO);
         if (!skb) {
@@ -2208,7 +2208,7 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport,
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         ev->transport_handle = iscsi_handle(transport);
         ev->type = ISCSI_KEVENT_PING_COMP;
         ev->r.ping_comp.host_no = host_no;
@@ -2227,7 +2227,7 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi,
 {
         struct sk_buff  *skb;
         struct nlmsghdr *nlh;
-        int len = NLMSG_SPACE(size);
+        int len = nlmsg_total_size(size);
         int flags = multi ? NLM_F_MULTI : 0;
         int t = done ? NLMSG_DONE : type;
 
@@ -2239,24 +2239,24 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi,
 
         nlh = __nlmsg_put(skb, 0, 0, t, (len - sizeof(*nlh)), 0);
         nlh->nlmsg_flags = flags;
-        memcpy(NLMSG_DATA(nlh), payload, size);
+        memcpy(nlmsg_data(nlh), payload, size);
         return iscsi_multicast_skb(skb, group, GFP_ATOMIC);
 }
 
 static int
 iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
 {
-        struct iscsi_uevent *ev = NLMSG_DATA(nlh);
+        struct iscsi_uevent *ev = nlmsg_data(nlh);
         struct iscsi_stats *stats;
         struct sk_buff *skbstat;
         struct iscsi_cls_conn *conn;
         struct nlmsghdr *nlhstat;
         struct iscsi_uevent *evstat;
         struct iscsi_internal *priv;
-        int len = NLMSG_SPACE(sizeof(*ev) +
-                              sizeof(struct iscsi_stats) +
-                              sizeof(struct iscsi_stats_custom) *
-                              ISCSI_STATS_CUSTOM_MAX);
+        int len = nlmsg_total_size(sizeof(*ev) +
+                                   sizeof(struct iscsi_stats) +
+                                   sizeof(struct iscsi_stats_custom) *
+                                   ISCSI_STATS_CUSTOM_MAX);
         int err = 0;
 
         priv = iscsi_if_transport_lookup(transport);
@@ -2279,7 +2279,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
 
                 nlhstat = __nlmsg_put(skbstat, 0, 0, 0,
                                       (len - sizeof(*nlhstat)), 0);
-                evstat = NLMSG_DATA(nlhstat);
+                evstat = nlmsg_data(nlhstat);
                 memset(evstat, 0, sizeof(*evstat));
                 evstat->transport_handle = iscsi_handle(conn->transport);
                 evstat->type = nlh->nlmsg_type;
@@ -2292,12 +2292,12 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
                 memset(stats, 0, sizeof(*stats));
 
                 transport->get_stats(conn, stats);
-                actual_size = NLMSG_SPACE(sizeof(struct iscsi_uevent) +
-                                          sizeof(struct iscsi_stats) +
-                                          sizeof(struct iscsi_stats_custom) *
-                                          stats->custom_length);
+                actual_size = nlmsg_total_size(sizeof(struct iscsi_uevent) +
+                                               sizeof(struct iscsi_stats) +
+                                               sizeof(struct iscsi_stats_custom) *
+                                               stats->custom_length);
                 actual_size -= sizeof(*nlhstat);
-                actual_size = NLMSG_LENGTH(actual_size);
+                actual_size = nlmsg_msg_size(actual_size);
                 skb_trim(skbstat, NLMSG_ALIGN(actual_size));
                 nlhstat->nlmsg_len = actual_size;
 
@@ -2321,7 +2321,7 @@ int iscsi_session_event(struct iscsi_cls_session *session,
         struct iscsi_uevent *ev;
         struct sk_buff  *skb;
         struct nlmsghdr *nlh;
-        int rc, len = NLMSG_SPACE(sizeof(*ev));
+        int rc, len = nlmsg_total_size(sizeof(*ev));
 
         priv = iscsi_if_transport_lookup(session->transport);
         if (!priv)
@@ -2337,7 +2337,7 @@ int iscsi_session_event(struct iscsi_cls_session *session,
         }
 
         nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
-        ev = NLMSG_DATA(nlh);
+        ev = nlmsg_data(nlh);
         ev->transport_handle = iscsi_handle(session->transport);
 
         ev->type = event;
@@ -2689,7 +2689,7 @@ iscsi_send_ping(struct iscsi_transport *transport, struct iscsi_uevent *ev)
 static int
 iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
 {
-        struct iscsi_uevent *ev = NLMSG_DATA(nlh);
+        struct iscsi_uevent *ev = nlmsg_data(nlh);
         struct Scsi_Host *shost = NULL;
         struct iscsi_chap_rec *chap_rec;
         struct iscsi_internal *priv;
@@ -2708,7 +2708,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
                 return -EINVAL;
 
         chap_buf_size = (ev->u.get_chap.num_entries * sizeof(*chap_rec));
-        len = NLMSG_SPACE(sizeof(*ev) + chap_buf_size);
+        len = nlmsg_total_size(sizeof(*ev) + chap_buf_size);
 
         shost = scsi_host_lookup(ev->u.get_chap.host_no);
         if (!shost) {
@@ -2729,7 +2729,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
 
                 nlhchap = __nlmsg_put(skbchap, 0, 0, 0,
                                       (len - sizeof(*nlhchap)), 0);
-                evchap = NLMSG_DATA(nlhchap);
+                evchap = nlmsg_data(nlhchap);
                 memset(evchap, 0, sizeof(*evchap));
                 evchap->transport_handle = iscsi_handle(transport);
                 evchap->type = nlh->nlmsg_type;
@@ -2742,7 +2742,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
                 err = transport->get_chap(shost, ev->u.get_chap.chap_tbl_idx,
                                     &evchap->u.get_chap.num_entries, buf);
 
-                actual_size = NLMSG_SPACE(sizeof(*ev) + chap_buf_size);
+                actual_size = nlmsg_total_size(sizeof(*ev) + chap_buf_size);
                 skb_trim(skbchap, NLMSG_ALIGN(actual_size));
                 nlhchap->nlmsg_len = actual_size;
 
@@ -3068,7 +3068,7 @@ static int
 iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
 {
         int err = 0;
-        struct iscsi_uevent *ev = NLMSG_DATA(nlh);
+        struct iscsi_uevent *ev = nlmsg_data(nlh);
         struct iscsi_transport *transport = NULL;
         struct iscsi_internal *priv;
         struct iscsi_cls_session *session;
@@ -3256,7 +3256,7 @@ static void
 iscsi_if_rx(struct sk_buff *skb)
 {
         mutex_lock(&rx_queue_mutex);
-        while (skb->len >= NLMSG_SPACE(0)) {
+        while (skb->len >= NLMSG_HDRLEN) {
                 int err;
                 uint32_t rlen;
                 struct nlmsghdr *nlh;
@@ -3269,7 +3269,7 @@ iscsi_if_rx(struct sk_buff *skb)
                         break;
                 }
 
-                ev = NLMSG_DATA(nlh);
+                ev = nlmsg_data(nlh);
                 rlen = NLMSG_ALIGN(nlh->nlmsg_len);
                 if (rlen > skb->len)
                         rlen = skb->len;
diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index 71098a7b5fed..7cb7d2c8fd86 100644
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -354,7 +354,7 @@ void ssb_chipcommon_init(struct ssb_chipcommon *cc)
 
         if (cc->dev->id.revision >= 11)
                 cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
-        ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
+        ssb_dbg("chipcommon status is 0x%x\n", cc->status);
 
         if (cc->dev->id.revision >= 20) {
                 chipco_write32(cc, SSB_CHIPCO_GPIOPULLUP, 0);
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 7b0bce936762..1173a091b402 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -110,8 +110,8 @@ static void ssb_pmu0_pllinit_r0(struct ssb_chipcommon *cc,
                 return;
         }
 
-        ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
-                   (crystalfreq / 1000), (crystalfreq % 1000));
+        ssb_info("Programming PLL to %u.%03u MHz\n",
+                 crystalfreq / 1000, crystalfreq % 1000);
 
         /* First turn the PLL off. */
         switch (bus->chip_id) {
@@ -138,7 +138,7 @@ static void ssb_pmu0_pllinit_r0(struct ssb_chipcommon *cc,
         }
         tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
         if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
-                ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
+                ssb_emerg("Failed to turn the PLL off!\n");
 
         /* Set PDIV in PLL control 0. */
         pllctl = ssb_chipco_pll_read(cc, SSB_PMU0_PLLCTL0);
@@ -249,8 +249,8 @@ static void ssb_pmu1_pllinit_r0(struct ssb_chipcommon *cc,
                 return;
         }
 
-        ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
-                   (crystalfreq / 1000), (crystalfreq % 1000));
+        ssb_info("Programming PLL to %u.%03u MHz\n",
+                 crystalfreq / 1000, crystalfreq % 1000);
 
         /* First turn the PLL off. */
         switch (bus->chip_id) {
@@ -275,7 +275,7 @@ static void ssb_pmu1_pllinit_r0(struct ssb_chipcommon *cc,
         }
         tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
         if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
-                ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
+                ssb_emerg("Failed to turn the PLL off!\n");
 
         /* Set p1div and p2div. */
         pllctl = ssb_chipco_pll_read(cc, SSB_PMU1_PLLCTL0);
@@ -349,9 +349,8 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
         case 43222:
                 break;
         default:
-                ssb_printk(KERN_ERR PFX
-                           "ERROR: PLL init unknown for device %04X\n",
-                           bus->chip_id);
+                ssb_err("ERROR: PLL init unknown for device %04X\n",
+                        bus->chip_id);
         }
 }
 
@@ -472,9 +471,8 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)
                 max_msk = 0xFFFFF;
                 break;
         default:
-                ssb_printk(KERN_ERR PFX
-                           "ERROR: PMU resource config unknown for device %04X\n",
-                           bus->chip_id);
+                ssb_err("ERROR: PMU resource config unknown for device %04X\n",
+                        bus->chip_id);
         }
 
         if (updown_tab) {
@@ -526,8 +524,8 @@ void ssb_pmu_init(struct ssb_chipcommon *cc)
         pmucap = chipco_read32(cc, SSB_CHIPCO_PMU_CAP);
         cc->pmu.rev = (pmucap & SSB_CHIPCO_PMU_CAP_REVISION);
 
-        ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
-                    cc->pmu.rev, pmucap);
+        ssb_dbg("Found rev %u PMU (capabilities 0x%08X)\n",
+                cc->pmu.rev, pmucap);
 
         if (cc->pmu.rev == 1)
                 chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
@@ -638,9 +636,8 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc)
         case 0x5354:
                 ssb_pmu_get_alp_clock_clk0(cc);
         default:
-                ssb_printk(KERN_ERR PFX
-                           "ERROR: PMU alp clock unknown for device %04X\n",
-                           bus->chip_id);
+                ssb_err("ERROR: PMU alp clock unknown for device %04X\n",
+                        bus->chip_id);
                 return 0;
         }
 }
@@ -654,9 +651,8 @@ u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
                 /* 5354 chip uses a non programmable PLL of frequency 240MHz */
                 return 240000000;
         default:
-                ssb_printk(KERN_ERR PFX
-                           "ERROR: PMU cpu clock unknown for device %04X\n",
-                           bus->chip_id);
+                ssb_err("ERROR: PMU cpu clock unknown for device %04X\n",
+                        bus->chip_id);
                 return 0;
         }
 }
@@ -669,9 +665,8 @@ u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
         case 0x5354:
                 return 120000000;
         default:
-                ssb_printk(KERN_ERR PFX
-                           "ERROR: PMU controlclock unknown for device %04X\n",
-                           bus->chip_id);
+                ssb_err("ERROR: PMU controlclock unknown for device %04X\n",
+                        bus->chip_id);
                 return 0;
         }
 }
@@ -692,8 +687,23 @@ void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid)
                 pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
                 break;
         case 43222:
-                /* TODO: BCM43222 requires updating PLLs too */
-                return;
+                if (spuravoid == 1) {
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11500008);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0C000C06);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x0F600a08);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x2001E920);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888815);
+                } else {
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100008);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0c000c06);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x03000a08);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x200005c0);
+                        ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888855);
+                }
+                pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
+                break;
         default:
                 ssb_printk(KERN_ERR PFX
                            "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index 33b37dac40bd..fa385a368a56 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -167,21 +167,22 @@ static void set_irq(struct ssb_device *dev, unsigned int irq)
                 irqflag |= (ipsflag & ~ipsflag_irq_mask[irq]);
                 ssb_write32(mdev, SSB_IPSFLAG, irqflag);
         }
-        ssb_dprintk(KERN_INFO PFX
-                    "set_irq: core 0x%04x, irq %d => %d\n",
-                    dev->id.coreid, oldirq+2, irq+2);
+        ssb_dbg("set_irq: core 0x%04x, irq %d => %d\n",
+                dev->id.coreid, oldirq+2, irq+2);
 }
 
 static void print_irq(struct ssb_device *dev, unsigned int irq)
 {
-        int i;
         static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
-        ssb_dprintk(KERN_INFO PFX
-                "core 0x%04x, irq :", dev->id.coreid);
-        for (i = 0; i <= 6; i++) {
-                ssb_dprintk(" %s%s", irq_name[i], i==irq?"*":" ");
-        }
-        ssb_dprintk("\n");
+        ssb_dbg("core 0x%04x, irq : %s%s %s%s %s%s %s%s %s%s %s%s %s%s\n",
+                dev->id.coreid,
+                irq_name[0], irq == 0 ? "*" : " ",
+                irq_name[1], irq == 1 ? "*" : " ",
+                irq_name[2], irq == 2 ? "*" : " ",
+                irq_name[3], irq == 3 ? "*" : " ",
+                irq_name[4], irq == 4 ? "*" : " ",
+                irq_name[5], irq == 5 ? "*" : " ",
+                irq_name[6], irq == 6 ? "*" : " ");
 }
 
 static void dump_irq(struct ssb_bus *bus)
@@ -286,7 +287,7 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
         if (!mcore->dev)
                 return; /* We don't have a MIPS core */
 
-        ssb_dprintk(KERN_INFO PFX "Initializing MIPS core...\n");
+        ssb_dbg("Initializing MIPS core...\n");
 
         bus = mcore->dev->bus;
         hz = ssb_clockspeed(bus);
@@ -334,7 +335,7 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
                         break;
                 }
         }
-        ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
+        ssb_dbg("after irq reconfiguration\n");
         dump_irq(bus);
 
         ssb_mips_serial_init(mcore);
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 59801d23d7ec..d75b72ba2672 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -263,8 +263,7 @@ int ssb_pcicore_plat_dev_init(struct pci_dev *d)
                 return -ENODEV;
         }
 
-        ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
-                   pci_name(d));
+        ssb_info("PCI: Fixing up device %s\n", pci_name(d));
 
         /* Fix up interrupt lines */
         d->irq = ssb_mips_irq(extpci_core->dev) + 2;
@@ -285,12 +284,12 @@ static void ssb_pcicore_fixup_pcibridge(struct pci_dev *dev)
         if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
                 return;
 
-        ssb_printk(KERN_INFO "PCI: Fixing up bridge %s\n", pci_name(dev));
+        ssb_info("PCI: Fixing up bridge %s\n", pci_name(dev));
 
         /* Enable PCI bridge bus mastering and memory space */
         pci_set_master(dev);
         if (pcibios_enable_device(dev, ~0) < 0) {
-                ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n");
+                ssb_err("PCI: SSB bridge enable failed\n");
                 return;
         }
 
@@ -299,8 +298,8 @@ static void ssb_pcicore_fixup_pcibridge(struct pci_dev *dev)
 
         /* Make sure our latency is high enough to handle the devices behind us */
         lat = 168;
-        ssb_printk(KERN_INFO "PCI: Fixing latency timer of device %s to %u\n",
-                   pci_name(dev), lat);
+        ssb_info("PCI: Fixing latency timer of device %s to %u\n",
+                 pci_name(dev), lat);
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_pcicore_fixup_pcibridge);
@@ -323,7 +322,7 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
                 return;
         extpci_core = pc;
 
-        ssb_dprintk(KERN_INFO PFX "PCIcore in host mode found\n");
+        ssb_dbg("PCIcore in host mode found\n");
         /* Reset devices on the external PCI bus */
         val = SSB_PCICORE_CTL_RST_OE;
         val |= SSB_PCICORE_CTL_CLK_OE;
@@ -338,7 +337,7 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
         udelay(1); /* Assertion time demanded by the PCI standard */
 
         if (pc->dev->bus->has_cardbus_slot) {
-                ssb_dprintk(KERN_INFO PFX "CardBus slot detected\n");
+                ssb_dbg("CardBus slot detected\n");
                 pc->cardbusmode = 1;
                 /* GPIO 1 resets the bridge */
                 ssb_gpio_out(pc->dev->bus, 1, 1);
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c
index bb18d76f9f2c..55e101115038 100644
--- a/drivers/ssb/embedded.c
+++ b/drivers/ssb/embedded.c
@@ -57,9 +57,8 @@ int ssb_watchdog_register(struct ssb_bus *bus)
                                              bus->busnumber, &wdt,
                                              sizeof(wdt));
         if (IS_ERR(pdev)) {
-                ssb_dprintk(KERN_INFO PFX
-                            "can not register watchdog device, err: %li\n",
-                            PTR_ERR(pdev));
+                ssb_dbg("can not register watchdog device, err: %li\n",
+                        PTR_ERR(pdev));
                 return PTR_ERR(pdev);
         }
 
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 3b645b8a261f..812775a4bfb6 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -275,8 +275,8 @@ int ssb_devices_thaw(struct ssb_freeze_context *ctx)
 
                 err = sdrv->probe(sdev, &sdev->id);
                 if (err) {
-                        ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
-                                   dev_name(sdev->dev));
+                        ssb_err("Failed to thaw device %s\n",
+                                dev_name(sdev->dev));
                         result = err;
                 }
                 ssb_device_put(sdev);
@@ -447,10 +447,9 @@ void ssb_bus_unregister(struct ssb_bus *bus)
 
         err = ssb_gpio_unregister(bus);
         if (err == -EBUSY)
-                ssb_dprintk(KERN_ERR PFX "Some GPIOs are still in use.\n");
+                ssb_dbg("Some GPIOs are still in use\n");
         else if (err)
-                ssb_dprintk(KERN_ERR PFX
-                            "Can not unregister GPIO driver: %i\n", err);
+                ssb_dbg("Can not unregister GPIO driver: %i\n", err);
 
         ssb_buses_lock();
         ssb_devices_unregister(bus);
@@ -497,8 +496,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
 
                 devwrap = kzalloc(sizeof(*devwrap), GFP_KERNEL);
                 if (!devwrap) {
-                        ssb_printk(KERN_ERR PFX
-                                   "Could not allocate device\n");
+                        ssb_err("Could not allocate device\n");
                         err = -ENOMEM;
                         goto error;
                 }
@@ -537,9 +535,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
                 sdev->dev = dev;
                 err = device_register(dev);
                 if (err) {
-                        ssb_printk(KERN_ERR PFX
-                                   "Could not register %s\n",
-                                   dev_name(dev));
+                        ssb_err("Could not register %s\n", dev_name(dev));
                         /* Set dev to NULL to not unregister
                          * dev on error unwinding. */
                         sdev->dev = NULL;
@@ -825,10 +821,9 @@ static int ssb_bus_register(struct ssb_bus *bus,
         ssb_mipscore_init(&bus->mipscore);
         err = ssb_gpio_init(bus);
         if (err == -ENOTSUPP)
-                ssb_dprintk(KERN_DEBUG PFX "GPIO driver not activated\n");
+                ssb_dbg("GPIO driver not activated\n");
         else if (err)
-                ssb_dprintk(KERN_ERR PFX
-                           "Error registering GPIO driver: %i\n", err);
+                ssb_dbg("Error registering GPIO driver: %i\n", err);
         err = ssb_fetch_invariants(bus, get_invariants);
         if (err) {
                 ssb_bus_may_powerdown(bus);
@@ -878,11 +873,11 @@ int ssb_bus_pcibus_register(struct ssb_bus *bus, struct pci_dev *host_pci)
 
         err = ssb_bus_register(bus, ssb_pci_get_invariants, 0);
         if (!err) {
-                ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
-                           "PCI device %s\n", dev_name(&host_pci->dev));
+                ssb_info("Sonics Silicon Backplane found on PCI device %s\n",
+                         dev_name(&host_pci->dev));
         } else {
-                ssb_printk(KERN_ERR PFX "Failed to register PCI version"
-                           " of SSB with error %d\n", err);
+                ssb_err("Failed to register PCI version of SSB with error %d\n",
+                        err);
         }
 
         return err;
@@ -903,8 +898,8 @@ int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
 
         err = ssb_bus_register(bus, ssb_pcmcia_get_invariants, baseaddr);
         if (!err) {
-                ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
-                           "PCMCIA device %s\n", pcmcia_dev->devname);
+                ssb_info("Sonics Silicon Backplane found on PCMCIA device %s\n",
+                         pcmcia_dev->devname);
         }
 
         return err;
@@ -925,8 +920,8 @@ int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func,
 
         err = ssb_bus_register(bus, ssb_sdio_get_invariants, ~0);
         if (!err) {
-                ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
-                           "SDIO device %s\n", sdio_func_id(func));
+                ssb_info("Sonics Silicon Backplane found on SDIO device %s\n",
+                         sdio_func_id(func));
         }
 
         return err;
@@ -944,8 +939,8 @@ int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,
 
         err = ssb_bus_register(bus, get_invariants, baseaddr);
         if (!err) {
-                ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found at "
-                           "address 0x%08lX\n", baseaddr);
+                ssb_info("Sonics Silicon Backplane found at address 0x%08lX\n",
+                         baseaddr);
         }
 
         return err;
@@ -1339,7 +1334,7 @@ out:
 #endif
         return err;
 error:
-        ssb_printk(KERN_ERR PFX "Bus powerdown failed\n");
+        ssb_err("Bus powerdown failed\n");
         goto out;
 }
 EXPORT_SYMBOL(ssb_bus_may_powerdown);
@@ -1362,7 +1357,7 @@ int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 
         return 0;
 error:
-        ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
+        ssb_err("Bus powerup failed\n");
         return err;
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@@ -1470,15 +1465,13 @@ static int __init ssb_modinit(void)
 
         err = b43_pci_ssb_bridge_init();
         if (err) {
-                ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
-                           "initialization failed\n");
+                ssb_err("Broadcom 43xx PCI-SSB-bridge initialization failed\n");
                 /* don't fail SSB init because of this */
                 err = 0;
         }
         err = ssb_gige_init();
         if (err) {
-                ssb_printk(KERN_ERR "SSB Broadcom Gigabit Ethernet "
-                           "driver initialization failed\n");
+                ssb_err("SSB Broadcom Gigabit Ethernet driver initialization failed\n");
                 /* don't fail SSB init because of this */
                 err = 0;
         }
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index e9d94968f394..a8dc95ebf2d6 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -56,7 +56,7 @@ int ssb_pci_switch_coreidx(struct ssb_bus *bus, u8 coreidx)
         }
         return 0;
 error:
-        ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
+        ssb_err("Failed to switch to core %u\n", coreidx);
         return -ENODEV;
 }
 
@@ -67,10 +67,9 @@ int ssb_pci_switch_core(struct ssb_bus *bus,
         unsigned long flags;
 
 #if SSB_VERBOSE_PCICORESWITCH_DEBUG
-        ssb_printk(KERN_INFO PFX
-                   "Switching to %s core, index %d\n",
-                   ssb_core_name(dev->id.coreid),
-                   dev->core_index);
+        ssb_info("Switching to %s core, index %d\n",
+                 ssb_core_name(dev->id.coreid),
+                 dev->core_index);
 #endif
 
         spin_lock_irqsave(&bus->bar_lock, flags);
@@ -231,6 +230,15 @@ static inline u8 ssb_crc8(u8 crc, u8 data)
         return t[crc ^ data];
 }
 
+static void sprom_get_mac(char *mac, const u16 *in)
+{
+        int i;
+        for (i = 0; i < 3; i++) {
+                *mac++ = in[i] >> 8;
+                *mac++ = in[i];
+        }
+}
+
 static u8 ssb_sprom_crc(const u16 *sprom, u16 size)
 {
         int word;
@@ -278,7 +286,7 @@ static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom)
         u32 spromctl;
         u16 size = bus->sprom_size;
 
-        ssb_printk(KERN_NOTICE PFX "Writing SPROM. Do NOT turn off the power! Please stand by...\n");
+        ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
         err = pci_read_config_dword(pdev, SSB_SPROMCTL, &spromctl);
         if (err)
                 goto err_ctlreg;
@@ -286,17 +294,17 @@ static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom)
         err = pci_write_config_dword(pdev, SSB_SPROMCTL, spromctl);
         if (err)
                 goto err_ctlreg;
-        ssb_printk(KERN_NOTICE PFX "[ 0%%");
+        ssb_notice("[ 0%%");
         msleep(500);
         for (i = 0; i < size; i++) {
                 if (i == size / 4)
-                        ssb_printk("25%%");
+                        ssb_cont("25%%");
                 else if (i == size / 2)
-                        ssb_printk("50%%");
+                        ssb_cont("50%%");
                 else if (i == (size * 3) / 4)
-                        ssb_printk("75%%");
+                        ssb_cont("75%%");
                 else if (i % 2)
-                        ssb_printk(".");
+                        ssb_cont(".");
                 writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
                 mmiowb();
                 msleep(20);
@@ -309,12 +317,12 @@ static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom)
         if (err)
                 goto err_ctlreg;
         msleep(500);
-        ssb_printk("100%% ]\n");
-        ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
+        ssb_cont("100%% ]\n");
+        ssb_notice("SPROM written\n");
 
         return 0;
 err_ctlreg:
-        ssb_printk(KERN_ERR PFX "Could not access SPROM control register.\n");
+        ssb_err("Could not access SPROM control register.\n");
         return err;
 }
 
@@ -339,10 +347,23 @@ static s8 r123_extract_antgain(u8 sprom_revision, const u16 *in,
         return (s8)gain;
 }
 
+static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in)
+{
+        SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
+        SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);
+        SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0);
+        SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0);
+        SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0);
+        SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0);
+        SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0);
+        SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0);
+        SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0);
+        SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO,
+             SSB_SPROM2_MAXP_A_LO_SHIFT);
+}
+
 static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
 {
-        int i;
-        u16 v;
         u16 loc[3];
 
         if (out->revision == 3)                 /* rev 3 moved MAC */
@@ -352,19 +373,10 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
                 loc[1] = SSB_SPROM1_ET0MAC;
                 loc[2] = SSB_SPROM1_ET1MAC;
         }
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(loc[0]) + i];
-                *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
-        }
+        sprom_get_mac(out->il0mac, &in[SPOFF(loc[0])]);
         if (out->revision < 3) {        /* only rev 1-2 have et0, et1 */
-                for (i = 0; i < 3; i++) {
-                        v = in[SPOFF(loc[1]) + i];
-                        *(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
-                }
-                for (i = 0; i < 3; i++) {
-                        v = in[SPOFF(loc[2]) + i];
-                        *(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
-                }
+                sprom_get_mac(out->et0mac, &in[SPOFF(loc[1])]);
+                sprom_get_mac(out->et1mac, &in[SPOFF(loc[2])]);
         }
         SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
         SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
@@ -372,6 +384,7 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
         SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
         SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
+        SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
         if (out->revision == 1)
                 SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
                      SSB_SPROM1_BINF_CCODE_SHIFT);
@@ -398,8 +411,7 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
              SSB_SPROM1_ITSSI_A_SHIFT);
         SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
         SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
-        if (out->revision >= 2)
-                SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
+
         SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);
         SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
 
@@ -410,6 +422,8 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
                                                     SSB_SPROM1_AGAIN_A,
                                                     SSB_SPROM1_AGAIN_A_SHIFT);
+        if (out->revision >= 2)
+                sprom_extract_r23(out, in);
 }
 
 /* Revs 4 5 and 8 have partially shared layout */
@@ -454,23 +468,20 @@ static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
 
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 {
-        int i;
-        u16 v;
         u16 il0mac_offset;
 
         if (out->revision == 4)
                 il0mac_offset = SSB_SPROM4_IL0MAC;
         else
                 il0mac_offset = SSB_SPROM5_IL0MAC;
-        /* extract the MAC address */
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(il0mac_offset) + i];
-                *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
-        }
+
+        sprom_get_mac(out->il0mac, &in[SPOFF(il0mac_offset)]);
+
         SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
         SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
              SSB_SPROM4_ETHPHY_ET1A_SHIFT);
         SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
+        SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
         if (out->revision == 4) {
                 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
                 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
@@ -530,7 +541,7 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
         int i;
-        u16 v, o;
+        u16 o;
         u16 pwr_info_offset[] = {
                 SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
                 SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
@@ -539,11 +550,10 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
                         ARRAY_SIZE(out->core_pwr_info));
 
         /* extract the MAC address */
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
-                *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
-        }
+        sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);
+
         SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
+        SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
         SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
         SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
         SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
@@ -743,7 +753,7 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
         memset(out, 0, sizeof(*out));
 
         out->revision = in[size - 1] & 0x00FF;
-        ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
+        ssb_dbg("SPROM revision %d detected\n", out->revision);
         memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
         memset(out->et1mac, 0xFF, 6);
 
@@ -752,7 +762,7 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
                  * number stored in the SPROM.
                  * Always extract r1. */
                 out->revision = 1;
-                ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
+                ssb_dbg("SPROM treated as revision %d\n", out->revision);
         }
 
         switch (out->revision) {
@@ -769,9 +779,8 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
                 sprom_extract_r8(out, in);
                 break;
         default:
-                ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
-                           " revision %d detected. Will extract"
-                           " v1\n", out->revision);
+                ssb_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
+                         out->revision);
                 out->revision = 1;
                 sprom_extract_r123(out, in);
         }
@@ -791,7 +800,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
         u16 *buf;
 
         if (!ssb_is_sprom_available(bus)) {
-                ssb_printk(KERN_ERR PFX "No SPROM available!\n");
+                ssb_err("No SPROM available!\n");
                 return -ENODEV;
         }
         if (bus->chipco.dev) {  /* can be unavailable! */
@@ -810,7 +819,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
         } else {
                 bus->sprom_offset = SSB_SPROM_BASE1;
         }
-        ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
+        ssb_dbg("SPROM offset is 0x%x\n", bus->sprom_offset);
 
         buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
         if (!buf)
@@ -835,18 +844,15 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                          * available for this device in some other storage */
                         err = ssb_fill_sprom_with_fallback(bus, sprom);
                         if (err) {
-                                ssb_printk(KERN_WARNING PFX "WARNING: Using"
-                                           " fallback SPROM failed (err %d)\n",
-                                           err);
+                                ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n",
+                                         err);
                         } else {
-                                ssb_dprintk(KERN_DEBUG PFX "Using SPROM"
-                                            " revision %d provided by"
-                                            " platform.\n", sprom->revision);
+                                ssb_dbg("Using SPROM revision %d provided by platform\n",
+                                        sprom->revision);
                                 err = 0;
                                 goto out_free;
                         }
-                        ssb_printk(KERN_WARNING PFX "WARNING: Invalid"
-                                   " SPROM CRC (corrupt SPROM)\n");
+                        ssb_warn("WARNING: Invalid SPROM CRC (corrupt SPROM)\n");
                 }
         }
         err = sprom_extract(bus, sprom, buf, bus->sprom_size);
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index fbafed5b729b..b413e0187087 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -143,7 +143,7 @@ int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
 
         return 0;
 error:
-        ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
+        ssb_err("Failed to switch to core %u\n", coreidx);
         return err;
 }
 
@@ -153,10 +153,9 @@ int ssb_pcmcia_switch_core(struct ssb_bus *bus,
         int err;
 
 #if SSB_VERBOSE_PCMCIACORESWITCH_DEBUG
-        ssb_printk(KERN_INFO PFX
-                   "Switching to %s core, index %d\n",
-                   ssb_core_name(dev->id.coreid),
-                   dev->core_index);
+        ssb_info("Switching to %s core, index %d\n",
+                 ssb_core_name(dev->id.coreid),
+                 dev->core_index);
 #endif
 
         err = ssb_pcmcia_switch_coreidx(bus, dev->core_index);
@@ -192,7 +191,7 @@ int ssb_pcmcia_switch_segment(struct ssb_bus *bus, u8 seg)
 
         return 0;
 error:
-        ssb_printk(KERN_ERR PFX "Failed to switch pcmcia segment\n");
+        ssb_err("Failed to switch pcmcia segment\n");
         return err;
 }
 
@@ -549,44 +548,39 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom)
         bool failed = 0;
         size_t size = SSB_PCMCIA_SPROM_SIZE;
 
-        ssb_printk(KERN_NOTICE PFX
-                   "Writing SPROM. Do NOT turn off the power! "
-                   "Please stand by...\n");
+        ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
         err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEEN);
         if (err) {
-                ssb_printk(KERN_NOTICE PFX
-                           "Could not enable SPROM write access.\n");
+                ssb_notice("Could not enable SPROM write access\n");
                 return -EBUSY;
         }
-        ssb_printk(KERN_NOTICE PFX "[ 0%%");
+        ssb_notice("[ 0%%");
         msleep(500);
         for (i = 0; i < size; i++) {
                 if (i == size / 4)
-                        ssb_printk("25%%");
+                        ssb_cont("25%%");
                 else if (i == size / 2)
-                        ssb_printk("50%%");
+                        ssb_cont("50%%");
                 else if (i == (size * 3) / 4)
-                        ssb_printk("75%%");
+                        ssb_cont("75%%");
                 else if (i % 2)
-                        ssb_printk(".");
+                        ssb_cont(".");
                 err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
                 if (err) {
-                        ssb_printk(KERN_NOTICE PFX
-                                   "Failed to write to SPROM.\n");
+                        ssb_notice("Failed to write to SPROM\n");
                         failed = 1;
                         break;
                 }
         }
         err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
         if (err) {
-                ssb_printk(KERN_NOTICE PFX
-                           "Could not disable SPROM write access.\n");
+                ssb_notice("Could not disable SPROM write access\n");
                 failed = 1;
         }
         msleep(500);
         if (!failed) {
-                ssb_printk("100%% ]\n");
-                ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
+                ssb_cont("100%% ]\n");
+                ssb_notice("SPROM written\n");
         }
 
         return failed ? -EBUSY : 0;
@@ -700,7 +694,7 @@ static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
         return -ENOSPC; /* continue with next entry */
 
 error:
-        ssb_printk(KERN_ERR PFX
+        ssb_err(
                    "PCMCIA: Failed to fetch device invariants: %s\n",
                    error_description);
         return -ENODEV;
@@ -722,7 +716,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
                                 ssb_pcmcia_get_mac, sprom);
         if (res != 0) {
-                ssb_printk(KERN_ERR PFX
+                ssb_err(
                         "PCMCIA: Failed to fetch MAC address\n");
                 return -ENODEV;
         }
@@ -733,7 +727,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         if ((res == 0) || (res == -ENOSPC))
                 return 0;
 
-        ssb_printk(KERN_ERR PFX
+        ssb_err(
                         "PCMCIA: Failed to fetch device invariants\n");
         return -ENODEV;
 }
@@ -843,6 +837,6 @@ int ssb_pcmcia_init(struct ssb_bus *bus)
 
         return 0;
 error:
-        ssb_printk(KERN_ERR PFX "Failed to initialize PCMCIA host device\n");
+        ssb_err("Failed to initialize PCMCIA host device\n");
         return err;
 }
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index ab4627cf1114..b9429df583eb 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -125,8 +125,7 @@ static u16 pcidev_to_chipid(struct pci_dev *pci_dev)
                 chipid_fallback = 0x4401;
                 break;
         default:
-                ssb_printk(KERN_ERR PFX
-                           "PCI-ID not in fallback list\n");
+                ssb_err("PCI-ID not in fallback list\n");
         }
 
         return chipid_fallback;
@@ -152,8 +151,7 @@ static u8 chipid_to_nrcores(u16 chipid)
         case 0x4704:
                 return 9;
         default:
-                ssb_printk(KERN_ERR PFX
-                           "CHIPID not in nrcores fallback list\n");
+                ssb_err("CHIPID not in nrcores fallback list\n");
         }
 
         return 1;
@@ -320,15 +318,13 @@ int ssb_bus_scan(struct ssb_bus *bus,
                         bus->chip_package = 0;
                 }
         }
-        ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
-                   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
-                   bus->chip_package);
+        ssb_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
+                 bus->chip_id, bus->chip_rev, bus->chip_package);
         if (!bus->nr_devices)
                 bus->nr_devices = chipid_to_nrcores(bus->chip_id);
         if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
-                ssb_printk(KERN_ERR PFX
-                           "More than %d ssb cores found (%d)\n",
-                           SSB_MAX_NR_CORES, bus->nr_devices);
+                ssb_err("More than %d ssb cores found (%d)\n",
+                        SSB_MAX_NR_CORES, bus->nr_devices);
                 goto err_unmap;
         }
         if (bus->bustype == SSB_BUSTYPE_SSB) {
@@ -370,8 +366,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
                         nr_80211_cores++;
                         if (nr_80211_cores > 1) {
                                 if (!we_support_multiple_80211_cores(bus)) {
-                                        ssb_dprintk(KERN_INFO PFX "Ignoring additional "
-                                                    "802.11 core\n");
+                                        ssb_dbg("Ignoring additional 802.11 core\n");
                                         continue;
                                 }
                         }
@@ -379,8 +374,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
                 case SSB_DEV_EXTIF:
 #ifdef CONFIG_SSB_DRIVER_EXTIF
                         if (bus->extif.dev) {
-                                ssb_printk(KERN_WARNING PFX
-                                           "WARNING: Multiple EXTIFs found\n");
+                                ssb_warn("WARNING: Multiple EXTIFs found\n");
                                 break;
                         }
                         bus->extif.dev = dev;
@@ -388,8 +382,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
                         break;
                 case SSB_DEV_CHIPCOMMON:
                         if (bus->chipco.dev) {
-                                ssb_printk(KERN_WARNING PFX
-                                           "WARNING: Multiple ChipCommon found\n");
+                                ssb_warn("WARNING: Multiple ChipCommon found\n");
                                 break;
                         }
                         bus->chipco.dev = dev;
@@ -398,8 +391,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
                 case SSB_DEV_MIPS_3302:
 #ifdef CONFIG_SSB_DRIVER_MIPS
                         if (bus->mipscore.dev) {
-                                ssb_printk(KERN_WARNING PFX
-                                           "WARNING: Multiple MIPS cores found\n");
+                                ssb_warn("WARNING: Multiple MIPS cores found\n");
                                 break;
                         }
                         bus->mipscore.dev = dev;
@@ -420,8 +412,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
                                 }
                         }
                         if (bus->pcicore.dev) {
-                                ssb_printk(KERN_WARNING PFX
-                                           "WARNING: Multiple PCI(E) cores found\n");
+                                ssb_warn("WARNING: Multiple PCI(E) cores found\n");
                                 break;
                         }
                         bus->pcicore.dev = dev;
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index 80d366fcf8d3..a3b23644b0fb 100644
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -127,13 +127,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
                 goto out_kfree;
         err = ssb_devices_freeze(bus, &freeze);
         if (err) {
-                ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
+                ssb_err("SPROM write: Could not freeze all devices\n");
                 goto out_unlock;
         }
         res = sprom_write(bus, sprom);
         err = ssb_devices_thaw(&freeze);
         if (err)
-                ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
+                ssb_err("SPROM write: Could not thaw all devices\n");
 out_unlock:
         mutex_unlock(&bus->sprom_mutex);
 out_kfree:
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 466171b77f68..4671f17f09af 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -9,16 +9,27 @@
 #define PFX     "ssb: "
 
 #ifdef CONFIG_SSB_SILENT
-# define ssb_printk(fmt, x...)  do { /* nothing */ } while (0)
+# define ssb_printk(fmt, ...)                                   \
+        do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
 #else
-# define ssb_printk             printk
+# define ssb_printk(fmt, ...)                                   \
+        printk(fmt, ##__VA_ARGS__)
 #endif /* CONFIG_SSB_SILENT */
 
+#define ssb_emerg(fmt, ...)     ssb_printk(KERN_EMERG PFX fmt, ##__VA_ARGS__)
+#define ssb_err(fmt, ...)       ssb_printk(KERN_ERR PFX fmt, ##__VA_ARGS__)
+#define ssb_warn(fmt, ...)      ssb_printk(KERN_WARNING PFX fmt, ##__VA_ARGS__)
+#define ssb_notice(fmt, ...)    ssb_printk(KERN_NOTICE PFX fmt, ##__VA_ARGS__)
+#define ssb_info(fmt, ...)      ssb_printk(KERN_INFO PFX fmt, ##__VA_ARGS__)
+#define ssb_cont(fmt, ...)      ssb_printk(KERN_CONT fmt, ##__VA_ARGS__)
+
 /* dprintk: Debugging printk; vanishes for non-debug compilation */
 #ifdef CONFIG_SSB_DEBUG
-# define ssb_dprintk(fmt, x...) ssb_printk(fmt , ##x)
+# define ssb_dbg(fmt, ...)                                      \
+        ssb_printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__)
 #else
-# define ssb_dprintk(fmt, x...) do { /* nothing */ } while (0)
+# define ssb_dbg(fmt, ...)                                      \
+        do { if (0) printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__); } while (0)
 #endif
 
 #ifdef CONFIG_SSB_DEBUG
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 8a92605adbff..af7f1c1d0b5c 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -15,7 +15,7 @@
 
 #include <linux/module.h>
 #include <linux/etherdevice.h>
-#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <asm/byteorder.h>
 #include <net/sock.h>
 #include "netlink_k.h"
@@ -26,12 +26,12 @@
 
 #define ND_MAX_GROUP                    30
 #define ND_IFINDEX_LEN                  sizeof(int)
-#define ND_NLMSG_SPACE(len)             (NLMSG_SPACE(len) + ND_IFINDEX_LEN)
+#define ND_NLMSG_SPACE(len)             (nlmsg_total_size(len) + ND_IFINDEX_LEN)
 #define ND_NLMSG_DATA(nlh) \
-        ((void *)((char *)NLMSG_DATA(nlh) + ND_IFINDEX_LEN))
+        ((void *)((char *)nlmsg_data(nlh) + ND_IFINDEX_LEN))
 #define ND_NLMSG_S_LEN(len)             (len+ND_IFINDEX_LEN)
 #define ND_NLMSG_R_LEN(nlh)             (nlh->nlmsg_len-ND_IFINDEX_LEN)
-#define ND_NLMSG_IFIDX(nlh)             NLMSG_DATA(nlh)
+#define ND_NLMSG_IFIDX(nlh)             nlmsg_data(nlh)
 #define ND_MAX_MSG_LEN                  8096
 
 #if defined(DEFINE_MUTEX)
@@ -52,7 +52,7 @@ static void netlink_rcv_cb(struct sk_buff *skb)
         void *msg;
         int ifindex;
 
-        if (skb->len >= NLMSG_SPACE(0)) {
+        if (skb->len >= NLMSG_HDRLEN) {
                 nlh = (struct nlmsghdr *)skb->data;
 
                 if (skb->len < nlh->nlmsg_len ||
@@ -125,7 +125,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
                 return -EINVAL;
         }
 
-        skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC);
+        skb = nlmsg_new(len, GFP_ATOMIC);
         if (!skb) {
                 pr_err("netlink_broadcast ret=%d\n", ret);
                 return -ENOMEM;
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index ec6fb3fa59bb..87c216c1e54e 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -64,20 +64,10 @@ enum {
         VHOST_NET_VQ_MAX = 2,
 };
 
-enum vhost_net_poll_state {
-        VHOST_NET_POLL_DISABLED = 0,
-        VHOST_NET_POLL_STARTED = 1,
-        VHOST_NET_POLL_STOPPED = 2,
-};
-
 struct vhost_net {
         struct vhost_dev dev;
         struct vhost_virtqueue vqs[VHOST_NET_VQ_MAX];
         struct vhost_poll poll[VHOST_NET_VQ_MAX];
-        /* Tells us whether we are polling a socket for TX.
-         * We only do this when socket buffer fills up.
-         * Protected by tx vq lock. */
-        enum vhost_net_poll_state tx_poll_state;
         /* Number of TX recently submitted.
          * Protected by tx vq lock. */
         unsigned tx_packets;
@@ -155,28 +145,6 @@ static void copy_iovec_hdr(const struct iovec *from, struct iovec *to,
         }
 }
 
-/* Caller must have TX VQ lock */
-static void tx_poll_stop(struct vhost_net *net)
-{
-        if (likely(net->tx_poll_state != VHOST_NET_POLL_STARTED))
-                return;
-        vhost_poll_stop(net->poll + VHOST_NET_VQ_TX);
-        net->tx_poll_state = VHOST_NET_POLL_STOPPED;
-}
-
-/* Caller must have TX VQ lock */
-static int tx_poll_start(struct vhost_net *net, struct socket *sock)
-{
-        int ret;
-
-        if (unlikely(net->tx_poll_state != VHOST_NET_POLL_STOPPED))
-                return 0;
-        ret = vhost_poll_start(net->poll + VHOST_NET_VQ_TX, sock->file);
-        if (!ret)
-                net->tx_poll_state = VHOST_NET_POLL_STARTED;
-        return ret;
-}
-
 /* In case of DMA done not in order in lower device driver for some reason.
  * upend_idx is used to track end of used idx, done_idx is used to track head
  * of used idx. Once lower device DMA done contiguously, we will signal KVM
@@ -242,7 +210,7 @@ static void handle_tx(struct vhost_net *net)
                 .msg_flags = MSG_DONTWAIT,
         };
         size_t len, total_len = 0;
-        int err, wmem;
+        int err;
         size_t hdr_size;
         struct socket *sock;
         struct vhost_ubuf_ref *uninitialized_var(ubufs);
@@ -253,19 +221,9 @@ static void handle_tx(struct vhost_net *net)
         if (!sock)
                 return;
 
-        wmem = atomic_read(&sock->sk->sk_wmem_alloc);
-        if (wmem >= sock->sk->sk_sndbuf) {
-                mutex_lock(&vq->mutex);
-                tx_poll_start(net, sock);
-                mutex_unlock(&vq->mutex);
-                return;
-        }
-
         mutex_lock(&vq->mutex);
         vhost_disable_notify(&net->dev, vq);
 
-        if (wmem < sock->sk->sk_sndbuf / 2)
-                tx_poll_stop(net);
         hdr_size = vq->vhost_hlen;
         zcopy = vq->ubufs;
 
@@ -285,23 +243,14 @@ static void handle_tx(struct vhost_net *net)
                 if (head == vq->num) {
                         int num_pends;
 
-                        wmem = atomic_read(&sock->sk->sk_wmem_alloc);
-                        if (wmem >= sock->sk->sk_sndbuf * 3 / 4) {
-                                tx_poll_start(net, sock);
-                                set_bit(SOCK_ASYNC_NOSPACE, &sock->flags);
-                                break;
-                        }
                         /* If more outstanding DMAs, queue the work.
                          * Handle upend_idx wrap around
                          */
                         num_pends = likely(vq->upend_idx >= vq->done_idx) ?
                                     (vq->upend_idx - vq->done_idx) :
                                     (vq->upend_idx + UIO_MAXIOV - vq->done_idx);
-                        if (unlikely(num_pends > VHOST_MAX_PEND)) {
-                                tx_poll_start(net, sock);
-                                set_bit(SOCK_ASYNC_NOSPACE, &sock->flags);
+                        if (unlikely(num_pends > VHOST_MAX_PEND))
                                 break;
-                        }
                         if (unlikely(vhost_enable_notify(&net->dev, vq))) {
                                 vhost_disable_notify(&net->dev, vq);
                                 continue;
@@ -364,8 +313,6 @@ static void handle_tx(struct vhost_net *net)
                                         UIO_MAXIOV;
                         }
                         vhost_discard_vq_desc(vq, 1);
-                        if (err == -EAGAIN || err == -ENOBUFS)
-                                tx_poll_start(net, sock);
                         break;
                 }
                 if (err != len)
@@ -628,7 +575,6 @@ static int vhost_net_open(struct inode *inode, struct file *f)
 
         vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
         vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
-        n->tx_poll_state = VHOST_NET_POLL_DISABLED;
 
         f->private_data = n;
 
@@ -638,32 +584,24 @@ static int vhost_net_open(struct inode *inode, struct file *f)
 static void vhost_net_disable_vq(struct vhost_net *n,
                                  struct vhost_virtqueue *vq)
 {
+        struct vhost_poll *poll = n->poll + (vq - n->vqs);
         if (!vq->private_data)
                 return;
-        if (vq == n->vqs + VHOST_NET_VQ_TX) {
-                tx_poll_stop(n);
-                n->tx_poll_state = VHOST_NET_POLL_DISABLED;
-        } else
-                vhost_poll_stop(n->poll + VHOST_NET_VQ_RX);
+        vhost_poll_stop(poll);
 }
 
 static int vhost_net_enable_vq(struct vhost_net *n,
                                 struct vhost_virtqueue *vq)
 {
+        struct vhost_poll *poll = n->poll + (vq - n->vqs);
         struct socket *sock;
-        int ret;
 
         sock = rcu_dereference_protected(vq->private_data,
                                          lockdep_is_held(&vq->mutex));
         if (!sock)
                 return 0;
-        if (vq == n->vqs + VHOST_NET_VQ_TX) {
-                n->tx_poll_state = VHOST_NET_POLL_STOPPED;
-                ret = tx_poll_start(n, sock);
-        } else
-                ret = vhost_poll_start(n->poll + VHOST_NET_VQ_RX, sock->file);
 
-        return ret;
+        return vhost_poll_start(poll, sock->file);
 }
 
 static struct socket *vhost_net_stop_vq(struct vhost_net *n,
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 9759249e6d90..4eecdb867d53 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -89,6 +89,9 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file)
         unsigned long mask;
         int ret = 0;
 
+        if (poll->wqh)
+                return 0;
+
         mask = file->f_op->poll(file, &poll->table);
         if (mask)
                 vhost_poll_wakeup(&poll->wait, 0, 0, (void *)mask);