Merge branch 'coolsnowwolf:master' into master

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .118
-LINUX_KERNEL_HASH-6.1.118 = 010784bd7161c32c4cd68a423d4dcb14e4587677d238b2825a31fe012869224c
+LINUX_VERSION-6.1 = .119
+LINUX_KERNEL_HASH-6.1.119 = aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278

target/linux/bcm27xx/patches-6.6/950-0092-MMC-added-alternative-MMC-driver.patch

@@ -285,7 +285,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static inline int mmc_blk_part_switch(struct mmc_card *card,
  				      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -3066,6 +3073,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3016,6 +3023,8 @@ static int mmc_blk_probe(struct mmc_card
  {
  	struct mmc_blk_data *md;
  	int ret = 0;
@@ -294,7 +294,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -3073,7 +3082,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3023,7 +3032,16 @@ static int mmc_blk_probe(struct mmc_card
  	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
  		return -ENODEV;
 
@@ -312,7 +312,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -3088,6 +3106,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3038,6 +3056,17 @@ static int mmc_blk_probe(struct mmc_card
  		goto out_free;
  	}
 

target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch

@@ -361,7 +361,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
  static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7956,6 +7956,7 @@ static void __init free_area_init_node(i
+@@ -7988,6 +7988,7 @@ static void __init free_area_init_node(i
  	pgdat_set_deferred_range(pgdat);
 
  	free_area_init_core(pgdat);

target/linux/generic/backport-6.1/715-07-v6.2-net-remove-explicit-phylink_generic_validate-referen.patch

@@ -202,7 +202,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	.mac_link_up = am65_cpsw_nuss_mac_link_up,
 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
 +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-@@ -1741,7 +1741,6 @@ static void axienet_mac_link_up(struct p
+@@ -1750,7 +1750,6 @@ static void axienet_mac_link_up(struct p
  }
 
  static const struct phylink_mac_ops axienet_phylink_ops = {

target/linux/generic/backport-6.1/715-26-v6.5-net-phylink-pass-neg_mode-into-phylink_mii_c22_pcs_c.patch

@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	supported = mac_dev->phylink_config.supported_interfaces;
 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
 +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-@@ -1636,7 +1636,7 @@ static void axienet_pcs_an_restart(struc
+@@ -1645,7 +1645,7 @@ static void axienet_pcs_an_restart(struc
  	phylink_mii_c22_pcs_an_restart(pcs_phy);
  }
 
@@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  			      phy_interface_t interface,
  			      const unsigned long *advertising,
  			      bool permit_pause_to_mac)
-@@ -1658,7 +1658,8 @@ static int axienet_pcs_config(struct phy
+@@ -1667,7 +1667,8 @@ static int axienet_pcs_config(struct phy
  		}
  	}
 
@@ -72,7 +72,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	if (ret < 0)
  		netdev_warn(ndev, "Failed to configure PCS: %d\n", ret);
 
-@@ -2138,6 +2139,7 @@ static int axienet_probe(struct platform
+@@ -2147,6 +2148,7 @@ static int axienet_probe(struct platform
  		}
  		of_node_put(np);
  		lp->pcs.ops = &axienet_pcs_ops;

target/linux/generic/backport-6.1/770-net-introduce-napi_is_scheduled-helper.patch

@@ -85,7 +85,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
  /**
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -6533,7 +6533,7 @@ static int __napi_poll(struct napi_struc
+@@ -6541,7 +6541,7 @@ static int __napi_poll(struct napi_struc
  	 * accidentally calling ->poll() when NAPI is not scheduled.
  	 */
  	work = 0;

target/linux/generic/backport-6.1/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch

@@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
 
  	__netif_tx_unlock_bh(netdev_get_tx_queue(priv->dev, queue));
 
-@@ -5490,12 +5494,13 @@ static int stmmac_napi_poll_tx(struct na
+@@ -5503,12 +5507,13 @@ static int stmmac_napi_poll_tx(struct na
  	struct stmmac_channel *ch =
  		container_of(napi, struct stmmac_channel, tx_napi);
  	struct stmmac_priv *priv = ch->priv_data;
@@ -57,7 +57,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
  	work_done = min(work_done, budget);
 
  	if (work_done < budget && napi_complete_done(napi, work_done)) {
-@@ -5506,6 +5511,10 @@ static int stmmac_napi_poll_tx(struct na
+@@ -5519,6 +5524,10 @@ static int stmmac_napi_poll_tx(struct na
  		spin_unlock_irqrestore(&ch->lock, flags);
  	}
 
@@ -68,7 +68,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
  	return work_done;
  }
 
-@@ -5514,12 +5523,13 @@ static int stmmac_napi_poll_rxtx(struct
+@@ -5527,12 +5536,13 @@ static int stmmac_napi_poll_rxtx(struct
  	struct stmmac_channel *ch =
  		container_of(napi, struct stmmac_channel, rxtx_napi);
  	struct stmmac_priv *priv = ch->priv_data;
@@ -83,7 +83,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
  	tx_done = min(tx_done, budget);
 
  	rx_done = stmmac_rx_zc(priv, budget, chan);
-@@ -5544,6 +5554,10 @@ static int stmmac_napi_poll_rxtx(struct
+@@ -5557,6 +5567,10 @@ static int stmmac_napi_poll_rxtx(struct
  		spin_unlock_irqrestore(&ch->lock, flags);
  	}
 

target/linux/generic/backport-6.1/850-v6.2-bus-mhi-host-pci_generic-add-support-for-sc8280xp-cr.patch

@@ -21,7 +21,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
 --- a/drivers/bus/mhi/host/pci_generic.c
 +++ b/drivers/bus/mhi/host/pci_generic.c
-@@ -542,6 +542,8 @@ static const struct mhi_pci_dev_info mhi
+@@ -551,6 +551,8 @@ static const struct mhi_pci_dev_info mhi
  static const struct pci_device_id mhi_pci_id_table[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0304),
  		.driver_data = (kernel_ulong_t) &mhi_qcom_sdx24_info },

target/linux/generic/backport-6.1/851-v6.2-bus-mhi-host-pci_generic-Add-HP-variant-of-T99W175.patch

@@ -22,7 +22,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
 --- a/drivers/bus/mhi/host/pci_generic.c
 +++ b/drivers/bus/mhi/host/pci_generic.c
-@@ -599,6 +599,9 @@ static const struct pci_device_id mhi_pc
+@@ -608,6 +608,9 @@ static const struct pci_device_id mhi_pc
  	/* MV32-WB (Cinterion) */
  	{ PCI_DEVICE(0x1269, 0x00bb),
  		.driver_data = (kernel_ulong_t) &mhi_mv32_info },

target/linux/generic/backport-6.1/852-v6.2-bus-mhi-host-pci_generic-Add-definition-for-some-VID.patch

@@ -28,8 +28,8 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
  /**
   * struct mhi_pci_dev_info - MHI PCI device specific information
   * @config: MHI controller configuration
-@@ -560,11 +564,11 @@ static const struct pci_device_id mhi_pc
- 		.driver_data = (kernel_ulong_t) &mhi_telit_fn990_info },
+@@ -569,11 +573,11 @@ static const struct pci_device_id mhi_pc
+ 		.driver_data = (kernel_ulong_t) &mhi_telit_fe990a_info },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308),
  		.driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info },
 -	{ PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */
@@ -43,7 +43,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
  		.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
  	/* T99W175 (sdx55), Both for eSIM and Non-eSIM */
  	{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab),
-@@ -588,16 +592,16 @@ static const struct pci_device_id mhi_pc
+@@ -597,16 +601,16 @@ static const struct pci_device_id mhi_pc
  	{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
  		.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
  	/* MV31-W (Cinterion) */

target/linux/generic/backport-6.1/853-v6.2-bus-mhi-host-pci_generic-Drop-redundant-pci_enable_p.patch

@@ -36,7 +36,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
  #include <linux/delay.h>
  #include <linux/device.h>
  #include <linux/mhi.h>
-@@ -904,11 +903,9 @@ static int mhi_pci_probe(struct pci_dev
+@@ -913,11 +912,9 @@ static int mhi_pci_probe(struct pci_dev
  	mhi_pdev->pci_state = pci_store_saved_state(pdev);
  	pci_load_saved_state(pdev, NULL);
 
@@ -49,7 +49,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
  	/* MHI bus does not power up the controller by default */
  	err = mhi_prepare_for_power_up(mhi_cntrl);
-@@ -942,8 +939,6 @@ err_unprepare:
+@@ -951,8 +948,6 @@ err_unprepare:
  	mhi_unprepare_after_power_down(mhi_cntrl);
  err_unregister:
  	mhi_unregister_controller(mhi_cntrl);
@@ -58,7 +58,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
  	return err;
  }
-@@ -966,7 +961,6 @@ static void mhi_pci_remove(struct pci_de
+@@ -975,7 +970,6 @@ static void mhi_pci_remove(struct pci_de
  		pm_runtime_get_noresume(&pdev->dev);
 
  	mhi_unregister_controller(mhi_cntrl);

target/linux/generic/backport-6.1/854-v6.4-bus-mhi-pci_generic-Add-Foxconn-T99W510.patch

@@ -31,7 +31,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
  static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
  	.name = "foxconn-sdx55",
  	.fw = "qcom/sdx55m/sbl1.mbn",
-@@ -590,6 +599,15 @@ static const struct pci_device_id mhi_pc
+@@ -599,6 +608,15 @@ static const struct pci_device_id mhi_pc
  	/* T99W373 (sdx62) */
  	{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
  		.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },

target/linux/generic/backport-6.1/856-v6.6-bus-mhi-host-pci_generic-Add-support-for-Quectel-EM1.patch

@@ -23,7 +23,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
 --- a/drivers/bus/mhi/host/pci_generic.c
 +++ b/drivers/bus/mhi/host/pci_generic.c
-@@ -594,6 +594,8 @@ static const struct pci_device_id mhi_pc
+@@ -603,6 +603,8 @@ static const struct pci_device_id mhi_pc
  		.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */
  		.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },

target/linux/generic/backport-6.1/857-v6.6-bus-mhi-host-pci_generic-Add-support-for-Quectel-RM5.patch

@@ -37,7 +37,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
  static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = {
  	MHI_CHANNEL_CONFIG_UL(0, "LOOPBACK", 32, 0),
  	MHI_CHANNEL_CONFIG_DL(1, "LOOPBACK", 32, 0),
-@@ -594,6 +604,9 @@ static const struct pci_device_id mhi_pc
+@@ -603,6 +613,9 @@ static const struct pci_device_id mhi_pc
  		.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */
  		.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },

target/linux/generic/backport-6.1/858-v6.6-bus-mhi-host-pci_generic-Add-support-for-Dell-DW5932.patch

@@ -19,7 +19,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
 --- a/drivers/bus/mhi/host/pci_generic.c
 +++ b/drivers/bus/mhi/host/pci_generic.c
-@@ -641,6 +641,12 @@ static const struct pci_device_id mhi_pc
+@@ -650,6 +650,12 @@ static const struct pci_device_id mhi_pc
  	/* T99W510 (sdx24), variant 3 */
  	{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f2),
  		.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx24_info },

target/linux/generic/backport-6.1/859-v6.6-bus-mhi-host-pci_generic-Add-support-for-Quectel-RM5.patch

@@ -24,7 +24,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
 
 --- a/drivers/bus/mhi/host/pci_generic.c
 +++ b/drivers/bus/mhi/host/pci_generic.c
-@@ -607,6 +607,9 @@ static const struct pci_device_id mhi_pc
+@@ -616,6 +616,9 @@ static const struct pci_device_id mhi_pc
  	/* RM520N-GL (sdx6x), eSIM */
  	{ PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1004),
  		.driver_data = (kernel_ulong_t) &mhi_quectel_rm5xx_info },

target/linux/generic/backport-6.1/862-v6.8-bus-mhi-host-pci_generic-Add-SDX75-based-modem-suppo.patch

@@ -51,8 +51,8 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
  static const struct mhi_pci_dev_info mhi_qcom_sdx65_info = {
  	.name = "qcom-sdx65m",
  	.fw = "qcom/sdx65m/xbl.elf",
-@@ -600,6 +620,8 @@ static const struct pci_device_id mhi_pc
- 		.driver_data = (kernel_ulong_t) &mhi_telit_fn990_info },
+@@ -609,6 +629,8 @@ static const struct pci_device_id mhi_pc
+ 		.driver_data = (kernel_ulong_t) &mhi_telit_fe990a_info },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308),
  		.driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info },
 +	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0309),