ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-22 10:01:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.66

Browse Source 
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.66

All patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2023-12-08 07:08:03 -05:00 committed by Nick Hainke
parent 1d364cc9ff
commit 9380d9efa4
12 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .65 LINUX_VERSION-6.1 = .66
LINUX_KERNEL_HASH-6.1.65 = 407229936802a44b1e484c2e9ac3bbe53a65d825cc468ccdbd76281b491ab20a LINUX_KERNEL_HASH-6.1.66 = 419e62cd6c4239e6950b688db9e8753eb1e99c216dc3204f7932398a3fef1a0c

2
target/linux/armsr/patches-6.1/701-v6.2-0001-net-dpaa2-eth-don-t-use-ENOTSUPP-error-code.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -3613,7 +3613,7 @@ static int dpaa2_eth_setup_dpni(struct f @@ -3611,7 +3611,7 @@ static int dpaa2_eth_setup_dpni(struct f
dev_err(dev, "DPNI version %u.%u not supported, need >= %u.%u\n", dev_err(dev, "DPNI version %u.%u not supported, need >= %u.%u\n",
priv->dpni_ver_major, priv->dpni_ver_minor, priv->dpni_ver_major, priv->dpni_ver_minor,
DPNI_VER_MAJOR, DPNI_VER_MINOR); DPNI_VER_MAJOR, DPNI_VER_MINOR);

4
target/linux/armsr/patches-6.1/701-v6.2-0003-net-dpaa2-mac-absorb-phylink_start-call-into-dpaa2_m.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -2082,10 +2082,8 @@ static int dpaa2_eth_open(struct net_dev @@ -2080,10 +2080,8 @@ static int dpaa2_eth_open(struct net_dev
goto enable_err; goto enable_err;
} }
@ -33,7 +33,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return 0; return 0;
@@ -2159,7 +2157,6 @@ static int dpaa2_eth_stop(struct net_dev @@ -2157,7 +2155,6 @@ static int dpaa2_eth_stop(struct net_dev
int retries = 10; int retries = 10;
if (dpaa2_eth_is_type_phy(priv)) { if (dpaa2_eth_is_type_phy(priv)) {

6
target/linux/armsr/patches-6.1/701-v6.2-0005-net-dpaa2-eth-assign-priv-mac-after-dpaa2_mac_connec.patch
View File

@ -49,7 +49,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -4443,9 +4443,8 @@ static int dpaa2_eth_connect_mac(struct @@ -4441,9 +4441,8 @@ static int dpaa2_eth_connect_mac(struct
err = dpaa2_mac_open(mac); err = dpaa2_mac_open(mac);
if (err) if (err)
goto err_free_mac; goto err_free_mac;
@ -60,7 +60,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
err = dpaa2_mac_connect(mac); err = dpaa2_mac_connect(mac);
if (err && err != -EPROBE_DEFER) if (err && err != -EPROBE_DEFER)
netdev_err(priv->net_dev, "Error connecting to the MAC endpoint: %pe", netdev_err(priv->net_dev, "Error connecting to the MAC endpoint: %pe",
@@ -4454,11 +4453,12 @@ static int dpaa2_eth_connect_mac(struct @@ -4452,11 +4451,12 @@ static int dpaa2_eth_connect_mac(struct
goto err_close_mac; goto err_close_mac;
} }
@ -74,7 +74,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
err_free_mac: err_free_mac:
kfree(mac); kfree(mac);
return err; return err;
@@ -4466,15 +4466,18 @@ err_free_mac: @@ -4464,15 +4464,18 @@ err_free_mac:
static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv) static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv)
{ {

4
target/linux/armsr/patches-6.1/701-v6.2-0009-net-dpaa2-eth-connect-to-MAC-before-requesting-the-e.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -4710,6 +4710,10 @@ static int dpaa2_eth_probe(struct fsl_mc @@ -4708,6 +4708,10 @@ static int dpaa2_eth_probe(struct fsl_mc
} }
#endif #endif
@ -44,7 +44,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
err = dpaa2_eth_setup_irqs(dpni_dev); err = dpaa2_eth_setup_irqs(dpni_dev);
if (err) { if (err) {
netdev_warn(net_dev, "Failed to set link interrupt, fall back to polling\n"); netdev_warn(net_dev, "Failed to set link interrupt, fall back to polling\n");
@@ -4722,10 +4726,6 @@ static int dpaa2_eth_probe(struct fsl_mc @@ -4720,10 +4724,6 @@ static int dpaa2_eth_probe(struct fsl_mc
priv->do_link_poll = true; priv->do_link_poll = true;
} }

24
target/linux/armsr/patches-6.1/701-v6.2-0010-net-dpaa2-eth-serialize-changes-to-priv-mac-with-a-m.patch
View File

@ -41,7 +41,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -2020,8 +2020,11 @@ static int dpaa2_eth_link_state_update(s @@ -2018,8 +2018,11 @@ static int dpaa2_eth_link_state_update(s
/* When we manage the MAC/PHY using phylink there is no need /* When we manage the MAC/PHY using phylink there is no need
* to manually update the netif_carrier. * to manually update the netif_carrier.
@ -54,7 +54,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
goto out; goto out;
/* Chech link state; speed / duplex changes are not treated yet */ /* Chech link state; speed / duplex changes are not treated yet */
@@ -2060,6 +2063,8 @@ static int dpaa2_eth_open(struct net_dev @@ -2058,6 +2061,8 @@ static int dpaa2_eth_open(struct net_dev
priv->dpbp_dev->obj_desc.id, priv->bpid); priv->dpbp_dev->obj_desc.id, priv->bpid);
} }
@ -63,7 +63,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
if (!dpaa2_eth_is_type_phy(priv)) { if (!dpaa2_eth_is_type_phy(priv)) {
/* We'll only start the txqs when the link is actually ready; /* We'll only start the txqs when the link is actually ready;
* make sure we don't race against the link up notification, * make sure we don't race against the link up notification,
@@ -2078,6 +2083,7 @@ static int dpaa2_eth_open(struct net_dev @@ -2076,6 +2081,7 @@ static int dpaa2_eth_open(struct net_dev
err = dpni_enable(priv->mc_io, 0, priv->mc_token); err = dpni_enable(priv->mc_io, 0, priv->mc_token);
if (err < 0) { if (err < 0) {
@ -71,7 +71,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
netdev_err(net_dev, "dpni_enable() failed\n"); netdev_err(net_dev, "dpni_enable() failed\n");
goto enable_err; goto enable_err;
} }
@@ -2085,6 +2091,8 @@ static int dpaa2_eth_open(struct net_dev @@ -2083,6 +2089,8 @@ static int dpaa2_eth_open(struct net_dev
if (dpaa2_eth_is_type_phy(priv)) if (dpaa2_eth_is_type_phy(priv))
dpaa2_mac_start(priv->mac); dpaa2_mac_start(priv->mac);
@ -80,7 +80,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return 0; return 0;
enable_err: enable_err:
@@ -2156,6 +2164,8 @@ static int dpaa2_eth_stop(struct net_dev @@ -2154,6 +2162,8 @@ static int dpaa2_eth_stop(struct net_dev
int dpni_enabled = 0; int dpni_enabled = 0;
int retries = 10; int retries = 10;
@ -89,7 +89,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
if (dpaa2_eth_is_type_phy(priv)) { if (dpaa2_eth_is_type_phy(priv)) {
dpaa2_mac_stop(priv->mac); dpaa2_mac_stop(priv->mac);
} else { } else {
@@ -2163,6 +2173,8 @@ static int dpaa2_eth_stop(struct net_dev @@ -2161,6 +2171,8 @@ static int dpaa2_eth_stop(struct net_dev
netif_carrier_off(net_dev); netif_carrier_off(net_dev);
} }
@ -98,7 +98,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
/* On dpni_disable(), the MC firmware will: /* On dpni_disable(), the MC firmware will:
* - stop MAC Rx and wait for all Rx frames to be enqueued to software * - stop MAC Rx and wait for all Rx frames to be enqueued to software
* - cut off WRIOP dequeues from egress FQs and wait until transmission * - cut off WRIOP dequeues from egress FQs and wait until transmission
@@ -2488,12 +2500,20 @@ static int dpaa2_eth_ts_ioctl(struct net @@ -2486,12 +2498,20 @@ static int dpaa2_eth_ts_ioctl(struct net
static int dpaa2_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int dpaa2_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct dpaa2_eth_priv *priv = netdev_priv(dev); struct dpaa2_eth_priv *priv = netdev_priv(dev);
@ -121,7 +121,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@@ -4453,7 +4473,9 @@ static int dpaa2_eth_connect_mac(struct @@ -4451,7 +4471,9 @@ static int dpaa2_eth_connect_mac(struct
goto err_close_mac; goto err_close_mac;
} }
@ -131,7 +131,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return 0; return 0;
@@ -4466,9 +4488,12 @@ err_free_mac: @@ -4464,9 +4486,12 @@ err_free_mac:
static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv) static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv)
{ {
@ -145,7 +145,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
if (!mac) if (!mac)
return; return;
@@ -4487,6 +4512,7 @@ static irqreturn_t dpni_irq0_handler_thr @@ -4485,6 +4510,7 @@ static irqreturn_t dpni_irq0_handler_thr
struct fsl_mc_device *dpni_dev = to_fsl_mc_device(dev); struct fsl_mc_device *dpni_dev = to_fsl_mc_device(dev);
struct net_device *net_dev = dev_get_drvdata(dev); struct net_device *net_dev = dev_get_drvdata(dev);
struct dpaa2_eth_priv *priv = netdev_priv(net_dev); struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
@ -153,7 +153,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
int err; int err;
err = dpni_get_irq_status(dpni_dev->mc_io, 0, dpni_dev->mc_handle, err = dpni_get_irq_status(dpni_dev->mc_io, 0, dpni_dev->mc_handle,
@@ -4504,7 +4530,12 @@ static irqreturn_t dpni_irq0_handler_thr @@ -4502,7 +4528,12 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_update_tx_fqids(priv); dpaa2_eth_update_tx_fqids(priv);
rtnl_lock(); rtnl_lock();
@ -167,7 +167,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
dpaa2_eth_disconnect_mac(priv); dpaa2_eth_disconnect_mac(priv);
else else
dpaa2_eth_connect_mac(priv); dpaa2_eth_connect_mac(priv);
@@ -4605,6 +4636,8 @@ static int dpaa2_eth_probe(struct fsl_mc @@ -4603,6 +4634,8 @@ static int dpaa2_eth_probe(struct fsl_mc
priv = netdev_priv(net_dev); priv = netdev_priv(net_dev);
priv->net_dev = net_dev; priv->net_dev = net_dev;

4
target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -4529,7 +4529,6 @@ static irqreturn_t dpni_irq0_handler_thr @@ -4527,7 +4527,6 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_set_mac_addr(netdev_priv(net_dev)); dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
dpaa2_eth_update_tx_fqids(priv); dpaa2_eth_update_tx_fqids(priv);
@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
/* We can avoid locking because the "endpoint changed" IRQ /* We can avoid locking because the "endpoint changed" IRQ
* handler is the only one who changes priv->mac at runtime, * handler is the only one who changes priv->mac at runtime,
* so we are not racing with anyone. * so we are not racing with anyone.
@@ -4539,7 +4538,6 @@ static irqreturn_t dpni_irq0_handler_thr @@ -4537,7 +4536,6 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_disconnect_mac(priv); dpaa2_eth_disconnect_mac(priv);
else else
dpaa2_eth_connect_mac(priv); dpaa2_eth_connect_mac(priv);

8
target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
View File

@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
static inline int mmc_blk_part_switch(struct mmc_card *card, static inline int mmc_blk_part_switch(struct mmc_card *card,
unsigned int part_type); unsigned int part_type);
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
@@ -2996,6 +3003,8 @@ static int mmc_blk_probe(struct mmc_card @@ -2998,6 +3005,8 @@ static int mmc_blk_probe(struct mmc_card
{ {
struct mmc_blk_data *md; struct mmc_blk_data *md;
int ret = 0; int ret = 0;
@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
/* /*
* Check that the card supports the command class(es) we need. * Check that the card supports the command class(es) we need.
@@ -3003,7 +3012,16 @@ static int mmc_blk_probe(struct mmc_card @@ -3005,7 +3014,16 @@ static int mmc_blk_probe(struct mmc_card
if (!(card->csd.cmdclass & CCC_BLOCK_READ)) if (!(card->csd.cmdclass & CCC_BLOCK_READ))
return -ENODEV; return -ENODEV;
@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
card->complete_wq = alloc_workqueue("mmc_complete", card->complete_wq = alloc_workqueue("mmc_complete",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
@@ -3018,6 +3036,17 @@ static int mmc_blk_probe(struct mmc_card @@ -3020,6 +3038,17 @@ static int mmc_blk_probe(struct mmc_card
goto out_free; goto out_free;
} }
@ -313,7 +313,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
goto out; goto out;
--- a/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c
@@ -1814,7 +1814,8 @@ EXPORT_SYMBOL(mmc_erase); @@ -1819,7 +1819,8 @@ EXPORT_SYMBOL(mmc_erase);
int mmc_can_erase(struct mmc_card *card) int mmc_can_erase(struct mmc_card *card)
{ {

2
target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/sc16is7xx.c --- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c
@@ -770,6 +770,8 @@ static bool sc16is7xx_port_irq(struct sc @@ -771,6 +771,8 @@ static bool sc16is7xx_port_irq(struct sc
rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG); rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
if (rxlen) if (rxlen)
sc16is7xx_handle_rx(port, rxlen, iir); sc16is7xx_handle_rx(port, rxlen, iir);

4
target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
--- a/drivers/spi/spi.c --- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c +++ b/drivers/spi/spi.c
@@ -3614,6 +3614,7 @@ static int __spi_validate_bits_per_word( @@ -3633,6 +3633,7 @@ static int __spi_validate_bits_per_word(
*/ */
int spi_setup(struct spi_device *spi) int spi_setup(struct spi_device *spi)
{ {
@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
unsigned bad_bits, ugly_bits; unsigned bad_bits, ugly_bits;
int status = 0; int status = 0;
@@ -3634,6 +3635,14 @@ int spi_setup(struct spi_device *spi) @@ -3653,6 +3654,14 @@ int spi_setup(struct spi_device *spi)
(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL | (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL))) SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
return -EINVAL; return -EINVAL;

2
target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/mmc/core/block.c --- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c
@@ -1926,7 +1926,7 @@ static void mmc_blk_mq_rw_recovery(struc @@ -1928,7 +1928,7 @@ static void mmc_blk_mq_rw_recovery(struc
return; return;
} }

4
target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
View File

@ -212,7 +212,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
static inline struct spi_driver *to_spi_driver(struct device_driver *drv) static inline struct spi_driver *to_spi_driver(struct device_driver *drv)
{ {
return drv ? container_of(drv, struct spi_driver, driver) : NULL; return drv ? container_of(drv, struct spi_driver, driver) : NULL;
@@ -682,6 +716,11 @@ struct spi_controller { @@ -683,6 +717,11 @@ struct spi_controller {
void *dummy_rx; void *dummy_rx;
void *dummy_tx; void *dummy_tx;
@ -224,7 +224,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
int (*fw_translate_cs)(struct spi_controller *ctlr, unsigned cs); int (*fw_translate_cs)(struct spi_controller *ctlr, unsigned cs);
/* /*
@@ -1489,6 +1528,9 @@ spi_register_board_info(struct spi_board @@ -1490,6 +1529,9 @@ spi_register_board_info(struct spi_board
{ return 0; } { return 0; }
#endif #endif