From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b580a05b05302ab7931ca8d92e0b64fb9b23ed74
Date: Fri, 01 Apr 2016 13:09:27 +0100 [thread overview]
Message-ID: <20160401120927.8ECF51081BA6@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6574 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (commit)
via c91595a143f9ed878be2dfc326be9a968b38eecc (commit)
via b64110cfd55f841ea11b1f43d019b84e9a6121fd (commit)
via f9855d6d55f33be3bdefec3e756667fbdb538b31 (commit)
from ae04f2400a66b8a5f7fdeb4fb940898c1572220f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b580a05b05302ab7931ca8d92e0b64fb9b23ed74
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 08:30:34 2016 +0200
kernel: set pakver to 67
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c91595a143f9ed878be2dfc326be9a968b38eecc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 08:25:08 2016 +0200
e1000e: update to 3.3.3
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b64110cfd55f841ea11b1f43d019b84e9a6121fd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 08:15:27 2016 +0200
igb: fix hung at dev_get_stats()
without this igb can bring the whole userspace to hung
with "cpu_stuck for more than 22s". I don't understand
why this bug is set to "wont-fix" at the bugtracker.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f9855d6d55f33be3bdefec3e756667fbdb538b31
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 08:13:59 2016 +0200
igb: update to 5.3.4.4
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/e1000e | 6 ++--
lfs/igb | 5 ++--
lfs/linux | 2 +-
.../igb-5.3.4.4_fix_hung_at_dev_get_stats.patch | 35 ++++++++++++++++++++++
4 files changed, 42 insertions(+), 6 deletions(-)
create mode 100644 src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
Difference in files:
diff --git a/lfs/e1000e b/lfs/e1000e
index 5f284ce..37b0c41 100644
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
-VER = 3.2.7.1
+VER = 3.3.3
THISAPP = e1000e-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8f62c220d763fa92473365e40d55bd86
+$(DL_FILE)_MD5 = 01274408a0f987457600dc7993c9d59a
install : $(TARGET)
diff --git a/lfs/igb b/lfs/igb
index 85d228c..d00a1e1 100644
--- a/lfs/igb
+++ b/lfs/igb
@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
-VER = 5.3.3.2
+VER = 5.3.4.4
THISAPP = igb-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2d753a0bd03c949ec08d68c27540044d
+$(DL_FILE)_MD5 = 6c0d7dfdb161128da7c039fc83bbdba0
install : $(TARGET)
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mv $(MODPATH)/igb.ko \
$(MODPATH)/igb.ko.org
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX)
cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH)
@rm -rf $(DIR_APP)
diff --git a/lfs/linux b/lfs/linux
index f7782ff..be2e105 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 66
+PAK_VER = 67
DEPS = ""
KERNEL_ARCH = $(MACHINE)
diff --git a/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
new file mode 100644
index 0000000..a92c441
--- /dev/null
+++ b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
@@ -0,0 +1,35 @@
+Don't read phy_idle_errors at dev_get_stats() because this can
+hung the userspace.
+
+https://sourceforge.net/p/e1000/bugs/500/
+Why this is set to wont-fix?
+
+I think it is better when phy errors are not reportet in the stats
+than a random hanging of the whole sytem.
+
+diff -Naur igb-5.3.4.4.org/src/igb_main.c igb-5.3.4.4/src/igb_main.c
+--- igb-5.3.4.4.org/src/igb_main.c 2016-02-26 01:48:39.000000000 +0100
++++ igb-5.3.4.4/src/igb_main.c 2016-03-31 09:22:10.671794282 +0200
+@@ -6032,14 +6032,14 @@
+
+ /* Tx Dropped needs to be maintained elsewhere */
+
+- /* Phy Stats */
+- if (hw->phy.media_type == e1000_media_type_copper) {
+- if ((adapter->link_speed == SPEED_1000) &&
+- (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
+- phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
+- adapter->phy_stats.idle_errors += phy_tmp;
+- }
+- }
++// /* Phy Stats */
++// if (hw->phy.media_type == e1000_media_type_copper) {
++// if ((adapter->link_speed == SPEED_1000) &&
++// (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
++// phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
++// adapter->phy_stats.idle_errors += phy_tmp;
++// }
++// }
+
+ /* Management Stats */
+ adapter->stats.mgptc += E1000_READ_REG(hw, E1000_MGTPTC);
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-04-01 12:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160401120927.8ECF51081BA6@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox