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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 6E086C54E4A for ; Mon, 11 May 2020 14:25:25 +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 250F920736 for ; Mon, 11 May 2020 14:25:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ly2Ejox8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 250F920736 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com 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=pC3GpQRL5sHk9KMtFFcOTKXL/DCSECqT9KI252iqnCg=; b=ly2Ejox81b751j WwKuSJFv9b8QhxIS4M9O4RmcDBquS7XjUpJX89QXQj4pkjdZBCvk3x2HYSWJabS4RA2C+ayuMdPGx dmwZQSHMrJmIg8PeyNpPICCR18xfkmpLOiRSOQwc/ji35iH2nsvUGNp16LVk8bN/AQF+Zmq91KDn3 mmrETUsOhUcXZ0vZym+8c+HxMnxmRZ+/3OSJg/xW8B42FWAvwAWqOVPfg+6WyiR1RGcipS7DrEldl SVIUAz9eXUVOBjkm2wbvNYU2SsJnnKi+qYPP5bsG/KOeAifPWqkC92NYyrA5Z1Vkk48C4undVtd/E UwdxIoUlouuwRPG/uGtg==; 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 1jY9My-0008Ro-1B; Mon, 11 May 2020 14:25:24 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jY9Mu-0008Qi-MS; Mon, 11 May 2020 14:25:22 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E051F1045; Mon, 11 May 2020 07:25:18 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3F4643F68F; Mon, 11 May 2020 07:25:17 -0700 (PDT) Date: Mon, 11 May 2020 15:25:14 +0100 From: Lorenzo Pieralisi To: Nicolas Saenz Julienne , Mathias Nyman Subject: Re: [PATCH v8 4/4] USB: pci-quirks: Add Raspberry Pi 4 quirk Message-ID: <20200511142514.GB27249@e121166-lin.cambridge.arm.com> References: <20200505161318.26200-1-nsaenzjulienne@suse.de> <20200505161318.26200-5-nsaenzjulienne@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200505161318.26200-5-nsaenzjulienne@suse.de> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200511_072520_824867_7020AF53 X-CRM114-Status: GOOD ( 21.05 ) 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: f.fainelli@gmail.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, tim.gover@raspberrypi.org, helgaas@kernel.org, wahrenst@gmx.net, linux-pci@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, May 05, 2020 at 06:13:17PM +0200, Nicolas Saenz Julienne wrote: > 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 > VideoCore. Inform VideoCore that VL805 was just reset. > > Also, as this creates a dependency between USB_PCI and VideoCore's > firmware interface, and since USB_PCI can't be set as a module neither > this can. Reflect that on the firmware interface Kconfg. > > Signed-off-by: Nicolas Saenz Julienne > --- > > 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(-) Hi Mathias, I would need your ACK to merge this series, thanks. Lorenzo > diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig > index 8007d4aa76dc..b42140cff8ac 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 92150ecdb036..0b949acfa258 100644 > --- a/drivers/usb/host/pci-quirks.c > +++ b/drivers/usb/host/pci-quirks.c > @@ -16,6 +16,9 @@ > #include > #include > #include > + > +#include > + > #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 && > -- > 2.26.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel