From: Bjorn Helgaas <helgaas@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
"A.s. Dong" <aisheng.dong@nxp.com>,
Mark Rutland <mark.rutland@arm.com>,
Richard Zhu <hongxing.zhu@nxp.com>,
linux-arm-kernel@lists.infradead.org,
Rob Herring <robh@kernel.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Fabio Estevam <fabio.estevam@nxp.com>,
devicetree@vger.kernel.org, linux-imx@nxp.com,
Leonard Crestez <leonard.crestez@nxp.com>,
cphealy@gmail.com, l.stach@pengutronix.de,
Trent Piepho <tpiepho@impinj.com>
Subject: Re: [PATCH v2 0/3] PCIE support for i.MX8MQ
Date: Fri, 14 Dec 2018 14:38:29 -0600 [thread overview]
Message-ID: <20181214203828.GD20725@google.com> (raw)
In-Reply-To: <20181206121550.GA2725@e107981-ln.cambridge.arm.com>
[+cc Trent]
On Thu, Dec 06, 2018 at 12:15:50PM +0000, Lorenzo Pieralisi wrote:
> On Wed, Dec 05, 2018 at 11:35:42PM -0800, Andrey Smirnov wrote:
> > Everyone:
> >
> > This series contains changes I made in order to enable support of PCIE
> > IP block on i.MX8MQ SoCs (full tree can be found at [github-v2]).
> >
> > NOTE: The last patch have a Kconfig symbol depenency on [imx8mq-kconfig].
> >
> > Changes since [v1]:
> >
> > - Driver changed to use single "fsl,controller-id" property to
> > distinguish between two intances of PCIE IP block
> >
> > - All code pertaining to L1SS was dropped to simplify the patch
> >
> > - Documented additions to DT bindings
> >
> > Feedback is welcome!
> >
> > Thanks,
> > Andrey Smirnov
>
> Andrey,
>
> I have applied the patches, ...
When I merged your pci/dwc branch, I noticed what looks like a merge
conflict between these commits:
d123765b58ee ("PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7")
1a059d994189 ("PCI: imx: Add support for i.MX8MQ")
d123765b58ee added SOC_IMX7D:
- depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
+ depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
and 1a059d994189 added SOC_IMX8MQ but dropped SOC_IMX7D again, which looks
like a mistake:
- depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
+ depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST)
So my "next" branch[1] (current head 7053eeb009e0) is:
config PCI_IMX6
bool "Freescale i.MX6/7 PCIe controller"
depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST)
depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST
which I think is wrong. Lorenzo, if you update your pci/dwc branch,
I'll rebuild my "next" branch.
If you want to tweak the switch statements and/or IMX8 checks, you
could do that at the same time.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/log/?h=next
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <helgaas@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: "A.s. Dong" <aisheng.dong@nxp.com>,
Mark Rutland <mark.rutland@arm.com>,
Trent Piepho <tpiepho@impinj.com>,
Richard Zhu <hongxing.zhu@nxp.com>, Rob Herring <robh@kernel.org>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-imx@nxp.com,
Fabio Estevam <fabio.estevam@nxp.com>,
Leonard Crestez <leonard.crestez@nxp.com>,
cphealy@gmail.com, linux-arm-kernel@lists.infradead.org,
l.stach@pengutronix.de
Subject: Re: [PATCH v2 0/3] PCIE support for i.MX8MQ
Date: Fri, 14 Dec 2018 14:38:29 -0600 [thread overview]
Message-ID: <20181214203828.GD20725@google.com> (raw)
In-Reply-To: <20181206121550.GA2725@e107981-ln.cambridge.arm.com>
[+cc Trent]
On Thu, Dec 06, 2018 at 12:15:50PM +0000, Lorenzo Pieralisi wrote:
> On Wed, Dec 05, 2018 at 11:35:42PM -0800, Andrey Smirnov wrote:
> > Everyone:
> >
> > This series contains changes I made in order to enable support of PCIE
> > IP block on i.MX8MQ SoCs (full tree can be found at [github-v2]).
> >
> > NOTE: The last patch have a Kconfig symbol depenency on [imx8mq-kconfig].
> >
> > Changes since [v1]:
> >
> > - Driver changed to use single "fsl,controller-id" property to
> > distinguish between two intances of PCIE IP block
> >
> > - All code pertaining to L1SS was dropped to simplify the patch
> >
> > - Documented additions to DT bindings
> >
> > Feedback is welcome!
> >
> > Thanks,
> > Andrey Smirnov
>
> Andrey,
>
> I have applied the patches, ...
When I merged your pci/dwc branch, I noticed what looks like a merge
conflict between these commits:
d123765b58ee ("PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7")
1a059d994189 ("PCI: imx: Add support for i.MX8MQ")
d123765b58ee added SOC_IMX7D:
- depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
+ depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
and 1a059d994189 added SOC_IMX8MQ but dropped SOC_IMX7D again, which looks
like a mistake:
- depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
+ depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST)
So my "next" branch[1] (current head 7053eeb009e0) is:
config PCI_IMX6
bool "Freescale i.MX6/7 PCIe controller"
depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST)
depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST
which I think is wrong. Lorenzo, if you update your pci/dwc branch,
I'll rebuild my "next" branch.
If you want to tweak the switch statements and/or IMX8 checks, you
could do that at the same time.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/log/?h=next
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-12-14 20:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 7:35 [PATCH v2 0/3] PCIE support for i.MX8MQ Andrey Smirnov
2018-12-06 7:35 ` Andrey Smirnov
2018-12-06 7:35 ` [PATCH v2 1/3] PCI: imx: No-op imx6_setup_phy_mpll() on i.MX7D Andrey Smirnov
2018-12-06 7:35 ` Andrey Smirnov
2018-12-06 9:41 ` Lucas Stach
2018-12-06 9:41 ` Lucas Stach
2018-12-06 7:35 ` [PATCH v2 2/3] PCI: imx: No-op imx6_pcie_reset_phy() " Andrey Smirnov
2018-12-06 7:35 ` Andrey Smirnov
2018-12-06 9:41 ` Lucas Stach
2018-12-06 9:41 ` Lucas Stach
2018-12-06 7:35 ` [PATCH v2 3/3] PCI: imx: Add support for i.MX8MQ Andrey Smirnov
2018-12-06 7:35 ` Andrey Smirnov
2018-12-06 10:23 ` Lucas Stach
2018-12-06 10:23 ` Lucas Stach
2018-12-14 20:30 ` Bjorn Helgaas
2018-12-14 20:30 ` Bjorn Helgaas
2018-12-14 20:55 ` Gustavo A. R. Silva
2018-12-14 20:55 ` Gustavo A. R. Silva
2018-12-15 5:22 ` Andrey Smirnov
2018-12-15 5:22 ` Andrey Smirnov
2018-12-15 5:22 ` Andrey Smirnov
2018-12-06 12:15 ` [PATCH v2 0/3] PCIE " Lorenzo Pieralisi
2018-12-06 12:15 ` Lorenzo Pieralisi
2018-12-07 2:44 ` Andrey Smirnov
2018-12-07 2:44 ` Andrey Smirnov
2018-12-07 2:44 ` Andrey Smirnov
2018-12-14 20:38 ` Bjorn Helgaas [this message]
2018-12-14 20:38 ` Bjorn Helgaas
2018-12-15 5:25 ` Andrey Smirnov
2018-12-15 5:25 ` Andrey Smirnov
2018-12-15 5:25 ` Andrey Smirnov
2018-12-17 10:12 ` Lucas Stach
2018-12-17 10:12 ` Lucas Stach
2018-12-17 10:12 ` Lucas Stach
2018-12-17 10:26 ` Lorenzo Pieralisi
2018-12-17 10:26 ` Lorenzo Pieralisi
2018-12-17 10:26 ` Lorenzo Pieralisi
2018-12-17 11:11 ` Lorenzo Pieralisi
2018-12-17 11:11 ` Lorenzo Pieralisi
2018-12-17 11:11 ` Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181214203828.GD20725@google.com \
--to=helgaas@kernel.org \
--cc=aisheng.dong@nxp.com \
--cc=andrew.smirnov@gmail.com \
--cc=cphealy@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=hongxing.zhu@nxp.com \
--cc=l.stach@pengutronix.de \
--cc=leonard.crestez@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=robh@kernel.org \
--cc=tpiepho@impinj.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.