Skip to content

Commit

Permalink
mei: add mei_quirk_probe function
Browse files Browse the repository at this point in the history
The main purpose of this function is to exclude ME devices
without support for MEI/HECI interface from binding

Currently affected systems are C600/X79 based servers
that expose PCI device even though it doesn't supported ME Interface.
MEI driver accessing such nonfunctional device can corrupt
the system.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Aug 16, 2012
1 parent 3e83095 commit a2f6985
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions drivers/misc/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,27 @@ static struct miscdevice mei_misc_device = {
.minor = MISC_DYNAMIC_MINOR,
};

/**
* mei_quirk_probe - probe for devices that doesn't valid ME interface
* @pdev: PCI device structure
* @ent: entry into pci_device_table
*
* returns true if ME Interface is valid, false otherwise
*/
static bool __devinit mei_quirk_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
u32 reg;
if (ent->device == MEI_DEV_ID_PBG_1) {
pci_read_config_dword(pdev, 0x48, &reg);
/* make sure that bit 9 is up and bit 10 is down */
if ((reg & 0x600) == 0x200) {
dev_info(&pdev->dev, "Device doesn't have valid ME Interface\n");
return false;
}
}
return true;
}
/**
* mei_probe - Device Initialization Routine
*
Expand All @@ -939,6 +960,12 @@ static int __devinit mei_probe(struct pci_dev *pdev,
int err;

mutex_lock(&mei_mutex);

if (!mei_quirk_probe(pdev, ent)) {
err = -ENODEV;
goto end;
}

if (mei_device) {
err = -EEXIST;
goto end;
Expand Down

0 comments on commit a2f6985

Please sign in to comment.