Commit 61600112 authored by Jacob Keller's avatar Jacob Keller Committed by David S. Miller
Browse files

nfp: Use pci_get_dsn() 



Use the newly added pci_get_dsn() function for obtaining the 64-bit
Device Serial Number in the nfp6000_read_serial and
nfp_6000_get_interface functions.

pci_get_dsn() reports the Device Serial number as a u64 value created by
combining two pci_read_config_dword functions. The lower 16 bits
represent the device interface value, and the next 48 bits represent the
serial value. Use put_unaligned_be32 and put_unaligned_be16 to convert
the serial value portion into a Big Endian formatted serial u8 array.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f998958d

drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c

+9 −15
Original line number Diff line number Diff line
@@ -1247,19 +1247,16 @@ static void nfp6000_free(struct nfp_cpp *cpp) 
static int nfp6000_read_serial(struct device *dev, u8 *serial)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	int pos;

	u32 reg;

	u64 dsn;



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);

	if (!pos) {

	dsn = pci_get_dsn(pdev);

	if (!dsn) {

		dev_err(dev, "can't find PCIe Serial Number Capability\n");

		return -EINVAL;

	}



	pci_read_config_dword(pdev, pos + 4, &reg);

	put_unaligned_be16(reg >> 16, serial + 4);

	pci_read_config_dword(pdev, pos + 8, &reg);

	put_unaligned_be32(reg, serial);

	put_unaligned_be32((u32)(dsn >> 32), serial);

	put_unaligned_be16((u16)(dsn >> 16), serial + 4);



	return 0;

}
@@ -1267,18 +1264,15 @@ static int nfp6000_read_serial(struct device *dev, u8 *serial) 
static int nfp6000_get_interface(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	int pos;

	u32 reg;

	u64 dsn;



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);

	if (!pos) {

	dsn = pci_get_dsn(pdev);

	if (!dsn) {

		dev_err(dev, "can't find PCIe Serial Number Capability\n");

		return -EINVAL;

	}



	pci_read_config_dword(pdev, pos + 4, &reg);



	return reg & 0xffff;

	return dsn & 0xffff;

}



static const struct nfp_cpp_operations nfp6000_pcie_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE