diff options
author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-04-01 08:52:56 +0100 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-05-17 13:42:36 -0400 |
commit | a5d2af4cf04bd0d1a6c1cb178d4673d9ca32a298 (patch) | |
tree | 73500799c2eaa5a3e27a2c4aef382caee7cdfa02 | |
parent | e1bab7565919a5eb4765ba26f927a17898177c04 (diff) |
libahci: save port map for forced port map
[ Upstream commit 2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-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 49840264dd57..de56b91238c9 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -467,6 +467,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) { |