* [PATCH] PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797
@ 2022-02-14 11:02 Pali Rohár
2022-02-14 15:46 ` Bjorn Helgaas
0 siblings, 1 reply; 3+ messages in thread
From: Pali Rohár @ 2022-02-14 11:02 UTC (permalink / raw)
To: Bjorn Helgaas, Lorenzo Pieralisi, Thomas Petazzoni, Rob Herring,
Krzysztof Wilczyński, Jan Palus, Marek Behún
Cc: linux-pci, linux-kernel
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/20211125124605.25915-12-pali@kernel.org
[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 <jpalus@fastmail.com>
Signed-off-by: Pali Rohár <pali@kernel.org>
---
drivers/pci/controller/pci-mvebu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 71258ea3d35f..f8e82c5e2d87 100644
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -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;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797
2022-02-14 11:02 [PATCH] PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797 Pali Rohár
@ 2022-02-14 15:46 ` Bjorn Helgaas
2022-02-15 9:48 ` Pali Rohár
0 siblings, 1 reply; 3+ messages in thread
From: Bjorn Helgaas @ 2022-02-14 15:46 UTC (permalink / raw)
To: Pali Rohár
Cc: Lorenzo Pieralisi, Thomas Petazzoni, Rob Herring,
Krzysztof Wilczyński, Jan Palus, Marek Behún,
linux-pci, linux-kernel, Thorsten Leemhuis
On Mon, Feb 14, 2022 at 12:02:28PM +0100, Pali Rohár wrote:
> 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/20211125124605.25915-12-pali@kernel.org
> [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 <jpalus@fastmail.com>
> Signed-off-by: Pali Rohár <pali@kernel.org>
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 <pali@kernel.org>
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/20211125124605.25915-12-pali@kernel.org
[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/20220214110228.25825-1-pali@kernel.org
Link: https://lore.kernel.org/r/20220127234917.GA150851@bhelgaas
Reported-by: Jan Palus <jpalus@fastmail.com>
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/controller/pci-mvebu.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
> index 71258ea3d35f..f8e82c5e2d87 100644
> --- a/drivers/pci/controller/pci-mvebu.c
> +++ b/drivers/pci/controller/pci-mvebu.c
> @@ -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;
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797
2022-02-14 15:46 ` Bjorn Helgaas
@ 2022-02-15 9:48 ` Pali Rohár
0 siblings, 0 replies; 3+ messages in thread
From: Pali Rohár @ 2022-02-15 9:48 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Lorenzo Pieralisi, Thomas Petazzoni, Rob Herring,
Krzysztof Wilczyński, Jan Palus, Marek Behún,
linux-pci, linux-kernel, Thorsten Leemhuis
On Monday 14 February 2022 09:46:28 Bjorn Helgaas wrote:
> On Mon, Feb 14, 2022 at 12:02:28PM +0100, Pali Rohár wrote:
> > 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/20211125124605.25915-12-pali@kernel.org
> > [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 <jpalus@fastmail.com>
> > Signed-off-by: Pali Rohár <pali@kernel.org>
>
> 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 <pali@kernel.org>
> 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/20211125124605.25915-12-pali@kernel.org
> [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/20220214110228.25825-1-pali@kernel.org
> Link: https://lore.kernel.org/r/20220127234917.GA150851@bhelgaas
> Reported-by: Jan Palus <jpalus@fastmail.com>
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Thanks!
> > ---
> > drivers/pci/controller/pci-mvebu.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
> > index 71258ea3d35f..f8e82c5e2d87 100644
> > --- a/drivers/pci/controller/pci-mvebu.c
> > +++ b/drivers/pci/controller/pci-mvebu.c
> > @@ -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;
> > --
> > 2.20.1
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-15 9:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-14 11:02 [PATCH] PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797 Pali Rohár
2022-02-14 15:46 ` Bjorn Helgaas
2022-02-15 9:48 ` Pali Rohár
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).