platform/chrome: cros_ec_typec: Check for EC device
PATCH 1/1 platform/chrome: cros_ec_typec: Check for EC device
The Type C ACPI device on older Chromebooks is not generated correctly (since their EC firmware doesn't support the new commands required). In such cases, the crafted ACPI device doesn't have an EC parent, and it is therefore not useful (it shouldn't be generated in the first place since the EC firmware doesn't support any of the Type C commands).
To handle devices which use these older firmware revisions, check for the parent EC device handle, and fail the probe if it's not found.
---
Alyssa, could you kindly test this with your existing setup? Thanks!
drivers/platform/chrome/cros_ec_typec.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/platform/chrome/cros_ec_typec.c +6 -0
@@ -1076,6 +1076,12 @@ static int cros_typec_probe(struct platform_device *pdev) typec->dev = dev; typec->ec =dev_get_drvdata (pdev->dev.parent); + +if (!typec->ec) { +dev_err (dev,"couldn't find parent EC device\n" ); +return -ENODEV ; + } +platform_set_drvdata (pdev, typec); ret =cros_typec_get_cmd_version (typec);
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Quoted 3 lines · Prashant Malani
Fixes fdc6b21e2444 ("platform/chrome: Add Type C connector class driver")Reported-by Alyssa Ross <[email protected]>Signed-off-by Prashant Malani <[email protected]>
With a minor comment,
drivers/platform/chrome/cros_ec_typec.c static int cros_typec_probe(struct platform_device *pdev) · line 1079
Quoted 5 lines
drivers/platform/chrome/cros_ec_typec.c +1
-0@@ -1076,6 +1076,12 @@ static int cros_typec_probe(struct platform_device *pdev) typec->dev = dev; typec->ec =dev_get_drvdata (pdev->dev.parent); +
I would prefer to remove the blank line to make it look like an integrated block.
Quoted 5 lines
drivers/platform/chrome/cros_ec_typec.c +5
-0+if (!typec->ec) { +dev_err (dev,"couldn't find parent EC device\n" ); +return -ENODEV ; + } +
Hi Tzung-Bi,
Thanks for your review.
Quoted 9 lines · Tzung-Bi Shih
Quoted 3 lines · Prashant Malani
Fixes fdc6b21e2444 ("platform/chrome: Add Type C connector class driver")Reported-by Alyssa Ross <[email protected]>Signed-off-by Prashant Malani <[email protected]>With a minor comment,
Reviewed-by Tzung-Bi Shih <[email protected]>
Quoted 7 lines
drivers/platform/chrome/cros_ec_typec.c static int cros_typec_probe(struct platform_device *pdev) · line 1079
Quoted 5 lines
drivers/platform/chrome/cros_ec_typec.c +1
-0@@ -1076,6 +1076,12 @@ static int cros_typec_probe(struct platform_device *pdev) typec->dev = dev; typec->ec =dev_get_drvdata (pdev->dev.parent); +I would prefer to remove the blank line to make it look like an integrated block.
I actually prefer it as it is. typec->dev is not really part of this "integrated block", and I don't want to add another space there. In any case, since this is a very minor style nit, I will address it in case there is another version required due to other comments.
Quoted 6 lines
drivers/platform/chrome/cros_ec_typec.c static int cros_typec_probe(struct platform_device *pdev) · line 1084
Quoted 6 lines
drivers/platform/chrome/cros_ec_typec.c +5
-0+if (!typec->ec) { +dev_err (dev,"couldn't find parent EC device\n" ); +return -ENODEV ; + } +
Best,
-Prashant
Quoted 17 lines · Prashant Malani
Hi Tzung-Bi,
Thanks for your review.
Quoted 11 lines · Tzung-Bi Shih
Quoted 3 lines · Prashant Malani
Fixes fdc6b21e2444 ("platform/chrome: Add Type C connector class driver")Reported-by Alyssa Ross <[email protected]>Signed-off-by Prashant Malani <[email protected]>With a minor comment,
Reviewed-by Tzung-Bi Shih <[email protected]>Quoted 2 lines
(quoted diff) +0
-0@@ -1076,6 +1076,12 @@ static int cros_typec_probe(struct platform_device *pdev)
Quoted 8 lines
Quoted 5 lines
drivers/platform/chrome/cros_ec_typec.c static int cros_typec_probe(struct platform_device *pdev) · line 1079
Quoted 3 lines
drivers/platform/chrome/cros_ec_typec.c +1
-0typec->dev = dev; typec->ec =dev_get_drvdata (pdev->dev.parent); +I would prefer to remove the blank line to make it look like an integrated block.
I actually prefer it as it is.
typec->devis not really part of this "integrated block", and I don't want to add another space there.
But on the other side the check is part of the "integrated block". Maybe add an empty line between the two assignments if you want a separation.
Quoted 13 lines
In any case, since this is a very minor style nit, I will address it in case there is another version required due to other comments.
Quoted 6 lines
drivers/platform/chrome/cros_ec_typec.c static int cros_typec_probe(struct platform_device *pdev) · line 1084
Quoted 6 lines
drivers/platform/chrome/cros_ec_typec.c +5
-0+if (!typec->ec) { +dev_err (dev,"couldn't find parent EC device\n" ); +return -ENODEV ; + } +Best,
-Prashant
Hey Guenter,
Quoted 25 lines · Guenter Roeck
Quoted 23 lines · Prashant Malani
Hi Tzung-Bi,
Thanks for your review.
Quoted 16 lines · Tzung-Bi Shih
Quoted 3 lines · Prashant Malani
Fixes fdc6b21e2444 ("platform/chrome: Add Type C connector class driver")Reported-by Alyssa Ross <[email protected]>Signed-off-by Prashant Malani <[email protected]>With a minor comment,
Reviewed-by Tzung-Bi Shih <[email protected]>drivers/platform/chrome/cros_ec_typec.c static int cros_typec_probe(struct platform_device *pdev) · line 1079
Quoted 5 lines
drivers/platform/chrome/cros_ec_typec.c +1
-0@@ -1076,6 +1076,12 @@ static int cros_typec_probe(struct platform_device *pdev) typec->dev = dev; typec->ec =dev_get_drvdata (pdev->dev.parent); +I would prefer to remove the blank line to make it look like an integrated block.
Quoted 6 lines
Quoted 2 lines
I actually prefer it as it is.
typec->devis not really part of this "integrated block", and I don't want to add another space there.But on the other side the check is part of the "integrated block". Maybe add an empty line between the two assignments if you want a separation.
OK. I'll add the space before it.
Thanks,