From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 138DEC43444 for ; Mon, 17 Dec 2018 10:25:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1A6F206A2 for ; Mon, 17 Dec 2018 10:25:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732254AbeLQKZ4 (ORCPT ); Mon, 17 Dec 2018 05:25:56 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:52784 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726642AbeLQKZz (ORCPT ); Mon, 17 Dec 2018 05:25:55 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 035A7A78; Mon, 17 Dec 2018 02:25:55 -0800 (PST) Received: from red-moon (red-moon.cambridge.arm.com [10.1.197.39]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 55E233F6A8; Mon, 17 Dec 2018 02:25:52 -0800 (PST) Date: Mon, 17 Dec 2018 10:26:36 +0000 From: Lorenzo Pieralisi To: Lucas Stach Cc: Andrey Smirnov , helgaas@kernel.org, Dong Aisheng , Mark Rutland , Richard Zhu , linux-arm-kernel , Rob Herring , linux-pci@vger.kernel.org, linux-kernel , Fabio Estevam , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , linux-imx@nxp.com, Leonard Crestez , Chris Healy , Trent Piepho Subject: Re: [PATCH v2 0/3] PCIE support for i.MX8MQ Message-ID: <20181217102636.GA13465@red-moon> References: <20181206073545.10967-1-andrew.smirnov@gmail.com> <20181206121550.GA2725@e107981-ln.cambridge.arm.com> <20181214203828.GD20725@google.com> <1545041578.5874.3.camel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1545041578.5874.3.camel@pengutronix.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 17, 2018 at 11:12:58AM +0100, Lucas Stach wrote: > Am Freitag, den 14.12.2018, 21:25 -0800 schrieb Andrey Smirnov: > > > On Fri, Dec 14, 2018 at 12:38 PM Bjorn Helgaas wrote: > > > > > > [+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. > > > > Yeah, this is definitely wrong, should be SOC_IMX8MQ || SOC_IMX6Q || > > SOC_IMX7D || (ARM && COMPILE_TEST) > > arm-soc would like to see the SOC_IMX8MQ option removed, so let's try > to not add any more things that depend on this. Please use (ARM64 && > MACH_MXC) or something to that tune instead. Patch series dropped from the PCI queue, waiting for the discussion and related follow-up patches to settle. Lorenzo