Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 15 Feb 2022 10:48:18 +0100
From:   Pali =?utf-8?B?Um9ow6Fy?= <pali@kernel.org>
To:     Bjorn Helgaas <helgaas@kernel.org>
Cc:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
        Rob Herring <robh@kernel.org>,
        Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= <kw@linux.com>,
        Jan Palus <jpalus@fastmail.com>,
        Marek =?utf-8?B?QmVow7pu?= <kabel@kernel.org>,
        linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
        Thorsten Leemhuis <regressions@leemhuis.info>
Subject: Re: [PATCH] PCI: mvebu: Fix merge conflicts in commit 91a8d79fc797
Message-ID: <20220215094818.yl44tioh4spauh4q@pali>
References: <20220214110228.25825-1-pali@kernel.org>
 <20220214154628.GA8830@bhelgaas>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20220214154628.GA8830@bhelgaas>
User-Agent: NeoMutt/20180716
Precedence: bulk

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
> >