summaryrefslogtreecommitdiffstats
path: root/chipset_enable.c
diff options
context:
space:
mode:
Diffstat (limited to 'chipset_enable.c')
-rw-r--r--chipset_enable.c78
1 files changed, 42 insertions, 36 deletions
diff --git a/chipset_enable.c b/chipset_enable.c
index dd4e0ea..89171b7 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -451,7 +451,7 @@ static int enable_flash_ich_fwh_decode(struct pci_dev *dev, enum ich_chipset ich
fwh_idsel_old = mmio_readl(ilb + fwh_sel1);
rmmio_writel(fwh_idsel, ilb + fwh_sel1);
} else {
- fwh_idsel_old = pci_read_long(dev, fwh_sel1) << 16;
+ fwh_idsel_old = (uint64_t)pci_read_long(dev, fwh_sel1) << 16;
rpci_write_long(dev, fwh_sel1, (fwh_idsel >> 16) & 0xffffffff);
if (fwh_sel2 > 0) {
fwh_idsel_old |= pci_read_word(dev, fwh_sel2);
@@ -1593,7 +1593,7 @@ const struct penable chipset_enables[] = {
{0x1166, 0x0205, OK, "Broadcom", "HT-1000", enable_flash_ht1000},
{0x17f3, 0x6030, OK, "RDC", "R8610/R3210", enable_flash_rdc_r8610},
{0x8086, 0x0c60, NT, "Intel", "S12x0", enable_flash_s12x0},
- {0x8086, 0x0f1c, NT, "Intel", "Bay Trail", enable_flash_silvermont},
+ {0x8086, 0x0f1c, OK, "Intel", "Bay Trail", enable_flash_silvermont},
{0x8086, 0x0f1d, NT, "Intel", "Bay Trail", enable_flash_silvermont},
{0x8086, 0x0f1e, NT, "Intel", "Bay Trail", enable_flash_silvermont},
{0x8086, 0x0f1f, NT, "Intel", "Bay Trail", enable_flash_silvermont},
@@ -1635,6 +1635,7 @@ const struct penable chipset_enables[] = {
{0x8086, 0x1f39, NT, "Intel", "Avoton/Rangeley", enable_flash_silvermont},
{0x8086, 0x1f3a, NT, "Intel", "Avoton/Rangeley", enable_flash_silvermont},
{0x8086, 0x1f3b, NT, "Intel", "Avoton/Rangeley", enable_flash_silvermont},
+ {0x8086, 0x229c, NT, "Intel", "Braswell", enable_flash_silvermont},
{0x8086, 0x2310, NT, "Intel", "DH89xxCC (Cave Creek)", enable_flash_pch7},
{0x8086, 0x2390, NT, "Intel", "Coleto Creek", enable_flash_pch7},
{0x8086, 0x2410, OK, "Intel", "ICH", enable_flash_ich0},
@@ -1730,42 +1731,47 @@ const struct penable chipset_enables[] = {
{0x8086, 0x8c5d, NT, "Intel", "Lynx Point", enable_flash_pch8},
{0x8086, 0x8c5e, NT, "Intel", "Lynx Point", enable_flash_pch8},
{0x8086, 0x8c5f, NT, "Intel", "Lynx Point", enable_flash_pch8},
+ {0x8086, 0x8cc1, NT, "Intel", "9 Series", enable_flash_pch9},
+ {0x8086, 0x8cc2, NT, "Intel", "9 Series Engineering Sample", enable_flash_pch9},
+ {0x8086, 0x8cc3, NT, "Intel", "9 Series", enable_flash_pch9},
+ {0x8086, 0x8cc4, NT, "Intel", "Z97", enable_flash_pch9},
+ {0x8086, 0x8cc6, NT, "Intel", "H97", enable_flash_pch9},
+ {0x8086, 0x8d40, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d41, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d42, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d43, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d44, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d45, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d46, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d47, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d48, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d49, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d4a, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d4b, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d4c, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d4d, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d4e, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d4f, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d50, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d51, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d52, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d53, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d54, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d55, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d56, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d57, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d58, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d59, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d5a, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d5b, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d5c, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d5d, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d5e, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
+ {0x8086, 0x8d5f, NT, "Intel", "C610/X99 (Wellsburg)", enable_flash_pch8_wb},
{0x8086, 0x9c41, NT, "Intel", "Lynx Point LP Eng. Sample", enable_flash_pch8_lp},
{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, 0x8d40, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d41, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d42, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d43, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d44, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d45, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d46, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d47, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d48, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d49, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d4a, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d4b, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d4c, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d4d, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d4e, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d4f, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d50, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d51, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d52, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d53, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d54, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d55, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d56, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d57, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d58, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d59, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d5a, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d5b, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d5c, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d5d, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d5e, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
- {0x8086, 0x8d5f, NT, "Intel", "Wellsburg", enable_flash_pch8_wb},
{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},
@@ -1807,10 +1813,10 @@ int chipset_flash_enable(void)
msg_pdbg(" with PCI ID %04x:%04x",
chipset_enables[i].vendor_id,
chipset_enables[i].device_id);
- msg_pinfo(". ");
+ msg_pinfo(".\n");
if (chipset_enables[i].status == NT) {
- msg_pinfo("\nThis chipset is marked as untested. If "
+ msg_pinfo("This chipset is marked as untested. If "
"you are using an up-to-date version\nof "
"flashrom *and* were (not) able to "
"successfully update your firmware with it,\n"
OpenPOWER on IntegriCloud