diff --git a/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch b/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch index 3f1f76bc48..8a80afd835 100644 --- a/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch +++ b/patch/kernel/archive/uefi-arm64-6.7/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 06c6871f8788..b8b8d6ee5d9f 100644 +index 85dcda51df05..7d27700e46e7 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 06c6871f8788..b8b8d6ee5d9f 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 80e598bd4255..e9ab9e2741de 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 598eff926815..526623866d16 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c @@ -9,6 +9,7 @@ @@ -83,7 +83,7 @@ index 20fc455b3337..0fb965b4cd4c 100644 } else { plat_dat = dev_get_platdata(&pdev->dev); if (!plat_dat) { -@@ -75,6 +82,17 @@ static const struct of_device_id dwmac_generic_match[] = { +@@ -65,12 +72,24 @@ static const struct of_device_id dwmac_generic_match[] = { }; MODULE_DEVICE_TABLE(of, dwmac_generic_match); @@ -100,8 +100,7 @@ index 20fc455b3337..0fb965b4cd4c 100644 + static struct platform_driver dwmac_generic_driver = { .probe = dwmac_generic_probe, - .remove_new = stmmac_pltfr_remove, -@@ -82,6 +100,7 @@ static struct platform_driver dwmac_generic_driver = { + .driver = { .name = STMMAC_RESOURCE_NAME, .pm = &stmmac_pltfr_pm_ops, .of_match_table = dwmac_generic_match, @@ -338,7 +337,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 5801f4d50f95..429fd08f11c5 100644 +index 37e64283f910..aa82d76a6685 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 +349,7 @@ index 5801f4d50f95..429fd08f11c5 100644 #include #include 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 1ffde555da47..28221c3dd587 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -9,6 +9,9 @@ @@ -363,9 +362,9 @@ index 2f0678f15fb7..24e9b1a818c5 100644 #include #include #include -@@ -700,6 +703,248 @@ EXPORT_SYMBOL_GPL(stmmac_probe_config_dt); +@@ -690,6 +693,248 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) + #endif /* CONFIG_OF */ EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt); - EXPORT_SYMBOL_GPL(stmmac_remove_config_dt); +#ifdef CONFIG_ACPI +/* @@ -612,7 +611,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, +@@ -697,8 +942,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 +627,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, +@@ -716,6 +967,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,11 +636,11 @@ 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 bb6fc7e59aed..7c99e1d40e5d 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 * - stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac); +@@ -13,6 +13,8 @@ + struct plat_stmmacenet_data * devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac); +struct plat_stmmacenet_data * diff --git a/patch/kernel/archive/uefi-arm64-6.7/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch b/patch/kernel/archive/uefi-arm64-6.7/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch index cee44a00f6..73bf234807 100644 --- a/patch/kernel/archive/uefi-arm64-6.7/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch +++ b/patch/kernel/archive/uefi-arm64-6.7/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch @@ -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 28221c3dd587..c91049ecfe97 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) +@@ -838,7 +838,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) +@@ -868,8 +868,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");