From 46c619cdb9c89c492a9b1b297bef5c4cbd326d73 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 14:15:13 -0400 Subject: [PATCH] Relocate intel-i40e to stx-integ/kernel/kernel-modules/intel-i40e Move content from stx-gplv2 into stx-integ Packages will be relocated to stx-integ: base/ bash cgcs-users cluster-resource-agents dpkg haproxy libfdt netpbm rpm database/ mariadb filesystem/ iscsi-initiator-utils filesystem/drbd/ drbd-tools kernel/kernel-modules/ drbd integrity intel-e1000e intel-i40e intel-i40evf intel-ixgbe intel-ixgbevf qat17 tpmdd ldap/ ldapscripts networking/ iptables net-tools Change-Id: I2326dd3a8a4bdc3fcf8b807ae521e7d121c694bb Story: 2002801 Task: 22687 Signed-off-by: Scott Little --- centos_pkg_dirs | 1 - centos_pkg_dirs_rt | 1 - intel-i40e/centos/build_srpm.data | 4 - intel-i40e/centos/i40e-kmod.spec | 129 ------- intel-i40e/files/GPL-v2.0.txt | 339 ------------------ ...e-Enable-getting-link-status-from-VF.patch | 128 ------- ...re-debug-info-for-VFs-still-in-reset.patch | 75 ---- intel-i40e/files/modules-load.conf | 1 - ...t_vf_config-poll-for-out-of-vf-reset.patch | 49 --- 9 files changed, 727 deletions(-) delete mode 100644 intel-i40e/centos/build_srpm.data delete mode 100644 intel-i40e/centos/i40e-kmod.spec delete mode 100644 intel-i40e/files/GPL-v2.0.txt delete mode 100644 intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch delete mode 100644 intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch delete mode 100644 intel-i40e/files/modules-load.conf delete mode 100644 intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch diff --git a/centos_pkg_dirs b/centos_pkg_dirs index f54fbae..673d8e4 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -14,7 +14,6 @@ tpmdd integrity drbd drbd-tools -intel-i40e intel-ixgbe intel-ixgbevf qat17 diff --git a/centos_pkg_dirs_rt b/centos_pkg_dirs_rt index 8d71fda..0a917f7 100644 --- a/centos_pkg_dirs_rt +++ b/centos_pkg_dirs_rt @@ -1,4 +1,3 @@ -intel-i40e intel-ixgbe intel-ixgbevf qat17 diff --git a/intel-i40e/centos/build_srpm.data b/intel-i40e/centos/build_srpm.data deleted file mode 100644 index a7df34c..0000000 --- a/intel-i40e/centos/build_srpm.data +++ /dev/null @@ -1,4 +0,0 @@ -COPY_LIST=" \ - $PKG_BASE/files/* \ - $STX_BASE/downloads/i40e-2.4.10.tar.gz" -TIS_PATCH_VER=1 diff --git a/intel-i40e/centos/i40e-kmod.spec b/intel-i40e/centos/i40e-kmod.spec deleted file mode 100644 index 6b6eed9..0000000 --- a/intel-i40e/centos/i40e-kmod.spec +++ /dev/null @@ -1,129 +0,0 @@ -%if "%{?_tis_build_type}" == "rt" -%define bt_ext -rt -%else -%undefine bt_ext -%endif - -# Define the kmod package name here. -%define kmod_name i40e - -Name: %{kmod_name}-kmod%{?bt_ext} -Version: 2.4.10 -Release: 0%{?_tis_dist}.%{tis_patch_ver} -Group: System Environment/Kernel -License: GPLv2 -Summary: %{kmod_name}%{?bt_ext} kernel module(s) -URL: http://www.intel.com/ - -BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl -ExclusiveArch: x86_64 - -# Sources. -Source0: %{kmod_name}-%{version}.tar.gz -Source5: GPL-v2.0.txt -Source11: modules-load.conf - -Patch01: i40e-Enable-getting-link-status-from-VF.patch -Patch02: i40e-add-more-debug-info-for-VFs-still-in-reset.patch -Patch03: ndo_get_vf_config-poll-for-out-of-vf-reset.patch - -%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//') - -%package -n kmod-i40e%{?bt_ext} -Summary: i40e kernel module(s) -Group: System Environment/Kernel -%global _use_internal_dependency_generator 0 -Provides: kernel-modules >= %{kversion} -Provides: i40e-kmod = %{?epoch:%{epoch}:}%{version}-%{release} -Requires(post): /usr/sbin/depmod -Requires(postun): /usr/sbin/depmod - -%description -n kmod-i40e%{?bt_ext} -This package provides the i40e kernel module(s) built -for the Linux kernel using the %{_target_cpu} family of processors. - -%post -n kmod-i40e%{?bt_ext} -echo "Working. This may take some time ..." -if [ -e "/boot/System.map-%{kversion}" ]; then - /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : -fi -modules=( $(find /lib/modules/%{kversion}/extra/i40e | grep '\.ko$') ) -if [ -x "/sbin/weak-modules" ]; then - printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules -fi -echo "Done." - -%preun -n kmod-i40e%{?bt_ext} -rpm -ql kmod-i40e%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-i40e%{?bt_ext}-modules - -%postun -n kmod-i40e%{?bt_ext} -echo "Working. This may take some time ..." -if [ -e "/boot/System.map-%{kversion}" ]; then - /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : -fi -modules=( $(cat /var/run/rpm-kmod-i40e%{?bt_ext}-modules) ) -rm /var/run/rpm-kmod-i40e%{?bt_ext}-modules -if [ -x "/sbin/weak-modules" ]; then - printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules -fi -echo "Done." - -%files -n kmod-i40e%{?bt_ext} -%defattr(644,root,root,755) -/lib/modules/%{kversion}/ -%config(noreplace)/etc/depmod.d/kmod-i40e.conf -%doc /usr/share/doc/kmod-i40e-%{version}/ -%doc /usr/share/man/man7/ -%{_sysconfdir}/modules-load.d/i40e.conf - -# Disable the building of the debug package(s). -%define debug_package %{nil} - -%description -This package provides the %{kmod_name} kernel module(s). -It is built to depend upon the specific ABI provided by a range of releases -of the same variant of the Linux kernel and not on any one specific build. - -%prep -%autosetup -p 1 -n %{kmod_name}-%{version} -%{__gzip} %{kmod_name}.7 -echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf - -%build -pushd src >/dev/null -%{__make} KSRC=%{_usrsrc}/kernels/%{kversion} -popd >/dev/null - -%install -%{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/ -%{__install} src/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/ -%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/ -%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/ -%{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/ -%{__install} %{SOURCE5} %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/ -%{__install} pci.updates %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/ -%{__install} README %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/ -%{__install} -d %{buildroot}%{_mandir}/man7/ -%{__install} %{kmod_name}.7.gz %{buildroot}%{_mandir}/man7/ -%{__install} -d %{buildroot}%{_sysconfdir}/modules-load.d -%{__install} -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/modules-load.d/i40e.conf - -# Strip the modules(s). -find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \; - -# Always Sign the modules(s). -# If the module signing keys are not defined, define them here. -%{!?privkey: %define privkey /usr/src/kernels/%{kversion}/signing_key.priv} -%{!?pubkey: %define pubkey /usr/src/kernels/%{kversion}/signing_key.x509} -for module in $(find %{buildroot} -type f -name \*.ko); -do %{__perl} /usr/src/kernels/%{kversion}/scripts/sign-file \ - sha256 %{privkey} %{pubkey} $module; -done - -%clean -%{__rm} -rf %{buildroot} - -%changelog -* Thu Feb 11 2016 Matthias Saou 1.4.25-1 -- Initial RPM package, based on elrepo.org's ixgbe one. - diff --git a/intel-i40e/files/GPL-v2.0.txt b/intel-i40e/files/GPL-v2.0.txt deleted file mode 100644 index d159169..0000000 --- a/intel-i40e/files/GPL-v2.0.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch b/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch deleted file mode 100644 index 0612126..0000000 --- a/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 412fdc8c0d51500e42e76e788ece3ca7dd260ced Mon Sep 17 00:00:00 2001 -Message-Id: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -From: Vadim Suraev -Date: Mon, 8 Feb 2016 15:57:30 -0500 -Subject: [PATCH 1/3] i40e: Enable getting link status from VF - -Add handling of custom OP code sent from the PMD VF to get link status via the -virtual channel interface. - -Signed-off-by: Allain Legacy -Signed-off-by: eric zhang -Signed-off-by: Jim Somerville ---- - src/i40e_virtchnl_pf.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/virtchnl.h | 1 + - 2 files changed, 79 insertions(+) - -diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c -index 020bacb..126ec19 100644 ---- a/src/i40e_virtchnl_pf.c -+++ b/src/i40e_virtchnl_pf.c -@@ -1857,6 +1857,81 @@ error_param: - aq_ret); - } - -+struct i40e_eth_link { -+ uint16_t link_speed; /**< ETH_LINK_SPEED_[10, 100, 1000, 10000] */ -+ uint16_t link_duplex; /**< ETH_LINK_[HALF_DUPLEX, FULL_DUPLEX] */ -+ uint8_t link_status : 1; /**< 1 -> link up, 0 -> link down */ -+}__attribute__((aligned(8))); -+ -+#define ETH_LINK_SPEED_AUTONEG 0 /**< Auto-negotiate link speed. */ -+#define ETH_LINK_SPEED_10 10 /**< 10 megabits/second. */ -+#define ETH_LINK_SPEED_100 100 /**< 100 megabits/second. */ -+#define ETH_LINK_SPEED_1000 1000 /**< 1 gigabits/second. */ -+#define ETH_LINK_SPEED_10000 10000 /**< 10 gigabits/second. */ -+#define ETH_LINK_SPEED_10G 10000 /**< alias of 10 gigabits/second. */ -+#define ETH_LINK_SPEED_20G 20000 /**< 20 gigabits/second. */ -+#define ETH_LINK_SPEED_40G 40000 /**< 40 gigabits/second. */ -+ -+#define ETH_LINK_AUTONEG_DUPLEX 0 /**< Auto-negotiate duplex. */ -+#define ETH_LINK_HALF_DUPLEX 1 /**< Half-duplex connection. */ -+#define ETH_LINK_FULL_DUPLEX 2 /**< Full-duplex connection. */ -+ -+static void -+i40e_vc_get_link_status(struct i40e_vf *vf) -+{ -+ struct i40e_pf *pf = vf->pf; -+ struct i40e_hw *hw; -+ i40e_status aq_ret = I40E_SUCCESS; -+ i40e_status status; -+ struct i40e_eth_link eth_link; -+ bool new_link; -+ -+ if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) || -+ !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps)) { -+ aq_ret = I40E_ERR_PARAM; -+ goto error_param; -+ } -+ hw = &pf->hw; -+ -+ /* set this to force the get_link_status call to refresh state */ -+ pf->hw.phy.get_link_info = true; -+ -+ status = i40e_get_link_status(&pf->hw, &new_link); -+ if (status != I40E_SUCCESS) { -+ dev_dbg(&pf->pdev->dev, "couldn't get link state, status: %d\n", -+ status); -+ aq_ret = I40E_ERR_INVALID_LINK_SETTINGS; -+ goto error_param; -+ } -+ -+ /* Update link status first to acquire latest link change */ -+ eth_link.link_status = new_link ? 1 : 0; -+ -+ switch(hw->phy.link_info.link_speed) { -+ case I40E_LINK_SPEED_40GB: -+ eth_link.link_speed = ETH_LINK_SPEED_40G; -+ break; -+ case I40E_LINK_SPEED_10GB: -+ eth_link.link_speed = ETH_LINK_SPEED_10G; -+ break; -+ case I40E_LINK_SPEED_1GB: -+ eth_link.link_speed = ETH_LINK_SPEED_1000; -+ break; -+ case I40E_LINK_SPEED_100MB: -+ eth_link.link_speed = ETH_LINK_SPEED_100; -+ break; -+ default: -+ eth_link.link_speed = ETH_LINK_SPEED_AUTONEG; -+ break; -+ } -+ eth_link.link_duplex = ETH_LINK_FULL_DUPLEX;/* always */ -+ -+error_param: -+ i40e_vc_send_msg_to_vf(vf, VIRTCHNL_OP_GET_LINK_STAT, -+ aq_ret, (uint8_t *)ð_link, -+ sizeof(eth_link)); -+} -+ - /** - * i40e_vc_config_queues_msg - * @vf: pointer to the VF info -@@ -2901,6 +2976,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, - case VIRTCHNL_OP_REQUEST_QUEUES: - ret = i40e_vc_request_queues_msg(vf, msg, msglen); - break; -+ case VIRTCHNL_OP_GET_LINK_STAT: -+ i40e_vc_get_link_status(vf); -+ break; - - case VIRTCHNL_OP_UNKNOWN: - default: -diff --git a/src/virtchnl.h b/src/virtchnl.h -index afde603..b9b38c0 100644 ---- a/src/virtchnl.h -+++ b/src/virtchnl.h -@@ -133,6 +133,7 @@ enum virtchnl_ops { - VIRTCHNL_OP_ENABLE_VLAN_STRIPPING = 27, - VIRTCHNL_OP_DISABLE_VLAN_STRIPPING = 28, - VIRTCHNL_OP_REQUEST_QUEUES = 29, -+ VIRTCHNL_OP_GET_LINK_STAT = 0x101, - - }; - --- -1.8.3.1 - diff --git a/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch b/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch deleted file mode 100644 index fd1cfd3..0000000 --- a/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d60e87567eb5418fbb848bf30f72d3d8bec3bad6 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -From: Jim Somerville -Date: Mon, 26 Mar 2018 11:03:47 -0400 -Subject: [PATCH 2/3] i40e add more debug info for VFs still in reset - -Signed-off-by: Jim Somerville ---- - src/i40e_virtchnl_pf.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c -index 126ec19..da29fc3 100644 ---- a/src/i40e_virtchnl_pf.c -+++ b/src/i40e_virtchnl_pf.c -@@ -3077,8 +3077,8 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) - msleep(20); - } - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { -- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", -- vf_id); -+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", -+ __func__, vf_id); - ret = -EAGAIN; - goto error_param; - } -@@ -3218,8 +3218,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, - vf = &(pf->vf[vf_id]); - vsi = pf->vsi[vf->lan_vsi_idx]; - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { -- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", -- vf_id); -+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", -+ __func__, vf_id); - ret = -EAGAIN; - goto error_pvid; - } -@@ -3350,8 +3350,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate) - vf = &(pf->vf[vf_id]); - vsi = pf->vsi[vf->lan_vsi_idx]; - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { -- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", -- vf_id); -+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", -+ __func__, vf_id); - ret = -EAGAIN; - goto error; - } -@@ -3443,8 +3443,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, - /* first vsi is always the LAN vsi */ - vsi = pf->vsi[vf->lan_vsi_idx]; - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { -- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", -- vf_id); -+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", -+ __func__, vf_id); - ret = -EAGAIN; - goto error_param; - } -@@ -3576,8 +3576,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable) - - vf = &(pf->vf[vf_id]); - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { -- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", -- vf_id); -+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", -+ __func__, vf_id); - ret = -EAGAIN; - goto out; - } --- -1.8.3.1 - diff --git a/intel-i40e/files/modules-load.conf b/intel-i40e/files/modules-load.conf deleted file mode 100644 index d772f16..0000000 --- a/intel-i40e/files/modules-load.conf +++ /dev/null @@ -1 +0,0 @@ -i40e diff --git a/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch b/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch deleted file mode 100644 index 3a30692..0000000 --- a/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 25b521f58b33bf070c0b31d077333c13c3ad25e8 Mon Sep 17 00:00:00 2001 -Message-Id: <25b521f58b33bf070c0b31d077333c13c3ad25e8.1528830095.git.Jim.Somerville@windriver.com> -In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -From: Jim Somerville -Date: Mon, 2 Apr 2018 15:35:12 -0400 -Subject: [PATCH 3/3] ndo_get_vf_config poll for out of vf reset - -Same solution as 028daf80117376b22909becd9720daaefdfceff4 from the -net-next tree as supplied by Intel, but we apply it to -ndo_get_vf_config instead. - -Signed-off-by: Jim Somerville ---- - src/i40e_virtchnl_pf.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c -index da29fc3..d5935d6 100644 ---- a/src/i40e_virtchnl_pf.c -+++ b/src/i40e_virtchnl_pf.c -@@ -3431,6 +3431,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, - struct i40e_pf *pf = vsi->back; - struct i40e_vf *vf; - int ret = 0; -+ u8 i; - - /* validate the request */ - if (vf_id >= pf->num_alloc_vfs) { -@@ -3442,6 +3443,16 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, - vf = &(pf->vf[vf_id]); - /* first vsi is always the LAN vsi */ - vsi = pf->vsi[vf->lan_vsi_idx]; -+ -+ /* When the VF is resetting wait until it is done. -+ * It can take up to 200 milliseconds, -+ * but wait for up to 300 milliseconds to be safe. -+ */ -+ for (i = 0; i < 15; i++) { -+ if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) -+ break; -+ msleep(20); -+ } - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { - dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", - __func__, vf_id); --- -1.8.3.1 -