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

Commit ece903bf authored by Andrey Jr. Melnikov's avatar Andrey Jr. Melnikov Committed by Greg Kroah-Hartman
Browse files

ahci: asm1064: correct count of reported ports 



[ Upstream commit 9815e39617541ef52d0dfac4be274ad378c6dc09 ]

The ASM1064 SATA host controller always reports wrongly,
that it has 24 ports. But in reality, it only has four ports.

before:
ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xffff0f impl SATA mode
ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst

after:
ahci 0000:04:00.0: ASM1064 has only four ports
ahci 0000:04:00.0: forcing port_map 0xffff0f -> 0xf
ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xf impl SATA mode
ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst

Signed-off-by: default avatar"Andrey Jr. Melnikov" <temnota.am@gmail.com>
Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
Stable-dep-of: 6cd8adc3e189 ("ahci: asm1064: asm1166: don't limit reported ports")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e4d581a5

drivers/ata/ahci.c

+11 −3
Original line number Diff line number Diff line
@@ -634,9 +634,17 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets"); 
static void ahci_pci_save_initial_config(struct pci_dev *pdev,

					 struct ahci_host_priv *hpriv)

{

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == 0x1166) {

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA) {

		switch (pdev->device) {

		case 0x1166:

			dev_info(&pdev->dev, "ASM1166 has only six ports\n");

			hpriv->saved_port_map = 0x3f;

			break;

		case 0x1064:

			dev_info(&pdev->dev, "ASM1064 has only four ports\n");

			hpriv->saved_port_map = 0xf;

			break;

		}

	}



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