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.1.59 Manually rebased: bcm27xx/patches-6.1/950-0124-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch Removed upstreamed: generic/backport-6.1/781-v6.6-02-net-dsa-qca8k-fix-potential-MDIO-bus-conflict-when-a.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.59&id=881050b25b1dda7b0f14d40d1b09bf38cb3b427c Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <[email protected]>
- Loading branch information
1 parent
33e72eb
commit bb8fd41
Showing
19 changed files
with
47 additions
and
153 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.1 = .58 | ||
LINUX_KERNEL_HASH-6.1.58 = ce987ed3d2f640b3a2a62a0a8573d538a36dfd3cc31e2d7a239ce5a16c1c21ad | ||
LINUX_VERSION-6.1 = .59 | ||
LINUX_KERNEL_HASH-6.1.59 = 627f7724c675036639290fb5c39e3fdeb3d566b80b192c45f4a808ab54c8c0a0 |
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 |
---|---|---|
|
@@ -10,7 +10,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/drm_atomic_helper.c | ||
+++ b/drivers/gpu/drm/drm_atomic_helper.c | ||
@@ -438,6 +438,11 @@ mode_fixup(struct drm_atomic_state *stat | ||
@@ -443,6 +443,11 @@ mode_fixup(struct drm_atomic_state *stat | ||
new_crtc_state = | ||
drm_atomic_get_new_crtc_state(state, new_conn_state->crtc); | ||
|
||
|
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 |
---|---|---|
|
@@ -59,7 +59,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/drm_atomic_helper.c | ||
+++ b/drivers/gpu/drm/drm_atomic_helper.c | ||
@@ -1617,13 +1617,6 @@ drm_atomic_helper_wait_for_vblanks(struc | ||
@@ -1626,13 +1626,6 @@ drm_atomic_helper_wait_for_vblanks(struc | ||
int i, ret; | ||
unsigned int crtc_mask = 0; | ||
|
||
|
@@ -73,7 +73,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) { | ||
if (!new_crtc_state->active) | ||
continue; | ||
@@ -2273,12 +2266,6 @@ int drm_atomic_helper_setup_commit(struc | ||
@@ -2282,12 +2275,6 @@ int drm_atomic_helper_setup_commit(struc | ||
complete_all(&commit->flip_done); | ||
continue; | ||
} | ||
|
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 |
---|---|---|
|
@@ -1185,7 +1185,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
} | ||
--- a/drivers/usb/core/hub.c | ||
+++ b/drivers/usb/core/hub.c | ||
@@ -5636,7 +5636,7 @@ static void port_event(struct usb_hub *h | ||
@@ -5655,7 +5655,7 @@ static void port_event(struct usb_hub *h | ||
port_dev->over_current_count++; | ||
port_over_current_notify(port_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 |
---|---|---|
|
@@ -17615,12 +17615,12 @@ Signed-off-by: Ashish Vara <[email protected]> | |
* For devices with more than one control interface, we assume the | ||
--- a/sound/usb/quirks.c | ||
+++ b/sound/usb/quirks.c | ||
@@ -2171,6 +2171,8 @@ static const struct usb_audio_quirk_flag | ||
@@ -2175,6 +2175,8 @@ static const struct usb_audio_quirk_flag | ||
QUIRK_FLAG_FIXED_RATE), | ||
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */ | ||
QUIRK_FLAG_FIXED_RATE), | ||
+ DEVICE_FLG(0x09da, 0x2695, /* A4Tech FHD 1080p webcam */ | ||
+ QUIRK_FLAG_DISABLE_AUTOSUSPEND | QUIRK_FLAG_GET_SAMPLE_RATE), | ||
DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */ | ||
QUIRK_FLAG_GET_SAMPLE_RATE), | ||
|
||
/* Vendor matches */ | ||
VENDOR_FLG(0x045e, /* MS Lifecam */ |
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 |
---|---|---|
|
@@ -96,7 +96,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
} | ||
|
||
static int goodix_check_cfg_8(struct goodix_ts_data *ts, const u8 *cfg, int len) | ||
@@ -1406,6 +1459,11 @@ static void goodix_ts_remove(struct i2c_ | ||
@@ -1425,6 +1478,11 @@ static void goodix_ts_remove(struct i2c_ | ||
{ | ||
struct goodix_ts_data *ts = i2c_get_clientdata(client); | ||
|
||
|
@@ -108,7 +108,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
if (ts->load_cfg_from_disk) | ||
wait_for_completion(&ts->firmware_loading_complete); | ||
} | ||
@@ -1421,7 +1479,7 @@ static int __maybe_unused goodix_suspend | ||
@@ -1440,7 +1498,7 @@ static int __maybe_unused goodix_suspend | ||
|
||
/* We need gpio pins to suspend/resume */ | ||
if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE) { | ||
|
@@ -117,7 +117,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
return 0; | ||
} | ||
|
||
@@ -1465,7 +1523,7 @@ static int __maybe_unused goodix_resume( | ||
@@ -1484,7 +1542,7 @@ static int __maybe_unused goodix_resume( | ||
int error; | ||
|
||
if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE) { | ||
|
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 |
---|---|---|
|
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
--- a/drivers/net/dsa/qca/qca8k-8xxx.c | ||
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c | ||
@@ -743,9 +743,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus | ||
@@ -754,9 +754,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus | ||
|
||
qca8k_split_addr(reg, &r1, &r2, &page); | ||
|
||
|
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
/* Check if qca8k_read has failed for a different reason | ||
* before returnting -ETIMEDOUT | ||
@@ -787,7 +787,7 @@ qca8k_mdio_write(struct qca8k_priv *priv | ||
@@ -798,7 +798,7 @@ qca8k_mdio_write(struct qca8k_priv *priv | ||
|
||
exit: | ||
/* even if the busy_wait timeouts try to clear the MASTER_EN */ | ||
|
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
mutex_unlock(&bus->mdio_lock); | ||
|
||
@@ -817,18 +817,18 @@ qca8k_mdio_read(struct qca8k_priv *priv, | ||
@@ -828,18 +828,18 @@ qca8k_mdio_read(struct qca8k_priv *priv, | ||
if (ret) | ||
goto exit; | ||
|
||
|
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: David S. Miller <[email protected]> | |
}; | ||
|
||
static int | ||
@@ -2091,8 +2147,6 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, | ||
@@ -2102,8 +2158,6 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, | ||
|
||
static const struct qca8k_info_ops qca8xxx_ops = { | ||
.autocast_mib = qca8k_get_ethtool_stats_eth, | ||
|
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 |
---|---|---|
|
@@ -32,7 +32,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/dsa/qca/qca8k-8xxx.c | ||
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c | ||
@@ -1883,9 +1883,8 @@ qca8k_setup(struct dsa_switch *ds) | ||
@@ -1894,9 +1894,8 @@ qca8k_setup(struct dsa_switch *ds) | ||
if (ret) | ||
return ret; | ||
|
||
|
@@ -44,7 +44,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
if (ret) | ||
return ret; | ||
|
||
@@ -1991,6 +1990,8 @@ static const struct dsa_switch_ops qca8k | ||
@@ -2002,6 +2001,8 @@ static const struct dsa_switch_ops qca8k | ||
.port_change_mtu = qca8k_port_change_mtu, | ||
.port_max_mtu = qca8k_port_max_mtu, | ||
.port_stp_state_set = qca8k_port_stp_state_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 |
---|---|---|
|
@@ -26,7 +26,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/dsa/qca/qca8k-8xxx.c | ||
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c | ||
@@ -1863,18 +1863,16 @@ qca8k_setup(struct dsa_switch *ds) | ||
@@ -1874,18 +1874,16 @@ qca8k_setup(struct dsa_switch *ds) | ||
if (ret) | ||
return ret; | ||
|
||
|
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 |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/dsa/qca/qca8k-8xxx.c | ||
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c | ||
@@ -1773,6 +1773,46 @@ static int qca8k_connect_tag_protocol(st | ||
@@ -1784,6 +1784,46 @@ static int qca8k_connect_tag_protocol(st | ||
return 0; | ||
} | ||
|
||
|
@@ -64,7 +64,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
static int | ||
qca8k_setup(struct dsa_switch *ds) | ||
{ | ||
@@ -1908,42 +1948,8 @@ qca8k_setup(struct dsa_switch *ds) | ||
@@ -1919,42 +1959,8 @@ qca8k_setup(struct dsa_switch *ds) | ||
* missing settings to improve switch stability under load condition. | ||
* This problem is limited to qca8337 and other qca8k switch are not affected. | ||
*/ | ||
|
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 |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/dsa/qca/qca8k-8xxx.c | ||
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c | ||
@@ -1817,7 +1817,8 @@ static int | ||
@@ -1828,7 +1828,8 @@ static int | ||
qca8k_setup(struct dsa_switch *ds) | ||
{ | ||
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; | ||
|
@@ -27,7 +27,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
u32 mask; | ||
|
||
cpu_port = qca8k_find_cpu_port(ds); | ||
@@ -1868,27 +1869,27 @@ qca8k_setup(struct dsa_switch *ds) | ||
@@ -1879,27 +1880,27 @@ qca8k_setup(struct dsa_switch *ds) | ||
dev_warn(priv->dev, "mib init failed"); | ||
|
||
/* Initial setup of all ports */ | ||
|
@@ -70,7 +70,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
} | ||
|
||
/* Forward all unknown frames to CPU port for Linux processing | ||
@@ -1910,48 +1911,48 @@ qca8k_setup(struct dsa_switch *ds) | ||
@@ -1921,48 +1922,48 @@ qca8k_setup(struct dsa_switch *ds) | ||
return ret; | ||
|
||
/* Setup connection between CPU port & user ports | ||
|
106 changes: 0 additions & 106 deletions
106
...neric/backport-6.1/781-v6.6-02-net-dsa-qca8k-fix-potential-MDIO-bus-conflict-when-a.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 |
---|---|---|
|
@@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
help | ||
--- a/net/core/dev.c | ||
+++ b/net/core/dev.c | ||
@@ -3575,6 +3575,11 @@ static int xmit_one(struct sk_buff *skb, | ||
@@ -3579,6 +3579,11 @@ static int xmit_one(struct sk_buff *skb, | ||
if (dev_nit_active(dev)) | ||
dev_queue_xmit_nit(skb, 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 |
---|---|---|
|
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/core/dev.c | ||
+++ b/net/core/dev.c | ||
@@ -7593,6 +7593,48 @@ static void __netdev_adjacent_dev_unlink | ||
@@ -7597,6 +7597,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, | ||
@@ -7644,6 +7686,7 @@ static int __netdev_upper_dev_link(struc | ||
@@ -7648,6 +7690,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); | ||
@@ -7740,6 +7783,7 @@ static void __netdev_upper_dev_unlink(st | ||
@@ -7744,6 +7787,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); | ||
|
||
@@ -8792,6 +8836,7 @@ int dev_set_mac_address(struct net_devic | ||
@@ -8796,6 +8840,7 @@ int dev_set_mac_address(struct net_devic | ||
if (err) | ||
return err; | ||
dev->addr_assign_type = NET_ADDR_SET; | ||
|
Oops, something went wrong.