Skip to contentSkip to conversation

mfd: cros_ec: instantiate properly CrOS ISH MCU device

PATCH Applied Rushikesh S Kadam 5 participants 5 messages Mar 1, 2019 – Apr 2, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 mfd: cros_ec: instantiate properly CrOS ISH MCU device

Integrated Sensor Hub (ISH) is also a MCU running EC having feature bit EC_FEATURE_ISH. Instantiate it as a special CrOS EC device with device name 'cros_ish'.

---
v3
- Dropped "Intel" in commments in cros_ec header file. CrOS EC ISH device is a generic ISH. This was missed earlier.
v2
- Addressed review comments to term the CrOS EC device as a generic Integrated Sensor Hub.
v1
- Initial version.

 drivers/mfd/cros_ec_dev.c            | 13 +++++++++++++
 include/linux/mfd/cros_ec.h          |  1 +
 include/linux/mfd/cros_ec_commands.h |  2 ++
 3 files changed, 16 insertions(+)
drivers/mfd/cros_ec_dev.c +13 -0
index 2d0fee4..46963c2 100644
@@ -415,6 +415,19 @@ static int ec_device_probe(struct platform_device *pdev)
 	cdev_init(&ec->cdev, &fops);
 
 	/*
+	 * Check whether this is actually an Integrated Sensor Hub (ISH)
+	 * rather than an EC.
+	 */
+	if (cros_ec_check_features(ec, EC_FEATURE_ISH)) {
+		dev_info(dev, "CrOS ISH MCU detected.\n");
+		/*
+		 * Help userspace differentiating ECs from ISH MCU,
+		 * regardless of the probing order.
+		 */
+		ec_platform->ec_name = CROS_EC_DEV_ISH_NAME;
+	}
+
+	/*
 	 * Add the class device
 	 * Link to the character device for creating the /dev entry
 	 * in devtmpfs.
include/linux/mfd/cros_ec.h +1 -0
index de8b588..00c5765 100644
@@ -24,6 +24,7 @@
 
 #define CROS_EC_DEV_NAME "cros_ec"
 #define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_ISH_NAME "cros_ish"
 
 /*
  * The EC is unresponsive for a time after a reboot command.  Add a
include/linux/mfd/cros_ec_commands.h +2 -0
index fc91082..43bee4f 100644
@@ -856,6 +856,8 @@ enum ec_feature_code {
 	EC_FEATURE_RTC = 27,
 	/* EC supports CEC commands */
 	EC_FEATURE_CEC = 35,
+	/* The MCU is an Integrated Sensor Hub */
+	EC_FEATURE_ISH = 40,
 };
 
 #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))
Signature · 1 line
1.9.1
Acked-by on v3 1/1
#1 lore raw

Hi Rushikesh,

Quoted 62 lines · Rushikesh S Kadam

Integrated Sensor Hub (ISH) is also a MCU running EC having feature bit EC_FEATURE_ISH. Instantiate it as a special CrOS EC device with device name 'cros_ish'.

---
v3
- Dropped "Intel" in commments in cros_ec header file. CrOS EC ISH device is a generic ISH. This was missed earlier.
v2
- Addressed review comments to term the CrOS EC device as a generic Integrated Sensor Hub.
v1
- Initial version.

 drivers/mfd/cros_ec_dev.c            | 13 +++++++++++++
 include/linux/mfd/cros_ec.h          |  1 +
 include/linux/mfd/cros_ec_commands.h |  2 ++
 3 files changed, 16 insertions(+)
drivers/mfd/cros_ec_dev.c +13 -0
index 2d0fee4..46963c2 100644
@@ -415,6 +415,19 @@ static int ec_device_probe(struct platform_device *pdev)
 	cdev_init(&ec->cdev, &fops);
 
 	/*
+	 * Check whether this is actually an Integrated Sensor Hub (ISH)
+	 * rather than an EC.
+	 */
+	if (cros_ec_check_features(ec, EC_FEATURE_ISH)) {
+		dev_info(dev, "CrOS ISH MCU detected.\n");
+		/*
+		 * Help userspace differentiating ECs from ISH MCU,
+		 * regardless of the probing order.
+		 */
+		ec_platform->ec_name = CROS_EC_DEV_ISH_NAME;
+	}
+
+	/*
 	 * Add the class device
 	 * Link to the character device for creating the /dev entry
 	 * in devtmpfs.
include/linux/mfd/cros_ec.h +1 -0
index de8b588..00c5765 100644
@@ -24,6 +24,7 @@
 
 #define CROS_EC_DEV_NAME "cros_ec"
 #define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_ISH_NAME "cros_ish"
 
 /*
  * The EC is unresponsive for a time after a reboot command.  Add a
include/linux/mfd/cros_ec_commands.h +0 -0
index fc91082..43bee4f 100644

include/linux/mfd/cros_ec_commands.h enum ec_feature_code { · line 863

Quoted 8 lines
include/linux/mfd/cros_ec_commands.h +2 -0
@@ -856,6 +856,8 @@ enum ec_feature_code {
 	EC_FEATURE_RTC = 27,
 	/* EC supports CEC commands */
 	EC_FEATURE_CEC = 35,
+	/* The MCU is an Integrated Sensor Hub */
+	EC_FEATURE_ISH = 40,
 };
 
 #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))
Reviewed-by
#2 lore raw
Quoted 72 lines · Enric Balletbo i Serra

Hi Rushikesh,

Quoted 68 lines · Rushikesh S Kadam

Integrated Sensor Hub (ISH) is also a MCU running EC having feature bit EC_FEATURE_ISH. Instantiate it as a special CrOS EC device with device name 'cros_ish'.

---
v3
- Dropped "Intel" in commments in cros_ec header file. CrOS EC ISH device is a generic ISH. This was missed earlier.
v2
- Addressed review comments to term the CrOS EC device as a generic Integrated Sensor Hub.
v1
- Initial version.

 drivers/mfd/cros_ec_dev.c            | 13 +++++++++++++
 include/linux/mfd/cros_ec.h          |  1 +
 include/linux/mfd/cros_ec_commands.h |  2 ++
 3 files changed, 16 insertions(+)
drivers/mfd/cros_ec_dev.c +13 -0
index 2d0fee4..46963c2 100644
@@ -415,6 +415,19 @@ static int ec_device_probe(struct platform_device *pdev)
      cdev_init(&ec->cdev, &fops);
 
      /*
+      * Check whether this is actually an Integrated Sensor Hub (ISH)
+      * rather than an EC.
+      */
+     if (cros_ec_check_features(ec, EC_FEATURE_ISH)) {
+             dev_info(dev, "CrOS ISH MCU detected.\n");
+             /*
+              * Help userspace differentiating ECs from ISH MCU,
+              * regardless of the probing order.
+              */
+             ec_platform->ec_name = CROS_EC_DEV_ISH_NAME;
+     }
+
+     /*
       * Add the class device
       * Link to the character device for creating the /dev entry
       * in devtmpfs.
include/linux/mfd/cros_ec.h +1 -0
index de8b588..00c5765 100644
@@ -24,6 +24,7 @@
 
 #define CROS_EC_DEV_NAME "cros_ec"
 #define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_ISH_NAME "cros_ish"
 
 /*
  * The EC is unresponsive for a time after a reboot command.  Add a
include/linux/mfd/cros_ec_commands.h +2 -0
index fc91082..43bee4f 100644
@@ -856,6 +856,8 @@ enum ec_feature_code {
      EC_FEATURE_RTC = 27,
      /* EC supports CEC commands */
      EC_FEATURE_CEC = 35,
+     /* The MCU is an Integrated Sensor Hub */
+     EC_FEATURE_ISH = 40,
 };
 
Quoted 4 lines

include/linux/mfd/cros_ec_commands.h enum ec_feature_code { · line 863

Quoted 2 lines
include/linux/mfd/cros_ec_commands.h +0 -0
 #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))
Reviewed-by on v3 1/1
#3 lore raw
In reply to Rushikesh S Kadam
Quoted 3 lines · Rushikesh S Kadam

Integrated Sensor Hub (ISH) is also a MCU running EC having feature bit EC_FEATURE_ISH. Instantiate it as a special CrOS EC device with device name 'cros_ish'.

FWIW,

Quoted 69 lines

---
v3
- Dropped "Intel" in commments in cros_ec header file. CrOS EC ISH device is a generic ISH. This was missed earlier.
v2
- Addressed review comments to term the CrOS EC device as a generic Integrated Sensor Hub.
v1
- Initial version.

 drivers/mfd/cros_ec_dev.c            | 13 +++++++++++++
 include/linux/mfd/cros_ec.h          |  1 +
 include/linux/mfd/cros_ec_commands.h |  2 ++
 3 files changed, 16 insertions(+)
drivers/mfd/cros_ec_dev.c +13 -0
index 2d0fee4..46963c2 100644
@@ -415,6 +415,19 @@ static int ec_device_probe(struct platform_device *pdev)
 	cdev_init(&ec->cdev, &fops);
 
 	/*
+	 * Check whether this is actually an Integrated Sensor Hub (ISH)
+	 * rather than an EC.
+	 */
+	if (cros_ec_check_features(ec, EC_FEATURE_ISH)) {
+		dev_info(dev, "CrOS ISH MCU detected.\n");
+		/*
+		 * Help userspace differentiating ECs from ISH MCU,
+		 * regardless of the probing order.
+		 */
+		ec_platform->ec_name = CROS_EC_DEV_ISH_NAME;
+	}
+
+	/*
 	 * Add the class device
 	 * Link to the character device for creating the /dev entry
 	 * in devtmpfs.
include/linux/mfd/cros_ec.h +1 -0
index de8b588..00c5765 100644
@@ -24,6 +24,7 @@
 
 #define CROS_EC_DEV_NAME "cros_ec"
 #define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_ISH_NAME "cros_ish"
 
 /*
  * The EC is unresponsive for a time after a reboot command.  Add a
include/linux/mfd/cros_ec_commands.h +2 -0
index fc91082..43bee4f 100644
@@ -856,6 +856,8 @@ enum ec_feature_code {
 	EC_FEATURE_RTC = 27,
 	/* EC supports CEC commands */
 	EC_FEATURE_CEC = 35,
+	/* The MCU is an Integrated Sensor Hub */
+	EC_FEATURE_ISH = 40,
 };
 
 #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))
Signature · 1 line
1.9.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Applied
#4 lore raw
In reply to Rushikesh S Kadam
Quoted 15 lines · Rushikesh S Kadam

Integrated Sensor Hub (ISH) is also a MCU running EC having feature bit EC_FEATURE_ISH. Instantiate it as a special CrOS EC device with device name 'cros_ish'.

---
v3
- Dropped "Intel" in commments in cros_ec header file. CrOS EC ISH device is a generic ISH. This was missed earlier.
v2
- Addressed review comments to term the CrOS EC device as a generic Integrated Sensor Hub.
v1
- Initial version.

Quoted 4 lines
 drivers/mfd/cros_ec_dev.c            | 13 +++++++++++++
 include/linux/mfd/cros_ec.h          |  1 +
 include/linux/mfd/cros_ec_commands.h |  2 ++
 3 files changed, 16 insertions(+)

Applied, thanks.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog