From patchwork Tue May 19 05:06:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 189086 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 98653C433DF for ; Tue, 19 May 2020 05:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6EBC22075F for ; Tue, 19 May 2020 05:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589864797; bh=XsPeKd9drW5XbmMQEhFn4Sn06g1yztiEDGzG7U3P1RU=; h=From:To:Cc:Subject:Date:List-ID:From; b=r9unfgaH+VtlaQpTI3nKrckj/rZKyOaevrrg8xZN2PGnjhTOU4YD2XfEvsSd5kbwL JMwzfWJOhdE6AGRuZvh5+VofQ5cJjtap+HtVYg/A0AEP7Tzhd9VGXvzb9DYA7oC+IA BfQXq5Pmp2RN2lGdtJnFKl3HqMyfnazolXLRN0iE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbgESFGh (ORCPT ); Tue, 19 May 2020 01:06:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:58422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726366AbgESFGg (ORCPT ); Tue, 19 May 2020 01:06:36 -0400 Received: from localhost.localdomain (unknown [122.182.207.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F81020758; Tue, 19 May 2020 05:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589864796; bh=XsPeKd9drW5XbmMQEhFn4Sn06g1yztiEDGzG7U3P1RU=; h=From:To:Cc:Subject:Date:From; b=RjmQmuMEJQgQK2LMqDNokkVc7g4NGaOZF+YeF5wWUa/sCdY+gkIErINUUEqKOEes6 IaPG/K3+bNEP57UDsp+NuajpbGSTZdPz8P9t/iug7rP/aSPtHBf/QBU41cRn2cvouZ /DDvd7q+t0vj6NVhXuulj5DUKDVD1x6pU5PXdWmo= From: Vinod Koul To: Mathias Nyman , Greg Kroah-Hartman Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Christian Lamparter , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Anders Roxell , Arnd Bergmann Subject: [PATCH] usb: xhci: fix USB_XHCI_PCI depends Date: Tue, 19 May 2020 10:36:22 +0530 Message-Id: <20200519050622.994908-1-vkoul@kernel.org> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The xhci-pci-renesas module exports symbols for xhci-pci to load the RAM/ROM on renesas xhci controllers. We had dependency which works when both the modules are builtin or modules. But if xhci-pci is inbuilt and xhci-pci-renesas in module, we get below linker error: drivers/usb/host/xhci-pci.o: In function `xhci_pci_remove': drivers/usb/host/xhci-pci.c:411: undefined reference to `renesas_xhci_pci_exit' drivers/usb/host/xhci-pci.o: In function `xhci_pci_probe': drivers/usb/host/xhci-pci.c:345: undefined reference to `renesas_xhci_check_request_fw' Fix this by adding USB_XHCI_PCI having depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS so that both can be either inbuilt or modules. Reported-by: Anders Roxell Fixes: a66d21d7dba8 ("usb: xhci: Add support for Renesas controller with memory") Tested-by: Anders Roxell Signed-off-by: Vinod Koul Reviewed-by: Bjorn Andersson --- drivers/usb/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index b5c542d6a1c5..92783d175b3f 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP config USB_XHCI_PCI tristate depends on USB_PCI + depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS default y config USB_XHCI_PCI_RENESAS tristate "Support for additional Renesas xHCI controller with firwmare" - depends on USB_XHCI_PCI ---help--- Say 'Y' to enable the support for the Renesas xHCI controller with firwmare. Make sure you have the firwmare for the device and