[PATCH 3.16 010/114] libahci: save port map for forced port map
From: Ben Hutchings <hidden>
Date: 2016-06-13 18:37:36
Also in:
lkml
3.16.36-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Kandagatla <redacted>
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 <redacted>
Acked-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Andy Gross <redacted>
Signed-off-by: Tejun Heo <tj@kernel.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <redacted>
---
drivers/ata/libahci.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c@@ -472,6 +472,7 @@ void ahci_save_initial_config(struct 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) {