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

Commit 4f13967e authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: me: disable driver on SPT SPS firmware 



commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream.

Sunrise Point PCH with SPS Firmware doesn't expose working
MEI interface, we need to quirk it out.
The SPS Firmware is identifiable only on the first PCI function
of the device.

Tested-by: default avatarSujith Pandel <sujith_pandel@dell.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1049372

drivers/misc/mei/hw-me.c

+8 −2
Original line number Diff line number Diff line
@@ -1258,8 +1258,14 @@ static bool mei_me_fw_type_nm(struct pci_dev *pdev) 
static bool mei_me_fw_type_sps(struct pci_dev *pdev)

{

	u32 reg;

	/* Read ME FW Status check for SPS Firmware */

	pci_read_config_dword(pdev, PCI_CFG_HFS_1, &reg);

	unsigned int devfn;



	/*

	 * Read ME FW Status register to check for SPS Firmware

	 * The SPS FW is only signaled in pci function 0

	 */

	devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);

	pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, &reg);

	/* if bits [19:16] = 15, running SPS Firmware */

	return (reg & 0xf0000) == 0xf0000;

}

drivers/misc/mei/pci-me.c

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { 


	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT, mei_me_pch8_cfg)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_cfg)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_cfg)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_sps_cfg)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_sps_cfg)},



	{MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},