forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.23 Removed upstreamed: pending-6.6/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch[1] pending-6.6/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch[2] mediatek/patches-6.6/232-clk-mediatek-mt7981-topckgen-flag-SGM_REG_SEL-as-cri.patch[3] Manually rebased: mediatek/patches-6.6/100-dts-update-mt7622-rfb1.patch Added: generic/backports-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=1f32abb474c1c9bdb21d9eda74c325a0b3a162e5 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=943c14ece95eb1cf98d477462aebcbfdfd714633 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=6ff01b314149d1cf59caebc29384f0beed21cba4 4. See comments in openwrt#14992 regarding broken flogic/xiaomi_redmi-router-ax6000-ubootmod Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezannei, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Signed-off-by: John Audia <[email protected]>
- Loading branch information
Showing
38 changed files
with
98 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.6 = .22 | ||
LINUX_KERNEL_HASH-6.6.22 = 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 | ||
LINUX_VERSION-6.6 = .23 | ||
LINUX_KERNEL_HASH-6.6.23 = 200fd119cb9ef06bcedcdb52be00ba443163eab154295c5831fed9a12211a8b9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <[email protected]> | |
|
||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | ||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | ||
@@ -597,6 +597,7 @@ | ||
@@ -594,6 +594,7 @@ | ||
reg-names = "nand", "nand-int-base"; | ||
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; | ||
interrupt-names = "nand_ctlrdy"; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <[email protected]> | |
|
||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | ||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | ||
@@ -344,7 +344,7 @@ | ||
@@ -341,7 +341,7 @@ | ||
gpio0: gpio-controller@500 { | ||
compatible = "brcm,bcm6345-gpio"; | ||
reg-names = "dirout", "dat"; | ||
|
27 changes: 27 additions & 0 deletions
27
target/linux/generic/backport-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From: Ezra Buehler <[email protected]> | ||
|
||
E.g. ESMT chips will return an identification code with a length of 5 | ||
bytes. In order to prevent ambiguity, flash chips would actually need to | ||
return IDs that are up to 17 or more bytes long due to JEDEC's | ||
continuation scheme. I understand that if a manufacturer ID is located | ||
in bank N of JEDEC's database (there are currently 16 banks), N - 1 | ||
continuation codes (7Fh) need to be added to the identification code | ||
(comprising of manufacturer ID and device ID). However, most flash chip | ||
manufacturers don't seem to implement this (correctly). | ||
|
||
Signed-off-by: Ezra Buehler <[email protected]> | ||
--- | ||
include/linux/mtd/spinand.h | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
--- a/include/linux/mtd/spinand.h | ||
+++ b/include/linux/mtd/spinand.h | ||
@@ -169,7 +169,7 @@ | ||
struct spinand_op; | ||
struct spinand_device; | ||
|
||
-#define SPINAND_MAX_ID_LEN 4 | ||
+#define SPINAND_MAX_ID_LEN 5 | ||
/* | ||
* For erase, write and read operation, we got the following timings : | ||
* tBERS (erase) 1ms to 4ms |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/core/dev.c | ||
+++ b/net/core/dev.c | ||
@@ -7686,6 +7686,48 @@ static void __netdev_adjacent_dev_unlink | ||
@@ -7689,6 +7689,48 @@ static void __netdev_adjacent_dev_unlink | ||
&upper_dev->adj_list.lower); | ||
} | ||
|
||
|
@@ -93,23 +93,23 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
static int __netdev_upper_dev_link(struct net_device *dev, | ||
struct net_device *upper_dev, bool master, | ||
void *upper_priv, void *upper_info, | ||
@@ -7737,6 +7779,7 @@ static int __netdev_upper_dev_link(struc | ||
@@ -7740,6 +7782,7 @@ static int __netdev_upper_dev_link(struc | ||
if (ret) | ||
return ret; | ||
|
||
+ netdev_update_addr_mask(dev); | ||
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, | ||
&changeupper_info.info); | ||
ret = notifier_to_errno(ret); | ||
@@ -7833,6 +7876,7 @@ static void __netdev_upper_dev_unlink(st | ||
@@ -7836,6 +7879,7 @@ static void __netdev_upper_dev_unlink(st | ||
|
||
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); | ||
|
||
+ netdev_update_addr_mask(dev); | ||
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, | ||
&changeupper_info.info); | ||
|
||
@@ -8889,6 +8933,7 @@ int dev_set_mac_address(struct net_devic | ||
@@ -8892,6 +8936,7 @@ int dev_set_mac_address(struct net_devic | ||
return err; | ||
} | ||
dev->addr_assign_type = NET_ADDR_SET; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -8213,7 +8213,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -8214,7 +8214,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -4982,6 +4982,8 @@ static int mtk_probe(struct platform_dev | ||
@@ -4981,6 +4981,8 @@ static int mtk_probe(struct platform_dev | ||
* for NAPI to work | ||
*/ | ||
init_dummy_netdev(ð->dummy_dev); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Couzens <[email protected]> | |
|
||
--- a/drivers/net/dsa/mt7530.c | ||
+++ b/drivers/net/dsa/mt7530.c | ||
@@ -2268,6 +2268,10 @@ mt7530_setup(struct dsa_switch *ds) | ||
@@ -2304,6 +2304,10 @@ mt7530_setup(struct dsa_switch *ds) | ||
return -ENODEV; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <net/page_pool/helpers.h> | ||
|
||
#include "mtk_eth_soc.h" | ||
@@ -1579,12 +1580,28 @@ static void mtk_wake_queue(struct mtk_et | ||
@@ -1578,12 +1579,28 @@ static void mtk_wake_queue(struct mtk_et | ||
} | ||
} | ||
|
||
|
@@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
bool gso = false; | ||
int tx_num; | ||
|
||
@@ -1606,6 +1623,18 @@ static netdev_tx_t mtk_start_xmit(struct | ||
@@ -1605,6 +1622,18 @@ static netdev_tx_t mtk_start_xmit(struct | ||
return NETDEV_TX_BUSY; | ||
} | ||
|
||
|
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
/* TSO: fill MSS info in tcp checksum field */ | ||
if (skb_is_gso(skb)) { | ||
if (skb_cow_head(skb, 0)) { | ||
@@ -1621,8 +1650,14 @@ static netdev_tx_t mtk_start_xmit(struct | ||
@@ -1620,8 +1649,14 @@ static netdev_tx_t mtk_start_xmit(struct | ||
} | ||
} | ||
|
||
|
50 changes: 0 additions & 50 deletions
50
.../linux/generic/pending-6.6/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch
This file was deleted.
Oops, something went wrong.
59 changes: 0 additions & 59 deletions
59
target/linux/generic/pending-6.6/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
void netif_napi_add_weight(struct net_device *dev, struct napi_struct *napi, | ||
int (*poll)(struct napi_struct *, int), int weight) | ||
{ | ||
@@ -11348,6 +11419,9 @@ static int dev_cpu_dead(unsigned int old | ||
@@ -11351,6 +11422,9 @@ static int dev_cpu_dead(unsigned int old | ||
raise_softirq_irqoff(NET_TX_SOFTIRQ); | ||
local_irq_enable(); | ||
|
||
|
@@ -167,7 +167,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#ifdef CONFIG_RPS | ||
remsd = oldsd->rps_ipi_list; | ||
oldsd->rps_ipi_list = NULL; | ||
@@ -11663,6 +11737,7 @@ static int __init net_dev_init(void) | ||
@@ -11666,6 +11740,7 @@ static int __init net_dev_init(void) | ||
INIT_CSD(&sd->defer_csd, trigger_rx_softirq, sd); | ||
spin_lock_init(&sd->defer_lock); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <[email protected]> | |
|
||
--- a/drivers/net/dsa/mt7530.c | ||
+++ b/drivers/net/dsa/mt7530.c | ||
@@ -2156,10 +2156,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr | ||
@@ -2192,10 +2192,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr | ||
{ | ||
struct dsa_switch *ds = priv->ds; | ||
struct device *dev = priv->dev; | ||
|
@@ -30,7 +30,7 @@ Signed-off-by: David Bauer <[email protected]> | |
bus = devm_mdiobus_alloc(dev); | ||
if (!bus) | ||
return -ENOMEM; | ||
@@ -2178,7 +2181,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr | ||
@@ -2214,7 +2217,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr | ||
if (priv->irq) | ||
mt7530_setup_mdio_irq(priv); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]> | |
help | ||
--- a/init/main.c | ||
+++ b/init/main.c | ||
@@ -608,6 +608,29 @@ static inline void setup_nr_cpu_ids(void | ||
@@ -609,6 +609,29 @@ static inline void setup_nr_cpu_ids(void | ||
static inline void smp_prepare_cpus(unsigned int maxcpus) { } | ||
#endif | ||
|
||
|
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]> | |
/* | ||
* We need to store the untouched command line for future reference. | ||
* We also need to store the touched command line since the parameter | ||
@@ -895,6 +918,7 @@ void start_kernel(void) | ||
@@ -896,6 +919,7 @@ void start_kernel(void) | ||
pr_notice("%s", linux_banner); | ||
early_security_init(); | ||
setup_arch(&command_line); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
}; | ||
|
||
chosen { | ||
@@ -164,22 +165,22 @@ | ||
@@ -165,22 +166,22 @@ | ||
|
||
port@1 { | ||
reg = <1>; | ||
|
2 changes: 1 addition & 1 deletion
2
target/linux/mediatek/patches-6.6/114-dts-bpi64-disable-rtc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
target/linux/mediatek/patches-6.6/131-dts-mt7622-add-snand-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.