diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-04-01 09:52:56 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-04-01 16:30:30 +0200 |
| commit | 2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7 (patch) | |
| tree | 0720be8b1ad635bae27cc020a5254a1e24211397 /drivers | |
| parent | Linux 4.6-rc1 (diff) | |
| download | linux-2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7.tar.xz linux-2fd0f46cb1b82587c7ae4a616d69057fb9bd0af7.zip | |
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>
Diffstat (limited to 'drivers')
| -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 3982054060b8..a5d7c1c2a05e 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) { |