cxlflash: Remove dual port online dependency (964497b3) · Commits · 戴 / test

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. With this change, the card will be able to configure even when the link is down. At some later point when the link is transitioned to 'up', a link state change interrupt will trigger the port configuration. Note that despite its void-like behavior, the function was left with a return code for right now in case its behavior needs to be altered again in the near future based on testing. Signed-off-by:

Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Signed-off-by:

Manoj N. Kumar <manoj@linux.vnet.ibm.com> Reviewed-by:

Brian King <brking@linux.vnet.ibm.com> Reviewed-by:

Daniel Axtens <dja@axtens.net> Reviewed-by:

Tomas Henzl <thenzl@redhat.com> Signed-off-by:

James Bottomley <JBottomley@Odin.com>

drivers/scsi/cxlflash/main.c

+10 −17

Original line number	Diff line number	Diff line
		@@ -1030,7 +1030,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);

		@@ -1038,33 +1038,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",
		pr_err("%s: wait on port %d to go online timed out\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;
		}

		/**

Admin message