uefi-arm64 6.6 (current): rewrite kernel patches, no changes

- in preparation for edge 6.12-rcX bump, and recovering lost patches
armbian · Oct 13, 2024 · 46cddfa · 46cddfa
1 parent 9063798
commit 46cddfa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/...arm64-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch b/...arm64-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch
@@ -1,8 +1,8 @@
-From 7648741002eeb851ceb394864253445b77ea3d25 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Catalin Marinas <catalin.marinas@arm.com>
 Date: Wed, 10 Apr 2024 08:25:37 -0400
-Subject: [PATCH] arm64: swiotlb: Reduce the default size if no ZONE_DMA
- bouncing needed
+Subject: arm64: swiotlb: Reduce the default size if no ZONE_DMA bouncing
+ needed
 
 With CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC enabled, the arm64 kernel still
 allocates the default SWIOTLB buffer (64MB) even if ZONE_DMA is disabled
@@ -18,11 +18,11 @@ Cc: Ross Burton <ross.burton@arm.com>
 Cc: Will Deacon <will@kernel.org>
 Reviewed-by: Robin Murphy <robin.murphy@arm.com>
 ---
- arch/arm64/mm/init.c | 11 ++++++++++-
+ arch/arm64/mm/init.c | 11 +++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 8a0f8604348b..8deec68028ac 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -16,6 +16,7 @@
@@ -52,5 +52,5 @@ index 8a0f8604348b..8deec68028ac 100644
  swiotlb_init(swiotlb, SWIOTLB_VERBOSE);
 
 -- 
-2.39.2
+Armbian
 
diff --git a/patch/kernel/archive/uefi-arm64-6.6/board-hikey960-usb.patch b/patch/kernel/archive/uefi-arm64-6.6/board-hikey960-usb.patch
@@ -13,7 +13,7 @@ Subject: [ARCHEOLOGY] Add board: HiKey960
  1 file changed, 33 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
-index 3f13a960f34e..f05edfe378e6 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
 +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
 @@ -197,6 +197,37 @@ optee {

diff --git a/patch/kernel/archive/uefi-arm64-6.6/driver-phytium-stmmac-acpi.patch b/patch/kernel/archive/uefi-arm64-6.6/driver-phytium-stmmac-acpi.patch
@@ -26,7 +26,7 @@ Subject: Phytium onboard ethernet drivers for 6.x
  8 files changed, 531 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
-index 25f2d42de406..134b19ad7999 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
 +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
 @@ -121,6 +121,16 @@ config DWMAC_MESON
@@ -47,7 +47,7 @@ index 25f2d42de406..134b19ad7999 100644
  tristate "Qualcomm ETHQOS support"
  default ARCH_QCOM
 diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
-index 5b57aee19267..91b1cf9bc81c 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile
 +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
 @@ -19,6 +19,7 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
@@ -59,7 +59,7 @@ index 5b57aee19267..91b1cf9bc81c 100644
  obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o
  obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
-index 20fc455b3337..0fb965b4cd4c 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
 @@ -9,6 +9,7 @@
@@ -111,7 +111,7 @@ index 20fc455b3337..0fb965b4cd4c 100644
  module_platform_driver(dwmac_generic_driver);
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c
 new file mode 100644
-index 000000000000..e6ad44b80a10
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c
 @@ -0,0 +1,222 @@
@@ -338,7 +338,7 @@ index 000000000000..e6ad44b80a10
 +MODULE_DESCRIPTION("Glue driver for Phytium DWMAC");
 +MODULE_LICENSE("GPL v2");
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 69b9c71f0ede..f69c363e58e4 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 @@ -14,6 +14,7 @@
@@ -350,7 +350,7 @@ index 69b9c71f0ede..f69c363e58e4 100644
  #include <linux/kernel.h>
  #include <linux/interrupt.h>
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-index 2f0678f15fb7..24e9b1a818c5 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 @@ -9,6 +9,9 @@
@@ -363,7 +363,7 @@ index 2f0678f15fb7..24e9b1a818c5 100644
  #include <linux/platform_device.h>
  #include <linux/pm_runtime.h>
  #include <linux/module.h>
-@@ -700,6 +703,248 @@ EXPORT_SYMBOL_GPL(stmmac_probe_config_dt);
+@@ -703,6 +706,248 @@ EXPORT_SYMBOL_GPL(stmmac_probe_config_dt);
  EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt);
  EXPORT_SYMBOL_GPL(stmmac_remove_config_dt);
 
@@ -612,7 +612,7 @@ index 2f0678f15fb7..24e9b1a818c5 100644
  int stmmac_get_platform_resources(struct platform_device *pdev,
  struct stmmac_resources *stmmac_res)
  {
-@@ -707,8 +952,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
+@@ -710,8 +955,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
 
  /* Get IRQ information early to have an ability to ask for deferred
  * probe if needed before we went too far with resource allocation.
@@ -628,7 +628,7 @@ index 2f0678f15fb7..24e9b1a818c5 100644
  if (stmmac_res->irq < 0)
  return stmmac_res->irq;
 
-@@ -726,6 +977,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
+@@ -729,6 +980,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
  return -EPROBE_DEFER;
  dev_info(&pdev->dev, "IRQ eth_wake_irq not found\n");
  stmmac_res->wol_irq = stmmac_res->irq;
@@ -637,7 +637,7 @@ index 2f0678f15fb7..24e9b1a818c5 100644
 
  stmmac_res->lpi_irq =
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
-index c5565b2a70ac..783d23487612 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
 @@ -15,6 +15,8 @@ struct plat_stmmacenet_data *
@@ -650,7 +650,7 @@ index c5565b2a70ac..783d23487612 100644
  struct plat_stmmacenet_data *plat);
 
 diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
-index 37fb033e1c29..bf6ba5e81a95 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
 @@ -111,6 +111,11 @@

diff --git a/patch/kernel/archive/uefi-arm64-6.6/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch b/patch/kernel/archive/uefi-arm64-6.6/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch
@@ -9,7 +9,7 @@ Subject: fix stmmac acpi glue for Feiteng on 6.6.y
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c
-index e6ad44b80a10..733f5ea20d0c 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c
 @@ -55,7 +55,7 @@ dwmac_phytium_parse_config_acpi(struct platform_device *pdev, const char *mac)
@@ -34,10 +34,10 @@ index e6ad44b80a10..733f5ea20d0c 100644
  /* Set the maxmtu to a default of JUMBO_LEN in case the
  * parameter is not present.
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-index 24e9b1a818c5..f93078ebcdad 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-@@ -848,7 +848,7 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
+@@ -851,7 +851,7 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
 
  np = dev_fwnode(&(pdev->dev));
 
@@ -46,7 +46,7 @@ index 24e9b1a818c5..f93078ebcdad 100644
 
  /* Get max speed of operation from device tree */
  if (fwnode_property_read_u32(np, "max-speed", &plat->max_speed))
-@@ -878,8 +878,9 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
+@@ -881,8 +881,9 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
 
  plat->force_sf_dma_mode =
  fwnode_property_read_bool(np, "snps,force_sf_dma_mode");