linux-next: manual merge of the scsi-mkp tree with Linus' tree

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 824 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/aacraid/aachba.c

between commit:

  df561f6688fe ("treewide: Use fallthrough pseudo-keyword")

from Linus' tree and commit:

  cfd3d2225aa5 ("scsi: aacraid: Remove erroneous fallthrough annotation")

from the scsi-mkp tree.

I fixed it up (I removed the line removed by the latter - it was rewritten
by the former to "fallthrough;") and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]

Hi all,

On Wed, 2 Sep 2020 15:12:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/scsi/aacraid/aachba.c
> 
> between commit:
> 
>   df561f6688fe ("treewide: Use fallthrough pseudo-keyword")
> 
> from Linus' tree and commit:
> 
>   cfd3d2225aa5 ("scsi: aacraid: Remove erroneous fallthrough annotation")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (I removed the line removed by the latter - it was rewritten
> by the former to "fallthrough;") and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

This is now a conflict between the scsi tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Karan Tilak Kumar (kartilak)]

Hi Stephen,

Thanks for your help on this.

I cloned this repo, and checked out the master branch:

git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
git checkout master

I don't see these two commits there yet.

Are these commits scheduled to be merged sometime soon?
Please advise.

Thanks,
Karan

-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au> 
Sent: Sunday, August 27, 2023 8:03 PM
To: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Karan Tilak Kumar (kartilak) <kartilak@cisco.com>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/fnic/fnic.h

between commit:

  5a43b07a8783 ("scsi: fnic: Replace return codes in fnic_clean_pending_aborts()")

from Linus' tree and commit:

  15924b050363 ("scsi: fnic: Replace sgreset tag with max_tag_id")

from the scsi-mkp tree.

I fixed it up (it was just the version number, so I used the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 795 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/fnic/fnic.h

between commit:

  5a43b07a8783 ("scsi: fnic: Replace return codes in fnic_clean_pending_aborts()")

from Linus' tree and commit:

  15924b050363 ("scsi: fnic: Replace sgreset tag with max_tag_id")

from the scsi-mkp tree.

I fixed it up (it was just the version number, so I used the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/mpi3mr/mpi3mr_fw.c

between commit:

  02ca7da2919a ("scsi: mpi3mr: ioctl timeout when disabling/enabling interrupt")

from Linus' tree and commit:

  23b3d1cf1572 ("scsi: mpi3mr: Fix admin queue memory leak upon soft reset")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
index a565817aa56d,e9b3684a3c8f..000000000000
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@@ -2627,8 -2603,6 +2626,7 @@@ static int mpi3mr_setup_admin_qpair(str
  	    MPI3MR_ADMIN_REPLY_FRAME_SZ;
  	mrioc->admin_reply_ci = 0;
  	mrioc->admin_reply_ephase = 1;
- 	mrioc->admin_reply_base = NULL;
 +	atomic_set(&mrioc->admin_reply_q_in_use, 0);
  
  	if (!mrioc->admin_req_base) {
  		mrioc->admin_req_base = dma_alloc_coherent(&mrioc->pdev->dev,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[John Garry]

On 14/02/2022 03:29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got conflicts in:
> 
>    drivers/scsi/pm8001/pm8001_hwi.c
>    drivers/scsi/pm8001/pm80xx_hwi.c
> 
> between commit:
> 
>    c26b85ea1636 ("scsi: pm80xx: Fix double completion for SATA devices")
> 
> from Linus' tree and commit:
> 
>    26fc0ea74fcb ("scsi: libsas: Drop SAS_TASK_AT_INITIATOR")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (the former removed the code modified by the latter) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
> 

Thanks for the heads up. So, yeah, your change looks right.

Cheers,
John

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got conflicts in:

  drivers/scsi/pm8001/pm8001_hwi.c
  drivers/scsi/pm8001/pm80xx_hwi.c

between commit:

  c26b85ea1636 ("scsi: pm80xx: Fix double completion for SATA devices")

from Linus' tree and commit:

  26fc0ea74fcb ("scsi: libsas: Drop SAS_TASK_AT_INITIATOR")

from the scsi-mkp tree.

I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/ufs/ufshcd.c

between commit:

  3ff1f6b6ba6f ("scsi: ufs: core: Improve SCSI abort handling")

from Linus' tree and commit:

  1fbaa02dfd05 ("scsi: ufs: Improve SCSI abort handling further")

from the scsi-mkp tree.

I fixed it up (I just used the latter version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2015 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/ufs/ufshcd.c

between commit:

  88b099006d83 ("scsi: ufs: core: Revert "scsi: ufs: Synchronize SCSI and UFS error handling"")

from Linus' tree and commit:

  87bf6a6bbe8b ("scsi: ufs: core: Do not exit ufshcd_err_handler() unless operational or dead")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/ufs/ufshcd.c
index 8bf14f97481a,d91a405fd181..000000000000
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6055,22 -6063,23 +6053,24 @@@ static bool ufshcd_is_pwr_mode_restore_
  
  /**
   * ufshcd_err_handler - handle UFS errors that require s/w attention
 - * @host: SCSI host pointer
 + * @work: pointer to work structure
   */
 -static void ufshcd_err_handler(struct Scsi_Host *host)
 +static void ufshcd_err_handler(struct work_struct *work)
  {
 -	struct ufs_hba *hba = shost_priv(host);
 +	struct ufs_hba *hba;
+ 	int retries = MAX_ERR_HANDLER_RETRIES;
  	unsigned long flags;
- 	bool err_xfer = false;
- 	bool err_tm = false;
- 	int err = 0, pmc_err;
+ 	bool needs_restore;
+ 	bool needs_reset;
+ 	bool err_xfer;
+ 	bool err_tm;
+ 	int pmc_err;
  	int tag;
- 	bool needs_reset = false, needs_restore = false;
  
 +	hba = container_of(work, struct ufs_hba, eh_work);
 +
  	down(&hba->host_sem);
  	spin_lock_irqsave(hba->host->host_lock, flags);
 -	hba->host->host_eh_scheduled = 0;
  	if (ufshcd_err_handling_should_stop(hba)) {
  		if (hba->ufshcd_state != UFSHCD_STATE_ERROR)
  			hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Martin K. Petersen]

Stephen,

> Today's linux-next merge of the scsi-mkp tree got conflicts in:
>
>   drivers/scsi/mpt3sas/mpt3sas_base.c
>   drivers/scsi/mpt3sas/mpt3sas_base.h

Fixed this up. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Sreekanth Reddy]

[-- Attachment #1: Type: text/plain, Size: 2532 bytes --]

On Wed, Aug 11, 2021 at 11:10 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the scsi-mkp tree got conflicts in:
>
>   drivers/scsi/mpt3sas/mpt3sas_base.c
>   drivers/scsi/mpt3sas/mpt3sas_base.h
>
> between commit:
>
>   fae21608c31c ("scsi: mpt3sas: Transition IOC to Ready state during shutdown")
>
> from Linus' tree and commit:
>
>   432bc7caef4e ("scsi: mpt3sas: Add io_uring iopoll support")
>
> from the scsi-mkp tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks Stephen,  Below changes are looking good.

Regards,
Sreekanth
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
> index cf4a3a2c22ad,e7f6fbb282bd..000000000000
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
> @@@ -8471,7 -8738,8 +8738,8 @@@ mpt3sas_base_hard_reset_handler(struct
>         _base_pre_reset_handler(ioc);
>         mpt3sas_wait_for_commands_to_complete(ioc);
>         mpt3sas_base_mask_interrupts(ioc);
> +       mpt3sas_base_pause_mq_polling(ioc);
>  -      r = _base_make_ioc_ready(ioc, type);
>  +      r = mpt3sas_base_make_ioc_ready(ioc, type);
>         if (r)
>                 goto out;
>         _base_clear_outstanding_commands(ioc);
> diff --cc drivers/scsi/mpt3sas/mpt3sas_base.h
> index 0c6c3df0038d,3cf2e4615ff5..000000000000
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.h
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
> @@@ -1730,10 -1755,9 +1755,13 @@@ do {  ioc_err(ioc, "In func: %s\n", __fu
>         status, mpi_request, sz); } while (0)
>
>   int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count);
>  +int
>  +mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type);
>  +void mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc);
>  +void mpt3sas_base_disable_msix(struct MPT3SAS_ADAPTER *ioc);
> + int mpt3sas_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num);
> + void mpt3sas_base_pause_mq_polling(struct MPT3SAS_ADAPTER *ioc);
> + void mpt3sas_base_resume_mq_polling(struct MPT3SAS_ADAPTER *ioc);
>
>   /* scsih shared API */
>   struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4218 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got conflicts in:

  drivers/scsi/mpt3sas/mpt3sas_base.c
  drivers/scsi/mpt3sas/mpt3sas_base.h

between commit:

  fae21608c31c ("scsi: mpt3sas: Transition IOC to Ready state during shutdown")

from Linus' tree and commit:

  432bc7caef4e ("scsi: mpt3sas: Add io_uring iopoll support")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
index cf4a3a2c22ad,e7f6fbb282bd..000000000000
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@@ -8471,7 -8738,8 +8738,8 @@@ mpt3sas_base_hard_reset_handler(struct 
  	_base_pre_reset_handler(ioc);
  	mpt3sas_wait_for_commands_to_complete(ioc);
  	mpt3sas_base_mask_interrupts(ioc);
+ 	mpt3sas_base_pause_mq_polling(ioc);
 -	r = _base_make_ioc_ready(ioc, type);
 +	r = mpt3sas_base_make_ioc_ready(ioc, type);
  	if (r)
  		goto out;
  	_base_clear_outstanding_commands(ioc);
diff --cc drivers/scsi/mpt3sas/mpt3sas_base.h
index 0c6c3df0038d,3cf2e4615ff5..000000000000
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@@ -1730,10 -1755,9 +1755,13 @@@ do {	ioc_err(ioc, "In func: %s\n", __fu
  	status, mpi_request, sz); } while (0)
  
  int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count);
 +int
 +mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type);
 +void mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc);
 +void mpt3sas_base_disable_msix(struct MPT3SAS_ADAPTER *ioc);
+ int mpt3sas_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num);
+ void mpt3sas_base_pause_mq_polling(struct MPT3SAS_ADAPTER *ioc);
+ void mpt3sas_base_resume_mq_polling(struct MPT3SAS_ADAPTER *ioc);
  
  /* scsih shared API */
  struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3013 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/ufs/ufshcd.c

between commit:

  b10178ee7fa8 ("scsi: ufs: Clean up completed request without interrupt notification")

from Linus' tree and commit:

  307348f6ab14 ("scsi: ufs: Abort tasks before clearing them from doorbell")

from the scsi-mkp tree.

I fixed it up (I thnink - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/ufs/ufshcd.c
index 3abc5b65e21c,05716f62febe..000000000000
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6587,65 -6745,10 +6749,11 @@@ static int ufshcd_abort(struct scsi_cmn
  		goto out;
  	}
  
- 	for (poll_cnt = 100; poll_cnt; poll_cnt--) {
- 		err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag,
- 				UFS_QUERY_TASK, &resp);
- 		if (!err && resp == UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED) {
- 			/* cmd pending in the device */
- 			dev_err(hba->dev, "%s: cmd pending in the device. tag = %d\n",
- 				__func__, tag);
- 			break;
- 		} else if (!err && resp == UPIU_TASK_MANAGEMENT_FUNC_COMPL) {
- 			/*
- 			 * cmd not pending in the device, check if it is
- 			 * in transition.
- 			 */
- 			dev_err(hba->dev, "%s: cmd at tag %d not pending in the device.\n",
- 				__func__, tag);
- 			reg = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
- 			if (reg & (1 << tag)) {
- 				/* sleep for max. 200us to stabilize */
- 				usleep_range(100, 200);
- 				continue;
- 			}
- 			/* command completed already */
- 			dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n",
- 				__func__, tag);
- 			goto cleanup;
- 		} else {
- 			dev_err(hba->dev,
- 				"%s: no response from device. tag = %d, err %d\n",
- 				__func__, tag, err);
- 			if (!err)
- 				err = resp; /* service response error */
- 			goto out;
- 		}
- 	}
- 
- 	if (!poll_cnt) {
- 		err = -EBUSY;
- 		goto out;
- 	}
- 
- 	err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag,
- 			UFS_ABORT_TASK, &resp);
- 	if (err || resp != UPIU_TASK_MANAGEMENT_FUNC_COMPL) {
- 		if (!err) {
- 			err = resp; /* service response error */
- 			dev_err(hba->dev, "%s: issued. tag = %d, err %d\n",
- 				__func__, tag, err);
- 		}
- 		goto out;
- 	}
- 
- 	err = ufshcd_clear_cmd(hba, tag);
- 	if (err) {
- 		dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n",
- 			__func__, tag, err);
+ 	err = ufshcd_try_to_abort_task(hba, tag);
+ 	if (err)
  		goto out;
- 	}
  
 +cleanup:
  	spin_lock_irqsave(host->host_lock, flags);
  	__ufshcd_transfer_req_compl(hba, (1UL << tag));
  	spin_unlock_irqrestore(host->host_lock, flags);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/ufs/ufshcd.h

between commit:

  8da76f71fef7 ("scsi: ufs-pci: Add quirk for broken auto-hibernate for Intel EHL")

from Linus' tree and commit:

  5df6f2def50c ("scsi: ufs: Introduce skipping manual flush for Write Booster")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/ufs/ufshcd.h
index b5b2761456fb,a88dfac7c9e9..000000000000
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@@ -531,11 -531,10 +531,16 @@@ enum ufshcd_quirks 
  	 */
  	UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR		= 1 << 10,
  
 +	/*
 +	 * This quirk needs to be enabled if the host controller has
 +	 * auto-hibernate capability but it doesn't work.
 +	 */
 +	UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8		= 1 << 11,
++
+ 	/*
+ 	 * This quirk needs to disable manual flush for write booster
+ 	 */
 -	UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL		= 1 << 11,
++	UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL		= 1 << 12,
  };
  
  enum ufshcd_caps {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

Hi all,

On Wed, 10 Jun 2020 12:17:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/scsi/sr.c
> 
> between commit:
> 
>   a711d91cd97e ("block: add a cdrom_device_info pointer to struct gendisk")
> 
> from Linus' tree and commit:
> 
>   6555781b3fde ("scsi: sr: Fix sr_probe() missing deallocate of device minor")
> 
> from the scsi-mkp tree.
> 

> diff --cc drivers/scsi/sr.c
> index 4dcd735ea49e,b9cff27e2c81..000000000000
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@@ -790,9 -790,10 +790,9 @@@ static int sr_probe(struct device *dev
>   	set_capacity(disk, cd->capacity);
>   	disk->private_data = &cd->driver;
>   	disk->queue = sdev->request_queue;
>  -	cd->cdi.disk = disk;
>   
>  -	if (register_cdrom(&cd->cdi))
>  +	if (register_cdrom(disk, &cd->cdi))
> - 		goto fail_put;
> + 		goto fail_minor;
>   
>   	/*
>   	 * Initialize block layer runtime PM stuffs before the

This is now a conflict between the scsi tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/sr.c

between commit:

  a711d91cd97e ("block: add a cdrom_device_info pointer to struct gendisk")

from Linus' tree and commit:

  6555781b3fde ("scsi: sr: Fix sr_probe() missing deallocate of device minor")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/sr.c
index 4dcd735ea49e,b9cff27e2c81..000000000000
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@@ -790,9 -790,10 +790,9 @@@ static int sr_probe(struct device *dev
  	set_capacity(disk, cd->capacity);
  	disk->private_data = &cd->driver;
  	disk->queue = sdev->request_queue;
 -	cd->cdi.disk = disk;
  
 -	if (register_cdrom(&cd->cdi))
 +	if (register_cdrom(disk, &cd->cdi))
- 		goto fail_put;
+ 		goto fail_minor;
  
  	/*
  	 * Initialize block layer runtime PM stuffs before the

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[John Garry]

On 11/02/2019 04:31, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
>   drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
>
> between commit:
>
>   7bb25a89aad2 ("scsi: hisi_sas: Set protection parameters prior to adding SCSI host")
>
> from Linus' tree and commit:
>
>   b3cce125cb1e ("scsi: hisi_sas: Add support for DIX feature for v3 hw")
>
> from the scsi-mkp tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>

The merge looks ok, thanks

JFYI, I did mention in the relevant patchset cover letter that the 
series depends on commit 7bb25a89aad2 ("scsi: hisi_sas: Set protection 
parameters prior to adding SCSI host"), which was not on Martin's 5.1 
queue. The series seems to apply cleanly to that same branch without 
this patch.

John

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1504 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

between commit:

  7bb25a89aad2 ("scsi: hisi_sas: Set protection parameters prior to adding SCSI host")

from Linus' tree and commit:

  b3cce125cb1e ("scsi: hisi_sas: Add support for DIX feature for v3 hw")

from the scsi-mkp tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 8481c5795e1f,00738d0673fe..000000000000
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@@ -2698,12 -2805,6 +2806,15 @@@ hisi_sas_v3_probe(struct pci_dev *pdev
  	if (hisi_sas_debugfs_enable)
  		hisi_sas_debugfs_init(hisi_hba);
  
 +	if (hisi_hba->prot_mask) {
 +		dev_info(dev, "Registering for DIF/DIX prot_mask=0x%x\n",
 +			 prot_mask);
 +		scsi_host_set_prot(hisi_hba->shost, prot_mask);
++		if (hisi_hba->prot_mask & HISI_SAS_DIX_PROT_MASK)
++			scsi_host_set_guard(hisi_hba->shost,
++					    SHOST_DIX_GUARD_CRC);
 +	}
 +
  	rc = scsi_add_host(shost, dev);
  	if (rc)
  		goto err_out_ha;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[James Smart]

On 2/6/2019 8:44 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>    drivers/scsi/lpfc/lpfc_nvme.c
> 
> between commit:
> 
>    7961cba6f7d8 ("scsi: lpfc: nvme: avoid hang / use-after-free when destroying localport")
> 
> from Linus' tree and commit:
> 
>    4c47efc140fa ("scsi: lpfc: Move SCSI and NVME Stats to hardware queue structures")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 


Thank You. The fixup patch looks correct.

Martin, let me know if there's anything else you'd like me to do.

-- james

Signed-off-by:  James Smart <james.smart@broadcom.com>

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1939 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/lpfc/lpfc_nvme.c

between commit:

  7961cba6f7d8 ("scsi: lpfc: nvme: avoid hang / use-after-free when destroying localport")

from Linus' tree and commit:

  4c47efc140fa ("scsi: lpfc: Move SCSI and NVME Stats to hardware queue structures")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/lpfc/lpfc_nvme.c
index c84621a80ee5,e73895674f39..000000000000
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@@ -2592,16 -2178,14 +2180,14 @@@ lpfc_nvme_destroy_localport(struct lpfc
  #if (IS_ENABLED(CONFIG_NVME_FC))
  	struct nvme_fc_local_port *localport;
  	struct lpfc_nvme_lport *lport;
- 	struct lpfc_nvme_ctrl_stat *cstat;
  	int ret;
 +	DECLARE_COMPLETION_ONSTACK(lport_unreg_cmp);
  
  	if (vport->nvmei_support == 0)
  		return;
  
  	localport = vport->localport;
 -	vport->localport = NULL;
  	lport = (struct lpfc_nvme_lport *)localport->private;
- 	cstat = lport->cstat;
  
  	lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME,
  			 "6011 Destroying NVME localport %p\n",
@@@ -2616,9 -2200,7 +2202,8 @@@
  	/* Wait for completion.  This either blocks
  	 * indefinitely or succeeds
  	 */
 -	lpfc_nvme_lport_unreg_wait(vport, lport);
 +	lpfc_nvme_lport_unreg_wait(vport, lport, &lport_unreg_cmp);
 +	vport->localport = NULL;
- 	kfree(cstat);
  
  	/* Regardless of the unregister upcall response, clear
  	 * nvmei_support.  All rports are unregistered and the

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2124 bytes --]

Hi all,

On Mon, 10 Dec 2018 17:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary. This

See below :-)

Also I accidentally left the declaration of "status" in __qla2x00_abort_all_cmds().
-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/qla2xxx/qla_os.c
index f92196ec5489,643cd7c0efc1..000000000000
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -1742,6 -1746,41 +1742,49 @@@ qla2x00_loop_reset(scsi_qla_host_t *vha
  	return QLA_SUCCESS;
  }
  
+ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res,
+ 			      unsigned long *flags)
+ 	__releases(qp->qp_lock_ptr)
+ 	__acquires(qp->qp_lock_ptr)
+ {
+ 	scsi_qla_host_t *vha = qp->vha;
+ 	struct qla_hw_data *ha = vha->hw;
+ 
+ 	if (sp->type == SRB_NVME_CMD || sp->type == SRB_NVME_LS) {
+ 		if (!sp_get(sp)) {
+ 			/* got sp */
+ 			spin_unlock_irqrestore(qp->qp_lock_ptr, *flags);
+ 			qla_nvme_abort(ha, sp, res);
+ 			spin_lock_irqsave(qp->qp_lock_ptr, *flags);
+ 		}
+ 	} else if (GET_CMD_SP(sp) && !ha->flags.eeh_busy &&
+ 		   !test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&
+ 		   !qla2x00_isp_reg_stat(ha) && sp->type == SRB_SCSI_CMD) {
+ 		/*
+ 		 * Don't abort commands in adapter during EEH recovery as it's
+ 		 * not accessible/responding.
+ 		 *
+ 		 * Get a reference to the sp and drop the lock. The reference
+ 		 * ensures this sp->done() call and not the call in
+ 		 * qla2xxx_eh_abort() ends the SCSI cmd (with result 'res').
+ 		 */
+ 		if (!sp_get(sp)) {
++			int status;
++
+ 			spin_unlock_irqrestore(qp->qp_lock_ptr, *flags);
 -			qla2xxx_eh_abort(GET_CMD_SP(sp));
++			status = qla2xxx_eh_abort(GET_CMD_SP(sp));
+ 			spin_lock_irqsave(qp->qp_lock_ptr, *flags);
++			/*
++			 * Get rid of extra reference causedby early
++			 * exit from qla2xxx_eh_abort
++			 */
++			if (status == FAST_IO_FAIL)
++				atomic_dec(&sp->ref_count);
+ 		}
+ 	}
+ 	sp->done(sp, res);
+ }
+ 
  static void
  __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 781 bytes --]

Hi Martin,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/qla2xxx/qla_os.c

between commit:

  f2ffd4e5bc7b ("scsi: qla2xxx: Timeouts occur on surprise removal of QLogic adapter")

from Linus' tree and commit:

  c4e521b654e1 ("scsi: qla2xxx: Split the __qla2x00_abort_all_cmds() function")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]

Hi Martin,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/lpfc/lpfc_debugfs.c

between commit:

  9e210178267b ("scsi: lpfc: Synchronize access to remoteport via rport")

from Linus' tree and commit:

  d021613ee3ac ("scsi: lpfc: Remove set but not used variables 'tgtp'")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/lpfc/lpfc_debugfs.c
index aec5b10a8c85,d6e4cbfe3273..000000000000
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@@ -550,8 -550,7 +550,7 @@@ lpfc_debugfs_nodelist_data(struct lpfc_
  	struct lpfc_nodelist *ndlp;
  	unsigned char *statep;
  	struct nvme_fc_local_port *localport;
- 	struct lpfc_nvmet_tgtport *tgtp;
 -	struct nvme_fc_remote_port *nrport;
 +	struct nvme_fc_remote_port *nrport = NULL;
  	struct lpfc_nvme_rport *rport;
  
  	cnt = (LPFC_NODELIST_SIZE / LPFC_NODELIST_ENTRY_SIZE);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4465 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/qla2xxx/qla_init.c

between commit:

  36eb8ff672fa ("scsi: qla2xxx: Fix NULL pointer dereference for fcport search")

from Linus' tree and commit:

  48acad099074 ("scsi: qla2xxx: Fix N2N link re-connect")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Martin, thanks for the heads up, but I think my resolution below is more
correct than the one you were supplied with as the ql_dbg() function
needs this many arguments.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/qla2xxx/qla_init.c
index 1b19b954bbae,f52c68b4da44..000000000000
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@@ -578,34 -693,76 +693,79 @@@ static void qla24xx_handle_gnl_done_eve
  	}
  
  	if (!found) {
- 		/* fw has no record of this port */
- 		for (i = 0; i < n; i++) {
- 			e = &vha->gnl.l[i];
- 			id.b.domain = e->port_id[0];
- 			id.b.area = e->port_id[1];
- 			id.b.al_pa = e->port_id[2];
- 			id.b.rsvd_1 = 0;
- 			loop_id = le16_to_cpu(e->nport_handle);
- 
- 			if (fcport->d_id.b24 == id.b24) {
- 				conflict_fcport =
- 					qla2x00_find_fcport_by_wwpn(vha,
- 					    e->port_name, 0);
- 				if (conflict_fcport) {
- 					qlt_schedule_sess_for_deletion
- 						(conflict_fcport);
- 					ql_dbg(ql_dbg_disc, vha, 0x20e6,
- 					    "%s %d %8phC post del sess\n",
- 					    __func__, __LINE__,
- 					    conflict_fcport->port_name);
+ 		switch (vha->hw->current_topology) {
+ 		case ISP_CFG_F:
+ 		case ISP_CFG_FL:
+ 			for (i = 0; i < n; i++) {
+ 				e = &vha->gnl.l[i];
+ 				id.b.domain = e->port_id[0];
+ 				id.b.area = e->port_id[1];
+ 				id.b.al_pa = e->port_id[2];
+ 				id.b.rsvd_1 = 0;
+ 				loop_id = le16_to_cpu(e->nport_handle);
+ 
+ 				if (fcport->d_id.b24 == id.b24) {
+ 					conflict_fcport =
+ 					    qla2x00_find_fcport_by_wwpn(vha,
+ 						e->port_name, 0);
 -					ql_dbg(ql_dbg_disc + ql_dbg_verbose,
 -					    vha, 0x20e5,
 -					    "%s %d %8phC post del sess\n",
 -					    __func__, __LINE__,
 -					    conflict_fcport->port_name);
 -					qlt_schedule_sess_for_deletion
 -						(conflict_fcport);
++					if (conflict_fcport) {
++						ql_dbg(ql_dbg_disc +
++						    ql_dbg_verbose,
++						    vha, 0x20e5,
++						    "%s %d %8phC post del sess\n",
++						    __func__, __LINE__,
++						    conflict_fcport->port_name);
++						qlt_schedule_sess_for_deletion
++							(conflict_fcport);
++					}
  				}
+ 				/*
+ 				 * FW already picked this loop id for
+ 				 * another fcport
+ 				 */
+ 				if (fcport->loop_id == loop_id)
+ 					fcport->loop_id = FC_NO_LOOP_ID;
  			}
- 
- 			/* FW already picked this loop id for another fcport */
- 			if (fcport->loop_id == loop_id)
- 				fcport->loop_id = FC_NO_LOOP_ID;
+ 			qla24xx_fcport_handle_login(vha, fcport);
+ 			break;
+ 		case ISP_CFG_N:
+ 			fcport->disc_state = DSC_DELETED;
+ 			if (time_after_eq(jiffies, fcport->dm_login_expire)) {
+ 				if (fcport->n2n_link_reset_cnt < 2) {
+ 					fcport->n2n_link_reset_cnt++;
+ 					/*
+ 					 * remote port is not sending PLOGI.
+ 					 * Reset link to kick start his state
+ 					 * machine
+ 					 */
+ 					set_bit(N2N_LINK_RESET,
+ 					    &vha->dpc_flags);
+ 				} else {
+ 					if (fcport->n2n_chip_reset < 1) {
+ 						ql_log(ql_log_info, vha, 0x705d,
+ 						    "Chip reset to bring laser down");
+ 						set_bit(ISP_ABORT_NEEDED,
+ 						    &vha->dpc_flags);
+ 						fcport->n2n_chip_reset++;
+ 					} else {
+ 						ql_log(ql_log_info, vha, 0x705d,
+ 						    "Remote port %8ph is not coming back\n",
+ 						    fcport->port_name);
+ 						fcport->scan_state = 0;
+ 					}
+ 				}
+ 				qla2xxx_wake_dpc(vha);
+ 			} else {
+ 				/*
+ 				 * report port suppose to do PLOGI. Give him
+ 				 * more time. FW will catch it.
+ 				 */
+ 				set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
+ 			}
+ 			break;
+ 		default:
+ 			break;
  		}
- 		qla24xx_fcport_handle_login(vha, fcport);
  	}
  } /* gnl_event */
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2837 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got conflicts in:

  drivers/scsi/qla2xxx/qla_gs.c

between commit:

  b5f3bc39a0e8 ("scsi: qla2xxx: Fix inconsistent DMA mem alloc/free")

from Linus' tree and commit:

  8777e4314d39 ("scsi: qla2xxx: Migrate NVME N2N handling into state machine")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

P.S. it looks like more use could be made of "c" in this function ...

diff --cc drivers/scsi/qla2xxx/qla_gs.c
index 7a3744006419,407eb705f1be..000000000000
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@@ -3394,19 -3383,40 +3391,40 @@@ int qla24xx_post_gpnid_work(struct scsi
  
  void qla24xx_sp_unmap(scsi_qla_host_t *vha, srb_t *sp)
  {
- 	if (sp->u.iocb_cmd.u.ctarg.req) {
- 		dma_free_coherent(&vha->hw->pdev->dev,
- 			sp->u.iocb_cmd.u.ctarg.req_allocated_size,
- 			sp->u.iocb_cmd.u.ctarg.req,
- 			sp->u.iocb_cmd.u.ctarg.req_dma);
- 		sp->u.iocb_cmd.u.ctarg.req = NULL;
- 	}
- 	if (sp->u.iocb_cmd.u.ctarg.rsp) {
- 		dma_free_coherent(&vha->hw->pdev->dev,
- 			sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
- 			sp->u.iocb_cmd.u.ctarg.rsp,
- 			sp->u.iocb_cmd.u.ctarg.rsp_dma);
- 		sp->u.iocb_cmd.u.ctarg.rsp = NULL;
+ 	struct srb_iocb *c = &sp->u.iocb_cmd;
+ 
+ 	switch (sp->type) {
+ 	case SRB_ELS_DCMD:
+ 		if (c->u.els_plogi.els_plogi_pyld)
+ 			dma_free_coherent(&vha->hw->pdev->dev,
+ 			    c->u.els_plogi.tx_size,
+ 			    c->u.els_plogi.els_plogi_pyld,
+ 			    c->u.els_plogi.els_plogi_pyld_dma);
+ 
+ 		if (c->u.els_plogi.els_resp_pyld)
+ 			dma_free_coherent(&vha->hw->pdev->dev,
+ 			    c->u.els_plogi.rx_size,
+ 			    c->u.els_plogi.els_resp_pyld,
+ 			    c->u.els_plogi.els_resp_pyld_dma);
+ 		break;
+ 	case SRB_CT_PTHRU_CMD:
+ 	default:
+ 		if (sp->u.iocb_cmd.u.ctarg.req) {
+ 			dma_free_coherent(&vha->hw->pdev->dev,
 -			    sizeof(struct ct_sns_pkt),
++			    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
+ 			    sp->u.iocb_cmd.u.ctarg.req,
+ 			    sp->u.iocb_cmd.u.ctarg.req_dma);
+ 			sp->u.iocb_cmd.u.ctarg.req = NULL;
+ 		}
+ 
+ 		if (sp->u.iocb_cmd.u.ctarg.rsp) {
+ 			dma_free_coherent(&vha->hw->pdev->dev,
 -			    sizeof(struct ct_sns_pkt),
++			    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
+ 			    sp->u.iocb_cmd.u.ctarg.rsp,
+ 			    sp->u.iocb_cmd.u.ctarg.rsp_dma);
+ 			sp->u.iocb_cmd.u.ctarg.rsp = NULL;
+ 		}
+ 		break;
  	}
  
  	sp->free(sp);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1632 bytes --]

Hi all,

On Wed, 11 Jul 2018 14:04:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   54e45716a84a ("scsi: remove NCR_D700 driver")
> 
> from Linus' tree and commit:
> 
>   01a21986f8ed ("MAINTAINERS: Add Sam as the maintainer for NCSI")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc MAINTAINERS
> index e5f8823b5f02,f3de5d37179a..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -9810,17 -9750,6 +9810,11 @@@ F:	drivers/scsi/mac_scsi.
>   F:	drivers/scsi/sun3_scsi.*
>   F:	drivers/scsi/sun3_scsi_vme.c
>   
> - NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
> - M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
> - L:	linux-scsi@vger.kernel.org
> - S:	Maintained
> - F:	drivers/scsi/NCR_D700.*
> - 
>  +NCSI LIBRARY:
>  +M:	Samuel Mendoza-Jonas <sam@mendozajonas.com>
>  +S:	Maintained
>  +F:	net/ncsi/
>  +
>   NCT6775 HARDWARE MONITOR DRIVER
>   M:	Guenter Roeck <linux@roeck-us.net>
>   L:	linux-hwmon@vger.kernel.org

This conflict is now between the scsi tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  MAINTAINERS

between commit:

  54e45716a84a ("scsi: remove NCR_D700 driver")

from Linus' tree and commit:

  01a21986f8ed ("MAINTAINERS: Add Sam as the maintainer for NCSI")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index e5f8823b5f02,f3de5d37179a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9810,17 -9750,6 +9810,11 @@@ F:	drivers/scsi/mac_scsi.
  F:	drivers/scsi/sun3_scsi.*
  F:	drivers/scsi/sun3_scsi_vme.c
  
- NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
- M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
- L:	linux-scsi@vger.kernel.org
- S:	Maintained
- F:	drivers/scsi/NCR_D700.*
- 
 +NCSI LIBRARY:
 +M:	Samuel Mendoza-Jonas <sam@mendozajonas.com>
 +S:	Maintained
 +F:	net/ncsi/
 +
  NCT6775 HARDWARE MONITOR DRIVER
  M:	Guenter Roeck <linux@roeck-us.net>
  L:	linux-hwmon@vger.kernel.org

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

Hi Martin,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/qla2xxx/qla_os.c

between commit:

  2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery")

from Linus' tree and commit:

  33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")

from the scsi-mkp tree.

I fixed it up (I just used the latter version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi Martin,

On Thu, 30 Nov 2017 21:14:25 -0500 "Martin K. Petersen" <martin.petersen@oracle.com> wrote:
>
> > That should have been arcmsr_set_iop_datetime, sorry.  I will fix it
> > tomorrow if you haven't rebased onto v4.15-rc1 by then :-)  
> 
> I had such a huge pile of patches in the queue that I was compelled to
> begin 4.16 early. I had meant to rebase that tree to rc1 before
> switching my for-next branch over from 4.15 fixes. But I completely
> forgot when I pushed, sorry!

No worries.

> Will fix things up tomorrow...

Thanks.
-- 
Cheers,
Stephen Rothwell

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Martin K. Petersen]

Stephen,

> That should have been arcmsr_set_iop_datetime, sorry.  I will fix it
> tomorrow if you haven't rebased onto v4.15-rc1 by then :-)

I had such a huge pile of patches in the queue that I was compelled to
begin 4.16 early. I had meant to rebase that tree to rc1 before
switching my for-next branch over from 4.15 fixes. But I completely
forgot when I pushed, sorry!

Will fix things up tomorrow...

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi Martin

On Thu, 30 Nov 2017 12:51:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> + static void arcmsr_init_set_datetime_timer(struct AdapterControlBlock *pacb)
> + {
>  -	init_timer(&pacb->refresh_timer);
> ++	timer_setup(&pacb->eternal_timer, arcmsr_request_device_map, 0);
                                          ^^^^^^^^^^^^^^^^^^^^^^^^^
That should have been arcmsr_set_iop_datetime, sorry.  I will fix it
tomorrow if you haven't rebased onto v4.15-rc1 by then :-)

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi Martin,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/arcmsr/arcmsr_hba.c

between commits:

  b9eaf1872222 ("treewide: init_timer() -> setup_timer()")
  e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")

from Linus' tree and commits:

  ee09098d4769 ("scsi: arcmsr: add a function arcmsr_set_iop_datetime and driver option set_date_time to set date and time to firmware")
  1b19ea2998c4 ("scsi: arcmsr: spin off duplicate code of timer init for message isr BH in arcmsr_probe and arcmsr_resume as a function")

from the scsi-mkp tree.

I fixed it up (I think I gto it right - see below) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/arcmsr/arcmsr_hba.c
index 21f6421536a0,2aec32ff8109..000000000000
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@@ -755,6 -857,28 +857,24 @@@ out_free_irq
  	return FAILED;
  }
  
+ static void arcmsr_init_get_devmap_timer(struct AdapterControlBlock *pacb)
+ {
+ 	INIT_WORK(&pacb->arcmsr_do_message_isr_bh, arcmsr_message_isr_bh_fn);
+ 	atomic_set(&pacb->rq_map_token, 16);
+ 	atomic_set(&pacb->ante_token_value, 16);
+ 	pacb->fw_flag = FW_NORMAL;
 -	init_timer(&pacb->eternal_timer);
++	timer_setup(&pacb->eternal_timer, arcmsr_request_device_map, 0);
+ 	pacb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 * HZ);
 -	pacb->eternal_timer.data = (unsigned long)pacb;
 -	pacb->eternal_timer.function = &arcmsr_request_device_map;
+ 	add_timer(&pacb->eternal_timer);
+ }
+ 
+ static void arcmsr_init_set_datetime_timer(struct AdapterControlBlock *pacb)
+ {
 -	init_timer(&pacb->refresh_timer);
++	timer_setup(&pacb->eternal_timer, arcmsr_request_device_map, 0);
+ 	pacb->refresh_timer.expires = jiffies + msecs_to_jiffies(60 * 1000);
 -	pacb->refresh_timer.data = (unsigned long)pacb;
 -	pacb->refresh_timer.function = &arcmsr_set_iop_datetime;
+ 	add_timer(&pacb->refresh_timer);
+ }
+ 
  static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  {
  	struct Scsi_Host *host;

linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  include/scsi/scsi_cmnd.h

between commit:

  70e42fd02c46 ("scsi: sd_zbc: Write unlock zone from sd_uninit_cmnd()")

from Linus' tree and commit:

  64104f703212 ("scsi: Call scsi_initialize_rq() for filesystem requests")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/scsi/scsi_cmnd.h
index 5f45f2349a75,a9f8f7e79d83..000000000000
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@@ -57,7 -57,9 +57,10 @@@ struct scsi_pointer 
  /* for scmd->flags */
  #define SCMD_TAGGED		(1 << 0)
  #define SCMD_UNCHECKED_ISA_DMA	(1 << 1)
 +#define SCMD_ZONE_WRITE_LOCK	(1 << 2)
+ #define SCMD_INITIALIZED	(1 << 3)
+ /* flags preserved across unprep / reprep */
+ #define SCMD_PRESERVED_FLAGS	(SCMD_UNCHECKED_ISA_DMA | SCMD_INITIALIZED)
  
  struct scsi_cmnd {
  	struct scsi_request req;