[openfabrics-ewg] [PATCH[ OFED-1.1-rc7 install.sh: default activation of scaling code for ehca

[Vladimir Sokolovsky]

Hi Nam,
I already prepared the patch for ehca scaling, please review (attached).

Please send me the other patch for 32/64 bit issue.
Note: all work should be done in openib.spec file.

There should be no issues with 64/32 bit libraries on ppc64, but you are
right about 32-bit binaries, they were not taken into RPM because there
is no standart place to keep them.

Regards,
Vladimir



On Tue, 2006-10-17 at 11:22 +0200, Hoang-Nam Nguyen wrote:
> Hi Vladimir!
> > Should it be CONFIG_INFINIBAND_EHCA_SCALING instead of
> > CONFIG_INFINIBAND_SCALING?
> Oh no, stupid bug from me. That has to be CONFIG_INFINIBAND_EHCA_SCALING.
> > The configure and the Makefile (under openib-1.1/ofed_scripts) should
> > also be updated with this new parameter.
> Yes. I'll send you (say in 2-3 hrs) a new patch with those fixes and
> the one fix in order to get 64/32-bit binaries and libraries on ppc64
> with the proper names and dir location.
> Thanks!
> Nam
-------------- next part --------------
diff --git a/ofed_scripts/Makefile b/ofed_scripts/Makefile
index 6ad75b2..36d8d76 100644
--- a/ofed_scripts/Makefile
+++ b/ofed_scripts/Makefile
@@ -60,6 +60,7 @@ kernel:
                CONFIG_INFINIBAND_IPOIB_DEBUG=$(CONFIG_INFINIBAND_IPOIB_DEBUG) \
                CONFIG_INFINIBAND_ISER=$(CONFIG_INFINIBAND_ISER) \
                CONFIG_INFINIBAND_EHCA=$(CONFIG_INFINIBAND_EHCA) \
+               CONFIG_INFINIBAND_EHCA_SCALING=$(CONFIG_INFINIBAND_EHCA_SCALING) \
                CONFIG_INFINIBAND_RDS=$(CONFIG_INFINIBAND_RDS) \
                CONFIG_INFINIBAND_RDS_DEBUG=$(CONFIG_INFINIBAND_RDS_DEBUG) \
                CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=$(CONFIG_INFINIBAND_IPOIB_DEBUG_DATA) \
diff --git a/ofed_scripts/configure b/ofed_scripts/configure
index bcda252..500646a 100755
--- a/ofed_scripts/configure
+++ b/ofed_scripts/configure
@@ -1063,9 +1063,11 @@ main()
                         ;;
                         --with-ehca-mod)
                             CONFIG_INFINIBAND_EHCA="m"
+                            CONFIG_INFINIBAND_EHCA_SCALING="y"
                         ;;
                         --without-ehca-mod)
                             CONFIG_INFINIBAND_EHCA=
+                            CONFIG_INFINIBAND_EHCA_SCALING=
                         ;;
                         --with-rds-mod)
                             CONFIG_INFINIBAND_RDS="m"
@@ -1174,6 +1176,7 @@ CONFIG_INFINIBAND_MTHCA=${CONFIG_INFINIB
 CONFIG_INFINIBAND_IPOIB_DEBUG=${CONFIG_INFINIBAND_IPOIB_DEBUG:-''}
 CONFIG_INFINIBAND_ISER=${CONFIG_INFINIBAND_ISER:-''}
 CONFIG_INFINIBAND_EHCA=${CONFIG_INFINIBAND_EHCA:-''}
+CONFIG_INFINIBAND_EHCA_SCALING=${CONFIG_INFINIBAND_EHCA_SCALING:-''}
 CONFIG_INFINIBAND_RDS=${CONFIG_INFINIBAND_RDS:-''}
 CONFIG_INFINIBAND_RDS_DEBUG=${CONFIG_INFINIBAND_RDS_DEBUG:-''}
 CONFIG_INFINIBAND_MADEYE=${CONFIG_INFINIBAND_MADEYE:-''}
@@ -1239,6 +1242,7 @@ CONFIG_INFINIBAND_MTHCA=${CONFIG_INFINIB
 CONFIG_INFINIBAND_IPOIB_DEBUG=${CONFIG_INFINIBAND_IPOIB_DEBUG}
 CONFIG_INFINIBAND_ISER=${CONFIG_INFINIBAND_ISER}
 CONFIG_INFINIBAND_EHCA=${CONFIG_INFINIBAND_EHCA}
+CONFIG_INFINIBAND_EHCA_SCALING=${CONFIG_INFINIBAND_EHCA_SCALING}
 CONFIG_INFINIBAND_RDS=${CONFIG_INFINIBAND_RDS}
 CONFIG_INFINIBAND_RDS_DEBUG=${CONFIG_INFINIBAND_RDS_DEBUG}
 CONFIG_INFINIBAND_MADEYE=${CONFIG_INFINIBAND_MADEYE}
@@ -1332,6 +1336,11 @@ if [ "X${CONFIG_INFINIBAND_EHCA}" == "Xm
 else
         DEFINE_INFINIBAND_EHCA="#undef CONFIG_INFINIBAND_EHCA"
 fi
+if [ "X${CONFIG_INFINIBAND_EHCA_SCALING}" == "Xy" ]; then
+        DEFINE_INFINIBAND_EHCA_SCALING="#define CONFIG_INFINIBAND_EHCA_SCALING 1"
+else
+        DEFINE_INFINIBAND_EHCA_SCALING="#undef CONFIG_INFINIBAND_EHCA_SCALING"
+fi
 if [ "X${CONFIG_INFINIBAND_RDS}" == "Xm" ]; then
         DEFINE_INFINIBAND_RDS="#define CONFIG_INFINIBAND_RDS 1"
 else
@@ -1398,6 +1407,7 @@ #undef CONFIG_INFINIBAND_MTHCA
 #undef CONFIG_INFINIBAND_IPOIB_DEBUG
 #undef CONFIG_INFINIBAND_ISER
 #undef CONFIG_INFINIBAND_EHCA
+#undef CONFIG_INFINIBAND_EHCA_SCALING
 #undef CONFIG_INFINIBAND_RDS
 #undef CONFIG_INFINIBAND_RDS_DEBUG
 #undef CONFIG_INFINIBAND_MADEYE
diff --git a/ofed_scripts/install.sh b/ofed_scripts/install.sh
index 884cdef..95d68fb 100755
--- a/ofed_scripts/install.sh
+++ b/ofed_scripts/install.sh
@@ -635,7 +635,27 @@ set_deps()

                 MODULES_CONF_PARAMS="$MODULES_CONF_PARAMS CONFIG_IPATH_CORE=m CONFIG_INFINIBAND_IPATH=m"
         fi
-
+
+        if [ "$ehca" == "y" ]; then
+                case $(uname -m) in
+                        ppc|ppc64)
+                                case ${KVERSION} in
+                                        2.6.1[6-9]*)
+                                        MODULES_CONF_PARAMS="$MODULES_CONF_PARAMS CONFIG_INFINIBAND_EHCA=m CONFIG_INFINIBAND_EHCA_SCALING=y"
+                                        ;;
+                                        *)
+                                        echo "EHCA is not supported by ${KVERSION} kernel"
+                                        ;;
+                                esac
+                        ;;
+                        *)
+                                echo "EHCA is not supported on $(uname -m) architecture"
+                                exit 1
+                        ;;
+                esac
+
+        fi
+
         if [ "$ipoib" == "y" ]; then
                 MODULES_CONF_PARAMS="$MODULES_CONF_PARAMS CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_DEBUG=y"
         fi