From: David S. Miller <davem@davemloft.net>
Date: Sun, 27 Jan 2019 18:43:17 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v5.1-rc1~178^2~412
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1d68101367a92336e633d0c3681bf8c86644e124;p=users%2Fjedix%2Flinux-maple.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

1d68101367a92336e633d0c3681bf8c86644e124
diff --cc drivers/net/ethernet/sfc/ef10.c
index ee42d4a887d7,2f2bda68d861..6062e99fa69b
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@@ -6041,12 -6041,12 +6041,13 @@@ static const struct efx_ef10_nvram_type
  	{ NVRAM_PARTITION_TYPE_EXPROM_CONFIG_PORT3, 0,   3, "sfc_exp_rom_cfg" },
  	{ NVRAM_PARTITION_TYPE_LICENSE,		   0,    0, "sfc_license" },
  	{ NVRAM_PARTITION_TYPE_PHY_MIN,		   0xff, 0, "sfc_phy_fw" },
 -	/* MUM and SUC firmware share the same partition type */
  	{ NVRAM_PARTITION_TYPE_MUM_FIRMWARE,	   0,    0, "sfc_mumfw" },
  	{ NVRAM_PARTITION_TYPE_EXPANSION_UEFI,	   0,    0, "sfc_uefi" },
 -	{ NVRAM_PARTITION_TYPE_STATUS,		   0,    0, "sfc_status" }
 +	{ NVRAM_PARTITION_TYPE_DYNCONFIG_DEFAULTS, 0,    0, "sfc_dynamic_cfg_dflt" },
 +	{ NVRAM_PARTITION_TYPE_ROMCONFIG_DEFAULTS, 0,    0, "sfc_exp_rom_cfg_dflt" },
 +	{ NVRAM_PARTITION_TYPE_STATUS,		   0,    0, "sfc_status" },
  };
+ #define EF10_NVRAM_PARTITION_COUNT	ARRAY_SIZE(efx_ef10_nvram_types)
  
  static int efx_ef10_mtd_probe_partition(struct efx_nic *efx,
  					struct efx_mcdi_mtd_partition *part,
@@@ -6072,16 -6074,16 +6075,23 @@@
  	rc = efx_mcdi_nvram_info(efx, type, &size, &erase_size, &protected);
  	if (rc)
  		return rc;
 +	if (protected &&
 +	    (type != NVRAM_PARTITION_TYPE_DYNCONFIG_DEFAULTS &&
 +	     type != NVRAM_PARTITION_TYPE_ROMCONFIG_DEFAULTS))
 +		/* Hide protected partitions that don't provide defaults. */
 +		return -ENODEV;
 +
  	if (protected)
 -		return -ENODEV; /* hide it */
 +		/* Protected partitions are read only. */
 +		erase_size = 0;
  
+ 	/* If we've already exposed a partition of this type, hide this
+ 	 * duplicate.  All operations on MTDs are keyed by the type anyway,
+ 	 * so we can't act on the duplicate.
+ 	 */
+ 	if (__test_and_set_bit(type_idx, found))
+ 		return -EEXIST;
+ 
  	part->nvram_type = type;
  
  	MCDI_SET_DWORD(inbuf, NVRAM_METADATA_IN_TYPE, type);