Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df17bfd4 authored by Hoang-Nam Nguyen's avatar Hoang-Nam Nguyen Committed by Roland Dreier
Browse files

IB/ehca: MR/MW structure refactoring 



- Rename struct ehca_mr fields to clearly distinguish between kernel
  and HW page size.
- Sort struct ehca_mr_pginfo into a common part and a union containing
  specific fields for physical, user and fast MR

Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 2492398e

drivers/infiniband/hw/ehca/ehca_classes.h

+25 −25
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ struct ehca_mr { 
	spinlock_t mrlock;



	enum ehca_mr_flag flags;

	u32 num_pages;		/* number of MR pages */

	u32 num_4k;		/* number of 4k "page" portions to form MR */

	u32 num_kpages;		/* number of kernel pages */

	u32 num_hwpages;	/* number of hw pages to form MR */

	int acl;		/* ACL (stored here for usage in reregister) */

	u64 *start;		/* virtual start address (stored here for */

	                        /* usage in reregister) */
@@ -217,9 +217,6 @@ struct ehca_mr { 
	/* fw specific data */

	struct ipz_mrmw_handle ipz_mr_handle;	/* MR handle for h-calls */

	struct h_galpas galpas;

	/* data for userspace bridge */

	u32 nr_of_pages;

	void *pagearray;

};



struct ehca_mw {
@@ -241,26 +238,29 @@ enum ehca_mr_pgi_type { 


struct ehca_mr_pginfo {

	enum ehca_mr_pgi_type type;

	u64 num_pages;

	u64 page_cnt;

	u64 num_4k;       /* number of 4k "page" portions */

	u64 page_4k_cnt;  /* counter for 4k "page" portions */

	u64 next_4k;      /* next 4k "page" portion in buffer/chunk/listelem */

	u64 num_kpages;

	u64 kpage_cnt;

	u64 num_hwpages;     /* number of hw pages */

	u64 hwpage_cnt;      /* counter for hw pages */

	u64 next_hwpage;     /* next hw page in buffer/chunk/listelem */



	/* type EHCA_MR_PGI_PHYS section */

	union {

		struct { /* type EHCA_MR_PGI_PHYS section */

			int num_phys_buf;

			struct ib_phys_buf *phys_buf_array;

			u64 next_buf;



	/* type EHCA_MR_PGI_USER section */

		} phy;

		struct { /* type EHCA_MR_PGI_USER section */

			struct ib_umem *region;

			struct ib_umem_chunk *next_chunk;

			u64 next_nmap;



	/* type EHCA_MR_PGI_FMR section */

		} usr;

		struct { /* type EHCA_MR_PGI_FMR section */

			u64 fmr_pgsize;

			u64 *page_list;

			u64 next_listelem;

	/* next_4k also used within EHCA_MR_PGI_FMR */

		} fmr;

	} u;

};



/* output parameters for MR/FMR hipz calls */

drivers/infiniband/hw/ehca/ehca_mrmw.c

+259 −252

File changed.

Preview size limit exceeded, changes collapsed.