Keep a local copy of UAPI header file
ramesh.thomas at intel.com
cover Keep a local copy of UAPI header file
From: Ramesh Thomas <ramesh.thomas(a)intel.com>
Use a local copy of the UAPI header file to avoid dependency on kernel version in build system.
Ramesh Thomas (2):
accel-config: Duplicate the UAPI header file locally
accel-config: Change path of idxd.h to local copy
accfg/idxd.h | 325 +++++++++++++++++++++++++++++++++++++++++++ accfg/lib/libaccfg.c | 2 +- test/dsa.c | 2 +- test/dsa.h | 2 +- test/libaccfg.c | 2 +- test/prep.c | 2 +- 6 files changed, 330 insertions(+), 5 deletions(-) create mode 100644 accfg/idxd.h
Signature · 1 line
2.26.3
ramesh.thomas at intel.com
PATCH 1/2 accel-config: Duplicate the UAPI header file locally
From: Ramesh Thomas <ramesh.thomas(a)intel.com>
Keep a copy of the UAPI header file idxd.h locally to avoid dependency on the kernel version of build systems.
--- accfg/idxd.h | 325 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 325 insertions(+) create mode 100644 accfg/idxd.h
accfg/idxd.h new file +325 -0
@@ -0,0 +1,325 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ +/* Copyright(c) 2019 Intel Corporation. All rights reserved. */ + +#ifndef _USR_IDXD_H_ +#define _USR_IDXD_H_ + +#include <stdint.h> + +/* Driver command error status */ +enum idxd_scmd_stat { +IDXD_SCMD_DEV_ENABLED =0x80000010 , +IDXD_SCMD_DEV_NOT_ENABLED =0x80000020 , +IDXD_SCMD_WQ_ENABLED =0x80000021 , +IDXD_SCMD_DEV_DMA_ERR =0x80020000 , +IDXD_SCMD_WQ_NO_GRP =0x80030000 , +IDXD_SCMD_WQ_NO_NAME =0x80040000 , +IDXD_SCMD_WQ_NO_SVM =0x80050000 , +IDXD_SCMD_WQ_NO_THRESH =0x80060000 , +IDXD_SCMD_WQ_PORTAL_ERR =0x80070000 , +IDXD_SCMD_WQ_RES_ALLOC_ERR =0x80080000 , +IDXD_SCMD_PERCPU_ERR =0x80090000 , +IDXD_SCMD_DMA_CHAN_ERR =0x800a0000 , +IDXD_SCMD_CDEV_ERR =0x800b0000 , +IDXD_SCMD_WQ_NO_SWQ_SUPPORT =0x800c0000 , +IDXD_SCMD_WQ_NONE_CONFIGURED =0x800d0000 , +IDXD_SCMD_WQ_NO_SIZE =0x800e0000 , +}; + +#define IDXD_SCMD_SOFTERR_MASK 0x80000000 +#define IDXD_SCMD_SOFTERR_SHIFT 16 + +/* Descriptor flags */ +#define IDXD_OP_FLAG_FENCE 0x0001 +#define IDXD_OP_FLAG_BOF 0x0002 +#define IDXD_OP_FLAG_CRAV 0x0004 +#define IDXD_OP_FLAG_RCR 0x0008 +#define IDXD_OP_FLAG_RCI 0x0010 +#define IDXD_OP_FLAG_CRSTS 0x0020 +#define IDXD_OP_FLAG_CR 0x0080 +#define IDXD_OP_FLAG_CC 0x0100 +#define IDXD_OP_FLAG_ADDR1_TCS 0x0200 +#define IDXD_OP_FLAG_ADDR2_TCS 0x0400 +#define IDXD_OP_FLAG_ADDR3_TCS 0x0800 +#define IDXD_OP_FLAG_CR_TCS 0x1000 +#define IDXD_OP_FLAG_STORD 0x2000 +#define IDXD_OP_FLAG_DRDBK 0x4000 +#define IDXD_OP_FLAG_DSTS 0x8000 + +/* IAX */ +#define IDXD_OP_FLAG_RD_SRC2_AECS 0x010000 + +/* Opcode */ +enum dsa_opcode { +DSA_OPCODE_NOOP =0 , +DSA_OPCODE_BATCH , +DSA_OPCODE_DRAIN , +DSA_OPCODE_MEMMOVE , +DSA_OPCODE_MEMFILL , +DSA_OPCODE_COMPARE , +DSA_OPCODE_COMPVAL , +DSA_OPCODE_CR_DELTA , +DSA_OPCODE_AP_DELTA , +DSA_OPCODE_DUALCAST , +DSA_OPCODE_CRCGEN =0x10 , +DSA_OPCODE_COPY_CRC , +DSA_OPCODE_DIF_CHECK , +DSA_OPCODE_DIF_INS , +DSA_OPCODE_DIF_STRP , +DSA_OPCODE_DIF_UPDT , +DSA_OPCODE_CFLUSH =0x20 , +}; + +enum iax_opcode { +IAX_OPCODE_NOOP =0 , +IAX_OPCODE_DRAIN =2 , +IAX_OPCODE_MEMMOVE , +IAX_OPCODE_DECOMPRESS =0x42 , +IAX_OPCODE_COMPRESS , +}; + +/* Completion record status */ +enum dsa_completion_status { +DSA_COMP_NONE =0 , +DSA_COMP_SUCCESS , +DSA_COMP_SUCCESS_PRED , +DSA_COMP_PAGE_FAULT_NOBOF , +DSA_COMP_PAGE_FAULT_IR , +DSA_COMP_BATCH_FAIL , +DSA_COMP_BATCH_PAGE_FAULT , +DSA_COMP_DR_OFFSET_NOINC , +DSA_COMP_DR_OFFSET_ERANGE , +DSA_COMP_DIF_ERR , +DSA_COMP_BAD_OPCODE =0x10 , +DSA_COMP_INVALID_FLAGS , +DSA_COMP_NOZERO_RESERVE , +DSA_COMP_XFER_ERANGE , +DSA_COMP_DESC_CNT_ERANGE , +DSA_COMP_DR_ERANGE , +DSA_COMP_OVERLAP_BUFFERS , +DSA_COMP_DCAST_ERR , +DSA_COMP_DESCLIST_ALIGN , +DSA_COMP_INT_HANDLE_INVAL , +DSA_COMP_CRA_XLAT , +DSA_COMP_CRA_ALIGN , +DSA_COMP_ADDR_ALIGN , +DSA_COMP_PRIV_BAD , +DSA_COMP_TRAFFIC_CLASS_CONF , +DSA_COMP_PFAULT_RDBA , +DSA_COMP_HW_ERR1 , +DSA_COMP_HW_ERR_DRB , +DSA_COMP_TRANSLATION_FAIL , +}; + +enum iax_completion_status { +IAX_COMP_NONE =0 , +IAX_COMP_SUCCESS , +IAX_COMP_PAGE_FAULT_IR =0x04 , +IAX_COMP_OUTBUF_OVERFLOW , +IAX_COMP_BAD_OPCODE =0x10 , +IAX_COMP_INVALID_FLAGS , +IAX_COMP_NOZERO_RESERVE , +IAX_COMP_INVALID_SIZE , +IAX_COMP_OVERLAP_BUFFERS =0x16 , +IAX_COMP_INT_HANDLE_INVAL =0x19 , +IAX_COMP_CRA_XLAT , +IAX_COMP_CRA_ALIGN , +IAX_COMP_ADDR_ALIGN , +IAX_COMP_PRIV_BAD , +IAX_COMP_TRAFFIC_CLASS_CONF , +IAX_COMP_PFAULT_RDBA , +IAX_COMP_HW_ERR1 , +IAX_COMP_HW_ERR_DRB , +IAX_COMP_TRANSLATION_FAIL , +IAX_COMP_PRS_TIMEOUT , +IAX_COMP_WATCHDOG , +IAX_COMP_INVALID_COMP_FLAG =0x30 , +IAX_COMP_INVALID_FILTER_FLAG , +IAX_COMP_INVALID_NUM_ELEMS =0x33 , +}; + +#define DSA_COMP_STATUS_MASK 0x7f +#define DSA_COMP_STATUS_WRITE 0x80 + +struct dsa_hw_desc { +uint32_t pasid:20 ; +uint32_t rsvd:11 ; +uint32_t priv:1 ; +uint32_t flags:24 ; +uint32_t opcode:8 ; +uint64_t completion_addr; +union { +uint64_t src_addr; +uint64_t rdback_addr; +uint64_t pattern; +uint64_t desc_list_addr; + }; +union { +uint64_t dst_addr; +uint64_t rdback_addr2; +uint64_t src2_addr; +uint64_t comp_pattern; + }; +union { +uint32_t xfer_size; +uint32_t desc_count; + }; +uint16_t int_handle; +uint16_t rsvd1; +union { +uint8_t expected_res; +/* create delta record */ +struct { +uint64_t delta_addr; +uint32_t max_delta_size; +uint32_t delt_rsvd; +uint8_t expected_res_mask; + }; +uint32_t delta_rec_size; +uint64_t dest2; +/* CRC */ +struct { +uint32_t crc_seed; +uint32_t crc_rsvd; +uint64_t seed_addr; + }; +/* DIF check or strip */ +struct { +uint8_t src_dif_flags; +uint8_t dif_chk_res; +uint8_t dif_chk_flags; +uint8_t dif_chk_res2[5 ]; +uint32_t chk_ref_tag_seed; +uint16_t chk_app_tag_mask; +uint16_t chk_app_tag_seed; + }; +/* DIF insert */ +struct { +uint8_t dif_ins_res; +uint8_t dest_dif_flag; +uint8_t dif_ins_flags; +uint8_t dif_ins_res2[13 ]; +uint32_t ins_ref_tag_seed; +uint16_t ins_app_tag_mask; +uint16_t ins_app_tag_seed; + }; +/* DIF update */ +struct { +uint8_t src_upd_flags; +uint8_t upd_dest_flags; +uint8_t dif_upd_flags; +uint8_t dif_upd_res[5 ]; +uint32_t src_ref_tag_seed; +uint16_t src_app_tag_mask; +uint16_t src_app_tag_seed; +uint32_t dest_ref_tag_seed; +uint16_t dest_app_tag_mask; +uint16_t dest_app_tag_seed; + }; + +uint8_t op_specific[24 ]; + }; +} __attribute__((packed)); + +struct iax_hw_desc { +uint32_t pasid:20 ; +uint32_t rsvd:11 ; +uint32_t priv:1 ; +uint32_t flags:24 ; +uint32_t opcode:8 ; +uint64_t completion_addr; +uint64_t src1_addr; +uint64_t dst_addr; +uint32_t src1_size; +uint16_t int_handle; +union { +uint16_t compr_flags; +uint16_t decompr_flags; + }; +uint64_t src2_addr; +uint32_t max_dst_size; +uint32_t src2_size; +uint32_t filter_flags; +uint32_t num_inputs; +} __attribute__((packed)); + +struct dsa_raw_desc { +uint64_t field[8 ]; +} __attribute__((packed)); + +/* +* The status field will be modified by hardware, therefore it should be +* __volatile__ and prevent the compiler from optimize the read. +*/ +struct dsa_completion_record { + __volatile__ uint8_t status; +union { +uint8_t result; +uint8_t dif_status; + }; +uint16_t rsvd; +uint32_t bytes_completed; +uint64_t fault_addr; +union { +/* common record */ +struct { +uint32_t invalid_flags:24 ; +uint32_t rsvd2:8 ; + }; + +uint32_t delta_rec_size; +uint32_t crc_val; + +/* DIF check & strip */ +struct { +uint32_t dif_chk_ref_tag; +uint16_t dif_chk_app_tag_mask; +uint16_t dif_chk_app_tag; + }; + +/* DIF insert */ +struct { +uint64_t dif_ins_res; +uint32_t dif_ins_ref_tag; +uint16_t dif_ins_app_tag_mask; +uint16_t dif_ins_app_tag; + }; + +/* DIF update */ +struct { +uint32_t dif_upd_src_ref_tag; +uint16_t dif_upd_src_app_tag_mask; +uint16_t dif_upd_src_app_tag; +uint32_t dif_upd_dest_ref_tag; +uint16_t dif_upd_dest_app_tag_mask; +uint16_t dif_upd_dest_app_tag; + }; + +uint8_t op_specific[16 ]; + }; +} __attribute__((packed)); + +struct dsa_raw_completion_record { +uint64_t field[4 ]; +} __attribute__((packed)); + +struct iax_completion_record { + __volatile__ uint8_t status; +uint8_t error_code; +uint16_t rsvd; +uint32_t bytes_completed; +uint64_t fault_addr; +uint32_t invalid_flags; +uint32_t rsvd2; +uint32_t output_size; +uint8_t output_bits; +uint8_t rsvd3; +uint16_t rsvd4; +uint64_t rsvd5[4 ]; +} __attribute__((packed)); + +struct iax_raw_completion_record { +uint64_t field[8 ]; +} __attribute__((packed)); + +#endif
Signature · 1 line
2.26.3
ramesh.thomas at intel.com
PATCH 2/2 accel-config: Change path of idxd.h to local copy
In reply to ramesh.thomas at intel.comFrom: Ramesh Thomas <ramesh.thomas(a)intel.com>
Change path of idxd.h includes from /usr/include to accfg.
--- accfg/lib/libaccfg.c | 2 +- test/dsa.c | 2 +- test/dsa.h | 2 +- test/libaccfg.c | 2 +- test/prep.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
accfg/lib/libaccfg.c +1 -1
@@ -27,7 +27,7 @@#include <accfg/libaccel_config.h> #include <fnmatch.h> #include "private.h" -#include <linux/idxd.h> +#include <accfg/idxd.h> #define MDEV_POSTFIX "mdev_supported_types"#define IDXD_DRIVER_BIND_PATH "/sys/bus/dsa/drivers/idxd"
test/dsa.c +1 -1
@@ -13,7 +13,7 @@#include <sys/mman.h> #include <linux/vfio.h> #include <accfg/libaccel_config.h> -#include <linux/idxd.h> +#include <accfg/idxd.h> #include "dsa.h" #define DSA_COMPL_RING_SIZE 64
test/dsa.h +1 -1
@@ -3,7 +3,7 @@#ifndef __TEST_DSA_H__#define __TEST_DSA_H__#include <accfg/libaccel_config.h> -#include <linux/idxd.h> +#include <accfg/idxd.h> #include "accfg_test.h" #define MAX_PATH_LENGTH 1024
test/libaccfg.c +1 -1
@@ -27,7 +27,7 @@#include <ccan/array_size/array_size.h> #include <accfg/libaccel_config.h> #include <test.h> -#include <linux/idxd.h> +#include <accfg/idxd.h> #include <util/log.h> #include "accfg_test.h"
test/prep.c +1 -1
@@ -5,7 +5,7 @@#include <string.h> #include <stdlib.h> #include <unistd.h> -#include <linux/idxd.h> +#include <accfg/idxd.h> #include "dsa.h" void dsa_prep_desc_common(struct dsa_hw_desc *hw, char opcode,
Signature · 1 line
2.26.3
Dave Jiang
Reviewed-by on the v1 seriesQuoted 9 lines · ramesh.thomas(a)intel.com
From: Ramesh Thomas <ramesh.thomas(a)intel.com>
Use a local copy of the UAPI header file to avoid dependency on kernel version in build system.
Ramesh Thomas (2):
accel-config: Duplicate the UAPI header file locally
accel-config: Change path ofidxd.hto local copy
Quoted 8 lines
accfg/idxd.h | 325 +++++++++++++++++++++++++++++++++++++++++++ accfg/lib/libaccfg.c | 2 +- test/dsa.c | 2 +- test/dsa.h | 2 +- test/libaccfg.c | 2 +- test/prep.c | 2 +- 6 files changed, 330 insertions(+), 5 deletions(-)create mode 100644
accfg/idxd.h
LGTM as long as legal stuff sorts out.