isci: fix COMSAS negation timout workaround for WD SAS drives (a9003756) · Commits · 戴 / test

The following patch is a fix for the WD workaround COMSAS negation timeout change. This patch disables the OOB SM when the OOB is placed in reset, which allows the updated COMSAS negation timeout value to take effect. Cc: Dan Thompson <daniel.j.thompson@intel.com> Reported-by:

Dan Thompson <daniel.j.thompson@intel.com> Signed-off-by:

Dave Maurer <david.c.maurer@intel.com> Signed-off-by:

Dan Williams <dan.j.williams@intel.com>

drivers/scsi/isci/phy.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1205,6 +1205,7 @@ static void scu_link_layer_start_oob(struct isci_phy *iphy)
		/** Reset OOB sequence - start */
		val = readl(&ll->phy_configuration);
		val &= ~(SCU_SAS_PCFG_GEN_BIT(OOB_RESET) \|
		SCU_SAS_PCFG_GEN_BIT(OOB_ENABLE) \|
		SCU_SAS_PCFG_GEN_BIT(HARD_RESET));
		writel(val, &ll->phy_configuration);
		readl(&ll->phy_configuration); /* flush */
		@@ -1236,6 +1237,7 @@ static void scu_link_layer_tx_hard_reset(
		* to the starting state. */
		phy_configuration_value =
		readl(&iphy->link_layer_registers->phy_configuration);
		phy_configuration_value &= ~(SCU_SAS_PCFG_GEN_BIT(OOB_ENABLE));
		phy_configuration_value \|=
		(SCU_SAS_PCFG_GEN_BIT(HARD_RESET) \|
		SCU_SAS_PCFG_GEN_BIT(OOB_RESET));

Admin message