xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / arm64 / pal_hibernate.h

diff --git a/osfmk/arm64/pal_hibernate.h b/osfmk/arm64/pal_hibernate.h
index 88724f77272c2c860969e8f50bc8a2bd582fc328..0033ec1f8b22dcf808954c851803d18b9fe8aace 100644 (file)
--- a/osfmk/arm64/pal_hibernate.h
+++ b/osfmk/arm64/pal_hibernate.h
@@ -55,10 +55,6 @@ typedef enum {
  * @discussion  ARM64-specific PAL context; see pal_hib_ctx_t for details.
  */
 struct pal_hib_ctx {
-#if HIBERNATE_HMAC_IMAGE
-       struct ccdigest_info di;
-       hibernate_scratch_t pagesRestored;
-#endif /* HIBERNATE_HMAC_IMAGE */
 };
 
 /*!
@@ -69,12 +65,14 @@ struct pal_hib_ctx {
  * @field       dockChannelWstatMask Mask to apply to dockchannel WSTAT register to compute available FIFO entries
  * @field       hibUartRegBase       Physical address of the UART registers
  * @field       hmacRegBase          Physical address of the hmac block registers
+ * @field       kernelSlide          Offset from physical address to virtual address in the kernel map
  */
 typedef struct {
        uint64_t dockChannelRegBase;
        uint64_t dockChannelWstatMask;
        uint64_t hibUartRegBase;
        uint64_t hmacRegBase;
+       uint64_t kernelSlide;
 } pal_hib_globals_t;
 extern pal_hib_globals_t gHibernateGlobals;
 
@@ -102,13 +100,11 @@ void pal_hib_resume_tramp(uint32_t headerPpnum);
  * @field       ttbr0               Physical address of the first level translation table (low mem)
  * @field       ttbr1               Physical address of the first level translation table (high mem)
  * @field       memSlide            Offset from physical address to virtual address during hibernation resume
- * @field       kernelSlide         Offset from physical address to virtual address in the kernel map
  */
 typedef struct{
        uint64_t ttbr0;
        uint64_t ttbr1;
        uint64_t memSlide;
-       uint64_t kernelSlide;
 } pal_hib_tramp_result_t;
 
 #if HIBERNATE_TRAP_HANDLER