| Message ID | 20220225000753.511996-5-djrscally@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support OVTI7251 on Microsoft Surface line | expand |
On Fri, Feb 25, 2022 at 12:07:46AM +0000, Daniel Scally wrote: > Move the endpoint checking from .probe() to a dedicated function, > and additionally check that the firmware provided link frequencies > are a match for those supported by the driver. Store the index to the > matching link frequency so it can be easily identified later. ... > + ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); > + fwnode_handle_put(endpoint); > + if (ret) > + return dev_err_probe(ov7251->dev, ret, > + "parsing endpoint node failed\n"); > + > + if (!bus_cfg.nr_of_link_frequencies) { > + dev_err(ov7251->dev, "no link frequencies defined\n"); > + ret = -EINVAL; It's also fine to use dev_err_probe() here. > + goto out_free_bus_cfg; > + } > + > + for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) { > + for (j = 0; j < ARRAY_SIZE(link_freq); j++) > + if (bus_cfg.link_frequencies[i] == link_freq[j]) { > + freq_found = true; > + break; > + } > + > + if (freq_found) > + break; freq_found may be replaced by the if (j < ARRAY_SIZE(link_freq)) here. > + } > + > + if (i == bus_cfg.nr_of_link_frequencies) { > + dev_err(ov7251->dev, "no supported link freq found\n"); > + ret = -EINVAL; dev_err_probe() > + goto out_free_bus_cfg; > + } > + > + ov7251->link_freq_idx = i; > + > +out_free_bus_cfg: > + v4l2_fwnode_endpoint_free(&bus_cfg); > + > + return ret; > +}
Hi Andy On 25/02/2022 17:01, Andy Shevchenko wrote: > On Fri, Feb 25, 2022 at 12:07:46AM +0000, Daniel Scally wrote: >> Move the endpoint checking from .probe() to a dedicated function, >> and additionally check that the firmware provided link frequencies >> are a match for those supported by the driver. Store the index to the >> matching link frequency so it can be easily identified later. > ... > >> + ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); >> + fwnode_handle_put(endpoint); >> + if (ret) >> + return dev_err_probe(ov7251->dev, ret, >> + "parsing endpoint node failed\n"); >> + >> + if (!bus_cfg.nr_of_link_frequencies) { >> + dev_err(ov7251->dev, "no link frequencies defined\n"); >> + ret = -EINVAL; > It's also fine to use dev_err_probe() here. Yup will switch to that. > >> + goto out_free_bus_cfg; >> + } >> + >> + for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) { >> + for (j = 0; j < ARRAY_SIZE(link_freq); j++) >> + if (bus_cfg.link_frequencies[i] == link_freq[j]) { >> + freq_found = true; >> + break; >> + } >> + >> + if (freq_found) >> + break; > freq_found may be replaced by the > > if (j < ARRAY_SIZE(link_freq)) > > here. Huh oh yeah. I don't know why that never occurred to me...I was originally even using a goto and swapped it because it was ugly. Thanks! > >> + } >> + >> + if (i == bus_cfg.nr_of_link_frequencies) { >> + dev_err(ov7251->dev, "no supported link freq found\n"); >> + ret = -EINVAL; > dev_err_probe() > >> + goto out_free_bus_cfg; >> + } >> + >> + ov7251->link_freq_idx = i; >> + >> +out_free_bus_cfg: >> + v4l2_fwnode_endpoint_free(&bus_cfg); >> + >> + return ret; >> +}
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c index d6fe574cb9e0..613b2c80a2a8 100644 --- a/drivers/media/i2c/ov7251.c +++ b/drivers/media/i2c/ov7251.c @@ -60,6 +60,11 @@ struct ov7251_mode_info { struct v4l2_fract timeperframe; }; +enum supported_link_freqs { + OV7251_LINK_FREQ_240_MHZ, + OV7251_NUM_SUPPORTED_LINK_FREQS +}; + struct ov7251 { struct i2c_client *i2c_client; struct device *dev; @@ -75,6 +80,7 @@ struct ov7251 { struct regulator *core_regulator; struct regulator *analog_regulator; + enum supported_link_freqs link_freq_idx; const struct ov7251_mode_info *current_mode; struct v4l2_ctrl_handler ctrls; @@ -1255,10 +1261,61 @@ static const struct v4l2_subdev_ops ov7251_subdev_ops = { .pad = &ov7251_subdev_pad_ops, }; +static int ov7251_check_hwcfg(struct ov7251 *ov7251) +{ + struct fwnode_handle *fwnode = dev_fwnode(ov7251->dev); + struct v4l2_fwnode_endpoint bus_cfg = { + .bus_type = V4L2_MBUS_CSI2_DPHY, + }; + struct fwnode_handle *endpoint; + bool freq_found = false; + unsigned int i, j; + int ret; + + endpoint = fwnode_graph_get_next_endpoint(fwnode, NULL); + if (!endpoint) + return -EPROBE_DEFER; /* could be provided by cio2-bridge */ + + ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); + fwnode_handle_put(endpoint); + if (ret) + return dev_err_probe(ov7251->dev, ret, + "parsing endpoint node failed\n"); + + if (!bus_cfg.nr_of_link_frequencies) { + dev_err(ov7251->dev, "no link frequencies defined\n"); + ret = -EINVAL; + goto out_free_bus_cfg; + } + + for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) { + for (j = 0; j < ARRAY_SIZE(link_freq); j++) + if (bus_cfg.link_frequencies[i] == link_freq[j]) { + freq_found = true; + break; + } + + if (freq_found) + break; + } + + if (i == bus_cfg.nr_of_link_frequencies) { + dev_err(ov7251->dev, "no supported link freq found\n"); + ret = -EINVAL; + goto out_free_bus_cfg; + } + + ov7251->link_freq_idx = i; + +out_free_bus_cfg: + v4l2_fwnode_endpoint_free(&bus_cfg); + + return ret; +} + static int ov7251_probe(struct i2c_client *client) { struct device *dev = &client->dev; - struct fwnode_handle *endpoint; struct ov7251 *ov7251; u8 chip_id_high, chip_id_low, chip_rev; int ret; @@ -1270,24 +1327,9 @@ static int ov7251_probe(struct i2c_client *client) ov7251->i2c_client = client; ov7251->dev = dev; - endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL); - if (!endpoint) { - dev_err(dev, "endpoint node not found\n"); - return -EINVAL; - } - - ret = v4l2_fwnode_endpoint_parse(endpoint, &ov7251->ep); - fwnode_handle_put(endpoint); - if (ret < 0) { - dev_err(dev, "parsing endpoint node failed\n"); + ret = ov7251_check_hwcfg(ov7251); + if (ret) return ret; - } - - if (ov7251->ep.bus_type != V4L2_MBUS_CSI2_DPHY) { - dev_err(dev, "invalid bus type (%u), must be CSI2 (%u)\n", - ov7251->ep.bus_type, V4L2_MBUS_CSI2_DPHY); - return -EINVAL; - } /* get system clock (xclk) */ ov7251->xclk = devm_clk_get(dev, "xclk");
Move the endpoint checking from .probe() to a dedicated function, and additionally check that the firmware provided link frequencies are a match for those supported by the driver. Store the index to the matching link frequency so it can be easily identified later. Signed-off-by: Daniel Scally <djrscally@gmail.com> --- Changes in v2: - Switched to use unsigned int (Sakari) - Dropped the checks for bus_type and number of data lanes (Sakari) - Fixed the double-loop break (Dave) - Stored the index to the configured link frequency so it can be used later on. drivers/media/i2c/ov7251.c | 78 +++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 18 deletions(-)