Commit d5081bf5 authored by Dave Jiang's avatar Dave Jiang Committed by Jon Mason
Browse files

ntb: intel: fix port config status offset for SPR 



The field offset for port configuration status on SPR has been changed to
bit 14 from ICX where it resides at bit 12. By chance link status detection
continued to work on SPR. This is due to bit 12 being a configuration bit
which is in sync with the status bit. Fix this by checking for a SPR device
and checking correct status bit.

Fixes: 26bfe3d0 ("ntb: intel: Add Icelake (gen4) support for Intel NTB")
Tested-by: default avatarJerry Dai <jerry.dai@intel.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent 30532568

drivers/ntb/hw/intel/ntb_hw_gen4.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -168,6 +168,18 @@ static enum ntb_topo gen4_ppd_topo(struct intel_ntb_dev *ndev, u32 ppd) 
	return NTB_TOPO_NONE;

	return NTB_TOPO_NONE;

}

}





static enum ntb_topo spr_ppd_topo(struct intel_ntb_dev *ndev, u32 ppd)

{

	switch (ppd & SPR_PPD_TOPO_MASK) {

	case SPR_PPD_TOPO_B2B_USD:

		return NTB_TOPO_B2B_USD;

	case SPR_PPD_TOPO_B2B_DSD:

		return NTB_TOPO_B2B_DSD;

	}



	return NTB_TOPO_NONE;

}



int gen4_init_dev(struct intel_ntb_dev *ndev)

int gen4_init_dev(struct intel_ntb_dev *ndev)

{

{

	struct pci_dev *pdev = ndev->ntb.pdev;

	struct pci_dev *pdev = ndev->ntb.pdev;
@@ -183,7 +195,10 @@ int gen4_init_dev(struct intel_ntb_dev *ndev) 
	}

	}





	ppd1 = ioread32(ndev->self_mmio + GEN4_PPD1_OFFSET);

	ppd1 = ioread32(ndev->self_mmio + GEN4_PPD1_OFFSET);

	if (pdev_is_ICX(pdev))

		ndev->ntb.topo = gen4_ppd_topo(ndev, ppd1);

		ndev->ntb.topo = gen4_ppd_topo(ndev, ppd1);

	else if (pdev_is_SPR(pdev))

		ndev->ntb.topo = spr_ppd_topo(ndev, ppd1);

	dev_dbg(&pdev->dev, "ppd %#x topo %s\n", ppd1,

	dev_dbg(&pdev->dev, "ppd %#x topo %s\n", ppd1,

		ntb_topo_string(ndev->ntb.topo));

		ntb_topo_string(ndev->ntb.topo));

	if (ndev->ntb.topo == NTB_TOPO_NONE)

	if (ndev->ntb.topo == NTB_TOPO_NONE)

drivers/ntb/hw/intel/ntb_hw_gen4.h

+16 −0
Original line number Original line Diff line number Diff line
@@ -49,10 +49,14 @@ 
#define GEN4_PPD_CLEAR_TRN		0x0001

#define GEN4_PPD_CLEAR_TRN		0x0001

#define GEN4_PPD_LINKTRN		0x0008

#define GEN4_PPD_LINKTRN		0x0008

#define GEN4_PPD_CONN_MASK		0x0300

#define GEN4_PPD_CONN_MASK		0x0300

#define SPR_PPD_CONN_MASK		0x0700

#define GEN4_PPD_CONN_B2B		0x0200

#define GEN4_PPD_CONN_B2B		0x0200

#define GEN4_PPD_DEV_MASK		0x1000

#define GEN4_PPD_DEV_MASK		0x1000

#define GEN4_PPD_DEV_DSD		0x1000

#define GEN4_PPD_DEV_DSD		0x1000

#define GEN4_PPD_DEV_USD		0x0000

#define GEN4_PPD_DEV_USD		0x0000

#define SPR_PPD_DEV_MASK		0x4000

#define SPR_PPD_DEV_DSD 		0x4000

#define SPR_PPD_DEV_USD 		0x0000

#define GEN4_LINK_CTRL_LINK_DISABLE	0x0010

#define GEN4_LINK_CTRL_LINK_DISABLE	0x0010





#define GEN4_SLOTSTS			0xb05a

#define GEN4_SLOTSTS			0xb05a
@@ -62,6 +66,10 @@ 
#define GEN4_PPD_TOPO_B2B_USD	(GEN4_PPD_CONN_B2B | GEN4_PPD_DEV_USD)

#define GEN4_PPD_TOPO_B2B_USD	(GEN4_PPD_CONN_B2B | GEN4_PPD_DEV_USD)

#define GEN4_PPD_TOPO_B2B_DSD	(GEN4_PPD_CONN_B2B | GEN4_PPD_DEV_DSD)

#define GEN4_PPD_TOPO_B2B_DSD	(GEN4_PPD_CONN_B2B | GEN4_PPD_DEV_DSD)





#define SPR_PPD_TOPO_MASK	(SPR_PPD_CONN_MASK | SPR_PPD_DEV_MASK)

#define SPR_PPD_TOPO_B2B_USD	(GEN4_PPD_CONN_B2B | SPR_PPD_DEV_USD)

#define SPR_PPD_TOPO_B2B_DSD	(GEN4_PPD_CONN_B2B | SPR_PPD_DEV_DSD)



#define GEN4_DB_COUNT			32

#define GEN4_DB_COUNT			32

#define GEN4_DB_LINK			32

#define GEN4_DB_LINK			32

#define GEN4_DB_LINK_BIT		BIT_ULL(GEN4_DB_LINK)

#define GEN4_DB_LINK_BIT		BIT_ULL(GEN4_DB_LINK)
@@ -112,4 +120,12 @@ static inline int pdev_is_ICX(struct pci_dev *pdev) 
	return 0;

	return 0;

}

}





static inline int pdev_is_SPR(struct pci_dev *pdev)

{

	if (pdev_is_gen4(pdev) &&

	    pdev->revision > PCI_DEVICE_REVISION_ICX_MAX)

		return 1;

	return 0;

}



#endif
 
#endif