From: Anders Roxell <anders.roxell@linaro.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: "Mathias Nyman" <mathias.nyman@intel.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
linux-arm-msm@vger.kernel.org,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
"Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>,
"Christian Lamparter" <chunkeey@googlemail.com>,
"John Stultz" <john.stultz@linaro.org>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Andreas Böhler" <dev@aboehler.at>,
linux-usb@vger.kernel.org,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v13 3/5] usb: xhci: Add support for Renesas controller with memory
Date: Mon, 18 May 2020 19:53:17 +0200 [thread overview]
Message-ID: <CADYN=9JLeWHODRWDEcTE_6iZ3TX-E4yyx3OwqzK-H-ytLAmQUg@mail.gmail.com> (raw)
In-Reply-To: <20200506060025.1535960-4-vkoul@kernel.org>
On Wed, 6 May 2020 at 08:01, Vinod Koul <vkoul@kernel.org> wrote:
>
> Some rensas controller like uPD720201 and uPD720202 need firmware to be
> loaded. Add these devices in pci table and invoke renesas firmware loader
> functions to check and load the firmware into device memory when
> required.
>
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
Hi, I got a build error when I built an arm64 allmodconfig kernel.
building obj-arm64-next-20200518
aarch64-linux-gnu-ld: drivers/usb/host/xhci-pci.o: in function
`xhci_pci_remove':
/srv/src/kernel/next/obj-arm64-next-20200518/../drivers/usb/host/xhci-pci.c:411:
undefined reference to `renesas_xhci_pci_exit'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200518/../drivers/usb/host/xhci-pci.c:411:(.text+0xd8):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol
`renesas_xhci_pci_exit'
aarch64-linux-gnu-ld: drivers/usb/host/xhci-pci.o: in function `xhci_pci_probe':
/srv/src/kernel/next/obj-arm64-next-20200518/../drivers/usb/host/xhci-pci.c:345:
undefined reference to `renesas_xhci_check_request_fw'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200518/../drivers/usb/host/xhci-pci.c:345:(.text+0x2298):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol
`renesas_xhci_check_request_fw'
make[1]: *** [/srv/src/kernel/next/Makefile:1126: vmlinux] Error 1
make[1]: Target 'Image' not remade because of errors.
make: *** [Makefile:185: __sub-make] Error 2
make: Target 'Image' not remade because of errors.
When I reverted this patch from todays next tag next-20200518 I
managed to build.
Cheers,
Anders
> ---
> drivers/usb/host/xhci-pci.c | 35 ++++++++++++++++++++++++++++++++++-
> drivers/usb/host/xhci.h | 1 +
> 2 files changed, 35 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index b6c2f5c530e3..ef513c2fb843 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -15,6 +15,7 @@
>
> #include "xhci.h"
> #include "xhci-trace.h"
> +#include "xhci-pci.h"
>
> #define SSIC_PORT_NUM 2
> #define SSIC_PORT_CFG2 0x880c
> @@ -87,7 +88,16 @@ static int xhci_pci_reinit(struct xhci_hcd *xhci, struct pci_dev *pdev)
>
> static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
> {
> - struct pci_dev *pdev = to_pci_dev(dev);
> + struct pci_dev *pdev = to_pci_dev(dev);
> + struct xhci_driver_data *driver_data;
> + const struct pci_device_id *id;
> +
> + id = pci_match_id(pdev->driver->id_table, pdev);
> +
> + if (id && id->driver_data) {
> + driver_data = (struct xhci_driver_data *)id->driver_data;
> + xhci->quirks |= driver_data->quirks;
> + }
>
> /* Look for vendor-specific quirks */
> if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
> @@ -328,6 +338,14 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
> int retval;
> struct xhci_hcd *xhci;
> struct usb_hcd *hcd;
> + struct xhci_driver_data *driver_data;
> +
> + driver_data = (struct xhci_driver_data *)id->driver_data;
> + if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) {
> + retval = renesas_xhci_check_request_fw(dev, id);
> + if (retval)
> + return retval;
> + }
>
> /* Prevent runtime suspending between USB-2 and USB-3 initialization */
> pm_runtime_get_noresume(&dev->dev);
> @@ -389,6 +407,9 @@ static void xhci_pci_remove(struct pci_dev *dev)
> struct xhci_hcd *xhci;
>
> xhci = hcd_to_xhci(pci_get_drvdata(dev));
> + if (xhci->quirks & XHCI_RENESAS_FW_QUIRK)
> + renesas_xhci_pci_exit(dev);
> +
> xhci->xhc_state |= XHCI_STATE_REMOVING;
>
> if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
> @@ -540,14 +561,26 @@ static void xhci_pci_shutdown(struct usb_hcd *hcd)
>
> /*-------------------------------------------------------------------------*/
>
> +static const struct xhci_driver_data reneses_data = {
> + .quirks = XHCI_RENESAS_FW_QUIRK,
> + .firmware = "renesas_usb_fw.mem",
> +};
> +
> /* PCI driver selection metadata; PCI hotplugging uses this */
> static const struct pci_device_id pci_ids[] = {
> + { PCI_DEVICE(0x1912, 0x0014),
> + .driver_data = (unsigned long)&reneses_data,
> + },
> + { PCI_DEVICE(0x1912, 0x0015),
> + .driver_data = (unsigned long)&reneses_data,
> + },
> /* handle any USB 3.0 xHCI controller */
> { PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0),
> },
> { /* end: all zeroes */ }
> };
> MODULE_DEVICE_TABLE(pci, pci_ids);
> +MODULE_FIRMWARE("renesas_usb_fw.mem");
>
> /* pci driver glue; this is a "new style" PCI driver module */
> static struct pci_driver xhci_pci_driver = {
> diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> index 3289bb516201..4047363c7423 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1873,6 +1873,7 @@ struct xhci_hcd {
> #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33)
> #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34)
> #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35)
> +#define XHCI_RENESAS_FW_QUIRK BIT_ULL(36)
>
> unsigned int num_active_eps;
> unsigned int limit_active_eps;
> --
> 2.25.4
>
next prev parent reply other threads:[~2020-05-18 18:20 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 6:00 [PATCH v13 0/5] usb: xhci: Add support for Renesas USB controllers Vinod Koul
2020-05-06 6:00 ` [PATCH v13 1/5] usb: hci: add hc_driver as argument for usb_hcd_pci_probe Vinod Koul
2020-05-06 6:00 ` [PATCH v13 2/5] usb: renesas-xhci: Add the renesas xhci driver Vinod Koul
2020-05-19 11:45 ` Heikki Krogerus
2020-05-19 12:01 ` Vinod Koul
2020-05-19 12:51 ` Heikki Krogerus
2020-05-19 20:19 ` Christian Lamparter
2020-05-20 13:27 ` Heikki Krogerus
2020-05-06 6:00 ` [PATCH v13 3/5] usb: xhci: Add support for Renesas controller with memory Vinod Koul
2020-05-18 17:53 ` Anders Roxell [this message]
2020-05-18 19:57 ` Vinod Koul
2020-05-18 22:37 ` Anders Roxell
2020-05-19 4:53 ` Vinod Koul
2020-05-19 7:44 ` Arnd Bergmann
2020-05-19 12:42 ` Vinod Koul
2020-05-18 22:42 ` Bjorn Andersson
2020-05-06 6:00 ` [PATCH v13 4/5] usb: renesas-xhci: Add ROM loader for uPD720201 Vinod Koul
2020-05-06 6:00 ` [PATCH v13 5/5] usb: xhci: provide a debugfs hook for erasing rom Vinod Koul
2020-05-13 12:36 ` Mathias Nyman
2020-05-13 12:45 ` Greg Kroah-Hartman
2020-05-14 9:24 ` Greg Kroah-Hartman
2020-05-14 11:26 ` Vinod Koul
2020-05-14 11:46 ` Greg Kroah-Hartman
2020-05-14 12:15 ` Vinod Koul
2020-05-13 12:19 ` [PATCH v13 0/5] usb: xhci: Add support for Renesas USB controllers Mathias Nyman
2020-05-13 12:40 ` Greg Kroah-Hartman
2020-05-13 12:51 ` Mathias Nyman
2020-05-13 12:52 ` Greg Kroah-Hartman
2020-05-13 12:57 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADYN=9JLeWHODRWDEcTE_6iZ3TX-E4yyx3OwqzK-H-ytLAmQUg@mail.gmail.com' \
--to=anders.roxell@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=chunkeey@googlemail.com \
--cc=dev@aboehler.at \
--cc=gregkh@linuxfoundation.org \
--cc=john.stultz@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=stern@rowland.harvard.edu \
--cc=vkoul@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).