From cc960978731c903ddfb9300b7af949d2671d88f2 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 25 May 2016 10:45:00 -0600 Subject: [PATCH] btl/ugni: fix bug when attempting unaligned get on aries This commit fixes a programming error when using an aries nic. The documentation of ugni shows that only the local alignment restriction for get was lifted on aries. There is still a remote address alignment restriction. Signed-off-by: Nathan Hjelm --- opal/mca/btl/ugni/btl_ugni_component.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/opal/mca/btl/ugni/btl_ugni_component.c b/opal/mca/btl/ugni/btl_ugni_component.c index aa27bb97e5..e59918ee84 100644 --- a/opal/mca/btl/ugni/btl_ugni_component.c +++ b/opal/mca/btl/ugni/btl_ugni_component.c @@ -275,11 +275,8 @@ btl_ugni_component_register(void) /* * see def. of ALIGNMENT_MASK to figure this one out */ - if (GNI_DEVICE_GEMINI == device_type) { - mca_btl_ugni_module.super.btl_get_alignment = 4; - } else { - mca_btl_ugni_module.super.btl_get_alignment = 0; - } + /* both gemini and aries have a 4-byte alignment requirement on remote addresses */ + mca_btl_ugni_module.super.btl_get_alignment = 4; /* threshold for put */ mca_btl_ugni_module.super.btl_min_rdma_pipeline_size = 8 * 1024;