The following patches were removed because they are integrated in the upstream kernel 5.4: * backport-5.4/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch * backport-5.4/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch * backport-5.4/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch * backport-5.4/080-v5.1-0002-bcma-use-dev_-printing-functions.patch * backport-5.4/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch * backport-5.4/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch * backport-5.4/200-v5.2-usb-dwc2-Set-lpm-mode-parameters-depend-on-HW-configuration.patch * backport-5.4/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch * backport-5.4/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch * backport-5.4/450-v5.0-mtd-spinand-winbond-Add-support-for-W25N01GV.patch * backport-5.4/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch * backport-5.4/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch * backport-5.4/455-v5.1-mtd-spinand-Add-support-for-all-Toshiba-Memory-produ.patch * backport-5.4/456-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch * backport-5.4/460-v5.0-mtd-spi-nor-Add-support-for-mx25u12835f.patch * backport-5.4/460-v5.3-mtd-spinand-Define-macros-for-page-read-ops-with-thr.patch * backport-5.4/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch * backport-5.4/462-v5.3-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UFxxG.patch * backport-5.4/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch * backport-5.4/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch * backport-5.4/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch * backport-5.4/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch * backport-5.4/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch * backport-5.4/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch * backport-5.4/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch * backport-5.4/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch * backport-5.4/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch * backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch * backport-5.4/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch * backport-5.4/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch * backport-5.4/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch * backport-5.4/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch * backport-5.4/713-v5.2-net-phylink-avoid-reducing-support-mask.patch * backport-5.4/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch * backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch * backport-5.4/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch * backport-5.4/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch * pending-5.4/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch * pending-5.4/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch * pending-5.4/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch * pending-5.4/220-optimize_inlining.patch * pending-5.4/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch * pending-5.4/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch * pending-5.4/477-mtd-add-spi-nor-add-mx25u3235f.patch * pending-5.4/479-mtd-spi-nor-add-eon-en25qh64.patch Some bigger changes were done to this feature and we did not port this patch yet: * hack-5.4/207-disable-modorder.patch This depends on BOOTMEM which was removed from the kernel, this needs some bigger changes: * hack-5.4/930-crashlog.patch A different version of the FPU disable patch was merged upstream, OpenWrt needs some adaptations. * pending-5.4/304-mips_disable_fpu.patch - no crashlog support yet as a required file got deleted upstream - Removed patch below, which is now seen as a recursive dependency [1] - Removed patch below due to build error [2] - fix still required to avoid identical function def [3] - Fixes included from Blocktrron - Fixes included from Chunkeey - Fix included from nbd regarding "dst leak in Flow Offload" [1] target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch [2] target/linux/generic/hack-5.4/207-disable-modorder.patch [3] target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: David Bauer <mail@david-bauer.net> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			112 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			112 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 8df5dd55cef48c0769379e04dbc085a899b106d4 Mon Sep 17 00:00:00 2001
 | |
| From: Russell King <rmk+kernel@armlinux.org.uk>
 | |
| Date: Fri, 8 Mar 2019 14:02:25 +0000
 | |
| Subject: [PATCH 640/660] net: sfp: add support for module quirks
 | |
| 
 | |
| Add support for applying module quirks to the list of supported
 | |
| ethtool link modes.
 | |
| 
 | |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 | |
| ---
 | |
|  drivers/net/phy/sfp-bus.c | 54 +++++++++++++++++++++++++++++++++++++++
 | |
|  1 file changed, 54 insertions(+)
 | |
| 
 | |
| --- a/drivers/net/phy/sfp-bus.c
 | |
| +++ b/drivers/net/phy/sfp-bus.c
 | |
| @@ -10,6 +10,12 @@
 | |
|  
 | |
|  #include "sfp.h"
 | |
|  
 | |
| +struct sfp_quirk {
 | |
| +	const char *vendor;
 | |
| +	const char *part;
 | |
| +	void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes);
 | |
| +};
 | |
| +
 | |
|  /**
 | |
|   * struct sfp_bus - internal representation of a sfp bus
 | |
|   */
 | |
| @@ -22,6 +28,7 @@ struct sfp_bus {
 | |
|  	const struct sfp_socket_ops *socket_ops;
 | |
|  	struct device *sfp_dev;
 | |
|  	struct sfp *sfp;
 | |
| +	const struct sfp_quirk *sfp_quirk;
 | |
|  
 | |
|  	const struct sfp_upstream_ops *upstream_ops;
 | |
|  	void *upstream;
 | |
| @@ -31,6 +38,46 @@ struct sfp_bus {
 | |
|  	bool started;
 | |
|  };
 | |
|  
 | |
| +static const struct sfp_quirk sfp_quirks[] = {
 | |
| +};
 | |
| +
 | |
| +static size_t sfp_strlen(const char *str, size_t maxlen)
 | |
| +{
 | |
| +	size_t size, i;
 | |
| +
 | |
| +	/* Trailing characters should be filled with space chars */
 | |
| +	for (i = 0, size = 0; i < maxlen; i++)
 | |
| +		if (str[i] != ' ')
 | |
| +			size = i + 1;
 | |
| +
 | |
| +	return size;
 | |
| +}
 | |
| +
 | |
| +static bool sfp_match(const char *qs, const char *str, size_t len)
 | |
| +{
 | |
| +	if (!qs)
 | |
| +		return true;
 | |
| +	if (strlen(qs) != len)
 | |
| +		return false;
 | |
| +	return !strncmp(qs, str, len);
 | |
| +}
 | |
| +
 | |
| +static const struct sfp_quirk *sfp_lookup_quirk(const struct sfp_eeprom_id *id)
 | |
| +{
 | |
| +	const struct sfp_quirk *q;
 | |
| +	unsigned int i;
 | |
| +	size_t vs, ps;
 | |
| +
 | |
| +	vs = sfp_strlen(id->base.vendor_name, ARRAY_SIZE(id->base.vendor_name));
 | |
| +	ps = sfp_strlen(id->base.vendor_pn, ARRAY_SIZE(id->base.vendor_pn));
 | |
| +
 | |
| +	for (i = 0, q = sfp_quirks; i < ARRAY_SIZE(sfp_quirks); i++, q++)
 | |
| +		if (sfp_match(q->vendor, id->base.vendor_name, vs) &&
 | |
| +		    sfp_match(q->part, id->base.vendor_pn, ps))
 | |
| +			return q;
 | |
| +
 | |
| +	return NULL;
 | |
| +}
 | |
|  /**
 | |
|   * sfp_parse_port() - Parse the EEPROM base ID, setting the port type
 | |
|   * @bus: a pointer to the &struct sfp_bus structure for the sfp module
 | |
| @@ -234,6 +281,9 @@ void sfp_parse_support(struct sfp_bus *b
 | |
|  			phylink_set(modes, 1000baseX_Full);
 | |
|  	}
 | |
|  
 | |
| +	if (bus->sfp_quirk)
 | |
| +		bus->sfp_quirk->modes(id, modes);
 | |
| +
 | |
|  	bitmap_or(support, support, modes, __ETHTOOL_LINK_MODE_MASK_NBITS);
 | |
|  
 | |
|  	phylink_set(support, Autoneg);
 | |
| @@ -610,6 +660,8 @@ int sfp_module_insert(struct sfp_bus *bu
 | |
|  	const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus);
 | |
|  	int ret = 0;
 | |
|  
 | |
| +	bus->sfp_quirk = sfp_lookup_quirk(id);
 | |
| +
 | |
|  	if (ops && ops->module_insert)
 | |
|  		ret = ops->module_insert(bus->upstream, id);
 | |
|  
 | |
| @@ -623,6 +675,8 @@ void sfp_module_remove(struct sfp_bus *b
 | |
|  
 | |
|  	if (ops && ops->module_remove)
 | |
|  		ops->module_remove(bus->upstream);
 | |
| +
 | |
| +	bus->sfp_quirk = NULL;
 | |
|  }
 | |
|  EXPORT_SYMBOL_GPL(sfp_module_remove);
 | |
|  
 |