diff --git a/.bnx2x.metadata b/.bnx2x.metadata new file mode 100644 index 0000000..179013b --- /dev/null +++ b/.bnx2x.metadata @@ -0,0 +1 @@ +fc2236052f9f44add30ca2a6b4fbc440e1ee2d6b SOURCES/bnx2x-1.710.51.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b09395 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/bnx2x-1.710.51.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/bnx2x-firmware.files b/SOURCES/bnx2x-firmware.files new file mode 100644 index 0000000..bdcbb4c --- /dev/null +++ b/SOURCES/bnx2x-firmware.files @@ -0,0 +1,4 @@ +%defattr(644,root,root,755) +/lib/firmware/bnx2x/bnx2x-e1-7.10.51.0.fw +/lib/firmware/bnx2x/bnx2x-e1h-7.10.51.0.fw +/lib/firmware/bnx2x/bnx2x-e2-7.10.51.0.fw diff --git a/SOURCES/bnx2x.files b/SOURCES/bnx2x.files new file mode 100644 index 0000000..2504e86 --- /dev/null +++ b/SOURCES/bnx2x.files @@ -0,0 +1,4 @@ +%defattr(644,root,root,755) +/lib/modules/%2-%1 +/etc/depmod.d/bnx2x.conf +/usr/share/doc/kmod-bnx2x/greylist.txt diff --git a/SOURCES/bnx2x.patch b/SOURCES/bnx2x.patch new file mode 100644 index 0000000..4fc8dca --- /dev/null +++ b/SOURCES/bnx2x.patch @@ -0,0 +1,85 @@ +diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +index 86e9451..5097083 100644 +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +@@ -2581,4 +2581,9 @@ void bnx2x_set_rx_ts(struct bnx2x *bp, struct sk_buff *skb); + #define BNX2X_MAX_PHC_DRIFT 31000000 + #define BNX2X_PTP_TX_TIMEOUT + ++static inline int dup_is_kdump_kernel(void) ++{ ++ return reset_devices; ++} ++ + #endif /* bnx2x.h */ +diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +index 66717c5..bd1fed9 100644 +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +@@ -65,7 +65,7 @@ static int bnx2x_calc_num_queues(struct bnx2x *bp) + int nq = bnx2x_num_queues ? : netif_get_num_default_rss_queues(); + + /* Reduce memory usage in kdump environment by using only one queue */ +- if (is_kdump_kernel()) ++ if (dup_is_kdump_kernel()) + nq = 1; + + nq = clamp(nq, 1, BNX2X_MAX_QUEUES(bp)); +@@ -1647,6 +1647,44 @@ void bnx2x_free_irq(struct bnx2x *bp) + } + } + ++/** ++ * pci_enable_msix_range - configure device's MSI-X capability structure ++ * @dev: pointer to the pci_dev data structure of MSI-X device function ++ * @entries: pointer to an array of MSI-X entries ++ * @minvec: minimum number of MSI-X irqs requested ++ * @maxvec: maximum number of MSI-X irqs requested ++ * ++ * Setup the MSI-X capability structure of device function with a maximum ++ * possible number of interrupts in the range between @minvec and @maxvec ++ * upon its software driver call to request for MSI-X mode enabled on its ++ * hardware device function. It returns a negative errno if an error occurs. ++ * If it succeeds, it returns the actual number of interrupts allocated and ++ * indicates the successful configuration of MSI-X capability structure ++ * with new allocated MSI-X interrupts. ++ **/ ++static int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, ++ int minvec, int maxvec) ++{ ++ int nvec = maxvec; ++ int rc; ++ ++ if (maxvec < minvec) ++ return -ERANGE; ++ ++ do { ++ rc = pci_enable_msix(dev, entries, nvec); ++ if (rc < 0) { ++ return rc; ++ } else if (rc > 0) { ++ if (rc < minvec) ++ return -ENOSPC; ++ nvec = rc; ++ } ++ } while (rc); ++ ++ return nvec; ++} ++ + int bnx2x_enable_msix(struct bnx2x *bp) + { + int msix_vec = 0, i, rc; +diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +index e22c363..491ffe0 100644 +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +@@ -11972,7 +11972,7 @@ static int bnx2x_init_bp(struct bnx2x *bp) + bp->disable_tpa = disable_tpa; + bp->disable_tpa |= IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp); + /* Reduce memory usage in kdump environment by disabling TPA */ +- bp->disable_tpa |= is_kdump_kernel(); ++ bp->disable_tpa |= dup_is_kdump_kernel(); + + /* Set TPA flags */ + if (bp->disable_tpa) { diff --git a/SOURCES/bnx2x.preamble b/SOURCES/bnx2x.preamble new file mode 100644 index 0000000..142b3d4 --- /dev/null +++ b/SOURCES/bnx2x.preamble @@ -0,0 +1 @@ +Requires: firmware(%{kmod_name}) = %{kmod_firmware_version} diff --git a/SOURCES/depmodconf b/SOURCES/depmodconf new file mode 100755 index 0000000..d54ed63 --- /dev/null +++ b/SOURCES/depmodconf @@ -0,0 +1,10 @@ +#!/bin/bash +VAR=${2} +MAJOR=` echo $VAR | cut -f 1 -d "-" ` +VAR=${VAR##$MAJOR"-"} +MINOR=` echo $VAR | cut -f 1 -d "." ` +kver=$MAJOR-$MINOR.* +find $3 -name '*.ko' | sed 's|^.*/\([^/]*\)\.ko$|\1|' | sort -u | \ +while read -r module; do + echo "override $module $kver weak-updates/$1" +done diff --git a/SOURCES/find-provides.ksyms b/SOURCES/find-provides.ksyms new file mode 100755 index 0000000..38899cd --- /dev/null +++ b/SOURCES/find-provides.ksyms @@ -0,0 +1,11 @@ +#!/bin/bash +filelist=$(sed "s/['\"]/\\\&/g") +kolist=$(echo $filelist | tr '[:blank:]' \\n | grep -E '/lib/modules/.+\.ko$') +echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/find-provides.ksyms + +for module in $kolist; do + modname=$(echo $module | sed 's|^.*/\([^/]*\)\.ko$|\1|') + if [ "$modname" != "$1" ]; then + echo "kmod-$modname = $2" + fi +done | sort -u diff --git a/SOURCES/find-requires.ksyms b/SOURCES/find-requires.ksyms new file mode 100755 index 0000000..db86dd8 --- /dev/null +++ b/SOURCES/find-requires.ksyms @@ -0,0 +1,65 @@ +#! /bin/bash + +IFS=$'\n' + +all_provides() { + nm "$@" \ + | sed -r -ne 's:^([0-9a-f]+) A __crc_(.+):\1\t\2:p' \ + | sort -k2 -u +} + +all_requires() { + for module in "$@"; do + set -- $(/sbin/modinfo -F vermagic "$module" | sed -e 's: .*::' -e q) + /sbin/modprobe --dump-modversions "$module" \ + | awk --non-decimal-data ' + BEGIN { FS = "\t" ; OFS = "\t" } + {printf("0x%08x\t%s\n", $1, $2)}' \ + | sed -r -e 's:$:\t'"$1"':' + done \ + | sort -k2 -u +} + +rm -rf /tmp/krava + +if ! [ -e /sbin/modinfo -a -e /sbin/modprobe ]; then + cat > /dev/null + exit 0 +fi + +modules=($(grep -E '/lib/modules/.+\.ko$')) + +if [ ${#modules[@]} -gt 0 ]; then + kernel=$(/sbin/modinfo -F vermagic "${modules[0]}" | sed -e 's: .*::' -e q) + + # get all that kernel provides + symvers=$(mktemp -t ${0##*/}.XXXXX) + cat /usr/src/kernels/$kernel/Module.symvers | awk ' + BEGIN { FS = "\t" ; OFS = "\t" } + { print $2 "\t" $1 } + ' \ + | sed -r -e 's:$:\t'"$1"':' \ + | sort -u -k2 > $symvers + + # get all that we demands + reqs=$(mktemp -t ${0##*/}.XXXXX) + join -t $'\t' -j 2 -v 1 \ + <(all_requires "${modules[@]}") \ + <(all_provides "${modules[@]}") \ + | sort -u -k2 > $reqs + + # get kernel dependencies - kernel(symbol) = 0xHEX + join -t $'\t' -j2 -o 1.1 1.2 $symvers $reqs \ + | sort -u \ + | awk ' + { FS = "\t" ; OFS = "\t" } + { print "kernel(" $1 ") = " $2 } + ' + + # get module dependencies - ksym(symbol) = 0xHEX + join -t $'\t' -j2 -v2 $symvers $reqs \ + | sort -u | awk ' + { FS = "\t" ; OFS = "\t" } + { print "ksym(" $2 ") = " $1 } + ' +fi diff --git a/SOURCES/kmodtool b/SOURCES/kmodtool new file mode 100755 index 0000000..5a9fc7e --- /dev/null +++ b/SOURCES/kmodtool @@ -0,0 +1,315 @@ +#!/bin/bash + +# kmodtool - Helper script for building kernel module RPMs +# An original version appeared in Fedora. This version is +# generally called only by the %kernel_module_package RPM macro +# during the process of building Driver Update Packages (which +# are also known as "kmods" in the Fedora community). +# +# Copyright (c) 2003-2010 Ville Skyttä , +# Thorsten Leemhuis +# Jon Masters +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Changelog: +# +# 2010/07/28 - Add fixes for filelists in line with LF standard +# - Remove now defunct "framepointer" kernel variant +# - Change version to "rhel6-rh2" as a consequence. +# +# 2010/01/10 - Simplified for RHEL6. We are working on upstream +# moving to a newer format and in any case do not +# need to retain support for really old systems. + +shopt -s extglob + +myprog="kmodtool" +myver="rhel6-rh2" +knownvariants=@(debug|kdump) +kmod_name= +kver= +verrel= +variant= + +get_kernel_release () +{ + if [[ -z $1 ]]; then + uname -r + return + fi + local arch=$(arch) + local verrel=${1%.$arch} + local verprefix=${verrel%.*} + local versuffix=${verrel#$verprefix} + verrel=$(ls -Ud /usr/src/kernels/$verprefix*$versuffix.$arch | sort -V | tail -n 1) + verrel=${verrel##*/} + [[ -z $verrel ]] && verrel=$1.$arch + echo "$verrel" +} + +get_verrel () +{ + verrel=$(get_kernel_release "$1") + verrel=${verrel%%$knownvariants} +} + +print_verrel () +{ + get_verrel $@ + echo "${verrel}" +} + +get_verrel_for_deps () +{ + verrel_dep=${1:-$(uname -r)} + verrel_dep=${verrel_dep%%$knownvariants} + # TODO: rpmtemplate should be called with %{kernel_version}, not %{kverrel} + # begin hack (remove z-stream subversion) + local verprefix=${verrel_dep%-*} + local versuffix=${verrel_dep##*-} + local verinfix=${versuffix%.*.*} + versuffix=${versuffix#$verinfix} + verinfix=${verinfix%%.*} + verrel_dep=$verprefix-$verinfix$versuffix + # end hack +} + +get_variant () +{ + get_verrel $@ + variant=$(get_kernel_release "$1") + variant=${variant##$verrel} + variant=${variant:-'""'} +} + +print_variant () +{ + get_variant $@ + echo "${variant}" +} + +get_filelist() { + local IFS=$'\n' + filelist=($(cat)) + + if [ ${#filelist[@]} -gt 0 ]; + then + for ((n = 0; n < ${#filelist[@]}; n++)); + do + line="${filelist[n]}" + line=$(echo "$line" \ + | sed -e "s/%verrel/$verrel/g" \ + | sed -e "s/%variant/$variant/g" \ + | sed -e "s/%dashvariant/$dashvariant/g" \ + | sed -e "s/%dotvariant/$dotvariant/g" \ + | sed -e "s/\.%1/$dotvariant/g" \ + | sed -e "s/\-%1/$dotvariant/g" \ + | sed -e "s/%2/$verrel/g") + echo "$line" + done + else + echo "%defattr(644,root,root,755)" + echo "/lib/modules/${verrel}${dotvariant}" + fi +} + + +get_rpmtemplate () +{ + local variant="${1}" + local dashvariant="${variant:+-${variant}}" + local dotvariant="${variant:+.${variant}}" + + echo "%package -n kmod-${kmod_name}${dashvariant}" + + if [ -z "$kmod_provides_summary" ]; then + echo "Summary: ${kmod_name} kernel module(s)" + fi + + if [ -z "$kmod_provides_group" ]; then + echo "Group: System Environment/Kernel" + fi + + if [ ! -z "$kmod_version" ]; then + echo "Version: %{kmod_version}" + fi + + if [ ! -z "$kmod_release" ]; then + echo "Release: %{kmod_release}" + fi + + # Turn of the internal dep generator so we will use the kmod scripts. + echo "%global _use_internal_dependency_generator 0" + cat < /dev/null || : +fi + +modules=( \$(find /lib/modules/${verrel}${dotvariant}/extra/${kmod_name} | grep '\.ko$') ) +if [ -x "/sbin/weak-modules" ]; then + printf '%s\n' "\${modules[@]}" \ + | /sbin/weak-modules --add-modules +fi +EOF + +cat < /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules +EOF + +cat < /dev/null || : +fi + +modules=( \$(cat /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules) ) +rm /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules +if [ -x "/sbin/weak-modules" ]; then + printf '%s\n' "\${modules[@]}" \ + | /sbin/weak-modules --remove-modules +fi +EOF + +echo "%files -n kmod-${kmod_name}${dashvariant}" + +if [ "" == "$override_filelist" ]; +then + echo "%defattr(644,root,root,755)" + echo "/lib/modules/${verrel}${dotvariant}" +else + cat "$override_filelist" | get_filelist +fi +} + +print_rpmtemplate () +{ + kmod_name="${1}" + shift + kver="${1}" + get_verrel "${1}" + get_verrel_for_deps "${1}" + shift + if [ -z "${kmod_name}" ] ; then + echo "Please provide the kmodule-name as first parameter." >&2 + exit 2 + elif [ -z "${kver}" ] ; then + echo "Please provide the kver as second parameter." >&2 + exit 2 + elif [ -z "${verrel}" ] ; then + echo "Couldn't find out the verrel." >&2 + exit 2 + fi + + for variant in "$@" ; do + if [ "default" == "$variant" ]; + then + get_rpmtemplate "" + else + get_rpmtemplate "${variant}" + fi + done +} + +usage () +{ + cat <