672 lines
30 KiB
Diff
672 lines
30 KiB
Diff
From patchwork Tue Mar 24 18:28:09 2020
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
X-Patchwork-Id: 11456187
|
|
Return-Path:
|
|
<SRS0=7UWt=5J=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
|
[172.30.200.123])
|
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 884BD1667
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:29:06 +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 64FF0206F6
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:29:06 +0000 (UTC)
|
|
Authentication-Results: mail.kernel.org;
|
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
|
header.i=@lists.infradead.org header.b="G3ed3Qzw"
|
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64FF0206F6
|
|
Authentication-Results: mail.kernel.org;
|
|
dmarc=none (p=none dis=none) header.from=suse.de
|
|
Authentication-Results: mail.kernel.org;
|
|
spf=none
|
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:
|
|
Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
|
|
Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
|
|
List-Owner; bh=ZW8pFtwlUj3q7GZJotB4Rgjtfp9gMy+l74jJQcTab0w=; b=G3ed3QzwnvX3MD
|
|
lHn7XDGcdKtGCuuX/Xhmoz/5j7Rgw1hOz3+8tGJaH+BigLM7Kfms9kB2c3chHrDwTH5SW0LzlU8el
|
|
hxpbcJnVFy3VLdCMUrvQUXY0SmOcoSSN3NK032HxlqAKSa5HPE3dTBWheiUGKlZ6c3A9dGItYzD6I
|
|
M4WO+9b0wHM1KMMrsyVo51ysdAFEXtSym1xNN+pW/tE9ak+/bFHxMW1XcMNrVwo9R43U5JSvmcC0M
|
|
OKBYNAYFpFWx3n3wvAaFQkBEkmH3QmPBd0aiE8UTGk6CY0VHwjbVcE7u7daksOPLrZgsRgqmLRatE
|
|
98WbgEKpzDu7mgvLn5zw==;
|
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
|
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoIP-0002bD-LX; Tue, 24 Mar 2020 18:29:01 +0000
|
|
Received: from mx2.suse.de ([195.135.220.15])
|
|
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoHq-00024O-PS; Tue, 24 Mar 2020 18:28:29 +0000
|
|
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
|
|
Received: from relay2.suse.de (unknown [195.135.220.254])
|
|
by mx2.suse.de (Postfix) with ESMTP id 4A537ABD1;
|
|
Tue, 24 Mar 2020 18:28:22 +0000 (UTC)
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
To: linux-kernel@vger.kernel.org, Florian Fainelli <f.fainelli@gmail.com>,
|
|
Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>,
|
|
bcm-kernel-feedback-list@broadcom.com,
|
|
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Subject: [PATCH v6 1/4] soc: bcm2835: Sync xHCI reset firmware property with
|
|
downstream
|
|
Date: Tue, 24 Mar 2020 19:28:09 +0100
|
|
Message-Id: <20200324182812.20420-2-nsaenzjulienne@suse.de>
|
|
X-Mailer: git-send-email 2.25.1
|
|
In-Reply-To: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
References: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
MIME-Version: 1.0
|
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
|
X-CRM114-CacheID: sfid-20200324_112826_965603_11D899C2
|
|
X-CRM114-Status: GOOD ( 13.71 )
|
|
X-Spam-Score: -2.3 (--)
|
|
X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
|
|
Content analysis details: (-2.3 points)
|
|
pts rule name description
|
|
---- ----------------------
|
|
--------------------------------------------------
|
|
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
|
|
[195.135.220.15 listed in wl.mailspike.net]
|
|
-2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,
|
|
medium trust [195.135.220.15 listed in list.dnswl.org]
|
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
|
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
|
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
|
X-Mailman-Version: 2.1.29
|
|
Precedence: list
|
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
|
List-Unsubscribe:
|
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
|
List-Subscribe:
|
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
|
Cc: tim.gover@raspberrypi.org, sergei.shtylyov@cogentembedded.com,
|
|
gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
|
|
linux-rpi-kernel@lists.infradead.org, linux-pci@vger.kernel.org,
|
|
linux-arm-kernel@lists.infradead.org, wahrenst@gmx.net
|
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
|
Errors-To:
|
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
|
|
|
The property is needed in order to trigger VL805's firmware load. Note
|
|
that there is a gap between the property introduced and the previous
|
|
one. This is also the case downstream.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
include/soc/bcm2835/raspberrypi-firmware.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
|
|
index 7800e12ee042..cc9cdbc66403 100644
|
|
--- a/include/soc/bcm2835/raspberrypi-firmware.h
|
|
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
|
|
@@ -90,7 +90,7 @@ enum rpi_firmware_property_tag {
|
|
RPI_FIRMWARE_SET_PERIPH_REG = 0x00038045,
|
|
RPI_FIRMWARE_GET_POE_HAT_VAL = 0x00030049,
|
|
RPI_FIRMWARE_SET_POE_HAT_VAL = 0x00030050,
|
|
-
|
|
+ RPI_FIRMWARE_NOTIFY_XHCI_RESET = 0x00030058,
|
|
|
|
/* Dispmanx TAGS */
|
|
RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE = 0x00040001,
|
|
|
|
From patchwork Tue Mar 24 18:28:10 2020
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
X-Patchwork-Id: 11456191
|
|
Return-Path:
|
|
<SRS0=7UWt=5J=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
|
[172.30.200.123])
|
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4D571731
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:29:30 +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 9A787206F6
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:29:30 +0000 (UTC)
|
|
Authentication-Results: mail.kernel.org;
|
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
|
header.i=@lists.infradead.org header.b="Z5B/3JRW"
|
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A787206F6
|
|
Authentication-Results: mail.kernel.org;
|
|
dmarc=none (p=none dis=none) header.from=suse.de
|
|
Authentication-Results: mail.kernel.org;
|
|
spf=none
|
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:
|
|
Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
|
|
Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
|
|
List-Owner; bh=kAIknZ2RVw6gB9CaOcG4KQjgkdNyrtcLcfH5XAGtITo=; b=Z5B/3JRWWCVYHI
|
|
AsxnYFEFit0NnrRvZDbi0ktp8wUbVrztmKRPQWvfaWSlelJEKdEpJhHItnpicKfR5JhfHFsPt3V3X
|
|
i29DtdYSOr/cjW/qeoakzXY0b1ApjrrK3MWjX/k0k9SVqGwkq6KT3T3qok969KInPAe0ERZ9bYkP1
|
|
P2Jj1QT0QtCfcd0PsSjn4riMP09KNZVuviLm2bcg3Cr78qfIq6gDHHoS1nqPzdEt4gG+i/s66lTFY
|
|
Dd3vPgItuRBvzgAjWdT4Bvx41u82KONuYDshYftzUZX7pxh76o4PwtPoPt/A4hJT0pZZe9MB6pQlM
|
|
JwbBVC2fhM1afv00diOw==;
|
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
|
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoIm-00032a-5v; Tue, 24 Mar 2020 18:29:24 +0000
|
|
Received: from mx2.suse.de ([195.135.220.15])
|
|
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoHq-00024W-PL; Tue, 24 Mar 2020 18:28:29 +0000
|
|
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
|
|
Received: from relay2.suse.de (unknown [195.135.220.254])
|
|
by mx2.suse.de (Postfix) with ESMTP id 3F0CFABE7;
|
|
Tue, 24 Mar 2020 18:28:23 +0000 (UTC)
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
To: linux-kernel@vger.kernel.org,
|
|
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
|
|
Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>,
|
|
Scott Branden <sbranden@broadcom.com>,
|
|
bcm-kernel-feedback-list@broadcom.com
|
|
Subject: [PATCH v6 2/4] firmware: raspberrypi: Introduce vl805 init routine
|
|
Date: Tue, 24 Mar 2020 19:28:10 +0100
|
|
Message-Id: <20200324182812.20420-3-nsaenzjulienne@suse.de>
|
|
X-Mailer: git-send-email 2.25.1
|
|
In-Reply-To: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
References: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
MIME-Version: 1.0
|
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
|
X-CRM114-CacheID: sfid-20200324_112827_110873_06144E1C
|
|
X-CRM114-Status: GOOD ( 15.67 )
|
|
X-Spam-Score: -2.3 (--)
|
|
X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
|
|
Content analysis details: (-2.3 points)
|
|
pts rule name description
|
|
---- ----------------------
|
|
--------------------------------------------------
|
|
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
|
|
[195.135.220.15 listed in wl.mailspike.net]
|
|
-2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,
|
|
medium trust [195.135.220.15 listed in list.dnswl.org]
|
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
|
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
|
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
|
X-Mailman-Version: 2.1.29
|
|
Precedence: list
|
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
|
List-Unsubscribe:
|
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
|
List-Subscribe:
|
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
|
Cc: tim.gover@raspberrypi.org, sergei.shtylyov@cogentembedded.com,
|
|
gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
|
|
linux-rpi-kernel@lists.infradead.org, linux-pci@vger.kernel.org,
|
|
linux-arm-kernel@lists.infradead.org, wahrenst@gmx.net
|
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
|
Errors-To:
|
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
|
|
|
On the Raspberry Pi 4, after a PCI reset, VL805's firmware may either be
|
|
loaded directly from an EEPROM or, if not present, by the SoC's
|
|
VideCore. The function informs VideCore that VL805 was just reset, or
|
|
requests for a probe defer.
|
|
|
|
Based on Tim Gover's downstream implementation.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
Changes since v4:
|
|
- Inline function definition when RASPBERRYPI_FIRMWARE is not defined
|
|
|
|
Changes since v1:
|
|
- Move include into .c file and add forward declaration to .h
|
|
|
|
drivers/firmware/raspberrypi.c | 38 ++++++++++++++++++++++
|
|
include/soc/bcm2835/raspberrypi-firmware.h | 7 ++++
|
|
2 files changed, 45 insertions(+)
|
|
|
|
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
|
|
index da26a584dca0..cbb495aff6a0 100644
|
|
--- a/drivers/firmware/raspberrypi.c
|
|
+++ b/drivers/firmware/raspberrypi.c
|
|
@@ -12,6 +12,7 @@
|
|
#include <linux/of_platform.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
+#include <linux/pci.h>
|
|
#include <soc/bcm2835/raspberrypi-firmware.h>
|
|
|
|
#define MBOX_MSG(chan, data28) (((data28) & ~0xf) | ((chan) & 0xf))
|
|
@@ -286,6 +287,43 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
|
|
}
|
|
EXPORT_SYMBOL_GPL(rpi_firmware_get);
|
|
|
|
+/*
|
|
+ * On the Raspberry Pi 4, after a PCI reset, VL805's firmware may either be
|
|
+ * loaded directly from an EEPROM or, if not present, by the SoC's VideCore.
|
|
+ * Inform VideCore that VL805 was just reset, or defer xhci's probe if not yet
|
|
+ * joinable trough the mailbox interface.
|
|
+ */
|
|
+int rpi_firmware_init_vl805(struct pci_dev *pdev)
|
|
+{
|
|
+ struct device_node *fw_np;
|
|
+ struct rpi_firmware *fw;
|
|
+ u32 dev_addr;
|
|
+ int ret;
|
|
+
|
|
+ fw_np = of_find_compatible_node(NULL, NULL,
|
|
+ "raspberrypi,bcm2835-firmware");
|
|
+ if (!fw_np)
|
|
+ return 0;
|
|
+
|
|
+ fw = rpi_firmware_get(fw_np);
|
|
+ of_node_put(fw_np);
|
|
+ if (!fw)
|
|
+ return -EPROBE_DEFER;
|
|
+
|
|
+ dev_addr = pdev->bus->number << 20 | PCI_SLOT(pdev->devfn) << 15 |
|
|
+ PCI_FUNC(pdev->devfn) << 12;
|
|
+
|
|
+ ret = rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_XHCI_RESET,
|
|
+ &dev_addr, sizeof(dev_addr));
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ dev_dbg(&pdev->dev, "loaded Raspberry Pi's VL805 firmware\n");
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rpi_firmware_init_vl805);
|
|
+
|
|
static const struct of_device_id rpi_firmware_of_match[] = {
|
|
{ .compatible = "raspberrypi,bcm2835-firmware", },
|
|
{},
|
|
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
|
|
index cc9cdbc66403..3025aca3c358 100644
|
|
--- a/include/soc/bcm2835/raspberrypi-firmware.h
|
|
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
|
|
@@ -10,6 +10,7 @@
|
|
#include <linux/of_device.h>
|
|
|
|
struct rpi_firmware;
|
|
+struct pci_dev;
|
|
|
|
enum rpi_firmware_property_status {
|
|
RPI_FIRMWARE_STATUS_REQUEST = 0,
|
|
@@ -141,6 +142,7 @@ int rpi_firmware_property(struct rpi_firmware *fw,
|
|
int rpi_firmware_property_list(struct rpi_firmware *fw,
|
|
void *data, size_t tag_size);
|
|
struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
|
|
+int rpi_firmware_init_vl805(struct pci_dev *pdev);
|
|
#else
|
|
static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,
|
|
void *data, size_t len)
|
|
@@ -158,6 +160,11 @@ static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware
|
|
{
|
|
return NULL;
|
|
}
|
|
+
|
|
+static inline int rpi_firmware_init_vl805(struct pci_dev *pdev)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
#endif
|
|
|
|
#endif /* __SOC_RASPBERRY_FIRMWARE_H__ */
|
|
|
|
From patchwork Tue Mar 24 18:28:11 2020
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
X-Patchwork-Id: 11456189
|
|
Return-Path:
|
|
<SRS0=7UWt=5J=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
|
[172.30.200.123])
|
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 168CB1667
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:29:15 +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 EAB942076E
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:29:14 +0000 (UTC)
|
|
Authentication-Results: mail.kernel.org;
|
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
|
header.i=@lists.infradead.org header.b="BOwwgdOE"
|
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAB942076E
|
|
Authentication-Results: mail.kernel.org;
|
|
dmarc=none (p=none dis=none) header.from=suse.de
|
|
Authentication-Results: mail.kernel.org;
|
|
spf=none
|
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:
|
|
Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
|
|
Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
|
|
List-Owner; bh=CLmK04T+baw5jWu/lH2cJ3fygso/fqFgoMOSigkpvRw=; b=BOwwgdOEAmbVoa
|
|
/8AtILxDfcKBVhbig0LKPFd94roUQzY/SylcBG5jWceT90PE3BxYgomfaBA6U41LW9Xe5LZsfylId
|
|
/IP3RNq34yRDWPXo3WWkLFYEtwJB60SWZlD8BG+ApGeUJ9z6vXTL9h3K9ThLwhFycZOkSxtDMicCG
|
|
vkP4ErkYnvASxQ021+lq/VxFgdnvtKcw2OE+ghhRHgOn8dc+/dJHCp8vi33Qrk9DFhKSGnSX/A5vz
|
|
E84/rlt964N9kXLE2npw9hNrj6DdrQozcB9YTAEL9S/krTUmOLI/iWS/DZEUA50xy9wVBqD9Bm78x
|
|
TS0oeyfH49HaUmd10Y6w==;
|
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
|
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoIa-0002oW-NS; Tue, 24 Mar 2020 18:29:12 +0000
|
|
Received: from mx2.suse.de ([195.135.220.15])
|
|
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoHr-00024Z-2w; Tue, 24 Mar 2020 18:28:29 +0000
|
|
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
|
|
Received: from relay2.suse.de (unknown [195.135.220.254])
|
|
by mx2.suse.de (Postfix) with ESMTP id 1A1A0ABF4;
|
|
Tue, 24 Mar 2020 18:28:24 +0000 (UTC)
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
To: linux-kernel@vger.kernel.org,
|
|
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
|
|
Florian Fainelli <f.fainelli@gmail.com>,
|
|
bcm-kernel-feedback-list@broadcom.com,
|
|
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
|
|
Andrew Murray <amurray@thegoodpenguin.co.uk>
|
|
Subject: [PATCH v6 3/4] PCI: brcmstb: Wait for Raspberry Pi's firmware when
|
|
present
|
|
Date: Tue, 24 Mar 2020 19:28:11 +0100
|
|
Message-Id: <20200324182812.20420-4-nsaenzjulienne@suse.de>
|
|
X-Mailer: git-send-email 2.25.1
|
|
In-Reply-To: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
References: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
MIME-Version: 1.0
|
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
|
X-CRM114-CacheID: sfid-20200324_112827_267470_0540B982
|
|
X-CRM114-Status: GOOD ( 12.13 )
|
|
X-Spam-Score: -2.3 (--)
|
|
X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
|
|
Content analysis details: (-2.3 points)
|
|
pts rule name description
|
|
---- ----------------------
|
|
--------------------------------------------------
|
|
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
|
|
[195.135.220.15 listed in wl.mailspike.net]
|
|
-2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,
|
|
medium trust [195.135.220.15 listed in list.dnswl.org]
|
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
|
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
|
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
|
X-Mailman-Version: 2.1.29
|
|
Precedence: list
|
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
|
List-Unsubscribe:
|
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
|
List-Subscribe:
|
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
|
Cc: tim.gover@raspberrypi.org, sergei.shtylyov@cogentembedded.com,
|
|
gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
|
|
linux-rpi-kernel@lists.infradead.org, linux-pci@vger.kernel.org,
|
|
Bjorn Helgaas <bhelgaas@google.com>, linux-arm-kernel@lists.infradead.org,
|
|
wahrenst@gmx.net
|
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
|
Errors-To:
|
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
|
|
|
xHCI's PCI fixup, run at the end of pcie-brcmstb's probe, depends on
|
|
RPi4's VideoCore firmware interface to be up and running. It's possible
|
|
for both initializations to race, so make sure it's available prior to
|
|
starting.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
drivers/pci/controller/pcie-brcmstb.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
|
|
index 3a10e678c7f4..a3d3070a5832 100644
|
|
--- a/drivers/pci/controller/pcie-brcmstb.c
|
|
+++ b/drivers/pci/controller/pcie-brcmstb.c
|
|
@@ -28,6 +28,8 @@
|
|
#include <linux/string.h>
|
|
#include <linux/types.h>
|
|
|
|
+#include <soc/bcm2835/raspberrypi-firmware.h>
|
|
+
|
|
#include "../pci.h"
|
|
|
|
/* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */
|
|
@@ -917,11 +919,24 @@ static int brcm_pcie_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *np = pdev->dev.of_node, *msi_np;
|
|
struct pci_host_bridge *bridge;
|
|
+ struct device_node *fw_np;
|
|
struct brcm_pcie *pcie;
|
|
struct pci_bus *child;
|
|
struct resource *res;
|
|
int ret;
|
|
|
|
+ /*
|
|
+ * We have to wait for the Raspberry Pi's firmware interface to be up
|
|
+ * as some PCI fixups depend on it.
|
|
+ */
|
|
+ fw_np = of_find_compatible_node(NULL, NULL,
|
|
+ "raspberrypi,bcm2835-firmware");
|
|
+ if (fw_np && !rpi_firmware_get(fw_np)) {
|
|
+ of_node_put(fw_np);
|
|
+ return -EPROBE_DEFER;
|
|
+ }
|
|
+ of_node_put(fw_np);
|
|
+
|
|
bridge = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie));
|
|
if (!bridge)
|
|
return -ENOMEM;
|
|
|
|
From patchwork Tue Mar 24 18:28:12 2020
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
X-Patchwork-Id: 11456185
|
|
Return-Path:
|
|
<SRS0=7UWt=5J=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
|
[172.30.200.123])
|
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD453174A
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:28:41 +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 8690720789
|
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
|
Tue, 24 Mar 2020 18:28:41 +0000 (UTC)
|
|
Authentication-Results: mail.kernel.org;
|
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
|
header.i=@lists.infradead.org header.b="BSDoMdbd"
|
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8690720789
|
|
Authentication-Results: mail.kernel.org;
|
|
dmarc=none (p=none dis=none) header.from=suse.de
|
|
Authentication-Results: mail.kernel.org;
|
|
spf=none
|
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:
|
|
Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
|
|
Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
|
|
List-Owner; bh=YaBoM78lqEEmZOW4u4cO0fQ+Qpc7vocOU6aRT/EpQsk=; b=BSDoMdbdXfJNCB
|
|
Ccoti2K8Qk9NgAlOnVt60cLhw66HCbJPwZn1v08f/rr05ZIoPMToFkJt5krqew7Vd+jlZnzMxf8MC
|
|
lBfOqOev9hIjbyu19c646LbpbqVrtrtm9vmy6Lvd2GGuQuvybpM0RHDvc2wzv8a3fejGMgKStaQ/3
|
|
Efne01FoiZvWBedWpTdsoGJbFzfSb4ua/8JT2Ki04i9itY4oTZs9itKK1Taqe3WfNDphluuFcmdGx
|
|
nNxQK/PkA6XCdpJHxaCz3DtyZj/2NhAqd8roXn+PUt5SG00Tfc6auERZQPLtTinW6m9ZaUkBhjJQ0
|
|
GHUMyyLHvQ583h1ty9ow==;
|
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
|
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoI3-0002Hl-Jz; Tue, 24 Mar 2020 18:28:39 +0000
|
|
Received: from mx2.suse.de ([195.135.220.15])
|
|
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jGoHq-00024d-Jc; Tue, 24 Mar 2020 18:28:28 +0000
|
|
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
|
|
Received: from relay2.suse.de (unknown [195.135.220.254])
|
|
by mx2.suse.de (Postfix) with ESMTP id EE53FABF6;
|
|
Tue, 24 Mar 2020 18:28:24 +0000 (UTC)
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
To: linux-kernel@vger.kernel.org,
|
|
Mathias Nyman <mathias.nyman@intel.com>
|
|
Subject: [PATCH v6 4/4] USB: pci-quirks: Add Raspberry Pi 4 quirk
|
|
Date: Tue, 24 Mar 2020 19:28:12 +0100
|
|
Message-Id: <20200324182812.20420-5-nsaenzjulienne@suse.de>
|
|
X-Mailer: git-send-email 2.25.1
|
|
In-Reply-To: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
References: <20200324182812.20420-1-nsaenzjulienne@suse.de>
|
|
MIME-Version: 1.0
|
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
|
X-CRM114-CacheID: sfid-20200324_112826_791336_2ABB38D1
|
|
X-CRM114-Status: GOOD ( 16.34 )
|
|
X-Spam-Score: -2.3 (--)
|
|
X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
|
|
Content analysis details: (-2.3 points)
|
|
pts rule name description
|
|
---- ----------------------
|
|
--------------------------------------------------
|
|
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
|
|
[195.135.220.15 listed in wl.mailspike.net]
|
|
-2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,
|
|
medium trust [195.135.220.15 listed in list.dnswl.org]
|
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
|
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
|
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
|
X-Mailman-Version: 2.1.29
|
|
Precedence: list
|
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
|
List-Unsubscribe:
|
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
|
List-Subscribe:
|
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
|
Cc: f.fainelli@gmail.com, sergei.shtylyov@cogentembedded.com,
|
|
gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
|
|
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, tim.gover@raspberrypi.org,
|
|
bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org,
|
|
linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
|
|
wahrenst@gmx.net
|
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
|
Errors-To:
|
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
|
|
|
On the Raspberry Pi 4, after a PCI reset, VL805's firmware may either be
|
|
loaded directly from an EEPROM or, if not present, by the SoC's
|
|
VideCore. Inform VideCore that VL805 was just reset.
|
|
|
|
Also, as this creates a dependency between USB_PCI and VideoCore's
|
|
firmware interface. Since USB_PCI can't be set as a module neither this
|
|
should.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
---
|
|
|
|
Changes since v5:
|
|
- Fix Kconfig issue with allmodconfig
|
|
|
|
Changes since v4:
|
|
- Do not split up error message
|
|
|
|
Changes since v3:
|
|
- Add more complete error message
|
|
|
|
Changes since v1:
|
|
- Make RASPBERRYPI_FIRMWARE dependent on this quirk to make sure it
|
|
gets compiled when needed.
|
|
|
|
drivers/firmware/Kconfig | 3 ++-
|
|
drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
|
|
index ea869addc89b..78ab2ad6d3f0 100644
|
|
--- a/drivers/firmware/Kconfig
|
|
+++ b/drivers/firmware/Kconfig
|
|
@@ -178,8 +178,9 @@ config ISCSI_IBFT
|
|
Otherwise, say N.
|
|
|
|
config RASPBERRYPI_FIRMWARE
|
|
- tristate "Raspberry Pi Firmware Driver"
|
|
+ bool "Raspberry Pi Firmware Driver"
|
|
depends on BCM2835_MBOX
|
|
+ default USB_PCI
|
|
help
|
|
This option enables support for communicating with the firmware on the
|
|
Raspberry Pi.
|
|
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
|
|
index beb2efa71341..0dc34668bb2a 100644
|
|
--- a/drivers/usb/host/pci-quirks.c
|
|
+++ b/drivers/usb/host/pci-quirks.c
|
|
@@ -16,6 +16,9 @@
|
|
#include <linux/export.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/dmi.h>
|
|
+
|
|
+#include <soc/bcm2835/raspberrypi-firmware.h>
|
|
+
|
|
#include "pci-quirks.h"
|
|
#include "xhci-ext-caps.h"
|
|
|
|
@@ -1243,11 +1246,24 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
|
|
|
|
static void quirk_usb_early_handoff(struct pci_dev *pdev)
|
|
{
|
|
+ int ret;
|
|
+
|
|
/* Skip Netlogic mips SoC's internal PCI USB controller.
|
|
* This device does not need/support EHCI/OHCI handoff
|
|
*/
|
|
if (pdev->vendor == 0x184e) /* vendor Netlogic */
|
|
return;
|
|
+
|
|
+ if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
|
|
+ ret = rpi_firmware_init_vl805(pdev);
|
|
+ if (ret) {
|
|
+ /* Firmware might be outdated, or something failed */
|
|
+ dev_warn(&pdev->dev,
|
|
+ "Failed to load VL805's firmware: %d. Will continue to attempt to work, but bad things might happen. You should fix this...\n",
|
|
+ ret);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
|
|
pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
|
|
pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
|