rpms/kernel/devel linux-2.6-ps3-ehci-iso.patch, 1.2, 1.3 kernel.spec, 1.314, 1.315
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Fri Dec 14 16:53:02 UTC 2007
Author: dwmw2
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23351
Modified Files:
kernel.spec
Added Files:
linux-2.6-ps3-ehci-iso.patch
Log Message:
fix oprofile -- the Cell support prevented loading the module on !cell
Clean up PPC patches in specfile according to upstream status
linux-2.6-ps3-ehci-iso.patch:
Index: linux-2.6-ps3-ehci-iso.patch
===================================================================
RCS file: linux-2.6-ps3-ehci-iso.patch
diff -N linux-2.6-ps3-ehci-iso.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-ps3-ehci-iso.patch 14 Dec 2007 16:52:50 -0000 1.3
@@ -0,0 +1,80 @@
+From: Masashi Kimoto <Masashi_Kimoto at hq.scei.sony.co.jp>
+
+When we use Linux git tree on PS3 we face a error msg from
+ps3-ehci-driver,
+ ps3-ehci-driver sb_04: port 1 resume error -19
+ hub 2-0:1.0: hub_port_status failed (err = -32)
+ ...
+Built-in Bluetooth uses a USB isochronous and causes this error.
+
+USB host controller refers TD after echi driver modify it's Periodic Frame
+List.
+Because of this, NULLed TD is asscessed and causes USB error.
+
+In this patch the driver holds the TD while host controller refers the
+list after Active bit=0.
+
+From: Masashi Kimoto <Masashi_Kimoto at hq.scei.sony.co.jp>
+Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
+
+---
+ drivers/usb/host/ehci-sched.c | 30 ++++++++++++++++++++++++++++++
+ 1 files changed, 30 insertions(+)
+
+--- a/drivers/usb/host/ehci-sched.c
++++ b/drivers/usb/host/ehci-sched.c
+@@ -21,6 +21,10 @@
+
+ /*-------------------------------------------------------------------------*/
+
++#ifdef CONFIG_PPC_PS3
++#include <asm/firmware.h>
++#endif
++
+ /*
+ * EHCI scheduled transaction support: interrupt, iso, split iso
+ * These are called "periodic" transactions in the EHCI spec.
+@@ -1302,8 +1306,21 @@ itd_urb_transaction (
+ if (likely (!list_empty(&stream->free_list))) {
+ itd = list_entry (stream->free_list.prev,
+ struct ehci_itd, itd_list);
++#ifdef CONFIG_PPC_PS3
++ /* Fix for Cell SCC ISO transfer (PS3 Bluetooth). */
++ if (firmware_has_feature(FW_FEATURE_PS3_LV1)
++ && itd->frame == ((ehci_readl(ehci,
++ &ehci->regs->frame_index) >> 3)
++ % ehci->periodic_size))
++ itd = NULL;
++ else {
++ list_del (&itd->itd_list);
++ itd_dma = itd->itd_dma;
++ }
++#else
+ list_del (&itd->itd_list);
+ itd_dma = itd->itd_dma;
++#endif
+ } else
+ itd = NULL;
+
+@@ -1922,8 +1939,21 @@ sitd_urb_transaction (
+ if (!list_empty(&stream->free_list)) {
+ sitd = list_entry (stream->free_list.prev,
+ struct ehci_sitd, sitd_list);
++#ifdef CONFIG_PPC_PS3
++ /* Fix for Cell SCC ISO transfer (PS3 Bluetooth). */
++ if (firmware_has_feature(FW_FEATURE_PS3_LV1)
++ && sitd->frame == ((ehci_readl(ehci,
++ &ehci->regs->frame_index) >> 3)
++ % ehci->periodic_size))
++ sitd = NULL;
++ else {
++ list_del (&sitd->sitd_list);
++ sitd_dma = sitd->sitd_dma;
++ }
++#else
+ list_del (&sitd->sitd_list);
+ sitd_dma = sitd->sitd_dma;
++#endif
+ } else
+ sitd = NULL;
+
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- kernel.spec 14 Dec 2007 07:46:05 -0000 1.314
+++ kernel.spec 14 Dec 2007 16:52:50 -0000 1.315
@@ -581,21 +581,22 @@
Patch85: linux-2.6-alsa-rc4-mm1.patch
Patch86: linux-2.6-alsa-support-sis7019.patch
-Patch100: linux-2.6-g5-therm-shutdown.patch
-Patch101: linux-2.6-powerpc-bootwrapper.patch
-Patch110: linux-2.6-pasemi-for-2.6.25.patch
-Patch111: linux-2.6-pasemi-reserve-i2c.patch
-Patch112: linux-2.6-ps3-storage-alias.patch
-Patch113: linux-2.6-ps3-legacy-bootloader-hack.patch
-Patch120: linux-2.6-ppc-rtc.patch
-Patch130: linux-2.6-gelic-fixups.patch
-Patch131: linux-2.6-gelic-wireless-v2.patch
-Patch132: linux-2.6-gelic-wireless-fix.patch
-Patch135: linux-2.6-powerpc-generic-suspend-001-pmu-no-lock-kernel.patch
-Patch136: linux-2.6-powerpc-generic-suspend-002-pmu-remove-dead-code.patch
-Patch137: linux-2.6-powerpc-generic-suspend-003-remove-adb-sleep-notifier.patch
-Patch138: linux-2.6-powerpc-generic-suspend-004-kill-pmu-sleep-notifier.patch
-Patch139: linux-2.6-powerpc-generic-suspend-005-proper-sleep-management.patch
+Patch120: linux-2.6-powerpc-bootwrapper.patch
+Patch121: linux-2.6-pasemi-for-2.6.25.patch
+Patch122: linux-2.6-pasemi-reserve-i2c.patch
+Patch123: linux-2.6-ppc-rtc.patch
+Patch124: linux-2.6-gelic-fixups.patch
+Patch125: linux-2.6-gelic-wireless-v2.patch
+Patch126: linux-2.6-gelic-wireless-fix.patch
+Patch130: linux-2.6-powerpc-generic-suspend-001-pmu-no-lock-kernel.patch
+Patch131: linux-2.6-powerpc-generic-suspend-002-pmu-remove-dead-code.patch
+Patch132: linux-2.6-powerpc-generic-suspend-003-remove-adb-sleep-notifier.patch
+Patch133: linux-2.6-powerpc-generic-suspend-004-kill-pmu-sleep-notifier.patch
+Patch134: linux-2.6-powerpc-generic-suspend-005-proper-sleep-management.patch
+Patch140: linux-2.6-ps3-ehci-iso.patch
+Patch141: linux-2.6-ps3-storage-alias.patch
+Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch
+Patch143: linux-2.6-g5-therm-shutdown.patch
Patch150: linux-2.6-build-nonintconfig.patch
Patch160: linux-2.6-execshield.patch
@@ -1010,8 +1011,7 @@
#
# PowerPC
#
-# Alleviate G5 thermal shutdown problems
-ApplyPatch linux-2.6-g5-therm-shutdown.patch
+### UPSTREAM PATCHES FROM 2.6.25 (we think):
# Export bootwrapper for userspace to use
ApplyPatch linux-2.6-powerpc-bootwrapper.patch
# PA Semi updates
@@ -1019,20 +1019,31 @@
ApplyPatch linux-2.6-pasemi-reserve-i2c.patch
# RTC class driver for ppc_md rtc functions
ApplyPatch linux-2.6-ppc-rtc.patch
-# PlayStation support
-ApplyPatch linux-2.6-ps3-storage-alias.patch
-ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
+# PlayStation wireless support
ApplyPatch linux-2.6-gelic-fixups.patch
ApplyPatch linux-2.6-gelic-wireless-v2.patch
ApplyPatch linux-2.6-gelic-wireless-fix.patch
-# Suspend through /sys/power/state (due in 2.6.25; yay)
+# Suspend through /sys/power/state
ApplyPatch linux-2.6-powerpc-generic-suspend-001-pmu-no-lock-kernel.patch
ApplyPatch linux-2.6-powerpc-generic-suspend-002-pmu-remove-dead-code.patch
ApplyPatch linux-2.6-powerpc-generic-suspend-003-remove-adb-sleep-notifier.patch
ApplyPatch linux-2.6-powerpc-generic-suspend-004-kill-pmu-sleep-notifier.patch
ApplyPatch linux-2.6-powerpc-generic-suspend-005-proper-sleep-management.patch
+### NOT (YET) UPSTREAM:
+# The EHCI ISO patch isn't yet upstream but is needed to fix reboot
+ApplyPatch linux-2.6-ps3-ehci-iso.patch
+# The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
+# module name to work on upgrades. Otherwise, I believe mkinitrd will fail
+# to pull the module in,
+ApplyPatch linux-2.6-ps3-storage-alias.patch
+# Support booting from Sony's original released 2.6.16-based kboot
+ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
+# Alleviate G5 thermal shutdown problems
+ApplyPatch linux-2.6-g5-therm-shutdown.patch
+#
# Exec shield
+#
ApplyPatch linux-2.6-execshield.patch
#
@@ -1731,6 +1742,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Fri Dec 14 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix OProfile on non-Cell ppc64
+
* Fri Dec 14 2007 Dave Jones <davej at redhat.com>
- Anaconda still needs the old sysfs files, so reenable SYSFS_DEPRECATED
for now.
More information about the fedora-extras-commits
mailing list