PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797

PATCH Applied Pali Rohár 2 participants 3 messages Feb 14, 2022 – Feb 15, 2022

Subsystems (3)

PCI PCI native host bridge and endpoint drivers PCI driver for mvebu (Marvell Armada 370 and Armada XP SoC support)

lore

Share & tools

lore

Pali Rohár

author maintainer

2022-02-14 11:28 UTC #0 lore raw

PATCH 1/1 PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797

Commit 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge") was incorrectly applied from mailing list patch [1] to the linux git repository [2] probably due to resolving merge conflicts incorrectly. Fix it now.

[1] - https://lore.kernel.org/r/[email protected]
[2] - https://git.kernel.org/linus/91a8d79fc797

Fixes 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge")

BugLink https://bugzilla.kernel.org/show_bug.cgi?id=215540

Reported-by Jan Palus <[email protected]>

Signed-off-by Pali Rohár <[email protected]>

---
 drivers/pci/controller/pci-mvebu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/pci/controller/pci-mvebu.c +2 -1

index 71258ea3d35f..f8e82c5e2d87 100644
@@ -1329,7 +1329,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
 		 * indirectly via kernel emulated PCI bridge driver.
 		 */
 		mvebu_pcie_setup_hw(port);
-		mvebu_pcie_set_local_dev_nr(port, 0);
+		mvebu_pcie_set_local_dev_nr(port, 1);
+		mvebu_pcie_set_local_bus_nr(port, 0);
 	}
 
 	pcie->nports = i;

Signature · 1 line

2.20.1

Bjorn Helgaas

Applied

2022-02-14 15:46 UTC #1 lore raw

Quoted 5 lines · Pali Rohár

Commit 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge") was incorrectly applied from mailing list patch [1] to the linux git repository [2] probably due to resolving merge conflicts incorrectly. Fix it now.

Quoted 7 lines

[1] - https://lore.kernel.org/r/[email protected]
[2] - https://git.kernel.org/linus/91a8d79fc797
Fixes 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge")
BugLink https://bugzilla.kernel.org/show_bug.cgi?id=215540
Reported-by Jan Palus <[email protected]>
Signed-off-by Pali Rohár <[email protected]>

Applied to for-linus for v5.17 with the following commit log, thanks!

commit c49ae619905e ("PCI: mvebu: Fix device enumeration regression")

Author: Pali Rohár <[email protected]>
Date:   Mon Feb 14 12:02:28 2022 +0100

PCI: mvebu: Fix device enumeration regression

Jan reported that on Turris Omnia (Armada 385), no PCIe devices were detected after upgrading from v5.16.1 to v5.16.3 and identified the cause as the backport of 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge"), which appeared in v5.17-rc1.

91a8d79fc797 was incorrectly applied from mailing list patch [1] to the linux git repository [2] probably due to resolving merge conflicts incorrectly. Fix it now.

[1] https://lore.kernel.org/r/[email protected]
[2] https://git.kernel.org/linus/91a8d79fc797

[bhelgaas: commit log]

BugLink https://bugzilla.kernel.org/show_bug.cgi?id=215540

Fixes 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge")

Link https://lore.kernel.org/r/[email protected] open here

Link https://lore.kernel.org/r/20220127234917.GA150851@bhelgaas open here

Reported-by Jan Palus <[email protected]>

Signed-off-by Pali Rohár <[email protected]>

Signed-off-by Bjorn Helgaas <[email protected]>

Quoted 21 lines

---
 drivers/pci/controller/pci-mvebu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/pci/controller/pci-mvebu.c +2 -1

index 71258ea3d35f..f8e82c5e2d87 100644
@@ -1329,7 +1329,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
 		 * indirectly via kernel emulated PCI bridge driver.
 		 */
 		mvebu_pcie_setup_hw(port);
-		mvebu_pcie_set_local_dev_nr(port, 0);
+		mvebu_pcie_set_local_dev_nr(port, 1);
+		mvebu_pcie_set_local_bus_nr(port, 0);
 	}
 
 	pcie->nports = i;

Signature · 1 line

2.20.1

Pali Rohár

author maintainer

2022-02-15 09:48 UTC #2 lore raw

Quoted 34 lines · On Monday 14 February 2022 09:46:28 Bjorn Helgaas wrote:

Quoted 5 lines · Pali Rohár
Commit 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge") was incorrectly applied from mailing list patch [1] to the linux git repository [2] probably due to resolving merge conflicts incorrectly. Fix it now.
Quoted 7 lines
[1] - https://lore.kernel.org/r/[email protected]
[2] - https://git.kernel.org/linus/91a8d79fc797
Fixes 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge")
BugLink https://bugzilla.kernel.org/show_bug.cgi?id=215540
Reported-by Jan Palus <[email protected]>
Signed-off-by Pali Rohár <[email protected]>
Applied to for-linus for v5.17 with the following commit log, thanks!
commit c49ae619905e ("PCI: mvebu: Fix device enumeration regression")
Author: Pali Rohár <[email protected]>
Date:   Mon Feb 14 12:02:28 2022 +0100
PCI: mvebu: Fix device enumeration regression
Jan reported that on Turris Omnia (Armada 385), no PCIe devices were detected after upgrading from v5.16.1 to v5.16.3 and identified the cause as the backport of 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge"), which appeared in v5.17-rc1.
91a8d79fc797 was incorrectly applied from mailing list patch [1] to the linux git repository [2] probably due to resolving merge conflicts incorrectly. Fix it now.
[1] https://lore.kernel.org/r/[email protected]
[2] https://git.kernel.org/linus/91a8d79fc797

Quoted 8 lines

[bhelgaas: commit log]
BugLink https://bugzilla.kernel.org/show_bug.cgi?id=215540
Fixes 91a8d79fc797 ("PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge")
Link https://lore.kernel.org/r/[email protected] open here
Link https://lore.kernel.org/r/20220127234917.GA150851@bhelgaas open here
Reported-by Jan Palus <[email protected]>
Signed-off-by Pali Rohár <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>

Thanks!

Quoted 21 lines

---
 drivers/pci/controller/pci-mvebu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/pci/controller/pci-mvebu.c +2 -1

index 71258ea3d35f..f8e82c5e2d87 100644
@@ -1329,7 +1329,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
 		 * indirectly via kernel emulated PCI bridge driver.
 		 */
 		mvebu_pcie_setup_hw(port);
-		mvebu_pcie_set_local_dev_nr(port, 0);
+		mvebu_pcie_set_local_dev_nr(port, 1);
+		mvebu_pcie_set_local_bus_nr(port, 0);
 	}
 
 	pcie->nports = i;

Signature · 1 line

2.20.1