June 2017 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[staging]: Drop redundant `enum msglevel`
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Hello Stefan Tauner, Paul Menzel, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/20268 to look at the new patch set (#2). Change subject: Drop redundant `enum msglevel` ...................................................................... Drop redundant `enum msglevel` Use `enum flashrom_log_level` instead to avoid further confusion. Change-Id: I1895cb8f60da3abf70c9c2953f52414cd2cc10a9 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M cli_classic.c M cli_output.c M flash.h M ichspi.c M libflashrom.c M libflashrom.h 6 files changed, 38 insertions(+), 45 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/20268/2 -- To view, visit https://review.coreboot.org/20268 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1895cb8f60da3abf70c9c2953f52414cd2cc10a9 Gerrit-Change-Number: 20268 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Make read_ich_descriptors_from_dump() available in fl...
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/20265 ) Change subject: fixup! Make read_ich_descriptors_from_dump() available in flashrom ...................................................................... fixup! Make read_ich_descriptors_from_dump() available in flashrom Add a guard around read_ich_descriptors_via_fdo() which uses raw hardware access and is only called from `ichspi`. Fixes linking in case `NEED_RAW_ACCESS != 1`. Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/20265 Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M ich_descriptors.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: David Hendricks: Looks good to me, approved build bot (Jenkins): Verified diff --git a/ich_descriptors.c b/ich_descriptors.c index 34100cb..a12022c 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -847,6 +847,8 @@ return (1 << (19 + size_enc)); } +/* Only used by ichspi.c */ +#if CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__)) static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar) { uint32_t control = 0; @@ -918,6 +920,7 @@ msg_pdbg2(" done.\n"); return ICH_RET_OK; } +#endif /** * @brief Read a layout from the dump of an Intel ICH descriptor. -- To view, visit https://review.coreboot.org/20265 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Add a convenient libflashrom interface
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/20267 ) Change subject: fixup! Add a convenient libflashrom interface ...................................................................... fixup! Add a convenient libflashrom interface Update `enum flashrom_log_level` to match `enum msglevel` again. They diverged already. Found by clang. Change-Id: Icf175c5f2a415365bd756ca813e724f6797459b2 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/20267 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M libflashrom.c M libflashrom.h 2 files changed, 6 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/libflashrom.c b/libflashrom.c index 1176e02..962e96f 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -90,7 +90,7 @@ int ret; va_list args; va_start(args, fmt); - ret = global_log_callback(level, fmt, args); + ret = global_log_callback((enum flashrom_log_level)level, fmt, args); va_end(args); return ret; } diff --git a/libflashrom.h b/libflashrom.h index 09a88c4..c5d972e 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -29,10 +29,11 @@ /** @ingroup flashrom-general */ enum flashrom_log_level { /* This has to match enum msglevel. */ FLASHROM_MSG_ERROR = 0, - FLASHROM_MSG_INFO = 1, - FLASHROM_MSG_DEBUG = 2, - FLASHROM_MSG_DEBUG2 = 3, - FLASHROM_MSG_SPEW = 4, + FLASHROM_MSG_WARN = 1, + FLASHROM_MSG_INFO = 2, + FLASHROM_MSG_DEBUG = 3, + FLASHROM_MSG_DEBUG2 = 4, + FLASHROM_MSG_SPEW = 5, }; /** @ingroup flashrom-general */ typedef int(flashrom_log_callback)(enum flashrom_log_level, const char *format, va_list); -- To view, visit https://review.coreboot.org/20267 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: Icf175c5f2a415365bd756ca813e724f6797459b2 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Add a convenient libflashrom interface
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/20266 ) Change subject: fixup! Add a convenient libflashrom interface ...................................................................... fixup! Add a convenient libflashrom interface The buffer passed to flashrom_image_write() isn't `const`. It might be altered for full verification (with mixed contents if a layout is being used). Change-Id: Ibd8a9579e5dd859ae03b0deb3042b7035719e5de Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/20266 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M flashrom.c M libflashrom.h 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index 503a199..838dfd0 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2294,7 +2294,7 @@ * containing included regions will be touched. * * @param flashctx The context of the flash chip. - * @param buffer Source buffer to read image from. + * @param buffer Source buffer to read image from (may be altered for full verification). * @param buffer_len Size of source buffer in bytes. * @return 0 on success, * 4 if buffer_len doesn't match the size of the flash chip, diff --git a/libflashrom.h b/libflashrom.h index 1937194..09a88c4 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -59,7 +59,7 @@ bool flashrom_flag_get(const struct flashrom_flashctx *, enum flashrom_flag); int flashrom_image_read(struct flashrom_flashctx *, void *buffer, size_t buffer_len); -int flashrom_image_write(struct flashrom_flashctx *, const void *buffer, size_t buffer_len); +int flashrom_image_write(struct flashrom_flashctx *, void *buffer, size_t buffer_len); int flashrom_image_verify(struct flashrom_flashctx *, const void *buffer, size_t buffer_len); struct flashrom_layout; -- To view, visit https://review.coreboot.org/20266 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: Ibd8a9579e5dd859ae03b0deb3042b7035719e5de Gerrit-Change-Number: 20266 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Make read_ich_descriptors_from_dump() available in fl...
by build bot (Jenkins) (Code Review) 20 Jun '17

20 Jun '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/20265 ) Change subject: fixup! Make read_ich_descriptors_from_dump() available in flashrom ...................................................................... Patch Set 2: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/387/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/403/ : SUCCESS -- To view, visit https://review.coreboot.org/20265 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 20 Jun 2017 11:25:09 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Make coreboot.org the upstream server
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/19187 ) Change subject: Make coreboot.org the upstream server ...................................................................... Patch Set 5: (2 comments) NVM, the change to the upstream_pattern makes sense. https://review.coreboot.org/#/c/19187/5/util/getrevision.sh File util/getrevision.sh: https://review.coreboot.org/#/c/19187/5/util/getrevision.sh@35 PS5, Line 35: upstream_url="https://review.coreboot.org/flashrom.git" This is unnecessary, I guess. https://review.coreboot.org/#/c/19187/5/util/getrevision.sh@36 PS5, Line 36: upstream_patterns="github\.com.flashrom/flashrom(\.git)?|flashrom\.org.git/flashrom(\.git)?|coreboot\.org.*/flashrom(\.git)?" I agree here. The pattern could be condensed though, it always ends in `/flashrom(\.git)?`. -- To view, visit https://review.coreboot.org/19187 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I9461dc4d2d461fff253392c4a1249a8835d5c9a4 Gerrit-Change-Number: 19187 Gerrit-PatchSet: 5 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 20 Jun 2017 10:46:04 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[staging]: Make coreboot.org the upstream server
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/19187 ) Change subject: Make coreboot.org the upstream server ...................................................................... Patch Set 5: Does this still matter? the repos are sync'ed anyway, aren't they? -- To view, visit https://review.coreboot.org/19187 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I9461dc4d2d461fff253392c4a1249a8835d5c9a4 Gerrit-Change-Number: 19187 Gerrit-PatchSet: 5 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 20 Jun 2017 10:40:45 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Convert flashrom to git
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/19206 ) Change subject: Convert flashrom to git ...................................................................... Patch Set 6: (8 comments) Only some nits and simple things it getrevision.sh. https://review.coreboot.org/#/c/19206/6//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/19206/6//COMMIT_MSG@13 PS6, Line 13: - Remove djgpp-dos target (it is not different to other x-compilations). I was just wondering, why I didn't nag earlier, you can keep the change in or remove this line... https://review.coreboot.org/#/c/19206/6//COMMIT_MSG@15 PS6, Line 15: anything else from the code dump when we export the respective variable. Nit, line is too long. https://review.coreboot.org/#/c/19206/6//COMMIT_MSG@26 PS6, Line 26: f5dd7ce1 This sha will probably get lost. Linking to the mailing list archive might be better. https://review.coreboot.org/#/c/19206/6//COMMIT_MSG@28 PS6, Line 28: pushing to the review server. Maybe also mention, that you split out the complex version string. https://review.coreboot.org/#/c/19206/6/util/getrevision.sh File util/getrevision.sh: https://review.coreboot.org/#/c/19206/6/util/getrevision.sh@140 PS6, Line 140: local svn_base=$(git log --grep=git-svn-id -1 --format='%h') : if [ "$svn_base" != "" ] ; then : local diff_to_svn=$(git rev-list --count ${svn_base}..${r}) : if [ "$diff_to_svn" -gt 0 ] ; then : r="$r-$diff_to_svn" : fi : fi Looks like we don't have git-svn-id any more. A simple `git describe ${r}` might do? We already have tags in git, for me it shows something like: v0.9.9-22-gfb2996c1 https://review.coreboot.org/#/c/19206/6/util/getrevision.sh@168 PS6, Line 168: sed 's/.*@/r/;s/[[:blank:]].*//') Same here, maybe just drop the --upstream command? https://review.coreboot.org/#/c/19206/6/util/git-hooks/pre-push File util/git-hooks/pre-push: https://review.coreboot.org/#/c/19206/6/util/git-hooks/pre-push@46 PS6, Line 46: else : range="$remote_sha..$local_sha" Nit, actually I don't like the `else` here, it's not directly related to the `if` (i.e. could just move below the `fi`). Now I also wonder why we need this variable at all (only used in one place). https://review.coreboot.org/#/c/19206/6/util/git-hooks/pre-push@55 PS6, Line 55: " or \"Acked-by\" lines, not pushing." >&2 Sounds good. -- To view, visit https://review.coreboot.org/19206 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: david.hendricks(a)gmail.com Gerrit-Comment-Date: Tue, 20 Jun 2017 10:39:00 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[staging]: ichspi: Drop `dev` parameter from init functions
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/19460 ) Change subject: ichspi: Drop `dev` parameter from init functions ...................................................................... ichspi: Drop `dev` parameter from init functions It's never used and has no clear contract (e.g. will the pointer stay valid beyond the call?). Change-Id: I0d4e7cc731364e86eff214b9022b842a577f9ef4 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/19460 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- M chipset_enable.c M ichspi.c M programmer.h 3 files changed, 8 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified Philippe Mathieu-Daudé: Looks good to me, but someone else must approve Stefan Reinauer: Looks good to me, approved diff --git a/chipset_enable.c b/chipset_enable.c index 208cd3a..83c470f 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -718,7 +718,7 @@ void *spibar = rcrb + spibar_offset; /* This adds BUS_SPI */ - int ret_spi = ich_init_spi(dev, spibar, ich_generation); + int ret_spi = ich_init_spi(spibar, ich_generation); if (ret_spi == ERROR_FATAL) return ret_spi; @@ -846,7 +846,7 @@ */ enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC); - int ret_spi = ich_init_spi(dev, spibar, ich_generation); + int ret_spi = ich_init_spi(spibar, ich_generation); if (ret_spi == ERROR_FATAL) return ret_spi; @@ -949,12 +949,12 @@ return ERROR_FATAL; } - return via_init_spi(dev, spi0_mm_base); + return via_init_spi(spi0_mm_base); } static int enable_flash_vt8237s_spi(struct pci_dev *dev, const char *name) { - return via_init_spi(dev, pci_read_long(dev, 0xbc) << 8); + return via_init_spi(pci_read_long(dev, 0xbc) << 8); } static int enable_flash_cs5530(struct pci_dev *dev, const char *name) diff --git a/ichspi.c b/ichspi.c index e1395ee..218e3b1 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1561,7 +1561,7 @@ .erase = ich_hwseq_block_erase, }; -int ich_init_spi(struct pci_dev *dev, void *spibar, enum ich_chipset ich_gen) +int ich_init_spi(void *spibar, enum ich_chipset ich_gen) { int i; uint16_t tmp2; @@ -1828,7 +1828,7 @@ .write_aai = default_spi_write_aai, }; -int via_init_spi(struct pci_dev *dev, uint32_t mmio_base) +int via_init_spi(uint32_t mmio_base) { int i; diff --git a/programmer.h b/programmer.h index 9beaf98..fd9da96 100644 --- a/programmer.h +++ b/programmer.h @@ -655,8 +655,8 @@ /* ichspi.c */ #if CONFIG_INTERNAL == 1 extern uint32_t ichspi_bbar; -int ich_init_spi(struct pci_dev *dev, void *spibar, enum ich_chipset ich_generation); -int via_init_spi(struct pci_dev *dev, uint32_t mmio_base); +int ich_init_spi(void *spibar, enum ich_chipset ich_generation); +int via_init_spi(uint32_t mmio_base); /* amd_imc.c */ int amd_imc_shutdown(struct pci_dev *dev); -- To view, visit https://review.coreboot.org/19460 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I0d4e7cc731364e86eff214b9022b842a577f9ef4 Gerrit-Change-Number: 19460 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Youness Alaoui <snifikino(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: Handle Intel Wildcat Point *LP* like Lynx Point LP
by Nico Huber (Code Review) 20 Jun '17

20 Jun '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/18883 ) Change subject: Handle Intel Wildcat Point *LP* like Lynx Point LP ...................................................................... Handle Intel Wildcat Point *LP* like Lynx Point LP The subtle difference was ignored when adding these chipsets. The integrated Wildcat Point LP PCH is documented in [1]. I'm not sure how to account for "Broadwell H" which seems not publicly documented. Maybe it's an unreleased HM9*, in which case the non-LP path should be correct. [1] Mobile 5th Generation Intel® Core(TM) Processor Family I/O, Intel® Core(TM) M Processor Family I/O, Mobile Intel® Pentium® Processor Family I/O, and Mobile Intel® Celeron® Processor Family I/O Datasheet Revision 004 Document Number: 330837 Change-Id: I6b7ca3c0bde111b04ed7c745ed76d28d3d05f01c Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/18883 Reviewed-by: Youness Alaoui <snifikino(a)gmail.com> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M chipset_enable.c M ich_descriptors.c M programmer.h 3 files changed, 21 insertions(+), 9 deletions(-) Approvals: Youness Alaoui: Looks good to me, but someone else must approve David Hendricks: Looks good to me, approved Philippe Mathieu-Daudé: Looks good to me, but someone else must approve build bot (Jenkins): Verified diff --git a/chipset_enable.c b/chipset_enable.c index 1191a4c..208cd3a 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -643,6 +643,7 @@ straps_names = straps_names_pch89_baytrail; break; case CHIPSET_8_SERIES_LYNX_POINT_LP: + case CHIPSET_9_SERIES_WILDCAT_POINT_LP: straps_names = straps_names_pch8_lp; break; case CHIPSET_8_SERIES_WELLSBURG: // FIXME: check datasheet @@ -661,7 +662,8 @@ bbs = (gcs >> 1) & 0x1; break; case CHIPSET_8_SERIES_LYNX_POINT_LP: - /* Lynx Point LP uses a single bit for BBS */ + case CHIPSET_9_SERIES_WILDCAT_POINT_LP: + /* LP PCHs use a single bit for BBS */ bbs = (gcs >> 10) & 0x1; break; default: @@ -796,6 +798,12 @@ static int enable_flash_pch9(struct pci_dev *dev, const char *name) { return enable_flash_ich_spi(dev, CHIPSET_9_SERIES_WILDCAT_POINT, 0xdc); +} + +/* Wildcat Point LP */ +static int enable_flash_pch9_lp(struct pci_dev *dev, const char *name) +{ + return enable_flash_ich_spi(dev, CHIPSET_9_SERIES_WILDCAT_POINT_LP, 0xdc); } /* Silvermont architecture: Bay Trail(-T/-I), Avoton/Rangeley. @@ -1787,13 +1795,13 @@ {0x8086, 0x9c43, NT, "Intel", "Lynx Point LP Premium", enable_flash_pch8_lp}, {0x8086, 0x9c45, NT, "Intel", "Lynx Point LP Mainstream", enable_flash_pch8_lp}, {0x8086, 0x9c47, NT, "Intel", "Lynx Point LP Value", enable_flash_pch8_lp}, - {0x8086, 0x9cc1, NT, "Intel", "Haswell U Sample", enable_flash_pch9}, - {0x8086, 0x9cc2, NT, "Intel", "Broadwell U Sample", enable_flash_pch9}, - {0x8086, 0x9cc3, NT, "Intel", "Broadwell U Premium", enable_flash_pch9}, - {0x8086, 0x9cc5, NT, "Intel", "Broadwell U Base", enable_flash_pch9}, - {0x8086, 0x9cc6, NT, "Intel", "Broadwell Y Sample", enable_flash_pch9}, - {0x8086, 0x9cc7, NT, "Intel", "Broadwell Y Premium", enable_flash_pch9}, - {0x8086, 0x9cc9, NT, "Intel", "Broadwell Y Base", enable_flash_pch9}, + {0x8086, 0x9cc1, NT, "Intel", "Haswell U Sample", enable_flash_pch9_lp}, + {0x8086, 0x9cc2, NT, "Intel", "Broadwell U Sample", enable_flash_pch9_lp}, + {0x8086, 0x9cc3, NT, "Intel", "Broadwell U Premium", enable_flash_pch9_lp}, + {0x8086, 0x9cc5, NT, "Intel", "Broadwell U Base", enable_flash_pch9_lp}, + {0x8086, 0x9cc6, NT, "Intel", "Broadwell Y Sample", enable_flash_pch9_lp}, + {0x8086, 0x9cc7, NT, "Intel", "Broadwell Y Premium", enable_flash_pch9_lp}, + {0x8086, 0x9cc9, NT, "Intel", "Broadwell Y Base", enable_flash_pch9_lp}, {0x8086, 0x9ccb, NT, "Intel", "Broadwell H", enable_flash_pch9}, {0x8086, 0x9d41, BAD, "Intel", "Sunrise Point (Skylake LP Sample)", NULL}, {0x8086, 0x9d43, BAD, "Intel", "Sunrise Point (Skylake-U Base)", NULL}, diff --git a/ich_descriptors.c b/ich_descriptors.c index 7e2521a..34100cb 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -139,7 +139,8 @@ case CHIPSET_8_SERIES_LYNX_POINT: case CHIPSET_8_SERIES_LYNX_POINT_LP: case CHIPSET_8_SERIES_WELLSBURG: - case CHIPSET_9_SERIES_WILDCAT_POINT: { + case CHIPSET_9_SERIES_WILDCAT_POINT: + case CHIPSET_9_SERIES_WILDCAT_POINT_LP: { uint8_t size_enc; if (idx == 0) { size_enc = desc->component.dens_new.comp1_density; @@ -183,6 +184,7 @@ case CHIPSET_8_SERIES_LYNX_POINT_LP: case CHIPSET_8_SERIES_WELLSBURG: case CHIPSET_9_SERIES_WILDCAT_POINT: + case CHIPSET_9_SERIES_WILDCAT_POINT_LP: return freq_str[value]; case CHIPSET_ICH_UNKNOWN: default: @@ -821,6 +823,7 @@ case CHIPSET_8_SERIES_LYNX_POINT_LP: case CHIPSET_8_SERIES_WELLSBURG: case CHIPSET_9_SERIES_WILDCAT_POINT: + case CHIPSET_9_SERIES_WILDCAT_POINT_LP: if (idx == 0) { size_enc = desc->component.dens_new.comp1_density; } else { diff --git a/programmer.h b/programmer.h index 1a6216a..9beaf98 100644 --- a/programmer.h +++ b/programmer.h @@ -649,6 +649,7 @@ CHIPSET_8_SERIES_LYNX_POINT_LP, CHIPSET_8_SERIES_WELLSBURG, CHIPSET_9_SERIES_WILDCAT_POINT, + CHIPSET_9_SERIES_WILDCAT_POINT_LP, }; /* ichspi.c */ -- To view, visit https://review.coreboot.org/18883 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I6b7ca3c0bde111b04ed7c745ed76d28d3d05f01c Gerrit-Change-Number: 18883 Gerrit-PatchSet: 7 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Youness Alaoui <snifikino(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit June 2017