* [GIT PULL] first round of SCSI updates for the 4.7+ merge window
@ 2016-08-05 23:21 James Bottomley
[not found] ` <87popjshn6.fsf@concordia.ellerman.id.au>
0 siblings, 1 reply; 4+ messages in thread
From: James Bottomley @ 2016-08-05 23:21 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds; +Cc: linux-scsi, linux-kernel
This is seven basic fixes (plus one MAINTAINERS update) which came in
close to the merge window.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc
The short changelog is:
Brian King (1):
ipr: Wait to do async scan until scsi host is initialized
Hannes Reinecke (1):
fcoe: Use default VLAN for FIP VLAN discovery
Johannes Thumshirn (1):
lpfc: Fix possible NULL pointer dereference
Mauricio Faria de Oliveira (1):
lpfc: fix oops in lpfc_sli4_scmd_to_wqidx_distr() from lpfc_send_taskmgmt()
Uma Krishnan (2):
MAINTAINERS: Update cxlflash maintainers
cxlflash: Verify problem state area is mapped before notifying shutdown
Wei Yongjun (2):
ipr: Fix error return code in ipr_probe_ioa()
fcoe: add missing destroy_workqueue() on error in fcoe_init()
And the diffstat:
MAINTAINERS | 1 +
drivers/scsi/cxlflash/main.c | 10 ++++++++-
drivers/scsi/fcoe/fcoe.c | 52 +++++++++++++++++++++++++++++++++++++++++--
drivers/scsi/fcoe/fcoe.h | 1 +
drivers/scsi/ipr.c | 10 +++++++++
drivers/scsi/ipr.h | 1 +
drivers/scsi/lpfc/lpfc_scsi.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 15 +++++--------
8 files changed, 79 insertions(+), 13 deletions(-)
James
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ipr: Fix sync scsi scan
[not found] ` <87popjshn6.fsf@concordia.ellerman.id.au>
@ 2016-08-08 22:53 ` Brian King
2016-08-09 6:44 ` Michael Ellerman
0 siblings, 1 reply; 4+ messages in thread
From: Brian King @ 2016-08-08 22:53 UTC (permalink / raw)
To: Michael Ellerman, James Bottomley, Andrew Morton, Linus Torvalds
Cc: linux-scsi, linux-kernel, Martin K. Petersen, aneesh.kumar
On 08/08/2016 05:02 AM, Michael Ellerman wrote:
> James Bottomley <James.Bottomley@HansenPartnership.com> writes:
>
>> This is seven basic fixes (plus one MAINTAINERS update) which came in
>> close to the merge window.
>>
>> The patch is available here:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc
>>
>> The short changelog is:
>>
>> Brian King (1):
>> ipr: Wait to do async scan until scsi host is initialized
>
> This commit seems to be causing a ~10 minute pause during boot on my
> powerpc boxes which have an IPR, eg:
Sorry about that. I fixed up async scan and managed to break sync scan...
This patch fixes it on my box. Does it fix the issue for you as well?
Thanks,
Brian
--
Brian King
Power Linux I/O
IBM Linux Technology Center
8<
Commit b195d5e2bffd3de3f07e8683e6abddf099ea0822 fixed async scan
for ipr, but broke sync scan for ipr. This fixes sync scan back up.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
---
drivers/scsi/ipr.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff -puN drivers/scsi/ipr.c~ipr_async_scan_fixup_again drivers/scsi/ipr.c
--- linux-2.6.git/drivers/scsi/ipr.c~ipr_async_scan_fixup_again 2016-08-08 17:48:51.637984104 -0500
+++ linux-2.6.git-bjking1/drivers/scsi/ipr.c 2016-08-08 17:48:51.643984056 -0500
@@ -10410,8 +10410,11 @@ static int ipr_probe(struct pci_dev *pde
__ipr_remove(pdev);
return rc;
}
+ spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
+ ioa_cfg->scan_enabled = 1;
+ schedule_work(&ioa_cfg->work_q);
+ spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
- scsi_scan_host(ioa_cfg->host);
ioa_cfg->iopoll_weight = ioa_cfg->chip_cfg->iopoll_weight;
if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
@@ -10421,10 +10424,8 @@ static int ipr_probe(struct pci_dev *pde
}
}
- spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
- ioa_cfg->scan_enabled = 1;
- schedule_work(&ioa_cfg->work_q);
- spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
+ scsi_scan_host(ioa_cfg->host);
+
return 0;
}
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipr: Fix sync scsi scan
2016-08-08 22:53 ` [PATCH] ipr: Fix sync scsi scan Brian King
@ 2016-08-09 6:44 ` Michael Ellerman
2016-08-11 2:57 ` Martin K. Petersen
0 siblings, 1 reply; 4+ messages in thread
From: Michael Ellerman @ 2016-08-09 6:44 UTC (permalink / raw)
To: Brian King, James Bottomley, Andrew Morton, Linus Torvalds
Cc: linux-scsi, linux-kernel, Martin K. Petersen, aneesh.kumar
Brian King <brking@linux.vnet.ibm.com> writes:
> On 08/08/2016 05:02 AM, Michael Ellerman wrote:
>> James Bottomley <James.Bottomley@HansenPartnership.com> writes:
>>
>>> This is seven basic fixes (plus one MAINTAINERS update) which came in
>>> close to the merge window.
>>>
>>> The patch is available here:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc
>>>
>>> The short changelog is:
>>>
>>> Brian King (1):
>>> ipr: Wait to do async scan until scsi host is initialized
>>
>> This commit seems to be causing a ~10 minute pause during boot on my
>> powerpc boxes which have an IPR, eg:
>
> Sorry about that. I fixed up async scan and managed to break sync scan...
>
> This patch fixes it on my box. Does it fix the issue for you as well?
Yes, thanks!
If you like here's a:
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
It would be good if we can we get that to Linus sooner rather than later.
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipr: Fix sync scsi scan
2016-08-09 6:44 ` Michael Ellerman
@ 2016-08-11 2:57 ` Martin K. Petersen
0 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2016-08-11 2:57 UTC (permalink / raw)
To: Michael Ellerman
Cc: Brian King, James Bottomley, Andrew Morton, Linus Torvalds,
linux-scsi, linux-kernel, Martin K. Petersen, aneesh.kumar
>>>>> "Michael" == Michael Ellerman <mpe@ellerman.id.au> writes:
>> Sorry about that. I fixed up async scan and managed to break sync
>> scan...
>>
>> This patch fixes it on my box. Does it fix the issue for you as well?
Michael> Yes, thanks!
Michael> If you like here's a:
Michael> Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Michael> It would be good if we can we get that to Linus sooner rather
Michael> than later.
Brian: This was a wee bit short of a real patch submission but I hand
applied it to 4.8/scsi-fixes.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-11 2:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-05 23:21 [GIT PULL] first round of SCSI updates for the 4.7+ merge window James Bottomley
[not found] ` <87popjshn6.fsf@concordia.ellerman.id.au>
2016-08-08 22:53 ` [PATCH] ipr: Fix sync scsi scan Brian King
2016-08-09 6:44 ` Michael Ellerman
2016-08-11 2:57 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).