*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Intel PCIe NTB Linux driver
+ * Intel PCIe GEN3 NTB Linux driver
  *
- * Contact Information:
- * Jon Mason <jon.mason@intel.com>
  */
 
 #include <linux/debugfs.h>
 #include "ntb_hw_gen1.h"
 #include "ntb_hw_gen3.h"
 
-static const struct intel_ntb_reg skx_reg = {
-       .poll_link              = skx_poll_link,
+static int gen3_poll_link(struct intel_ntb_dev *ndev);
+
+static const struct intel_ntb_reg gen3_reg = {
+       .poll_link              = gen3_poll_link,
        .link_is_up             = xeon_link_is_up,
-       .db_ioread              = skx_db_ioread,
-       .db_iowrite             = skx_db_iowrite,
+       .db_ioread              = gen3_db_ioread,
+       .db_iowrite             = gen3_db_iowrite,
        .db_size                = sizeof(u32),
-       .ntb_ctl                = SKX_NTBCNTL_OFFSET,
+       .ntb_ctl                = GEN3_NTBCNTL_OFFSET,
        .mw_bar                 = {2, 4},
 };
 
-static const struct intel_ntb_alt_reg skx_pri_reg = {
-       .db_bell                = SKX_EM_DOORBELL_OFFSET,
-       .db_clear               = SKX_IM_INT_STATUS_OFFSET,
-       .db_mask                = SKX_IM_INT_DISABLE_OFFSET,
-       .spad                   = SKX_IM_SPAD_OFFSET,
+static const struct intel_ntb_alt_reg gen3_pri_reg = {
+       .db_bell                = GEN3_EM_DOORBELL_OFFSET,
+       .db_clear               = GEN3_IM_INT_STATUS_OFFSET,
+       .db_mask                = GEN3_IM_INT_DISABLE_OFFSET,
+       .spad                   = GEN3_IM_SPAD_OFFSET,
 };
 
-static const struct intel_ntb_alt_reg skx_b2b_reg = {
-       .db_bell                = SKX_IM_DOORBELL_OFFSET,
-       .db_clear               = SKX_EM_INT_STATUS_OFFSET,
-       .db_mask                = SKX_EM_INT_DISABLE_OFFSET,
-       .spad                   = SKX_B2B_SPAD_OFFSET,
+static const struct intel_ntb_alt_reg gen3_b2b_reg = {
+       .db_bell                = GEN3_IM_DOORBELL_OFFSET,
+       .db_clear               = GEN3_EM_INT_STATUS_OFFSET,
+       .db_mask                = GEN3_EM_INT_DISABLE_OFFSET,
+       .spad                   = GEN3_B2B_SPAD_OFFSET,
 };
 
-static const struct intel_ntb_xlat_reg skx_sec_xlat = {
-/*     .bar0_base              = SKX_EMBAR0_OFFSET, */
-       .bar2_limit             = SKX_IMBAR1XLMT_OFFSET,
-       .bar2_xlat              = SKX_IMBAR1XBASE_OFFSET,
+static const struct intel_ntb_xlat_reg gen3_sec_xlat = {
+/*     .bar0_base              = GEN3_EMBAR0_OFFSET, */
+       .bar2_limit             = GEN3_IMBAR1XLMT_OFFSET,
+       .bar2_xlat              = GEN3_IMBAR1XBASE_OFFSET,
 };
 
-int skx_poll_link(struct intel_ntb_dev *ndev)
+static int gen3_poll_link(struct intel_ntb_dev *ndev)
 {
        u16 reg_val;
        int rc;
                              ndev->self_reg->db_clear);
 
        rc = pci_read_config_word(ndev->ntb.pdev,
-                                 SKX_LINK_STATUS_OFFSET, ®_val);
+                                 GEN3_LINK_STATUS_OFFSET, ®_val);
        if (rc)
                return 0;
 
        return 1;
 }
 
-static int skx_init_isr(struct intel_ntb_dev *ndev)
+static int gen3_init_isr(struct intel_ntb_dev *ndev)
 {
        int i;
 
         * The vectors at reset is 1-32,0. We need to reprogram to 0-32.
         */
 
-       for (i = 0; i < SKX_DB_MSIX_VECTOR_COUNT; i++)
-               iowrite8(i, ndev->self_mmio + SKX_INTVEC_OFFSET + i);
+       for (i = 0; i < GEN3_DB_MSIX_VECTOR_COUNT; i++)
+               iowrite8(i, ndev->self_mmio + GEN3_INTVEC_OFFSET + i);
 
        /* move link status down one as workaround */
        if (ndev->hwerr_flags & NTB_HWERR_MSIX_VECTOR32_BAD) {
-               iowrite8(SKX_DB_MSIX_VECTOR_COUNT - 2,
-                        ndev->self_mmio + SKX_INTVEC_OFFSET +
-                        (SKX_DB_MSIX_VECTOR_COUNT - 1));
+               iowrite8(GEN3_DB_MSIX_VECTOR_COUNT - 2,
+                        ndev->self_mmio + GEN3_INTVEC_OFFSET +
+                        (GEN3_DB_MSIX_VECTOR_COUNT - 1));
        }
 
-       return ndev_init_isr(ndev, SKX_DB_MSIX_VECTOR_COUNT,
-                            SKX_DB_MSIX_VECTOR_COUNT,
-                            SKX_DB_MSIX_VECTOR_SHIFT,
-                            SKX_DB_TOTAL_SHIFT);
+       return ndev_init_isr(ndev, GEN3_DB_MSIX_VECTOR_COUNT,
+                            GEN3_DB_MSIX_VECTOR_COUNT,
+                            GEN3_DB_MSIX_VECTOR_SHIFT,
+                            GEN3_DB_TOTAL_SHIFT);
 }
 
-static int skx_setup_b2b_mw(struct intel_ntb_dev *ndev,
+static int gen3_setup_b2b_mw(struct intel_ntb_dev *ndev,
                            const struct intel_b2b_addr *addr,
                            const struct intel_b2b_addr *peer_addr)
 {
 
        /* setup incoming bar limits == base addrs (zero length windows) */
        bar_addr = addr->bar2_addr64;
-       iowrite64(bar_addr, mmio + SKX_IMBAR1XLMT_OFFSET);
-       bar_addr = ioread64(mmio + SKX_IMBAR1XLMT_OFFSET);
+       iowrite64(bar_addr, mmio + GEN3_IMBAR1XLMT_OFFSET);
+       bar_addr = ioread64(mmio + GEN3_IMBAR1XLMT_OFFSET);
        dev_dbg(&pdev->dev, "IMBAR1XLMT %#018llx\n", bar_addr);
 
        bar_addr = addr->bar4_addr64;
-       iowrite64(bar_addr, mmio + SKX_IMBAR2XLMT_OFFSET);
-       bar_addr = ioread64(mmio + SKX_IMBAR2XLMT_OFFSET);
+       iowrite64(bar_addr, mmio + GEN3_IMBAR2XLMT_OFFSET);
+       bar_addr = ioread64(mmio + GEN3_IMBAR2XLMT_OFFSET);
        dev_dbg(&pdev->dev, "IMBAR2XLMT %#018llx\n", bar_addr);
 
        /* zero incoming translation addrs */
-       iowrite64(0, mmio + SKX_IMBAR1XBASE_OFFSET);
-       iowrite64(0, mmio + SKX_IMBAR2XBASE_OFFSET);
+       iowrite64(0, mmio + GEN3_IMBAR1XBASE_OFFSET);
+       iowrite64(0, mmio + GEN3_IMBAR2XBASE_OFFSET);
 
        ndev->peer_mmio = ndev->self_mmio;
 
        return 0;
 }
 
-static int skx_init_ntb(struct intel_ntb_dev *ndev)
+static int gen3_init_ntb(struct intel_ntb_dev *ndev)
 {
        int rc;
 
 
        ndev->mw_count = XEON_MW_COUNT;
-       ndev->spad_count = SKX_SPAD_COUNT;
-       ndev->db_count = SKX_DB_COUNT;
-       ndev->db_link_mask = SKX_DB_LINK_BIT;
+       ndev->spad_count = GEN3_SPAD_COUNT;
+       ndev->db_count = GEN3_DB_COUNT;
+       ndev->db_link_mask = GEN3_DB_LINK_BIT;
 
        /* DB fixup for using 31 right now */
        if (ndev->hwerr_flags & NTB_HWERR_MSIX_VECTOR32_BAD)
        switch (ndev->ntb.topo) {
        case NTB_TOPO_B2B_USD:
        case NTB_TOPO_B2B_DSD:
-               ndev->self_reg = &skx_pri_reg;
-               ndev->peer_reg = &skx_b2b_reg;
-               ndev->xlat_reg = &skx_sec_xlat;
+               ndev->self_reg = &gen3_pri_reg;
+               ndev->peer_reg = &gen3_b2b_reg;
+               ndev->xlat_reg = &gen3_sec_xlat;
 
                if (ndev->ntb.topo == NTB_TOPO_B2B_USD) {
-                       rc = skx_setup_b2b_mw(ndev,
+                       rc = gen3_setup_b2b_mw(ndev,
                                              &xeon_b2b_dsd_addr,
                                              &xeon_b2b_usd_addr);
                } else {
-                       rc = skx_setup_b2b_mw(ndev,
+                       rc = gen3_setup_b2b_mw(ndev,
                                              &xeon_b2b_usd_addr,
                                              &xeon_b2b_dsd_addr);
                }
 
                /* Enable Bus Master and Memory Space on the secondary side */
                iowrite16(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER,
-                         ndev->self_mmio + SKX_SPCICMD_OFFSET);
+                         ndev->self_mmio + GEN3_SPCICMD_OFFSET);
 
                break;
 
        return 0;
 }
 
-int skx_init_dev(struct intel_ntb_dev *ndev)
+int gen3_init_dev(struct intel_ntb_dev *ndev)
 {
        struct pci_dev *pdev;
        u8 ppd;
 
        pdev = ndev->ntb.pdev;
 
-       ndev->reg = &skx_reg;
+       ndev->reg = &gen3_reg;
 
        rc = pci_read_config_byte(pdev, XEON_PPD_OFFSET, &ppd);
        if (rc)
 
        ndev->hwerr_flags |= NTB_HWERR_MSIX_VECTOR32_BAD;
 
-       rc = skx_init_ntb(ndev);
+       rc = gen3_init_ntb(ndev);
        if (rc)
                return rc;
 
-       return skx_init_isr(ndev);
+       return gen3_init_isr(ndev);
 }
 
 ssize_t ndev_ntb3_debugfs_read(struct file *filp, char __user *ubuf,
        off += scnprintf(buf + off, buf_size - off,
                         "\nNTB Incoming XLAT:\n");
 
-       u.v64 = ioread64(mmio + SKX_IMBAR1XBASE_OFFSET);
+       u.v64 = ioread64(mmio + GEN3_IMBAR1XBASE_OFFSET);
        off += scnprintf(buf + off, buf_size - off,
                         "IMBAR1XBASE -\t\t%#018llx\n", u.v64);
 
-       u.v64 = ioread64(mmio + SKX_IMBAR2XBASE_OFFSET);
+       u.v64 = ioread64(mmio + GEN3_IMBAR2XBASE_OFFSET);
        off += scnprintf(buf + off, buf_size - off,
                         "IMBAR2XBASE -\t\t%#018llx\n", u.v64);
 
-       u.v64 = ioread64(mmio + SKX_IMBAR1XLMT_OFFSET);
+       u.v64 = ioread64(mmio + GEN3_IMBAR1XLMT_OFFSET);
        off += scnprintf(buf + off, buf_size - off,
                         "IMBAR1XLMT -\t\t\t%#018llx\n", u.v64);
 
-       u.v64 = ioread64(mmio + SKX_IMBAR2XLMT_OFFSET);
+       u.v64 = ioread64(mmio + GEN3_IMBAR2XLMT_OFFSET);
        off += scnprintf(buf + off, buf_size - off,
                         "IMBAR2XLMT -\t\t\t%#018llx\n", u.v64);
 
                off += scnprintf(buf + off, buf_size - off,
                                 "\nNTB Outgoing B2B XLAT:\n");
 
-               u.v64 = ioread64(mmio + SKX_EMBAR1XBASE_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR1XBASE_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR1XBASE -\t\t%#018llx\n", u.v64);
 
-               u.v64 = ioread64(mmio + SKX_EMBAR2XBASE_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR2XBASE_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR2XBASE -\t\t%#018llx\n", u.v64);
 
-               u.v64 = ioread64(mmio + SKX_EMBAR1XLMT_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR1XLMT_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR1XLMT -\t\t%#018llx\n", u.v64);
 
-               u.v64 = ioread64(mmio + SKX_EMBAR2XLMT_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR2XLMT_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR2XLMT -\t\t%#018llx\n", u.v64);
 
                off += scnprintf(buf + off, buf_size - off,
                                 "\nNTB Secondary BAR:\n");
 
-               u.v64 = ioread64(mmio + SKX_EMBAR0_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR0_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR0 -\t\t%#018llx\n", u.v64);
 
-               u.v64 = ioread64(mmio + SKX_EMBAR1_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR1_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR1 -\t\t%#018llx\n", u.v64);
 
-               u.v64 = ioread64(mmio + SKX_EMBAR2_OFFSET);
+               u.v64 = ioread64(mmio + GEN3_EMBAR2_OFFSET);
                off += scnprintf(buf + off, buf_size - off,
                                 "EMBAR2 -\t\t%#018llx\n", u.v64);
        }
        off += scnprintf(buf + off, buf_size - off,
                         "\nNTB Statistics:\n");
 
-       u.v16 = ioread16(mmio + SKX_USMEMMISS_OFFSET);
+       u.v16 = ioread16(mmio + GEN3_USMEMMISS_OFFSET);
        off += scnprintf(buf + off, buf_size - off,
                         "Upstream Memory Miss -\t%u\n", u.v16);
 
                         "\nNTB Hardware Errors:\n");
 
        if (!pci_read_config_word(ndev->ntb.pdev,
-                                 SKX_DEVSTS_OFFSET, &u.v16))
+                                 GEN3_DEVSTS_OFFSET, &u.v16))
                off += scnprintf(buf + off, buf_size - off,
                                 "DEVSTS -\t\t%#06x\n", u.v16);
 
        if (!pci_read_config_word(ndev->ntb.pdev,
-                                 SKX_LINK_STATUS_OFFSET, &u.v16))
+                                 GEN3_LINK_STATUS_OFFSET, &u.v16))
                off += scnprintf(buf + off, buf_size - off,
                                 "LNKSTS -\t\t%#06x\n", u.v16);
 
        if (!pci_read_config_dword(ndev->ntb.pdev,
-                                  SKX_UNCERRSTS_OFFSET, &u.v32))
+                                  GEN3_UNCERRSTS_OFFSET, &u.v32))
                off += scnprintf(buf + off, buf_size - off,
                                 "UNCERRSTS -\t\t%#06x\n", u.v32);
 
        if (!pci_read_config_dword(ndev->ntb.pdev,
-                                  SKX_CORERRSTS_OFFSET, &u.v32))
+                                  GEN3_CORERRSTS_OFFSET, &u.v32))
                off += scnprintf(buf + off, buf_size - off,
                                 "CORERRSTS -\t\t%#06x\n", u.v32);
 
 
        /* setup the EP */
        limit_reg = ndev->xlat_reg->bar2_limit + (idx * 0x10) + 0x4000;
-       base = ioread64(mmio + SKX_EMBAR1_OFFSET + (8 * idx));
+       base = ioread64(mmio + GEN3_EMBAR1_OFFSET + (8 * idx));
        base &= ~0xf;
 
        if (limit_reg && size != mw_size)
 
 #include "ntb_hw_intel.h"
 
 /* Intel Skylake Xeon hardware */
-#define SKX_IMBAR1SZ_OFFSET            0x00d0
-#define SKX_IMBAR2SZ_OFFSET            0x00d1
-#define SKX_EMBAR1SZ_OFFSET            0x00d2
-#define SKX_EMBAR2SZ_OFFSET            0x00d3
-#define SKX_DEVCTRL_OFFSET             0x0098
-#define SKX_DEVSTS_OFFSET              0x009a
-#define SKX_UNCERRSTS_OFFSET           0x014c
-#define SKX_CORERRSTS_OFFSET           0x0158
-#define SKX_LINK_STATUS_OFFSET         0x01a2
+#define GEN3_IMBAR1SZ_OFFSET           0x00d0
+#define GEN3_IMBAR2SZ_OFFSET           0x00d1
+#define GEN3_EMBAR1SZ_OFFSET           0x00d2
+#define GEN3_EMBAR2SZ_OFFSET           0x00d3
+#define GEN3_DEVCTRL_OFFSET            0x0098
+#define GEN3_DEVSTS_OFFSET             0x009a
+#define GEN3_UNCERRSTS_OFFSET          0x014c
+#define GEN3_CORERRSTS_OFFSET          0x0158
+#define GEN3_LINK_STATUS_OFFSET                0x01a2
 
-#define SKX_NTBCNTL_OFFSET             0x0000
-#define SKX_IMBAR1XBASE_OFFSET         0x0010          /* SBAR2XLAT */
-#define SKX_IMBAR1XLMT_OFFSET          0x0018          /* SBAR2LMT */
-#define SKX_IMBAR2XBASE_OFFSET         0x0020          /* SBAR4XLAT */
-#define SKX_IMBAR2XLMT_OFFSET          0x0028          /* SBAR4LMT */
-#define SKX_IM_INT_STATUS_OFFSET       0x0040
-#define SKX_IM_INT_DISABLE_OFFSET      0x0048
-#define SKX_IM_SPAD_OFFSET             0x0080          /* SPAD */
-#define SKX_USMEMMISS_OFFSET           0x0070
-#define SKX_INTVEC_OFFSET              0x00d0
-#define SKX_IM_DOORBELL_OFFSET         0x0100          /* SDOORBELL0 */
-#define SKX_B2B_SPAD_OFFSET            0x0180          /* B2B SPAD */
-#define SKX_EMBAR0XBASE_OFFSET         0x4008          /* B2B_XLAT */
-#define SKX_EMBAR1XBASE_OFFSET         0x4010          /* PBAR2XLAT */
-#define SKX_EMBAR1XLMT_OFFSET          0x4018          /* PBAR2LMT */
-#define SKX_EMBAR2XBASE_OFFSET         0x4020          /* PBAR4XLAT */
-#define SKX_EMBAR2XLMT_OFFSET          0x4028          /* PBAR4LMT */
-#define SKX_EM_INT_STATUS_OFFSET       0x4040
-#define SKX_EM_INT_DISABLE_OFFSET      0x4048
-#define SKX_EM_SPAD_OFFSET             0x4080          /* remote SPAD */
-#define SKX_EM_DOORBELL_OFFSET         0x4100          /* PDOORBELL0 */
-#define SKX_SPCICMD_OFFSET             0x4504          /* SPCICMD */
-#define SKX_EMBAR0_OFFSET              0x4510          /* SBAR0BASE */
-#define SKX_EMBAR1_OFFSET              0x4518          /* SBAR23BASE */
-#define SKX_EMBAR2_OFFSET              0x4520          /* SBAR45BASE */
+#define GEN3_NTBCNTL_OFFSET            0x0000
+#define GEN3_IMBAR1XBASE_OFFSET                0x0010          /* SBAR2XLAT */
+#define GEN3_IMBAR1XLMT_OFFSET         0x0018          /* SBAR2LMT */
+#define GEN3_IMBAR2XBASE_OFFSET                0x0020          /* SBAR4XLAT */
+#define GEN3_IMBAR2XLMT_OFFSET         0x0028          /* SBAR4LMT */
+#define GEN3_IM_INT_STATUS_OFFSET      0x0040
+#define GEN3_IM_INT_DISABLE_OFFSET     0x0048
+#define GEN3_IM_SPAD_OFFSET            0x0080          /* SPAD */
+#define GEN3_USMEMMISS_OFFSET          0x0070
+#define GEN3_INTVEC_OFFSET             0x00d0
+#define GEN3_IM_DOORBELL_OFFSET                0x0100          /* SDOORBELL0 */
+#define GEN3_B2B_SPAD_OFFSET           0x0180          /* B2B SPAD */
+#define GEN3_EMBAR0XBASE_OFFSET                0x4008          /* B2B_XLAT */
+#define GEN3_EMBAR1XBASE_OFFSET                0x4010          /* PBAR2XLAT */
+#define GEN3_EMBAR1XLMT_OFFSET         0x4018          /* PBAR2LMT */
+#define GEN3_EMBAR2XBASE_OFFSET                0x4020          /* PBAR4XLAT */
+#define GEN3_EMBAR2XLMT_OFFSET         0x4028          /* PBAR4LMT */
+#define GEN3_EM_INT_STATUS_OFFSET      0x4040
+#define GEN3_EM_INT_DISABLE_OFFSET     0x4048
+#define GEN3_EM_SPAD_OFFSET            0x4080          /* remote SPAD */
+#define GEN3_EM_DOORBELL_OFFSET                0x4100          /* PDOORBELL0 */
+#define GEN3_SPCICMD_OFFSET            0x4504          /* SPCICMD */
+#define GEN3_EMBAR0_OFFSET             0x4510          /* SBAR0BASE */
+#define GEN3_EMBAR1_OFFSET             0x4518          /* SBAR23BASE */
+#define GEN3_EMBAR2_OFFSET             0x4520          /* SBAR45BASE */
 
-#define SKX_DB_COUNT                   32
-#define SKX_DB_LINK                    32
-#define SKX_DB_LINK_BIT                        BIT_ULL(SKX_DB_LINK)
-#define SKX_DB_MSIX_VECTOR_COUNT       33
-#define SKX_DB_MSIX_VECTOR_SHIFT       1
-#define SKX_DB_TOTAL_SHIFT             33
-#define SKX_SPAD_COUNT                 16
+#define GEN3_DB_COUNT                  32
+#define GEN3_DB_LINK                   32
+#define GEN3_DB_LINK_BIT               BIT_ULL(GEN3_DB_LINK)
+#define GEN3_DB_MSIX_VECTOR_COUNT      33
+#define GEN3_DB_MSIX_VECTOR_SHIFT      1
+#define GEN3_DB_TOTAL_SHIFT            33
+#define GEN3_SPAD_COUNT                        16
 
-static inline u64 skx_db_ioread(void __iomem *mmio)
+static inline u64 gen3_db_ioread(void __iomem *mmio)
 {
        return ioread64(mmio);
 }
 
-static inline void skx_db_iowrite(u64 bits, void __iomem *mmio)
+static inline void gen3_db_iowrite(u64 bits, void __iomem *mmio)
 {
        iowrite64(bits, mmio);
 }
 
 ssize_t ndev_ntb3_debugfs_read(struct file *filp, char __user *ubuf,
                                      size_t count, loff_t *offp);
-int skx_init_dev(struct intel_ntb_dev *ndev);
-int skx_poll_link(struct intel_ntb_dev *ndev);
+int gen3_init_dev(struct intel_ntb_dev *ndev);
 
 extern const struct ntb_dev_ops intel_ntb3_ops;