[kernel] r19459 - in dists/sid/linux/debian: . patches
Ben Hutchings
benh at alioth.debian.org
Sun Oct 28 02:12:03 UTC 2012
Author: benh
Date: Sun Oct 28 02:12:02 2012
New Revision: 19459
Log:
Add fixes for #690956 and #691122
Added:
dists/sid/linux/debian/patches/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
dists/sid/linux/debian/patches/e1000-fix-vlan-processing-regression.patch
Modified:
dists/sid/linux/debian/changelog
dists/sid/linux/debian/patches/series
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Wed Oct 24 14:29:13 2012 (r19458)
+++ dists/sid/linux/debian/changelog Sun Oct 28 02:12:02 2012 (r19459)
@@ -3,6 +3,9 @@
* [x86] udeb: Re-add isci to scsi-extra-modules (Closes: #690886;
regression of #652897 in version 3.2~rc7-1~experimental.1 due to
mis-merge)
+ * e1000: fix vlan processing regression (Closes: #690956)
+ * [x86] drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
+ (Closes: #691122)
-- Ben Hutchings <ben at decadent.org.uk> Wed, 24 Oct 2012 14:15:57 +0100
Added: dists/sid/linux/debian/patches/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch Sun Oct 28 02:12:02 2012 (r19459)
@@ -0,0 +1,35 @@
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Fri, 22 Jun 2012 09:43:07 +0200
+Subject: drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
+
+commit 9756fe38d10b2bf90c81dc4d2f17d5632e135364 upstream.
+
+This box claims to have an LVDS interface but doesn't
+actually have one.
+
+Signed-off-by: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
+index ab4d647..05fcadb 100644
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -778,6 +778,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
+ DMI_MATCH(DMI_BOARD_NAME, "MS-7469"),
+ },
+ },
++ {
++ .callback = intel_no_lvds_dmi_callback,
++ .ident = "ZOTAC ZBOXSD-ID12/ID13",
++ .matches = {
++ DMI_MATCH(DMI_BOARD_VENDOR, "ZOTAC"),
++ DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"),
++ },
++ },
+
+ { } /* terminating entry */
+ };
Added: dists/sid/linux/debian/patches/e1000-fix-vlan-processing-regression.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/e1000-fix-vlan-processing-regression.patch Sun Oct 28 02:12:02 2012 (r19459)
@@ -0,0 +1,101 @@
+From: Jiri Pirko <jpirko at redhat.com>
+Date: Tue, 20 Mar 2012 18:10:01 +0000
+Subject: e1000: fix vlan processing regression
+
+commit 52f5509fe8ccb607ff9b84ad618f244262336475 upstream.
+
+This patch fixes a regression introduced by commit "e1000: do vlan
+cleanup (799d531)".
+
+Apparently some e1000 chips (not mine) are sensitive about the order of
+setting vlan filter and vlan stripping/inserting functionality. So this
+patch changes the order so it's the same as before vlan cleanup.
+
+Reported-by: Ben Greear <greearb at candelatech.com>
+Signed-off-by: Jiri Pirko <jpirko at redhat.com>
+Tested-by: Ben Greear <greearb at candelatech.com>
+Tested-by: Aaron Brown <aaron.f.brown at intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
+[Jonathan Nieder: It doesn't apply cleanly to kernels before
+v3.3-rc1~182^2~581 (net: introduce and use netdev_features_t for
+device features sets) but a backport is straightforward.]
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+Tested-by: Andrey Jr. Melnikov <temnota at kmv.ru>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 76 +++++++++++++++------------
+ 1 file changed, 42 insertions(+), 34 deletions(-)
+
+--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
++++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
+@@ -168,6 +168,8 @@ static int e1000_82547_fifo_workaround(s
+
+ static bool e1000_vlan_used(struct e1000_adapter *adapter);
+ static void e1000_vlan_mode(struct net_device *netdev, u32 features);
++static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
++ bool filter_on);
+ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+ static void e1000_restore_vlan(struct e1000_adapter *adapter);
+@@ -1219,7 +1221,7 @@ static int __devinit e1000_probe(struct
+ if (err)
+ goto err_register;
+
+- e1000_vlan_mode(netdev, netdev->features);
++ e1000_vlan_filter_on_off(adapter, false);
+
+ /* print bus type/speed/width info */
+ e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
+@@ -4553,6 +4555,21 @@ static bool e1000_vlan_used(struct e1000
+ return false;
+ }
+
++static void __e1000_vlan_mode(struct e1000_adapter *adapter, u32 features)
++{
++ struct e1000_hw *hw = &adapter->hw;
++ u32 ctrl;
++
++ ctrl = er32(CTRL);
++ if (features & NETIF_F_HW_VLAN_RX) {
++ /* enable VLAN tag insert/strip */
++ ctrl |= E1000_CTRL_VME;
++ } else {
++ /* disable VLAN tag insert/strip */
++ ctrl &= ~E1000_CTRL_VME;
++ }
++ ew32(CTRL, ctrl);
++}
+ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
+ bool filter_on)
+ {
+@@ -4562,6 +4579,7 @@ static void e1000_vlan_filter_on_off(str
+ if (!test_bit(__E1000_DOWN, &adapter->flags))
+ e1000_irq_disable(adapter);
+
++ __e1000_vlan_mode(adapter, adapter->netdev->features);
+ if (filter_on) {
+ /* enable VLAN receive filtering */
+ rctl = er32(RCTL);
+@@ -4584,21 +4602,11 @@ static void e1000_vlan_filter_on_off(str
+ static void e1000_vlan_mode(struct net_device *netdev, u32 features)
+ {
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+- struct e1000_hw *hw = &adapter->hw;
+- u32 ctrl;
+
+ if (!test_bit(__E1000_DOWN, &adapter->flags))
+ e1000_irq_disable(adapter);
+
+- ctrl = er32(CTRL);
+- if (features & NETIF_F_HW_VLAN_RX) {
+- /* enable VLAN tag insert/strip */
+- ctrl |= E1000_CTRL_VME;
+- } else {
+- /* disable VLAN tag insert/strip */
+- ctrl &= ~E1000_CTRL_VME;
+- }
+- ew32(CTRL, ctrl);
++ __e1000_vlan_mode(adapter, features);
+
+ if (!test_bit(__E1000_DOWN, &adapter->flags))
+ e1000_irq_enable(adapter);
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Wed Oct 24 14:29:13 2012 (r19458)
+++ dists/sid/linux/debian/patches/series Sun Oct 28 02:12:02 2012 (r19459)
@@ -408,3 +408,5 @@
bugfix/all/use-clamp_t-in-UNAME26-fix.patch
bugfix/x86/ALSA-hda-Fix-oops-caused-by-recent-commit-Fix-intern.patch
debian/fs-writeback-avoid-ABI-change-in-3.2.32.patch
+e1000-fix-vlan-processing-regression.patch
+drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
More information about the Kernel-svn-changes
mailing list