Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle PIO probe failures (i.e. old EEPROMs) #6599

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Handle PIO probe failures (i.e. old EEPROMs) #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ad1b27
misc: rp1-pio: Handle probe errors
pelwell Jan 9, 2025
13aa05a
firmware: rp1: Simplify rp1_firmware_get
pelwell Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions drivers/firmware/rp1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,42 +159,36 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
struct device_node *fwnode;
struct rp1_firmware *fw;

if (client) {
fwnode = of_parse_phandle(client, "firmware", 0);
if (!fwnode)
fwnode = of_get_parent(client);
if (fwnode && !of_device_is_compatible(fwnode, match)) {
of_node_put(fwnode);
fwnode = NULL;
}
}

if (!client)
return NULL;
fwnode = of_parse_phandle(client, "firmware", 0);
if (!fwnode)
fwnode = of_find_matching_node(NULL, rp1_firmware_of_match);

if (!fwnode)
return ERR_PTR(-ENOENT);
return NULL;
if (!of_device_is_compatible(fwnode, match)) {
of_node_put(fwnode);
return NULL;
}

pdev = of_find_device_by_node(fwnode);
of_node_put(fwnode);

if (!pdev)
return ERR_PTR(-EPROBE_DEFER);
goto err_exit;

fw = platform_get_drvdata(pdev);
if (!fw)
goto err_defer;
goto err_exit;

if (!kref_get_unless_zero(&fw->consumers))
goto err_defer;
goto err_exit;

put_device(&pdev->dev);

return fw;

err_defer:
err_exit:
put_device(&pdev->dev);
return ERR_PTR(-EPROBE_DEFER);
return NULL;
}
EXPORT_SYMBOL_GPL(rp1_firmware_get);

Expand All @@ -210,8 +204,8 @@ struct rp1_firmware *devm_rp1_firmware_get(struct device *dev, struct device_nod
int ret;

fw = rp1_firmware_get(client);
if (IS_ERR(fw))
return fw;
if (!fw)
return NULL;

ret = devm_add_action_or_reset(dev, devm_rp1_firmware_put, fw);
if (ret)
Expand Down
8 changes: 5 additions & 3 deletions drivers/misc/rp1-pio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,9 @@ struct rp1_pio_client *rp1_pio_open(void)
{
struct rp1_pio_client *client;

if (!g_pio)
return ERR_PTR(-ENOENT);

client = kzalloc(sizeof(*client), GFP_KERNEL);
if (!client)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -1265,9 +1268,8 @@ static int rp1_pio_probe(struct platform_device *pdev)
return dev_err_probe(dev, pdev->id, "alias is missing\n");

fw = devm_rp1_firmware_get(dev, dev->of_node);
if (IS_ERR(fw))
return PTR_ERR(fw);

if (IS_ERR_OR_NULL(fw))
return dev_err_probe(dev, -ENOENT, "failed to contact RP1 firmware\n");
ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
if (ret < 0)
return ret;
Expand Down
Loading