rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Mon Aug 02 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.17-155.rc1 

- Linux 2.6.32.17-rc1
- Comment out patches merged upstream:
    linux-2.6-ext4-quota-metadata-reservation.patch
    ext4-issue-discard-operation-before-releasing-blocks.patch
    mac80211-do-not-wipe-out-old-supported-rates.patch
    mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
    iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
    sched-fix-over-scheduling-bug.patch
    ethtool-fix-buffer-overflow.patch
    cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
    usb-obey-the-sysfs-power-wakeup-setting.patch
- Revert -stable patches we already have:
    drm-i915-enable-low-power-render-writes-on-gen3-hardware.patch
    drm-i915-define-mi_arb_state-bits.patch
- Comment out due to conflicts with -stable:
    ssb_check_for_sprom.patch
This commit is contained in:
Chuck Ebbert 2010-08-02 18:00:48 -04:00
parent 58fa2b1e04
commit 3b624ed511
4 changed files with 178 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
kernel.spec
View File

@ -47,7 +47,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
%global baserelease 154
%global baserelease 155
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -59,9 +59,9 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
%define stable_update 16
%define stable_update 17
# Is it a -stable RC?
%define stable_rc 0
%define stable_rc 1
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@ -1333,7 +1333,7 @@ ApplyPatch linux-2.6-execshield.patch
#
# ext4
ApplyPatch linux-2.6-ext4-quota-metadata-reservation.patch
#ApplyPatch linux-2.6-ext4-quota-metadata-reservation.patch
# xfs
@ -1525,7 +1525,7 @@ ApplyPatch ice1712-fix-revo71-mixer-names.patch
ApplyPatch linux-2.6-b43_-Rewrite-DMA-Tx-status-handling-sanity-checks.patch
# rhbz#533746
ApplyPatch ssb_check_for_sprom.patch
#ApplyPatch ssb_check_for_sprom.patch
# backport iwlwifi fixes (thanks, sgruszka!) -- drop when stable catches-up
ApplyPatch iwlwifi-reset-card-during-probe.patch
@ -1545,7 +1545,7 @@ ApplyPatch iwlwifi_-code-cleanup-for-connectivity-recovery.patch
ApplyPatch iwlwifi_-iwl_good_ack_health-only-apply-to-AGN-device.patch
# fix possible corruption with ssd
ApplyPatch ext4-issue-discard-operation-before-releasing-blocks.patch
#ApplyPatch ext4-issue-discard-operation-before-releasing-blocks.patch
# iwlwifi: fix scan races
ApplyPatch iwlwifi-fix-scan-races.patch
@ -1557,20 +1557,20 @@ ApplyPatch iwlwifi-recover_from_tx_stall.patch
# mac80211/iwlwifi fix connections to some APs (rhbz#558002)
ApplyPatch mac80211-explicitly-disable-enable-QoS.patch
ApplyPatch iwlwifi-manage-QoS-by-mac-stack.patch
ApplyPatch mac80211-do-not-wipe-out-old-supported-rates.patch
ApplyPatch mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
#ApplyPatch mac80211-do-not-wipe-out-old-supported-rates.patch
#ApplyPatch mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
# iwlwifi: cancel scan watchdog in iwl_bg_abort_scan
ApplyPatch iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
#ApplyPatch iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
# l2tp: fix oops in pppol2tp_xmit (#607054)
ApplyPatch l2tp-fix-oops-in-pppol2tp_xmit.patch
# fix performance problem with CGROUPS
ApplyPatch sched-fix-over-scheduling-bug.patch
#ApplyPatch sched-fix-over-scheduling-bug.patch
# CVE-2010-2478
ApplyPatch ethtool-fix-buffer-overflow.patch
#ApplyPatch ethtool-fix-buffer-overflow.patch
# fix broken oneshot support and missing umount events (F13#607327)
ApplyPatch inotify-fix-inotify-oneshot-support.patch
@ -1582,14 +1582,14 @@ ApplyPatch crypto-testmgr-add-null-test-for-aesni.patch
ApplyPatch crypto-add-async-hash-testing.patch
# CVE-2010-2524
ApplyPatch cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
#ApplyPatch cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
# CVE-2010-2066
ApplyPatch ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch
# CVE-2010-2266
ApplyPatch xfs-prevent-swapext-from-operating-on-write-only-files.patch
# fix broken USB device wakeups (#617559)
ApplyPatch usb-obey-the-sysfs-power-wakeup-setting.patch
#ApplyPatch usb-obey-the-sysfs-power-wakeup-setting.patch
ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
@ -2243,6 +2243,24 @@ fi
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
* Mon Aug 02 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.17-155.rc1
- Linux 2.6.32.17-rc1
- Comment out patches merged upstream:
linux-2.6-ext4-quota-metadata-reservation.patch
ext4-issue-discard-operation-before-releasing-blocks.patch
mac80211-do-not-wipe-out-old-supported-rates.patch
mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
sched-fix-over-scheduling-bug.patch
ethtool-fix-buffer-overflow.patch
cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
usb-obey-the-sysfs-power-wakeup-setting.patch
- Revert -stable patches we already have:
drm-i915-enable-low-power-render-writes-on-gen3-hardware.patch
drm-i915-define-mi_arb_state-bits.patch
- Comment out due to conflicts with -stable:
ssb_check_for_sprom.patch
* Tue Jul 27 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.16-154
- xfs-prevent-swapext-from-operating-on-write-only-files.patch:
CVE-2010-2266

0
linux-2.6-imac-transparent-bridge.patch Executable file → Normal file
View File

146
linux-2.6-upstream-reverts.patch
View File

@ -1,3 +1,149 @@
From 944001201ca0196bcdb088129e5866a9f379d08c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Jul 2010 13:15:31 +1000
Subject: drm/i915: enable low power render writes on GEN3 hardware.
From: Dave Airlie <airlied@redhat.com>
commit 944001201ca0196bcdb088129e5866a9f379d08c upstream.
A lot of 945GMs have had stability issues for a long time, this manifested as X hangs, blitter engine hangs, and lots of crashes.
one such report is at:
https://bugs.freedesktop.org/show_bug.cgi?id=20560
along with numerous distro bugzillas.
This only took a week of digging and hair ripping to figure out.
Tracked down and tested on a 945GM Lenovo T60,
previously running
x11perf -copypixwin500
or
x11perf -copywinpix500
repeatedly would cause the GPU to wedge within 4 or 5 tries, with random busy bits set.
After this patch no hangs were observed.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/gpu/drm/i915/i915_gem.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4697,6 +4697,16 @@ i915_gem_load(struct drm_device *dev)
list_add(&dev_priv->mm.shrink_list, &shrink_list);
spin_unlock(&shrink_list_lock);
+ /* On GEN3 we really need to make sure the ARB C3 LP bit is set */
+ if (IS_I915G(dev) || IS_I915GM(dev) || IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) {
+ u32 tmp = I915_READ(MI_ARB_STATE);
+ if (!(tmp & MI_ARB_C3_LP_WRITE_ENABLE)) {
+ /* arb state is a masked write, so set bit + bit in mask */
+ tmp = MI_ARB_C3_LP_WRITE_ENABLE | (MI_ARB_C3_LP_WRITE_ENABLE << MI_ARB_MASK_SHIFT);
+ I915_WRITE(MI_ARB_STATE, tmp);
+ }
+ }
+
/* Old X drivers will take 0-2 for front, back, depth buffers */
dev_priv->fence_reg_start = 3;
From 45503ded966c98e604c9667c0b458d40666b9ef3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 19 Jul 2010 21:12:35 -0700
Subject: drm/i915: Define MI_ARB_STATE bits
From: Keith Packard <keithp@keithp.com>
commit 45503ded966c98e604c9667c0b458d40666b9ef3 upstream.
The i915 memory arbiter has a register full of configuration
bits which are currently not defined in the driver header file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/gpu/drm/i915/i915_reg.h | 64 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -307,6 +307,70 @@
#define LM_BURST_LENGTH 0x00000700
#define LM_FIFO_WATERMARK 0x0000001F
#define MI_ARB_STATE 0x020e4 /* 915+ only */
+#define MI_ARB_MASK_SHIFT 16 /* shift for enable bits */
+
+/* Make render/texture TLB fetches lower priorty than associated data
+ * fetches. This is not turned on by default
+ */
+#define MI_ARB_RENDER_TLB_LOW_PRIORITY (1 << 15)
+
+/* Isoch request wait on GTT enable (Display A/B/C streams).
+ * Make isoch requests stall on the TLB update. May cause
+ * display underruns (test mode only)
+ */
+#define MI_ARB_ISOCH_WAIT_GTT (1 << 14)
+
+/* Block grant count for isoch requests when block count is
+ * set to a finite value.
+ */
+#define MI_ARB_BLOCK_GRANT_MASK (3 << 12)
+#define MI_ARB_BLOCK_GRANT_8 (0 << 12) /* for 3 display planes */
+#define MI_ARB_BLOCK_GRANT_4 (1 << 12) /* for 2 display planes */
+#define MI_ARB_BLOCK_GRANT_2 (2 << 12) /* for 1 display plane */
+#define MI_ARB_BLOCK_GRANT_0 (3 << 12) /* don't use */
+
+/* Enable render writes to complete in C2/C3/C4 power states.
+ * If this isn't enabled, render writes are prevented in low
+ * power states. That seems bad to me.
+ */
+#define MI_ARB_C3_LP_WRITE_ENABLE (1 << 11)
+
+/* This acknowledges an async flip immediately instead
+ * of waiting for 2TLB fetches.
+ */
+#define MI_ARB_ASYNC_FLIP_ACK_IMMEDIATE (1 << 10)
+
+/* Enables non-sequential data reads through arbiter
+ */
+#define MI_ARB_DUAL_DATA_PHASE_DISABLE (1 << 9)
+
+/* Disable FSB snooping of cacheable write cycles from binner/render
+ * command stream
+ */
+#define MI_ARB_CACHE_SNOOP_DISABLE (1 << 8)
+
+/* Arbiter time slice for non-isoch streams */
+#define MI_ARB_TIME_SLICE_MASK (7 << 5)
+#define MI_ARB_TIME_SLICE_1 (0 << 5)
+#define MI_ARB_TIME_SLICE_2 (1 << 5)
+#define MI_ARB_TIME_SLICE_4 (2 << 5)
+#define MI_ARB_TIME_SLICE_6 (3 << 5)
+#define MI_ARB_TIME_SLICE_8 (4 << 5)
+#define MI_ARB_TIME_SLICE_10 (5 << 5)
+#define MI_ARB_TIME_SLICE_14 (6 << 5)
+#define MI_ARB_TIME_SLICE_16 (7 << 5)
+
+/* Low priority grace period page size */
+#define MI_ARB_LOW_PRIORITY_GRACE_4KB (0 << 4) /* default */
+#define MI_ARB_LOW_PRIORITY_GRACE_8KB (1 << 4)
+
+/* Disable display A/B trickle feed */
+#define MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE (1 << 2)
+
+/* Set display plane priority */
+#define MI_ARB_DISPLAY_PRIORITY_A_B (0 << 0) /* display A > display B */
+#define MI_ARB_DISPLAY_PRIORITY_B_A (1 << 0) /* display B > display A */
+
#define CACHE_MODE_0 0x02120 /* 915+ only */
#define CM0_MASK_SHIFT 16
#define CM0_IZ_OPT_DISABLE (1<<6)
From 0725e95ea56698774e893edb7e7276b1d6890954 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <br@blankpage.ch>
Date: Wed, 10 Mar 2010 12:36:43 +0100

1
sources
View File

@ -1,2 +1,3 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2
d85be0216a7c8f0d4321eb9bb583fa5a patch-2.6.32.17-rc1.bz2