diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-29 17:54:16 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-31 16:51:46 +0200 |
commit | c7634180fc8104e2f770f2efbe77b5235514fd75 (patch) | |
tree | 28a18c68ae756496f132658b94d9445393738e4d /target/linux/mvebu | |
parent | 1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a (diff) | |
download | upstream-c7634180fc8104e2f770f2efbe77b5235514fd75.tar.gz upstream-c7634180fc8104e2f770f2efbe77b5235514fd75.tar.bz2 upstream-c7634180fc8104e2f770f2efbe77b5235514fd75.zip |
kernel: bump 4.19 to 4.19.62
Refreshed all patches.
Remove upstreamed:
- 023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch
- 023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch
- 023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch
- 950-0252-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch
- 950-0253-staging-bcm2835-camera-Remove-check-of-the-number-of.patch
- 950-0254-staging-bcm2835-camera-Handle-empty-EOS-buffers-whil.patch
- 950-0489-staging-mmal-vchiq-Replace-spinlock-protecting-conte.patch
- 0021-ARM-dts-gemini-Fix-up-DNS-313-compatible-string.patch
- 049-v4.20-mips-remove-superfluous-check-for-linux.patch
- 100-MIPS-fix-build-on-non-linux-hosts.patch
- 303-MIPS-Fix-bounds-check-virt_addr_valid.patch
- 0002-usb-dwc2-use-a-longer-AHB-idle-timeout-in-dwc2_core_.patch
Altered patches:
- 950-0267-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch
- 700-net-add-qualcomm-mdio-and-phy.patch
Fixes:
- CVE-2019-3846
New symbol:
- AX88796B_PHY
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu')
4 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch b/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch index f800e0a49c..0c6cb72cb9 100644 --- a/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch +++ b/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch @@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -229,6 +229,7 @@ static const struct sff_data sfp_data = +@@ -230,6 +230,7 @@ static const struct sff_data sfp_data = static const struct of_device_id sfp_of_match[] = { { .compatible = "sff,sff", .data = &sff_data, }, { .compatible = "sff,sfp", .data = &sfp_data, }, diff --git a/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch b/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch index b78c6d8e3c..854ac68769 100644 --- a/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch +++ b/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1131,6 +1131,184 @@ static void sfp_hwmon_remove(struct sfp +@@ -1132,6 +1132,184 @@ static void sfp_hwmon_remove(struct sfp } #endif @@ -195,7 +195,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /* Helpers */ static void sfp_module_tx_disable(struct sfp *sfp) { -@@ -1375,6 +1553,8 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -1376,6 +1554,8 @@ static int sfp_sm_mod_probe(struct sfp * { /* SFP module inserted - read I2C data */ struct sfp_eeprom_id id; @@ -204,7 +204,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> bool cotsworks; u8 check; int ret; -@@ -1431,12 +1611,87 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -1432,12 +1612,87 @@ static int sfp_sm_mod_probe(struct sfp * sfp->id = id; diff --git a/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch b/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch index f9f7aba2bc..69a31cb9f0 100644 --- a/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch +++ b/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch @@ -12,7 +12,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1570,9 +1570,9 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -1571,9 +1571,9 @@ static int sfp_sm_mod_probe(struct sfp * return -EAGAIN; } @@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> */ cotsworks = !memcmp(id.base.vendor_name, "COTSWORKS ", 16); -@@ -1611,11 +1611,12 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -1612,11 +1612,12 @@ static int sfp_sm_mod_probe(struct sfp * sfp->id = id; diff --git a/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch b/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch index bec8b4c1e6..833c515a11 100644 --- a/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch +++ b/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch @@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1373,7 +1373,7 @@ static void sfp_sm_phy_detach(struct sfp +@@ -1374,7 +1374,7 @@ static void sfp_sm_phy_detach(struct sfp sfp->mod_phy = NULL; } @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> { struct phy_device *phy; int err; -@@ -1383,11 +1383,11 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1384,11 +1384,11 @@ static void sfp_sm_probe_phy(struct sfp phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); if (phy == ERR_PTR(-ENODEV)) { dev_info(sfp->dev, "no PHY detected\n"); @@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> } err = sfp_add_phy(sfp->sfp_bus, phy); -@@ -1395,11 +1395,13 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1396,11 +1396,13 @@ static void sfp_sm_probe_phy(struct sfp phy_device_remove(phy); phy_device_free(phy); dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); @@ -51,7 +51,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> } static void sfp_sm_link_up(struct sfp *sfp) -@@ -1463,14 +1465,9 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1464,14 +1466,9 @@ static void sfp_sm_fault(struct sfp *sfp static void sfp_sm_mod_init(struct sfp *sfp) { @@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> /* Setting the serdes link mode is guesswork: there's no * field in the EEPROM which indicates what mode should -@@ -1484,7 +1481,22 @@ static void sfp_sm_mod_init(struct sfp * +@@ -1485,7 +1482,22 @@ static void sfp_sm_mod_init(struct sfp * if (sfp->id.base.e1000_base_t || sfp->id.base.e100_base_lx || sfp->id.base.e100_base_fx) |