diff options
author | James Smart <James.Smart@Emulex.Com> | 2008-12-04 22:40:07 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:28 -0500 |
commit | 923e4b6a72e5643fb2373a62e8563827a51520dc (patch) | |
tree | 532cdbf6ce1d8b71480192989d46c858a1eb4567 /drivers/scsi | |
parent | e2a0a9d69ce224c6f5b72515d81150e6bf4a905a (diff) |
[SCSI] lpfc 8.3.0 : Hook lpfc's debugfs into Kconfig
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/Kconfig | 7 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc.h | 4 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_debugfs.c | 12 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_debugfs.h | 2 |
4 files changed, 16 insertions, 9 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 403ecad48d4b..1badcec18f41 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -1357,6 +1357,13 @@ config SCSI_LPFC | |||
1357 | This lpfc driver supports the Emulex LightPulse | 1357 | This lpfc driver supports the Emulex LightPulse |
1358 | Family of Fibre Channel PCI host adapters. | 1358 | Family of Fibre Channel PCI host adapters. |
1359 | 1359 | ||
1360 | config SCSI_LPFC_DEBUG_FS | ||
1361 | bool "Emulex LightPulse Fibre Channel debugfs Support" | ||
1362 | depends on SCSI_LPFC && DEBUG_FS | ||
1363 | help | ||
1364 | This makes debugging infomation from the lpfc driver | ||
1365 | available via the debugfs filesystem. | ||
1366 | |||
1360 | config SCSI_SIM710 | 1367 | config SCSI_SIM710 |
1361 | tristate "Simple 53c710 SCSI support (Compaq, NCR machines)" | 1368 | tristate "Simple 53c710 SCSI support (Compaq, NCR machines)" |
1362 | depends on (EISA || MCA) && SCSI | 1369 | depends on (EISA || MCA) && SCSI |
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index 960ba307613a..dcba267db711 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
@@ -376,7 +376,7 @@ struct lpfc_vport { | |||
376 | 376 | ||
377 | struct fc_vport *fc_vport; | 377 | struct fc_vport *fc_vport; |
378 | 378 | ||
379 | #ifdef CONFIG_LPFC_DEBUG_FS | 379 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
380 | struct dentry *debug_disc_trc; | 380 | struct dentry *debug_disc_trc; |
381 | struct dentry *debug_nodelist; | 381 | struct dentry *debug_nodelist; |
382 | struct dentry *vport_debugfs_root; | 382 | struct dentry *vport_debugfs_root; |
@@ -621,7 +621,7 @@ struct lpfc_hba { | |||
621 | unsigned long last_rsrc_error_time; | 621 | unsigned long last_rsrc_error_time; |
622 | unsigned long last_ramp_down_time; | 622 | unsigned long last_ramp_down_time; |
623 | unsigned long last_ramp_up_time; | 623 | unsigned long last_ramp_up_time; |
624 | #ifdef CONFIG_LPFC_DEBUG_FS | 624 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
625 | struct dentry *hba_debugfs_root; | 625 | struct dentry *hba_debugfs_root; |
626 | atomic_t debugfs_vport_count; | 626 | atomic_t debugfs_vport_count; |
627 | struct dentry *debug_hbqinfo; | 627 | struct dentry *debug_hbqinfo; |
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 992009a9470f..b615eda361d5 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "lpfc_compat.h" | 46 | #include "lpfc_compat.h" |
47 | #include "lpfc_debugfs.h" | 47 | #include "lpfc_debugfs.h" |
48 | 48 | ||
49 | #ifdef CONFIG_LPFC_DEBUG_FS | 49 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
50 | /** | 50 | /** |
51 | * debugfs interface | 51 | * debugfs interface |
52 | * | 52 | * |
@@ -618,7 +618,7 @@ inline void | |||
618 | lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt, | 618 | lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt, |
619 | uint32_t data1, uint32_t data2, uint32_t data3) | 619 | uint32_t data1, uint32_t data2, uint32_t data3) |
620 | { | 620 | { |
621 | #ifdef CONFIG_LPFC_DEBUG_FS | 621 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
622 | struct lpfc_debugfs_trc *dtp; | 622 | struct lpfc_debugfs_trc *dtp; |
623 | int index; | 623 | int index; |
624 | 624 | ||
@@ -659,7 +659,7 @@ inline void | |||
659 | lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt, | 659 | lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt, |
660 | uint32_t data1, uint32_t data2, uint32_t data3) | 660 | uint32_t data1, uint32_t data2, uint32_t data3) |
661 | { | 661 | { |
662 | #ifdef CONFIG_LPFC_DEBUG_FS | 662 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
663 | struct lpfc_debugfs_trc *dtp; | 663 | struct lpfc_debugfs_trc *dtp; |
664 | int index; | 664 | int index; |
665 | 665 | ||
@@ -680,7 +680,7 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt, | |||
680 | return; | 680 | return; |
681 | } | 681 | } |
682 | 682 | ||
683 | #ifdef CONFIG_LPFC_DEBUG_FS | 683 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
684 | /** | 684 | /** |
685 | * lpfc_debugfs_disc_trc_open - Open the discovery trace log. | 685 | * lpfc_debugfs_disc_trc_open - Open the discovery trace log. |
686 | * @inode: The inode pointer that contains a vport pointer. | 686 | * @inode: The inode pointer that contains a vport pointer. |
@@ -1222,7 +1222,7 @@ static atomic_t lpfc_debugfs_hba_count; | |||
1222 | inline void | 1222 | inline void |
1223 | lpfc_debugfs_initialize(struct lpfc_vport *vport) | 1223 | lpfc_debugfs_initialize(struct lpfc_vport *vport) |
1224 | { | 1224 | { |
1225 | #ifdef CONFIG_LPFC_DEBUG_FS | 1225 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
1226 | struct lpfc_hba *phba = vport->phba; | 1226 | struct lpfc_hba *phba = vport->phba; |
1227 | char name[64]; | 1227 | char name[64]; |
1228 | uint32_t num, i; | 1228 | uint32_t num, i; |
@@ -1447,7 +1447,7 @@ debug_failed: | |||
1447 | inline void | 1447 | inline void |
1448 | lpfc_debugfs_terminate(struct lpfc_vport *vport) | 1448 | lpfc_debugfs_terminate(struct lpfc_vport *vport) |
1449 | { | 1449 | { |
1450 | #ifdef CONFIG_LPFC_DEBUG_FS | 1450 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
1451 | struct lpfc_hba *phba = vport->phba; | 1451 | struct lpfc_hba *phba = vport->phba; |
1452 | 1452 | ||
1453 | if (vport->disc_trc) { | 1453 | if (vport->disc_trc) { |
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.h b/drivers/scsi/lpfc/lpfc_debugfs.h index 31e86a55391d..03c7313a1012 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.h +++ b/drivers/scsi/lpfc/lpfc_debugfs.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef _H_LPFC_DEBUG_FS | 21 | #ifndef _H_LPFC_DEBUG_FS |
22 | #define _H_LPFC_DEBUG_FS | 22 | #define _H_LPFC_DEBUG_FS |
23 | 23 | ||
24 | #ifdef CONFIG_LPFC_DEBUG_FS | 24 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
25 | struct lpfc_debugfs_trc { | 25 | struct lpfc_debugfs_trc { |
26 | char *fmt; | 26 | char *fmt; |
27 | uint32_t data1; | 27 | uint32_t data1; |