summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2016-04-01 08:52:56 +0100
committerBen Hutchings <ben@decadent.org.uk>2016-06-15 21:28:11 +0100
commit72692570f912eafefd514dff9a70d85215e7d62d (patch)
tree4eaaa045f8cf2d03d685c7dcf541eca89b687424
parent315085d5f39f1be90960b9ee4749c2e5df21096e (diff)
downloadlinux-stable-72692570f912eafefd514dff9a70d85215e7d62d.tar.gz
linux-stable-72692570f912eafefd514dff9a70d85215e7d62d.tar.bz2
linux-stable-72692570f912eafefd514dff9a70d85215e7d62d.zip
libahci: save port map for forced port map
commit 2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7 upstream. 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") 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> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-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 1adb71733d05..fbfde7153f78 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -452,6 +452,7 @@ void ahci_save_initial_config(struct device *dev,
dev_info(dev, "forcing port_map 0x%x -> 0x%x\n",
port_map, force_port_map);
port_map = force_port_map;
+ hpriv->saved_port_map = port_map;
}
if (mask_port_map) {