Re: [PATCH 4/4] platform/chrome: i2c: i2c-cros-ec-tunnel: Convert i2c tunnel to MFD Cell

Raul Rangel
2019-11-25T19:38:55Z

> > + if (!ec) {
> > + dev_err(dev, "%s: ec is missing!\n", __func__);
> > + return -EINVAL;
> > + }
> > +
> > + if (!ec->ec_dev) {
> > + dev_err(dev, "%s: ec->ec_dev is missing!\n", __func__);
> > + return -EINVAL;
> > + }
> > +
>
> Are those checks needed? Is that possible?
I don't think it's possible anymore now that the driver has been
converted into an MFD Cell. Previously it would panic if the
i2c-cros-ec-tunnel was compiled as a built-in because it could be
probed before the cros_ec. If the i2c-cros-ec-tunnel was compiled as a
module it worked as expected. So this patch really just fixes the race
condition on initialization.

[ 3.733397] BUG: kernel NULL pointer dereference, address: 0000000000000060
...
[ 3.734358] RIP: 0010:ec_i2c_probe+0x2f/0x158
0xffffffff81834990 is in ec_i2c_probe
(/mnt/host/source/src/third_party/kernel/next/drivers/i2c/busses/i2c-cros-ec-tunnel.c:250).
245 struct device *dev = &pdev->dev;
246 struct ec_i2c_device *bus = NULL;
247 u32 remote_bus;
248 int err;
249
250 if (!ec->cmd_xfer) {
251 dev_err(dev, "Missing sendrecv\n");
252 return -EINVAL;
253 }
254

If you want, I can remove them. But I also don't think they hurt
anything either.

> > -static const struct of_device_id cros_ec_i2c_of_match[] = {
> > - { .compatible = "google,cros-ec-i2c-tunnel" },
> > - {},
> > -};
> > -MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);
> > -
> > -static const struct acpi_device_id cros_ec_i2c_tunnel_acpi_id[] = {
> > - { "GOOG0012", 0 },
>
> So, you're removing something that you just added in a previous patch. So is
> really the change in the previous patch needed?

The previous patch also switched over to using
device_property_read_u32, so it's still needed.

> > - { }
> > -};
> > -MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_tunnel_acpi_id);
> > -
> > static struct platform_driver ec_i2c_tunnel_driver = {
> > .probe = ec_i2c_probe,
> > .remove = ec_i2c_remove,
> > .driver = {
> > .name = "cros-ec-i2c-tunnel",
> > - .acpi_match_table = ACPI_PTR(cros_ec_i2c_tunnel_acpi_id),
> > - .of_match_table = of_match_ptr(cros_ec_i2c_of_match),
>
> I don't understand this change, why? The id should be in the driver to match.

I removed it here because I want the driver to enumerate as an MFD
cell instead of a stand alone driver.

> > },
> > };
> >
> > diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
> > index 1efdba18f20b..61b20e061f75 100644
> > --- a/drivers/mfd/cros_ec_dev.c
> > +++ b/drivers/mfd/cros_ec_dev.c
> > @@ -113,6 +113,18 @@ static const struct mfd_cell cros_ec_vbc_cells[] = {
> > { .name = "cros-ec-vbc", }
> > };
> >
> > +static struct mfd_cell_acpi_match cros_ec_i2c_tunnel_acpi_match = {
> > + .pnpid = "GOOG0012"
> > +};
> > +
> > +static struct mfd_cell cros_ec_fw_cells[] = {
> > + {
> > + .name = "cros-ec-i2c-tunnel",
> > + .acpi_match = &cros_ec_i2c_tunnel_acpi_match,
> > + .of_compatible = "google,cros-ec-i2c-tunnel"
>
> Ah, I see. The acpi_match and the of_compatible should be in the
> i2c-cros-ec-tunnel driver not here. Why you changed? Didn't work?

The cell needs to be the one that defines the ACPI match so the MFD
can find the node and set the parent correctly.

>
> > + },
> > +};
> > +
> > int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
> > {
> > struct cros_ec_command *msg;
> > @@ -485,6 +497,13 @@ static int ec_device_probe(struct platform_device *pdev)
> > "failed to add cros-ec platform devices: %d\n",
> > retval);
> >
> > + retval = mfd_add_hotplug_devices(ec->dev, cros_ec_fw_cells,
> > + ARRAY_SIZE(cros_ec_fw_cells));
> > + if (retval)
> > + dev_warn(ec->dev,
> > + "failed to add cros-ec fw platform devices: %d\n",
> > + retval);
> > +
>
> I think this should go inside the cros_ec_platform_cells, so drop this and
> add the "cros-ec-i2c-tunnel" in the cros_ec_platform_cells[] table is enough.

Good idea. I'll do that.

Thanks