Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ba63ec authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: fail graciously when someone tries to grab global lock 



The global device lock is acquired to search the resource table.
The lock is actually itself part of the table (entry 0).
Therefore if someone asks for resource 0 we would deadlock since
double locking is no longer allowed.

Currently the driver doesn't try to lock that resource so let's
simply make sure we fail graciously and not add special handling
of this case until really need.  Hide the relevant defines in
the source file.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d4fc6eb

drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h

+1 −8
Original line number Diff line number Diff line
@@ -66,14 +66,7 @@ int nfp_nsp_write_eth_table(struct nfp_nsp *state, 


/* Implemented in nfp_resource.c */



#define NFP_RESOURCE_TBL_TARGET		NFP_CPP_TARGET_MU

#define NFP_RESOURCE_TBL_BASE		0x8100000000ULL



/* NFP Resource Table self-identifier */

#define NFP_RESOURCE_TBL_NAME		"nfp.res"

#define NFP_RESOURCE_TBL_KEY		0x00000000 /* Special key for entry 0 */



/* All other keys are CRC32-POSIX of the 8-byte identification string */

/* All keys are CRC32-POSIX of the 8-byte identification string */



/* ARM/PCI vNIC Interfaces 0..3 */

#define NFP_RESOURCE_VNIC_PCI_0		"vnic.p0"

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

+12 −3
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ 
#include "nfp_cpp.h"

#include "nfp6000/nfp6000.h"



#define NFP_RESOURCE_TBL_TARGET		NFP_CPP_TARGET_MU

#define NFP_RESOURCE_TBL_BASE		0x8100000000ULL



/* NFP Resource Table self-identifier */

#define NFP_RESOURCE_TBL_NAME		"nfp.res"

#define NFP_RESOURCE_TBL_KEY		0x00000000 /* Special key for entry 0 */



#define NFP_RESOURCE_ENTRY_NAME_SZ	8



/**
@@ -100,8 +107,10 @@ static int nfp_cpp_resource_find(struct nfp_cpp *cpp, struct nfp_resource *res) 
	strncpy(name_pad, res->name, sizeof(name_pad));



	/* Search for a matching entry */

	key = NFP_RESOURCE_TBL_KEY;

	if (memcmp(name_pad, NFP_RESOURCE_TBL_NAME "\0\0\0\0\0\0\0\0", 8))

	if (!memcmp(name_pad, NFP_RESOURCE_TBL_NAME "\0\0\0\0\0\0\0\0", 8)) {

		nfp_err(cpp, "Grabbing device lock not supported\n");

		return -EOPNOTSUPP;

	}

	key = crc32_posix(name_pad, sizeof(name_pad));



	for (i = 0; i < NFP_RESOURCE_TBL_ENTRIES; i++) {