Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Apr 2015 19:13:51 +0000 (UTC)
From:      Neel Natu <neel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r281499 - head/sys/dev/usb/controller
Message-ID:  <201504131913.t3DJDqvx062305@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: neel
Date: Mon Apr 13 19:13:51 2015
New Revision: 281499
URL: https://svnweb.freebsd.org/changeset/base/281499

Log:
  Modify the return value of the uhci/ehci/xhci PCI probe routines to
  'BUS_PROBE_DEFAULT'. This allows bhyve's 'ppt' driver to claim ownership
  of the device and pass it through to the guest.
  
  In the common case where there are no competing drivers for USB controllers
  this change is a no-op.
  
  Reviewed by:	hselasky
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/controller/ehci_pci.c
  head/sys/dev/usb/controller/uhci_pci.c
  head/sys/dev/usb/controller/xhci_pci.c

Modified: head/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_pci.c	Mon Apr 13 16:43:06 2015	(r281498)
+++ head/sys/dev/usb/controller/ehci_pci.c	Mon Apr 13 19:13:51 2015	(r281499)
@@ -220,7 +220,7 @@ ehci_pci_probe(device_t self)
 
 	if (desc) {
 		device_set_desc(self, desc);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	} else {
 		return (ENXIO);
 	}

Modified: head/sys/dev/usb/controller/uhci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/uhci_pci.c	Mon Apr 13 16:43:06 2015	(r281498)
+++ head/sys/dev/usb/controller/uhci_pci.c	Mon Apr 13 19:13:51 2015	(r281499)
@@ -244,7 +244,7 @@ uhci_pci_probe(device_t self)
 
 	if (desc) {
 		device_set_desc(self, desc);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	} else {
 		return (ENXIO);
 	}

Modified: head/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci_pci.c	Mon Apr 13 16:43:06 2015	(r281498)
+++ head/sys/dev/usb/controller/xhci_pci.c	Mon Apr 13 19:13:51 2015	(r281499)
@@ -131,7 +131,7 @@ xhci_pci_probe(device_t self)
 
 	if (desc) {
 		device_set_desc(self, desc);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	} else {
 		return (ENXIO);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504131913.t3DJDqvx062305>