From nobody@FreeBSD.org  Mon Mar 19 07:49:50 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B3F6106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Mar 2012 07:49:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D75B8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Mar 2012 07:49:50 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q2J7nnGs051694
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Mar 2012 07:49:49 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q2J7nnkt051693;
	Mon, 19 Mar 2012 07:49:49 GMT
	(envelope-from nobody)
Message-Id: <201203190749.q2J7nnkt051693@red.freebsd.org>
Date: Mon, 19 Mar 2012 07:49:49 GMT
From: Pavel Timofeev <timp87@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: missing module dependencies
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         166239
>Category:       kern
>Synopsis:       [modules] [patch] missing module dependencies
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 07:50:12 UTC 2012
>Closed-Date:    Wed Jun 06 06:41:39 UTC 2012
>Last-Modified:  Wed Jun 06 06:41:39 UTC 2012
>Originator:     Pavel Timofeev
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
hptiop(4), hptmv(4) and isp(4) don't have necessary dependencies for loading themselves as modules.

Obtained from (see all thread)
http://lists.freebsd.org/pipermail/freebsd-stable/2012-March/066607.html
http://lists.freebsd.org/pipermail/freebsd-scsi/2012-March/005333.html
>How-To-Repeat:
remove such devices from kernconf. then recompile kernel and try to load hptiop(4), hptmv(4) and isp(4) as modules.
>Fix:
see attached patch

Patch attached with submission follows:

--- /sys/dev/hptiop/hptiop.c	2012-03-12 12:03:51.000000000 +0400
+++ ./hptiop/hptiop.c	2012-03-11 13:14:49.000000000 +0400
@@ -1268,6 +1268,7 @@
 };
 
 DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
+MODULE_DEPEND(hptiop, cam, 1, 1, 1);
 
 static int hptiop_probe(device_t dev)
 {
--- /sys/dev/hptmv/entry.c	2012-03-12 12:03:51.000000000 +0400
+++ ./hptmv/entry.c	2012-03-11 13:15:14.000000000 +0400
@@ -108,6 +108,7 @@
 
 #define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6)
 __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
+MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1); 
 
 #define ccb_ccb_ptr spriv_ptr0
 #define ccb_adapter ccb_h.spriv_ptr1
--- /sys/dev/isp/isp_pci.c	2011-11-16 06:52:24.000000000 +0400
+++ ./isp/isp_pci.c	2012-03-13 11:28:28.000000000 +0400
@@ -372,6 +372,8 @@
 };
 static devclass_t isp_devclass;
 DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
+MODULE_DEPEND(isp, cam, 1, 1, 1);
+MODULE_DEPEND(isp, firmware, 1, 1, 1);
 
 static int
 isp_pci_probe(device_t dev)
--- /sys/dev/isp/isp_sbus.c	2011-02-15 00:50:51.000000000 +0300
+++ ./isp/isp_sbus.c	2012-03-13 11:28:43.000000000 +0400
@@ -106,6 +106,8 @@
 };
 static devclass_t isp_devclass;
 DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
+MODULE_DEPEND(isp, cam, 1, 1, 1);
+MODULE_DEPEND(isp, firmware, 1, 1, 1);
 
 static int
 isp_sbus_probe(device_t dev)


>Release-Note:
>Audit-Trail:

From: Pavel Timofeev <timp87@gmail.com>
To: bug-followup@FreeBSD.org, timp87@gmail.com
Cc:  
Subject: Re: kern/166239: [modules] [patch] missing module dependencies
Date: Tue, 10 Apr 2012 09:31:48 +0400

 reassign it to freebsd-scsi please
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun Apr 15 20:25:03 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166239 
State-Changed-From-To: open->analyzed 
State-Changed-By: eadler 
State-Changed-When: Wed May 16 02:52:03 UTC 2012 
State-Changed-Why:  
awaiting approval 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166239 
State-Changed-From-To: analyzed->patched 
State-Changed-By: eadler 
State-Changed-When: Fri Jun 1 04:38:45 UTC 2012 
State-Changed-Why:  
committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166239 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/166239: commit references a PR
Date: Fri,  1 Jun 2012 04:34:59 +0000 (UTC)

 Author: eadler
 Date: Fri Jun  1 04:34:49 2012
 New Revision: 236379
 URL: http://svn.freebsd.org/changeset/base/236379
 
 Log:
   Adding missing dependancies for loading hptiop(4), hptmv(4) and isp(4) as modules.
   
   PR:		kern/166239
   Submitted by:	Pavel Timofeev <timp87@gmail.com>
   Discussed on:	-stable, -scsi
   Reviewed by:	scottl
   No objection from: mjacob
   Approved by:	cperciva
   MFC after:	3 days
 
 Modified:
   head/sys/dev/hptiop/hptiop.c
   head/sys/dev/hptmv/entry.c
   head/sys/dev/isp/isp_pci.c
   head/sys/dev/isp/isp_sbus.c
 
 Modified: head/sys/dev/hptiop/hptiop.c
 ==============================================================================
 --- head/sys/dev/hptiop/hptiop.c	Fri Jun  1 04:26:50 2012	(r236378)
 +++ head/sys/dev/hptiop/hptiop.c	Fri Jun  1 04:34:49 2012	(r236379)
 @@ -1268,6 +1268,7 @@ static driver_t hptiop_pci_driver = {
  };
  
  DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
 +MODULE_DEPEND(hptiop, cam, 1, 1, 1);
  
  static int hptiop_probe(device_t dev)
  {
 
 Modified: head/sys/dev/hptmv/entry.c
 ==============================================================================
 --- head/sys/dev/hptmv/entry.c	Fri Jun  1 04:26:50 2012	(r236378)
 +++ head/sys/dev/hptmv/entry.c	Fri Jun  1 04:34:49 2012	(r236379)
 @@ -108,6 +108,7 @@ static devclass_t	hpt_devclass;
  
  #define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6)
  __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 +MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
  
  #define ccb_ccb_ptr spriv_ptr0
  #define ccb_adapter ccb_h.spriv_ptr1
 
 Modified: head/sys/dev/isp/isp_pci.c
 ==============================================================================
 --- head/sys/dev/isp/isp_pci.c	Fri Jun  1 04:26:50 2012	(r236378)
 +++ head/sys/dev/isp/isp_pci.c	Fri Jun  1 04:34:49 2012	(r236379)
 @@ -372,6 +372,8 @@ static driver_t isp_pci_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_pci_probe(device_t dev)
 
 Modified: head/sys/dev/isp/isp_sbus.c
 ==============================================================================
 --- head/sys/dev/isp/isp_sbus.c	Fri Jun  1 04:26:50 2012	(r236378)
 +++ head/sys/dev/isp/isp_sbus.c	Fri Jun  1 04:34:49 2012	(r236379)
 @@ -106,6 +106,8 @@ static driver_t isp_sbus_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_sbus_probe(device_t dev)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/166239: commit references a PR
Date: Wed,  6 Jun 2012 04:38:40 +0000 (UTC)

 Author: eadler
 Date: Wed Jun  6 04:38:25 2012
 New Revision: 236655
 URL: http://svn.freebsd.org/changeset/base/236655
 
 Log:
   MFC r236379:
   	   Adding missing dependancies for loading hptiop(4), hptmv(4) and isp(4) as modules.
   
   PR:		kern/166239
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/9/sys/dev/hptiop/hptiop.c
   stable/9/sys/dev/hptmv/entry.c
   stable/9/sys/dev/isp/isp_pci.c
   stable/9/sys/dev/isp/isp_sbus.c
 Directory Properties:
   stable/9/sys/   (props changed)
   stable/9/sys/dev/   (props changed)
 
 Modified: stable/9/sys/dev/hptiop/hptiop.c
 ==============================================================================
 --- stable/9/sys/dev/hptiop/hptiop.c	Wed Jun  6 04:26:27 2012	(r236654)
 +++ stable/9/sys/dev/hptiop/hptiop.c	Wed Jun  6 04:38:25 2012	(r236655)
 @@ -1268,6 +1268,7 @@ static driver_t hptiop_pci_driver = {
  };
  
  DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
 +MODULE_DEPEND(hptiop, cam, 1, 1, 1);
  
  static int hptiop_probe(device_t dev)
  {
 
 Modified: stable/9/sys/dev/hptmv/entry.c
 ==============================================================================
 --- stable/9/sys/dev/hptmv/entry.c	Wed Jun  6 04:26:27 2012	(r236654)
 +++ stable/9/sys/dev/hptmv/entry.c	Wed Jun  6 04:38:25 2012	(r236655)
 @@ -108,6 +108,7 @@ static devclass_t	hpt_devclass;
  
  #define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6)
  __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 +MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
  
  #define ccb_ccb_ptr spriv_ptr0
  #define ccb_adapter ccb_h.spriv_ptr1
 
 Modified: stable/9/sys/dev/isp/isp_pci.c
 ==============================================================================
 --- stable/9/sys/dev/isp/isp_pci.c	Wed Jun  6 04:26:27 2012	(r236654)
 +++ stable/9/sys/dev/isp/isp_pci.c	Wed Jun  6 04:38:25 2012	(r236655)
 @@ -372,6 +372,8 @@ static driver_t isp_pci_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_pci_probe(device_t dev)
 
 Modified: stable/9/sys/dev/isp/isp_sbus.c
 ==============================================================================
 --- stable/9/sys/dev/isp/isp_sbus.c	Wed Jun  6 04:26:27 2012	(r236654)
 +++ stable/9/sys/dev/isp/isp_sbus.c	Wed Jun  6 04:38:25 2012	(r236655)
 @@ -106,6 +106,8 @@ static driver_t isp_sbus_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_sbus_probe(device_t dev)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/166239: commit references a PR
Date: Wed,  6 Jun 2012 04:39:04 +0000 (UTC)

 Author: eadler
 Date: Wed Jun  6 04:38:45 2012
 New Revision: 236656
 URL: http://svn.freebsd.org/changeset/base/236656
 
 Log:
   MFC r236379:
   	   Adding missing dependancies for loading hptiop(4), hptmv(4) and isp(4) as modules.
   
   PR:		kern/166239
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/8/sys/dev/hptiop/hptiop.c
   stable/8/sys/dev/hptmv/entry.c
   stable/8/sys/dev/isp/isp_pci.c
   stable/8/sys/dev/isp/isp_sbus.c
 Directory Properties:
   stable/8/sys/   (props changed)
 
 Modified: stable/8/sys/dev/hptiop/hptiop.c
 ==============================================================================
 --- stable/8/sys/dev/hptiop/hptiop.c	Wed Jun  6 04:38:25 2012	(r236655)
 +++ stable/8/sys/dev/hptiop/hptiop.c	Wed Jun  6 04:38:45 2012	(r236656)
 @@ -1268,6 +1268,7 @@ static driver_t hptiop_pci_driver = {
  };
  
  DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
 +MODULE_DEPEND(hptiop, cam, 1, 1, 1);
  
  static int hptiop_probe(device_t dev)
  {
 
 Modified: stable/8/sys/dev/hptmv/entry.c
 ==============================================================================
 --- stable/8/sys/dev/hptmv/entry.c	Wed Jun  6 04:38:25 2012	(r236655)
 +++ stable/8/sys/dev/hptmv/entry.c	Wed Jun  6 04:38:45 2012	(r236656)
 @@ -108,6 +108,7 @@ static devclass_t	hpt_devclass;
  
  #define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6)
  __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 +MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
  
  #define ccb_ccb_ptr spriv_ptr0
  #define ccb_adapter ccb_h.spriv_ptr1
 
 Modified: stable/8/sys/dev/isp/isp_pci.c
 ==============================================================================
 --- stable/8/sys/dev/isp/isp_pci.c	Wed Jun  6 04:38:25 2012	(r236655)
 +++ stable/8/sys/dev/isp/isp_pci.c	Wed Jun  6 04:38:45 2012	(r236656)
 @@ -362,6 +362,8 @@ static driver_t isp_pci_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_pci_probe(device_t dev)
 
 Modified: stable/8/sys/dev/isp/isp_sbus.c
 ==============================================================================
 --- stable/8/sys/dev/isp/isp_sbus.c	Wed Jun  6 04:38:25 2012	(r236655)
 +++ stable/8/sys/dev/isp/isp_sbus.c	Wed Jun  6 04:38:45 2012	(r236656)
 @@ -106,6 +106,8 @@ static driver_t isp_sbus_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_sbus_probe(device_t dev)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/166239: commit references a PR
Date: Wed,  6 Jun 2012 04:39:25 +0000 (UTC)

 Author: eadler
 Date: Wed Jun  6 04:39:05 2012
 New Revision: 236657
 URL: http://svn.freebsd.org/changeset/base/236657
 
 Log:
   MFC r236379:
   	   Adding missing dependancies for loading hptiop(4), hptmv(4) and isp(4) as modules.
   
   PR:		kern/166239
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/7/sys/dev/hptiop/hptiop.c
   stable/7/sys/dev/hptmv/entry.c
   stable/7/sys/dev/isp/isp_pci.c
   stable/7/sys/dev/isp/isp_sbus.c
 Directory Properties:
   stable/7/sys/   (props changed)
 
 Modified: stable/7/sys/dev/hptiop/hptiop.c
 ==============================================================================
 --- stable/7/sys/dev/hptiop/hptiop.c	Wed Jun  6 04:38:45 2012	(r236656)
 +++ stable/7/sys/dev/hptiop/hptiop.c	Wed Jun  6 04:39:05 2012	(r236657)
 @@ -1279,6 +1279,7 @@ static driver_t hptiop_pci_driver = {
  };
  
  DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
 +MODULE_DEPEND(hptiop, cam, 1, 1, 1);
  
  static int hptiop_probe(device_t dev)
  {
 
 Modified: stable/7/sys/dev/hptmv/entry.c
 ==============================================================================
 --- stable/7/sys/dev/hptmv/entry.c	Wed Jun  6 04:38:45 2012	(r236656)
 +++ stable/7/sys/dev/hptmv/entry.c	Wed Jun  6 04:39:05 2012	(r236657)
 @@ -107,6 +107,7 @@ static devclass_t	hpt_devclass;
  
  #define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6)
  __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 +MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
  
  #define ccb_ccb_ptr spriv_ptr0
  #define ccb_adapter ccb_h.spriv_ptr1
 
 Modified: stable/7/sys/dev/isp/isp_pci.c
 ==============================================================================
 --- stable/7/sys/dev/isp/isp_pci.c	Wed Jun  6 04:38:45 2012	(r236656)
 +++ stable/7/sys/dev/isp/isp_pci.c	Wed Jun  6 04:39:05 2012	(r236657)
 @@ -362,6 +362,8 @@ static driver_t isp_pci_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_pci_probe(device_t dev)
 
 Modified: stable/7/sys/dev/isp/isp_sbus.c
 ==============================================================================
 --- stable/7/sys/dev/isp/isp_sbus.c	Wed Jun  6 04:38:45 2012	(r236656)
 +++ stable/7/sys/dev/isp/isp_sbus.c	Wed Jun  6 04:39:05 2012	(r236657)
 @@ -106,6 +106,8 @@ static driver_t isp_sbus_driver = {
  };
  static devclass_t isp_devclass;
  DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
 +MODULE_DEPEND(isp, cam, 1, 1, 1);
 +MODULE_DEPEND(isp, firmware, 1, 1, 1);
  
  static int
  isp_sbus_probe(device_t dev)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Wed Jun 6 06:41:36 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166239 
>Unformatted:
