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=-7.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham 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 B7EF6C43387 for ; Fri, 14 Dec 2018 20:38:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E8162080F for ; Fri, 14 Dec 2018 20:38:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rXum7wnA"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="eJkkvqBV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E8162080F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZGLae3nQQcF8bjOIIazPoOw9llrqGgP93HM3GPIpN3U=; b=rXum7wnAnw8J5Q +7EKqGf0mjXCH9OUjRa8nW2OFozGEee1TQpckT1EfE+7wKo5hhjhxlDNwFm5cbM91MMLF8nWg0r7C NfVrp0pg4yDGHK1/OZ9THDBpeTTW9Pt+ITPiI/PZBb9k8GFcYUnJv9gYawnMI0SEag7FmcmChoqmI a1L/tGNiwyOZy7ulJo4r2Vn8GWWlqL4OSVWEWRfSjrBfdwFYSalQaiK8YVYjwcC6AVf4v7h1x9JkB lnNflVQ3oAACsUymdeYXnW/KAFf15Y8Ya5eHgZYklrUeYw+XhuKzoh/mdgu5T7BmvNOQszxaZ2VOO zjd8v2HzNbqPe/etnlrw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gXuEO-0000aW-15; Fri, 14 Dec 2018 20:38:44 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gXuEL-0000Yz-2W for linux-arm-kernel@lists.infradead.org; Fri, 14 Dec 2018 20:38:42 +0000 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1B75208C1; Fri, 14 Dec 2018 20:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544819911; bh=hzltAayUK9lLKge3kpsO0GSbw5lLTpE2an01zAcOuRc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=eJkkvqBVLfGKn4C8bDA7hgwgcPJzf07Sw6FPMPhBDPjc9BjTfPHPeF2EM2S/YzPIO GDLwMSJpz2q5ri/wKySWnrpZOi9tf1tuoEmz1I6seurZgVgseWVeRc87lsf1EKRSIR f94hVWtyPYw0tPzW6m79gqNAjGq/vL8haNZwystg= Date: Fri, 14 Dec 2018 14:38:29 -0600 From: Bjorn Helgaas To: Lorenzo Pieralisi Subject: Re: [PATCH v2 0/3] PCIE support for i.MX8MQ Message-ID: <20181214203828.GD20725@google.com> References: <20181206073545.10967-1-andrew.smirnov@gmail.com> <20181206121550.GA2725@e107981-ln.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181206121550.GA2725@e107981-ln.cambridge.arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181214_123841_131191_CF15A1D8 X-CRM114-Status: GOOD ( 16.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "A.s. Dong" , Mark Rutland , Trent Piepho , Richard Zhu , Rob Herring , Andrey Smirnov , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-imx@nxp.com, Fabio Estevam , Leonard Crestez , cphealy@gmail.com, linux-arm-kernel@lists.infradead.org, l.stach@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org [+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