From 781e45b5fc6d2d38132ac8bd3a9e32e0c3155e84 Mon Sep 17 00:00:00 2001 From: Dave Maurer Date: Fri, 22 Jun 2012 06:45:33 +0000 Subject: [PATCH] --- yaml --- r: 328745 b: refs/heads/master c: a90037560588e51b3e98b49537799137cbfda17d h: refs/heads/master i: 328743: be9d8900667ae75f289289577ab5e2f24d04457b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/phy.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c83ee8c9d1fe..742962e97274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d70a74ffd616073a68ae0974d98819bfa8e6da6 +refs/heads/master: a90037560588e51b3e98b49537799137cbfda17d diff --git a/trunk/drivers/scsi/isci/phy.c b/trunk/drivers/scsi/isci/phy.c index 18f43d4c30ba..ebb8f530f708 100644 --- a/trunk/drivers/scsi/isci/phy.c +++ b/trunk/drivers/scsi/isci/phy.c @@ -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));