Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a23c1d6 authored by Antoine Tenart's avatar Antoine Tenart Committed by Tejun Heo
Browse files

ahci: fix AHCI parameters not taken into account 



Changes into the AHCI subsystem have introduced a bug by not taking into
account the force_port_map and mask_port_map parameters when using the
ahci_pci_save_initial_config function. This commit fixes it by setting
the internal parameters of the ahci_port_priv structure.

Fixes: 725c7b57

Reported-and-tested-by: default avatarZlatko Calusic <zcalusic@bitsync.net>
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
parent e35b9884

drivers/ata/ahci.c

+3 −6
Original line number Diff line number Diff line
@@ -527,12 +527,9 @@ MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)"); 
static void ahci_pci_save_initial_config(struct pci_dev *pdev,

					 struct ahci_host_priv *hpriv)

{

	unsigned int force_port_map = 0;

	unsigned int mask_port_map = 0;



	if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361) {

		dev_info(&pdev->dev, "JMB361 has only one port\n");

		force_port_map = 1;

		hpriv->force_port_map = 1;

	}



	/*
@@ -542,9 +539,9 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev, 
	 */

	if (hpriv->flags & AHCI_HFLAG_MV_PATA) {

		if (pdev->device == 0x6121)

			mask_port_map = 0x3;

			hpriv->mask_port_map = 0x3;

		else

			mask_port_map = 0xf;

			hpriv->mask_port_map = 0xf;

		dev_info(&pdev->dev,

			  "Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n");

	}