drm/vmwgfx: Fix build issues in mksGuestStats discovered by the kernel test robot

Fixes for ARCH
i386
	* printk format specifier warnings
	* inconsistent operand constraints in an ‘asm’ errors
arm64
	* not targeted by the commit being fixed

Reviewed-by: Zack Rusin <zackr@vmware.com>
Fixes: 7a7a933edd6c ("drm/vmwgfx: Introduce VMware mks-guest-stats")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Martin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210615182336.995192-5-zackr@vmware.com
Signed-off-by: Zack Rusin <zackr@vmware.com>

diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig
index a9052fae0bbc21d9428c00eeed936b03e51278ee..c9ce47c448e030462336adf640f6a7a4aa2730c7 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/Kconfig
+++ b/drivers/gpu/drm/vmwgfx/Kconfig
@@ -25,6 +25,7 @@ config DRM_VMWGFX_FBCON
 config DRM_VMWGFX_MKSSTATS
        bool "Enable mksGuestStats instrumentation of vmwgfx by default"
        depends on DRM_VMWGFX
+       depends on X86
        default n
        help
           Choose this option to instrument the kernel driver for mksGuestStats.

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index 74a3f09ad6648644a1050d9c93d322d3726449f6..ed9c7b3a1e0831f3c91bc674061b7fe56d9731e1 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -665,7 +665,7 @@ static inline void hypervisor_ppn_add(PPN64 pfn)
        unsigned long eax, ebx, ecx, edx, si = 0, di = 0;
 
        VMW_PORT(VMW_PORT_CMD_MKSGS_ADD_PPN,
-               pfn, si, di,
+               (unsigned long)pfn, si, di,
                0,
                VMW_HYPERVISOR_MAGIC,
                eax, ebx, ecx, edx, si, di);
@@ -682,7 +682,7 @@ static inline void hypervisor_ppn_remove(PPN64 pfn)
        unsigned long eax, ebx, ecx, edx, si = 0, di = 0;
 
        VMW_PORT(VMW_PORT_CMD_MKSGS_REMOVE_PPN,
-               pfn, si, di,
+               (unsigned long)pfn, si, di,
                0,
                VMW_HYPERVISOR_MAGIC,
                eax, ebx, ecx, edx, si, di);
@@ -1115,7 +1115,7 @@ int vmw_mksstat_add_ioctl(struct drm_device *dev, void *data,
 
        arg->id = slot;
 
-       DRM_DEV_INFO(dev->dev, "pid=%d arg.description='%.*s' id=%lu\n", current->pid, (int)desc_len, pdesc->description, slot);
+       DRM_DEV_INFO(dev->dev, "pid=%d arg.description='%.*s' id=%zu\n", current->pid, (int)desc_len, pdesc->description, slot);
 
        return 0;
 
@@ -1163,7 +1163,7 @@ int vmw_mksstat_remove_ioctl(struct drm_device *dev, void *data,
        if (slot >= ARRAY_SIZE(dev_priv->mksstat_user_pids))
                return -EINVAL;
 
-       DRM_DEV_INFO(dev->dev, "pid=%d arg.id=%lu\n", current->pid, slot);
+       DRM_DEV_INFO(dev->dev, "pid=%d arg.id=%zu\n", current->pid, slot);
 
        pgid = task_pgrp_vnr(current);
        pid = atomic_cmpxchg(&dev_priv->mksstat_user_pids[slot], pgid, MKSSTAT_PID_RESERVED);