From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932246AbbE1MJ0 (ORCPT ); Thu, 28 May 2015 08:09:26 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:33017 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932098AbbE1MH6 (ORCPT ); Thu, 28 May 2015 08:07:58 -0400 From: Dmitry Kalinkin To: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Cc: Martyn Welch , Manohar Vanga , Greg Kroah-Hartman , Igor Alekseev , Dmitry Kalinkin Subject: [PATCHv3 16/16] vme: provide uapi header Date: Thu, 28 May 2015 15:07:13 +0300 Message-Id: <1432814833-5320-17-git-send-email-dmitry.kalinkin@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1432814833-5320-1-git-send-email-dmitry.kalinkin@gmail.com> References: <1432814833-5320-1-git-send-email-dmitry.kalinkin@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This separates VME related constants that are a part of both kernel and user space API into a common uapi header. Signed-off-by: Dmitry Kalinkin Cc: Igor Alekseev --- include/linux/vme.h | 54 ++------------------------------------------- include/uapi/linux/Kbuild | 1 + include/uapi/linux/vme.h | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 52 deletions(-) create mode 100644 include/uapi/linux/vme.h diff --git a/include/linux/vme.h b/include/linux/vme.h index c013135..ecfd389 100644 --- a/include/linux/vme.h +++ b/include/linux/vme.h @@ -1,6 +1,8 @@ #ifndef _VME_H_ #define _VME_H_ +#include + /* Resource Type */ enum vme_resource_type { VME_MASTER, @@ -9,47 +11,6 @@ enum vme_resource_type { VME_LM }; -/* VME Address Spaces */ -#define VME_A16 0x1 -#define VME_A24 0x2 -#define VME_A32 0x4 -#define VME_A64 0x8 -#define VME_CRCSR 0x10 -#define VME_USER1 0x20 -#define VME_USER2 0x40 -#define VME_USER3 0x80 -#define VME_USER4 0x100 - -#define VME_A16_MAX 0x10000ULL -#define VME_A24_MAX 0x1000000ULL -#define VME_A32_MAX 0x100000000ULL -#define VME_A64_MAX 0x10000000000000000ULL -#define VME_CRCSR_MAX 0x1000000ULL - - -/* VME Cycle Types */ -#define VME_SCT 0x1 -#define VME_BLT 0x2 -#define VME_MBLT 0x4 -#define VME_2eVME 0x8 -#define VME_2eSST 0x10 -#define VME_2eSSTB 0x20 - -#define VME_2eSST160 0x100 -#define VME_2eSST267 0x200 -#define VME_2eSST320 0x400 - -#define VME_SUPER 0x1000 -#define VME_USER 0x2000 -#define VME_PROG 0x4000 -#define VME_DATA 0x8000 - -/* VME Data Widths */ -#define VME_D8 0x1 -#define VME_D16 0x2 -#define VME_D32 0x4 -#define VME_D64 0x8 - /* Arbitration Scheduling Modes */ #define VME_R_ROBIN_MODE 0x1 #define VME_PRIORITY_MODE 0x2 @@ -58,17 +19,6 @@ enum vme_resource_type { #define VME_DMA_PCI (1<<1) #define VME_DMA_VME (1<<2) -#define VME_DMA_PATTERN_BYTE (1<<0) -#define VME_DMA_PATTERN_WORD (1<<1) -#define VME_DMA_PATTERN_INCREMENT (1<<2) - -#define VME_DMA_VME_TO_MEM (1<<0) -#define VME_DMA_MEM_TO_VME (1<<1) -#define VME_DMA_VME_TO_VME (1<<2) -#define VME_DMA_MEM_TO_MEM (1<<3) -#define VME_DMA_PATTERN_TO_VME (1<<4) -#define VME_DMA_PATTERN_TO_MEM (1<<5) - struct vme_dma_attr { u32 type; void *private; diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1a0006a..ad25e3f 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -439,6 +439,7 @@ header-y += virtio_rng.h header-y += virtio_scsi.h header-y += virtio_types.h header-y += vm_sockets.h +header-y += vme.h header-y += vt.h header-y += wait.h header-y += wanrouter.h diff --git a/include/uapi/linux/vme.h b/include/uapi/linux/vme.h new file mode 100644 index 0000000..3dbf8b0 --- /dev/null +++ b/include/uapi/linux/vme.h @@ -0,0 +1,56 @@ +#ifndef _UAPI_LINUX_VME +#define _UAPI_LINUX_VME + +/* VME Address Spaces */ +#define VME_A16 0x1 +#define VME_A24 0x2 +#define VME_A32 0x4 +#define VME_A64 0x8 +#define VME_CRCSR 0x10 +#define VME_USER1 0x20 +#define VME_USER2 0x40 +#define VME_USER3 0x80 +#define VME_USER4 0x100 + +#define VME_A16_MAX 0x10000ULL +#define VME_A24_MAX 0x1000000ULL +#define VME_A32_MAX 0x100000000ULL +#define VME_A64_MAX 0x10000000000000000ULL +#define VME_CRCSR_MAX 0x1000000ULL + +/* VME Cycle Types */ +#define VME_SCT 0x1 +#define VME_BLT 0x2 +#define VME_MBLT 0x4 +#define VME_2eVME 0x8 +#define VME_2eSST 0x10 +#define VME_2eSSTB 0x20 + +#define VME_2eSST160 0x100 +#define VME_2eSST267 0x200 +#define VME_2eSST320 0x400 + +#define VME_SUPER 0x1000 +#define VME_USER 0x2000 +#define VME_PROG 0x4000 +#define VME_DATA 0x8000 + +/* VME Data Widths */ +#define VME_D8 0x1 +#define VME_D16 0x2 +#define VME_D32 0x4 +#define VME_D64 0x8 + +/* VME Transfer Directions */ +#define VME_DMA_VME_TO_MEM (1 << 0) +#define VME_DMA_MEM_TO_VME (1 << 1) +#define VME_DMA_VME_TO_VME (1 << 2) +#define VME_DMA_MEM_TO_MEM (1 << 3) +#define VME_DMA_PATTERN_TO_VME (1 << 4) +#define VME_DMA_PATTERN_TO_MEM (1 << 5) + +#define VME_DMA_PATTERN_BYTE (1 << 0) +#define VME_DMA_PATTERN_WORD (1 << 1) +#define VME_DMA_PATTERN_INCREMENT (1 << 2) + +#endif -- 1.8.3.1