This reverts commit 66ee379d743c69c726b61d078119a34d5be96a35.
The feature flag introduced by Commit 66ee379d743c ("mfd: cros_ec: Add
SCP Core-1 as a new CrOS EC MCU") was not first added in the source EC
code base[1]. This can lead to the possible misinterpration of an EC's
supported feature set, as well as causes issues with all future feature
flag updates.
[1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
Signed-off-by: Prashant Malani <[email protected]>
---
While this patch modifies drivers/mfd, it would be preferable to submit
it through the chrome-platform tree, since that eliminates cross-tree
dependencies for the series of which this patch is a part.
drivers/mfd/cros_ec_dev.c | 5 -----
include/linux/platform_data/cros_ec_commands.h | 2 --
include/linux/platform_data/cros_ec_proto.h | 1 -
3 files changed, 8 deletions(-)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 344ad03bdc42..02d4271dfe06 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -64,11 +64,6 @@ static const struct cros_feature_to_name cros_mcu_devices[] = {
.name = CROS_EC_DEV_SCP_NAME,
.desc = "System Control Processor",
},
- {
- .id = EC_FEATURE_SCP_C1,
- .name = CROS_EC_DEV_SCP_C1_NAME,
- .desc = "System Control Processor 2nd Core",
- },
{
.id = EC_FEATURE_TOUCHPAD,
.name = CROS_EC_DEV_TP_NAME,
diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index 5744a2d746aa..7c94bf5c8f05 100644
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -1300,8 +1300,6 @@ enum ec_feature_code {
* mux.
*/
EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK = 43,
- /* The MCU is a System Companion Processor (SCP) 2nd Core. */
- EC_FEATURE_SCP_C1 = 45,
};
#define EC_FEATURE_MASK_0(event_code) BIT(event_code % 32)
diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
index e43107e0bee1..a1f5b6d6db3a 100644
--- a/include/linux/platform_data/cros_ec_proto.h
+++ b/include/linux/platform_data/cros_ec_proto.h
@@ -19,7 +19,6 @@
#define CROS_EC_DEV_ISH_NAME "cros_ish"
#define CROS_EC_DEV_PD_NAME "cros_pd"
#define CROS_EC_DEV_SCP_NAME "cros_scp"
-#define CROS_EC_DEV_SCP_C1_NAME "cros_scp_c1"
#define CROS_EC_DEV_TP_NAME "cros_tp"
#define CROS_EC_DEV_EC_INDEX 0
--
2.39.0.314.g84b9a713c41-goog
On Wed, 28 Dec 2022, Prashant Malani wrote:
> This reverts commit 66ee379d743c69c726b61d078119a34d5be96a35.
>
> The feature flag introduced by Commit 66ee379d743c ("mfd: cros_ec: Add
> SCP Core-1 as a new CrOS EC MCU") was not first added in the source EC
> code base[1]. This can lead to the possible misinterpration of an EC's
> supported feature set, as well as causes issues with all future feature
> flag updates.
>
> [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
>
> Signed-off-by: Prashant Malani <[email protected]>
> ---
>
> While this patch modifies drivers/mfd, it would be preferable to submit
> it through the chrome-platform tree, since that eliminates cross-tree
> dependencies for the series of which this patch is a part.
Shouldn't be an issue:
Acked-by: Lee Jones <[email protected]>
> drivers/mfd/cros_ec_dev.c | 5 -----
> include/linux/platform_data/cros_ec_commands.h | 2 --
> include/linux/platform_data/cros_ec_proto.h | 1 -
> 3 files changed, 8 deletions(-)
>
> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
> index 344ad03bdc42..02d4271dfe06 100644
> --- a/drivers/mfd/cros_ec_dev.c
> +++ b/drivers/mfd/cros_ec_dev.c
> @@ -64,11 +64,6 @@ static const struct cros_feature_to_name cros_mcu_devices[] = {
> .name = CROS_EC_DEV_SCP_NAME,
> .desc = "System Control Processor",
> },
> - {
> - .id = EC_FEATURE_SCP_C1,
> - .name = CROS_EC_DEV_SCP_C1_NAME,
> - .desc = "System Control Processor 2nd Core",
> - },
> {
> .id = EC_FEATURE_TOUCHPAD,
> .name = CROS_EC_DEV_TP_NAME,
> diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
> index 5744a2d746aa..7c94bf5c8f05 100644
> --- a/include/linux/platform_data/cros_ec_commands.h
> +++ b/include/linux/platform_data/cros_ec_commands.h
> @@ -1300,8 +1300,6 @@ enum ec_feature_code {
> * mux.
> */
> EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK = 43,
> - /* The MCU is a System Companion Processor (SCP) 2nd Core. */
> - EC_FEATURE_SCP_C1 = 45,
> };
>
> #define EC_FEATURE_MASK_0(event_code) BIT(event_code % 32)
> diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
> index e43107e0bee1..a1f5b6d6db3a 100644
> --- a/include/linux/platform_data/cros_ec_proto.h
> +++ b/include/linux/platform_data/cros_ec_proto.h
> @@ -19,7 +19,6 @@
> #define CROS_EC_DEV_ISH_NAME "cros_ish"
> #define CROS_EC_DEV_PD_NAME "cros_pd"
> #define CROS_EC_DEV_SCP_NAME "cros_scp"
> -#define CROS_EC_DEV_SCP_C1_NAME "cros_scp_c1"
> #define CROS_EC_DEV_TP_NAME "cros_tp"
>
> #define CROS_EC_DEV_EC_INDEX 0
> --
> 2.39.0.314.g84b9a713c41-goog
>
--
Lee Jones [李琼斯]
On Wed, Dec 28, 2022 at 12:45:04AM +0000, Prashant Malani wrote:
> This reverts commit 66ee379d743c69c726b61d078119a34d5be96a35.
>
> The feature flag introduced by Commit 66ee379d743c ("mfd: cros_ec: Add
> SCP Core-1 as a new CrOS EC MCU") was not first added in the source EC
> code base[1]. This can lead to the possible misinterpration of an EC's
> supported feature set, as well as causes issues with all future feature
> flag updates.
>
> [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
>
> Signed-off-by: Prashant Malani <[email protected]>
Reviewed-by: Benson Leung <[email protected]>
> ---
>
> While this patch modifies drivers/mfd, it would be preferable to submit
> it through the chrome-platform tree, since that eliminates cross-tree
> dependencies for the series of which this patch is a part.
>
>
> drivers/mfd/cros_ec_dev.c | 5 -----
> include/linux/platform_data/cros_ec_commands.h | 2 --
> include/linux/platform_data/cros_ec_proto.h | 1 -
> 3 files changed, 8 deletions(-)
>
> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
> index 344ad03bdc42..02d4271dfe06 100644
> --- a/drivers/mfd/cros_ec_dev.c
> +++ b/drivers/mfd/cros_ec_dev.c
> @@ -64,11 +64,6 @@ static const struct cros_feature_to_name cros_mcu_devices[] = {
> .name = CROS_EC_DEV_SCP_NAME,
> .desc = "System Control Processor",
> },
> - {
> - .id = EC_FEATURE_SCP_C1,
> - .name = CROS_EC_DEV_SCP_C1_NAME,
> - .desc = "System Control Processor 2nd Core",
> - },
> {
> .id = EC_FEATURE_TOUCHPAD,
> .name = CROS_EC_DEV_TP_NAME,
> diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
> index 5744a2d746aa..7c94bf5c8f05 100644
> --- a/include/linux/platform_data/cros_ec_commands.h
> +++ b/include/linux/platform_data/cros_ec_commands.h
> @@ -1300,8 +1300,6 @@ enum ec_feature_code {
> * mux.
> */
> EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK = 43,
> - /* The MCU is a System Companion Processor (SCP) 2nd Core. */
> - EC_FEATURE_SCP_C1 = 45,
> };
>
> #define EC_FEATURE_MASK_0(event_code) BIT(event_code % 32)
> diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
> index e43107e0bee1..a1f5b6d6db3a 100644
> --- a/include/linux/platform_data/cros_ec_proto.h
> +++ b/include/linux/platform_data/cros_ec_proto.h
> @@ -19,7 +19,6 @@
> #define CROS_EC_DEV_ISH_NAME "cros_ish"
> #define CROS_EC_DEV_PD_NAME "cros_pd"
> #define CROS_EC_DEV_SCP_NAME "cros_scp"
> -#define CROS_EC_DEV_SCP_C1_NAME "cros_scp_c1"
> #define CROS_EC_DEV_TP_NAME "cros_tp"
>
> #define CROS_EC_DEV_EC_INDEX 0
> --
> 2.39.0.314.g84b9a713c41-goog
>
>
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]