forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
https://lore.kernel.org/all/?q=6.6.48-rc1 https://lore.kernel.org/all/[email protected] Signed-off-by: Marty Jones <[email protected]>
- Loading branch information
Showing
25 changed files
with
48 additions
and
229 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 = .47 | ||
LINUX_KERNEL_HASH-6.6.47 = d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 | ||
LINUX_VERSION-6.6 = .48 | ||
LINUX_KERNEL_HASH-6.6.48 = 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 |
45 changes: 0 additions & 45 deletions
45
...x/bcm27xx/patches-6.6/950-0058-Revert-Bluetooth-Always-request-for-user-confirmatio.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 |
---|---|---|
|
@@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
* For devices with more than one control interface, we assume the | ||
--- a/sound/usb/quirks.c | ||
+++ b/sound/usb/quirks.c | ||
@@ -2189,6 +2189,8 @@ static const struct usb_audio_quirk_flag | ||
@@ -2191,6 +2191,8 @@ static const struct usb_audio_quirk_flag | ||
QUIRK_FLAG_ALIGN_TRANSFER), | ||
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ | ||
QUIRK_FLAG_ALIGN_TRANSFER), | ||
|
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 |
---|---|---|
|
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
* non-error returns are a promise to giveback() the urb later | ||
* we drop ownership so next owner (or urb unlink) can get it | ||
*/ | ||
@@ -5326,6 +5429,7 @@ static const struct hc_driver xhci_hc_dr | ||
@@ -5328,6 +5431,7 @@ static const struct hc_driver xhci_hc_dr | ||
.endpoint_reset = xhci_endpoint_reset, | ||
.check_bandwidth = xhci_check_bandwidth, | ||
.reset_bandwidth = xhci_reset_bandwidth, | ||
|
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 |
---|---|---|
|
@@ -212,7 +212,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
}, | ||
--- a/drivers/usb/dwc3/core.c | ||
+++ b/drivers/usb/dwc3/core.c | ||
@@ -1181,6 +1181,24 @@ static void dwc3_config_threshold(struct | ||
@@ -1194,6 +1194,24 @@ static void dwc3_config_threshold(struct | ||
} | ||
} | ||
|
||
|
@@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/** | ||
* dwc3_core_init - Low-level initialization of DWC3 Core | ||
* @dwc: Pointer to our controller context structure | ||
@@ -1246,6 +1264,8 @@ static int dwc3_core_init(struct dwc3 *d | ||
@@ -1259,6 +1277,8 @@ static int dwc3_core_init(struct dwc3 *d | ||
|
||
dwc3_set_incr_burst_type(dwc); | ||
|
||
|
@@ -246,7 +246,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
ret = dwc3_phy_power_on(dwc); | ||
if (ret) | ||
goto err_exit_phy; | ||
@@ -1320,6 +1340,24 @@ static int dwc3_core_init(struct dwc3 *d | ||
@@ -1333,6 +1353,24 @@ static int dwc3_core_init(struct dwc3 *d | ||
|
||
dwc3_config_threshold(dwc); | ||
|
||
|
@@ -271,15 +271,15 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
return 0; | ||
|
||
err_power_off_phy: | ||
@@ -1463,6 +1501,7 @@ static void dwc3_get_properties(struct d | ||
@@ -1476,6 +1514,7 @@ static void dwc3_get_properties(struct d | ||
u8 tx_thr_num_pkt_prd = 0; | ||
u8 tx_max_burst_prd = 0; | ||
u8 tx_fifo_resize_max_num; | ||
+ u8 axi_pipe_limit; | ||
const char *usb_psy_name; | ||
int ret; | ||
|
||
@@ -1485,6 +1524,9 @@ static void dwc3_get_properties(struct d | ||
@@ -1498,6 +1537,9 @@ static void dwc3_get_properties(struct d | ||
*/ | ||
tx_fifo_resize_max_num = 6; | ||
|
||
|
@@ -289,7 +289,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
dwc->maximum_speed = usb_get_maximum_speed(dev); | ||
dwc->max_ssp_rate = usb_get_maximum_ssp_rate(dev); | ||
dwc->dr_mode = usb_get_dr_mode(dev); | ||
@@ -1606,6 +1648,9 @@ static void dwc3_get_properties(struct d | ||
@@ -1619,6 +1661,9 @@ static void dwc3_get_properties(struct d | ||
dwc->dis_split_quirk = device_property_read_bool(dev, | ||
"snps,dis-split-quirk"); | ||
|
||
|
@@ -299,7 +299,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
dwc->lpm_nyet_threshold = lpm_nyet_threshold; | ||
dwc->tx_de_emphasis = tx_de_emphasis; | ||
|
||
@@ -1623,6 +1668,8 @@ static void dwc3_get_properties(struct d | ||
@@ -1636,6 +1681,8 @@ static void dwc3_get_properties(struct d | ||
dwc->tx_thr_num_pkt_prd = tx_thr_num_pkt_prd; | ||
dwc->tx_max_burst_prd = tx_max_burst_prd; | ||
|
||
|
@@ -308,7 +308,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
dwc->imod_interval = 0; | ||
|
||
dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num; | ||
@@ -1898,6 +1945,12 @@ static int dwc3_probe(struct platform_de | ||
@@ -1911,6 +1958,12 @@ static int dwc3_probe(struct platform_de | ||
|
||
dwc3_get_properties(dwc); | ||
|
||
|
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: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/dwc3/core.c | ||
+++ b/drivers/usb/dwc3/core.c | ||
@@ -1330,6 +1330,9 @@ static int dwc3_core_init(struct dwc3 *d | ||
@@ -1343,6 +1343,9 @@ static int dwc3_core_init(struct dwc3 *d | ||
if (dwc->parkmode_disable_hs_quirk) | ||
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_HS; | ||
|
||
|
@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (DWC3_VER_IS_WITHIN(DWC3, 290A, ANY) && | ||
(dwc->maximum_speed == USB_SPEED_HIGH || | ||
dwc->maximum_speed == USB_SPEED_FULL)) | ||
@@ -1628,6 +1631,8 @@ static void dwc3_get_properties(struct d | ||
@@ -1641,6 +1644,8 @@ static void dwc3_get_properties(struct d | ||
"snps,parkmode-disable-ss-quirk"); | ||
dwc->parkmode_disable_hs_quirk = device_property_read_bool(dev, | ||
"snps,parkmode-disable-hs-quirk"); | ||
|
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 |
---|---|---|
|
@@ -65,7 +65,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
} | ||
--- a/net/ipv4/udp_offload.c | ||
+++ b/net/ipv4/udp_offload.c | ||
@@ -361,6 +361,14 @@ struct sk_buff *__udp_gso_segment(struct | ||
@@ -362,6 +362,14 @@ struct sk_buff *__udp_gso_segment(struct | ||
else | ||
uh->check = gso_make_checksum(seg, ~check) ? : CSUM_MANGLED_0; | ||
|
||
|
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 |
---|---|---|
|
@@ -71,8 +71,8 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
|
||
--- a/net/ipv4/udp_offload.c | ||
+++ b/net/ipv4/udp_offload.c | ||
@@ -282,6 +282,12 @@ struct sk_buff *__udp_gso_segment(struct | ||
skb_transport_header(gso_skb))) | ||
@@ -283,6 +283,12 @@ struct sk_buff *__udp_gso_segment(struct | ||
!(skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST))) | ||
return ERR_PTR(-EINVAL); | ||
|
||
+ /* We don't know if egress device can segment and checksum the packet | ||
|
26 changes: 0 additions & 26 deletions
26
...neric/backport-6.6/752-04-v6.6-net-ethernet-mtk_wed-check-update_wo_rx_stats-in-mtk.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 |
---|---|---|
|
@@ -168,7 +168,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
ext_mask |= MTK_WED_EXT_INT_STATUS_TX_DRV_R_RESP_ERR; | ||
else | ||
ext_mask |= MTK_WED_EXT_INT_STATUS_RX_FBUF_LO_TH | | ||
@@ -1840,7 +1840,7 @@ mtk_wed_setup_tc(struct mtk_wed_device * | ||
@@ -1842,7 +1842,7 @@ mtk_wed_setup_tc(struct mtk_wed_device * | ||
{ | ||
struct mtk_wed_hw *hw = wed->hw; | ||
|
||
|
@@ -177,7 +177,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
return -EOPNOTSUPP; | ||
|
||
switch (type) { | ||
@@ -1914,9 +1914,9 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1916,9 +1916,9 @@ void mtk_wed_add_hw(struct device_node * | ||
hw->wdma = wdma; | ||
hw->index = index; | ||
hw->irq = irq; | ||
|
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 |
---|---|---|
|
@@ -142,7 +142,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
return -ENOMEM; | ||
|
||
wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_BASE, | ||
@@ -1928,7 +1935,12 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1930,7 +1937,12 @@ void mtk_wed_add_hw(struct device_node * | ||
hw->irq = irq; | ||
hw->version = eth->soc->version; | ||
|
||
|
@@ -156,7 +156,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
hw->mirror = syscon_regmap_lookup_by_phandle(eth_np, | ||
"mediatek,pcie-mirror"); | ||
hw->hifsys = syscon_regmap_lookup_by_phandle(eth_np, | ||
@@ -1942,6 +1954,8 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1944,6 +1956,8 @@ void mtk_wed_add_hw(struct device_node * | ||
regmap_write(hw->mirror, 0, 0); | ||
regmap_write(hw->mirror, 4, 0); | ||
} | ||
|
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 |
---|---|---|
|
@@ -759,7 +759,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
val = wed_r32(dev, MTK_WED_EXT_INT_STATUS); | ||
wed_w32(dev, MTK_WED_EXT_INT_STATUS, val); | ||
@@ -1939,6 +2130,9 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1941,6 +2132,9 @@ void mtk_wed_add_hw(struct device_node * | ||
case 2: | ||
hw->soc = &mt7986_data; | ||
break; | ||
|
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 |
---|---|---|
|
@@ -364,7 +364,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) | ||
{ | ||
int i; | ||
@@ -2212,6 +2503,10 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -2214,6 +2505,10 @@ void mtk_wed_add_hw(struct device_node * | ||
.detach = mtk_wed_detach, | ||
.ppe_check = mtk_wed_ppe_check, | ||
.setup_tc = mtk_wed_setup_tc, | ||
|
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 |
---|---|---|
|
@@ -131,7 +131,7 @@ Signed-off-by: John Crispin <[email protected]> | |
struct gpio_desc *desc) | ||
--- a/drivers/gpio/gpiolib-sysfs.c | ||
+++ b/drivers/gpio/gpiolib-sysfs.c | ||
@@ -557,7 +557,7 @@ static struct class gpio_class = { | ||
@@ -558,7 +558,7 @@ static struct class gpio_class = { | ||
* | ||
* Returns zero on success, else an error. | ||
*/ | ||
|
@@ -140,7 +140,7 @@ Signed-off-by: John Crispin <[email protected]> | |
{ | ||
struct gpio_chip *chip; | ||
struct gpio_device *gdev; | ||
@@ -619,6 +619,8 @@ int gpiod_export(struct gpio_desc *desc, | ||
@@ -620,6 +620,8 @@ int gpiod_export(struct gpio_desc *desc, | ||
offset = gpio_chip_hwgpio(desc); | ||
if (chip->names && chip->names[offset]) | ||
ioname = chip->names[offset]; | ||
|
@@ -149,7 +149,7 @@ Signed-off-by: John Crispin <[email protected]> | |
|
||
dev = device_create_with_groups(&gpio_class, &gdev->dev, | ||
MKDEV(0, 0), data, gpio_groups, | ||
@@ -640,8 +642,21 @@ err_unlock: | ||
@@ -641,8 +643,21 @@ err_unlock: | ||
gpiod_dbg(desc, "%s: status %d\n", __func__, status); | ||
return status; | ||
} | ||
|
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 |
---|---|---|
|
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!pe) | ||
--- a/mm/vmalloc.c | ||
+++ b/mm/vmalloc.c | ||
@@ -4455,6 +4455,8 @@ static const struct seq_operations vmall | ||
@@ -4448,6 +4448,8 @@ static const struct seq_operations vmall | ||
|
||
static int __init proc_vmalloc_init(void) | ||
{ | ||
|
26 changes: 0 additions & 26 deletions
26
target/linux/generic/pending-6.6/601-udp-fix-receiving-fraglist-GSO_packets.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.