svn path=/dists/sid/linux/; revision=19459
This commit is contained in:
parent
b7801fa239
commit
97a28bf87b
|
@ -3,6 +3,9 @@ linux (3.2.32-2) UNRELEASED; urgency=low
|
|||
* [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@decadent.org.uk> Wed, 24 Oct 2012 14:15:57 +0100
|
||||
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
From: Sjoerd Simons <sjoerd.simons@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@collabora.co.uk>
|
||||
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
Signed-off-by: Ben Hutchings <ben@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 */
|
||||
};
|
|
@ -0,0 +1,101 @@
|
|||
From: Jiri Pirko <jpirko@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@candelatech.com>
|
||||
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
|
||||
Tested-by: Ben Greear <greearb@candelatech.com>
|
||||
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
|
||||
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@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@gmail.com>
|
||||
Tested-by: Andrey Jr. Melnikov <temnota@kmv.ru>
|
||||
Signed-off-by: Ben Hutchings <ben@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);
|
|
@ -408,3 +408,5 @@ bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue