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

Commit aaa092a1 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

sata_sis: fix SCR read breakage 



SCR read for controllers which uses PCI configuration space for SCR
access got broken while adding @val argument to SCR accessors.  Fix
it.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5c1ad8b3

drivers/ata/sata_sis.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -166,11 +166,11 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg) 
	return addr;

	return addr;

}

}





static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)

static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg, u32 *val)

{

{

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);

	unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);

	u32 val, val2 = 0;

	u32 val2 = 0;

	u8 pmr;

	u8 pmr;





	if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */

	if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */
@@ -178,13 +178,16 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg) 




	pci_read_config_byte(pdev, SIS_PMR, &pmr);

	pci_read_config_byte(pdev, SIS_PMR, &pmr);





	pci_read_config_dword(pdev, cfg_addr, &val);

	pci_read_config_dword(pdev, cfg_addr, val);





	if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||

	if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||

	    (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))

	    (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))

		pci_read_config_dword(pdev, cfg_addr+0x10, &val2);

		pci_read_config_dword(pdev, cfg_addr+0x10, &val2);





	return (val|val2) &  0xfffffffb; /* avoid problems with powerdowned ports */

	*val |= val2;

	*val &= 0xfffffffb;	/* avoid problems with powerdowned ports */



	return 0;

}

}





static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val)

static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
@@ -214,7 +217,7 @@ static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val) 
		return -EINVAL;

		return -EINVAL;





	if (ap->flags & SIS_FLAG_CFGSCR)

	if (ap->flags & SIS_FLAG_CFGSCR)

		return sis_scr_cfg_read(ap, sc_reg);

		return sis_scr_cfg_read(ap, sc_reg, val);





	pci_read_config_byte(pdev, SIS_PMR, &pmr);

	pci_read_config_byte(pdev, SIS_PMR, &pmr);