298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolsnowwolf/lede

Browse Source
This commit is contained in:
lean 2022-04-21 23:23:35 +08:00
commit 70ca3376d0
104 changed files with 221 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .188 LINUX_VERSION-5.4 = .190
LINUX_KERNEL_HASH-5.4.188 = 9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc LINUX_KERNEL_HASH-5.4.190 = 81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194

4
target/linux/bcm27xx/patches-5.4/950-0018-Register-the-clocks-early-during-the-boot-process-so.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2267,8 +2267,15 @@ static int bcm2835_clk_probe(struct plat @@ -2262,8 +2262,15 @@ static int bcm2835_clk_probe(struct plat
if (ret) if (ret)
return ret; return ret;
@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
} }
static const struct cprman_plat_data cprman_bcm2835_plat_data = { static const struct cprman_plat_data cprman_bcm2835_plat_data = {
@@ -2294,7 +2301,11 @@ static struct platform_driver bcm2835_cl @@ -2289,7 +2296,11 @@ static struct platform_driver bcm2835_cl
.probe = bcm2835_clk_probe, .probe = bcm2835_clk_probe,
}; };

2
target/linux/bcm27xx/patches-5.4/950-0020-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1381,6 +1381,11 @@ bcm2835_register_pll_divider(struct bcm2 @@ -1376,6 +1376,11 @@ bcm2835_register_pll_divider(struct bcm2
divider->div.hw.init = &init; divider->div.hw.init = &init;
divider->div.table = NULL; divider->div.table = NULL;

14
target/linux/bcm27xx/patches-5.4/950-0021-clk-bcm2835-Add-claim-clocks-property.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1311,6 +1311,8 @@ static const struct clk_ops bcm2835_vpu_ @@ -1306,6 +1306,8 @@ static const struct clk_ops bcm2835_vpu_
.debug_init = bcm2835_clock_debug_init, .debug_init = bcm2835_clock_debug_init,
}; };
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman, static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
const struct bcm2835_pll_data *data) const struct bcm2835_pll_data *data)
{ {
@@ -1327,6 +1329,9 @@ static struct clk_hw *bcm2835_register_p @@ -1322,6 +1324,9 @@ static struct clk_hw *bcm2835_register_p
init.ops = &bcm2835_pll_clk_ops; init.ops = &bcm2835_pll_clk_ops;
init.flags = CLK_IGNORE_UNUSED; init.flags = CLK_IGNORE_UNUSED;
@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
pll = kzalloc(sizeof(*pll), GFP_KERNEL); pll = kzalloc(sizeof(*pll), GFP_KERNEL);
if (!pll) if (!pll)
return NULL; return NULL;
@@ -1382,8 +1387,10 @@ bcm2835_register_pll_divider(struct bcm2 @@ -1377,8 +1382,10 @@ bcm2835_register_pll_divider(struct bcm2
divider->div.table = NULL; divider->div.table = NULL;
if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) { if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) {
@ -49,7 +49,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
} }
divider->cprman = cprman; divider->cprman = cprman;
@@ -2191,6 +2198,8 @@ static const struct bcm2835_clk_desc clk @@ -2186,6 +2193,8 @@ static const struct bcm2835_clk_desc clk
.ctl_reg = CM_PERIICTL), .ctl_reg = CM_PERIICTL),
}; };
@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* /*
* Permanently take a reference on the parent of the SDRAM clock. * Permanently take a reference on the parent of the SDRAM clock.
* *
@@ -2210,6 +2219,19 @@ static int bcm2835_mark_sdc_parent_criti @@ -2205,6 +2214,19 @@ static int bcm2835_mark_sdc_parent_criti
return clk_prepare_enable(parent); return clk_prepare_enable(parent);
} }
@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int bcm2835_clk_probe(struct platform_device *pdev) static int bcm2835_clk_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@@ -2220,6 +2242,7 @@ static int bcm2835_clk_probe(struct plat @@ -2215,6 +2237,7 @@ static int bcm2835_clk_probe(struct plat
const size_t asize = ARRAY_SIZE(clk_desc_array); const size_t asize = ARRAY_SIZE(clk_desc_array);
const struct cprman_plat_data *pdata; const struct cprman_plat_data *pdata;
size_t i; size_t i;
@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
int ret; int ret;
pdata = of_device_get_match_data(&pdev->dev); pdata = of_device_get_match_data(&pdev->dev);
@@ -2239,6 +2262,13 @@ static int bcm2835_clk_probe(struct plat @@ -2234,6 +2257,13 @@ static int bcm2835_clk_probe(struct plat
if (IS_ERR(cprman->regs)) if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs); return PTR_ERR(cprman->regs);

8
target/linux/bcm27xx/patches-5.4/950-0022-clk-bcm2835-Read-max-core-clock-from-firmware.patch
View File

@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
spinlock_t regs_lock; /* spinlock for all clocks */ spinlock_t regs_lock; /* spinlock for all clocks */
unsigned int soc; unsigned int soc;
@@ -1015,6 +1019,30 @@ static unsigned long bcm2835_clock_get_r @@ -1010,6 +1014,30 @@ static unsigned long bcm2835_clock_get_r
return bcm2835_clock_rate_from_divisor(clock, parent_rate, div); return bcm2835_clock_rate_from_divisor(clock, parent_rate, div);
} }
@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock) static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock)
{ {
struct bcm2835_cprman *cprman = clock->cprman; struct bcm2835_cprman *cprman = clock->cprman;
@@ -1303,7 +1331,7 @@ static int bcm2835_vpu_clock_is_on(struc @@ -1298,7 +1326,7 @@ static int bcm2835_vpu_clock_is_on(struc
*/ */
static const struct clk_ops bcm2835_vpu_clock_clk_ops = { static const struct clk_ops bcm2835_vpu_clock_clk_ops = {
.is_prepared = bcm2835_vpu_clock_is_on, .is_prepared = bcm2835_vpu_clock_is_on,
@ -90,7 +90,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.set_rate = bcm2835_clock_set_rate, .set_rate = bcm2835_clock_set_rate,
.determine_rate = bcm2835_clock_determine_rate, .determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent, .set_parent = bcm2835_clock_set_parent,
@@ -2241,6 +2269,7 @@ static int bcm2835_clk_probe(struct plat @@ -2236,6 +2264,7 @@ static int bcm2835_clk_probe(struct plat
const struct bcm2835_clk_desc *desc; const struct bcm2835_clk_desc *desc;
const size_t asize = ARRAY_SIZE(clk_desc_array); const size_t asize = ARRAY_SIZE(clk_desc_array);
const struct cprman_plat_data *pdata; const struct cprman_plat_data *pdata;
@ -98,7 +98,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
size_t i; size_t i;
u32 clk_id; u32 clk_id;
int ret; int ret;
@@ -2262,6 +2291,14 @@ static int bcm2835_clk_probe(struct plat @@ -2257,6 +2286,14 @@ static int bcm2835_clk_probe(struct plat
if (IS_ERR(cprman->regs)) if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs); return PTR_ERR(cprman->regs);

2
target/linux/bcm27xx/patches-5.4/950-0023-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1473,6 +1473,15 @@ static struct clk_hw *bcm2835_register_c @@ -1468,6 +1468,15 @@ static struct clk_hw *bcm2835_register_c
init.flags = data->flags | CLK_IGNORE_UNUSED; init.flags = data->flags | CLK_IGNORE_UNUSED;
/* /*

2
target/linux/bcm27xx/patches-5.4/950-0027-mm-Remove-the-PFN-busy-warning.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -8512,8 +8512,6 @@ int alloc_contig_range(unsigned long sta @@ -8521,8 +8521,6 @@ int alloc_contig_range(unsigned long sta
/* Make sure the range is really isolated. */ /* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, false)) { if (test_pages_isolated(outer_start, end, false)) {

2
target/linux/bcm27xx/patches-5.4/950-0028-ASoC-Add-prompt-for-ICS43432-codec.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/sound/soc/codecs/Kconfig --- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig
@@ -710,7 +710,7 @@ config SND_SOC_HDAC_HDA @@ -715,7 +715,7 @@ config SND_SOC_HDAC_HDA
select SND_HDA select SND_HDA
config SND_SOC_ICS43432 config SND_SOC_ICS43432

6
target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -2469,6 +2469,11 @@ static int lan78xx_reset(struct lan78xx_ @@ -2471,6 +2471,11 @@ static int lan78xx_reset(struct lan78xx_
int ret = 0; int ret = 0;
unsigned long timeout; unsigned long timeout;
u8 sig; u8 sig;
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
ret = lan78xx_read_reg(dev, HW_CFG, &buf); ret = lan78xx_read_reg(dev, HW_CFG, &buf);
buf |= HW_CFG_LRST_; buf |= HW_CFG_LRST_;
@@ -2522,6 +2527,9 @@ static int lan78xx_reset(struct lan78xx_ @@ -2524,6 +2529,9 @@ static int lan78xx_reset(struct lan78xx_
ret = lan78xx_read_reg(dev, HW_CFG, &buf); ret = lan78xx_read_reg(dev, HW_CFG, &buf);
buf |= HW_CFG_MEF_; buf |= HW_CFG_MEF_;
@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
ret = lan78xx_write_reg(dev, HW_CFG, buf); ret = lan78xx_write_reg(dev, HW_CFG, buf);
ret = lan78xx_read_reg(dev, USB_CFG0, &buf); ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
@@ -2577,6 +2585,9 @@ static int lan78xx_reset(struct lan78xx_ @@ -2579,6 +2587,9 @@ static int lan78xx_reset(struct lan78xx_
buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
} }
} }

2
target/linux/bcm27xx/patches-5.4/950-0031-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
View File

@ -14,7 +14,7 @@ use the same logic.
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct devic @@ -2557,7 +2557,12 @@ static int pl011_setup_port(struct devic
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_ERR(base); return PTR_ERR(base);

6
target/linux/bcm27xx/patches-5.4/950-0032-amba_pl011-Round-input-clock-up.patch
View File

@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Clear pending error and receive interrupts */ /* Clear pending error and receive interrupts */
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
@@ -2324,7 +2341,7 @@ static int pl011_console_setup(struct co @@ -2303,7 +2320,7 @@ static int pl011_console_setup(struct co
plat->init(); plat->init();
} }
@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (uap->vendor->fixed_options) { if (uap->vendor->fixed_options) {
baud = uap->fixed_baud; baud = uap->fixed_baud;
@@ -2509,6 +2526,7 @@ static struct uart_driver amba_reg = { @@ -2488,6 +2505,7 @@ static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE, .cons = AMBA_CONSOLE,
}; };
@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int pl011_probe_dt_alias(int index, struct device *dev) static int pl011_probe_dt_alias(int index, struct device *dev)
{ {
struct device_node *np; struct device_node *np;
@@ -2540,6 +2558,7 @@ static int pl011_probe_dt_alias(int inde @@ -2519,6 +2537,7 @@ static int pl011_probe_dt_alias(int inde
return ret; return ret;
} }

2
target/linux/bcm27xx/patches-5.4/950-0034-amba_pl011-Add-cts-event-workaround-DT-property.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
- reg - reg
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -2665,6 +2665,11 @@ static int pl011_probe(struct amba_devic @@ -2644,6 +2644,11 @@ static int pl011_probe(struct amba_devic
if (IS_ERR(uap->clk)) if (IS_ERR(uap->clk))
return PTR_ERR(uap->clk); return PTR_ERR(uap->clk);

2
target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch
View File

@ -1040,7 +1040,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
} }
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -5369,7 +5369,7 @@ static void port_event(struct usb_hub *h @@ -5382,7 +5382,7 @@ static void port_event(struct usb_hub *h
port_dev->over_current_count++; port_dev->over_current_count++;
port_over_current_notify(port_dev); port_over_current_notify(port_dev);

2
target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
View File

@ -279,7 +279,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
} }
--- a/drivers/mmc/core/host.c --- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c
@@ -434,15 +434,30 @@ struct mmc_host *mmc_alloc_host(int extr @@ -443,15 +443,30 @@ struct mmc_host *mmc_alloc_host(int extr
{ {
int err; int err;
struct mmc_host *host; struct mmc_host *host;

22
target/linux/bcm27xx/patches-5.4/950-0053-BCM2708-Add-core-Device-Tree-support.patch
View File

@ -4281,9 +4281,9 @@ index 90125ce19a1b..d7c955443138 100644
compatible = "brcm,bcm2835-rng"; compatible = "brcm,bcm2835-rng";
reg = <0x7e104000 0x10>; reg = <0x7e104000 0x10>;
interrupts = <2 29>; interrupts = <2 29>;
@@ -184,8 +166,7 @@ @@ -185,8 +167,7 @@
interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
gpio-ranges = <&gpio 0 0 54>;
- /* Defines pin muxing groups according to - /* Defines pin muxing groups according to
- * BCM2835-ARM-Peripherals.pdf page 102. - * BCM2835-ARM-Peripherals.pdf page 102.
@ -4291,7 +4291,7 @@ index 90125ce19a1b..d7c955443138 100644
* *
* While each pin can have its mux selected * While each pin can have its mux selected
* for various functions individually, some * for various functions individually, some
@@ -263,15 +244,7 @@ @@ -264,15 +245,7 @@
brcm,pins = <44 45>; brcm,pins = <44 45>;
brcm,function = <BCM2835_FSEL_ALT2>; brcm,function = <BCM2835_FSEL_ALT2>;
}; };
@ -4307,7 +4307,7 @@ index 90125ce19a1b..d7c955443138 100644
jtag_gpio22: jtag_gpio22 { jtag_gpio22: jtag_gpio22 {
brcm,pins = <22 23 24 25 26 27>; brcm,pins = <22 23 24 25 26 27>;
brcm,function = <BCM2835_FSEL_ALT4>; brcm,function = <BCM2835_FSEL_ALT4>;
@@ -410,7 +383,7 @@ @@ -411,7 +384,7 @@
reg = <0x7e202000 0x100>; reg = <0x7e202000 0x100>;
interrupts = <2 24>; interrupts = <2 24>;
clocks = <&clocks BCM2835_CLOCK_VPU>; clocks = <&clocks BCM2835_CLOCK_VPU>;
@ -4316,8 +4316,8 @@ index 90125ce19a1b..d7c955443138 100644
dma-names = "rx-tx"; dma-names = "rx-tx";
status = "disabled"; status = "disabled";
}; };
@@ -490,14 +463,6 @@ @@ -492,14 +465,6 @@
status = "disabled";
}; };
- thermal: thermal@7e212000 { - thermal: thermal@7e212000 {
@ -4331,7 +4331,7 @@ index 90125ce19a1b..d7c955443138 100644
aux: aux@7e215000 { aux: aux@7e215000 {
compatible = "brcm,bcm2835-aux"; compatible = "brcm,bcm2835-aux";
#clock-cells = <1>; #clock-cells = <1>;
@@ -577,6 +542,32 @@ @@ -579,6 +544,32 @@
status = "disabled"; status = "disabled";
}; };
@ -4364,7 +4364,7 @@ index 90125ce19a1b..d7c955443138 100644
i2c1: i2c@7e804000 { i2c1: i2c@7e804000 {
compatible = "brcm,bcm2835-i2c"; compatible = "brcm,bcm2835-i2c";
reg = <0x7e804000 0x1000>; reg = <0x7e804000 0x1000>;
@@ -637,13 +628,6 @@ @@ -639,13 +630,6 @@
phy-names = "usb2-phy"; phy-names = "usb2-phy";
}; };
@ -22580,7 +22580,7 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 179d55af5852..2cfce19f9f73 100644 index 179d55af5852..2cfce19f9f73 100644
--- a/scripts/Makefile.lib --- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib +++ b/scripts/Makefile.lib
@@ -254,6 +254,7 @@ DTC ?= $(objtree)/scripts/dtc/dtc @@ -240,6 +240,7 @@ DTC ?= $(objtree)/scripts/dtc/dtc
ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
DTC_FLAGS += -Wno-unit_address_vs_reg \ DTC_FLAGS += -Wno-unit_address_vs_reg \
-Wno-unit_address_format \ -Wno-unit_address_format \
@ -22588,9 +22588,9 @@ index 179d55af5852..2cfce19f9f73 100644
-Wno-avoid_unnecessary_addr_size \ -Wno-avoid_unnecessary_addr_size \
-Wno-alias_paths \ -Wno-alias_paths \
-Wno-graph_child_address \ -Wno-graph_child_address \
@@ -313,6 +314,18 @@ endef @@ -299,6 +300,18 @@ endef
$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
$(call if_changed_rule,dtc_dt_yaml) $(call if_changed_rule,dtc,yaml)
+quiet_cmd_dtco = DTCO $@ +quiet_cmd_dtco = DTCO $@
+cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ +cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \

2
target/linux/bcm27xx/patches-5.4/950-0059-ASoC-Add-support-for-Rpi-DAC.patch
View File

@ -20,7 +20,7 @@ Subject: [PATCH] ASoC: Add support for Rpi-DAC
select SND_SOC_PCM3008 select SND_SOC_PCM3008
select SND_SOC_PCM3060_I2C if I2C select SND_SOC_PCM3060_I2C if I2C
select SND_SOC_PCM3060_SPI if SPI_MASTER select SND_SOC_PCM3060_SPI if SPI_MASTER
@@ -980,6 +981,10 @@ config SND_SOC_RT5616 @@ -985,6 +986,10 @@ config SND_SOC_RT5616
tristate "Realtek RT5616 CODEC" tristate "Realtek RT5616 CODEC"
depends on I2C depends on I2C

2
target/linux/bcm27xx/patches-5.4/950-0062-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch
View File

@ -35,7 +35,7 @@ Some code to load the driver based on device-tree-overlays was missing. This is
select SND_SOC_TLV320AIC26 if SPI_MASTER select SND_SOC_TLV320AIC26 if SPI_MASTER
select SND_SOC_TLV320AIC31XX if I2C select SND_SOC_TLV320AIC31XX if I2C
select SND_SOC_TLV320AIC32X4_I2C if I2C && COMMON_CLK select SND_SOC_TLV320AIC32X4_I2C if I2C && COMMON_CLK
@@ -1143,6 +1144,9 @@ config SND_SOC_TFA9879 @@ -1148,6 +1149,9 @@ config SND_SOC_TFA9879
tristate "NXP Semiconductors TFA9879 amplifier" tristate "NXP Semiconductors TFA9879 amplifier"
depends on I2C depends on I2C

8
target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c --- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c
@@ -5749,6 +5749,9 @@ int __init cgroup_init_early(void) @@ -5788,6 +5788,9 @@ int __init cgroup_init_early(void)
return 0; return 0;
} }
@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/** /**
* cgroup_init - cgroup initialization * cgroup_init - cgroup initialization
* *
@@ -5787,6 +5790,12 @@ int __init cgroup_init(void) @@ -5826,6 +5829,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex); mutex_unlock(&cgroup_mutex);
@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) { for_each_subsys(ss, ssid) {
if (ss->early_init) { if (ss->early_init) {
struct cgroup_subsys_state *css = struct cgroup_subsys_state *css =
@@ -6196,6 +6205,10 @@ static int __init cgroup_disable(char *s @@ -6235,6 +6244,10 @@ static int __init cgroup_disable(char *s
strcmp(token, ss->legacy_name)) strcmp(token, ss->legacy_name))
continue; continue;
@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static_branch_disable(cgroup_subsys_enabled_key[i]); static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n", pr_info("Disabling %s control group subsystem\n",
ss->name); ss->name);
@@ -6205,6 +6218,31 @@ static int __init cgroup_disable(char *s @@ -6244,6 +6257,31 @@ static int __init cgroup_disable(char *s
} }
__setup("cgroup_disable=", cgroup_disable); __setup("cgroup_disable=", cgroup_disable);

2
target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -2651,6 +2651,22 @@ static int lan78xx_open(struct net_devic @@ -2653,6 +2653,22 @@ static int lan78xx_open(struct net_devic
netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); netif_dbg(dev, ifup, dev->net, "phy initialised successfully");

4
target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -425,6 +425,15 @@ static int msg_level = -1; @@ -427,6 +427,15 @@ static int msg_level = -1;
module_param(msg_level, int, 0); module_param(msg_level, int, 0);
MODULE_PARM_DESC(msg_level, "Override default message level"); MODULE_PARM_DESC(msg_level, "Override default message level");
@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
{ {
u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
@@ -2933,8 +2942,14 @@ static int lan78xx_bind(struct lan78xx_n @@ -2935,8 +2944,14 @@ static int lan78xx_bind(struct lan78xx_n
if (DEFAULT_RX_CSUM_ENABLE) if (DEFAULT_RX_CSUM_ENABLE)
dev->net->features |= NETIF_F_RXCSUM; dev->net->features |= NETIF_F_RXCSUM;

4
target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -2183,6 +2183,22 @@ static int lan78xx_phy_init(struct lan78 @@ -2185,6 +2185,22 @@ static int lan78xx_phy_init(struct lan78
mii_adv_to_linkmode_adv_t(fc, mii_adv); mii_adv_to_linkmode_adv_t(fc, mii_adv);
linkmode_or(phydev->advertising, fc, phydev->advertising); linkmode_or(phydev->advertising, fc, phydev->advertising);
@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (phydev->mdio.dev.of_node) { if (phydev->mdio.dev.of_node) {
u32 reg; u32 reg;
int len; int len;
@@ -2660,22 +2676,6 @@ static int lan78xx_open(struct net_devic @@ -2662,22 +2678,6 @@ static int lan78xx_open(struct net_devic
netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); netif_dbg(dev, ifup, dev->net, "phy initialised successfully");

2
target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch
View File

@ -108,7 +108,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
+the fan to the user space through the hwmon sysfs interface. +the fan to the user space through the hwmon sysfs interface.
--- a/drivers/hwmon/Kconfig --- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig
@@ -1356,6 +1356,17 @@ config SENSORS_RASPBERRYPI_HWMON @@ -1357,6 +1357,17 @@ config SENSORS_RASPBERRYPI_HWMON
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called raspberrypi-hwmon. will be called raspberrypi-hwmon.

4
target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
View File

@ -15,7 +15,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 11 insertions(+), 1 deletion(-)
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -434,6 +434,11 @@ static bool enable_tso; @@ -436,6 +436,11 @@ static bool enable_tso;
module_param(enable_tso, bool, 0644); module_param(enable_tso, bool, 0644);
MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload"); MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
@ -27,7 +27,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
{ {
u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
@@ -3776,7 +3781,12 @@ static int lan78xx_probe(struct usb_inte @@ -3778,7 +3783,12 @@ static int lan78xx_probe(struct usb_inte
netdev->max_mtu = MAX_SINGLE_PACKET_SIZE; netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER);

2
target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -2188,7 +2188,7 @@ static int lan78xx_phy_init(struct lan78 @@ -2190,7 +2190,7 @@ static int lan78xx_phy_init(struct lan78
mii_adv_to_linkmode_adv_t(fc, mii_adv); mii_adv_to_linkmode_adv_t(fc, mii_adv);
linkmode_or(phydev->advertising, fc, phydev->advertising); linkmode_or(phydev->advertising, fc, phydev->advertising);

2
target/linux/bcm27xx/patches-5.4/950-0144-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch
View File

@ -226,7 +226,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
select SND_SOC_JZ4740_CODEC select SND_SOC_JZ4740_CODEC
select SND_SOC_JZ4725B_CODEC select SND_SOC_JZ4725B_CODEC
select SND_SOC_LM4857 if I2C select SND_SOC_LM4857 if I2C
@@ -1497,4 +1498,8 @@ config SND_SOC_TPA6130A2 @@ -1502,4 +1503,8 @@ config SND_SOC_TPA6130A2
tristate "Texas Instruments TPA6130A2 headphone amplifier" tristate "Texas Instruments TPA6130A2 headphone amplifier"
depends on I2C depends on I2C

2
target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch
View File

@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing.
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -3177,7 +3177,7 @@ static int rx_submit(struct lan78xx_net @@ -3179,7 +3179,7 @@ static int rx_submit(struct lan78xx_net
size_t size = dev->rx_urb_size; size_t size = dev->rx_urb_size;
int ret = 0; int ret = 0;

2
target/linux/bcm27xx/patches-5.4/950-0177-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2354,7 +2354,7 @@ static int bcm2835_clk_probe(struct plat @@ -2349,7 +2349,7 @@ static int bcm2835_clk_probe(struct plat
return ret; return ret;
/* note that we have registered all the clocks */ /* note that we have registered all the clocks */

2
target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Disable rate control for now */ /* Disable rate control for now */
bcmgenet_tdma_ring_writel(priv, index, flow_period_val, bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
TDMA_FLOW_PERIOD); TDMA_FLOW_PERIOD);
@@ -3575,9 +3575,12 @@ static int bcmgenet_probe(struct platfor @@ -3577,9 +3577,12 @@ static int bcmgenet_probe(struct platfor
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
/* Set default coalescing parameters */ /* Set default coalescing parameters */

29
target/linux/bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch
View File

@ -1,29 +0,0 @@
From a71750c83a6f1f2f7c22864bbb4e62af5e70c214 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Fri, 22 Mar 2019 09:47:14 +0000
Subject: [PATCH] usb: xhci: Disable the XHCI 5 second timeout
If the VL805 EEPROM has not been programmed then boot will hang for five
seconds. The timeout seems to be arbitrary and is an unecessary
delay on the first boot. Remove the timeout.
This is common code and probably can't be upstreamed unless the timeout
can be configurable somehow or perhaps the XHCI driver can be skipped
on the first boot.
---
drivers/usb/host/xhci.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -196,8 +196,9 @@ int xhci_reset(struct xhci_hcd *xhci)
if (xhci->quirks & XHCI_INTEL_HOST)
udelay(1000);
+ // Hack: reduce handshake timeout from 10s 0.5s due to unprogrammed vl805
ret = xhci_handshake(&xhci->op_regs->command,
- CMD_RESET, 0, 10 * 1000 * 1000);
+ CMD_RESET, 0, 500 * 1000);
if (ret)
return ret;

2
target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/usb/host/xhci-pci.c --- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -257,6 +257,10 @@ static void xhci_pci_quirks(struct devic @@ -271,6 +271,10 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x3432) pdev->device == 0x3432)
xhci->quirks |= XHCI_BROKEN_STREAMS; xhci->quirks |= XHCI_BROKEN_STREAMS;

4
target/linux/bcm27xx/patches-5.4/950-0216-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1114,15 +1114,19 @@ static int bcm2835_clock_set_rate(struct @@ -1109,15 +1109,19 @@ static int bcm2835_clock_set_rate(struct
spin_lock(&cprman->regs_lock); spin_lock(&cprman->regs_lock);
@ -42,7 +42,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
cprman_write(cprman, data->ctl_reg, ctl); cprman_write(cprman, data->ctl_reg, ctl);
@@ -1494,7 +1498,7 @@ static struct clk_hw *bcm2835_register_c @@ -1489,7 +1493,7 @@ static struct clk_hw *bcm2835_register_c
init.ops = &bcm2835_vpu_clock_clk_ops; init.ops = &bcm2835_vpu_clock_clk_ops;
} else { } else {
init.ops = &bcm2835_clock_clk_ops; init.ops = &bcm2835_clock_clk_ops;

10
target/linux/bcm27xx/patches-5.4/950-0217-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1103,8 +1103,10 @@ static int bcm2835_clock_on(struct clk_h @@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_h
return 0; return 0;
} }
@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
{ {
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
struct bcm2835_cprman *cprman = clock->cprman; struct bcm2835_cprman *cprman = clock->cprman;
@@ -1126,6 +1128,11 @@ static int bcm2835_clock_set_rate(struct @@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct
bcm2835_clock_wait_busy(clock); bcm2835_clock_wait_busy(clock);
} }
@ -40,7 +40,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
ctl &= ~CM_FRAC; ctl &= ~CM_FRAC;
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
cprman_write(cprman, data->ctl_reg, ctl); cprman_write(cprman, data->ctl_reg, ctl);
@@ -1137,6 +1144,12 @@ static int bcm2835_clock_set_rate(struct @@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct
return 0; return 0;
} }
@ -53,7 +53,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
static bool static bool
bcm2835_clk_is_pllc(struct clk_hw *hw) bcm2835_clk_is_pllc(struct clk_hw *hw)
{ {
@@ -1320,6 +1333,7 @@ static const struct clk_ops bcm2835_cloc @@ -1315,6 +1328,7 @@ static const struct clk_ops bcm2835_cloc
.unprepare = bcm2835_clock_off, .unprepare = bcm2835_clock_off,
.recalc_rate = bcm2835_clock_get_rate, .recalc_rate = bcm2835_clock_get_rate,
.set_rate = bcm2835_clock_set_rate, .set_rate = bcm2835_clock_set_rate,
@ -61,7 +61,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
.determine_rate = bcm2835_clock_determine_rate, .determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent, .set_parent = bcm2835_clock_set_parent,
.get_parent = bcm2835_clock_get_parent, .get_parent = bcm2835_clock_get_parent,
@@ -1498,7 +1512,6 @@ static struct clk_hw *bcm2835_register_c @@ -1493,7 +1507,6 @@ static struct clk_hw *bcm2835_register_c
init.ops = &bcm2835_vpu_clock_clk_ops; init.ops = &bcm2835_vpu_clock_clk_ops;
} else { } else {
init.ops = &bcm2835_clock_clk_ops; init.ops = &bcm2835_clock_clk_ops;

4
target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
View File

@ -81,7 +81,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
extern int usb_driver_set_configuration(struct usb_device *udev, int config); extern int usb_driver_set_configuration(struct usb_device *udev, int config);
--- a/include/linux/usb/hcd.h --- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h
@@ -384,6 +384,11 @@ struct hc_driver { @@ -382,6 +382,11 @@ struct hc_driver {
* or bandwidth constraints. * or bandwidth constraints.
*/ */
void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
@ -93,7 +93,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
/* Returns the hardware-chosen device address */ /* Returns the hardware-chosen device address */
int (*address_device)(struct usb_hcd *, struct usb_device *udev); int (*address_device)(struct usb_hcd *, struct usb_device *udev);
/* prepares the hardware to send commands to the device */ /* prepares the hardware to send commands to the device */
@@ -445,6 +450,8 @@ extern void usb_hcd_unmap_urb_setup_for_ @@ -443,6 +448,8 @@ extern void usb_hcd_unmap_urb_setup_for_
extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *); extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);
extern void usb_hcd_flush_endpoint(struct usb_device *udev, extern void usb_hcd_flush_endpoint(struct usb_device *udev,
struct usb_host_endpoint *ep); struct usb_host_endpoint *ep);

4
target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
--- a/drivers/usb/host/xhci.c --- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -1475,6 +1475,103 @@ command_cleanup: @@ -1472,6 +1472,103 @@ command_cleanup:
} }
/* /*
@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
* non-error returns are a promise to giveback() the urb later * non-error returns are a promise to giveback() the urb later
* we drop ownership so next owner (or urb unlink) can get it * we drop ownership so next owner (or urb unlink) can get it
*/ */
@@ -5376,6 +5473,7 @@ static const struct hc_driver xhci_hc_dr @@ -5373,6 +5470,7 @@ static const struct hc_driver xhci_hc_dr
.endpoint_reset = xhci_endpoint_reset, .endpoint_reset = xhci_endpoint_reset,
.check_bandwidth = xhci_check_bandwidth, .check_bandwidth = xhci_check_bandwidth,
.reset_bandwidth = xhci_reset_bandwidth, .reset_bandwidth = xhci_reset_bandwidth,

8
target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
--- a/drivers/usb/host/xhci-pci.c --- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -258,8 +258,10 @@ static void xhci_pci_quirks(struct devic @@ -272,8 +272,10 @@ static void xhci_pci_quirks(struct devic
xhci->quirks |= XHCI_BROKEN_STREAMS; xhci->quirks |= XHCI_BROKEN_STREAMS;
if (pdev->vendor == PCI_VENDOR_ID_VIA && if (pdev->vendor == PCI_VENDOR_ID_VIA &&
@ -37,7 +37,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)
--- a/drivers/usb/host/xhci-ring.c --- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c
@@ -550,7 +550,10 @@ void xhci_find_new_dequeue_state(struct @@ -563,7 +563,10 @@ void xhci_find_new_dequeue_state(struct
struct xhci_virt_ep *ep = &dev->eps[ep_index]; struct xhci_virt_ep *ep = &dev->eps[ep_index];
struct xhci_ring *ep_ring; struct xhci_ring *ep_ring;
struct xhci_segment *new_seg; struct xhci_segment *new_seg;
@ -48,7 +48,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
dma_addr_t addr; dma_addr_t addr;
u64 hw_dequeue; u64 hw_dequeue;
bool cycle_found = false; bool cycle_found = false;
@@ -588,7 +591,28 @@ void xhci_find_new_dequeue_state(struct @@ -601,7 +604,28 @@ void xhci_find_new_dequeue_state(struct
hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id); hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id);
new_seg = ep_ring->deq_seg; new_seg = ep_ring->deq_seg;
new_deq = ep_ring->dequeue; new_deq = ep_ring->dequeue;
@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
/* /*
--- a/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1877,6 +1877,7 @@ struct xhci_hcd { @@ -1880,6 +1880,7 @@ struct xhci_hcd {
#define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33) #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33)
#define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34)
#define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35)

2
target/linux/bcm27xx/patches-5.4/950-0267-clk-bcm2835-Avoid-null-pointer-exception.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2280,9 +2280,11 @@ static bool bcm2835_clk_is_claimed(const @@ -2275,9 +2275,11 @@ static bool bcm2835_clk_is_claimed(const
int i; int i;
for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) { for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {

2
target/linux/bcm27xx/patches-5.4/950-0293-xhci-Use-more-event-ring-segment-table-entries.patch
View File

@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
val); val);
--- a/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1653,8 +1653,8 @@ struct urb_priv { @@ -1656,8 +1656,8 @@ struct urb_priv {
* Each segment table entry is 4*32bits long. 1K seems like an ok size: * Each segment table entry is 4*32bits long. 1K seems like an ok size:
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table,
* meaning 64 ring segments. * meaning 64 ring segments.

2
target/linux/bcm27xx/patches-5.4/950-0314-dma-direct-Temporary-DMA-fix-on-arm64.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/dma/direct.c --- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c +++ b/kernel/dma/direct.c
@@ -398,7 +398,7 @@ int dma_direct_supported(struct device * @@ -399,7 +399,7 @@ int dma_direct_supported(struct device *
if (IS_ENABLED(CONFIG_ZONE_DMA)) if (IS_ENABLED(CONFIG_ZONE_DMA))
min_mask = DMA_BIT_MASK(ARCH_ZONE_DMA_BITS); min_mask = DMA_BIT_MASK(ARCH_ZONE_DMA_BITS);
else else

6
target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
View File

@ -87,7 +87,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
(default "off") (default "off")
--- a/drivers/net/phy/broadcom.c --- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c
@@ -267,6 +267,9 @@ static void bcm54xx_adjust_rxrefclk(stru @@ -268,6 +268,9 @@ static void bcm54xx_adjust_rxrefclk(stru
static int bcm54xx_config_init(struct phy_device *phydev) static int bcm54xx_config_init(struct phy_device *phydev)
{ {
int reg, err, val; int reg, err, val;
@ -97,7 +97,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
reg = phy_read(phydev, MII_BCM54XX_ECR); reg = phy_read(phydev, MII_BCM54XX_ECR);
if (reg < 0) if (reg < 0)
@@ -318,6 +321,8 @@ static int bcm54xx_config_init(struct ph @@ -319,6 +322,8 @@ static int bcm54xx_config_init(struct ph
bcm54xx_phydsp_config(phydev); bcm54xx_phydsp_config(phydev);
@ -106,7 +106,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
/* Encode link speed into LED1 and LED3 pair (green/amber). /* Encode link speed into LED1 and LED3 pair (green/amber).
* Also flash these two LEDs on activity. This means configuring * Also flash these two LEDs on activity. This means configuring
* them for MULTICOLOR and encoding link/activity into them. * them for MULTICOLOR and encoding link/activity into them.
@@ -327,8 +332,8 @@ static int bcm54xx_config_init(struct ph @@ -328,8 +333,8 @@ static int bcm54xx_config_init(struct ph
bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
val = BCM_LED_MULTICOLOR_IN_PHASE | val = BCM_LED_MULTICOLOR_IN_PHASE |

4
target/linux/bcm27xx/patches-5.4/950-0341-net-phy-2711-Change-the-default-ethernet-LED-actions.patch
View File

@ -11,7 +11,7 @@ releases.
--- a/drivers/net/phy/broadcom.c --- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c
@@ -268,7 +268,7 @@ static int bcm54xx_config_init(struct ph @@ -269,7 +269,7 @@ static int bcm54xx_config_init(struct ph
{ {
int reg, err, val; int reg, err, val;
u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT, u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT,
@ -20,7 +20,7 @@ releases.
struct device_node *np = phydev->mdio.dev.of_node; struct device_node *np = phydev->mdio.dev.of_node;
reg = phy_read(phydev, MII_BCM54XX_ECR); reg = phy_read(phydev, MII_BCM54XX_ECR);
@@ -323,10 +323,6 @@ static int bcm54xx_config_init(struct ph @@ -324,10 +324,6 @@ static int bcm54xx_config_init(struct ph
of_property_read_u32_array(np, "led-modes", led_modes, 2); of_property_read_u32_array(np, "led-modes", led_modes, 2);

4
target/linux/bcm27xx/patches-5.4/950-0347-clk-bcm2835-Disable-v3d-clock.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1734,16 +1734,12 @@ static const struct bcm2835_clk_desc clk @@ -1729,16 +1729,12 @@ static const struct bcm2835_clk_desc clk
.hold_mask = CM_PLLA_HOLDCORE, .hold_mask = CM_PLLA_HOLDCORE,
.fixed_divider = 1, .fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT), .flags = CLK_SET_RATE_PARENT),
@ -35,7 +35,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
SOC_ALL, SOC_ALL,
.name = "plla_dsi0", .name = "plla_dsi0",
@@ -2021,14 +2017,12 @@ static const struct bcm2835_clk_desc clk @@ -2016,14 +2012,12 @@ static const struct bcm2835_clk_desc clk
.int_bits = 6, .int_bits = 6,
.frac_bits = 0, .frac_bits = 0,
.tcnt_mux = 3), .tcnt_mux = 3),

2
target/linux/bcm27xx/patches-5.4/950-0364-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
--- a/arch/arm/boot/dts/bcm283x.dtsi --- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -635,22 +635,16 @@ @@ -636,22 +636,16 @@
}; };
clocks { clocks {

4
target/linux/bcm27xx/patches-5.4/950-0366-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch
View File

@ -78,7 +78,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
arm-pmu { arm-pmu {
--- a/arch/arm/boot/dts/bcm283x.dtsi --- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -432,18 +432,6 @@ @@ -433,18 +433,6 @@
status = "disabled"; status = "disabled";
}; };
@ -97,7 +97,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
dpi: dpi@7e208000 { dpi: dpi@7e208000 {
compatible = "brcm,bcm2835-dpi"; compatible = "brcm,bcm2835-dpi";
reg = <0x7e208000 0x8c>; reg = <0x7e208000 0x8c>;
@@ -608,12 +596,6 @@ @@ -609,12 +597,6 @@
status = "disabled"; status = "disabled";
}; };

2
target/linux/bcm27xx/patches-5.4/950-0389-Initialise-rpi-firmware-before-clk-bcm2835.patch
View File

@ -25,7 +25,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2401,7 +2401,7 @@ static int __init __bcm2835_clk_driver_i @@ -2396,7 +2396,7 @@ static int __init __bcm2835_clk_driver_i
{ {
return platform_driver_register(&bcm2835_clk_driver); return platform_driver_register(&bcm2835_clk_driver);
} }

2
target/linux/bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch
View File

@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static void pl011_stop_rx(struct uart_port *port) static void pl011_stop_rx(struct uart_port *port)
{ {
struct uart_amba_port *uap = struct uart_amba_port *uap =
@@ -2167,6 +2193,8 @@ static const struct uart_ops amba_pl011_ @@ -2150,6 +2176,8 @@ static const struct uart_ops amba_pl011_
.stop_tx = pl011_stop_tx, .stop_tx = pl011_stop_tx,
.start_tx = pl011_start_tx, .start_tx = pl011_start_tx,
.stop_rx = pl011_stop_rx, .stop_rx = pl011_stop_rx,

18
target/linux/bcm27xx/patches-5.4/950-0411-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch
View File

@ -1771,7 +1771,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
compatible = "brcm,bcm2835-rng"; compatible = "brcm,bcm2835-rng";
reg = <0x7e104000 0x10>; reg = <0x7e104000 0x10>;
interrupts = <2 29>; interrupts = <2 29>;
@@ -269,35 +212,6 @@ @@ -270,35 +213,6 @@
brcm,function = <BCM2835_FSEL_ALT2>; brcm,function = <BCM2835_FSEL_ALT2>;
}; };
@ -1807,7 +1807,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
sdhost_gpio48: sdhost_gpio48 { sdhost_gpio48: sdhost_gpio48 {
brcm,pins = <48 49 50 51 52 53>; brcm,pins = <48 49 50 51 52 53>;
brcm,function = <BCM2835_FSEL_ALT0>; brcm,function = <BCM2835_FSEL_ALT0>;
@@ -379,7 +293,7 @@ @@ -380,7 +294,7 @@
}; };
uart0: serial@7e201000 { uart0: serial@7e201000 {
@ -1816,7 +1816,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
reg = <0x7e201000 0x200>; reg = <0x7e201000 0x200>;
interrupts = <2 25>; interrupts = <2 25>;
clocks = <&clocks BCM2835_CLOCK_UART>, clocks = <&clocks BCM2835_CLOCK_UART>,
@@ -393,8 +307,6 @@ @@ -394,8 +308,6 @@
reg = <0x7e202000 0x100>; reg = <0x7e202000 0x100>;
interrupts = <2 24>; interrupts = <2 24>;
clocks = <&clocks BCM2835_CLOCK_VPU>; clocks = <&clocks BCM2835_CLOCK_VPU>;
@ -1825,7 +1825,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
status = "disabled"; status = "disabled";
}; };
@@ -402,10 +314,6 @@ @@ -403,10 +315,6 @@
compatible = "brcm,bcm2835-i2s"; compatible = "brcm,bcm2835-i2s";
reg = <0x7e203000 0x24>; reg = <0x7e203000 0x24>;
clocks = <&clocks BCM2835_CLOCK_PCM>; clocks = <&clocks BCM2835_CLOCK_PCM>;
@ -1836,7 +1836,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
status = "disabled"; status = "disabled";
}; };
@@ -414,8 +322,6 @@ @@ -415,8 +323,6 @@
reg = <0x7e204000 0x200>; reg = <0x7e204000 0x200>;
interrupts = <2 22>; interrupts = <2 22>;
clocks = <&clocks BCM2835_CLOCK_VPU>; clocks = <&clocks BCM2835_CLOCK_VPU>;
@ -1845,7 +1845,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
@@ -541,32 +447,6 @@ @@ -542,32 +448,6 @@
status = "disabled"; status = "disabled";
}; };
@ -1878,7 +1878,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
i2c1: i2c@7e804000 { i2c1: i2c@7e804000 {
compatible = "brcm,bcm2835-i2c"; compatible = "brcm,bcm2835-i2c";
reg = <0x7e804000 0x1000>; reg = <0x7e804000 0x1000>;
@@ -577,16 +457,6 @@ @@ -578,16 +458,6 @@
status = "disabled"; status = "disabled";
}; };
@ -1895,7 +1895,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
vec: vec@7e806000 { vec: vec@7e806000 {
compatible = "brcm,bcm2835-vec"; compatible = "brcm,bcm2835-vec";
reg = <0x7e806000 0x1000>; reg = <0x7e806000 0x1000>;
@@ -595,20 +465,6 @@ @@ -596,20 +466,6 @@
status = "disabled"; status = "disabled";
}; };
@ -1916,7 +1916,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
usb: usb@7e980000 { usb: usb@7e980000 {
compatible = "brcm,bcm2835-usb"; compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>; reg = <0x7e980000 0x10000>;
@@ -620,10 +476,6 @@ @@ -621,10 +477,6 @@
phys = <&usbphy>; phys = <&usbphy>;
phy-names = "usb2-phy"; phy-names = "usb2-phy";
}; };

4
target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arm64_dma32_phys_limit = max_zone_phys(32); arm64_dma32_phys_limit = max_zone_phys(32);
--- a/arch/powerpc/include/asm/page.h --- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h
@@ -334,13 +334,4 @@ struct vm_area_struct; @@ -338,13 +338,4 @@ struct vm_area_struct;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm/slice.h> #include <asm/slice.h>
@ -184,7 +184,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
return GFP_DMA; return GFP_DMA;
if (*phys_mask <= DMA_BIT_MASK(32)) if (*phys_mask <= DMA_BIT_MASK(32))
return GFP_DMA32; return GFP_DMA32;
@@ -396,7 +395,7 @@ int dma_direct_supported(struct device * @@ -397,7 +396,7 @@ int dma_direct_supported(struct device *
u64 min_mask; u64 min_mask;
if (IS_ENABLED(CONFIG_ZONE_DMA)) if (IS_ENABLED(CONFIG_ZONE_DMA))

6
target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch
View File

@ -82,7 +82,7 @@ Cc: linux-rockchip@lists.infradead.org
--- a/drivers/pci/controller/pci-aardvark.c --- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c
@@ -1176,7 +1176,8 @@ static int advk_pcie_probe(struct platfo @@ -1523,7 +1523,8 @@ static int advk_pcie_probe(struct platfo
return ret; return ret;
} }
@ -402,7 +402,7 @@ Cc: linux-rockchip@lists.infradead.org
} }
--- a/include/linux/pci.h --- a/include/linux/pci.h
+++ b/include/linux/pci.h +++ b/include/linux/pci.h
@@ -2279,6 +2279,7 @@ struct irq_domain; @@ -2282,6 +2282,7 @@ struct irq_domain;
struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus); struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
int pci_parse_request_of_pci_ranges(struct device *dev, int pci_parse_request_of_pci_ranges(struct device *dev,
struct list_head *resources, struct list_head *resources,
@ -410,7 +410,7 @@ Cc: linux-rockchip@lists.infradead.org
struct resource **bus_range); struct resource **bus_range);
/* Arch may override this (weak) */ /* Arch may override this (weak) */
@@ -2287,9 +2288,11 @@ struct device_node *pcibios_get_phb_of_n @@ -2290,9 +2291,11 @@ struct device_node *pcibios_get_phb_of_n
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static inline struct irq_domain * static inline struct irq_domain *
pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }

6
target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch
View File

@ -84,7 +84,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
--- a/kernel/dma/direct.c --- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c +++ b/kernel/dma/direct.c
@@ -326,7 +326,7 @@ static inline bool dma_direct_possible(s @@ -327,7 +327,7 @@ static inline bool dma_direct_possible(s
size_t size) size_t size)
{ {
return swiotlb_force != SWIOTLB_FORCE && return swiotlb_force != SWIOTLB_FORCE &&
@ -93,7 +93,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
} }
dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
@@ -375,7 +375,7 @@ dma_addr_t dma_direct_map_resource(struc @@ -376,7 +376,7 @@ dma_addr_t dma_direct_map_resource(struc
{ {
dma_addr_t dma_addr = paddr; dma_addr_t dma_addr = paddr;
@ -104,7 +104,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
} }
--- a/kernel/dma/swiotlb.c --- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c
@@ -682,7 +682,7 @@ bool swiotlb_map(struct device *dev, phy @@ -683,7 +683,7 @@ bool swiotlb_map(struct device *dev, phy
/* Ensure that the address returned is DMA'ble */ /* Ensure that the address returned is DMA'ble */
*dma_addr = __phys_to_dma(dev, *phys); *dma_addr = __phys_to_dma(dev, *phys);

4
target/linux/bcm27xx/patches-5.4/950-0445-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch
View File

@ -187,7 +187,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
} }
--- a/drivers/ata/ahci.c --- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c
@@ -900,7 +900,7 @@ static int ahci_configure_dma_masks(stru @@ -901,7 +901,7 @@ static int ahci_configure_dma_masks(stru
* value, don't extend it here. This happens on STA2X11, for example. * value, don't extend it here. This happens on STA2X11, for example.
* *
* XXX: manipulating the DMA mask from platform code is completely * XXX: manipulating the DMA mask from platform code is completely
@ -271,7 +271,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
u64 dma_direct_get_required_mask(struct device *dev); u64 dma_direct_get_required_mask(struct device *dev);
--- a/include/linux/dma-mapping.h --- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h
@@ -697,7 +697,7 @@ static inline int dma_coerce_mask_and_co @@ -705,7 +705,7 @@ static inline int dma_coerce_mask_and_co
*/ */
static inline bool dma_addressing_limited(struct device *dev) static inline bool dma_addressing_limited(struct device *dev)
{ {

2
target/linux/bcm27xx/patches-5.4/950-0464-Add-support-for-merus-amp-soundcard-and-ma120x0p-cod.patch
View File

@ -168,7 +168,7 @@ Signed-off-by: AMuszkat <ariel.muszkat@gmail.com>
select SND_SOC_MAX98088 if I2C select SND_SOC_MAX98088 if I2C
select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98090 if I2C
select SND_SOC_MAX98095 if I2C select SND_SOC_MAX98095 if I2C
@@ -732,6 +733,13 @@ config SND_SOC_LOCHNAGAR_SC @@ -737,6 +738,13 @@ config SND_SOC_LOCHNAGAR_SC
This driver support the sound card functionality of the Cirrus This driver support the sound card functionality of the Cirrus
Logic Lochnagar audio development board. Logic Lochnagar audio development board.

2
target/linux/bcm27xx/patches-5.4/950-0492-media-v4l-Add-definitions-for-HEVC-stateless-decodin.patch
View File

@ -838,7 +838,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
break; break;
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1356,6 +1356,7 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1374,6 +1374,7 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_PIX_FMT_VP8_FRAME: descr = "VP8 Frame"; break; case V4L2_PIX_FMT_VP8_FRAME: descr = "VP8 Frame"; break;
case V4L2_PIX_FMT_VP9: descr = "VP9"; break; case V4L2_PIX_FMT_VP9: descr = "VP9"; break;
case V4L2_PIX_FMT_HEVC: descr = "HEVC"; break; /* aka H.265 */ case V4L2_PIX_FMT_HEVC: descr = "HEVC"; break; /* aka H.265 */

2
target/linux/bcm27xx/patches-5.4/950-0499-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
View File

@ -278,7 +278,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
pixfmt-nv24 pixfmt-nv24
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1258,6 +1258,8 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1276,6 +1276,8 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_PIX_FMT_NV61M: descr = "Y/CrCb 4:2:2 (N-C)"; break; case V4L2_PIX_FMT_NV61M: descr = "Y/CrCb 4:2:2 (N-C)"; break;
case V4L2_PIX_FMT_NV12MT: descr = "Y/CbCr 4:2:0 (64x32 MB, N-C)"; break; case V4L2_PIX_FMT_NV12MT: descr = "Y/CbCr 4:2:0 (64x32 MB, N-C)"; break;
case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break; case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break;

4
target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
#define MAX_TUNING_LOOP 40 #define MAX_TUNING_LOOP 40
@@ -2762,7 +2762,7 @@ static void sdhci_timeout_timer(struct t @@ -2780,7 +2780,7 @@ static void sdhci_timeout_timer(struct t
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) { if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
sdhci_dumpregs(host); sdhci_dumpregs(host);
@@ -2784,7 +2784,7 @@ static void sdhci_timeout_data_timer(str @@ -2802,7 +2802,7 @@ static void sdhci_timeout_data_timer(str
if (host->data || host->data_cmd || if (host->data || host->data_cmd ||
(host->cmd && sdhci_data_line_cmd(host->cmd))) { (host->cmd && sdhci_data_line_cmd(host->cmd))) {

2
target/linux/bcm27xx/patches-5.4/950-0641-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+ +
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1332,6 +1332,7 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1350,6 +1350,7 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break;
case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break;
case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break;

4
target/linux/bcm27xx/patches-5.4/950-0658-dt-Implement-an-I2C-pinctrl-mux-for-BSC0.patch
View File

@ -392,7 +392,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+}; +};
--- a/arch/arm/boot/dts/bcm283x.dtsi --- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -340,7 +340,7 @@ @@ -341,7 +341,7 @@
status = "disabled"; status = "disabled";
}; };
@ -401,7 +401,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
compatible = "brcm,bcm2835-i2c"; compatible = "brcm,bcm2835-i2c";
reg = <0x7e205000 0x200>; reg = <0x7e205000 0x200>;
interrupts = <2 21>; interrupts = <2 21>;
@@ -350,6 +350,30 @@ @@ -351,6 +351,30 @@
status = "disabled"; status = "disabled";
}; };

2
target/linux/bcm27xx/patches-5.4/950-0669-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
View File

@ -74,7 +74,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+ +
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1333,6 +1333,7 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1351,6 +1351,7 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break;
case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break;
case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break; case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break;

6
target/linux/bcm27xx/patches-5.4/950-0718-udmabuf-add-a-pointer-to-the-miscdevice-in-dma-buf-p.patch
View File

@ -39,7 +39,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
{ {
DEFINE_DMA_BUF_EXPORT_INFO(exp_info); DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
struct file *memfd = NULL; struct file *memfd = NULL;
@@ -172,6 +174,7 @@ static long udmabuf_create(const struct @@ -176,6 +178,7 @@ static long udmabuf_create(const struct
exp_info.priv = ubuf; exp_info.priv = ubuf;
exp_info.flags = O_RDWR; exp_info.flags = O_RDWR;
@ -47,7 +47,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
buf = dma_buf_export(&exp_info); buf = dma_buf_export(&exp_info);
if (IS_ERR(buf)) { if (IS_ERR(buf)) {
ret = PTR_ERR(buf); ret = PTR_ERR(buf);
@@ -209,7 +212,7 @@ static long udmabuf_ioctl_create(struct @@ -213,7 +216,7 @@ static long udmabuf_ioctl_create(struct
list.offset = create.offset; list.offset = create.offset;
list.size = create.size; list.size = create.size;
@ -56,7 +56,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
} }
static long udmabuf_ioctl_create_list(struct file *filp, unsigned long arg) static long udmabuf_ioctl_create_list(struct file *filp, unsigned long arg)
@@ -228,7 +231,7 @@ static long udmabuf_ioctl_create_list(st @@ -232,7 +235,7 @@ static long udmabuf_ioctl_create_list(st
if (IS_ERR(list)) if (IS_ERR(list))
return PTR_ERR(list); return PTR_ERR(list);

10
target/linux/bcm27xx/patches-5.4/950-0803-media-rcar-csi2-Negotiate-data-lanes-number.patch
View File

@ -44,7 +44,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
if ((rcsi2_read(priv, PHCLM_REG) & PHCLM_STOPSTATECKL) && if ((rcsi2_read(priv, PHCLM_REG) & PHCLM_STOPSTATECKL) &&
(rcsi2_read(priv, PHDLM_REG) & lane_mask) == lane_mask) (rcsi2_read(priv, PHDLM_REG) & lane_mask) == lane_mask)
@@ -445,7 +447,8 @@ static int rcsi2_set_phypll(struct rcar_ @@ -452,7 +454,8 @@ static int rcsi2_set_phypll(struct rcar_
return 0; return 0;
} }
@ -54,7 +54,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
{ {
struct v4l2_subdev *source; struct v4l2_subdev *source;
struct v4l2_ctrl *ctrl; struct v4l2_ctrl *ctrl;
@@ -470,15 +473,63 @@ static int rcsi2_calc_mbps(struct rcar_c @@ -477,15 +480,63 @@ static int rcsi2_calc_mbps(struct rcar_c
* bps = link_freq * 2 * bps = link_freq * 2
*/ */
mbps = v4l2_ctrl_g_ctrl_int64(ctrl) * bpp; mbps = v4l2_ctrl_g_ctrl_int64(ctrl) * bpp;
@ -119,7 +119,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
unsigned int i; unsigned int i;
int mbps, ret; int mbps, ret;
@@ -520,10 +571,18 @@ static int rcsi2_start_receiver(struct r @@ -529,10 +580,18 @@ static int rcsi2_start_receiver(struct r
fld |= FLD_FLD_NUM(1); fld |= FLD_FLD_NUM(1);
} }
@ -140,7 +140,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
if (mbps < 0) if (mbps < 0)
return mbps; return mbps;
@@ -570,7 +629,7 @@ static int rcsi2_start_receiver(struct r @@ -579,7 +638,7 @@ static int rcsi2_start_receiver(struct r
rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ); rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ);
rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ | PHYCNT_RSTZ); rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ | PHYCNT_RSTZ);
@ -149,7 +149,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
if (ret) if (ret)
return ret; return ret;
@@ -747,6 +806,7 @@ static int rcsi2_notify_bound(struct v4l @@ -756,6 +815,7 @@ static int rcsi2_notify_bound(struct v4l
} }
priv->remote = subdev; priv->remote = subdev;

2
target/linux/bcm27xx/patches-5.4/950-0844-media-v4l-Add-14-bit-raw-bayer-pixel-formats.patch
View File

@ -125,7 +125,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+ - R\ :sub:`33high` + - R\ :sub:`33high`
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1298,6 +1298,10 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1316,6 +1316,10 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_PIX_FMT_SGBRG12P: descr = "12-bit Bayer GBGB/RGRG Packed"; break; case V4L2_PIX_FMT_SGBRG12P: descr = "12-bit Bayer GBGB/RGRG Packed"; break;
case V4L2_PIX_FMT_SGRBG12P: descr = "12-bit Bayer GRGR/BGBG Packed"; break; case V4L2_PIX_FMT_SGRBG12P: descr = "12-bit Bayer GRGR/BGBG Packed"; break;
case V4L2_PIX_FMT_SRGGB12P: descr = "12-bit Bayer RGRG/GBGB Packed"; break; case V4L2_PIX_FMT_SRGGB12P: descr = "12-bit Bayer RGRG/GBGB Packed"; break;

2
target/linux/bcm27xx/patches-5.4/950-0845-media-v4l-Add-14-bit-raw-greyscale-pixel-format.patch
View File

@ -111,7 +111,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
pixfmt-y16 pixfmt-y16
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1212,6 +1212,7 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1230,6 +1230,7 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_PIX_FMT_Y6: descr = "6-bit Greyscale"; break; case V4L2_PIX_FMT_Y6: descr = "6-bit Greyscale"; break;
case V4L2_PIX_FMT_Y10: descr = "10-bit Greyscale"; break; case V4L2_PIX_FMT_Y10: descr = "10-bit Greyscale"; break;
case V4L2_PIX_FMT_Y12: descr = "12-bit Greyscale"; break; case V4L2_PIX_FMT_Y12: descr = "12-bit Greyscale"; break;

2
target/linux/bcm27xx/patches-5.4/950-0847-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
View File

@ -75,7 +75,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
pixfmt-y10p pixfmt-y10p
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1217,6 +1217,7 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1235,6 +1235,7 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_PIX_FMT_Y16_BE: descr = "16-bit Greyscale BE"; break; case V4L2_PIX_FMT_Y16_BE: descr = "16-bit Greyscale BE"; break;
case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break;
case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break; case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break;

2
target/linux/bcm27xx/patches-5.4/950-0848-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
View File

@ -84,7 +84,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
pixfmt-y16 pixfmt-y16
--- a/drivers/media/v4l2-core/v4l2-ioctl.c --- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1218,6 +1218,7 @@ static void v4l_fill_fmtdesc(struct v4l2 @@ -1236,6 +1236,7 @@ static void v4l_fill_fmtdesc(struct v4l2
case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break;
case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break; case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break;
case V4L2_PIX_FMT_Y12P: descr = "12-bit Greyscale (MIPI Packed)"; break; case V4L2_PIX_FMT_Y12P: descr = "12-bit Greyscale (MIPI Packed)"; break;

2
target/linux/bcm27xx/patches-5.4/950-0877-Bluetooth-hci_bcm-Add-compatible-string-for-BCM43540.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
--- a/drivers/bluetooth/hci_bcm.c --- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c
@@ -1427,6 +1427,7 @@ static const struct of_device_id bcm_blu @@ -1432,6 +1432,7 @@ static const struct of_device_id bcm_blu
{ .compatible = "brcm,bcm4345c5" }, { .compatible = "brcm,bcm4345c5" },
{ .compatible = "brcm,bcm4330-bt" }, { .compatible = "brcm,bcm4330-bt" },
{ .compatible = "brcm,bcm43438-bt" }, { .compatible = "brcm,bcm43438-bt" },

2
target/linux/bcm27xx/patches-5.4/950-0878-Bluetooth-btbcm-Add-entry-for-BCM4335A0-UART-bluetoo.patch
View File

@ -48,7 +48,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
--- a/drivers/bluetooth/hci_bcm.c --- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c
@@ -1428,6 +1428,7 @@ static const struct of_device_id bcm_blu @@ -1433,6 +1433,7 @@ static const struct of_device_id bcm_blu
{ .compatible = "brcm,bcm4330-bt" }, { .compatible = "brcm,bcm4330-bt" },
{ .compatible = "brcm,bcm43438-bt" }, { .compatible = "brcm,bcm43438-bt" },
{ .compatible = "brcm,bcm43540-bt" }, { .compatible = "brcm,bcm43540-bt" },

6
target/linux/bcm27xx/patches-5.4/950-0879-Bluetooth-hci_bcm-Disallow-set_baudrate-for-BCM4354.patch
View File

@ -76,7 +76,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
else if (hu->proto->oper_speed) else if (hu->proto->oper_speed)
speed = hu->proto->oper_speed; speed = hu->proto->oper_speed;
else else
@@ -1377,6 +1395,7 @@ static struct platform_driver bcm_driver @@ -1382,6 +1400,7 @@ static struct platform_driver bcm_driver
static int bcm_serdev_probe(struct serdev_device *serdev) static int bcm_serdev_probe(struct serdev_device *serdev)
{ {
struct bcm_device *bcmdev; struct bcm_device *bcmdev;
@ -84,7 +84,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
int err; int err;
bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL); bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL);
@@ -1411,6 +1430,10 @@ static int bcm_serdev_probe(struct serde @@ -1416,6 +1435,10 @@ static int bcm_serdev_probe(struct serde
if (err) if (err)
dev_err(&serdev->dev, "Failed to power down\n"); dev_err(&serdev->dev, "Failed to power down\n");
@ -95,7 +95,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto); return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
} }
@@ -1422,12 +1445,16 @@ static void bcm_serdev_remove(struct ser @@ -1427,12 +1450,16 @@ static void bcm_serdev_remove(struct ser
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF

8
target/linux/bcm27xx/patches-5.4/950-0881-Bluetooth-hci_bcm-Support-pcm-params-in-dts.patch
View File

@ -52,9 +52,9 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
return 0; return 0;
} }
@@ -1149,6 +1162,9 @@ static int bcm_probe(struct platform_dev @@ -1154,6 +1167,9 @@ static int bcm_probe(struct platform_dev
dev->dev = &pdev->dev;
dev->irq = platform_get_irq(pdev, 0); dev->irq = ret;
+ /* Initialize routing field to an unused value */ + /* Initialize routing field to an unused value */
+ dev->pcm_int_params[0] = 0xff; + dev->pcm_int_params[0] = 0xff;
@ -62,7 +62,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
if (has_acpi_companion(&pdev->dev)) { if (has_acpi_companion(&pdev->dev)) {
ret = bcm_acpi_probe(dev); ret = bcm_acpi_probe(dev);
if (ret) if (ret)
@@ -1409,6 +1425,9 @@ static int bcm_serdev_probe(struct serde @@ -1414,6 +1430,9 @@ static int bcm_serdev_probe(struct serde
bcmdev->serdev_hu.serdev = serdev; bcmdev->serdev_hu.serdev = serdev;
serdev_device_set_drvdata(serdev, bcmdev); serdev_device_set_drvdata(serdev, bcmdev);

4
target/linux/bcm27xx/patches-5.4/950-0882-Bluetooth-hci_bcm-Drive-RTS-only-for-BCM43438.patch
View File

@ -61,7 +61,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
if (err) if (err)
goto err_unset_hu; goto err_unset_hu;
} }
@@ -1450,8 +1457,10 @@ static int bcm_serdev_probe(struct serde @@ -1455,8 +1462,10 @@ static int bcm_serdev_probe(struct serde
dev_err(&serdev->dev, "Failed to power down\n"); dev_err(&serdev->dev, "Failed to power down\n");
data = device_get_match_data(bcmdev->dev); data = device_get_match_data(bcmdev->dev);
@ -73,7 +73,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto); return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
} }
@@ -1468,11 +1477,15 @@ static struct bcm_device_data bcm4354_de @@ -1473,11 +1482,15 @@ static struct bcm_device_data bcm4354_de
.no_early_set_baudrate = true, .no_early_set_baudrate = true,
}; };

6
target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch
View File

@ -94,7 +94,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
#include <video/mipi_display.h> #include <video/mipi_display.h>
#include "fbtft.h" #include "fbtft.h"
@@ -1199,6 +1200,7 @@ static struct fbtft_platform_data *fbtft @@ -1192,6 +1193,7 @@ static struct fbtft_platform_data *fbtft
* @display: Display properties * @display: Display properties
* @sdev: SPI device * @sdev: SPI device
* @pdev: Platform device * @pdev: Platform device
@ -102,7 +102,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
* *
* Allocates, initializes and registers a framebuffer * Allocates, initializes and registers a framebuffer
* *
@@ -1208,12 +1210,15 @@ static struct fbtft_platform_data *fbtft @@ -1201,12 +1203,15 @@ static struct fbtft_platform_data *fbtft
*/ */
int fbtft_probe_common(struct fbtft_display *display, int fbtft_probe_common(struct fbtft_display *display,
struct spi_device *sdev, struct spi_device *sdev,
@ -119,7 +119,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
int ret; int ret;
if (sdev) if (sdev)
@@ -1229,6 +1234,14 @@ int fbtft_probe_common(struct fbtft_disp @@ -1222,6 +1227,14 @@ int fbtft_probe_common(struct fbtft_disp
pdata = fbtft_probe_dt(dev); pdata = fbtft_probe_dt(dev);
if (IS_ERR(pdata)) if (IS_ERR(pdata))
return PTR_ERR(pdata); return PTR_ERR(pdata);

2
target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
View File

@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
/* Reinitialize TDMA and RDMA and SW housekeeping */ /* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv); ret = bcmgenet_init_dma(priv);
@@ -3666,7 +3674,7 @@ static int bcmgenet_resume(struct device @@ -3668,7 +3676,7 @@ static int bcmgenet_resume(struct device
bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);
/* Disable RX/TX DMA and flush TX queues */ /* Disable RX/TX DMA and flush TX queues */

6
target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/usb/host/xhci-pci.c --- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -261,6 +261,7 @@ static void xhci_pci_quirks(struct devic @@ -275,6 +275,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x3483) { pdev->device == 0x3483) {
xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_LPM_SUPPORT;
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
--- a/drivers/usb/host/xhci-ring.c --- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c
@@ -647,6 +647,16 @@ void xhci_find_new_dequeue_state(struct @@ -660,6 +660,16 @@ void xhci_find_new_dequeue_state(struct
} while (!cycle_found || !td_last_trb_found); } while (!cycle_found || !td_last_trb_found);
@ -51,7 +51,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1880,6 +1880,7 @@ struct xhci_hcd { @@ -1883,6 +1883,7 @@ struct xhci_hcd {
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36)
#define XHCI_SKIP_PHY_INIT BIT_ULL(37) #define XHCI_SKIP_PHY_INIT BIT_ULL(37)
#define XHCI_DISABLE_SPARSE BIT_ULL(38) #define XHCI_DISABLE_SPARSE BIT_ULL(38)

6
target/linux/bcm27xx/patches-5.4/950-1010-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
--- a/drivers/net/phy/broadcom.c --- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c
@@ -213,7 +213,8 @@ static void bcm54xx_adjust_rxrefclk(stru @@ -214,7 +214,8 @@ static void bcm54xx_adjust_rxrefclk(stru
/* Abort if we are using an untested phy. */ /* Abort if we are using an untested phy. */
if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 && if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 &&
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 && BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&
@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
return; return;
val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3); val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
@@ -620,13 +621,21 @@ static struct phy_driver broadcom_driver @@ -641,13 +642,21 @@ static struct phy_driver broadcom_driver
.config_intr = bcm_phy_config_intr, .config_intr = bcm_phy_config_intr,
}, { }, {
.phy_id = PHY_ID_BCM54210E, .phy_id = PHY_ID_BCM54210E,
@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
.phy_id = PHY_ID_BCM5461, .phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461", .name = "Broadcom BCM5461",
@@ -753,7 +762,8 @@ module_phy_driver(broadcom_drivers); @@ -775,7 +784,8 @@ module_phy_driver(broadcom_drivers);
static struct mdio_device_id __maybe_unused broadcom_tbl[] = { static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
{ PHY_ID_BCM5411, 0xfffffff0 }, { PHY_ID_BCM5411, 0xfffffff0 },
{ PHY_ID_BCM5421, 0xfffffff0 }, { PHY_ID_BCM5421, 0xfffffff0 },

4
target/linux/bcm27xx/patches-5.4/950-1011-phy-broadcom-Add-bcm54213pe-configuration.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
--- a/drivers/net/phy/broadcom.c --- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c
@@ -43,6 +43,11 @@ static int bcm54210e_config_init(struct @@ -44,6 +44,11 @@ static int bcm54210e_config_init(struct
return 0; return 0;
} }
@ -22,7 +22,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
static int bcm54612e_config_init(struct phy_device *phydev) static int bcm54612e_config_init(struct phy_device *phydev)
{ {
int reg; int reg;
@@ -304,6 +309,10 @@ static int bcm54xx_config_init(struct ph @@ -305,6 +310,10 @@ static int bcm54xx_config_init(struct ph
err = bcm54210e_config_init(phydev); err = bcm54210e_config_init(phydev);
if (err) if (err)
return err; return err;

2
target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
--- a/drivers/net/usb/lan78xx.c --- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -1181,6 +1181,9 @@ static int lan78xx_link_reset(struct lan @@ -1183,6 +1183,9 @@ static int lan78xx_link_reset(struct lan
if (unlikely(ret < 0)) if (unlikely(ret < 0))
return -EIO; return -EIO;

4
target/linux/bcm53xx/patches-5.4/034-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
View File

@ -21,8 +21,8 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -485,7 +485,7 @@ @@ -484,7 +484,7 @@
}; #thermal-sensor-cells = <0>;
}; };
- srab: srab@18007000 { - srab: srab@18007000 {

2
target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
View File

@ -71,7 +71,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+}; +};
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -486,7 +486,7 @@ @@ -485,7 +485,7 @@
}; };
srab: ethernet-switch@18007000 { srab: ethernet-switch@18007000 {

2
target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
View File

@ -155,7 +155,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
label = "lan4"; label = "lan4";
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -492,6 +492,10 @@ @@ -491,6 +491,10 @@
status = "disabled"; status = "disabled";
/* ports are defined in board DTS */ /* ports are defined in board DTS */

6
target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
View File

@ -90,7 +90,7 @@ it on BCM4708 family.
/* /*
* Reset a halted HC. * Reset a halted HC.
* *
@@ -608,10 +651,20 @@ static int xhci_init(struct usb_hcd *hcd @@ -606,10 +649,20 @@ static int xhci_init(struct usb_hcd *hcd
static int xhci_run_finished(struct xhci_hcd *xhci) static int xhci_run_finished(struct xhci_hcd *xhci)
{ {
@ -114,7 +114,7 @@ it on BCM4708 family.
xhci->shared_hcd->state = HC_STATE_RUNNING; xhci->shared_hcd->state = HC_STATE_RUNNING;
xhci->cmd_ring_state = CMD_RING_STATE_RUNNING; xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
@@ -621,6 +674,10 @@ static int xhci_run_finished(struct xhci @@ -619,6 +672,10 @@ static int xhci_run_finished(struct xhci
xhci_dbg_trace(xhci, trace_xhci_dbg_init, xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB3 roothub"); "Finished xhci_run for USB3 roothub");
return 0; return 0;
@ -127,7 +127,7 @@ it on BCM4708 family.
/* /*
--- a/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1877,6 +1877,7 @@ struct xhci_hcd { @@ -1880,6 +1880,7 @@ struct xhci_hcd {
#define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33) #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33)
#define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34)
#define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35)

2
target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -422,16 +422,12 @@ @@ -424,16 +424,12 @@
#size-cells = <1>; #size-cells = <1>;
cru@100 { cru@100 {

1
target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
View File

@ -15,6 +15,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -294,6 +294,9 @@ config BCM63XX @@ -294,6 +294,9 @@ config BCM63XX
@@ -292,6 +292,9 @@ config BCM63XX
select SYNC_R4K select SYNC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT
select IRQ_MIPS_CPU select IRQ_MIPS_CPU

4
target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/dsa/mv88e6xxx/chip.c --- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4926,6 +4926,80 @@ static int mv88e6xxx_port_mdb_del(struct @@ -4927,6 +4927,80 @@ static int mv88e6xxx_port_mdb_del(struct
return err; return err;
} }
@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port, static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,
bool unicast, bool multicast) bool unicast, bool multicast)
{ {
@@ -4980,6 +5054,8 @@ static const struct dsa_switch_ops mv88e @@ -4981,6 +5055,8 @@ static const struct dsa_switch_ops mv88e
.port_mdb_prepare = mv88e6xxx_port_mdb_prepare, .port_mdb_prepare = mv88e6xxx_port_mdb_prepare,
.port_mdb_add = mv88e6xxx_port_mdb_add, .port_mdb_add = mv88e6xxx_port_mdb_add,
.port_mdb_del = mv88e6xxx_port_mdb_del, .port_mdb_del = mv88e6xxx_port_mdb_del,

2
target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/dsa/mv88e6xxx/chip.c --- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4993,7 +4993,7 @@ static void mv88e6xxx_port_mirror_del(st @@ -4994,7 +4994,7 @@ static void mv88e6xxx_port_mirror_del(st
if (chip->info->ops->set_egress_port(chip, if (chip->info->ops->set_egress_port(chip,
direction, direction,
dsa_upstream_port(ds, dsa_upstream_port(ds,

4
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -1236,7 +1236,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -398,7 +398,7 @@ static int socfpga_dwmac_probe(struct pl @@ -395,7 +395,7 @@ static int socfpga_dwmac_probe(struct pl
if (ret) if (ret)
return ret; return ret;
@ -1340,7 +1340,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} }
plat->phy_interface = of_get_phy_mode(np); plat->phy_interface = of_get_phy_mode(np);
@@ -639,7 +639,7 @@ void stmmac_remove_config_dt(struct plat @@ -638,7 +638,7 @@ void stmmac_remove_config_dt(struct plat
} }
#else #else
struct plat_stmmacenet_data * struct plat_stmmacenet_data *

4
target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
View File

@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c --- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c
@@ -1168,6 +1168,73 @@ static struct mtd_info * __init open_mtd @@ -1161,6 +1161,73 @@ static struct mtd_info * __init open_mtd
return mtd; return mtd;
} }
@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void) static int __init ubi_init(void)
{ {
int err, i, k; int err, i, k;
@@ -1251,6 +1318,12 @@ static int __init ubi_init(void) @@ -1244,6 +1311,12 @@ static int __init ubi_init(void)
} }
} }

2
target/linux/generic/pending-5.4/532-jffs2_eofdetect.patch
View File

@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (ret < 0) if (ret < 0)
goto out; goto out;
@@ -564,6 +570,17 @@ full_scan: @@ -566,6 +572,17 @@ full_scan:
return err; return err;
} }

2
target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* /*
* Get the required data from the packet. * Get the required data from the packet.
*/ */
@@ -1130,7 +1136,7 @@ int nf_conntrack_tcp_packet(struct nf_co @@ -1139,7 +1145,7 @@ int nf_conntrack_tcp_packet(struct nf_co
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK]; timeout = timeouts[TCP_CONNTRACK_UNACK];

12
target/linux/generic/pending-5.4/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
View File

@ -10,9 +10,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2179,8 +2179,8 @@ static irqreturn_t mtk_handle_irq_rx(int @@ -2151,8 +2151,8 @@ static irqreturn_t mtk_handle_irq_rx(int
struct mtk_eth *eth = _eth;
eth->rx_events++;
if (likely(napi_schedule_prep(&eth->rx_napi))) { if (likely(napi_schedule_prep(&eth->rx_napi))) {
- __napi_schedule(&eth->rx_napi); - __napi_schedule(&eth->rx_napi);
mtk_rx_irq_disable(eth, MTK_RX_DONE_INT); mtk_rx_irq_disable(eth, MTK_RX_DONE_INT);
@ -20,9 +20,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} }
return IRQ_HANDLED; return IRQ_HANDLED;
@@ -2192,8 +2192,8 @@ static irqreturn_t mtk_handle_irq_tx(int @@ -2163,8 +2163,8 @@ static irqreturn_t mtk_handle_irq_tx(int
struct mtk_eth *eth = _eth;
eth->tx_events++;
if (likely(napi_schedule_prep(&eth->tx_napi))) { if (likely(napi_schedule_prep(&eth->tx_napi))) {
- __napi_schedule(&eth->tx_napi); - __napi_schedule(&eth->tx_napi);
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} }
return IRQ_HANDLED; return IRQ_HANDLED;
@@ -3300,6 +3300,8 @@ static int mtk_probe(struct platform_dev @@ -3087,6 +3087,8 @@ static int mtk_probe(struct platform_dev
* for NAPI to work * for NAPI to work
*/ */
init_dummy_netdev(&eth->dummy_dev); init_dummy_netdev(&eth->dummy_dev);
@ -38,4 +38,4 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ strcpy(eth->dummy_dev.name, "mtk_eth"); + strcpy(eth->dummy_dev.name, "mtk_eth");
netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx, netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx,
MTK_NAPI_WEIGHT); MTK_NAPI_WEIGHT);
netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx, netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx,

2
target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c --- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5080,6 +5080,7 @@ static int mv88e6xxx_register_switch(str @@ -5081,6 +5081,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops; ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

4
target/linux/generic/pending-5.4/770-06-net-ethernet-mtk_eth_soc-implement-dynamic-interrupt.patch
View File

@ -85,16 +85,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ eth->rx_events++; + eth->rx_events++;
if (likely(napi_schedule_prep(&eth->rx_napi))) { if (likely(napi_schedule_prep(&eth->rx_napi))) {
__napi_schedule(&eth->rx_napi);
mtk_rx_irq_disable(eth, MTK_RX_DONE_INT); mtk_rx_irq_disable(eth, MTK_RX_DONE_INT);
__napi_schedule(&eth->rx_napi);
@@ -2156,6 +2172,7 @@ static irqreturn_t mtk_handle_irq_tx(int @@ -2156,6 +2172,7 @@ static irqreturn_t mtk_handle_irq_tx(int
{ {
struct mtk_eth *eth = _eth; struct mtk_eth *eth = _eth;
+ eth->tx_events++; + eth->tx_events++;
if (likely(napi_schedule_prep(&eth->tx_napi))) { if (likely(napi_schedule_prep(&eth->tx_napi))) {
__napi_schedule(&eth->tx_napi);
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
__napi_schedule(&eth->tx_napi);
@@ -2332,6 +2349,9 @@ static int mtk_stop(struct net_device *d @@ -2332,6 +2349,9 @@ static int mtk_stop(struct net_device *d
napi_disable(&eth->tx_napi); napi_disable(&eth->tx_napi);
napi_disable(&eth->rx_napi); napi_disable(&eth->rx_napi);

4
target/linux/generic/pending-5.4/770-15-net-ethernet-mediatek-mtk_eth_soc-add-support-for-in.patch
View File

@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
for (i = 0; i < MTK_MAX_DEVS; i++) { for (i = 0; i < MTK_MAX_DEVS; i++) {
if (!eth->netdev[i]) if (!eth->netdev[i])
continue; continue;
@@ -3236,6 +3251,7 @@ static const struct mtk_soc_data mt7621_ @@ -3238,6 +3253,7 @@ static const struct mtk_soc_data mt7621_
.hw_features = MTK_HW_FEATURES, .hw_features = MTK_HW_FEATURES,
.required_clks = MT7621_CLKS_BITMAP, .required_clks = MT7621_CLKS_BITMAP,
.required_pctl = false, .required_pctl = false,
@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
static const struct mtk_soc_data mt7622_data = { static const struct mtk_soc_data mt7622_data = {
@@ -3244,6 +3260,7 @@ static const struct mtk_soc_data mt7622_ @@ -3246,6 +3262,7 @@ static const struct mtk_soc_data mt7622_
.hw_features = MTK_HW_FEATURES, .hw_features = MTK_HW_FEATURES,
.required_clks = MT7622_CLKS_BITMAP, .required_clks = MT7622_CLKS_BITMAP,
.required_pctl = false, .required_pctl = false,

8
target/linux/generic/pending-5.4/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/** /**
* ata_build_rw_tf - Build ATA taskfile for given read/write request * ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile * @tf: Target ATA taskfile
@@ -5152,6 +5165,9 @@ struct ata_queued_cmd *ata_qc_new_init(s @@ -5155,6 +5168,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0) if (tag < 0)
return NULL; return NULL;
} }
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag); qc = __ata_qc_from_tag(ap, tag);
qc->tag = qc->hw_tag = tag; qc->tag = qc->hw_tag = tag;
@@ -6088,6 +6104,9 @@ struct ata_port *ata_port_alloc(struct a @@ -6091,6 +6107,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1; ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1; ap->stats.idle_irq = 1;
#endif #endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap); ata_sff_port_init(ap);
return ap; return ap;
@@ -6123,6 +6142,12 @@ static void ata_host_release(struct kref @@ -6126,6 +6145,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link); kfree(ap->pmp_link);
kfree(ap->slave_link); kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap); kfree(ap);
host->ports[i] = NULL; host->ports[i] = NULL;
} }
@@ -6586,7 +6611,23 @@ int ata_host_register(struct ata_host *h @@ -6589,7 +6614,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1; host->ports[i]->local_port_no = i + 1;
} }

36
target/linux/generic/pending-5.4/999-backport-wireless-ethernet-dispatch.patch
View File

@ -42,8 +42,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_regs.h create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_regs.h
create mode 100644 include/linux/soc/mediatek/mtk_wed.h create mode 100644 include/linux/soc/mediatek/mtk_wed.h
diff --git a/drivers/net/ethernet/mediatek/Kconfig b/drivers/net/ethernet/mediatek/Kconfig
index 86d356b4388d..da4ec235d146 100644
--- a/drivers/net/ethernet/mediatek/Kconfig --- a/drivers/net/ethernet/mediatek/Kconfig
+++ b/drivers/net/ethernet/mediatek/Kconfig +++ b/drivers/net/ethernet/mediatek/Kconfig
@@ -7,6 +7,10 @@ config NET_VENDOR_MEDIATEK @@ -7,6 +7,10 @@ config NET_VENDOR_MEDIATEK
@ -56,9 +54,7 @@ index 86d356b4388d..da4ec235d146 100644
+ +
config NET_MEDIATEK_SOC config NET_MEDIATEK_SOC
tristate "MediaTek SoC Gigabit Ethernet support" tristate "MediaTek SoC Gigabit Ethernet support"
depends on NET_DSA || !NET_DSA select PHYLINK
diff --git a/drivers/net/ethernet/mediatek/Makefile b/drivers/net/ethernet/mediatek/Makefile
index 79d4cdbbcbf5..45ba0970504a 100644
--- a/drivers/net/ethernet/mediatek/Makefile --- a/drivers/net/ethernet/mediatek/Makefile
+++ b/drivers/net/ethernet/mediatek/Makefile +++ b/drivers/net/ethernet/mediatek/Makefile
@@ -5,3 +5,8 @@ @@ -5,3 +5,8 @@
@ -70,11 +66,9 @@ index 79d4cdbbcbf5..45ba0970504a 100644
+mtk_eth-$(CONFIG_NET_MEDIATEK_SOC_WED) += mtk_wed_debugfs.o +mtk_eth-$(CONFIG_NET_MEDIATEK_SOC_WED) += mtk_wed_debugfs.o
+endif +endif
+obj-$(CONFIG_NET_MEDIATEK_SOC_WED) += mtk_wed_ops.o +obj-$(CONFIG_NET_MEDIATEK_SOC_WED) += mtk_wed_ops.o
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 70db217ed831..4d7c542d89fb 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -24,6 +24,7 @@ @@ -25,6 +25,7 @@
#include <net/dsa.h> #include <net/dsa.h>
#include "mtk_eth_soc.h" #include "mtk_eth_soc.h"
@ -82,7 +76,7 @@ index 70db217ed831..4d7c542d89fb 100644
static int mtk_msg_level = -1; static int mtk_msg_level = -1;
module_param_named(msg_level, mtk_msg_level, int, 0); module_param_named(msg_level, mtk_msg_level, int, 0);
@@ -3170,6 +3171,22 @@ static int mtk_probe(struct platform_device *pdev) @@ -3122,6 +3123,22 @@ static int mtk_probe(struct platform_device *pdev)
} }
} }
@ -105,11 +99,9 @@ index 70db217ed831..4d7c542d89fb 100644
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT) && i > 0) if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT) && i > 0)
eth->irq[i] = eth->irq[0]; eth->irq[i] = eth->irq[0];
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index e701544c4287..74661682fd92 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -295,6 +295,9 @@ @@ -292,6 +292,9 @@
#define MTK_GDM1_TX_GPCNT 0x2438 #define MTK_GDM1_TX_GPCNT 0x2438
#define MTK_STAT_OFFSET 0x40 #define MTK_STAT_OFFSET 0x40
@ -119,9 +111,6 @@ index e701544c4287..74661682fd92 100644
/* QDMA descriptor txd4 */ /* QDMA descriptor txd4 */
#define TX_DMA_CHKSUM (0x7 << 29) #define TX_DMA_CHKSUM (0x7 << 29)
#define TX_DMA_TSO BIT(28) #define TX_DMA_TSO BIT(28)
diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
new file mode 100644
index 000000000000..f0eacf819cd9
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c +++ b/drivers/net/ethernet/mediatek/mtk_wed.c
@@ -0,0 +1,875 @@ @@ -0,0 +1,875 @@
@ -1000,9 +989,6 @@ index 000000000000..f0eacf819cd9
+ kfree(hw); + kfree(hw);
+ } + }
+} +}
diff --git a/drivers/net/ethernet/mediatek/mtk_wed.h b/drivers/net/ethernet/mediatek/mtk_wed.h
new file mode 100644
index 000000000000..404c9a9b130d
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/mediatek/mtk_wed.h +++ b/drivers/net/ethernet/mediatek/mtk_wed.h
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
@ -1134,9 +1120,6 @@ index 000000000000..404c9a9b130d
+#endif +#endif
+ +
+#endif +#endif
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
new file mode 100644
index 000000000000..a81d3fd1a439
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c +++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
@@ -0,0 +1,175 @@ @@ -0,0 +1,175 @@
@ -1315,9 +1298,6 @@ index 000000000000..a81d3fd1a439
+ debugfs_create_file_unsafe("regval", 0600, dir, hw, &fops_regval); + debugfs_create_file_unsafe("regval", 0600, dir, hw, &fops_regval);
+ debugfs_create_file_unsafe("txinfo", 0400, dir, hw, &wed_txinfo_fops); + debugfs_create_file_unsafe("txinfo", 0400, dir, hw, &wed_txinfo_fops);
+} +}
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_ops.c b/drivers/net/ethernet/mediatek/mtk_wed_ops.c
new file mode 100644
index 000000000000..a5d9d8a5bce2
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/mediatek/mtk_wed_ops.c +++ b/drivers/net/ethernet/mediatek/mtk_wed_ops.c
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
@ -1329,9 +1309,6 @@ index 000000000000..a5d9d8a5bce2
+ +
+const struct mtk_wed_ops __rcu *mtk_soc_wed_ops; +const struct mtk_wed_ops __rcu *mtk_soc_wed_ops;
+EXPORT_SYMBOL_GPL(mtk_soc_wed_ops); +EXPORT_SYMBOL_GPL(mtk_soc_wed_ops);
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_regs.h b/drivers/net/ethernet/mediatek/mtk_wed_regs.h
new file mode 100644
index 000000000000..0a0465ea58b4
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/mediatek/mtk_wed_regs.h +++ b/drivers/net/ethernet/mediatek/mtk_wed_regs.h
@@ -0,0 +1,251 @@ @@ -0,0 +1,251 @@
@ -1586,9 +1563,6 @@ index 000000000000..0a0465ea58b4
+#define HIFSYS_DMA_AG_MAP 0x008 +#define HIFSYS_DMA_AG_MAP 0x008
+ +
+#endif +#endif
diff --git a/include/linux/soc/mediatek/mtk_wed.h b/include/linux/soc/mediatek/mtk_wed.h
new file mode 100644
index 000000000000..7e00cca06709
--- /dev/null --- /dev/null
+++ b/include/linux/soc/mediatek/mtk_wed.h +++ b/include/linux/soc/mediatek/mtk_wed.h
@@ -0,0 +1,131 @@ @@ -0,0 +1,131 @@
@ -1723,5 +1697,3 @@ index 000000000000..7e00cca06709
+#endif +#endif
+ +
+#endif +#endif
--
2.35.1

2
target/linux/ipq806x/patches-5.4/990-00-Add-required-entries-in-dts-files-for-NSS-support.patch.patch → target/linux/ipq806x/patches-5.4/990-00-Add-required-entries-in-dts-files-for-NSS-support.patch
View File

@ -12,7 +12,7 @@
+ +
gmac0: ethernet@37000000 { gmac0: ethernet@37000000 {
device_type = "network"; device_type = "network";
compatible = "qcom,ipq806x-gmac"; compatible = "qcom,ipq806x-gmac", "snps,dwmac";
@@ -1556,7 +1562,132 @@ @@ -1556,7 +1562,132 @@
regulator-always-on; regulator-always-on;
}; };

6
target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch
View File

@ -107,8 +107,8 @@
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1590,6 +1590,20 @@ enum netdev_priv_flags { @@ -1590,6 +1590,20 @@ enum netdev_priv_flags {
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK ML_PRIV_CAN,
#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN };
+/* QCA NSS ECM support - Start */ +/* QCA NSS ECM support - Start */
+enum netdev_priv_qca_ecm_flags { +enum netdev_priv_qca_ecm_flags {
@ -1002,7 +1002,7 @@
+ /* QCA NSS ECM support - End */ + /* QCA NSS ECM support - End */
+ +
if (swdev_notify) if (swdev_notify)
br_switchdev_fdb_notify(fdb, type); br_switchdev_fdb_notify(br, fdb, type);
@@ -1212,3 +1274,44 @@ void br_fdb_clear_offload(const struct n @@ -1212,3 +1274,44 @@ void br_fdb_clear_offload(const struct n
spin_unlock_bh(&p->br->hash_lock); spin_unlock_bh(&p->br->hash_lock);

22
target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch
View File

@ -1,6 +1,14 @@
--- a/include/linux/if_bridge.h --- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h
@@ -174,6 +174,8 @@ struct br_fdb_event { @@ -54,6 +54,7 @@ extern void br_fdb_update_unregister_notify(struct notifier_block *nb);
extern void br_dev_update_stats(struct net_device *dev,
struct rtnl_link_stats64 *nlstats);
+extern bool br_is_hairpin_enabled(struct net_device *dev);
#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)
int br_multicast_list_adjacent(struct net_device *dev,
@@ -174,6 +175,8 @@ struct br_fdb_event {
struct net_device *dev; struct net_device *dev;
unsigned char addr[6]; unsigned char addr[6];
unsigned char is_local; unsigned char is_local;
@ -82,7 +90,7 @@
#endif #endif
--- a/drivers/net/tun.c --- a/drivers/net/tun.c
+++ b/drivers/net/tun.c +++ b/drivers/net/tun.c
@@ -2860,6 +2860,8 @@ static int tun_set_iff(struct net *net, @@ -2861,6 +2861,8 @@ static int tun_set_iff(struct net *net,
~(NETIF_F_HW_VLAN_CTAG_TX | ~(NETIF_F_HW_VLAN_CTAG_TX |
NETIF_F_HW_VLAN_STAG_TX); NETIF_F_HW_VLAN_STAG_TX);
@ -111,16 +119,6 @@
netif_keep_dst(dev); netif_keep_dst(dev);
} }
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -54,6 +54,7 @@ extern void br_fdb_update_unregister_notify(struct notifier_block *nb);
extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
extern void br_dev_update_stats(struct net_device *dev,
struct rtnl_link_stats64 *nlstats);
+extern bool br_is_hairpin_enabled(struct net_device *dev);
#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)
int br_multicast_list_adjacent(struct net_device *dev,
--- a/net/bridge/br_if.c --- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c +++ b/net/bridge/br_if.c
@@ -796,6 +796,17 @@ void br_dev_update_stats(struct net_device *dev, @@ -796,6 +796,17 @@ void br_dev_update_stats(struct net_device *dev,

8
target/linux/ipq806x/patches-5.4/999-07c-qca-nss-clients-ppp-support.patch
View File

@ -115,8 +115,8 @@
void (*hold)(struct ppp_channel *); void (*hold)(struct ppp_channel *);
/* Release hold on the channel */ /* Release hold on the channel */
@@ -69,6 +71,15 @@ @@ -69,6 +71,15 @@
/* Test if ppp xmit lock is locked */ extern void ppp_release_channels(struct ppp_channel *channels[],
extern bool ppp_is_xmit_locked(struct net_device *dev); unsigned int chan_sz);
+/* Test if ppp xmit lock is locked */ +/* Test if ppp xmit lock is locked */
+extern bool ppp_is_xmit_locked(struct net_device *dev); +extern bool ppp_is_xmit_locked(struct net_device *dev);
@ -128,5 +128,5 @@
+extern int ppp_dev_index(struct ppp_channel *); +extern int ppp_dev_index(struct ppp_channel *);
+ +
/* Hold PPP channels for the PPP device */ /* Hold PPP channels for the PPP device */
extern int __ppp_hold_channels(struct net_device *dev, extern int ppp_hold_channels(struct net_device *dev,
struct ppp_channel *channels[], struct ppp_channel *channels[],

6
target/linux/ipq806x/patches-5.4/999-07d-qca-nss-clients-ppp-support.patch
View File

@ -1,8 +1,8 @@
--- a/include/linux/ppp_channel.h --- a/include/linux/ppp_channel.h
+++ b/include/linux/ppp_channel.h +++ b/include/linux/ppp_channel.h
@@ -135,5 +135,17 @@ extern void ppp_update_stats(struct net_ @@ -135,5 +135,17 @@ extern void ppp_update_stats(struct net_
extern int ppp_dev_index(struct ppp_channel *); * that ppp_unregister_channel returns.
/* QCA NSS ECM Support - End */ */
+/* QCA NSS Clients Support - Start */ +/* QCA NSS Clients Support - Start */
+/* PPP channel connection event types */ +/* PPP channel connection event types */
@ -96,4 +96,4 @@
+ +
/* remove it from the ppp unit's list */ /* remove it from the ppp unit's list */
ppp_lock(ppp); ppp_lock(ppp);
list_del(&pch->clist); list_del(&pch->clist);

2
target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch
View File

@ -35,7 +35,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
--- a/drivers/mtd/ubi/build.c --- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c
@@ -576,7 +576,7 @@ static int io_init(struct ubi_device *ub @@ -572,7 +572,7 @@ static int io_init(struct ubi_device *ub
dbg_gen("sizeof(struct ubi_ainf_peb) %zu", sizeof(struct ubi_ainf_peb)); dbg_gen("sizeof(struct ubi_ainf_peb) %zu", sizeof(struct ubi_ainf_peb));
dbg_gen("sizeof(struct ubi_wl_entry) %zu", sizeof(struct ubi_wl_entry)); dbg_gen("sizeof(struct ubi_wl_entry) %zu", sizeof(struct ubi_wl_entry));

2
target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c --- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2916,6 +2916,18 @@ static const struct usb_device_id uvc_id @@ -2911,6 +2911,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1, .bInterfaceSubClass = 1,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) }, .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },

2
target/linux/ramips/patches-5.4/0122-mips-ralink-enable-zboot-support.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -631,6 +631,7 @@ config RALINK @@ -629,6 +629,7 @@ config RALINK
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_MIPS16 select SYS_SUPPORTS_MIPS16

Some files were not shown because too many files have changed in this diff Show More