ntb_hw_switchtec: Update the way of getting VEP instance ID

Gen4 firmware adds DMA VEP and NVMe VEP support in VEP (virtual EP)
instance ID register in addtion to management EP. Update the way of
getting management VEP instance ID.

Signed-off-by: Kelvin Cao <kelvin.cao@microchip.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
index 8e9b97631884ad5bf199cb3dd2945901b91afced..ba6a9670c681be5dcb92836bde6a43eb4eecc749 100644 (file)
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@ -419,8 +419,10 @@ static void switchtec_ntb_part_link_speed(struct switchtec_ntb *sndev,
                                          enum ntb_width *width)
 {
        struct switchtec_dev *stdev = sndev->stdev;
-       u32 pff =
-               ioread32(&stdev->mmio_part_cfg_all[partition].vep_pff_inst_id);
+       struct part_cfg_regs __iomem *part_cfg =
+               &stdev->mmio_part_cfg_all[partition];
+
+       u32 pff = ioread32(&part_cfg->vep_pff_inst_id) & 0xFF;
        u32 linksta = ioread32(&stdev->mmio_pff_csr[pff].pci_cap_region[13]);
 
        if (speed)
@@ -1089,7 +1091,7 @@ static int crosslink_enum_partition(struct switchtec_ntb *sndev,
 {
        struct part_cfg_regs __iomem *part_cfg =
                &sndev->stdev->mmio_part_cfg_all[sndev->peer_partition];
-       u32 pff = ioread32(&part_cfg->vep_pff_inst_id);
+       u32 pff = ioread32(&part_cfg->vep_pff_inst_id) & 0xFF;
        struct pff_csr_regs __iomem *mmio_pff =
                &sndev->stdev->mmio_pff_csr[pff];
        const u64 bar_space = 0x1000000000LL;