diff options
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 112 | ||||
-rw-r--r-- | drivers/message/fusion/mptbase.h | 1 | ||||
-rw-r--r-- | drivers/message/fusion/mptfc.c | 187 | ||||
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 21 |
4 files changed, 184 insertions, 137 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 164375eea896..330c29080e3c 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -1188,7 +1188,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1188 | ioc->pcidev = pdev; | 1188 | ioc->pcidev = pdev; |
1189 | ioc->diagPending = 0; | 1189 | ioc->diagPending = 0; |
1190 | spin_lock_init(&ioc->diagLock); | 1190 | spin_lock_init(&ioc->diagLock); |
1191 | spin_lock_init(&ioc->fc_rescan_work_lock); | ||
1192 | spin_lock_init(&ioc->initializing_hba_lock); | 1191 | spin_lock_init(&ioc->initializing_hba_lock); |
1193 | 1192 | ||
1194 | /* Initialize the event logging. | 1193 | /* Initialize the event logging. |
@@ -1847,14 +1846,6 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) | |||
1847 | mpt_findImVolumes(ioc); | 1846 | mpt_findImVolumes(ioc); |
1848 | 1847 | ||
1849 | } else if (ioc->bus_type == FC) { | 1848 | } else if (ioc->bus_type == FC) { |
1850 | /* | ||
1851 | * Pre-fetch FC port WWN and stuff... | ||
1852 | * (FCPortPage0_t stuff) | ||
1853 | */ | ||
1854 | for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) { | ||
1855 | (void) mptbase_GetFcPortPage0(ioc, ii); | ||
1856 | } | ||
1857 | |||
1858 | if ((ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) && | 1849 | if ((ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) && |
1859 | (ioc->lan_cnfg_page0.Header.PageLength == 0)) { | 1850 | (ioc->lan_cnfg_page0.Header.PageLength == 0)) { |
1860 | /* | 1851 | /* |
@@ -4186,108 +4177,6 @@ GetLanConfigPages(MPT_ADAPTER *ioc) | |||
4186 | 4177 | ||
4187 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 4178 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
4188 | /* | 4179 | /* |
4189 | * mptbase_GetFcPortPage0 - Fetch FCPort config Page0. | ||
4190 | * @ioc: Pointer to MPT_ADAPTER structure | ||
4191 | * @portnum: IOC Port number | ||
4192 | * | ||
4193 | * Return: 0 for success | ||
4194 | * -ENOMEM if no memory available | ||
4195 | * -EPERM if not allowed due to ISR context | ||
4196 | * -EAGAIN if no msg frames currently available | ||
4197 | * -EFAULT for non-successful reply or no reply (timeout) | ||
4198 | */ | ||
4199 | int | ||
4200 | mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum) | ||
4201 | { | ||
4202 | ConfigPageHeader_t hdr; | ||
4203 | CONFIGPARMS cfg; | ||
4204 | FCPortPage0_t *ppage0_alloc; | ||
4205 | FCPortPage0_t *pp0dest; | ||
4206 | dma_addr_t page0_dma; | ||
4207 | int data_sz; | ||
4208 | int copy_sz; | ||
4209 | int rc; | ||
4210 | int count = 400; | ||
4211 | |||
4212 | |||
4213 | /* Get FCPort Page 0 header */ | ||
4214 | hdr.PageVersion = 0; | ||
4215 | hdr.PageLength = 0; | ||
4216 | hdr.PageNumber = 0; | ||
4217 | hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT; | ||
4218 | cfg.cfghdr.hdr = &hdr; | ||
4219 | cfg.physAddr = -1; | ||
4220 | cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER; | ||
4221 | cfg.dir = 0; | ||
4222 | cfg.pageAddr = portnum; | ||
4223 | cfg.timeout = 0; | ||
4224 | |||
4225 | if ((rc = mpt_config(ioc, &cfg)) != 0) | ||
4226 | return rc; | ||
4227 | |||
4228 | if (hdr.PageLength == 0) | ||
4229 | return 0; | ||
4230 | |||
4231 | data_sz = hdr.PageLength * 4; | ||
4232 | rc = -ENOMEM; | ||
4233 | ppage0_alloc = (FCPortPage0_t *) pci_alloc_consistent(ioc->pcidev, data_sz, &page0_dma); | ||
4234 | if (ppage0_alloc) { | ||
4235 | |||
4236 | try_again: | ||
4237 | memset((u8 *)ppage0_alloc, 0, data_sz); | ||
4238 | cfg.physAddr = page0_dma; | ||
4239 | cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT; | ||
4240 | |||
4241 | if ((rc = mpt_config(ioc, &cfg)) == 0) { | ||
4242 | /* save the data */ | ||
4243 | pp0dest = &ioc->fc_port_page0[portnum]; | ||
4244 | copy_sz = min_t(int, sizeof(FCPortPage0_t), data_sz); | ||
4245 | memcpy(pp0dest, ppage0_alloc, copy_sz); | ||
4246 | |||
4247 | /* | ||
4248 | * Normalize endianness of structure data, | ||
4249 | * by byte-swapping all > 1 byte fields! | ||
4250 | */ | ||
4251 | pp0dest->Flags = le32_to_cpu(pp0dest->Flags); | ||
4252 | pp0dest->PortIdentifier = le32_to_cpu(pp0dest->PortIdentifier); | ||
4253 | pp0dest->WWNN.Low = le32_to_cpu(pp0dest->WWNN.Low); | ||
4254 | pp0dest->WWNN.High = le32_to_cpu(pp0dest->WWNN.High); | ||
4255 | pp0dest->WWPN.Low = le32_to_cpu(pp0dest->WWPN.Low); | ||
4256 | pp0dest->WWPN.High = le32_to_cpu(pp0dest->WWPN.High); | ||
4257 | pp0dest->SupportedServiceClass = le32_to_cpu(pp0dest->SupportedServiceClass); | ||
4258 | pp0dest->SupportedSpeeds = le32_to_cpu(pp0dest->SupportedSpeeds); | ||
4259 | pp0dest->CurrentSpeed = le32_to_cpu(pp0dest->CurrentSpeed); | ||
4260 | pp0dest->MaxFrameSize = le32_to_cpu(pp0dest->MaxFrameSize); | ||
4261 | pp0dest->FabricWWNN.Low = le32_to_cpu(pp0dest->FabricWWNN.Low); | ||
4262 | pp0dest->FabricWWNN.High = le32_to_cpu(pp0dest->FabricWWNN.High); | ||
4263 | pp0dest->FabricWWPN.Low = le32_to_cpu(pp0dest->FabricWWPN.Low); | ||
4264 | pp0dest->FabricWWPN.High = le32_to_cpu(pp0dest->FabricWWPN.High); | ||
4265 | pp0dest->DiscoveredPortsCount = le32_to_cpu(pp0dest->DiscoveredPortsCount); | ||
4266 | pp0dest->MaxInitiators = le32_to_cpu(pp0dest->MaxInitiators); | ||
4267 | |||
4268 | /* | ||
4269 | * if still doing discovery, | ||
4270 | * hang loose a while until finished | ||
4271 | */ | ||
4272 | if (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) { | ||
4273 | if (count-- > 0) { | ||
4274 | msleep_interruptible(100); | ||
4275 | goto try_again; | ||
4276 | } | ||
4277 | printk(MYIOC_s_INFO_FMT "Firmware discovery not" | ||
4278 | " complete.\n", | ||
4279 | ioc->name); | ||
4280 | } | ||
4281 | } | ||
4282 | |||
4283 | pci_free_consistent(ioc->pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma); | ||
4284 | } | ||
4285 | |||
4286 | return rc; | ||
4287 | } | ||
4288 | |||
4289 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | ||
4290 | /* | ||
4291 | * mptbase_sas_persist_operation - Perform operation on SAS Persitent Table | 4180 | * mptbase_sas_persist_operation - Perform operation on SAS Persitent Table |
4292 | * @ioc: Pointer to MPT_ADAPTER structure | 4181 | * @ioc: Pointer to MPT_ADAPTER structure |
4293 | * @sas_address: 64bit SAS Address for operation. | 4182 | * @sas_address: 64bit SAS Address for operation. |
@@ -6495,7 +6384,6 @@ EXPORT_SYMBOL(mpt_findImVolumes); | |||
6495 | EXPORT_SYMBOL(mpt_alloc_fw_memory); | 6384 | EXPORT_SYMBOL(mpt_alloc_fw_memory); |
6496 | EXPORT_SYMBOL(mpt_free_fw_memory); | 6385 | EXPORT_SYMBOL(mpt_free_fw_memory); |
6497 | EXPORT_SYMBOL(mptbase_sas_persist_operation); | 6386 | EXPORT_SYMBOL(mptbase_sas_persist_operation); |
6498 | EXPORT_SYMBOL(mptbase_GetFcPortPage0); | ||
6499 | 6387 | ||
6500 | 6388 | ||
6501 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 6389 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index f673cca507e1..693c95c9034a 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
@@ -1027,7 +1027,6 @@ extern void mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size); | |||
1027 | extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); | 1027 | extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); |
1028 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); | 1028 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); |
1029 | extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); | 1029 | extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); |
1030 | extern int mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum); | ||
1031 | 1030 | ||
1032 | /* | 1031 | /* |
1033 | * Public data decl's... | 1032 | * Public data decl's... |
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index 856487741ef4..e518bc97f8ce 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
@@ -596,6 +596,110 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) | |||
596 | return err; | 596 | return err; |
597 | } | 597 | } |
598 | 598 | ||
599 | /* | ||
600 | * mptfc_GetFcPortPage0 - Fetch FCPort config Page0. | ||
601 | * @ioc: Pointer to MPT_ADAPTER structure | ||
602 | * @portnum: IOC Port number | ||
603 | * | ||
604 | * Return: 0 for success | ||
605 | * -ENOMEM if no memory available | ||
606 | * -EPERM if not allowed due to ISR context | ||
607 | * -EAGAIN if no msg frames currently available | ||
608 | * -EFAULT for non-successful reply or no reply (timeout) | ||
609 | * -EINVAL portnum arg out of range (hardwired to two elements) | ||
610 | */ | ||
611 | static int | ||
612 | mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum) | ||
613 | { | ||
614 | ConfigPageHeader_t hdr; | ||
615 | CONFIGPARMS cfg; | ||
616 | FCPortPage0_t *ppage0_alloc; | ||
617 | FCPortPage0_t *pp0dest; | ||
618 | dma_addr_t page0_dma; | ||
619 | int data_sz; | ||
620 | int copy_sz; | ||
621 | int rc; | ||
622 | int count = 400; | ||
623 | |||
624 | if (portnum > 1) | ||
625 | return -EINVAL; | ||
626 | |||
627 | /* Get FCPort Page 0 header */ | ||
628 | hdr.PageVersion = 0; | ||
629 | hdr.PageLength = 0; | ||
630 | hdr.PageNumber = 0; | ||
631 | hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT; | ||
632 | cfg.cfghdr.hdr = &hdr; | ||
633 | cfg.physAddr = -1; | ||
634 | cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER; | ||
635 | cfg.dir = 0; | ||
636 | cfg.pageAddr = portnum; | ||
637 | cfg.timeout = 0; | ||
638 | |||
639 | if ((rc = mpt_config(ioc, &cfg)) != 0) | ||
640 | return rc; | ||
641 | |||
642 | if (hdr.PageLength == 0) | ||
643 | return 0; | ||
644 | |||
645 | data_sz = hdr.PageLength * 4; | ||
646 | rc = -ENOMEM; | ||
647 | ppage0_alloc = (FCPortPage0_t *) pci_alloc_consistent(ioc->pcidev, data_sz, &page0_dma); | ||
648 | if (ppage0_alloc) { | ||
649 | |||
650 | try_again: | ||
651 | memset((u8 *)ppage0_alloc, 0, data_sz); | ||
652 | cfg.physAddr = page0_dma; | ||
653 | cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT; | ||
654 | |||
655 | if ((rc = mpt_config(ioc, &cfg)) == 0) { | ||
656 | /* save the data */ | ||
657 | pp0dest = &ioc->fc_port_page0[portnum]; | ||
658 | copy_sz = min_t(int, sizeof(FCPortPage0_t), data_sz); | ||
659 | memcpy(pp0dest, ppage0_alloc, copy_sz); | ||
660 | |||
661 | /* | ||
662 | * Normalize endianness of structure data, | ||
663 | * by byte-swapping all > 1 byte fields! | ||
664 | */ | ||
665 | pp0dest->Flags = le32_to_cpu(pp0dest->Flags); | ||
666 | pp0dest->PortIdentifier = le32_to_cpu(pp0dest->PortIdentifier); | ||
667 | pp0dest->WWNN.Low = le32_to_cpu(pp0dest->WWNN.Low); | ||
668 | pp0dest->WWNN.High = le32_to_cpu(pp0dest->WWNN.High); | ||
669 | pp0dest->WWPN.Low = le32_to_cpu(pp0dest->WWPN.Low); | ||
670 | pp0dest->WWPN.High = le32_to_cpu(pp0dest->WWPN.High); | ||
671 | pp0dest->SupportedServiceClass = le32_to_cpu(pp0dest->SupportedServiceClass); | ||
672 | pp0dest->SupportedSpeeds = le32_to_cpu(pp0dest->SupportedSpeeds); | ||
673 | pp0dest->CurrentSpeed = le32_to_cpu(pp0dest->CurrentSpeed); | ||
674 | pp0dest->MaxFrameSize = le32_to_cpu(pp0dest->MaxFrameSize); | ||
675 | pp0dest->FabricWWNN.Low = le32_to_cpu(pp0dest->FabricWWNN.Low); | ||
676 | pp0dest->FabricWWNN.High = le32_to_cpu(pp0dest->FabricWWNN.High); | ||
677 | pp0dest->FabricWWPN.Low = le32_to_cpu(pp0dest->FabricWWPN.Low); | ||
678 | pp0dest->FabricWWPN.High = le32_to_cpu(pp0dest->FabricWWPN.High); | ||
679 | pp0dest->DiscoveredPortsCount = le32_to_cpu(pp0dest->DiscoveredPortsCount); | ||
680 | pp0dest->MaxInitiators = le32_to_cpu(pp0dest->MaxInitiators); | ||
681 | |||
682 | /* | ||
683 | * if still doing discovery, | ||
684 | * hang loose a while until finished | ||
685 | */ | ||
686 | if (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) { | ||
687 | if (count-- > 0) { | ||
688 | msleep_interruptible(100); | ||
689 | goto try_again; | ||
690 | } | ||
691 | printk(MYIOC_s_INFO_FMT "Firmware discovery not" | ||
692 | " complete.\n", | ||
693 | ioc->name); | ||
694 | } | ||
695 | } | ||
696 | |||
697 | pci_free_consistent(ioc->pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma); | ||
698 | } | ||
699 | |||
700 | return rc; | ||
701 | } | ||
702 | |||
599 | static void | 703 | static void |
600 | mptfc_init_host_attr(MPT_ADAPTER *ioc,int portnum) | 704 | mptfc_init_host_attr(MPT_ADAPTER *ioc,int portnum) |
601 | { | 705 | { |
@@ -651,7 +755,7 @@ mptfc_rescan_devices(void *arg) | |||
651 | * will reregister existing rports | 755 | * will reregister existing rports |
652 | */ | 756 | */ |
653 | for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) { | 757 | for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) { |
654 | (void) mptbase_GetFcPortPage0(ioc, ii); | 758 | (void) mptfc_GetFcPortPage0(ioc, ii); |
655 | mptfc_init_host_attr(ioc,ii); /* refresh */ | 759 | mptfc_init_host_attr(ioc,ii); /* refresh */ |
656 | mptfc_GetFcDevPage0(ioc,ii,mptfc_register_dev); | 760 | mptfc_GetFcDevPage0(ioc,ii,mptfc_register_dev); |
657 | } | 761 | } |
@@ -753,6 +857,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
753 | goto out_mptfc_probe; | 857 | goto out_mptfc_probe; |
754 | } | 858 | } |
755 | 859 | ||
860 | spin_lock_init(&ioc->fc_rescan_work_lock); | ||
756 | INIT_WORK(&ioc->fc_rescan_work, mptfc_rescan_devices,(void *)ioc); | 861 | INIT_WORK(&ioc->fc_rescan_work, mptfc_rescan_devices,(void *)ioc); |
757 | 862 | ||
758 | spin_lock_irqsave(&ioc->FreeQlock, flags); | 863 | spin_lock_irqsave(&ioc->FreeQlock, flags); |
@@ -889,6 +994,14 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
889 | goto out_mptfc_probe; | 994 | goto out_mptfc_probe; |
890 | 995 | ||
891 | /* | 996 | /* |
997 | * Pre-fetch FC port WWN and stuff... | ||
998 | * (FCPortPage0_t stuff) | ||
999 | */ | ||
1000 | for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) { | ||
1001 | (void) mptfc_GetFcPortPage0(ioc, ii); | ||
1002 | } | ||
1003 | |||
1004 | /* | ||
892 | * scan for rports - | 1005 | * scan for rports - |
893 | * by doing it via the workqueue, some locking is eliminated | 1006 | * by doing it via the workqueue, some locking is eliminated |
894 | */ | 1007 | */ |
@@ -917,6 +1030,74 @@ static struct pci_driver mptfc_driver = { | |||
917 | #endif | 1030 | #endif |
918 | }; | 1031 | }; |
919 | 1032 | ||
1033 | static int | ||
1034 | mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) | ||
1035 | { | ||
1036 | MPT_SCSI_HOST *hd; | ||
1037 | u8 event = le32_to_cpu(pEvReply->Event) & 0xFF; | ||
1038 | unsigned long flags; | ||
1039 | int rc=1; | ||
1040 | |||
1041 | devtverboseprintk((MYIOC_s_INFO_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n", | ||
1042 | ioc->name, event)); | ||
1043 | |||
1044 | if (ioc->sh == NULL || | ||
1045 | ((hd = (MPT_SCSI_HOST *)ioc->sh->hostdata) == NULL)) | ||
1046 | return 1; | ||
1047 | |||
1048 | switch (event) { | ||
1049 | case MPI_EVENT_RESCAN: | ||
1050 | spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags); | ||
1051 | if (ioc->fc_rescan_work_q) { | ||
1052 | if (ioc->fc_rescan_work_count++ == 0) { | ||
1053 | queue_work(ioc->fc_rescan_work_q, | ||
1054 | &ioc->fc_rescan_work); | ||
1055 | } | ||
1056 | } | ||
1057 | spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags); | ||
1058 | break; | ||
1059 | default: | ||
1060 | rc = mptscsih_event_process(ioc,pEvReply); | ||
1061 | break; | ||
1062 | } | ||
1063 | return rc; | ||
1064 | } | ||
1065 | |||
1066 | static int | ||
1067 | mptfc_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) | ||
1068 | { | ||
1069 | int rc; | ||
1070 | unsigned long flags; | ||
1071 | |||
1072 | rc = mptscsih_ioc_reset(ioc,reset_phase); | ||
1073 | if (rc == 0) | ||
1074 | return rc; | ||
1075 | |||
1076 | |||
1077 | dtmprintk((KERN_WARNING MYNAM | ||
1078 | ": IOC %s_reset routed to FC host driver!\n", | ||
1079 | reset_phase==MPT_IOC_SETUP_RESET ? "setup" : ( | ||
1080 | reset_phase==MPT_IOC_PRE_RESET ? "pre" : "post"))); | ||
1081 | |||
1082 | if (reset_phase == MPT_IOC_SETUP_RESET) { | ||
1083 | } | ||
1084 | |||
1085 | else if (reset_phase == MPT_IOC_PRE_RESET) { | ||
1086 | } | ||
1087 | |||
1088 | else { /* MPT_IOC_POST_RESET */ | ||
1089 | spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags); | ||
1090 | if (ioc->fc_rescan_work_q) { | ||
1091 | if (ioc->fc_rescan_work_count++ == 0) { | ||
1092 | queue_work(ioc->fc_rescan_work_q, | ||
1093 | &ioc->fc_rescan_work); | ||
1094 | } | ||
1095 | } | ||
1096 | spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags); | ||
1097 | } | ||
1098 | return 1; | ||
1099 | } | ||
1100 | |||
920 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1101 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
921 | /** | 1102 | /** |
922 | * mptfc_init - Register MPT adapter(s) as SCSI host(s) with | 1103 | * mptfc_init - Register MPT adapter(s) as SCSI host(s) with |
@@ -945,12 +1126,12 @@ mptfc_init(void) | |||
945 | mptfcTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTFC_DRIVER); | 1126 | mptfcTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTFC_DRIVER); |
946 | mptfcInternalCtx = mpt_register(mptscsih_scandv_complete, MPTFC_DRIVER); | 1127 | mptfcInternalCtx = mpt_register(mptscsih_scandv_complete, MPTFC_DRIVER); |
947 | 1128 | ||
948 | if (mpt_event_register(mptfcDoneCtx, mptscsih_event_process) == 0) { | 1129 | if (mpt_event_register(mptfcDoneCtx, mptfc_event_process) == 0) { |
949 | devtverboseprintk((KERN_INFO MYNAM | 1130 | devtverboseprintk((KERN_INFO MYNAM |
950 | ": Registered for IOC event notifications\n")); | 1131 | ": Registered for IOC event notifications\n")); |
951 | } | 1132 | } |
952 | 1133 | ||
953 | if (mpt_reset_register(mptfcDoneCtx, mptscsih_ioc_reset) == 0) { | 1134 | if (mpt_reset_register(mptfcDoneCtx, mptfc_ioc_reset) == 0) { |
954 | dprintk((KERN_INFO MYNAM | 1135 | dprintk((KERN_INFO MYNAM |
955 | ": Registered for IOC reset notifications\n")); | 1136 | ": Registered for IOC reset notifications\n")); |
956 | } | 1137 | } |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 84fa271eb8f4..2d81831cf628 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -2521,18 +2521,6 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) | |||
2521 | hd->cmdPtr = NULL; | 2521 | hd->cmdPtr = NULL; |
2522 | } | 2522 | } |
2523 | 2523 | ||
2524 | /* 7. FC: Rescan for blocked rports which might have returned. | ||
2525 | */ | ||
2526 | if (ioc->bus_type == FC) { | ||
2527 | spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags); | ||
2528 | if (ioc->fc_rescan_work_q) { | ||
2529 | if (ioc->fc_rescan_work_count++ == 0) { | ||
2530 | queue_work(ioc->fc_rescan_work_q, | ||
2531 | &ioc->fc_rescan_work); | ||
2532 | } | ||
2533 | } | ||
2534 | spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags); | ||
2535 | } | ||
2536 | dtmprintk((MYIOC_s_WARN_FMT "Post-Reset complete.\n", ioc->name)); | 2524 | dtmprintk((MYIOC_s_WARN_FMT "Post-Reset complete.\n", ioc->name)); |
2537 | 2525 | ||
2538 | } | 2526 | } |
@@ -2546,7 +2534,6 @@ mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) | |||
2546 | { | 2534 | { |
2547 | MPT_SCSI_HOST *hd; | 2535 | MPT_SCSI_HOST *hd; |
2548 | u8 event = le32_to_cpu(pEvReply->Event) & 0xFF; | 2536 | u8 event = le32_to_cpu(pEvReply->Event) & 0xFF; |
2549 | unsigned long flags; | ||
2550 | 2537 | ||
2551 | devtverboseprintk((MYIOC_s_INFO_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n", | 2538 | devtverboseprintk((MYIOC_s_INFO_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n", |
2552 | ioc->name, event)); | 2539 | ioc->name, event)); |
@@ -2569,14 +2556,6 @@ mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) | |||
2569 | break; | 2556 | break; |
2570 | 2557 | ||
2571 | case MPI_EVENT_RESCAN: /* 06 */ | 2558 | case MPI_EVENT_RESCAN: /* 06 */ |
2572 | spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags); | ||
2573 | if (ioc->fc_rescan_work_q) { | ||
2574 | if (ioc->fc_rescan_work_count++ == 0) { | ||
2575 | queue_work(ioc->fc_rescan_work_q, | ||
2576 | &ioc->fc_rescan_work); | ||
2577 | } | ||
2578 | } | ||
2579 | spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags); | ||
2580 | break; | 2559 | break; |
2581 | 2560 | ||
2582 | /* | 2561 | /* |