[coreboot-gerrit] Patch merged into coreboot/master: ifdtool: Properly set + decode flmstr regs for IFD v2

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit d2cb11811ca0fd45ebfb3a08f1c4cc8faa1d56d4
Author: Shawn Nematbakhsh <shawnn at chromium.org>
Date:   Thu Sep 10 19:07:13 2015 -0700

    ifdtool: Properly set + decode flmstr regs for IFD v2
    
    flmstr register bits have slightly different meaning for IFD v2.
    
    BUG=chrome-os-partner:45091, chrome-os-partner:43461
    TEST=Run `ifdtool -d image.bin` on IFD v1 locked squawks image:
    
    Found Master Section
    FLMSTR1:   0x0a0b0000 (Host CPU/BIOS)
      Platform Data Region Write Access: disabled
      GbE Region Write Access:           enabled
      Intel ME Region Write Access:      disabled
      Host CPU/BIOS Region Write Access: enabled
      Flash Descriptor Write Access:     disabled
      Platform Data Region Read Access:  disabled
      GbE Region Read Access:            enabled
      Intel ME Region Read Access:       disabled
      Host CPU/BIOS Region Read Access:  enabled
      Flash Descriptor Read Access:      enabled
      Requester ID:                      0x0000
    
    FLMSTR2:   0x0c0d0000 (Intel ME)
      Platform Data Region Write Access: disabled
      GbE Region Write Access:           enabled
      Intel ME Region Write Access:      enabled
      Host CPU/BIOS Region Write Access: disabled
      Flash Descriptor Write Access:     disabled
      Platform Data Region Read Access:  disabled
      GbE Region Read Access:            enabled
      Intel ME Region Read Access:       enabled
      Host CPU/BIOS Region Read Access:  disabled
      Flash Descriptor Read Access:      enabled
      Requester ID:                      0x0000
    
    FLMSTR3:   0x08080118 (GbE)
      Platform Data Region Write Access: disabled
      GbE Region Write Access:           enabled
      Intel ME Region Write Access:      disabled
      Host CPU/BIOS Region Write Access: disabled
      Flash Descriptor Write Access:     disabled
      Platform Data Region Read Access:  disabled
      GbE Region Read Access:            enabled
      Intel ME Region Read Access:       disabled
      Host CPU/BIOS Region Read Access:  disabled
      Flash Descriptor Read Access:      disabled
      Requester ID:                      0x0118
    
    Then, run `ifdtool -l image.bin` and verify newly locked image is identical.
    Next, run `ifdtool -l image.bin` on unlocked glados image. Verify that locked
    and unlocked regions are identical to above.
    Finally, burn glados image, run `flashrom -V`, and verify ME regions is
    locked and descriptor region is RO.
    BRANCH=None
    
    Change-Id: I8a65bdc5edd0d888138b88c1189f8badd1404b64
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 11c434835a66a50ab2c0c01a084edc96cbe052da
    Original-Signed-off-by: Shawn Nematbakhsh <shawnn at chromium.org>
    Original-Change-Id: I875dfce6f5cf57831714702872bfe636f8f953f4
    Original-Reviewed-on: https://chromium-review.googlesource.com/298968
    Original-Commit-Ready: Shawn N <shawnn at chromium.org>
    Original-Tested-by: Shawn N <shawnn at chromium.org>
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Reviewed-on: http://review.coreboot.org/11658
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi <pgeorgi at google.com>


See http://review.coreboot.org/11658 for details.

-gerrit