All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][MINOR] mstflint/hca_self_test.ofed: Handle lspci output for ConnectX3 (on RHEL 6.2)
@ 2012-07-12 14:39 Lloyd Brown
       [not found] ` <1342103987-9341-1-git-send-email-lloyd_brown-8Bzd4dk9+oo@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Lloyd Brown @ 2012-07-12 14:39 UTC (permalink / raw)
  To: Oren Kladnitsky; +Cc: Lloyd Brown, linux-rdma-u79uwXL29TY76Z2rM5mHXA

Not sure whether the difference is the hardware,
or the OS revision, but the lspci output looks
like this example, and wasn't being caught:

02:00.0 Network controller [0207]: Mellanox Technologies MT27500 Family [ConnectX-3]

Signed-off-by: Lloyd Brown <lloyd_brown-8Bzd4dk9+oo@public.gmane.org>
---
 hca_self_test.ofed |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hca_self_test.ofed b/hca_self_test.ofed
index c3e3f22..3c5360d 100755
--- a/hca_self_test.ofed
+++ b/hca_self_test.ofed
@@ -110,7 +110,7 @@ MEM_CON_LSPCI_NAME="Memory controller"
 MEL_LSPCI_NAME_EXP="${HCA_LSPCI_NAME}|${VPI_LSPCI_NAME}|${NIC_LSPCI_NAME}"
 
 # HCA/PCI check
-NUM_IB_DEV=`lspci 2> /dev/null | grep -E "(${MEL_LSPCI_NAME_EXP}): Mellanox Technolog" | wc -l`
+NUM_IB_DEV=`lspci 2> /dev/null | grep -E "(${MEL_LSPCI_NAME_EXP})(\s\[[0-9]+\])?: Mellanox Technolog" | wc -l`
 NUM_MEM_CON=`lspci 2> /dev/null | grep "${MEM_CON_LSPCI_NAME}: Mellanox Technolog" | wc -l`
 
 let "NUM_HCAS=$NUM_IB_DEV + $NUM_MEM_CON"
@@ -211,7 +211,7 @@ function get_curr_ca_pci_info () {
     loop_cnt=$1
 
     if [ "${g_lspci_was_ran}" == "" ]; then
-        lspci 2> /dev/null | grep -E "(${MEL_LSPCI_NAME_EXP}|${MEM_CON_LSPCI_NAME}): Mellanox Technolog" > ${G_LSPCI_OUTPUT_FILE}
+        lspci 2> /dev/null | grep -E "(${MEL_LSPCI_NAME_EXP}|${MEM_CON_LSPCI_NAME})(\s\[[0-9]+\])?: Mellanox Technolog" > ${G_LSPCI_OUTPUT_FILE}
         g_lspci_was_ran=1
     fi
     current_pci_info=$(cat ${G_LSPCI_OUTPUT_FILE} | head -$(expr $loop_cnt + 1) | tail -1)
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-17 17:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-12 14:39 [PATCH][MINOR] mstflint/hca_self_test.ofed: Handle lspci output for ConnectX3 (on RHEL 6.2) Lloyd Brown
     [not found] ` <1342103987-9341-1-git-send-email-lloyd_brown-8Bzd4dk9+oo@public.gmane.org>
2012-07-17 16:11   ` Lloyd Brown
     [not found]     ` <50058EB2.8060600-8Bzd4dk9+oo@public.gmane.org>
2012-07-17 17:02       ` Tziporet Koren
     [not found]         ` <CD250C48050CFB4D95E78C95F2FDDD6E86A2D3DC-fViJhHBwANKuSA5JZHE7gA@public.gmane.org>
2012-07-17 17:03           ` Lloyd Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.