3.7.5-101.fc17.gnu

11 files changed, 117 insertions, 222 deletions

diff --git a/freed-ora/current/f17/Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch b/freed-ora/current/f17/Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
new file mode 100644
index 000000000..302774b45
--- /dev/null
+++ b/freed-ora/current/f17/Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
@@ -0,0 +1,68 @@
+From ae023b2795d36f0f077e157428eb7eafa29ee412 Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Mon, 21 Jan 2013 13:12:57 +0200
+Subject: [PATCH] Revert "iwlwifi: fix the reclaimed packet tracking upon
+ flush queue"
+
+This reverts commit f590dcec944552f9a4a61155810f3abd17d6465d
+which has been reported to cause issues.
+
+See https://lkml.org/lkml/2013/1/20/4 for further details.
+
+Cc: stable@vger.kernel.org [3.7]
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ drivers/net/wireless/iwlwifi/dvm/tx.c |   24 +++++++-----------------
+ 1 files changed, 7 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
+index 31534f7..2797964 100644
+--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
++++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
+@@ -1153,6 +1153,13 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
+ 			next_reclaimed = ssn;
+ 		}
+ 
++		if (tid != IWL_TID_NON_QOS) {
++			priv->tid_data[sta_id][tid].next_reclaimed =
++				next_reclaimed;
++			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
++						  next_reclaimed);
++		}
++
+ 		iwl_trans_reclaim(priv->trans, txq_id, ssn, &skbs);
+ 
+ 		iwlagn_check_ratid_empty(priv, sta_id, tid);
+@@ -1203,28 +1210,11 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
+ 			if (!is_agg)
+ 				iwlagn_non_agg_tx_status(priv, ctx, hdr->addr1);
+ 
+-			/*
+-			 * W/A for FW bug - the seq_ctl isn't updated when the
+-			 * queues are flushed. Fetch it from the packet itself
+-			 */
+-			if (!is_agg && status == TX_STATUS_FAIL_FIFO_FLUSHED) {
+-				next_reclaimed = le16_to_cpu(hdr->seq_ctrl);
+-				next_reclaimed =
+-					SEQ_TO_SN(next_reclaimed + 0x10);
+-			}
+-
+ 			is_offchannel_skb =
+ 				(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN);
+ 			freed++;
+ 		}
+ 
+-		if (tid != IWL_TID_NON_QOS) {
+-			priv->tid_data[sta_id][tid].next_reclaimed =
+-				next_reclaimed;
+-			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
+-					   next_reclaimed);
+-		}
+-
+ 		WARN_ON(!is_agg && freed != 1);
+ 
+ 		/*
+-- 
+1.7.6.5
+
diff --git a/freed-ora/current/f17/config-armv7 b/freed-ora/current/f17/config-armv7
index f143f3dee..4e1be85f0 100644
--- a/freed-ora/current/f17/config-armv7
+++ b/freed-ora/current/f17/config-armv7
@@ -160,7 +160,13 @@ CONFIG_OC_ETM=y
 CONFIG_SATA_HIGHBANK=m
 
 # versatile
+CONFIG_FB=y
 CONFIG_FB_ARMCLCD=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+
 CONFIG_I2C_VERSATILE=m
 CONFIG_OC_ETM=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
diff --git a/freed-ora/current/f17/config-x86-32-generic b/freed-ora/current/f17/config-x86-32-generic
index 1216d47e6..3273fd151 100644
--- a/freed-ora/current/f17/config-x86-32-generic
+++ b/freed-ora/current/f17/config-x86-32-generic
@@ -94,6 +94,8 @@ CONFIG_X86_TRAMPOLINE=y
 
 CONFIG_PCI_DIRECT=y
 
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
diff --git a/freed-ora/current/f17/config-x86-generic b/freed-ora/current/f17/config-x86-generic
index ae1c37f2e..6e1330376 100644
--- a/freed-ora/current/f17/config-x86-generic
+++ b/freed-ora/current/f17/config-x86-generic
@@ -390,8 +390,6 @@ CONFIG_X86_RESERVE_LOW=64
 CONFIG_PCH_GBE=m
 CONFIG_PCH_PHUB=m
 
-CONFIG_TRANSPARENT_HUGEPAGE=y
-
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 
diff --git a/freed-ora/current/f17/config-x86_64-generic b/freed-ora/current/f17/config-x86_64-generic
index 6003f11c0..2e4195d5b 100644
--- a/freed-ora/current/f17/config-x86_64-generic
+++ b/freed-ora/current/f17/config-x86_64-generic
@@ -27,6 +27,8 @@ CONFIG_AMD_IOMMU_V2=m
 CONFIG_SWIOTLB=y
 # CONFIG_CALGARY_IOMMU is not set
 
+CONFIG_TRANSPARENT_HUGEPAGE=y
+
 CONFIG_KEXEC_JUMP=y
 
 CONFIG_ACPI_BLACKLIST_YEAR=0
diff --git a/freed-ora/current/f17/drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch b/freed-ora/current/f17/drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch
deleted file mode 100644
index be557dc9d..000000000
--- a/freed-ora/current/f17/drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 262b6d363fcff16359c93bd58c297f961f6e6273
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Tue Jan 15 16:17:54 2013 +0000
-
-    drm/i915: Invalidate the relocation presumed_offsets along the slow path
-    
-    In the slow path, we are forced to copy the relocations prior to
-    acquiring the struct mutex in order to handle pagefaults. We forgo
-    copying the new offsets back into the relocation entries in order to
-    prevent a recursive locking bug should we trigger a pagefault whilst
-    holding the mutex for the reservations of the execbuffer. Therefore, we
-    need to reset the presumed_offsets just in case the objects are rebound
-    back into their old locations after relocating for this exexbuffer - if
-    that were to happen we would assume the relocations were valid and leave
-    the actual pointers to the kernels dangling, instant hang.
-    
-    Fixes regression from commit bcf50e2775bbc3101932d8e4ab8c7902aa4163b4
-    Author: Chris Wilson <chris@chris-wilson.co.uk>
-    Date:   Sun Nov 21 22:07:12 2010 +0000
-    
-        drm/i915: Handle pagefaults in execbuffer user relocations
-    
-    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55984
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-    Cc: Daniel Vetter <daniel.vetter@fwll.ch>
-    Cc: stable@vger.kernel.org
-    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-
-diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index d6a994a..26d08bb 100644
---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -539,6 +539,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
- 	total = 0;
- 	for (i = 0; i < count; i++) {
- 		struct drm_i915_gem_relocation_entry __user *user_relocs;
-+		u64 invalid_offset = (u64)-1;
-+		int j;
-
- 		user_relocs = (void __user *)(uintptr_t)exec[i].relocs_ptr;
-
-@@ -549,6 +551,25 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
- 			goto err;
- 		}
-
-+		/* As we do not update the known relocation offsets after
-+		 * relocating (due to the complexities in lock handling),
-+		 * we need to mark them as invalid now so that we force the
-+		 * relocation processing next time. Just in case the target
-+		 * object is evicted and then rebound into its old
-+		 * presumed_offset before the next execbuffer - if that
-+		 * happened we would make the mistake of assuming that the
-+		 * relocations were valid.
-+		 */
-+		for (j = 0; j < exec[i].relocation_count; j++) {
-+			if (copy_to_user(&user_relocs[j].presumed_offset,
-+					 &invalid_offset,
-+					 sizeof(invalid_offset))) {
-+				ret = -EFAULT;
-+				mutex_lock(&dev->struct_mutex);
-+				goto err;
-+			}
-+		}
-+
- 		reloc_offset[i] = total;
- 		total += exec[i].relocation_count;
- 	}
diff --git a/freed-ora/current/f17/kernel.spec b/freed-ora/current/f17/kernel.spec
index ceedd4a68..c2331120a 100644
--- a/freed-ora/current/f17/kernel.spec
+++ b/freed-ora/current/f17/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 104
+%global baserelease 101
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -104,7 +104,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -805,15 +805,12 @@ Patch21233: 8139cp-re-enable-interrupts-after-tx-timeout.patch
 #rhbz 886946
 Patch21241: iwlegacy-fix-IBSS-cleanup.patch
 
-#rhbz 902523
-Patch21236: libata-replace-sata_settings-with-devslp_timing.patch
-
-#i915 hang fixes
-Patch21237: drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch
-
 #rhbz 892428
 Patch21238: brcmsmac-updates-rhbz892428.patch
 
+#rhbz 863424
+Patch21239: Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1576,15 +1573,12 @@ ApplyPatch 8139cp-re-enable-interrupts-after-tx-timeout.patch
 #rhbz 886946
 ApplyPatch iwlegacy-fix-IBSS-cleanup.patch
 
-#rhbz 902523
-ApplyPatch libata-replace-sata_settings-with-devslp_timing.patch
-
-#i915
-ApplyPatch drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch
-
 #rhbz 892428
 ApplyPatch brcmsmac-updates-rhbz892428.patch
 
+#rhbz 863424
+ApplyPatch Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1714,6 +1708,10 @@ BuildKernel() {
 %ifarch %{arm}
     # http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html
     make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags} KALLSYMS_EXTRA_PASS=1
+
+    make -s ARCH=$Arch V=1 dtbs
+    mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
+    install -m 644 arch/arm/boot/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
 %else
     make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
 %endif
@@ -2383,6 +2381,9 @@ fi
 %defattr(-,root,root)\
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
 /%{image_install_path}/.vmlinuz-%{KVERREL}%{?2:.%{2}}.hmac \
+%ifarch %{arm}\
+/%{image_install_path}/dtb-%{KVERREL}%{?2:.%{2}} \
+%endif\
 %attr(600,root,root) /boot/System.map-%{KVERREL}%{?2:.%{2}}\
 /boot/config-%{KVERREL}%{?2:.%{2}}\
 %dir /lib/modules/%{KVERREL}%{?2:.%{2}}\
@@ -2444,6 +2445,22 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon Jan 28 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 3.7.5-gnu.
+
+* Mon Jan 28 2013 Justin M. Forbes <jforbes@redhat.com> - 3.7.5-101
+- Linux v3.7.5
+
+* Mon Jan 28 2013 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix iwlwifi issues (rhbz 863424)
+
+* Sun Jan 27 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Build and package dtbs on ARM
+- Enable FB options for qemu vexpress on unified
+
+* Fri Jan 25 2013 Justin M. Forbes <jforbes@redhat.com>
+- Turn off THP for 32bit
+
 * Wed Jan 23 2013 Justin M. Forbes <jforbes@redhat.com> - 3.7.4-104
 - brcmsmac fixes from upstream (rhbz 892428)
 
diff --git a/freed-ora/current/f17/libata-replace-sata_settings-with-devslp_timing.patch b/freed-ora/current/f17/libata-replace-sata_settings-with-devslp_timing.patch
deleted file mode 100644
index f620a20bd..000000000
--- a/freed-ora/current/f17/libata-replace-sata_settings-with-devslp_timing.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 803739d25c2343da6d2f95eebdcbc08bf67097d4 Mon Sep 17 00:00:00 2001
-From: Shane Huang <shane.huang@amd.com>
-Date: Mon, 17 Dec 2012 23:18:59 +0800
-Subject: [PATCH] [libata] replace sata_settings with devslp_timing
-
-NCQ capability was used to check availability of SATA Settings page
-from Identify Device Data Log, which contains DevSlp timing variables.
-It does not work on some HDDs and leads to error messages.
-
-IDENTIFY word 78 bit 5(Hardware Feature Control) can't work either
-because it is only the sufficient condition of Identify Device data
-log, not the necessary condition.
-
-This patch replaced ata_device->sata_settings with ->devslp_timing
-to only save DevSlp timing variables(8 bytes), instead of the whole
-SATA Settings page(512 bytes).
-
-Addresses https://bugzilla.kernel.org/show_bug.cgi?id=51881
-
-Reported-by: Borislav Petkov <bp@alien8.de>
-Signed-off-by: Shane Huang <shane.huang@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
----
- drivers/ata/libahci.c     |    6 +++---
- drivers/ata/libata-core.c |   22 +++++++++++++---------
- include/linux/ata.h       |    8 +++++---
- include/linux/libata.h    |    4 ++--
- 4 files changed, 23 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index 320712a..6cd7805 100644
---- a/drivers/ata/libahci.c
-+++ b/drivers/ata/libahci.c
-@@ -1951,13 +1951,13 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)
- 	/* Use the nominal value 10 ms if the read MDAT is zero,
- 	 * the nominal value of DETO is 20 ms.
- 	 */
--	if (dev->sata_settings[ATA_LOG_DEVSLP_VALID] &
-+	if (dev->devslp_timing[ATA_LOG_DEVSLP_VALID] &
- 	    ATA_LOG_DEVSLP_VALID_MASK) {
--		mdat = dev->sata_settings[ATA_LOG_DEVSLP_MDAT] &
-+		mdat = dev->devslp_timing[ATA_LOG_DEVSLP_MDAT] &
- 		       ATA_LOG_DEVSLP_MDAT_MASK;
- 		if (!mdat)
- 			mdat = 10;
--		deto = dev->sata_settings[ATA_LOG_DEVSLP_DETO];
-+		deto = dev->devslp_timing[ATA_LOG_DEVSLP_DETO];
- 		if (!deto)
- 			deto = 20;
- 	} else {
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 9e8b99a..46cd3f4 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -2325,24 +2325,28 @@ int ata_dev_configure(struct ata_device *dev)
- 			}
- 		}
- 
--		/* check and mark DevSlp capability */
--		if (ata_id_has_devslp(dev->id))
--			dev->flags |= ATA_DFLAG_DEVSLP;
--
--		/* Obtain SATA Settings page from Identify Device Data Log,
--		 * which contains DevSlp timing variables etc.
--		 * Exclude old devices with ata_id_has_ncq()
-+		/* Check and mark DevSlp capability. Get DevSlp timing variables
-+		 * from SATA Settings page of Identify Device Data Log.
- 		 */
--		if (ata_id_has_ncq(dev->id)) {
-+		if (ata_id_has_devslp(dev->id)) {
-+			u8 sata_setting[ATA_SECT_SIZE];
-+			int i, j;
-+
-+			dev->flags |= ATA_DFLAG_DEVSLP;
- 			err_mask = ata_read_log_page(dev,
- 						     ATA_LOG_SATA_ID_DEV_DATA,
- 						     ATA_LOG_SATA_SETTINGS,
--						     dev->sata_settings,
-+						     sata_setting,
- 						     1);
- 			if (err_mask)
- 				ata_dev_dbg(dev,
- 					    "failed to get Identify Device Data, Emask 0x%x\n",
- 					    err_mask);
-+			else
-+				for (i = 0; i < ATA_LOG_DEVSLP_SIZE; i++) {
-+					j = ATA_LOG_DEVSLP_OFFSET + i;
-+					dev->devslp_timing[i] = sata_setting[j];
-+				}
- 		}
- 
- 		dev->cdb_len = 16;
-diff --git a/include/linux/ata.h b/include/linux/ata.h
-index 408da95..8f7a3d6 100644
---- a/include/linux/ata.h
-+++ b/include/linux/ata.h
-@@ -297,10 +297,12 @@ enum {
- 	ATA_LOG_SATA_NCQ	= 0x10,
- 	ATA_LOG_SATA_ID_DEV_DATA  = 0x30,
- 	ATA_LOG_SATA_SETTINGS	  = 0x08,
--	ATA_LOG_DEVSLP_MDAT	  = 0x30,
-+	ATA_LOG_DEVSLP_OFFSET	  = 0x30,
-+	ATA_LOG_DEVSLP_SIZE	  = 0x08,
-+	ATA_LOG_DEVSLP_MDAT	  = 0x00,
- 	ATA_LOG_DEVSLP_MDAT_MASK  = 0x1F,
--	ATA_LOG_DEVSLP_DETO	  = 0x31,
--	ATA_LOG_DEVSLP_VALID	  = 0x37,
-+	ATA_LOG_DEVSLP_DETO	  = 0x01,
-+	ATA_LOG_DEVSLP_VALID	  = 0x07,
- 	ATA_LOG_DEVSLP_VALID_MASK = 0x80,
- 
- 	/* READ/WRITE LONG (obsolete) */
-diff --git a/include/linux/libata.h b/include/linux/libata.h
-index 83ba0ab..649e5f8 100644
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -652,8 +652,8 @@ struct ata_device {
- 		u32		gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */
- 	};
- 
--	/* Identify Device Data Log (30h), SATA Settings (page 08h) */
--	u8			sata_settings[ATA_SECT_SIZE];
-+	/* DEVSLP Timing Variables from Identify Device Data Log */
-+	u8			devslp_timing[ATA_LOG_DEVSLP_SIZE];
- 
- 	/* error history */
- 	int			spdn_cnt;
--- 
-1.7.7.6
-
diff --git a/freed-ora/current/f17/patch-3.7-gnu-3.7.4-gnu.xz.sign b/freed-ora/current/f17/patch-3.7-gnu-3.7.4-gnu.xz.sign
deleted file mode 100644
index bca404ed3..000000000
--- a/freed-ora/current/f17/patch-3.7-gnu-3.7.4-gnu.xz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEABECAAYFAlD+Ej4ACgkQvLfPh359R6eHlQCfeKOO59D4Rx1fQsHfe4e8pCZ0
-sggAn3gs407gfpseaOXqrRd6+J14PTNe
-=JF0E
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f17/patch-3.7-gnu-3.7.5-gnu.xz.sign b/freed-ora/current/f17/patch-3.7-gnu-3.7.5-gnu.xz.sign
new file mode 100644
index 000000000..aa0c683fa
--- /dev/null
+++ b/freed-ora/current/f17/patch-3.7-gnu-3.7.5-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEUEABECAAYFAlEG2NkACgkQvLfPh359R6epogCeLxB6RP638k+3A8UyzxI9sGTx
+7M0AmM8KQO+zHvOYEocTSPg4PmIIp14=
+=qWD4
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f17/sources b/freed-ora/current/f17/sources
index 906b2adec..07cd1dc66 100644
--- a/freed-ora/current/f17/sources
+++ b/freed-ora/current/f17/sources
@@ -1,2 +1,2 @@
 06bf9601d859531e7378eb43d4ca7dd3  linux-libre-3.7-gnu.tar.xz
-0ce6896b7069cb5aaf444318d8db3885  patch-3.7-gnu-3.7.4-gnu.xz
+9de11fba7c68f3588ce01f03f48ff395  patch-3.7-gnu-3.7.5-gnu.xz