summaryrefslogtreecommitdiffstats
path: root/ich_descriptors.h
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2019-07-04 16:01:51 +0200
committerNico Huber <nico.h@gmx.de>2019-08-08 21:29:37 +0000
commit2a5dfaf140eb8f22c923a026df855da0c5e9bf82 (patch)
treea1d231512e360758c35367d3b9b71e69f1ccbc57 /ich_descriptors.h
parent5ec84b3c096c9ace0bf3650206a0a9412e977c64 (diff)
downloadflashrom-2a5dfaf140eb8f22c923a026df855da0c5e9bf82.tar.gz
flashrom-2a5dfaf140eb8f22c923a026df855da0c5e9bf82.tar.bz2
flashrom-2a5dfaf140eb8f22c923a026df855da0c5e9bf82.zip
ichspi: Add support for discrete Cannon Lake PCHs
Only minor differences in the Firmware Descriptor, compared to their predecessors. We extend our check on the `ICCRIBA` field in the descriptor to dis- tinguish it from older generation. Alas, the `freq_read` field was repurposed, so we can't use it as sanity check any more. Change-Id: I1c2d1e8916cecd756e7ac1f0ba221d7cc361ba02 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/34072 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Diffstat (limited to 'ich_descriptors.h')
-rw-r--r--ich_descriptors.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/ich_descriptors.h b/ich_descriptors.h
index 422528657..c6bf5d802 100644
--- a/ich_descriptors.h
+++ b/ich_descriptors.h
@@ -170,8 +170,9 @@ struct ich_desc_region {
* Chipset/Generation #FLREGs width (bits)
* ICH8 .. Panther Point/7 5 13
* Lynx Point/8 .. Wildcat Point/9 7 15
- * Sunrise Point/100 .. 10 15
+ * Sunrise Point/100 .. 200 Series 10 15
* Lewisburg/100 .. 16 15
+ * Cannon Point/300 .. 16 15
*/
union {
uint32_t FLREGs[MAX_NUM_FLREGS]; /* Flash Descriptor Regions */
@@ -234,9 +235,10 @@ struct ich_desc_master {
};
/* From Skylake on */
struct {
- uint32_t :8,
- read :12,
- write :12;
+ uint32_t ext_read :4,
+ ext_write :4,
+ read :12,
+ write :12;
} mstr[MAX_NUM_MASTERS];
};
};