Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp908796ybj; Tue, 5 May 2020 09:28:22 -0700 (PDT) X-Google-Smtp-Source: APiQypK/HY7GljQSHD/Bbmhws/OEVvtVKBPMXkmz1K0RK1sDxbLWSpcbaow6LjJRdBoCuNnd1nce X-Received: by 2002:a17:906:31da:: with SMTP id f26mr3424389ejf.308.1588696102011; Tue, 05 May 2020 09:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588696102; cv=none; d=google.com; s=arc-20160816; b=0H3DPcft9RVoXeSbvSz/eoq3eMBaWHftWA1n5c4RJ03CLoQ4ozTmykvKhjAP1hUhiZ 9YnPc1eqI6ori8ANjX/4oeIrXRrZ7PF3MogXSfGb+ClnSFdcM1wxsYinEfk3Ng1yJrT2 SVWjrP8kiSIX4ImSo3hFzQewbq+S/Lza3Klhl84Sozz7RgsejNmyCWtIYwl7Hvp6kI/1 UyOwouZFCZ//HTnR35TStnBUrVq+2mTvgmyi5MCwMVhctjhDb6EWSOwCKZFOuHlGsvpv 6/ylBdF0Yi/KcWXx3wi6kCWXzUMtywJGHzPTIFIP6AlGia7/frAyzvIKzcPnh++FVB2b PnYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NzCJm57yPE04YEEY86Bqn73j62nuSL5fTKEmIyyWAeA=; b=KjnWcRKhkWhmlWDmxuBB+WU2rAjuKM08SzqU2SbYcKPpyA7kuzuyt2frCbsMVR/REc t4FUoe48muPx2Qfop3Yx29hvIunuxS3s4w/JRKu78w8xIFtDXf9Zz4TGi2pCZY4PD2LC cGdPDRWmJLZUR5DqXA2m464IzXEiaEIegoYIp0EQQtbjekVfuWVGC3uRa2AnYkItSNc1 NR2szMeRTJcjYNdaodxs3JVZHzeSIsBKC0x4KuEEnhgLGoWdsD8+icgzg2r8DQHIQcrL XK2PJLu0KLU+7OT2InkMvahFJt0Af7Z9PuudY6frlAKEjDNepkvNN0gS6J3OhlTCZ3Zv G82g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn16si1565035edb.488.2020.05.05.09.27.58; Tue, 05 May 2020 09:28:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730706AbgEEQ0V (ORCPT + 99 others); Tue, 5 May 2020 12:26:21 -0400 Received: from mx2.suse.de ([195.135.220.15]:57808 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729289AbgEEQ0T (ORCPT ); Tue, 5 May 2020 12:26:19 -0400 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 01199AED5; Tue, 5 May 2020 16:26:19 +0000 (UTC) From: Nicolas Saenz Julienne To: mbrugger@suse.com, u-boot@lists.denx.de, bmeng.cn@gmail.com, marex@denx.de, linux-kernel@vger.kernel.org Cc: sjg@chromium.org, m.szyprowski@samsung.com, s.nawrocki@samsung.com, mark.kettenis@xs4all.nl, Nicolas Saenz Julienne Subject: [PATCH v3 1/2] arm: rpi: Add function to trigger VL805's firmware load Date: Tue, 5 May 2020 18:26:06 +0200 Message-Id: <20200505162607.334-2-nsaenzjulienne@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200505162607.334-1-nsaenzjulienne@suse.de> References: <20200505162607.334-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On the Raspberry Pi 4, after a PCI reset, VL805's (a xHCI chip) firmware may either be loaded directly from an EEPROM or, if not present, by the SoC's VideCore (the SoC's co-processor). Introduce the function that informs VideCore that VL805 may need its firmware loaded. Signed-off-by: Nicolas Saenz Julienne --- Changes since v2: - Correct wrong function name in comment - Add better comment on rpi_firmware_init_vl805() Changes since v1: - Rename function so it's not mistaken with regular firmware loading arch/arm/mach-bcm283x/include/mach/mbox.h | 13 +++++++ arch/arm/mach-bcm283x/include/mach/msg.h | 7 ++++ arch/arm/mach-bcm283x/msg.c | 45 +++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index 60e226ce1d..2ae2d3d97c 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -491,6 +491,19 @@ struct bcm2835_mbox_tag_set_palette { } body; }; +#define BCM2835_MBOX_TAG_NOTIFY_XHCI_RESET 0x00030058 + +struct bcm2835_mbox_tag_pci_dev_addr { + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + u32 dev_addr; + } req; + struct { + } resp; + } body; +}; + /* * Pass a raw u32 message to the VC, and receive a raw u32 back. * diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h index 4afb08631b..f5213dd0e0 100644 --- a/arch/arm/mach-bcm283x/include/mach/msg.h +++ b/arch/arm/mach-bcm283x/include/mach/msg.h @@ -48,4 +48,11 @@ int bcm2835_set_video_params(int *widthp, int *heightp, int depth_bpp, int pixel_order, int alpha_mode, ulong *fb_basep, ulong *fb_sizep, int *pitchp); +/** + * bcm2711_notify_vl805_reset() - get vl805's firmware loaded + * + * @return 0 if OK, -EIO on error + */ +int bcm2711_notify_vl805_reset(void); + #endif diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c index 94b75283f8..f8ef531652 100644 --- a/arch/arm/mach-bcm283x/msg.c +++ b/arch/arm/mach-bcm283x/msg.c @@ -40,6 +40,12 @@ struct msg_setup { u32 end_tag; }; +struct msg_notify_vl805_reset { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_pci_dev_addr dev_addr; + u32 end_tag; +}; + int bcm2835_power_on_module(u32 module) { ALLOC_CACHE_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1); @@ -151,3 +157,42 @@ int bcm2835_set_video_params(int *widthp, int *heightp, int depth_bpp, return 0; } + +/* + * The Raspberry Pi 4 gets its USB functionality from VL805, a PCIe chip that + * implements xHCI. After a PCI reset, VL805's firmware may either be loaded + * directly from an EEPROM or, if not present, by the SoC's co-processor, + * VideoCore. RPi4's VideoCore OS contains both the non public firmware load + * logic and the VL805 firmware blob. This function triggers the aforementioned + * process. + */ +int bcm2711_notify_vl805_reset(void) +{ + ALLOC_CACHE_ALIGN_BUFFER(struct msg_notify_vl805_reset, + msg_notify_vl805_reset, 1); + int ret; + + BCM2835_MBOX_INIT_HDR(msg_notify_vl805_reset); + BCM2835_MBOX_INIT_TAG(&msg_notify_vl805_reset->dev_addr, + NOTIFY_XHCI_RESET); + + /* + * The pci device address is expected like this: + * + * PCI_BUS << 20 | PCI_SLOT << 15 | PCI_FUNC << 12 + * + * But since RPi4's PCIe setup is hardwired, we know the address in + * advance. + */ + msg_notify_vl805_reset->dev_addr.body.req.dev_addr = 0x100000; + + ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, + &msg_notify_vl805_reset->hdr); + if (ret) { + printf("bcm2711: Faild to load vl805's firmware, %d\n", ret); + return -EIO; + } + + return 0; +} + -- 2.26.2