summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2016-04-01 08:52:56 +0100
committerTejun Heo <tj@kernel.org>2016-04-01 10:30:30 -0400
commit2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7 (patch)
tree0720be8b1ad635bae27cc020a5254a1e24211397
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
downloadop-kernel-dev-2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7.zip
op-kernel-dev-2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7.tar.gz
libahci: save port map for forced port map
In usecases where force_port_map is used saved_port_map is never set, resulting in not programming the PORTS_IMPL register as part of initial config. This patch fixes this by setting it to port_map even in case where force_port_map is used, making it more inline with other parts of the code. Fixes: 566d1827df2e ("libata: disable forced PORTS_IMPL for >= AHCI 1.3") Cc: stable@vger.kernel.org # v4.5+ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Acked-by: Tejun Heo <tj@kernel.org> Reviewed-by: Andy Gross <andy.gross@linaro.org> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/ata/libahci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 3982054..a5d7c1c 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -507,6 +507,7 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv)
dev_info(dev, "forcing port_map 0x%x -> 0x%x\n",
port_map, hpriv->force_port_map);
port_map = hpriv->force_port_map;
+ hpriv->saved_port_map = port_map;
}
if (hpriv->mask_port_map) {
OpenPOWER on IntegriCloud