<p>Maximilian Schander has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22216">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">intelmetool: small cosmetic changes<br><br>Change-Id: I0038a146bd899f150518c4832258a42792abaabb<br>Signed-off-by: Maximilian Schander <maxschander@googlemail.com><br>---<br>M util/intelmetool/intelmetool.c<br>M util/intelmetool/me.c<br>M util/intelmetool/me_status.c<br>M util/intelmetool/mmap.c<br>4 files changed, 52 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/22216/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/util/intelmetool/intelmetool.c b/util/intelmetool/intelmetool.c<br>index b918c3e..c156e75 100644<br>--- a/util/intelmetool/intelmetool.c<br>+++ b/util/intelmetool/intelmetool.c<br>@@ -25,6 +25,7 @@<br> #include "mmap.h"<br> #include "intelmetool.h"<br> <br>+#define VENDOR_ID_INTEL 0x8086<br> #define FD2 0x3428<br> #define ME_COMMAND_DELAY 10000<br> <br>@@ -63,7 +64,8 @@<br> fclose(fp);<br> }<br> <br>-static void rehide_me() {<br>+static void rehide_me(void)<br>+{<br> if (fd2 & 0x2) {<br> printf("Re-hiding MEI device...");<br> fd2 = *(uint32_t *)(rcba + FD2);<br>@@ -78,7 +80,8 @@<br> * Real ME memory is located around top of memory minus 64MB. (I think)<br> * so we avoid cloning to this part.<br> */<br>-static void dump_me_memory() {<br>+static void dump_me_memory(void)<br>+{<br> uintptr_t me_clone = 0x60000000;<br> uint8_t *dump;<br> <br>@@ -107,7 +110,8 @@<br> }<br> }<br> <br>-static int pci_platform_scan() {<br>+static int pci_platform_scan(void)<br>+{<br> struct pci_access *pacc;<br> struct pci_dev *dev;<br> char namebuf[1024];<br>@@ -159,7 +163,9 @@<br> return 0;<br> }<br> <br>-static struct pci_dev *pci_me_interface_scan(const char **name, char *namebuf, int namebuf_size) {<br>+static struct pci_dev *pci_me_interface_scan(const char **name, char *namebuf,<br>+ int namebuf_size)<br>+{<br> struct pci_access *pacc;<br> struct pci_dev *dev;<br> int me = 0;<br>@@ -174,7 +180,7 @@<br> pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES | PCI_FILL_SIZES | PCI_FILL_CLASS);<br> *name = pci_lookup_name(pacc, namebuf, namebuf_size,<br> PCI_LOOKUP_DEVICE, dev->vendor_id, dev->device_id);<br>- if (dev->vendor_id == 0x8086) {<br>+ if (dev->vendor_id == VENDOR_ID_INTEL) {<br> if (PCI_DEV_HAS_SUPPORTED_ME(dev->device_id)) {<br> me = 1;<br> break;<br>@@ -193,7 +199,8 @@<br> return dev;<br> }<br> <br>-static int activate_me() {<br>+static int activate_me(void)<br>+{<br> struct pci_access *pacc;<br> struct pci_dev *sb;<br> uint32_t rcba_phys;<br>@@ -236,7 +243,8 @@<br> return 0;<br> }<br> <br>-static void dump_me_info() {<br>+static void dump_me_info(void)<br>+{<br> struct pci_dev *dev;<br> uint32_t stat, stat2;<br> char namebuf[1024];<br>@@ -257,6 +265,7 @@<br> <br> if (name == NULL)<br> name = "<unknown>";<br>+<br> printf("MEI found: [%x:%x] %s\n\n", dev->vendor_id, dev->device_id, name);<br> stat = pci_read_long(dev, 0x40);<br> printf("ME Status : 0x%x\n", stat);<br>@@ -268,7 +277,7 @@<br> intel_me_extend_valid(dev);<br> printf("\n");<br> <br>- if ((stat & 0xf000) >> 12 != 0) {<br>+ if (stat & 0xf000) {<br> printf("ME: has a broken implementation on your board with this BIOS\n");<br> }<br> <br>@@ -328,7 +337,7 @@<br> };<br> <br> while ((opt = getopt_long(argc, argv, "vh?sd",<br>- long_options, &option_index)) != EOF) {<br>+ long_options, &option_index)) != EOF) {<br> switch (opt) {<br> case 'v':<br> print_version();<br>diff --git a/util/intelmetool/me.c b/util/intelmetool/me.c<br>index e9fea6b..a0b56b4 100644<br>--- a/util/intelmetool/me.c<br>+++ b/util/intelmetool/me.c<br>@@ -53,7 +53,8 @@<br> switch (offset) {<br> case MEI_H_CSR:<br> case MEI_ME_CSR_HA:<br>-/* csr = ptr;<br>+/*<br>+ csr = ptr;<br> if (!csr) {<br> printf("%-9s[%02x] : ", type, offset);<br> printf("ERROR: 0x%08x\n", dword);<br>@@ -61,11 +62,13 @@<br> }<br> printf("%-9s[%02x] : ", type, offset);<br> printf("depth=%u read=%02u write=%02u ready=%u "<br>- "reset=%u intgen=%u intstatus=%u intenable=%u\n", csr->buffer_depth,<br>- csr->buffer_read_ptr, csr->buffer_write_ptr,<br>- csr->ready, csr->reset, csr->interrupt_generate,<br>- csr->interrupt_status, csr->interrupt_enable);<br>-*/ break;<br>+ "reset=%u intgen=%u intstatus=%u intenable=%u\n",<br>+ csr->buffer_depth, csr->buffer_read_ptr,<br>+ csr->buffer_write_ptr, csr->ready, csr->reset,<br>+ csr->interrupt_generate, csr->interrupt_status,<br>+ csr->interrupt_enable);<br>+*/<br>+ break;<br> case MEI_ME_CB_RW:<br> case MEI_H_CB_WW:<br> printf("%-9s[%02x] : ", type, offset);<br>@@ -580,7 +583,8 @@<br> <br> mei_base_address = dev->base_addr[0] & ~0xf;<br> pagerounded = mei_base_address & ~0xfff;<br>- mei_mmap = map_physical(pagerounded, 0x2000) + mei_base_address - pagerounded;<br>+ mei_mmap = (uint8_t *) map_physical(pagerounded, 0x2000)<br>+ + mei_base_address - pagerounded;<br> if (mei_mmap == NULL) {<br> printf("Could not map ME setup memory\n");<br> return 1;<br>diff --git a/util/intelmetool/me_status.c b/util/intelmetool/me_status.c<br>index 1de51f4..501848b 100644<br>--- a/util/intelmetool/me_status.c<br>+++ b/util/intelmetool/me_status.c<br>@@ -142,51 +142,50 @@<br> {<br> /* Check Current States */<br> printf("ME: FW Partition Table : %s\n",<br>- ((hfs & 0x20) >> 5) ? "BAD" : "OK");<br>+ ((hfs & 0x20) >> 5) ? "BAD" : "OK");<br> printf("ME: Bringup Loader Failure : %s\n",<br>- ((hfs & 0x400) >> 10) ? "YES" : "NO");<br>+ ((hfs & 0x400) >> 10) ? "YES" : "NO");<br> printf("ME: Firmware Init Complete : %s\n",<br>- ((hfs & 0x200) >> 9) ? "YES" : "NO");<br>+ ((hfs & 0x200) >> 9) ? "YES" : "NO");<br> printf("ME: Manufacturing Mode : %s\n",<br>- ((hfs & 0x10) >> 4) ? "YES" : "NO");<br>+ ((hfs & 0x10) >> 4) ? "YES" : "NO");<br> printf("ME: Boot Options Present : %s\n",<br>- ((hfs & 0x1000000) >> 24) ? "YES" : "NO");<br>+ ((hfs & 0x1000000) >> 24) ? "YES" : "NO");<br> printf("ME: Update In Progress : %s\n",<br>- ((hfs & 0x800) >> 11) ? "YES" : "NO");<br>+ ((hfs & 0x800) >> 11) ? "YES" : "NO");<br> printf("ME: Current Working State : %s\n",<br>- me_cws_values[hfs & 0xf]);<br>+ me_cws_values[hfs & 0xf]);<br> printf("ME: Current Operation State : %s\n",<br>- me_opstate_values[(hfs & 0x1c0) >> 6]);<br>+ me_opstate_values[(hfs & 0x1c0) >> 6]);<br> printf("ME: Current Operation Mode : %s\n",<br>- me_opmode_values[(hfs & 0xf0000) >> 16]);<br>+ me_opmode_values[(hfs & 0xf0000) >> 16]);<br> printf("ME: Error Code : %s\n",<br>- me_error_values[(hfs & 0xf000) >> 12]);<br>+ me_error_values[(hfs & 0xf000) >> 12]);<br> printf("ME: Progress Phase : %s\n",<br>- me_progress_values[(gmes & 0xf0000000) >> 28]);<br>+ me_progress_values[(gmes & 0xf0000000) >> 28]);<br> printf("ME: Power Management Event : %s\n",<br>- me_pmevent_values[(gmes & 0xf000000) >> 24]);<br>+ me_pmevent_values[(gmes & 0xf000000) >> 24]);<br> <br> printf("ME: Progress Phase State : ");<br> switch ((gmes & 0xf0000000) >> 28) {<br> case ME_GMES_PHASE_ROM: /* ROM Phase */<br>- printf("%s",<br>- me_progress_rom_values[(gmes & 0xff0000) >> 16]);<br>+ printf("%s", me_progress_rom_values[(gmes & 0xff0000) >> 16]);<br> break;<br> <br> case ME_GMES_PHASE_BUP: /* Bringup Phase */<br> if ((gmes & 0xff0000) >> 16 < ARRAY_SIZE(me_progress_bup_values)<br>- && me_progress_bup_values[(gmes & 0xff0000) >> 16])<br>+ && me_progress_bup_values[(gmes & 0xff0000) >> 16])<br> printf("%s",<br>- me_progress_bup_values[(gmes & 0xff0000) >> 16]);<br>+ me_progress_bup_values[(gmes & 0xff0000) >> 16]);<br> else<br> printf("0x%02x", (gmes & 0xff0000) >> 16);<br> break;<br> <br> case ME_GMES_PHASE_POLICY: /* Policy Module Phase */<br> if ((gmes & 0xff0000) >> 16 < ARRAY_SIZE(me_progress_policy_values)<br>- && me_progress_policy_values[(gmes & 0xff0000) >> 16])<br>+ && me_progress_policy_values[(gmes & 0xff0000) >> 16])<br> printf("%s",<br>- me_progress_policy_values[(gmes & 0xff0000) >> 16]);<br>+ me_progress_policy_values[(gmes & 0xff0000) >> 16]);<br> else<br> printf("0x%02x", (gmes & 0xff0000) >> 16);<br> break;<br>diff --git a/util/intelmetool/mmap.c b/util/intelmetool/mmap.c<br>index 2462b22..c67e870 100644<br>--- a/util/intelmetool/mmap.c<br>+++ b/util/intelmetool/mmap.c<br>@@ -20,7 +20,8 @@<br> #ifndef __DARWIN__<br> int fd_mem;<br> <br>-void *map_physical_exact(off_t phys_addr, void *mapto, size_t len) {<br>+void *map_physical_exact(off_t phys_addr, void *mapto, size_t len)<br>+{<br> void *virt_addr;<br> int err;<br> <br>@@ -37,7 +38,8 @@<br> return virt_addr;<br> }<br> <br>-void *map_physical(off_t phys_addr, size_t len) {<br>+void *map_physical(off_t phys_addr, size_t len)<br>+{<br> void *virt_addr;<br> int err;<br> <br>@@ -53,7 +55,8 @@<br> return virt_addr;<br> }<br> <br>-void unmap_physical(void *virt_addr, size_t len) {<br>+void unmap_physical(void *virt_addr, size_t len)<br>+{<br> munmap(virt_addr, len);<br> }<br> #endif<br></pre><p>To view, visit <a href="https://review.coreboot.org/22216">change 22216</a>. To unsubscribe, 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/22216"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0038a146bd899f150518c4832258a42792abaabb </div>
<div style="display:none"> Gerrit-Change-Number: 22216 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Maximilian Schander <maxschander@googlemail.com> </div>