<p>Felix Held <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/28388">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/pmh7tool: Add option to read specific bit<br><br>Change-Id: I045383eedbcf438270e9c64329a8d910bb941ab8<br>Signed-off-by: Evgeny Zinoviev <me@ch1p.com><br>Reviewed-on: https://review.coreboot.org/28388<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Felix Held <felix-coreboot@felixheld.de><br>---<br>M util/pmh7tool/pmh7tool.c<br>1 file changed, 27 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/pmh7tool/pmh7tool.c b/util/pmh7tool/pmh7tool.c</span><br><span>index d0c652e..f03d97e 100644</span><br><span>--- a/util/pmh7tool/pmh7tool.c</span><br><span>+++ b/util/pmh7tool/pmh7tool.c</span><br><span>@@ -53,16 +53,25 @@</span><br><span> pmh7_register_write(reg, val & ~(1 << bit));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t pmh7_register_read_bit(int16_t reg, uint8_t bit)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t val;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ val = pmh7_register_read(reg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return (val >> bit) & 1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void print_usage(const char *name)</span><br><span> {</span><br><span> printf("usage: %s\n", name);</span><br><span> printf("\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -h, --help: print this help\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -d, --dump: print registers\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -w, --write <addr> <data>: write to register\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -r, --read <addr>: read from register\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -c, --clear-bit <addr> <bit>\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -s, --set-bit <addr> <bit>\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -h, --help: print this help\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -d, --dump: print registers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -w, --write <addr> <data>: write to register\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -r, --read <addr>: read from register\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -b, --read-bit <addr> <bit> read bit\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -c, --clear-bit <addr> <bit> clear bit\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -s, --set-bit <addr> <bit> set bit\n"</span><br><span> "\n"</span><br><span> "Attention! Writing to PMH7 registers is very dangerous, as you\n"</span><br><span> " directly manipulate the power rails, enable lines,\n"</span><br><span>@@ -71,7 +80,7 @@</span><br><span> "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum action {HELP, DUMP, WRITE, READ, CLEAR, SET};</span><br><span style="color: hsl(120, 100%, 40%);">+enum action {HELP, DUMP, WRITE, READ, READBIT, CLEAR, SET};</span><br><span> </span><br><span> int main(int argc, char *argv[])</span><br><span> {</span><br><span>@@ -84,6 +93,7 @@</span><br><span> {"dump", 0, 0, 'd'},</span><br><span> {"write", 1, 0, 'w'},</span><br><span> {"read", 1, 0, 'r'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"read-bit", 1, 0, 'b'},</span><br><span> {"clear-bit", 1, 0, 'c'},</span><br><span> {"set-bit", 1, 0, 's'},</span><br><span> {0, 0, 0, 0}</span><br><span>@@ -94,7 +104,7 @@</span><br><span> exit(0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while ((opt = getopt_long(argc, argv, "hdw:r:c:s:",</span><br><span style="color: hsl(120, 100%, 40%);">+ while ((opt = getopt_long(argc, argv, "hdw:r:c:s:b:",</span><br><span> long_options, &option_index)) != EOF) {</span><br><span> switch (opt) {</span><br><span> case 'd':</span><br><span>@@ -107,6 +117,7 @@</span><br><span> break;</span><br><span> </span><br><span> case 'w':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'b':</span><br><span> case 'c':</span><br><span> case 's':</span><br><span> input_addr = strtoul(optarg, NULL, 16);</span><br><span>@@ -125,6 +136,9 @@</span><br><span> case 'w':</span><br><span> act = WRITE;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'b':</span><br><span style="color: hsl(120, 100%, 40%);">+ act = READBIT;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'c':</span><br><span> act = CLEAR;</span><br><span> break;</span><br><span>@@ -153,7 +167,7 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (act == SET || act == CLEAR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (act == SET || act == CLEAR || act == READBIT) {</span><br><span> if (input_data > 7) {</span><br><span> fprintf(stderr,</span><br><span> "Error: <bit> cannot be greater than 7.\n");</span><br><span>@@ -198,6 +212,10 @@</span><br><span> pmh7_register_write(input_addr, input_data);</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case READBIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%d\n", pmh7_register_read_bit(input_addr, input_data));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case CLEAR:</span><br><span> pmh7_register_clear_bit(input_addr, input_data);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28388">change 28388</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28388"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I045383eedbcf438270e9c64329a8d910bb941ab8 </div>
<div style="display:none"> Gerrit-Change-Number: 28388 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Evgeny Zinoviev <me@ch1p.com> </div>
<div style="display:none"> Gerrit-Reviewer: Evgeny Zinoviev <me@ch1p.com> </div>
<div style="display:none"> Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>