mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-10 15:03:07 +00:00
1d94f72439
Rebased patches:
* generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch
* ipq806x: 0065-arm-override-compiler-flags.patch
* mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch
Removed patches:
Fixed upstream:
* ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch
* ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch
- in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69
* mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch
- in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034
* mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
- should be hopefully fixed by the bunch of changes in .256 and .257
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Fixes: CVE-2021-3640
Signed-off-by: Petr Štetiar <ynezz@true.cz>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 6d43970a2eb1c7ee88caf7328d201f9c001262e9 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Sun, 16 Jul 2017 12:48:41 +0200
|
|
Subject: [PATCH V2 7/8] MIPS: BCM63XX: provide enet clocks as "enet" to the
|
|
ethernet devices
|
|
|
|
Add lookups to provide the appropriate enetX clocks as just "enet" to
|
|
the ethernet devices.
|
|
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
---
|
|
arch/mips/bcm63xx/clk.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/arch/mips/bcm63xx/clk.c
|
|
+++ b/arch/mips/bcm63xx/clk.c
|
|
@@ -383,6 +383,8 @@ static struct clk_lookup bcm3368_clks[]
|
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
|
CLKDEV_INIT(NULL, "spi", &clk_spi),
|
|
CLKDEV_INIT(NULL, "pcm", &clk_pcm),
|
|
+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet0),
|
|
+ CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
|
|
};
|
|
|
|
static struct clk_lookup bcm6328_clks[] = {
|
|
@@ -410,6 +412,7 @@ static struct clk_lookup bcm6338_clks[]
|
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
|
CLKDEV_INIT(NULL, "spi", &clk_spi),
|
|
+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet_misc),
|
|
};
|
|
|
|
static struct clk_lookup bcm6345_clks[] = {
|
|
@@ -423,6 +426,7 @@ static struct clk_lookup bcm6345_clks[]
|
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
|
CLKDEV_INIT(NULL, "spi", &clk_spi),
|
|
+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet_misc),
|
|
};
|
|
|
|
static struct clk_lookup bcm6348_clks[] = {
|
|
@@ -436,6 +440,8 @@ static struct clk_lookup bcm6348_clks[]
|
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
|
CLKDEV_INIT(NULL, "spi", &clk_spi),
|
|
+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet_misc),
|
|
+ CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet_misc),
|
|
};
|
|
|
|
static struct clk_lookup bcm6358_clks[] = {
|
|
@@ -451,6 +457,8 @@ static struct clk_lookup bcm6358_clks[]
|
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
|
CLKDEV_INIT(NULL, "spi", &clk_spi),
|
|
CLKDEV_INIT(NULL, "pcm", &clk_pcm),
|
|
+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet0),
|
|
+ CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
|
|
};
|
|
|
|
static struct clk_lookup bcm6362_clks[] = {
|