a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mei: extract supported features from the hbm version

Browse Source 
extract supported hbm features and commands from the hbm version

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler 2014-08-21 14:29:21 +03:00 committed by Greg Kroah-Hartman
parent 2af89db1d6
commit bae1cc7d41
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/misc/mei/hbm.c
View File

@ -372,7 +372,8 @@ static int mei_hbm_prop_req(struct mei_device *dev)
* @dev: the device structure * @dev: the device structure
* @pg_cmd: the pg command code * @pg_cmd: the pg command code
* *
* This function returns -EIO on write failure * returns -EIO on write failure
* -EOPNOTSUPP if the operation is not supported by the protocol
*/ */
int mei_hbm_pg(struct mei_device *dev, u8 pg_cmd) int mei_hbm_pg(struct mei_device *dev, u8 pg_cmd)
{ {
@ -381,6 +382,9 @@ int mei_hbm_pg(struct mei_device *dev, u8 pg_cmd)
const size_t len = sizeof(struct hbm_power_gate); const size_t len = sizeof(struct hbm_power_gate);
int ret; int ret;
if (!dev->hbm_f_pg_supported)
return -EOPNOTSUPP;
mei_hbm_hdr(mei_hdr, len); mei_hbm_hdr(mei_hdr, len);
req = (struct hbm_power_gate *)dev->wr_msg.data; req = (struct hbm_power_gate *)dev->wr_msg.data;
@ -660,6 +664,23 @@ static int mei_hbm_fw_disconnect_req(struct mei_device *dev,
return 0; return 0;
} }
/**
* mei_hbm_config_features: check what hbm features and commands
* are supported by the fw
*
* @dev: the device structure
*/
static void mei_hbm_config_features(struct mei_device *dev)
{
/* Power Gating Isolation Support */
dev->hbm_f_pg_supported = 0;
if (dev->version.major_version > HBM_MAJOR_VERSION_PGI)
dev->hbm_f_pg_supported = 1;
if (dev->version.major_version == HBM_MAJOR_VERSION_PGI &&
dev->version.minor_version >= HBM_MINOR_VERSION_PGI)
dev->hbm_f_pg_supported = 1;
}
/** /**
* mei_hbm_version_is_supported - checks whether the driver can * mei_hbm_version_is_supported - checks whether the driver can
@ -743,6 +764,8 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr)
break; break;
} }
mei_hbm_config_features(dev);
if (dev->dev_state != MEI_DEV_INIT_CLIENTS || if (dev->dev_state != MEI_DEV_INIT_CLIENTS ||
dev->hbm_state != MEI_HBM_STARTING) { dev->hbm_state != MEI_HBM_STARTING) {
dev_err(&dev->pdev->dev, "hbm: start: state mismatch, [%d, %d]\n", dev_err(&dev->pdev->dev, "hbm: start: state mismatch, [%d, %d]\n",

6
drivers/misc/mei/hw-me.c
View File

@ -574,11 +574,7 @@ static bool mei_me_pg_is_enabled(struct mei_device *dev)
if ((reg & ME_PGIC_HRA) == 0) if ((reg & ME_PGIC_HRA) == 0)
goto notsupported; goto notsupported;
if (dev->version.major_version < HBM_MAJOR_VERSION_PGI) if (!dev->hbm_f_pg_supported)
goto notsupported;
if (dev->version.major_version == HBM_MAJOR_VERSION_PGI &&
dev->version.minor_version < HBM_MINOR_VERSION_PGI)
goto notsupported; goto notsupported;
return true; return true;

4
drivers/misc/mei/mei_dev.h
View File

@ -402,6 +402,9 @@ struct mei_cfg {
* *
* @reset_count - limits the number of consecutive resets * @reset_count - limits the number of consecutive resets
* @hbm_state - state of host bus message protocol * @hbm_state - state of host bus message protocol
*
* @hbm_f_pg_supported - hbm feature pgi protocol
*
* @pg_event - power gating event * @pg_event - power gating event
* @mem_addr - mem mapped base register address * @mem_addr - mem mapped base register address
@ -476,6 +479,7 @@ struct mei_device {
} wr_msg; } wr_msg;
struct hbm_version version; struct hbm_version version;
unsigned int hbm_f_pg_supported:1;
struct list_head me_clients; struct list_head me_clients;
DECLARE_BITMAP(me_clients_map, MEI_CLIENTS_MAX); DECLARE_BITMAP(me_clients_map, MEI_CLIENTS_MAX);