aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-24 09:27:28 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-08-22 15:26:52 +1000
commit1fc31333f478ed92aa97079cf2d333b06ccf5f27 (patch)
tree1004140728ab8737d72bec8c13e61ea71219c23a
parentb7aa01a834ee072eac1c61dbf72334c7405d0327 (diff)
downloadskiboot-1fc31333f478ed92aa97079cf2d333b06ccf5f27.zip
skiboot-1fc31333f478ed92aa97079cf2d333b06ccf5f27.tar.gz
skiboot-1fc31333f478ed92aa97079cf2d333b06ccf5f27.tar.bz2
chip: Add a quirk for when core direct control XSCOMs are missing
Those will be needed by fast reboot. For now, mark qemu and mambo as not having them. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--core/chip.c6
-rw-r--r--include/chip.h1
2 files changed, 5 insertions, 2 deletions
diff --git a/core/chip.c b/core/chip.c
index 5ac5d62..ea775ef 100644
--- a/core/chip.c
+++ b/core/chip.c
@@ -79,7 +79,8 @@ void init_chips(void)
/* Detect mambo chip */
if (dt_find_by_path(dt_root, "/mambo")) {
proc_chip_quirks |= QUIRK_NO_CHIPTOD | QUIRK_MAMBO_CALLOUTS
- | QUIRK_NO_F000F | QUIRK_NO_PBA | QUIRK_NO_OCC_IRQ;
+ | QUIRK_NO_F000F | QUIRK_NO_PBA | QUIRK_NO_OCC_IRQ
+ | QUIRK_NO_DIRECT_CTL;
prlog(PR_NOTICE, "CHIP: Detected Mambo simulator\n");
}
/* Detect simics */
@@ -98,7 +99,8 @@ void init_chips(void)
}
/* Detect Qemu */
if (dt_node_is_compatible(dt_root, "qemu,powernv")) {
- proc_chip_quirks |= QUIRK_NO_CHIPTOD | QUIRK_NO_PBA;
+ proc_chip_quirks |= QUIRK_NO_CHIPTOD | QUIRK_NO_PBA
+ | QUIRK_NO_DIRECT_CTL;
prlog(PR_NOTICE, "CHIP: Detected Qemu simulator\n");
}
diff --git a/include/chip.h b/include/chip.h
index 77bc5cf..784faf8 100644
--- a/include/chip.h
+++ b/include/chip.h
@@ -130,6 +130,7 @@ enum proc_chip_quirks {
QUIRK_NO_OCC_IRQ = 0x00000010,
QUIRK_SIMICS = 0x00000020,
QUIRK_SLOW_SIM = 0x00000040,
+ QUIRK_NO_DIRECT_CTL = 0x00000080,
} proc_chip_quirks;
static inline bool chip_quirk(unsigned int q)