On 09/16/2015 04:30 PM, Matthew R. Ochs wrote:
> At present, both ports must be online for the device to
> configure properly. Remove this dependency and the unnecessary
> internal LUN override logic as well. Additionally, as a refactoring
> measure, change the return code variable name to match that used
> throughout the driver.
Doesn't this also change the behavior to no longer fail init_afu even
if BOTH ports fail to go offline in the reconfig case. Is that OK?
-Brian
>
> Signed-off-by: Matthew R. Ochs <mrochs@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Manoj N. Kumar <manoj@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/scsi/cxlflash/main.c | 23 ++++++++---------------
> 1 file changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
> index 74eb742..e2cc410 100644
> --- a/drivers/scsi/cxlflash/main.c
> +++ b/drivers/scsi/cxlflash/main.c
> @@ -1031,7 +1031,7 @@ static int wait_port_offline(u64 *fc_regs, u32 delay_us, u32 nretry)
> */
> static int afu_set_wwpn(struct afu *afu, int port, u64 *fc_regs, u64 wwpn)
> {
> - int ret = 0;
> + int rc = 0;
>
> set_port_offline(fc_regs);
>
> @@ -1039,33 +1039,26 @@ static int afu_set_wwpn(struct afu *afu, int port, u64 *fc_regs, u64 wwpn)
> FC_PORT_STATUS_RETRY_CNT)) {
> pr_debug("%s: wait on port %d to go offline timed out\n",
> __func__, port);
> - ret = -1; /* but continue on to leave the port back online */
> + rc = -1; /* but continue on to leave the port back online */
> }
>
> - if (ret == 0)
> + if (rc == 0)
> writeq_be(wwpn, &fc_regs[FC_PNAME / 8]);
>
> + /* Always return success after programming WWPN */
> + rc = 0;
> +
> set_port_online(fc_regs);
>
> if (!wait_port_online(fc_regs, FC_PORT_STATUS_RETRY_INTERVAL_US,
> FC_PORT_STATUS_RETRY_CNT)) {
> pr_debug("%s: wait on port %d to go online timed out\n",
> __func__, port);
> - ret = -1;
> -
> - /*
> - * Override for internal lun!!!
> - */
> - if (afu->internal_lun) {
> - pr_debug("%s: Overriding port %d online timeout!!!\n",
> - __func__, port);
> - ret = 0;
> - }
> }
>
> - pr_debug("%s: returning rc=%d\n", __func__, ret);
> + pr_debug("%s: returning rc=%d\n", __func__, rc);
>
> - return ret;
> + return rc;
> }
>
> /**
>
--
Brian King
Power Linux I/O
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
