ahci: fix AHCI parameters not taken into account (9a23c1d6) · Commits · 戴 / test

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: Reported-and-tested-by:

Zlatko Calusic <zcalusic@bitsync.net> Signed-off-by:

Antoine Tenart <antoine.tenart@free-electrons.com>

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");
		}

Admin message