FW status is read from mei pci configuration space. The register address depends on the plataform id
Signed-off-by: Tomas Winkler <[email protected]> --- drivers/misc/mei/hw-me-regs.h | 9 +++++++++ drivers/misc/mei/hw-me.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 6a203b6..3f612ce 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -111,10 +111,19 @@ #define MEI_DEV_ID_LPT 0x8C3A /* Lynx Point */ #define MEI_DEV_ID_LPT_LP 0x9C3A /* Lynx Point LP */ + /* * MEI HW Section */ +/* Host Firmware Status in Platforms < LPT */ +#define PCI_CFG_HFS_PPT 0x40 +/* Host Firmware Status in Platforms >= LPT */ +#define PCI_CFG_HFS_LPT 0x60 +# define PCI_CFG_HFS_STATE_MSK 0x0000000F +# define PCI_CFG_HFS_ISR_CNT_MSK 0x00000600 +# define PCI_CFG_HFS_ERR_CODE_MSK 0x0000F000 + /* MEI registers */ /* H_CB_WW - Host Circular Buffer (CB) Write Window register */ #define H_CB_WW 0 diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index b22c7e2..2346167 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -536,8 +536,38 @@ end: return IRQ_HANDLED; } + +/** + * mei_me_fw_status - retrieve fw status from the pci config space + * + * @dev: the device structure + * @fw_status: fw status register value + * + * returns 0 on success an error code otherwise + */ +static int mei_me_fw_status(struct mei_device *dev, u32 *fw_status) +{ + u32 reg; + if (!dev || !fw_status) + return -EINVAL; + + switch (dev->pdev->device) { + case MEI_DEV_ID_LPT: + case MEI_DEV_ID_LPT_LP: + reg = PCI_CFG_HFS_LPT; + break; + default: + reg = PCI_CFG_HFS_PPT; + break; + } + + return pci_read_config_dword(dev->pdev, reg, fw_status); +} + static const struct mei_hw_ops mei_me_hw_ops = { + .fw_status = mei_me_fw_status, + .host_is_ready = mei_me_host_is_ready, .hw_is_ready = mei_me_hw_is_ready, -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
