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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 F064AC433E1 for ; Sat, 15 Aug 2020 23:22:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9BC8206C0 for ; Sat, 15 Aug 2020 23:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597533752; bh=SB9wxVHgt3m7T/tEhx/Oa+YJt9VN49b1ddeU7NMOvEk=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=tL6iryON5tNZ+KX1KluD4jcVbTorWsjIFD5XKhl5dtUI2X1HlXz8LCImqwwFSGN4L 4Ih6V8axb89aC5UTVFRnBLhciBBHu15M9xUV+Id34sjXp0POPedrlzcoAkQkL1oDp0 76Z4UM31uplIy/lYuZm261384n6khXXw8A0NCNSI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728435AbgHOXWb (ORCPT ); Sat, 15 Aug 2020 19:22:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:35298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726021AbgHOXWa (ORCPT ); Sat, 15 Aug 2020 19:22:30 -0400 Received: from localhost (104.sub-72-107-126.myvzw.com [72.107.126.104]) (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 739D82065C; Sat, 15 Aug 2020 23:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597533749; bh=SB9wxVHgt3m7T/tEhx/Oa+YJt9VN49b1ddeU7NMOvEk=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=aVN9qcq6cqmxvD4IsLLewly56VryrzoOr3d3eGSPE1tXpVvGPQOKs97rPBlll36uG 7bM0cxwtJTA4bjf/rGTjcr8A0Xrcoy9KS/l92ag5S/On003FKZrPumPtta4UJtBrD7 ghyyujWRbGVHMF1kSphFqAtvcGhXkHRpnPPnx+L8= Date: Sat, 15 Aug 2020 18:22:28 -0500 From: Bjorn Helgaas To: Marc Zyngier Cc: linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rob Herring , Lorenzo Pieralisi , Heiko Stuebner , Shawn Lin , Roh Herring , Bjorn Helgaas , kernel-team@android.com Subject: Re: [PATCH 1/2] PCI: rockchip: Work around missing device_type property in DT Message-ID: <20200815232228.GA1325245@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200815125112.462652-2-maz@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Aug 15, 2020 at 01:51:11PM +0100, Marc Zyngier wrote: > Recent changes to the DT PCI bus parsing made it mandatory for > device tree nodes describing a PCI controller to have the > 'device_type = "pci"' property for the node to be matched. > > Although this follows the letter of the specification, it > breaks existing device-trees that have been working fine > for years. Rockchip rk3399-based systems are a prime example > of such collateral damage, and have stopped discovering their > PCI bus. > > In order to paper over the blunder, let's add a workaround > to the pcie-rockchip driver, adding the missing property when > none is found at boot time. A warning will hopefully nudge the > user into updating their DT to a fixed version if they can, but > the insentive is obviously pretty small. s/insentive/incentive/ (Lorenzo or I can fix this up) > Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser") > Suggested-by: Roh Herring s/Roh/Rob/ (similarly) > Signed-off-by: Marc Zyngier This looks like a candidate for v5.9, since 2f96593ecc37 was merged during the v5.9 merge window, right? I wonder how many other DTs are similarly broken? Maybe Rob's DT checker has already looked? > --- > drivers/pci/controller/pcie-rockchip-host.c | 29 +++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c > index 0bb2fb3e8a0b..d7dd04430a99 100644 > --- a/drivers/pci/controller/pcie-rockchip-host.c > +++ b/drivers/pci/controller/pcie-rockchip-host.c > @@ -949,6 +949,35 @@ static int rockchip_pcie_probe(struct platform_device *pdev) > if (!dev->of_node) > return -ENODEV; > > + /* > + * Most rk3399 DTs are missing the 'device_type = "pci"' property, > + * potentially leading to PCIe probing failure. Be kind to the > + * users and fix it up for them. Upgrading is recommended. > + */ > + if (!of_find_property(dev->of_node, "device_type", NULL)) { > + const char dtype[] = "pci"; > + struct property *prop; > + > + dev_warn(dev, "Working around missing device_type property\n"); > + > + prop = kzalloc(sizeof(*prop), GFP_KERNEL); > + if (!prop) > + return -ENOMEM; > + > + prop->name = kstrdup("device_type", GFP_KERNEL); > + prop->value = kstrdup(dtype, GFP_KERNEL); > + prop->length = ARRAY_SIZE(dtype); > + if (!prop->name || !prop->value) { > + kfree(prop->name); > + kfree(prop->value); > + kfree(prop); > + return -ENOMEM; > + } > + > + if (of_add_property(dev->of_node, prop)) > + dev_warn(dev, "Failed to add property, probing may fail"); > + } > + > bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rockchip)); > if (!bridge) > return -ENOMEM; > -- > 2.27.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 C6790C433DF for ; Sat, 15 Aug 2020 23:22:43 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 8F8DE2065C for ; Sat, 15 Aug 2020 23:22:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nptE5U29"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="aVN9qcq6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F8DE2065C 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-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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: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:References:List-Owner; bh=D22O34b25RzuCDiMT1avGY62390iOUntfeLGJ2Iw3ww=; b=nptE5U29pQjJlxmZFQv8BskWn yKKuf4GHQrEWDSCMduIaK9f6ck1HAGxSXdPKQwj/HqT3qIGZ0uy3WgtKWSnUw8rCppfkn7ltrAzOO 0p30tsFSjaD7fftq/kQeLvgLRVpWjY+3vGJ1z546s6ZqL7mzc+FcAsJdLbCVcRPzycE8HLVgEq6aB h1MpfiS7ZUQPd8iFa/N5d3YgsGvOMf3qV//+cdukiiLl+PU9juryVdJRkxSZq+xnQEbOBoZDCWW4H UQ7uunzrh4AKfYKqY4zTd5yHVwp2dkJ6rogtA1nEEPbZuadzqVza1qmr5t/W7yhnA5nb+k2XIcbMb cHgMz3dSA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k75VS-0007le-QN; Sat, 15 Aug 2020 23:22:34 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k75VP-0007l3-H9; Sat, 15 Aug 2020 23:22:32 +0000 Received: from localhost (104.sub-72-107-126.myvzw.com [72.107.126.104]) (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 739D82065C; Sat, 15 Aug 2020 23:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597533749; bh=SB9wxVHgt3m7T/tEhx/Oa+YJt9VN49b1ddeU7NMOvEk=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=aVN9qcq6cqmxvD4IsLLewly56VryrzoOr3d3eGSPE1tXpVvGPQOKs97rPBlll36uG 7bM0cxwtJTA4bjf/rGTjcr8A0Xrcoy9KS/l92ag5S/On003FKZrPumPtta4UJtBrD7 ghyyujWRbGVHMF1kSphFqAtvcGhXkHRpnPPnx+L8= Date: Sat, 15 Aug 2020 18:22:28 -0500 From: Bjorn Helgaas To: Marc Zyngier Subject: Re: [PATCH 1/2] PCI: rockchip: Work around missing device_type property in DT Message-ID: <20200815232228.GA1325245@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200815125112.462652-2-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200815_192231_728097_04E63E97 X-CRM114-Status: GOOD ( 29.55 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Lorenzo Pieralisi , Heiko Stuebner , linux-pci@vger.kernel.org, Shawn Lin , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Roh Herring , Bjorn Helgaas , kernel-team@android.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Sat, Aug 15, 2020 at 01:51:11PM +0100, Marc Zyngier wrote: > Recent changes to the DT PCI bus parsing made it mandatory for > device tree nodes describing a PCI controller to have the > 'device_type = "pci"' property for the node to be matched. > > Although this follows the letter of the specification, it > breaks existing device-trees that have been working fine > for years. Rockchip rk3399-based systems are a prime example > of such collateral damage, and have stopped discovering their > PCI bus. > > In order to paper over the blunder, let's add a workaround > to the pcie-rockchip driver, adding the missing property when > none is found at boot time. A warning will hopefully nudge the > user into updating their DT to a fixed version if they can, but > the insentive is obviously pretty small. s/insentive/incentive/ (Lorenzo or I can fix this up) > Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser") > Suggested-by: Roh Herring s/Roh/Rob/ (similarly) > Signed-off-by: Marc Zyngier This looks like a candidate for v5.9, since 2f96593ecc37 was merged during the v5.9 merge window, right? I wonder how many other DTs are similarly broken? Maybe Rob's DT checker has already looked? > --- > drivers/pci/controller/pcie-rockchip-host.c | 29 +++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c > index 0bb2fb3e8a0b..d7dd04430a99 100644 > --- a/drivers/pci/controller/pcie-rockchip-host.c > +++ b/drivers/pci/controller/pcie-rockchip-host.c > @@ -949,6 +949,35 @@ static int rockchip_pcie_probe(struct platform_device *pdev) > if (!dev->of_node) > return -ENODEV; > > + /* > + * Most rk3399 DTs are missing the 'device_type = "pci"' property, > + * potentially leading to PCIe probing failure. Be kind to the > + * users and fix it up for them. Upgrading is recommended. > + */ > + if (!of_find_property(dev->of_node, "device_type", NULL)) { > + const char dtype[] = "pci"; > + struct property *prop; > + > + dev_warn(dev, "Working around missing device_type property\n"); > + > + prop = kzalloc(sizeof(*prop), GFP_KERNEL); > + if (!prop) > + return -ENOMEM; > + > + prop->name = kstrdup("device_type", GFP_KERNEL); > + prop->value = kstrdup(dtype, GFP_KERNEL); > + prop->length = ARRAY_SIZE(dtype); > + if (!prop->name || !prop->value) { > + kfree(prop->name); > + kfree(prop->value); > + kfree(prop); > + return -ENOMEM; > + } > + > + if (of_add_property(dev->of_node, prop)) > + dev_warn(dev, "Failed to add property, probing may fail"); > + } > + > bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rockchip)); > if (!bridge) > return -ENOMEM; > -- > 2.27.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip 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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 3D299C433DF for ; Sat, 15 Aug 2020 23:24:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 0C453206B6 for ; Sat, 15 Aug 2020 23:24:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Yh8MayNK"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="aVN9qcq6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C453206B6 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+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=merlin.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: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:References:List-Owner; bh=CKSEuKf4QjYL4MCVTOGws/oIwG3u1Ujyp0vdVUv6tf0=; b=Yh8MayNKgir/j8Es2E6749pUl mw/YX1MxtOjTkhL0bDZUnHU3TAWi8TLPPDLfmXKeS+jOPF2Wlivxin04S0VDroGkZhkFK7IA4y94y qDJ7aMcQjAvAGKBZhDcasb8Wk/vWCVR2XSjsP2xaQSqMa33ywJ6UoS2xirF9qtlCY4HY3/yJWHdLT zVs45v2oDp1DNc6ZZk9n+bL63hws4zHP4ThhegrYX8pLjYiOvmgv5DSzXhvNaSNmeCc5ypIk/JYFv BtizJUiJ2LBhoYbldM7fYRwlVPcu34X6fwifg7766mC8KRO629UzQfYRe2W9jsE0SvHfbEN/rMPjd aTGpbKhyA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k75VS-0007lW-27; Sat, 15 Aug 2020 23:22:34 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k75VP-0007l3-H9; Sat, 15 Aug 2020 23:22:32 +0000 Received: from localhost (104.sub-72-107-126.myvzw.com [72.107.126.104]) (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 739D82065C; Sat, 15 Aug 2020 23:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597533749; bh=SB9wxVHgt3m7T/tEhx/Oa+YJt9VN49b1ddeU7NMOvEk=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=aVN9qcq6cqmxvD4IsLLewly56VryrzoOr3d3eGSPE1tXpVvGPQOKs97rPBlll36uG 7bM0cxwtJTA4bjf/rGTjcr8A0Xrcoy9KS/l92ag5S/On003FKZrPumPtta4UJtBrD7 ghyyujWRbGVHMF1kSphFqAtvcGhXkHRpnPPnx+L8= Date: Sat, 15 Aug 2020 18:22:28 -0500 From: Bjorn Helgaas To: Marc Zyngier Subject: Re: [PATCH 1/2] PCI: rockchip: Work around missing device_type property in DT Message-ID: <20200815232228.GA1325245@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200815125112.462652-2-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200815_192231_728097_04E63E97 X-CRM114-Status: GOOD ( 29.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Lorenzo Pieralisi , Heiko Stuebner , linux-pci@vger.kernel.org, Shawn Lin , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Roh Herring , Bjorn Helgaas , kernel-team@android.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Aug 15, 2020 at 01:51:11PM +0100, Marc Zyngier wrote: > Recent changes to the DT PCI bus parsing made it mandatory for > device tree nodes describing a PCI controller to have the > 'device_type = "pci"' property for the node to be matched. > > Although this follows the letter of the specification, it > breaks existing device-trees that have been working fine > for years. Rockchip rk3399-based systems are a prime example > of such collateral damage, and have stopped discovering their > PCI bus. > > In order to paper over the blunder, let's add a workaround > to the pcie-rockchip driver, adding the missing property when > none is found at boot time. A warning will hopefully nudge the > user into updating their DT to a fixed version if they can, but > the insentive is obviously pretty small. s/insentive/incentive/ (Lorenzo or I can fix this up) > Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser") > Suggested-by: Roh Herring s/Roh/Rob/ (similarly) > Signed-off-by: Marc Zyngier This looks like a candidate for v5.9, since 2f96593ecc37 was merged during the v5.9 merge window, right? I wonder how many other DTs are similarly broken? Maybe Rob's DT checker has already looked? > --- > drivers/pci/controller/pcie-rockchip-host.c | 29 +++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c > index 0bb2fb3e8a0b..d7dd04430a99 100644 > --- a/drivers/pci/controller/pcie-rockchip-host.c > +++ b/drivers/pci/controller/pcie-rockchip-host.c > @@ -949,6 +949,35 @@ static int rockchip_pcie_probe(struct platform_device *pdev) > if (!dev->of_node) > return -ENODEV; > > + /* > + * Most rk3399 DTs are missing the 'device_type = "pci"' property, > + * potentially leading to PCIe probing failure. Be kind to the > + * users and fix it up for them. Upgrading is recommended. > + */ > + if (!of_find_property(dev->of_node, "device_type", NULL)) { > + const char dtype[] = "pci"; > + struct property *prop; > + > + dev_warn(dev, "Working around missing device_type property\n"); > + > + prop = kzalloc(sizeof(*prop), GFP_KERNEL); > + if (!prop) > + return -ENOMEM; > + > + prop->name = kstrdup("device_type", GFP_KERNEL); > + prop->value = kstrdup(dtype, GFP_KERNEL); > + prop->length = ARRAY_SIZE(dtype); > + if (!prop->name || !prop->value) { > + kfree(prop->name); > + kfree(prop->value); > + kfree(prop); > + return -ENOMEM; > + } > + > + if (of_add_property(dev->of_node, prop)) > + dev_warn(dev, "Failed to add property, probing may fail"); > + } > + > bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rockchip)); > if (!bridge) > return -ENOMEM; > -- > 2.27.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel