lk2nd: hw: regulator: gpl: Add PM8937 support and improve error logging #463
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add support for the PM8937 SPMI regulator and enhance error logging in the `spmi_regulator_probe` function. Also, improve debugging output in `cmd_oem_debug_spmi_regulators`.
andrewgigena
force-pushed
the
pm8937-spmi-regulators
branch
from
123faf8 to
ef8d1d5
Compare
stephan-gh
reviewed
Dec 15, 2024
| struct regulator_dev *rdev = spmi_regulator_probe(target); | ||
| if (!rdev) { | ||
| snprintf(response, sizeof(response), "No regulators found"); | ||
| fastboot_info(response); |
There was a problem hiding this comment.
fastboot_info("No regulators found") should work I think, same below
| @@ -2586,6 +2619,7 @@ static const struct spmi_regulator_match qcom_spmi_regulator_match[] = { | |||
| { .subtype = PM8226_SUBTYPE, .sid = 1, .data = pm8226_regulators }, | |||
| { .subtype = PM8841_SUBTYPE, .sid = 5, .data = pm8841_regulators }, | |||
| { .subtype = PM8916_SUBTYPE, .sid = 1, .data = pm8916_regulators }, | |||
| { .subtype = PM8937_SUBTYPE, .sid = 1, .data = pm8937_regulators }, | |||
There was a problem hiding this comment.
This is meant to be synced completely with upstream to add all the new entries. I just did that and pushed to main, can you rebase to drop these changes?
|
@stephan-gh Hi, I did the rebase locally, here you have the code with the changes after the rebase. Should we modify this PR to add only this logs? diff --git a/lk2nd/fastboot/debug/regulator.c b/lk2nd/fastboot/debug/regulator.c
index 5fe25e52..3e7b52c5 100644
--- a/lk2nd/fastboot/debug/regulator.c
+++ b/lk2nd/fastboot/debug/regulator.c
@@ -51,7 +51,16 @@ static void cmd_oem_debug_spmi_regulators(const char *arg, void *data, unsigned
snprintf(response, sizeof(response), "Detected PMIC %#x", target);
fastboot_info(response);
- dump_regulators(spmi_regulator_probe(target));
+
+ struct regulator_dev *rdev = spmi_regulator_probe(target);
+ if (!rdev) {
+ snprintf(response, sizeof(response), "No regulators found");
+ fastboot_info(response);
+ } else {
+ snprintf(response, sizeof(response), "Regulator list:");
+ fastboot_info(response);
+ dump_regulators(rdev);
+ }
}
fastboot_okay("");
}
diff --git a/lk2nd/hw/regulator/gpl/qcom_spmi-regulator.c b/lk2nd/hw/regulator/gpl/qcom_spmi-regulator.c
index c84e1220..aae17f23 100644
--- a/lk2nd/hw/regulator/gpl/qcom_spmi-regulator.c
+++ b/lk2nd/hw/regulator/gpl/qcom_spmi-regulator.c
@@ -2750,15 +2750,19 @@ struct regulator_dev *spmi_regulator_probe(uint8_t subtype)
unsigned int i;
int ret;
- if (!match)
+ if (!match) {
+ dprintf(CRITICAL, "Failed to find SPMI regulator match for subtype 0x%02X\n", subtype);
return NULL;
+ }
for (data = match->data; data->name; ++data)
++num;
vreg = calloc(num, sizeof(*vreg));
- if (!vreg)
+ if (!vreg) {
+ dprintf(CRITICAL, "Failed to allocate memory for SPMI regulator\n");
return NULL;
+ }
for (i = 0; i < num; ++i) {
const struct spmi_regulator_data *reg = &match->data[i];
@@ -2768,9 +2772,11 @@ struct regulator_dev *spmi_regulator_probe(uint8_t subtype)
vreg[i].base = (match->sid << 16) | reg->base;
ret = spmi_regulator_match(&vreg[i], reg->force_type);
- if (ret)
- dprintf(CRITICAL, "Failed to match SPMI regulator %s\n",
- reg->name);
+ if (ret) {
+ dprintf(CRITICAL, "Failed to match SPMI regulator %s\n", reg->name);
+ dprintf(CRITICAL, "subtype=%u, force_type=0x%02X, logical_type=%u\n",
+ subtype, reg->force_type, vreg[i].logical_type);
+ }
if (vreg[i].set_points)
vreg[i].desc.driver_type = vreg[i].set_points->type; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is part of my research to enable support for sdcard on Nokia 5. I added support for the PM8937 SPMI regulator and enhance error logging in the
spmi_regulator_probefunction. Also, improve debugging output incmd_oem_debug_spmi_regulators. Code extracted from this patch by danct12Tested on Nokia 5 (nokia-nd1):
Tested on Xiaomi Redmi 4 (xiaomi-santoni):