diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-04-01 10:52:56 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-06-15 23:29:21 +0300 |
| commit | 8eb71f12aad899a8e182c2c459112dafb72b82e2 (patch) | |
| tree | 43d9b659ebc9666294ae71846b53237526df9a8c /drivers/ata | |
| parent | 772703cadb1bf378bcd5ae87db4c150da37351b6 (diff) | |
| download | linux-8eb71f12aad899a8e182c2c459112dafb72b82e2.tar.xz | |
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.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libahci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 9b82d2b1afdf..2012122d4c4a 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -472,6 +472,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) { |