drm/asahi: Fix build with !DEV_COREDUMP

Fixes all unused warnings in this case.

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

drivers/gpu/drm/asahi/gpu.rs

@@ -17,7 +17,7 @@ use core::slice;
 use core::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 
 use kernel::{
-    c_str, devcoredump,
+    c_str,
     error::code::*,
     io::mem::{Mem, MemFlags},
     macros::versions,
@@ -28,9 +28,11 @@ use kernel::{
         lock::{mutex::MutexBackend, Guard},
         Arc, Mutex, UniqueArc,
     },
-    time::{msecs_to_jiffies, Delta, Instant, Monotonic},
+    time::{Delta, Instant, Monotonic},
     types::ForeignOwnable,
 };
+#[cfg(CONFIG_DEV_COREDUMP)]
+use kernel::devcoredump;
 
 use crate::alloc::Allocator;
 use crate::debug::*;
@@ -341,6 +343,8 @@ impl rtkit::Operations for GpuManager::ver {
         if let Err(e) = data.generate_crashdump(crashlog) {
             dev_err!(dev.as_ref(), "Could not generate crashdump: {:?}\n", e);
         }
+        #[cfg(not(CONFIG_DEV_COREDUMP))]
+        let _ = crashlog;
 
         if debug_enabled(DebugFlags::OopsOnGpuCrash) {
             panic!("GPU firmware crashed");
@@ -853,13 +857,15 @@ impl GpuManager::ver {
             return Err(EIO);
         }
 
+        #[cfg(CONFIG_DEV_COREDUMP)]
         let node = dev.as_ref().of_node().ok_or(EIO)?;
 
         Ok(KBox::new(
             hw::DynConfig {
                 pwr: pwr_cfg,
                 uat_ttb_base: uat.ttb_base(),
                 id: gpu_id,
+                #[cfg(CONFIG_DEV_COREDUMP)]
                 firmware_version: node.get_property(c_str!("apple,firmware-version"))?,
 
                 hw_data_a: Self::load_hwdata_blob(

drivers/gpu/drm/asahi/hw/mod.rs

@@ -301,6 +301,7 @@ pub(crate) struct DynConfig {
     /// Power calibration configuration for this specific chip/device.
     pub(crate) pwr: PwrConfig,
     /// Firmware version.
+    #[cfg(CONFIG_DEV_COREDUMP)]
     pub(crate) firmware_version: KVec<u32>,
 
     pub(crate) hw_data_a: KVVec<u8>,

drivers/gpu/drm/asahi/mmu.rs

@@ -66,6 +66,7 @@ pub(crate) const IOVA_USER_TOP: u64 = 1 << (UAT_IAS as u64);
 pub(crate) const IOVA_USER_RANGE: Range<u64> = IOVA_USER_BASE..IOVA_USER_TOP;
 
 /// Upper/kernel base VA
+#[cfg(CONFIG_DEV_COREDUMP)]
 const IOVA_TTBR1_BASE: u64 = 0xffffff8000000000;
 /// Driver-managed kernel base VA
 const IOVA_KERN_BASE: u64 = 0xffffffa000000000;
@@ -74,6 +75,7 @@ const IOVA_KERN_TOP: u64 = 0xffffffb000000000;
 /// Driver-managed kernel VA range
 const IOVA_KERN_RANGE: Range<u64> = IOVA_KERN_BASE..IOVA_KERN_TOP;
 /// Full kernel VA range
+#[cfg(CONFIG_DEV_COREDUMP)]
 const IOVA_KERN_FULL_RANGE: Range<u64> = IOVA_TTBR1_BASE..(!UAT_PGMSK as u64);
 
 const TTBR_VALID: u64 = 0x1; // BIT(0)
@@ -1358,6 +1360,7 @@ impl Uat {
         &self.kernel_lower_vm
     }
 
+    #[cfg(CONFIG_DEV_COREDUMP)]
     pub(crate) fn dump_kernel_pages(&self) -> Result<KVVec<pgtable::DumpedPage>> {
         let mut inner = self.kernel_vm.inner.exec_lock(None, false)?;
         inner.page_table.dump_pages(IOVA_KERN_FULL_RANGE)

drivers/gpu/drm/asahi/pgtable.rs

@@ -11,8 +11,12 @@ use core::mem::size_of;
 use core::ops::Range;
 use core::sync::atomic::{AtomicU64, Ordering};
 
-use kernel::uapi::{PF_R, PF_W, PF_X};
-use kernel::{addr::PhysicalAddr, error::Result, page::Page, prelude::*, types::Owned};
+#[cfg(CONFIG_DEV_COREDUMP)]
+use kernel::{
+    uapi::{PF_R, PF_W, PF_X},
+    types::Owned,
+};
+use kernel::{addr::PhysicalAddr, error::Result, page::Page, prelude::*};
 
 use crate::debug::*;
 use crate::util::align;
@@ -74,6 +78,7 @@ const HIGH_BITS_PXN: u16 = 1 << 1;
 const HIGH_BITS_UXN: u16 = 1 << 2;
 const HIGH_BITS_GPU_ACCESS: u16 = 1 << 3;
 
+#[cfg(CONFIG_DEV_COREDUMP)]
 pub(crate) const PTE_ADDR_BITS: u64 = (!UAT_PGMSK as u64) & (!UAT_HIGH_BITS);
 
 #[derive(Debug, Copy, Clone)]
@@ -101,16 +106,20 @@ const PROT_GPU_WO: Prot = Prot::from_bits(AP_GPU, 0, 1);
 const PROT_GPU_RW: Prot = Prot::from_bits(AP_GPU, 1, 0);
 const _PROT_GPU_NA: Prot = Prot::from_bits(AP_GPU, 1, 1);
 
+#[cfg(CONFIG_DEV_COREDUMP)]
 const PF_RW: u32 = PF_R | PF_W;
+#[cfg(CONFIG_DEV_COREDUMP)]
 const PF_RX: u32 = PF_R | PF_X;
 
 // For crash dumps
+#[cfg(CONFIG_DEV_COREDUMP)]
 const PROT_TO_PERMS_FW: [[u32; 4]; 4] = [
     [0, 0, 0, PF_RW],
     [0, PF_RW, 0, PF_RW],
     [PF_RX, PF_RX, 0, PF_R],
     [PF_RX, PF_RW, 0, PF_R],
 ];
+#[cfg(CONFIG_DEV_COREDUMP)]
 const PROT_TO_PERMS_OS: [[u32; 4]; 4] = [
     [0, PF_R, PF_W, PF_RW],
     [PF_R, 0, PF_RW, PF_RW],
@@ -159,6 +168,7 @@ impl Prot {
         }
     }
 
+    #[cfg(CONFIG_DEV_COREDUMP)]
     pub(crate) const fn from_pte(pte: u64) -> Self {
         Prot {
             high_bits: (pte >> UAT_HIGH_BITS_SHIFT) as u16,
@@ -167,6 +177,7 @@ impl Prot {
         }
     }
 
+    #[cfg(CONFIG_DEV_COREDUMP)]
     pub(crate) const fn elf_flags(&self) -> u32 {
         let ap = (self.ap & 3) as usize;
         let uxn = if self.high_bits & HIGH_BITS_UXN != 0 {
@@ -221,6 +232,7 @@ impl Default for Prot {
     }
 }
 
+#[cfg(CONFIG_DEV_COREDUMP)]
 pub(crate) struct DumpedPage {
     pub(crate) iova: u64,
     pub(crate) pte: u64,
@@ -541,6 +553,7 @@ impl UatPageTable {
         })
     }
 
+    #[cfg(CONFIG_DEV_COREDUMP)]
     pub(crate) fn dump_pages(&mut self, iova_range: Range<u64>) -> Result<KVVec<DumpedPage>> {
         let mut pages = KVVec::new();
         let oas_mask = self.oas_mask;