ALSA: ctxfi - Remove PAGE_SIZE limitation

Remove the limitation of PAGE_SIZE to be 4k by defining the own
page size and macros for 4k.  8kb page size could be natively supported,
but it's disabled right now for simplicity.

Also, clean up using upper_32_bits() macro.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 6 insertions, 10 deletions

diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 44283bd7b2df..b7b8e6f41d0d 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1249,19 +1249,15 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
         }
 
         trnctl = 0x13;  /* 32-bit, 4k-size page */
-#if BITS_PER_LONG == 64
-        ptp_phys_low = info->vm_pgt_phys & ((1UL<<32)-1);
-        ptp_phys_high = (info->vm_pgt_phys>>32) & ((1UL<<32)-1);
-        trnctl |= (1<<2);
-#elif BITS_PER_LONG == 32
-        ptp_phys_low = info->vm_pgt_phys & (~0UL);
-        ptp_phys_high = 0;
-#else
-#       error "Unknown BITS_PER_LONG!"
-#endif
+        ptp_phys_low = (u32)info->vm_pgt_phys;
+        ptp_phys_high = upper_32_bits(info->vm_pgt_phys);
+        if (sizeof(void *) == 8) /* 64bit address */
+                trnctl |= (1 << 2);
+#if 0 /* Only 4k h/w pages for simplicitiy */
 #if PAGE_SIZE == 8192
         trnctl |= (1<<5);
 #endif
+#endif
         hw_write_20kx(hw, PTPALX, ptp_phys_low);
         hw_write_20kx(hw, PTPAHX, ptp_phys_high);
         hw_write_20kx(hw, TRNCTL, trnctl);