From ab787f6f280abe95e4b00e78d6c06f1c9bbd1e55 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 29 Dec 2025 11:56:33 +0100 Subject: [PATCH] meson64-6.18: rewrite against 6.18.2 --- ...c-Remove-redundant-MPS-configuration.patch | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/patch/kernel/archive/meson64-6.18/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch b/patch/kernel/archive/meson64-6.18/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch index 7a62b9c8ac..ada246c340 100644 --- a/patch/kernel/archive/meson64-6.18/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch +++ b/patch/kernel/archive/meson64-6.18/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Zhang <18255117159@163.com> -Subject: [PATCH v7 2/2] PCI: dwc: Remove redundant MPS configuration Date: Fri, 28 Nov 2025 01:09:08 +0800 +Subject: PCI: dwc: Remove redundant MPS configuration The Meson PCIe controller driver manually configures maximum payload size (MPS) through meson_set_max_payload, duplicating functionality now @@ -11,14 +11,14 @@ improving long-term maintainability. Signed-off-by: Hans Zhang <18255117159@163.com> --- - drivers/pci/controller/dwc/pci-meson.c | 17 ----------------- + drivers/pci/controller/dwc/pci-meson.c | 17 ---------- 1 file changed, 17 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c -index 787469d1b396..3d12e1a9bb0c 100644 +index 111111111111..222222222222 100644 --- a/drivers/pci/controller/dwc/pci-meson.c +++ b/drivers/pci/controller/dwc/pci-meson.c -@@ -261,22 +261,6 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size) +@@ -257,22 +257,6 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size) return fls(size) - 8; } @@ -41,7 +41,7 @@ index 787469d1b396..3d12e1a9bb0c 100644 static void meson_set_max_rd_req_size(struct meson_pcie *mp, int size) { struct dw_pcie *pci = &mp->pci; -@@ -381,7 +365,6 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp) +@@ -347,7 +331,6 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp) pp->bridge->ops = &meson_pci_ops; @@ -50,18 +50,12 @@ index 787469d1b396..3d12e1a9bb0c 100644 return 0; -- -2.34.1 - - -_______________________________________________ -linux-amlogic mailing list -linux-amlogic@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-amlogic +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Zhang <18255117159@163.com> -Subject: [PATCH v7 1/2] PCI: Configure Root Port MPS during host probing Date: Fri, 28 Nov 2025 01:09:07 +0800 +Subject: PCI: Configure Root Port MPS during host probing Current PCIe initialization logic may leave Root Ports operating with non-optimal Maximum Payload Size (MPS) settings. The existing code in @@ -92,11 +86,11 @@ Signed-off-by: Hans Zhang <18255117159@163.com> Tested-by: Mahesh Vaidya Tested-by: Shawn Lin --- - drivers/pci/probe.c | 12 ++++++++++++ + drivers/pci/probe.c | 12 ++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c -index 9cd032dff31e..3970d964d868 100644 +index 111111111111..222222222222 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2203,6 +2203,18 @@ static void pci_configure_mps(struct pci_dev *dev) @@ -119,5 +113,5 @@ index 9cd032dff31e..3970d964d868 100644 return; -- -2.34.1 +Armbian