GenWQE: Enable access to VPD flash area
Subsystems (2)
PATCH 1/5 GenWQE: Enable access to VPD flash area
In addition to the two flash partitions we used so far, there is a 3rd one which is enabled for usage by this fix.
--- drivers/misc/genwqe/card_dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/misc/genwqe/card_dev.c +5 -1
@@ -531,7 +531,9 @@ static int do_flash_update(struct genwqecase '1' : cmdopts =0x1C ;break ;/* download/erase_first/part_1 */ -case 'v' :/* cmdopts = 0x0c (VPD) */ +case 'v' : + cmdopts =0x0C ; +break ;/* download/erase_first/vpd */ default :return -EINVAL ; }
@@ -665,6 +667,8 @@ static int do_flash_read(struct genwqe_f cmdopts =0x1A ;break ;/* upload/part_1 */ case 'v' : + cmdopts =0x0A ; +break ;/* upload/vpd */ default :return -EINVAL ; }
PATCH 2/5 GenWQE: Add wmb before DDCB is started
Needed to add wmb() before we send the DDCB for execution. Without the syncronizing it failed on System p.
--- drivers/misc/genwqe/card_ddcb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/genwqe/card_ddcb.c +4 -0
@@ -305,6 +305,8 @@ static int enqueue_ddcb(struct genwqe_debreak ; new = (old |DDCB_NEXT_BE32 ); + +wmb (); icrc_hsi_shi =cmpxchg (&prev_ddcb->icrc_hsi_shi_32, old, new);if (icrc_hsi_shi == old)
@@ -314,6 +316,8 @@ static int enqueue_ddcb(struct genwqe_de/* Queue must be re-started by updating QUEUE_OFFSET */ ddcb_mark_tapped (pddcb); num = (u64 )ddcb_no <<8 ; + +wmb ();__genwqe_writeq (cd, queue->IO_QUEUE_OFFSET, num);/* start queue */ return RET_DDCB_TAPPED ;
PATCH 3/5 GenWQE: Ensure rc is not returning an uninitialized value
In reply to Frank HaverkampFrom: Colin Ian King <[email protected]>
rc is not initialized, so genwqe_finish_queue() either returns -EIO or garbage. Fortunately the return is not being checked by any callers, so this has not yet caused any problems. Even so, it makes sense to fix this small bug in case is is checked in future.
--- drivers/misc/genwqe/card_ddcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/genwqe/card_ddcb.c +1 -1
@@ -1310,7 +1310,7 @@ static int queue_wake_up_all(struct genw*/ int genwqe_finish_queue (struct genwqe_dev *cd) { -int i, rc, in_flight; +int i, rc =0 , in_flight;int waitmax = genwqe_ddcb_software_timeout;struct pci_dev *pci_dev = cd->pci_dev;struct ddcb_queue *queue = &cd->queue;
PATCH 4/5 GenWQE: Fix multithreading problems
In reply to Frank HaverkampWhen being used in a multithreaded application there were problems with memory pages/cachelines accessed by multiple threads/cpus at the same time, while doing DMA transfers to/from those. To avoid such situations this fix is creating a copy of the first and the last page if it is not fully used. The data is copied from user-space into those pages and results are copied back when the DDCB-request is successfully finished.
--- drivers/misc/genwqe/card_base.h | 58 ++++++++----- drivers/misc/genwqe/card_dev.c | 38 ++------ drivers/misc/genwqe/card_utils.c | 170 +++++++++++++++++++++++++++++---------- 3 files changed, 180 insertions(+), 86 deletions(-)
drivers/misc/genwqe/card_base.h +39 -19
@@ -337,6 +337,44 @@ enum genwqe_requ_state { };/** +* struct genwqe_sgl - Scatter gather list describing user-space memory +* @sgl: scatter gather list needs to be 128 byte aligned +* @sgl_dma_addr: dma address of sgl +* @sgl_size: size of area used for sgl +* @user_addr: user-space address of memory area +* @user_size: size of user-space memory area +* @page: buffer for partial pages if needed +* @page_dma_addr: dma address partial pages +*/ +struct genwqe_sgl { +dma_addr_t sgl_dma_addr; +struct sg_entry *sgl; +size_t sgl_size;/* size of sgl */ + +void __user *user_addr;/* user-space base-address */ +size_t user_size;/* size of memory area */ + +unsigned long nr_pages; +unsigned long fpage_offs; +size_t fpage_size; +size_t lpage_size; + +void *fpage; +dma_addr_t fpage_dma_addr; + +void *lpage; +dma_addr_t lpage_dma_addr; +}; + +int genwqe_alloc_sync_sgl (struct genwqe_dev *cd,struct genwqe_sgl *sgl, +void __user *user_addr,size_t user_size); + +int genwqe_setup_sgl (struct genwqe_dev *cd,struct genwqe_sgl *sgl, +dma_addr_t *dma_list); + +int genwqe_free_sync_sgl (struct genwqe_dev *cd,struct genwqe_sgl *sgl); + +/** * struct ddcb_requ - Kernel internal representation of the DDCB request * @cmd: User space representation of the DDCB execution request */
@@ -347,9 +385,7 @@ struct ddcb_requ {struct ddcb_queue *queue;/* associated queue */ struct dma_mapping dma_mappings[DDCB_FIXUPS ]; -struct sg_entry *sgl[DDCB_FIXUPS ]; -dma_addr_t sgl_dma_addr[DDCB_FIXUPS ]; -size_t sgl_size[DDCB_FIXUPS ]; +struct genwqe_sgl sgls[DDCB_FIXUPS ];/* kernel/user shared content */ struct genwqe_ddcb_cmd cmd;/* ddcb_no for this request */
@@ -453,22 +489,6 @@ int genwqe_user_vmap(struct genwqe_devint genwqe_user_vunmap (struct genwqe_dev *cd,struct dma_mapping *m,struct ddcb_requ *req); -struct sg_entry *genwqe_alloc_sgl (struct genwqe_dev *cd,int num_pages, -dma_addr_t *dma_addr,size_t *sgl_size); - -void genwqe_free_sgl (struct genwqe_dev *cd,struct sg_entry *sg_list, -dma_addr_t dma_addr,size_t size); - -int genwqe_setup_sgl (struct genwqe_dev *cd, -unsigned long offs, -unsigned long size, -struct sg_entry *sgl,/* genwqe sgl */ -dma_addr_t dma_addr,size_t sgl_size, -dma_addr_t *dma_list,int page_offs,int num_pages); - -int genwqe_check_sgl (struct genwqe_dev *cd,struct sg_entry *sg_list, -int size); -static inline bool dma_mapping_used (struct dma_mapping *m) {if (!m)
drivers/misc/genwqe/card_dev.c +11 -27
@@ -840,15 +840,8 @@ static int ddcb_cmd_cleanup(struct genwq__genwqe_del_mapping (cfile, dma_map);genwqe_user_vunmap (cd, dma_map, req); } -if (req->sgl[i] !=NULL ) { -genwqe_free_sgl (cd, req->sgl[i], - req->sgl_dma_addr[i], - req->sgl_size[i]); - req->sgl[i] =NULL ; - req->sgl_dma_addr[i] =0x0 ; - req->sgl_size[i] =0 ; - } - +if (req->sgls[i].sgl !=NULL ) +genwqe_free_sync_sgl (cd, &req->sgls[i]); }return 0 ; }
@@ -917,7 +910,7 @@ static int ddcb_cmd_fixups(struct genwqecase ATS_TYPE_SGL_RDWR :case ATS_TYPE_SGL_RD : { -int page_offs, nr_pages, offs; +int page_offs; u_addr =be64_to_cpu (*((__be64 *) &cmd->asiv[asiv_offs]));
@@ -955,27 +948,18 @@ static int ddcb_cmd_fixups(struct genwqe page_offs =0 ; } - offs =offset_in_page (u_addr); - nr_pages =DIV_ROUND_UP (offs + u_size,PAGE_SIZE ); -/* create genwqe style scatter gather list */ - req->sgl[i] =genwqe_alloc_sgl (cd, m->nr_pages, - &req->sgl_dma_addr[i], - &req->sgl_size[i]); -if (req->sgl[i] ==NULL ) { - rc = -ENOMEM ; + rc =genwqe_alloc_sync_sgl (cd, &req->sgls[i], + (void __user *)u_addr, + u_size); +if (rc !=0 ) goto err_out; - } -genwqe_setup_sgl (cd, offs, u_size, - req->sgl[i], - req->sgl_dma_addr[i], - req->sgl_size[i], - m->dma_list, - page_offs, - nr_pages); + +genwqe_setup_sgl (cd, &req->sgls[i], + &m->dma_list[page_offs]); *((__be64 *)&cmd->asiv[asiv_offs]) = -cpu_to_be64 (req->sgl_dma_addr[i]); +cpu_to_be64 (req->sgls[i].sgl_dma_addr);break ; }
drivers/misc/genwqe/card_utils.c +130 -40
228 lines not on this page · raw message
PATCH 5/5 GenWQE: Increase driver version number
In reply to Frank HaverkampIncrease genwqe driver version number.
--- drivers/misc/genwqe/genwqe_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/genwqe/genwqe_driver.h +1 -1
@@ -36,7 +36,7 @@#include <asm/byteorder.h> #include <linux/genwqe/genwqe_card.h> -#define DRV_VERS_STRING "2.0.0" +#define DRV_VERS_STRING "2.0.15"/* * Static minor number assignement, until we decide/implement