rpms/kernel-xen-2.6/devel .cvsignore, 1.5, 1.5.2.1 kernel-xen.spec, 1.30, 1.30.2.1 linux-2.6-usb-endian-ehci.patch, 1.1, 1.1.8.1 sources, 1.5, 1.5.2.1
Eduardo Habkost (ehabkost)
fedora-extras-commits at redhat.com
Thu Jul 12 19:45:46 UTC 2007
Author: ehabkost
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807
Modified Files:
Tag: private-ehabkost-test-branch
.cvsignore kernel-xen.spec linux-2.6-usb-endian-ehci.patch
sources
Log Message:
Rebase to Linux 2.6.20.14
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- .cvsignore 7 May 2007 18:47:08 -0000 1.5
+++ .cvsignore 12 Jul 2007 19:45:14 -0000 1.5.2.1
@@ -1,3 +1,3 @@
linux-2.6.20.tar.bz2
-patch-2.6.20.3.bz2
xen-3.1.0-rc7-7041b52471c3.tar.bz2
+patch-2.6.20.14.bz2
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -r1.30 -r1.30.2.1
--- kernel-xen.spec 12 Jul 2007 15:50:23 -0000 1.30
+++ kernel-xen.spec 12 Jul 2007 19:45:14 -0000 1.30.2.1
@@ -305,7 +305,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.20.3.bz2
+Patch1: patch-2.6.20.14.bz2
Patch3: git-geode.patch
# Patches 10 through 99 are for things that are going upstream really soon.
@@ -2021,6 +2021,9 @@
%changelog
* Thu Jul 12 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Rebase to Linux 2.6.20.14
+
+* Thu Jul 12 2007 Eduardo Habkost <ehabkost at redhat.com>
- Remove #ifdef CONFIG_PM from acpi poweroff code (fix bug #241381)
- BuildRequires: python for xen buildsystem mkheader.py
linux-2.6-usb-endian-ehci.patch:
Index: linux-2.6-usb-endian-ehci.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-usb-endian-ehci.patch,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- linux-2.6-usb-endian-ehci.patch 22 Mar 2007 16:01:16 -0000 1.1
+++ linux-2.6-usb-endian-ehci.patch 12 Jul 2007 19:45:14 -0000 1.1.8.1
@@ -22,10 +22,10 @@
drivers/usb/host/ehci.h | 32 +++++++++++
9 files changed, 212 insertions(+), 142 deletions(-)
-Index: linux-test-x86/drivers/usb/host/ehci-dbg.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-dbg.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-dbg.c 2006-12-13 13:03:44.000000000 +1100
-+++ linux-test-x86/drivers/usb/host/ehci-dbg.c 2006-12-13 13:06:02.000000000 +1100
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-dbg.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-dbg.c
@@ -43,7 +43,7 @@
*/
static void dbg_hcs_params (struct ehci_hcd *ehci, char *label)
@@ -35,7 +35,7 @@
ehci_dbg (ehci,
"%s hcs_params 0x%x dbg=%d%s cc=%d pcc=%d%s%s ports=%d\n",
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ static inline void dbg_hcs_params (struc
* */
static void dbg_hcc_params (struct ehci_hcd *ehci, char *label)
{
@@ -44,7 +44,7 @@
if (HCC_ISOC_CACHE (params)) {
ehci_dbg (ehci,
-@@ -653,7 +653,7 @@
+@@ -653,7 +653,7 @@ show_registers (struct class_device *cla
}
/* Capability Registers */
@@ -53,7 +53,7 @@
temp = scnprintf (next, size,
"bus %s, device %s (driver " DRIVER_VERSION ")\n"
"%s\n"
-@@ -673,7 +673,7 @@
+@@ -673,7 +673,7 @@ show_registers (struct class_device *cla
unsigned count = 256/4;
pdev = to_pci_dev(ehci_to_hcd(ehci)->self.controller);
@@ -62,7 +62,7 @@
while (offset && count--) {
pci_read_config_dword (pdev, offset, &cap);
switch (cap & 0xff) {
-@@ -704,50 +704,50 @@
+@@ -704,50 +704,50 @@ show_registers (struct class_device *cla
#endif
// FIXME interpret both types of params
@@ -121,11 +121,11 @@
size -= temp;
next += temp;
}
-Index: linux-test-x86/drivers/usb/host/Kconfig
+Index: linux-2.6.20.i386.patching/drivers/usb/host/Kconfig
===================================================================
---- linux-test-x86.orig/drivers/usb/host/Kconfig 2006-12-13 13:05:40.000000000 +1100
-+++ linux-test-x86/drivers/usb/host/Kconfig 2006-12-13 13:06:02.000000000 +1100
-@@ -67,6 +67,11 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/Kconfig
++++ linux-2.6.20.i386.patching/drivers/usb/host/Kconfig
+@@ -67,6 +67,11 @@ config USB_EHCI_TT_NEWSCHED
If unsure, say N.
@@ -137,11 +137,11 @@
config USB_ISP116X_HCD
tristate "ISP116X HCD support"
depends on USB
-Index: linux-test-x86/drivers/usb/host/ehci-fsl.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-fsl.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-fsl.c 2006-09-28 20:44:49.000000000 +1000
-+++ linux-test-x86/drivers/usb/host/ehci-fsl.c 2006-12-13 13:06:02.000000000 +1100
-@@ -177,7 +177,7 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-fsl.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-fsl.c
+@@ -177,7 +177,7 @@ static void mpc83xx_setup_phy(struct ehc
case FSL_USB2_PHY_NONE:
break;
}
@@ -150,7 +150,7 @@
}
static void mpc83xx_usb_setup(struct usb_hcd *hcd)
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ static void mpc83xx_usb_setup(struct usb
}
/* put controller in host mode. */
@@ -159,7 +159,7 @@
out_be32(non_ehci + FSL_SOC_USB_PRICTRL, 0x0000000c);
out_be32(non_ehci + FSL_SOC_USB_AGECNTTHRSH, 0x00000040);
out_be32(non_ehci + FSL_SOC_USB_SICTRL, 0x00000001);
-@@ -238,12 +238,12 @@
+@@ -238,12 +238,12 @@ static int ehci_fsl_setup(struct usb_hcd
/* EHCI registers start at offset 0x100 */
ehci->caps = hcd->regs + 0x100;
ehci->regs = hcd->regs + 0x100 +
@@ -174,11 +174,11 @@
retval = ehci_halt(ehci);
if (retval)
-Index: linux-test-x86/drivers/usb/host/ehci-hcd.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-hcd.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-hcd.c 2006-12-13 13:03:44.000000000 +1100
-+++ linux-test-x86/drivers/usb/host/ehci-hcd.c 2006-12-13 13:06:02.000000000 +1100
-@@ -157,12 +157,13 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-hcd.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-hcd.c
+@@ -157,12 +157,13 @@ MODULE_PARM_DESC (ignore_oc, "ignore bog
* before driver shutdown. But it also seems to be caused by bugs in cardbus
* bridge shutdown: shutting down the bridge before the devices using it.
*/
@@ -194,7 +194,7 @@
if (result == ~(u32)0) /* card removed */
return -ENODEV;
result &= mask;
-@@ -177,18 +178,19 @@
+@@ -177,18 +178,19 @@ static int handshake (void __iomem *ptr,
/* force HC to halt state from unknown (EHCI spec section 2.3) */
static int ehci_halt (struct ehci_hcd *ehci)
{
@@ -219,7 +219,7 @@
}
/* put TDI/ARC silicon into EHCI mode */
-@@ -198,23 +200,24 @@
+@@ -198,23 +200,24 @@ static void tdi_reset (struct ehci_hcd *
u32 tmp;
reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + 0x68);
@@ -249,7 +249,7 @@
if (retval)
return retval;
-@@ -236,21 +239,21 @@
+@@ -236,21 +239,21 @@ static void ehci_quiesce (struct ehci_hc
#endif
/* wait for any schedule enables/disables to take effect */
@@ -276,7 +276,7 @@
0, 16 * 125) != 0) {
ehci_to_hcd(ehci)->state = HC_STATE_HALT;
return;
-@@ -277,11 +280,11 @@
+@@ -277,11 +280,11 @@ static void ehci_watchdog (unsigned long
/* lost IAA irqs wedge things badly; seen with a vt8235 */
if (ehci->reclaim) {
@@ -290,8 +290,8 @@
ehci->reclaim_ready = 1;
}
}
-@@ -309,7 +312,7 @@
- (void) ehci_halt (ehci);
+@@ -322,7 +325,7 @@ ehci_shutdown (struct usb_hcd *hcd)
+ ehci_turn_off_all_ports(ehci);
/* make BIOS/etc use companion controller during reboot */
- writel (0, &ehci->regs->configured_flag);
@@ -299,7 +299,7 @@
/* unblock posted writes */
readl(&ehci->regs->configured_flag);
-@@ -379,11 +382,11 @@
+@@ -395,11 +398,11 @@ static void ehci_stop (struct usb_hcd *h
ehci_quiesce (ehci);
ehci_reset (ehci);
@@ -313,7 +313,7 @@
remove_debug_files (ehci);
-@@ -402,7 +405,8 @@
+@@ -418,7 +421,8 @@ static void ehci_stop (struct usb_hcd *h
ehci->stats.complete, ehci->stats.unlink);
#endif
@@ -323,7 +323,7 @@
}
/* one-time init, only for memory state */
-@@ -428,7 +432,7 @@
+@@ -444,7 +448,7 @@ static int ehci_init(struct usb_hcd *hcd
return retval;
/* controllers may cache some of the periodic schedule ... */
@@ -332,7 +332,7 @@
if (HCC_ISOC_CACHE(hcc_params)) // full frame cache
ehci->i_thresh = 8;
else // N microframes cached
-@@ -501,8 +505,8 @@
+@@ -517,8 +521,8 @@ static int ehci_run (struct usb_hcd *hcd
ehci_mem_cleanup(ehci);
return retval;
}
@@ -343,7 +343,7 @@
/*
* hcc_params controls whether ehci->regs->segment must (!!!)
-@@ -516,9 +520,9 @@
+@@ -532,9 +536,9 @@ static int ehci_run (struct usb_hcd *hcd
* Scsi_Host.highmem_io, and so forth. It's readonly to all
* host side drivers though.
*/
@@ -355,7 +355,7 @@
#if 0
// this is deeply broken on almost all architectures
if (!dma_set_mask(hcd->self.controller, DMA_64BIT_MASK))
-@@ -531,7 +535,7 @@
+@@ -547,7 +551,7 @@ static int ehci_run (struct usb_hcd *hcd
// root hub will detect new devices (why?); NEC doesn't
ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
ehci->command |= CMD_RUN;
@@ -364,7 +364,7 @@
dbg_cmd (ehci, "init", ehci->command);
/*
-@@ -541,17 +545,18 @@
+@@ -557,17 +561,18 @@ static int ehci_run (struct usb_hcd *hcd
* and there's no companion controller unless maybe for USB OTG.)
*/
hcd->state = HC_STATE_RUNNING;
@@ -387,7 +387,7 @@
/* GRR this is run-once init(), being done every time the HC starts.
* So long as they're part of class devices, we can't do it init()
-@@ -572,7 +577,7 @@
+@@ -588,7 +593,7 @@ static irqreturn_t ehci_irq (struct usb_
spin_lock (&ehci->lock);
@@ -396,7 +396,7 @@
/* e.g. cardbus physical eject */
if (status == ~(u32) 0) {
-@@ -587,8 +592,8 @@
+@@ -603,8 +608,8 @@ static irqreturn_t ehci_irq (struct usb_
}
/* clear (just) interrupts */
@@ -407,7 +407,7 @@
bh = 0;
#ifdef EHCI_VERBOSE_DEBUG
-@@ -619,11 +624,12 @@
+@@ -635,11 +640,12 @@ static irqreturn_t ehci_irq (struct usb_
unsigned i = HCS_N_PORTS (ehci->hcs_params);
/* resume root hub? */
@@ -422,7 +422,7 @@
if (pstatus & PORT_OWNER)
continue;
-@@ -643,14 +649,15 @@
+@@ -659,14 +665,15 @@ static irqreturn_t ehci_irq (struct usb_
/* PCI errors [4.15.2.4] */
if (unlikely ((status & STS_FATAL) != 0)) {
/* bogus "fatal" IRQs appear on some chips... why? */
@@ -441,7 +441,7 @@
/* generic layer kills/unlinks all urbs, then
* uses ehci_stop to clean up the rest
*/
-@@ -873,7 +880,8 @@
+@@ -889,7 +896,8 @@ done:
static int ehci_get_frame (struct usb_hcd *hcd)
{
struct ehci_hcd *ehci = hcd_to_ehci (hcd);
@@ -451,11 +451,11 @@
}
/*-------------------------------------------------------------------------*/
-Index: linux-test-x86/drivers/usb/host/ehci-hub.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-hub.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-hub.c 2006-12-13 13:03:44.000000000 +1100
-+++ linux-test-x86/drivers/usb/host/ehci-hub.c 2006-12-13 13:06:02.000000000 +1100
-@@ -47,7 +47,7 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-hub.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-hub.c
+@@ -47,7 +47,7 @@ static int ehci_bus_suspend (struct usb_
ehci_quiesce (ehci);
hcd->state = HC_STATE_QUIESCING;
}
@@ -464,7 +464,7 @@
if (ehci->reclaim)
ehci->reclaim_ready = 1;
ehci_work(ehci);
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ static int ehci_bus_suspend (struct usb_
ehci->bus_suspended = 0;
while (port--) {
u32 __iomem *reg = &ehci->regs->port_status [port];
@@ -473,7 +473,7 @@
u32 t2 = t1;
/* keep track of which ports we suspend */
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ static int ehci_bus_suspend (struct usb_
if (t1 != t2) {
ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
port + 1, t1, t2);
@@ -482,7 +482,7 @@
}
}
-@@ -92,8 +92,8 @@
+@@ -92,8 +92,8 @@ static int ehci_bus_suspend (struct usb_
mask = INTR_MASK;
if (!device_may_wakeup(&hcd->self.root_hub->dev))
mask &= ~STS_PCD;
@@ -493,7 +493,7 @@
ehci->next_statechange = jiffies + msecs_to_jiffies(10);
spin_unlock_irq (&ehci->lock);
-@@ -118,26 +118,26 @@
+@@ -118,21 +118,21 @@ static int ehci_bus_resume (struct usb_h
* the last user of the controller, not reset/pm hardware keeping
* state we gave to it.
*/
@@ -519,6 +519,9 @@
- writel (ehci->command, &ehci->regs->command);
+ ehci_writel(ehci, ehci->command, &ehci->regs->command);
+ /* Some controller/firmware combinations need a delay during which
+ * they set up the port statuses. See Bugzilla #8190. */
+@@ -141,7 +141,7 @@ static int ehci_bus_resume (struct usb_h
/* manually resume the ports we suspended during bus_suspend() */
i = HCS_N_PORTS (ehci->hcs_params);
while (i--) {
@@ -527,7 +530,7 @@
temp &= ~(PORT_RWC_BITS
| PORT_WKOC_E | PORT_WKDISC_E | PORT_WKCONN_E);
if (test_bit(i, &ehci->bus_suspended) &&
-@@ -145,20 +145,20 @@
+@@ -149,20 +149,20 @@ static int ehci_bus_resume (struct usb_h
ehci->reset_done [i] = jiffies + msecs_to_jiffies (20);
temp |= PORT_RESUME;
}
@@ -552,7 +555,7 @@
/* maybe re-activate the schedule(s) */
temp = 0;
-@@ -168,14 +168,14 @@
+@@ -172,14 +172,14 @@ static int ehci_bus_resume (struct usb_h
temp |= CMD_PSE;
if (temp) {
ehci->command |= temp;
@@ -569,7 +572,7 @@
spin_unlock_irq (&ehci->lock);
return 0;
-@@ -217,7 +217,8 @@
+@@ -221,7 +221,8 @@ static int check_reset_complete (
// what happens if HCS_N_CC(params) == 0 ?
port_status |= PORT_OWNER;
port_status &= ~PORT_RWC_BITS;
@@ -579,7 +582,7 @@
} else
ehci_dbg (ehci, "port %d high speed\n", index + 1);
-@@ -268,13 +269,14 @@
+@@ -272,13 +273,14 @@ ehci_hub_status_data (struct usb_hcd *hc
/* port N changes (bit N)? */
spin_lock_irqsave (&ehci->lock, flags);
for (i = 0; i < ports; i++) {
@@ -596,7 +599,7 @@
}
continue;
}
-@@ -373,18 +375,18 @@
+@@ -377,18 +379,18 @@ static int ehci_hub_control (
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
@@ -620,7 +623,7 @@
break;
case USB_PORT_FEAT_SUSPEND:
if (temp & PORT_RESET)
-@@ -396,8 +398,8 @@
+@@ -400,8 +402,8 @@ static int ehci_hub_control (
goto error;
/* resume signaling for 20 msec */
temp &= ~(PORT_RWC_BITS | PORT_WAKE_BITS);
@@ -631,7 +634,7 @@
ehci->reset_done [wIndex] = jiffies
+ msecs_to_jiffies (20);
}
-@@ -407,16 +409,17 @@
+@@ -411,16 +413,17 @@ static int ehci_hub_control (
break;
case USB_PORT_FEAT_POWER:
if (HCS_PPC (ehci->hcs_params))
@@ -655,7 +658,7 @@
break;
case USB_PORT_FEAT_C_RESET:
/* GetPortStatus clears reset */
-@@ -424,7 +427,7 @@
+@@ -428,7 +431,7 @@ static int ehci_hub_control (
default:
goto error;
}
@@ -664,7 +667,7 @@
break;
case GetHubDescriptor:
ehci_hub_descriptor (ehci, (struct usb_hub_descriptor *)
-@@ -440,7 +443,7 @@
+@@ -444,7 +447,7 @@ static int ehci_hub_control (
goto error;
wIndex--;
status = 0;
@@ -673,7 +676,7 @@
// wPortChange bits
if (temp & PORT_CSC)
-@@ -458,12 +461,14 @@
+@@ -462,12 +465,14 @@ static int ehci_hub_control (
ehci->reset_done [wIndex] = 0;
/* stop resume signaling */
@@ -694,7 +697,7 @@
if (retval != 0) {
ehci_err (ehci, "port %d resume error %d\n",
wIndex + 1, retval);
-@@ -480,13 +485,13 @@
+@@ -484,13 +489,13 @@ static int ehci_hub_control (
ehci->reset_done [wIndex] = 0;
/* force reset to complete */
@@ -712,7 +715,7 @@
PORT_RESET, 0, 750);
if (retval != 0) {
ehci_err (ehci, "port %d reset error %d\n",
-@@ -496,7 +501,8 @@
+@@ -500,7 +505,8 @@ static int ehci_hub_control (
/* see what we found out */
temp = check_reset_complete (ehci, wIndex,
@@ -722,7 +725,7 @@
}
// don't show wPortStatus if it's owned by a companion hc
-@@ -541,7 +547,7 @@
+@@ -545,7 +551,7 @@ static int ehci_hub_control (
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
@@ -731,7 +734,7 @@
if (temp & PORT_OWNER)
break;
-@@ -555,13 +561,13 @@
+@@ -559,13 +565,13 @@ static int ehci_hub_control (
goto error;
if (device_may_wakeup(&hcd->self.root_hub->dev))
temp |= PORT_WAKE_BITS;
@@ -749,7 +752,7 @@
break;
case USB_PORT_FEAT_RESET:
if (temp & PORT_RESUME)
-@@ -589,7 +595,8 @@
+@@ -593,7 +599,8 @@ static int ehci_hub_control (
ehci->reset_done [wIndex] = jiffies
+ msecs_to_jiffies (50);
}
@@ -759,7 +762,7 @@
break;
/* For downstream facing ports (these): one hub port is put
-@@ -604,13 +611,14 @@
+@@ -608,13 +615,14 @@ static int ehci_hub_control (
ehci_quiesce(ehci);
ehci_halt(ehci);
temp |= selector << 16;
@@ -776,11 +779,11 @@
break;
default:
-Index: linux-test-x86/drivers/usb/host/ehci-pci.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-pci.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-pci.c 2006-12-13 13:03:44.000000000 +1100
-+++ linux-test-x86/drivers/usb/host/ehci-pci.c 2006-12-13 13:06:02.000000000 +1100
-@@ -38,7 +38,7 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-pci.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-pci.c
+@@ -38,7 +38,7 @@ static int ehci_pci_reinit(struct ehci_h
if ((temp & (3 << 13)) == (1 << 13)) {
temp &= 0x1fff;
ehci->debug = ehci_to_hcd(ehci)->regs + temp;
@@ -789,7 +792,7 @@
ehci_info(ehci, "debug port %d%s\n",
HCS_DEBUG_PORT(ehci->hcs_params),
(temp & DBGP_ENABLED)
-@@ -72,7 +72,22 @@
+@@ -72,7 +72,22 @@ static int ehci_pci_setup(struct usb_hcd
int retval;
ehci->caps = hcd->regs;
@@ -813,7 +816,7 @@
dbg_hcs_params(ehci, "reset");
dbg_hcc_params(ehci, "reset");
-@@ -101,7 +116,7 @@
+@@ -101,7 +116,7 @@ static int ehci_pci_setup(struct usb_hcd
}
/* cache this readonly data; minimize chip reads */
@@ -822,7 +825,7 @@
retval = ehci_halt(ehci);
if (retval)
-@@ -235,8 +250,8 @@
+@@ -235,8 +250,8 @@ static int ehci_pci_suspend(struct usb_h
rc = -EINVAL;
goto bail;
}
@@ -833,7 +836,7 @@
/* make sure snapshot being resumed re-enumerates everything */
if (message.event == PM_EVENT_PRETHAW) {
-@@ -270,13 +285,13 @@
+@@ -270,13 +285,13 @@ static int ehci_pci_resume(struct usb_hc
/* If CF is still set, we maintained PCI Vaux power.
* Just undo the effect of ehci_pci_suspend().
*/
@@ -850,7 +853,7 @@
return 0;
}
-@@ -300,9 +315,9 @@
+@@ -300,9 +315,9 @@ static int ehci_pci_resume(struct usb_hc
/* here we "know" root ports should always stay powered */
ehci_port_power(ehci, 1);
@@ -863,11 +866,11 @@
hcd->state = HC_STATE_SUSPENDED;
return 0;
-Index: linux-test-x86/drivers/usb/host/ehci-q.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-q.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-q.c 2006-10-18 09:44:15.000000000 +1000
-+++ linux-test-x86/drivers/usb/host/ehci-q.c 2006-12-13 13:06:02.000000000 +1100
-@@ -789,13 +789,14 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-q.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-q.c
+@@ -789,13 +789,14 @@ static void qh_link_async (struct ehci_h
head = ehci->async;
timer_action_done (ehci, TIMER_ASYNC_OFF);
if (!head->qh_next.qh) {
@@ -885,7 +888,7 @@
ehci_to_hcd(ehci)->state = HC_STATE_RUNNING;
/* posted write need not be known to HC yet ... */
}
-@@ -1007,7 +1008,7 @@
+@@ -1007,7 +1008,7 @@ static void end_unlink_async (struct ehc
static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
{
@@ -894,7 +897,7 @@
struct ehci_qh *prev;
#ifdef DEBUG
-@@ -1025,7 +1026,8 @@
+@@ -1025,7 +1026,8 @@ static void start_unlink_async (struct e
if (ehci_to_hcd(ehci)->state != HC_STATE_HALT
&& !ehci->reclaim) {
/* ... and CMD_IAAD clear */
@@ -904,7 +907,7 @@
wmb ();
// handshake later, if we need to
timer_action_done (ehci, TIMER_ASYNC_OFF);
-@@ -1054,8 +1056,8 @@
+@@ -1054,8 +1056,8 @@ static void start_unlink_async (struct e
ehci->reclaim_ready = 0;
cmd |= CMD_IAAD;
@@ -915,11 +918,11 @@
timer_action (ehci, TIMER_IAA_WATCHDOG);
}
-Index: linux-test-x86/drivers/usb/host/ehci-sched.c
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci-sched.c
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci-sched.c 2006-10-06 21:44:38.000000000 +1000
-+++ linux-test-x86/drivers/usb/host/ehci-sched.c 2006-12-13 13:06:02.000000000 +1100
-@@ -433,20 +433,20 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci-sched.c
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci-sched.c
+@@ -433,20 +433,20 @@ static int enable_periodic (struct ehci_
/* did clearing PSE did take effect yet?
* takes effect only at frame boundaries...
*/
@@ -945,7 +948,7 @@
return 0;
}
-@@ -458,14 +458,14 @@
+@@ -458,14 +458,14 @@ static int disable_periodic (struct ehci
/* did setting PSE not take effect yet?
* takes effect only at frame boundaries...
*/
@@ -963,7 +966,7 @@
/* posted write ... */
ehci->next_uframe = -1;
-@@ -1336,7 +1336,7 @@
+@@ -1336,7 +1336,7 @@ iso_stream_schedule (
goto fail;
}
@@ -972,7 +975,7 @@
/* when's the last uframe this urb could start? */
max = now + mod;
-@@ -2088,7 +2088,7 @@
+@@ -2088,7 +2088,7 @@ scan_periodic (struct ehci_hcd *ehci)
*/
now_uframe = ehci->next_uframe;
if (HC_IS_RUNNING (ehci_to_hcd(ehci)->state))
@@ -981,7 +984,7 @@
else
clock = now_uframe + mod - 1;
clock %= mod;
-@@ -2213,7 +2213,7 @@
+@@ -2213,7 +2213,7 @@ restart:
if (!HC_IS_RUNNING (ehci_to_hcd(ehci)->state))
break;
ehci->next_uframe = now_uframe;
@@ -990,11 +993,11 @@
if (now_uframe == now)
break;
-Index: linux-test-x86/drivers/usb/host/ehci.h
+Index: linux-2.6.20.i386.patching/drivers/usb/host/ehci.h
===================================================================
---- linux-test-x86.orig/drivers/usb/host/ehci.h 2006-12-13 13:03:44.000000000 +1100
-+++ linux-test-x86/drivers/usb/host/ehci.h 2006-12-13 13:06:02.000000000 +1100
-@@ -92,6 +92,7 @@
+--- linux-2.6.20.i386.patching.orig/drivers/usb/host/ehci.h
++++ linux-2.6.20.i386.patching/drivers/usb/host/ehci.h
+@@ -92,6 +92,7 @@ struct ehci_hcd { /* one per controlle
unsigned is_tdi_rh_tt:1; /* TDI roothub with TT */
unsigned no_selective_suspend:1;
unsigned has_fsl_port_bug:1; /* FreeScale */
@@ -1002,7 +1005,7 @@
u8 sbrn; /* packed release number */
-@@ -651,6 +652,42 @@
+@@ -651,6 +652,42 @@ ehci_port_speed(struct ehci_hcd *ehci, u
#define ehci_has_fsl_portno_bug(e) (0)
#endif
@@ -1045,13 +1048,3 @@
/*-------------------------------------------------------------------------*/
-
--------------------------------------------------------------------------
-Take Surveys. Earn Cash. Influence the Future of IT
-Join SourceForge.net's Techsay panel and you'll get the chance to share your
-opinions on IT & business topics through brief surveys - and earn cash
-http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
-_______________________________________________
-linux-usb-devel at lists.sourceforge.net
-To unsubscribe, use the last form field at:
-https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- sources 7 May 2007 18:47:08 -0000 1.5
+++ sources 12 Jul 2007 19:45:14 -0000 1.5.2.1
@@ -1,3 +1,3 @@
34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2
-30764d4152c727b8ec7b709ab5464ec3 patch-2.6.20.3.bz2
b73a966a55f3907020a1a29b4e2df64d xen-3.1.0-rc7-7041b52471c3.tar.bz2
+126867078011af577963b0e946013a56 patch-2.6.20.14.bz2
More information about the scm-commits
mailing list