From patchwork Tue Aug 31 12:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Saenz Julienne X-Patchwork-Id: 12467173 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 EA432C432BE for ; Tue, 31 Aug 2021 13:01:40 +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 A9C7A6103A for ; Tue, 31 Aug 2021 13:01:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A9C7A6103A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Czbuy9OxVBg9taTGI2Ax/FOJfvcgIRByfVBwY37vxwo=; b=go7JVLHSEez6Jg WXuiMIKjx+Dwz70Dh+OcVvKz/2N4pTaBW8UiJscO+HuN4d0K2TRU7wChCZuZVFY5iWTGCa4Y623ix U7zeYrnXADcZCZT83uQgAGRVmjYgLgUY9Jnu3QzG+Rpb2Irp9NmiDvrdOakuicmh7wT0MHZuNUX9Q G3RcpGPKEelQdDrLNMhBKvyALUPlC75JZofzd/kmo0cjeoJeZQfqMqBH4NgYxb77nOoHifxYXTFQG yNkax+mJ5QyICrImoQBZYI1Av0zmWgrRAm/aJwK0WpvyozPORM2JJksVuLASftFXEo7+vJptI5Phn fEFaAXSipn63Hc6c203Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mL3MH-002GxL-VW; Tue, 31 Aug 2021 12:59:22 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mL3M1-002Gs1-T1 for linux-arm-kernel@lists.infradead.org; Tue, 31 Aug 2021 12:59:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630414742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Eh4ChN6tmGYrP4RUJdmpaQmwKMLLITK4RWlYVVT5MA=; b=FG5291XrazQqrtJfAZcPP8B3yJ1ZTeaeShFrCf9VV4u/owT9o/hrhdZFvqnFns2dIr6YnK ILsYp0Y9I3QI1Gsvnz3jlADAFA3V1vX+9ymQl8YUXAQOk/A+Swgo0AZ0vUZaUdyXPk16OD WxiaxMorJoVGGY7u4c9BkFeYePgkIjs= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-RD1HkC8hNQewRcHyJkoTEA-1; Tue, 31 Aug 2021 08:58:59 -0400 X-MC-Unique: RD1HkC8hNQewRcHyJkoTEA-1 Received: by mail-wm1-f72.google.com with SMTP id r125-20020a1c2b830000b0290197a4be97b7so1287568wmr.9 for ; Tue, 31 Aug 2021 05:58:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5Eh4ChN6tmGYrP4RUJdmpaQmwKMLLITK4RWlYVVT5MA=; b=qqNMbrg5zwdfvSX4xhSAnx/41xu76c/27fqivVwacNh2L0JjtW3fPHnw388N/GJZfK 9XOPKB053QBHhWXeYjdCJ0EvXlParv9rI/Wz3tunidwsYAn/FmAH78pUBoyd6fIwZTHg aJYQ1rFkMYZCcog4K4jmdp3NBLp6BO09zryn5C9nopzuH0WsSRdcGJfXCIEWHpuuPDXM qQ8dTV49Mk5WsUUrXVj1uRRxVhs4xKges0WytwwEFRDg0qU5Q/q50RKv/kFHN7wX+zAy jE4TnorW42v31W+zO9LT1QpagvWhwI3AoKHj9/ic21wcN+Y0D4GT4LP8JqrdwK68QIDH YO9w== X-Gm-Message-State: AOAM531xu8lzKW25LV3ftOVUYn0Ocjd8/Tyd72BVTs7PBE4HQHHvNSjr LIideqrl208MXK2aXMKDl6txxEziml3dMBLwP8WJaWAt+Mo0MfhOt6VZSJti29lzOEm5V5gExif FXOO6mn6F56mYSVH/15gNV3OYccR5wWUdNeg= X-Received: by 2002:adf:ef0b:: with SMTP id e11mr31432618wro.46.1630414738794; Tue, 31 Aug 2021 05:58:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtdWfILjxTRF4gocoS3gkh8TxcThwh4B/N0Ob5/z0qlXKtnOx8p568wFUOeGBfgSnQWogYTg== X-Received: by 2002:adf:ef0b:: with SMTP id e11mr31432600wro.46.1630414738590; Tue, 31 Aug 2021 05:58:58 -0700 (PDT) Received: from vian.redhat.com ([2a0c:5a80:3c08:b500:afb2:5ebc:3fd2:26de]) by smtp.gmail.com with ESMTPSA id a133sm2553199wme.5.2021.08.31.05.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Aug 2021 05:58:58 -0700 (PDT) From: Nicolas Saenz Julienne To: robh+dt@kernel.org, nsaenz@kernel.org, f.fainelli@gmail.com Cc: gregkh@linuxfoundation.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stefan.wahren@i2se.com, Nicolas Saenz Julienne , Rob Herring Subject: [PATCH v2 1/2] ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting Date: Tue, 31 Aug 2021 14:58:42 +0200 Message-Id: <20210831125843.1233488-1-nsaenzju@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=nsaenzju@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210831_055906_070856_565C94AD X-CRM114-Status: GOOD ( 12.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org dtbs_check currently complains that: arch/arm/boot/dts/bcm2711-rpi-4-b.dts:220.10-231.4: Warning (pci_device_reg): /scb/pcie@7d500000/pci@1,0: PCI unit address format error, expected "0,0" Unsurprisingly pci@0,0 is the right address, as illustrated by its reg property: &pcie0 { pci@0,0 { /* * As defined in the IEEE Std 1275-1994 document, * reg is a five-cell address encoded as (phys.hi * phys.mid phys.lo size.hi size.lo). phys.hi * should contain the device's BDF as 0b00000000 * bbbbbbbb dddddfff 00000000. The other cells * should be zero. */ reg = <0 0 0 0 0>; }; }; The device is clearly 0. So fix it. Also add a missing 'device_type = "pci"'. Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node") Suggested-by: Rob Herring Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Rob Herring --- Changes since v1: - s/bus/device/ when talking about unit addresses - Add device_type - Add Suggested-by arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts index f24bdd0870a5..8377dc14b7b5 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -217,7 +217,8 @@ phy1: ethernet-phy@1 { }; &pcie0 { - pci@1,0 { + pci@0,0 { + device_type = "pci"; #address-cells = <3>; #size-cells = <2>; ranges; From patchwork Tue Aug 31 12:58:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Saenz Julienne X-Patchwork-Id: 12467171 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 BBC9BC432BE for ; Tue, 31 Aug 2021 13:01:20 +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 7EABD60E98 for ; Tue, 31 Aug 2021 13:01:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7EABD60E98 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WGKRA4IXvrqgrPBksgtRSgqP75Jrfg+Y2f4R9ygRDtU=; b=ROtJSx9djD5jAL QRX+5rWfeKkcaiXozrjlmsRdeGAsa6txaK4xwOa+5MkDQKjnUEJbca93LxnmiRNw8EcAV4CkLu3vJ 6H/bTUeEW/V8QisfY0h+pEj8mmQjXgOUP/lApC98UjP6AxpfnyIeM9NX/kfUAE0OsQp1UMBLmu0bw 0HgjwkDnwlINSl64cvTbj/NfNTaG6NDwX/bp/LpzKLUN601rfKfxNMcwBY9dRVcEn8p3FkkvJMalc Qh00HH49oAh17aL4l/WhLJzxEBV8ueKLvdXbptmtKOUmobXQlizJNEQD1SOyVmH0mpqlv4llOOn2c hFJFS73rpIP27b0GQERQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mL3M5-002GuM-Of; Tue, 31 Aug 2021 12:59:09 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mL3M1-002Grq-9C for linux-arm-kernel@lists.infradead.org; Tue, 31 Aug 2021 12:59:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630414742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VFi9mk+JrNYqm9om9cI3aYM4Tz+JK5QNKRVw7UvYJXE=; b=X0Ls1UZ8/Hv4aGqMEO9ZXme27VI9ogy4PDiPT9e3q5KBpwgUeTZcfUnLZetWZ3R/6w9j5L 87NfYXrjyYv40xGA/YxY95D/O14BoAxSHbcBEM9gYEIm04UT5a3e7Jl0yoZl4qHdQH4Hkn 7SdKYQ/VoWSCH1F3R7jUwCl+wioHRCE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-S36P1dUlMimG5wpsYj2uWA-1; Tue, 31 Aug 2021 08:59:00 -0400 X-MC-Unique: S36P1dUlMimG5wpsYj2uWA-1 Received: by mail-wr1-f69.google.com with SMTP id 102-20020adf82ef000000b001576e345169so4006875wrc.7 for ; Tue, 31 Aug 2021 05:59:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VFi9mk+JrNYqm9om9cI3aYM4Tz+JK5QNKRVw7UvYJXE=; b=RWxRYix7fLM7xtUucwxlFJYa196qA2ZWxM+JtCrELrcPnPYSTu9hI9CuV7h2acFAnL 2HwzswGJRw7EK2FC66Y2KEAvCzFMZQgzKGaqG1Oxs79F3tz1UhIX/B0YNvqxasbM0eqn fppPDhqKfiuENQh7x+6wSJ2YB7NdFkmKNK8wP4BTZ7aqf4da/7RFnsNDdX94QFGN40Es ABRq4BTPKahRlHjryRBcDGnj50TaCb2xYAj2rQKmOW2/ZpkvAczimzYPaOaWPGJhsDbU kVtppcPeuEk3XHNRMegTrDs3lOk4PAV7q47y3qpSVQ/wQywuc3ismkmeTztqY497i56e Y1QQ== X-Gm-Message-State: AOAM533+Wb1L13mPlF1jaMYX1/g3m9sxNEhx4TF90ZQ/g4agg9E8mSbm WzIsQJ53+8p9Ph7ziTHk0KLk5JBWVxCzNJ+NQ20nejfAIHo4BlnwoX0n7Wm/iQERcYEcnzPNkKA fvUDEouiDHD6tpNXyAnpZ3MldFsgFOICqfOA= X-Received: by 2002:a5d:6e84:: with SMTP id k4mr30756124wrz.426.1630414739547; Tue, 31 Aug 2021 05:58:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzflIax6tFxvMs9mjbd8B1Mb2iEt9SCQmR/++VhwuAoQyhS9HpVASDt6bCiXW4+7etv8yFh8w== X-Received: by 2002:a5d:6e84:: with SMTP id k4mr30756112wrz.426.1630414739351; Tue, 31 Aug 2021 05:58:59 -0700 (PDT) Received: from vian.redhat.com ([2a0c:5a80:3c08:b500:afb2:5ebc:3fd2:26de]) by smtp.gmail.com with ESMTPSA id a133sm2553199wme.5.2021.08.31.05.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Aug 2021 05:58:59 -0700 (PDT) From: Nicolas Saenz Julienne To: robh+dt@kernel.org, nsaenz@kernel.org, f.fainelli@gmail.com Cc: gregkh@linuxfoundation.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stefan.wahren@i2se.com, Nicolas Saenz Julienne , Rob Herring Subject: [PATCH v2 2/2] ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address Date: Tue, 31 Aug 2021 14:58:43 +0200 Message-Id: <20210831125843.1233488-2-nsaenzju@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210831125843.1233488-1-nsaenzju@redhat.com> References: <20210831125843.1233488-1-nsaenzju@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=nsaenzju@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210831_055905_447312_C1305C88 X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The unit address is supposed to represent ','. Which are both 0 for RPi4b's XHCI controller. On top of that although OpenFirmware states bus number goes in the high part of the last reg parameter, FDT doesn't seem to care for it[1], so remove it. [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210830103909.323356-1-nsaenzju@redhat.com/#24414633 Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node") Suggested-by: Rob Herring Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Rob Herring --- Chages since v1: - Add patch as per robh suggestion arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts index 8377dc14b7b5..50530cc91876 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -225,8 +225,8 @@ pci@0,0 { reg = <0 0 0 0 0>; - usb@1,0 { - reg = <0x10000 0 0 0 0>; + usb@0,0 { + reg = <0 0 0 0 0>; resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>; }; };