diff --git a/include/linux/kfd_ioctl.h b/include/linux/kfd_ioctl.h
index 7acef41fc2..af94f31e33 100644
--- a/include/linux/kfd_ioctl.h
+++ b/include/linux/kfd_ioctl.h
@@ -128,27 +128,34 @@ struct kfd_ioctl_get_process_apertures_args {
 	uint32_t pad;
 };
 
-#define KFD_IOC_MAGIC 'K'
+#define AMDKFD_IOCTL_BASE 'K'
+#define AMDKFD_IO(nr)			_IO(AMDKFD_IOCTL_BASE, nr)
+#define AMDKFD_IOR(nr, type)		_IOR(AMDKFD_IOCTL_BASE, nr, type)
+#define AMDKFD_IOW(nr, type)		_IOW(AMDKFD_IOCTL_BASE, nr, type)
+#define AMDKFD_IOWR(nr, type)		_IOWR(AMDKFD_IOCTL_BASE, nr, type)
 
-#define KFD_IOC_GET_VERSION \
-		_IOR(KFD_IOC_MAGIC, 1, struct kfd_ioctl_get_version_args)
+#define AMDKFD_IOC_GET_VERSION			\
+		AMDKFD_IOR(0x01, struct kfd_ioctl_get_version_args)
 
-#define KFD_IOC_CREATE_QUEUE \
-		_IOWR(KFD_IOC_MAGIC, 2, struct kfd_ioctl_create_queue_args)
+#define AMDKFD_IOC_CREATE_QUEUE			\
+		AMDKFD_IOWR(0x02, struct kfd_ioctl_create_queue_args)
 
-#define KFD_IOC_DESTROY_QUEUE \
-	_IOWR(KFD_IOC_MAGIC, 3, struct kfd_ioctl_destroy_queue_args)
+#define AMDKFD_IOC_DESTROY_QUEUE		\
+		AMDKFD_IOWR(0x03, struct kfd_ioctl_destroy_queue_args)
 
-#define KFD_IOC_SET_MEMORY_POLICY \
-	_IOW(KFD_IOC_MAGIC, 4, struct kfd_ioctl_set_memory_policy_args)
+#define AMDKFD_IOC_SET_MEMORY_POLICY		\
+		AMDKFD_IOW(0x04, struct kfd_ioctl_set_memory_policy_args)
 
-#define KFD_IOC_GET_CLOCK_COUNTERS \
-	_IOWR(KFD_IOC_MAGIC, 5, struct kfd_ioctl_get_clock_counters_args)
+#define AMDKFD_IOC_GET_CLOCK_COUNTERS		\
+		AMDKFD_IOWR(0x05, struct kfd_ioctl_get_clock_counters_args)
 
-#define KFD_IOC_GET_PROCESS_APERTURES \
-	_IOR(KFD_IOC_MAGIC, 6, struct kfd_ioctl_get_process_apertures_args)
+#define AMDKFD_IOC_GET_PROCESS_APERTURES	\
+		AMDKFD_IOR(0x06, struct kfd_ioctl_get_process_apertures_args)
 
-#define KFD_IOC_UPDATE_QUEUE \
-	_IOW(KFD_IOC_MAGIC, 7, struct kfd_ioctl_update_queue_args)
+#define AMDKFD_IOC_UPDATE_QUEUE			\
+		AMDKFD_IOW(0x07, struct kfd_ioctl_update_queue_args)
+
+#define AMDKFD_COMMAND_START		0x01
+#define AMDKFD_COMMAND_END		0x08
 
 #endif
diff --git a/src/fmm.c b/src/fmm.c
index 4edbb3096b..a274c32090 100644
--- a/src/fmm.c
+++ b/src/fmm.c
@@ -446,7 +446,7 @@ HSAKMT_STATUS fmm_init_process_apertures(){
 	struct kfd_ioctl_get_process_apertures_args args;
 	uint8_t node_id;
 
-	if (0 == kfd_ioctl(KFD_IOC_GET_PROCESS_APERTURES, (void*)&args)){
+	if (0 == kfd_ioctl(AMDKFD_IOC_GET_PROCESS_APERTURES, (void*)&args)){
 		for(node_id = 0; node_id < args.num_of_nodes; node_id++){
 			gpu_mem[node_id].gpu_id = args.process_apertures[node_id].gpu_id;
 			gpu_mem[node_id].lds_aperture.base = PORT_UINT64_TO_VPTR(args.process_apertures[node_id].lds_base);
diff --git a/src/memory.c b/src/memory.c
index 37cb88f1ef..0b73b5260d 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -68,7 +68,7 @@ hsaKmtSetMemoryPolicy(
 	args.alternate_aperture_base = (uintptr_t)MemoryAddressAlternate;
 	args.alternate_aperture_size = MemorySizeInBytes;
 
-	int err = kfd_ioctl(KFD_IOC_SET_MEMORY_POLICY, &args);
+	int err = kfd_ioctl(AMDKFD_IOC_SET_MEMORY_POLICY, &args);
 
 	return (err == -1) ? HSAKMT_STATUS_ERROR : HSAKMT_STATUS_SUCCESS;
 }
diff --git a/src/queues.c b/src/queues.c
index 1292b2034a..be250a2502 100644
--- a/src/queues.c
+++ b/src/queues.c
@@ -107,7 +107,7 @@ hsaKmtCreateQueue(
 	args.queue_percentage = QueuePercentage;
 	args.queue_priority = Priority;
 
-	err = kfd_ioctl(KFD_IOC_CREATE_QUEUE, &args);
+	err = kfd_ioctl(AMDKFD_IOC_CREATE_QUEUE, &args);
 
 	if (err == -1)
 	{
@@ -166,7 +166,7 @@ hsaKmtUpdateQueue(
 	arg.queue_percentage = QueuePercentage;
 	arg.queue_priority = Priority;
 
-	int err = kfd_ioctl(KFD_IOC_UPDATE_QUEUE, &arg);
+	int err = kfd_ioctl(AMDKFD_IOC_UPDATE_QUEUE, &arg);
 	if (err == -1)
 	{
 		return HSAKMT_STATUS_ERROR;
@@ -193,7 +193,7 @@ hsaKmtDestroyQueue(
 
 	args.queue_id = q->queue_id;
 
-	int err = kfd_ioctl(KFD_IOC_DESTROY_QUEUE, &args);
+	int err = kfd_ioctl(AMDKFD_IOC_DESTROY_QUEUE, &args);
 
 	if (err == -1)
 	{
diff --git a/src/time.c b/src/time.c
index 91c1a1209b..37e070d102 100644
--- a/src/time.c
+++ b/src/time.c
@@ -46,7 +46,7 @@ hsaKmtGetClockCounters(
 
 	args.gpu_id = gpu_id;
 
-	err = kfd_ioctl(KFD_IOC_GET_CLOCK_COUNTERS, &args);
+	err = kfd_ioctl(AMDKFD_IOC_GET_CLOCK_COUNTERS, &args);
 	if (err < 0) {
 		result = HSAKMT_STATUS_ERROR;
 	} else {
diff --git a/src/version.c b/src/version.c
index 7d927c2dc3..8908b1793e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -39,7 +39,7 @@ hsaKmtGetVersion(
 	struct kfd_ioctl_get_version_args args;
 	memset(&args, 0, sizeof(args));
 
-	if (kfd_ioctl(KFD_IOC_GET_VERSION, &args) == -1)
+	if (kfd_ioctl(AMDKFD_IOC_GET_VERSION, &args) == -1)
 		return HSAKMT_STATUS_ERROR;
 
 	VersionInfo->KernelInterfaceMajorVersion = args.major_version;