diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-05-01 16:42:45 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-05-01 16:42:45 +1000 |
| commit | a7d8258c329a3dfff36d348bd3cc3a7171a1267f (patch) | |
| tree | 289fe2e8396cbc5857e4c4c4521e4893fa273160 /include | |
| parent | 6a3cad272e4c494541c2fa5d9b5d893e17adcde3 (diff) | |
| parent | a653df93b2d22691ac1583584c8292e6e421464f (diff) | |
| download | skiboot-a7d8258c329a3dfff36d348bd3cc3a7171a1267f.zip skiboot-a7d8258c329a3dfff36d348bd3cc3a7171a1267f.tar.gz skiboot-a7d8258c329a3dfff36d348bd3cc3a7171a1267f.tar.bz2 | |
Merge branch 'stable', skiboot-5.0.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/lpc.h | 6 | ||||
| -rw-r--r-- | include/xscom.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/lpc.h b/include/lpc.h index 5611c54..a0990fd 100644 --- a/include/lpc.h +++ b/include/lpc.h @@ -27,6 +27,12 @@ extern void lpc_init(void); /* Check for a default bus */ extern bool lpc_present(void); +/* Return of LPC is currently usable. This can be false if the caller + * currently holds a lock that would make it unsafe, or the LPC bus + * is known to be in some error condition (TBI). + */ +extern bool lpc_ok(void); + /* Handle the interrupt from LPC source */ extern void __attrconst lpc_interrupt(uint32_t chip_id); diff --git a/include/xscom.h b/include/xscom.h index b1ecaf5..a841261 100644 --- a/include/xscom.h +++ b/include/xscom.h @@ -173,6 +173,11 @@ extern void xscom_init(void); /* Mark XSCOM lock as being in console path */ extern void xscom_used_by_console(void); +/* Returns true if XSCOM can be used. Typically this returns false if + * the current CPU holds the XSCOM lock (to avoid re-entrancy from error path). + */ +extern bool xscom_ok(void); + extern int64_t xscom_read_cfam_chipid(uint32_t partid, uint32_t *chip_id); #endif /* __XSCOM_H */ |