Skip to content

Commit

Permalink
kernel: bump 6.6 to 6.6.57
Browse files Browse the repository at this point in the history
1. Update target/linux/generic/config-6.6 for new ksym
2. Refresh patches

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.57

Removed upstreamed:
	gemini/patches-6.6/0001-net-ethernet-cortina-Drop-TSO-support.patch[1]
	gemini/patches-6.6/0004-net-ethernet-cortina-Restore-TSO-support.patch[2]

Manually rebased:
	generic/hack-6.6/645-netfilter-connmark-introduce-set-dscpmark.patch

All other patches automatically rebased.

1. I cannot find a ref to this but all but a the comment line was present in 6.6.57
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.57&id=611f74b0e7fb93ee2366d9d7edca546806b220e9

Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
graysky2 committed Oct 18, 2024
1 parent f9f2dd1 commit df5ee8b
Show file tree
Hide file tree
Showing 26 changed files with 47 additions and 248 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.6
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .56
LINUX_KERNEL_HASH-6.6.56 = f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95
LINUX_VERSION-6.6 = .57
LINUX_KERNEL_HASH-6.6.57 = 66ce426ef96f99b8e1ef7ac72e780c730ef8b970f7aa5708501c4274d7abb7b3
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ SVN-Revision: 35130
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4221,14 +4221,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -4262,14 +4262,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We don't agree with upstream revert so undo it.

--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -489,8 +489,10 @@ static void xhci_pci_quirks(struct devic
@@ -490,8 +490,10 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x3432)
xhci->quirks |= XHCI_BROKEN_STREAMS;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>

--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -239,6 +239,9 @@
@@ -242,6 +242,9 @@
#define USB_VENDOR_ID_BAANTO 0x2453
#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100

Expand All @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201

@@ -1394,6 +1397,9 @@
@@ -1404,6 +1407,9 @@
#define USB_VENDOR_ID_XIAOMI 0x2717
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>

--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -492,6 +492,7 @@ static void xhci_pci_quirks(struct devic
@@ -493,6 +493,7 @@ static void xhci_pci_quirks(struct devic
if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
xhci->quirks |= XHCI_LPM_SUPPORT;
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>

--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -493,6 +493,7 @@ static void xhci_pci_quirks(struct devic
@@ -494,6 +494,7 @@ static void xhci_pci_quirks(struct devic
xhci->quirks |= XHCI_LPM_SUPPORT;
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
/* Allow 3 retries for everything but isoc, set CErr = 3 */
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -494,6 +494,7 @@ static void xhci_pci_quirks(struct devic
@@ -495,6 +495,7 @@ static void xhci_pci_quirks(struct devic
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
/* Device for a quirk */
#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73
#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000
@@ -294,6 +296,16 @@ static int xhci_pci_reinit(struct xhci_h
@@ -295,6 +297,16 @@ static int xhci_pci_reinit(struct xhci_h
return 0;
}

Expand All @@ -64,7 +64,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
{
struct pci_dev *pdev = to_pci_dev(dev);
@@ -495,6 +507,8 @@ static void xhci_pci_quirks(struct devic
@@ -496,6 +508,8 @@ static void xhci_pci_quirks(struct devic
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH;
xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
},
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1202,6 +1202,24 @@ static void dwc3_config_threshold(struct
@@ -1208,6 +1208,24 @@ static void dwc3_config_threshold(struct
}
}

Expand All @@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
/**
* dwc3_core_init - Low-level initialization of DWC3 Core
* @dwc: Pointer to our controller context structure
@@ -1267,6 +1285,8 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1273,6 +1291,8 @@ static int dwc3_core_init(struct dwc3 *d

dwc3_set_incr_burst_type(dwc);

Expand All @@ -246,7 +246,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
ret = dwc3_phy_power_on(dwc);
if (ret)
goto err_exit_phy;
@@ -1356,6 +1376,24 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1362,6 +1382,24 @@ static int dwc3_core_init(struct dwc3 *d

dwc3_config_threshold(dwc);

Expand All @@ -271,15 +271,15 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
return 0;

err_power_off_phy:
@@ -1499,6 +1537,7 @@ static void dwc3_get_properties(struct d
@@ -1505,6 +1543,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;

@@ -1521,6 +1560,9 @@ static void dwc3_get_properties(struct d
@@ -1527,6 +1566,9 @@ static void dwc3_get_properties(struct d
*/
tx_fifo_resize_max_num = 6;

Expand All @@ -289,7 +289,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
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);
@@ -1642,6 +1684,9 @@ static void dwc3_get_properties(struct d
@@ -1648,6 +1690,9 @@ static void dwc3_get_properties(struct d
dwc->dis_split_quirk = device_property_read_bool(dev,
"snps,dis-split-quirk");

Expand All @@ -299,7 +299,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
dwc->tx_de_emphasis = tx_de_emphasis;

@@ -1659,6 +1704,8 @@ static void dwc3_get_properties(struct d
@@ -1665,6 +1710,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;

Expand All @@ -308,7 +308,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
dwc->imod_interval = 0;

dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num;
@@ -1934,6 +1981,12 @@ static int dwc3_probe(struct platform_de
@@ -1940,6 +1987,12 @@ static int dwc3_probe(struct platform_de

dwc3_get_properties(dwc);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>

--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -2367,6 +2367,13 @@ config SENSORS_INTEL_M10_BMC_HWMON
@@ -2371,6 +2371,13 @@ config SENSORS_INTEL_M10_BMC_HWMON
sensors monitor various telemetry data of different components on the
card, e.g. board temperature, FPGA core temperature/voltage/current.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return;

mutex_init(&vc4file->perfmon.lock);
@@ -126,7 +126,7 @@ void vc4_perfmon_close_file(struct vc4_f
@@ -131,7 +131,7 @@ void vc4_perfmon_close_file(struct vc4_f
{
struct vc4_dev *vc4 = vc4file->dev;

Expand All @@ -841,7 +841,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return;

mutex_lock(&vc4file->perfmon.lock);
@@ -146,7 +146,7 @@ int vc4_perfmon_create_ioctl(struct drm_
@@ -151,7 +151,7 @@ int vc4_perfmon_create_ioctl(struct drm_
unsigned int i;
int ret;

Expand All @@ -850,7 +850,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return -ENODEV;

if (!vc4->v3d) {
@@ -200,7 +200,7 @@ int vc4_perfmon_destroy_ioctl(struct drm
@@ -205,7 +205,7 @@ int vc4_perfmon_destroy_ioctl(struct drm
struct drm_vc4_perfmon_destroy *req = data;
struct vc4_perfmon *perfmon;

Expand All @@ -859,7 +859,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return -ENODEV;

if (!vc4->v3d) {
@@ -228,7 +228,7 @@ int vc4_perfmon_get_values_ioctl(struct
@@ -233,7 +233,7 @@ int vc4_perfmon_get_values_ioctl(struct
struct vc4_perfmon *perfmon;
int ret;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return;

mutex_init(&vc4file->perfmon.lock);
@@ -126,7 +126,7 @@ void vc4_perfmon_close_file(struct vc4_f
@@ -131,7 +131,7 @@ void vc4_perfmon_close_file(struct vc4_f
{
struct vc4_dev *vc4 = vc4file->dev;

Expand All @@ -441,7 +441,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return;

mutex_lock(&vc4file->perfmon.lock);
@@ -146,7 +146,7 @@ int vc4_perfmon_create_ioctl(struct drm_
@@ -151,7 +151,7 @@ int vc4_perfmon_create_ioctl(struct drm_
unsigned int i;
int ret;

Expand All @@ -450,7 +450,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return -ENODEV;

if (!vc4->v3d) {
@@ -200,7 +200,7 @@ int vc4_perfmon_destroy_ioctl(struct drm
@@ -205,7 +205,7 @@ int vc4_perfmon_destroy_ioctl(struct drm
struct drm_vc4_perfmon_destroy *req = data;
struct vc4_perfmon *perfmon;

Expand All @@ -459,7 +459,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return -ENODEV;

if (!vc4->v3d) {
@@ -228,7 +228,7 @@ int vc4_perfmon_get_values_ioctl(struct
@@ -233,7 +233,7 @@ int vc4_perfmon_get_values_ioctl(struct
struct vc4_perfmon *perfmon;
int ret;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>

--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1366,6 +1366,9 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1372,6 +1372,9 @@ static int dwc3_core_init(struct dwc3 *d
if (dwc->parkmode_disable_hs_quirk)
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_HS;

Expand All @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
if (DWC3_VER_IS_WITHIN(DWC3, 290A, ANY) &&
(dwc->maximum_speed == USB_SPEED_HIGH ||
dwc->maximum_speed == USB_SPEED_FULL))
@@ -1664,6 +1667,8 @@ static void dwc3_get_properties(struct d
@@ -1670,6 +1673,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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>

--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -3914,6 +3914,8 @@ check_restart_area:
@@ -3929,6 +3929,8 @@ check_restart_area:
log->l_size = log->orig_file_size;
log->page_size = norm_file_page(t32, &log->l_size,
t32 == DefaultLogPageSize);
Expand Down

This file was deleted.

Loading

0 comments on commit df5ee8b

Please sign in to comment.