ntb_hw_amd: Add memory window support for new AMD hardware

The AMD new hardware uses BAR23 and BAR45 as memory windows
as compared to previos where BAR1, BAR23 and BAR45 is used
for memory windows.

This patch add support for both AMD hardwares.

Signed-off-by: Sanjay R Mehta <[email protected]>
Signed-off-by: Jon Mason <[email protected]>

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index e9286cf241f0741462541ac9271099d12ab5e90d..156c2a18a239458d0f81f9eb82d9db367db2d52d 100644 (file)
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -78,7 +78,7 @@ static int ndev_mw_to_bar(struct amd_ntb_dev *ndev, int idx)
        if (idx < 0 || idx > ndev->mw_count)
                return -EINVAL;
 
-       return 1 << idx;
+       return ndev->dev_data->mw_idx << idx;
 }
 
 static int amd_ntb_mw_count(struct ntb_dev *ntb, int pidx)
@@ -909,7 +909,7 @@ static int amd_init_ntb(struct amd_ntb_dev *ndev)
 {
        void __iomem *mmio = ndev->self_mmio;
 
-       ndev->mw_count = AMD_MW_CNT;
+       ndev->mw_count = ndev->dev_data->mw_count;
        ndev->spad_count = AMD_SPADS_CNT;
        ndev->db_count = AMD_DB_CNT;
 
@@ -1069,6 +1069,8 @@ static int amd_ntb_pci_probe(struct pci_dev *pdev,
                goto err_ndev;
        }
 
+       ndev->dev_data = (struct ntb_dev_data *)id->driver_data;
+
        ndev_init_struct(ndev, pdev);
 
        rc = amd_ntb_init_pci(ndev, pdev);
@@ -1123,10 +1125,21 @@ static const struct file_operations amd_ntb_debugfs_info = {
        .read = ndev_debugfs_read,
 };
 
+static const struct ntb_dev_data dev_data[] = {
+       { /* for device 145b */
+               .mw_count = 3,
+               .mw_idx = 1,
+       },
+       { /* for device 148b */
+               .mw_count = 2,
+               .mw_idx = 2,
+       },
+};
+
 static const struct pci_device_id amd_ntb_pci_tbl[] = {
-       {PCI_VDEVICE(AMD, 0x145b)},
-       {PCI_VDEVICE(AMD, 0x148b)},
-       {0}
+       { PCI_VDEVICE(AMD, 0x145b), (kernel_ulong_t)&dev_data[0] },
+       { PCI_VDEVICE(AMD, 0x148b), (kernel_ulong_t)&dev_data[1] },
+       { 0, }
 };
 MODULE_DEVICE_TABLE(pci, amd_ntb_pci_tbl);
 

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.h b/drivers/ntb/hw/amd/ntb_hw_amd.h
index 3aac994f3e771bbd243d4cbbd66b77a0ad249dc9..139a307147bc43523b2a83aedc51dd8e899668b1 100644 (file)
--- a/drivers/ntb/hw/amd/ntb_hw_amd.h
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.h
@@ -92,7 +92,6 @@ static inline void _write64(u64 val, void __iomem *mmio)
 
 enum {
        /* AMD NTB Capability */
-       AMD_MW_CNT              = 3,
        AMD_DB_CNT              = 16,
        AMD_MSIX_VECTOR_CNT     = 24,
        AMD_SPADS_CNT           = 16,
@@ -169,6 +168,11 @@ enum {
        AMD_PEER_OFFSET         = 0x400,
 };
 
+struct ntb_dev_data {
+       const unsigned char mw_count;
+       const unsigned int mw_idx;
+};
+
 struct amd_ntb_dev;
 
 struct amd_ntb_vec {
@@ -184,6 +188,7 @@ struct amd_ntb_dev {
        u32 cntl_sta;
        u32 peer_sta;
 
+       struct ntb_dev_data *dev_data;
        unsigned char mw_count;
        unsigned char spad_count;
        unsigned char db_count;