linux-kernel - RE: [PATCHv7 7/8] usb: dwc2: move usb_disabled() call to host driver only

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <A2CA0424C0A6F04399FB9E1CD98E0304844EBCF2@US01WEMBX2.internal.synopsys.com>
Date:	Fri, 14 Nov 2014 20:58:08 +0000
From:	Paul Zimmerman <Paul.Zimmerman@...opsys.com>
To:	"dinguyen@...nsource.altera.com" <dinguyen@...nsource.altera.com>,
	"balbi@...com" <balbi@...com>
CC:	"dinh.linux@...il.com" <dinh.linux@...il.com>,
	"swarren@...dotorg.org" <swarren@...dotorg.org>,
	"b.zolnierkie@...sung.com" <b.zolnierkie@...sung.com>,
	"matthijs@...in.nl" <matthijs@...in.nl>,
	"r.baldyga@...sung.com" <r.baldyga@...sung.com>,
	"jg1.han@...sung.com" <jg1.han@...sung.com>,
	"sachin.kamat@...aro.org" <sachin.kamat@...aro.org>,
	"ben-linux@...ff.org" <ben-linux@...ff.org>,
	"dianders@...omium.org" <dianders@...omium.org>,
	"kever.yang@...k-chips.com" <kever.yang@...k-chips.com>,
	"linux-usb@...r.kernel.org" <linux-usb@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCHv7 7/8] usb: dwc2: move usb_disabled() call to host
 driver only

> From: dinguyen@...nsource.altera.com [mailto:dinguyen@...nsource.altera.com]
> Sent: Tuesday, November 11, 2014 9:14 AM
> 
> From: Dinh Nguyen <dinguyen@...nsource.altera.com>
> 
> Since platform.c will get built for both Host and Gadget, if we leave the
> usb_disabled() call in platform.c, it results in the following build error
> when (!USB && USB_GADGET) condition is met.
> 
> ERROR: "usb_disabled" [drivers/usb/dwc2/dwc2_platform.ko] undefined!
> 
> Since usb_disabled() is mostly used to disable USB host functionality, move
> the call the host portion for the DWC2 driver.
> 
> Signed-off-by: Dinh Nguyen <dinguyen@...nsource.altera.com>
> ---
>  drivers/usb/dwc2/hcd.c      | 3 +++
>  drivers/usb/dwc2/platform.c | 3 ---
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index fa60f4a..755e16b 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -2780,6 +2780,9 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
>  	int i, num_channels;
>  	int retval;
> 
> +	if (usb_disabled())
> +		return -ENODEV;
> +
>  	dev_dbg(hsotg->dev, "DWC OTG HCD INIT\n");
> 
>  	/* Detect config values from hardware */
> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
> index 3552602..57eb8a3 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -157,9 +157,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
>  	int retval;
>  	int irq;
> 
> -	if (usb_disabled())
> -		return -ENODEV;
> -
>  	match = of_match_device(dwc2_of_match_table, &dev->dev);
>  	if (match && match->data) {
>  		params = match->data;

This patch also fixes a minor buglet, in that we were missing the
usb_disabled() check in pci.c.

Acked-by: Paul Zimmerman <paulz@...opsys.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/