Skip to content

Commit 26bfe3d

Browse files
davejiangjonmason
davejiang
authored and
jonmason
committed
ntb: intel: Add Icelake (gen4) support for Intel NTB
Adding 4th generation Intel NTB support bits. There are a lot of common parts that the gen4 NTB has with gen3 NTB on Skylake. The commonalities are reused in gen4 Icelake NTB. Signed-off-by: Dave Jiang <[email protected]> Signed-off-by: Jon Mason <[email protected]>
1 parent a0348a4 commit 26bfe3d

File tree

7 files changed

+640
-27
lines changed

7 files changed

+640
-27
lines changed

‎drivers/ntb/hw/intel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
obj-$(CONFIG_NTB_INTEL) += ntb_hw_intel.o
3-
ntb_hw_intel-y := ntb_hw_gen1.o ntb_hw_gen3.o
3+
ntb_hw_intel-y := ntb_hw_gen1.o ntb_hw_gen3.o ntb_hw_gen4.o

‎drivers/ntb/hw/intel/ntb_hw_gen1.c

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#include "ntb_hw_intel.h"
6161
#include "ntb_hw_gen1.h"
6262
#include "ntb_hw_gen3.h"
63+
#include "ntb_hw_gen4.h"
6364

6465
#define NTB_NAME "ntb_hw_intel"
6566
#define NTB_DESC "Intel(R) PCI-E Non-Transparent Bridge Driver"
@@ -762,6 +763,8 @@ static ssize_t ndev_debugfs_read(struct file *filp, char __user *ubuf,
762763
return ndev_ntb_debugfs_read(filp, ubuf, count, offp);
763764
else if (pdev_is_gen3(ndev->ntb.pdev))
764765
return ndev_ntb3_debugfs_read(filp, ubuf, count, offp);
766+
else if (pdev_is_gen4(ndev->ntb.pdev))
767+
return ndev_ntb4_debugfs_read(filp, ubuf, count, offp);
765768

766769
return -ENXIO;
767770
}
@@ -1858,42 +1861,40 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
18581861
int rc, node;
18591862

18601863
node = dev_to_node(&pdev->dev);
1864+
ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);
1865+
if (!ndev) {
1866+
rc = -ENOMEM;
1867+
goto err_ndev;
1868+
}
18611869

1862-
if (pdev_is_gen1(pdev)) {
1863-
ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);
1864-
if (!ndev) {
1865-
rc = -ENOMEM;
1866-
goto err_ndev;
1867-
}
1868-
1869-
ndev_init_struct(ndev, pdev);
1870+
ndev_init_struct(ndev, pdev);
18701871

1872+
if (pdev_is_gen1(pdev)) {
18711873
rc = intel_ntb_init_pci(ndev, pdev);
18721874
if (rc)
18731875
goto err_init_pci;
18741876

18751877
rc = xeon_init_dev(ndev);
18761878
if (rc)
18771879
goto err_init_dev;
1878-
18791880
} else if (pdev_is_gen3(pdev)) {
1880-
ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);
1881-
if (!ndev) {
1882-
rc = -ENOMEM;
1883-
goto err_ndev;
1884-
}
1885-
1886-
ndev_init_struct(ndev, pdev);
18871881
ndev->ntb.ops = &intel_ntb3_ops;
1888-
18891882
rc = intel_ntb_init_pci(ndev, pdev);
18901883
if (rc)
18911884
goto err_init_pci;
18921885

18931886
rc = gen3_init_dev(ndev);
18941887
if (rc)
18951888
goto err_init_dev;
1889+
} else if (pdev_is_gen4(pdev)) {
1890+
ndev->ntb.ops = &intel_ntb4_ops;
1891+
rc = intel_ntb_init_pci(ndev, pdev);
1892+
if (rc)
1893+
goto err_init_pci;
18961894

1895+
rc = gen4_init_dev(ndev);
1896+
if (rc)
1897+
goto err_init_dev;
18971898
} else {
18981899
rc = -EINVAL;
18991900
goto err_ndev;
@@ -1915,7 +1916,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
19151916

19161917
err_register:
19171918
ndev_deinit_debugfs(ndev);
1918-
if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev))
1919+
if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev) || pdev_is_gen4(pdev))
19191920
xeon_deinit_dev(ndev);
19201921
err_init_dev:
19211922
intel_ntb_deinit_pci(ndev);
@@ -1931,7 +1932,7 @@ static void intel_ntb_pci_remove(struct pci_dev *pdev)
19311932

19321933
ntb_unregister_device(&ndev->ntb);
19331934
ndev_deinit_debugfs(ndev);
1934-
if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev))
1935+
if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev) || pdev_is_gen4(pdev))
19351936
xeon_deinit_dev(ndev);
19361937
intel_ntb_deinit_pci(ndev);
19371938
kfree(ndev);
@@ -2036,6 +2037,7 @@ static const struct file_operations intel_ntb_debugfs_info = {
20362037
};
20372038

20382039
static const struct pci_device_id intel_ntb_pci_tbl[] = {
2040+
/* GEN1 */
20392041
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)},
20402042
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)},
20412043
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_IVT)},
@@ -2051,7 +2053,12 @@ static const struct pci_device_id intel_ntb_pci_tbl[] = {
20512053
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_IVT)},
20522054
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_HSX)},
20532055
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_BDX)},
2056+
2057+
/* GEN3 */
20542058
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SKX)},
2059+
2060+
/* GEN4 */
2061+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_ICX)},
20552062
{0}
20562063
};
20572064
MODULE_DEVICE_TABLE(pci, intel_ntb_pci_tbl);

‎drivers/ntb/hw/intel/ntb_hw_gen3.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,8 @@ ssize_t ndev_ntb3_debugfs_read(struct file *filp, char __user *ubuf,
415415
return ret;
416416
}
417417

418-
static int intel_ntb3_link_enable(struct ntb_dev *ntb,
419-
enum ntb_speed max_speed,
420-
enum ntb_width max_width)
418+
int intel_ntb3_link_enable(struct ntb_dev *ntb, enum ntb_speed max_speed,
419+
enum ntb_width max_width)
421420
{
422421
struct intel_ntb_dev *ndev;
423422
u32 ntb_ctl;
@@ -532,7 +531,7 @@ static int intel_ntb3_mw_set_trans(struct ntb_dev *ntb, int pidx, int idx,
532531
return 0;
533532
}
534533

535-
static int intel_ntb3_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
534+
int intel_ntb3_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
536535
resource_size_t *db_size,
537536
u64 *db_data, int db_bit)
538537
{
@@ -563,7 +562,7 @@ static int intel_ntb3_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
563562
return 0;
564563
}
565564

566-
static int intel_ntb3_peer_db_set(struct ntb_dev *ntb, u64 db_bits)
565+
int intel_ntb3_peer_db_set(struct ntb_dev *ntb, u64 db_bits)
567566
{
568567
struct intel_ntb_dev *ndev = ntb_ndev(ntb);
569568
int bit;
@@ -581,7 +580,7 @@ static int intel_ntb3_peer_db_set(struct ntb_dev *ntb, u64 db_bits)
581580
return 0;
582581
}
583582

584-
static u64 intel_ntb3_db_read(struct ntb_dev *ntb)
583+
u64 intel_ntb3_db_read(struct ntb_dev *ntb)
585584
{
586585
struct intel_ntb_dev *ndev = ntb_ndev(ntb);
587586

@@ -590,7 +589,7 @@ static u64 intel_ntb3_db_read(struct ntb_dev *ntb)
590589
ndev->self_reg->db_clear);
591590
}
592591

593-
static int intel_ntb3_db_clear(struct ntb_dev *ntb, u64 db_bits)
592+
int intel_ntb3_db_clear(struct ntb_dev *ntb, u64 db_bits)
594593
{
595594
struct intel_ntb_dev *ndev = ntb_ndev(ntb);
596595

‎drivers/ntb/hw/intel/ntb_hw_gen3.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ static inline void gen3_db_iowrite(u64 bits, void __iomem *mmio)
104104
ssize_t ndev_ntb3_debugfs_read(struct file *filp, char __user *ubuf,
105105
size_t count, loff_t *offp);
106106
int gen3_init_dev(struct intel_ntb_dev *ndev);
107+
int intel_ntb3_link_enable(struct ntb_dev *ntb, enum ntb_speed max_speed,
108+
enum ntb_width max_width);
109+
u64 intel_ntb3_db_read(struct ntb_dev *ntb);
110+
int intel_ntb3_db_clear(struct ntb_dev *ntb, u64 db_bits);
111+
int intel_ntb3_peer_db_set(struct ntb_dev *ntb, u64 db_bits);
112+
int intel_ntb3_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
113+
resource_size_t *db_size,
114+
u64 *db_data, int db_bit);
107115

108116
extern const struct ntb_dev_ops intel_ntb3_ops;
109117

0 commit comments

Comments
 (0)