[kernel/f15/master] Linux 2.6.38.1
Chuck Ebbert
cebbert at fedoraproject.org
Wed Mar 23 21:49:42 UTC 2011
commit 6236c85dc675d8c7defbf2e34a865aa28e9c0594
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Wed Mar 23 17:50:28 2011 -0400
Linux 2.6.38.1
Drop linux-2.6-ehci-check-port-status.patch, merged in .38.1
Add dcdbas-force-smi-to-happen-when-expected.patch
dcdbas-force-smi-to-happen-when-expected.patch | 34 +
git-linus.diff | 2604 ------------------------
kernel.spec | 17 +-
linux-2.6-ehci-check-port-status.patch | 54 -
sources | 1 +
5 files changed, 48 insertions(+), 2662 deletions(-)
---
diff --git a/dcdbas-force-smi-to-happen-when-expected.patch b/dcdbas-force-smi-to-happen-when-expected.patch
new file mode 100644
index 0000000..a7a2c8a
--- /dev/null
+++ b/dcdbas-force-smi-to-happen-when-expected.patch
@@ -0,0 +1,34 @@
+From: Stuart Hayes <stuart_hayes at yahoo.com>
+Date: Wed, 2 Mar 2011 12:42:05 +0000 (+0100)
+Subject: dcdbas: force SMI to happen when expected
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dd65c736d1b5312c80c88a64bf521db4959eded5
+
+dcdbas: force SMI to happen when expected
+
+The dcdbas driver can do an I/O write to cause a SMI to occur. The SMI handler
+looks at certain registers and memory locations, so the SMI needs to happen
+immediately. On some systems I/O writes are posted, though, causing the SMI to
+happen well after the "outb" occurred, which causes random failures. Following
+the "outb" with an "inb" forces the write to go through even if it is posted.
+
+Signed-off-by: Stuart Hayes <stuart_hayes at yahoo.com>
+Acked-by: Doug Warzecha <douglas_warzecha at dell.com>
+Signed-off-by: Jiri Kosina <jkosina at suse.cz>
+---
+
+diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
+index 69ad529..ea5ac2d 100644
+--- a/drivers/firmware/dcdbas.c
++++ b/drivers/firmware/dcdbas.c
+@@ -268,8 +268,10 @@ int dcdbas_smi_request(struct smi_cmd *smi_cmd)
+ }
+
+ /* generate SMI */
++ /* inb to force posted write through and make SMI happen now */
+ asm volatile (
+- "outb %b0,%w1"
++ "outb %b0,%w1\n"
++ "inb %w1"
+ : /* no output args */
+ : "a" (smi_cmd->command_code),
+ "d" (smi_cmd->command_address),
diff --git a/git-linus.diff b/git-linus.diff
index 4e0798a..e69de29 100644
--- a/git-linus.diff
+++ b/git-linus.diff
@@ -1,2604 +0,0 @@
---- vanilla-2.6.38.0.orig/fs/dcache.c
-+++ vanilla-2.6.38.0/fs/dcache.c
-@@ -296,8 +296,12 @@ static struct dentry *d_kill(struct dent
- __releases(parent->d_lock)
- __releases(dentry->d_inode->i_lock)
- {
-- dentry->d_parent = NULL;
- list_del(&dentry->d_u.d_child);
-+ /*
-+ * Inform try_to_ascend() that we are no longer attached to the
-+ * dentry tree
-+ */
-+ dentry->d_flags |= DCACHE_DISCONNECTED;
- if (parent)
- spin_unlock(&parent->d_lock);
- dentry_iput(dentry);
-@@ -1012,6 +1016,35 @@ void shrink_dcache_for_umount(struct sup
- }
-
- /*
-+ * This tries to ascend one level of parenthood, but
-+ * we can race with renaming, so we need to re-check
-+ * the parenthood after dropping the lock and check
-+ * that the sequence number still matches.
-+ */
-+static struct dentry *try_to_ascend(struct dentry *old, int locked, unsigned seq)
-+{
-+ struct dentry *new = old->d_parent;
-+
-+ rcu_read_lock();
-+ spin_unlock(&old->d_lock);
-+ spin_lock(&new->d_lock);
-+
-+ /*
-+ * might go back up the wrong parent if we have had a rename
-+ * or deletion
-+ */
-+ if (new != old->d_parent ||
-+ (old->d_flags & DCACHE_DISCONNECTED) ||
-+ (!locked && read_seqretry(&rename_lock, seq))) {
-+ spin_unlock(&new->d_lock);
-+ new = NULL;
-+ }
-+ rcu_read_unlock();
-+ return new;
-+}
-+
-+
-+/*
- * Search for at least 1 mount point in the dentry's subdirs.
- * We descend to the next level whenever the d_subdirs
- * list is non-empty and continue searching.
-@@ -1066,24 +1099,10 @@ resume:
- * All done at this level ... ascend and resume the search.
- */
- if (this_parent != parent) {
-- struct dentry *tmp;
-- struct dentry *child;
--
-- tmp = this_parent->d_parent;
-- rcu_read_lock();
-- spin_unlock(&this_parent->d_lock);
-- child = this_parent;
-- this_parent = tmp;
-- spin_lock(&this_parent->d_lock);
-- /* might go back up the wrong parent if we have had a rename
-- * or deletion */
-- if (this_parent != child->d_parent ||
-- (!locked && read_seqretry(&rename_lock, seq))) {
-- spin_unlock(&this_parent->d_lock);
-- rcu_read_unlock();
-+ struct dentry *child = this_parent;
-+ this_parent = try_to_ascend(this_parent, locked, seq);
-+ if (!this_parent)
- goto rename_retry;
-- }
-- rcu_read_unlock();
- next = child->d_u.d_child.next;
- goto resume;
- }
-@@ -1181,24 +1200,10 @@ resume:
- * All done at this level ... ascend and resume the search.
- */
- if (this_parent != parent) {
-- struct dentry *tmp;
-- struct dentry *child;
--
-- tmp = this_parent->d_parent;
-- rcu_read_lock();
-- spin_unlock(&this_parent->d_lock);
-- child = this_parent;
-- this_parent = tmp;
-- spin_lock(&this_parent->d_lock);
-- /* might go back up the wrong parent if we have had a rename
-- * or deletion */
-- if (this_parent != child->d_parent ||
-- (!locked && read_seqretry(&rename_lock, seq))) {
-- spin_unlock(&this_parent->d_lock);
-- rcu_read_unlock();
-+ struct dentry *child = this_parent;
-+ this_parent = try_to_ascend(this_parent, locked, seq);
-+ if (!this_parent)
- goto rename_retry;
-- }
-- rcu_read_unlock();
- next = child->d_u.d_child.next;
- goto resume;
- }
-@@ -2942,28 +2947,14 @@ resume:
- spin_unlock(&dentry->d_lock);
- }
- if (this_parent != root) {
-- struct dentry *tmp;
-- struct dentry *child;
--
-- tmp = this_parent->d_parent;
-+ struct dentry *child = this_parent;
- if (!(this_parent->d_flags & DCACHE_GENOCIDE)) {
- this_parent->d_flags |= DCACHE_GENOCIDE;
- this_parent->d_count--;
- }
-- rcu_read_lock();
-- spin_unlock(&this_parent->d_lock);
-- child = this_parent;
-- this_parent = tmp;
-- spin_lock(&this_parent->d_lock);
-- /* might go back up the wrong parent if we have had a rename
-- * or deletion */
-- if (this_parent != child->d_parent ||
-- (!locked && read_seqretry(&rename_lock, seq))) {
-- spin_unlock(&this_parent->d_lock);
-- rcu_read_unlock();
-+ this_parent = try_to_ascend(this_parent, locked, seq);
-+ if (!this_parent)
- goto rename_retry;
-- }
-- rcu_read_unlock();
- next = child->d_u.d_child.next;
- goto resume;
- }
---- vanilla-2.6.38.0.orig/include/linux/ftrace.h
-+++ vanilla-2.6.38.0/include/linux/ftrace.h
-@@ -428,6 +428,7 @@ extern void unregister_ftrace_graph(void
-
- extern void ftrace_graph_init_task(struct task_struct *t);
- extern void ftrace_graph_exit_task(struct task_struct *t);
-+extern void ftrace_graph_init_idle_task(struct task_struct *t, int cpu);
-
- static inline int task_curr_ret_stack(struct task_struct *t)
- {
-@@ -451,6 +452,7 @@ static inline void unpause_graph_tracing
-
- static inline void ftrace_graph_init_task(struct task_struct *t) { }
- static inline void ftrace_graph_exit_task(struct task_struct *t) { }
-+static inline void ftrace_graph_init_idle_task(struct task_struct *t, int cpu) { }
-
- static inline int register_ftrace_graph(trace_func_graph_ret_t retfunc,
- trace_func_graph_ent_t entryfunc)
---- vanilla-2.6.38.0.orig/kernel/sched.c
-+++ vanilla-2.6.38.0/kernel/sched.c
-@@ -5572,7 +5572,7 @@ void __cpuinit init_idle(struct task_str
- * The idle tasks have their own, simple scheduling class:
- */
- idle->sched_class = &idle_sched_class;
-- ftrace_graph_init_task(idle);
-+ ftrace_graph_init_idle_task(idle, cpu);
- }
-
- /*
---- vanilla-2.6.38.0.orig/kernel/trace/ftrace.c
-+++ vanilla-2.6.38.0/kernel/trace/ftrace.c
-@@ -3328,7 +3328,7 @@ static int start_graph_tracing(void)
- /* The cpu_boot init_task->ret_stack will never be freed */
- for_each_online_cpu(cpu) {
- if (!idle_task(cpu)->ret_stack)
-- ftrace_graph_init_task(idle_task(cpu));
-+ ftrace_graph_init_idle_task(idle_task(cpu), cpu);
- }
-
- do {
-@@ -3418,6 +3418,49 @@ void unregister_ftrace_graph(void)
- mutex_unlock(&ftrace_lock);
- }
-
-+static DEFINE_PER_CPU(struct ftrace_ret_stack *, idle_ret_stack);
-+
-+static void
-+graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
-+{
-+ atomic_set(&t->tracing_graph_pause, 0);
-+ atomic_set(&t->trace_overrun, 0);
-+ t->ftrace_timestamp = 0;
-+ /* make curr_ret_stack visable before we add the ret_stack */
-+ smp_wmb();
-+ t->ret_stack = ret_stack;
-+}
-+
-+/*
-+ * Allocate a return stack for the idle task. May be the first
-+ * time through, or it may be done by CPU hotplug online.
-+ */
-+void ftrace_graph_init_idle_task(struct task_struct *t, int cpu)
-+{
-+ t->curr_ret_stack = -1;
-+ /*
-+ * The idle task has no parent, it either has its own
-+ * stack or no stack at all.
-+ */
-+ if (t->ret_stack)
-+ WARN_ON(t->ret_stack != per_cpu(idle_ret_stack, cpu));
-+
-+ if (ftrace_graph_active) {
-+ struct ftrace_ret_stack *ret_stack;
-+
-+ ret_stack = per_cpu(idle_ret_stack, cpu);
-+ if (!ret_stack) {
-+ ret_stack = kmalloc(FTRACE_RETFUNC_DEPTH
-+ * sizeof(struct ftrace_ret_stack),
-+ GFP_KERNEL);
-+ if (!ret_stack)
-+ return;
-+ per_cpu(idle_ret_stack, cpu) = ret_stack;
-+ }
-+ graph_init_task(t, ret_stack);
-+ }
-+}
-+
- /* Allocate a return stack for newly created task */
- void ftrace_graph_init_task(struct task_struct *t)
- {
-@@ -3433,12 +3476,7 @@ void ftrace_graph_init_task(struct task_
- GFP_KERNEL);
- if (!ret_stack)
- return;
-- atomic_set(&t->tracing_graph_pause, 0);
-- atomic_set(&t->trace_overrun, 0);
-- t->ftrace_timestamp = 0;
-- /* make curr_ret_stack visable before we add the ret_stack */
-- smp_wmb();
-- t->ret_stack = ret_stack;
-+ graph_init_task(t, ret_stack);
- }
- }
-
---- vanilla-2.6.38.0.orig/arch/x86/kernel/e820.c
-+++ vanilla-2.6.38.0/arch/x86/kernel/e820.c
-@@ -847,15 +847,21 @@ static int __init parse_memopt(char *p)
- if (!p)
- return -EINVAL;
-
--#ifdef CONFIG_X86_32
- if (!strcmp(p, "nopentium")) {
-+#ifdef CONFIG_X86_32
- setup_clear_cpu_cap(X86_FEATURE_PSE);
- return 0;
-- }
-+#else
-+ printk(KERN_WARNING "mem=nopentium ignored! (only supported on x86_32)\n");
-+ return -EINVAL;
- #endif
-+ }
-
- userdef = 1;
- mem_size = memparse(p, &p);
-+ /* don't remove all of memory when handling "mem={invalid}" param */
-+ if (mem_size == 0)
-+ return -EINVAL;
- e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
-
- return 0;
---- vanilla-2.6.38.0.orig/drivers/ata/ahci.c
-+++ vanilla-2.6.38.0/drivers/ata/ahci.c
-@@ -260,6 +260,7 @@ static const struct pci_device_id ahci_p
- { PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */
- { PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */
- { PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */
-+ { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */
- { PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */
-
- /* JMicron 360/1/3/5/6, match class to avoid IDE function */
-@@ -383,6 +384,8 @@ static const struct pci_device_id ahci_p
- .class = PCI_CLASS_STORAGE_SATA_AHCI,
- .class_mask = 0xffffff,
- .driver_data = board_ahci_yes_fbs }, /* 88se9128 */
-+ { PCI_DEVICE(0x1b4b, 0x9125),
-+ .driver_data = board_ahci_yes_fbs }, /* 88se9125 */
-
- /* Promise */
- { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
---- vanilla-2.6.38.0.orig/drivers/ata/libata-eh.c
-+++ vanilla-2.6.38.0/drivers/ata/libata-eh.c
-@@ -1618,7 +1618,7 @@ static void ata_eh_analyze_serror(struct
- * host links. For disabled PMP links, only N bit is
- * considered as X bit is left at 1 for link plugging.
- */
-- if (link->lpm_policy != ATA_LPM_MAX_POWER)
-+ if (link->lpm_policy > ATA_LPM_MAX_POWER)
- hotplug_mask = 0; /* hotplug doesn't work w/ LPM */
- else if (!(link->flags & ATA_LFLAG_DISABLED) || ata_is_host_link(link))
- hotplug_mask = SERR_PHYRDY_CHG | SERR_DEV_XCHG;
---- vanilla-2.6.38.0.orig/drivers/infiniband/core/cma.c
-+++ vanilla-2.6.38.0/drivers/infiniband/core/cma.c
-@@ -1210,6 +1210,11 @@ static int cma_req_handler(struct ib_cm_
- cm_id->context = conn_id;
- cm_id->cm_handler = cma_ib_handler;
-
-+ /*
-+ * Protect against the user destroying conn_id from another thread
-+ * until we're done accessing it.
-+ */
-+ atomic_inc(&conn_id->refcount);
- ret = conn_id->id.event_handler(&conn_id->id, &event);
- if (!ret) {
- /*
-@@ -1222,8 +1227,10 @@ static int cma_req_handler(struct ib_cm_
- ib_send_cm_mra(cm_id, CMA_CM_MRA_SETTING, NULL, 0);
- mutex_unlock(&lock);
- mutex_unlock(&conn_id->handler_mutex);
-+ cma_deref_id(conn_id);
- goto out;
- }
-+ cma_deref_id(conn_id);
-
- /* Destroy the CM ID by returning a non-zero value. */
- conn_id->cm_id.ib = NULL;
-@@ -1425,17 +1432,25 @@ static int iw_conn_req_handler(struct iw
- event.param.conn.private_data_len = iw_event->private_data_len;
- event.param.conn.initiator_depth = attr.max_qp_init_rd_atom;
- event.param.conn.responder_resources = attr.max_qp_rd_atom;
-+
-+ /*
-+ * Protect against the user destroying conn_id from another thread
-+ * until we're done accessing it.
-+ */
-+ atomic_inc(&conn_id->refcount);
- ret = conn_id->id.event_handler(&conn_id->id, &event);
- if (ret) {
- /* User wants to destroy the CM ID */
- conn_id->cm_id.iw = NULL;
- cma_exch(conn_id, CMA_DESTROYING);
- mutex_unlock(&conn_id->handler_mutex);
-+ cma_deref_id(conn_id);
- rdma_destroy_id(&conn_id->id);
- goto out;
- }
-
- mutex_unlock(&conn_id->handler_mutex);
-+ cma_deref_id(conn_id);
-
- out:
- if (dev)
---- vanilla-2.6.38.0.orig/fs/partitions/osf.c
-+++ vanilla-2.6.38.0/fs/partitions/osf.c
-@@ -10,7 +10,7 @@
- #include "check.h"
- #include "osf.h"
-
--#define MAX_OSF_PARTITIONS 8
-+#define MAX_OSF_PARTITIONS 18
-
- int osf_partition(struct parsed_partitions *state)
- {
---- vanilla-2.6.38.0.orig/drivers/infiniband/core/cm.c
-+++ vanilla-2.6.38.0/drivers/infiniband/core/cm.c
-@@ -2989,6 +2989,7 @@ static int cm_sidr_req_handler(struct cm
- goto out; /* No match. */
- }
- atomic_inc(&cur_cm_id_priv->refcount);
-+ atomic_inc(&cm_id_priv->refcount);
- spin_unlock_irq(&cm.lock);
-
- cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;
---- vanilla-2.6.38.0.orig/arch/x86/kernel/early-quirks.c
-+++ vanilla-2.6.38.0/arch/x86/kernel/early-quirks.c
-@@ -159,7 +159,12 @@ static void __init ati_bugs_contd(int nu
- if (rev >= 0x40)
- acpi_fix_pin2_polarity = 1;
-
-- if (rev > 0x13)
-+ /*
-+ * SB600: revisions 0x11, 0x12, 0x13, 0x14, ...
-+ * SB700: revisions 0x39, 0x3a, ...
-+ * SB800: revisions 0x40, 0x41, ...
-+ */
-+ if (rev >= 0x39)
- return;
-
- if (acpi_use_timer_override)
---- vanilla-2.6.38.0.orig/arch/microblaze/include/asm/uaccess.h
-+++ vanilla-2.6.38.0/arch/microblaze/include/asm/uaccess.h
-@@ -120,16 +120,16 @@ static inline unsigned long __must_check
- {
- /* normal memset with two words to __ex_table */
- __asm__ __volatile__ ( \
-- "1: sb r0, %2, r0;" \
-+ "1: sb r0, %1, r0;" \
- " addik %0, %0, -1;" \
- " bneid %0, 1b;" \
-- " addik %2, %2, 1;" \
-+ " addik %1, %1, 1;" \
- "2: " \
- __EX_TABLE_SECTION \
- ".word 1b,2b;" \
- ".previous;" \
-- : "=r"(n) \
-- : "0"(n), "r"(to)
-+ : "=r"(n), "=r"(to) \
-+ : "0"(n), "1"(to)
- );
- return n;
- }
---- vanilla-2.6.38.0.orig/arch/x86/kernel/alternative.c
-+++ vanilla-2.6.38.0/arch/x86/kernel/alternative.c
-@@ -620,7 +620,12 @@ static int __kprobes stop_machine_text_p
- flush_icache_range((unsigned long)p->addr,
- (unsigned long)p->addr + p->len);
- }
--
-+ /*
-+ * Intel Archiecture Software Developer's Manual section 7.1.3 specifies
-+ * that a core serializing instruction such as "cpuid" should be
-+ * executed on _each_ core before the new instruction is made visible.
-+ */
-+ sync_core();
- return 0;
- }
-
---- vanilla-2.6.38.0.orig/security/tomoyo/file.c
-+++ vanilla-2.6.38.0/security/tomoyo/file.c
-@@ -927,7 +927,7 @@ int tomoyo_check_open_permission(struct
- struct path *path, const int flag)
- {
- const u8 acc_mode = ACC_MODE(flag);
-- int error = -ENOMEM;
-+ int error = 0;
- struct tomoyo_path_info buf;
- struct tomoyo_request_info r;
- int idx;
-@@ -938,9 +938,6 @@ int tomoyo_check_open_permission(struct
- buf.name = NULL;
- r.mode = TOMOYO_CONFIG_DISABLED;
- idx = tomoyo_read_lock();
-- if (!tomoyo_get_realpath(&buf, path))
-- goto out;
-- error = 0;
- /*
- * If the filename is specified by "deny_rewrite" keyword,
- * we need to check "allow_rewrite" permission when the filename is not
---- vanilla-2.6.38.0.orig/drivers/gpu/drm/i915/i915_irq.c
-+++ vanilla-2.6.38.0/drivers/gpu/drm/i915/i915_irq.c
-@@ -1377,7 +1377,12 @@ int i915_enable_vblank(struct drm_device
- else
- i915_enable_pipestat(dev_priv, pipe,
- PIPE_VBLANK_INTERRUPT_ENABLE);
-+
-+ /* maintain vblank delivery even in deep C-states */
-+ if (dev_priv->info->gen == 3)
-+ I915_WRITE(INSTPM, INSTPM_AGPBUSY_DIS << 16);
- spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
-+
- return 0;
- }
-
-@@ -1390,6 +1395,10 @@ void i915_disable_vblank(struct drm_devi
- unsigned long irqflags;
-
- spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
-+ if (dev_priv->info->gen == 3)
-+ I915_WRITE(INSTPM,
-+ INSTPM_AGPBUSY_DIS << 16 | INSTPM_AGPBUSY_DIS);
-+
- if (HAS_PCH_SPLIT(dev))
- ironlake_disable_display_irq(dev_priv, (pipe == 0) ?
- DE_PIPEA_VBLANK: DE_PIPEB_VBLANK);
---- vanilla-2.6.38.0.orig/drivers/gpu/drm/i915/i915_reg.h
-+++ vanilla-2.6.38.0/drivers/gpu/drm/i915/i915_reg.h
-@@ -405,9 +405,12 @@
- #define I915_ERROR_INSTRUCTION (1<<0)
- #define INSTPM 0x020c0
- #define INSTPM_SELF_EN (1<<12) /* 915GM only */
-+#define INSTPM_AGPBUSY_DIS (1<<11) /* gen3: when disabled, pending interrupts
-+ will not assert AGPBUSY# and will only
-+ be delivered when out of C3. */
- #define ACTHD 0x020c8
- #define FW_BLC 0x020d8
--#define FW_BLC2 0x020dc
-+#define FW_BLC2 0x020dc
- #define FW_BLC_SELF 0x020e0 /* 915+ only */
- #define FW_BLC_SELF_EN_MASK (1<<31)
- #define FW_BLC_SELF_FIFO_MASK (1<<16) /* 945 only */
---- vanilla-2.6.38.0.orig/drivers/gpu/drm/radeon/atombios_crtc.c
-+++ vanilla-2.6.38.0/drivers/gpu/drm/radeon/atombios_crtc.c
-@@ -61,8 +61,8 @@ static void atombios_overscan_setup(stru
- args.usOverscanLeft = cpu_to_le16((adjusted_mode->crtc_hdisplay - (a2 / mode->crtc_vdisplay)) / 2);
- args.usOverscanRight = cpu_to_le16((adjusted_mode->crtc_hdisplay - (a2 / mode->crtc_vdisplay)) / 2);
- } else if (a2 > a1) {
-- args.usOverscanLeft = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
-- args.usOverscanRight = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
-+ args.usOverscanTop = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
-+ args.usOverscanBottom = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
- }
- break;
- case RMX_FULL:
---- vanilla-2.6.38.0.orig/drivers/gpu/drm/drm_sysfs.c
-+++ vanilla-2.6.38.0/drivers/gpu/drm/drm_sysfs.c
-@@ -158,8 +158,15 @@ static ssize_t status_show(struct device
- {
- struct drm_connector *connector = to_drm_connector(device);
- enum drm_connector_status status;
-+ int ret;
-+
-+ ret = mutex_lock_interruptible(&connector->dev->mode_config.mutex);
-+ if (ret)
-+ return ret;
-
- status = connector->funcs->detect(connector, true);
-+ mutex_unlock(&connector->dev->mode_config.mutex);
-+
- return snprintf(buf, PAGE_SIZE, "%s\n",
- drm_get_connector_status_name(status));
- }
---- vanilla-2.6.38.0.orig/drivers/net/wireless/ath/ath9k/hw.c
-+++ vanilla-2.6.38.0/drivers/net/wireless/ath/ath9k/hw.c
-@@ -495,6 +495,17 @@ static int __ath9k_hw_init(struct ath_hw
- if (ah->hw_version.devid == AR5416_AR9100_DEVID)
- ah->hw_version.macVersion = AR_SREV_VERSION_9100;
-
-+ /*
-+ * Read back AR_WA into a permanent copy and set bits 14 and 17.
-+ * We need to do this to avoid RMW of this register. We cannot
-+ * read the reg when chip is asleep.
-+ */
-+ ah->WARegVal = REG_READ(ah, AR_WA);
-+ ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
-+ AR_WA_ASPM_TIMER_BASED_DISABLE);
-+
-+ ath9k_hw_read_revisions(ah);
-+
- if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
- ath_err(common, "Couldn't reset chip\n");
- return -EIO;
-@@ -563,14 +574,6 @@ static int __ath9k_hw_init(struct ath_hw
-
- ath9k_hw_init_mode_regs(ah);
-
-- /*
-- * Read back AR_WA into a permanent copy and set bits 14 and 17.
-- * We need to do this to avoid RMW of this register. We cannot
-- * read the reg when chip is asleep.
-- */
-- ah->WARegVal = REG_READ(ah, AR_WA);
-- ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
-- AR_WA_ASPM_TIMER_BASED_DISABLE);
-
- if (ah->is_pciexpress)
- ath9k_hw_configpcipowersave(ah, 0, 0);
-@@ -1082,8 +1085,6 @@ static bool ath9k_hw_set_reset_power_on(
- return false;
- }
-
-- ath9k_hw_read_revisions(ah);
--
- return ath9k_hw_set_reset(ah, ATH9K_RESET_WARM);
- }
-
---- vanilla-2.6.38.0.orig/drivers/net/wireless/ath/ath9k/recv.c
-+++ vanilla-2.6.38.0/drivers/net/wireless/ath/ath9k/recv.c
-@@ -439,9 +439,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
- * mode interface or when in monitor mode. AP mode does not need this
- * since it receives all in-BSS frames anyway.
- */
-- if (((sc->sc_ah->opmode != NL80211_IFTYPE_AP) &&
-- (sc->rx.rxfilter & FIF_PROMISC_IN_BSS)) ||
-- (sc->sc_ah->is_monitoring))
-+ if (sc->sc_ah->is_monitoring)
- rfilt |= ATH9K_RX_FILTER_PROM;
-
- if (sc->rx.rxfilter & FIF_CONTROL)
---- vanilla-2.6.38.0.orig/drivers/tty/serial/mrst_max3110.c
-+++ vanilla-2.6.38.0/drivers/tty/serial/mrst_max3110.c
-@@ -51,7 +51,7 @@
- struct uart_max3110 {
- struct uart_port port;
- struct spi_device *spi;
-- char name[24];
-+ char name[SPI_NAME_SIZE];
-
- wait_queue_head_t wq;
- struct task_struct *main_thread;
---- vanilla-2.6.38.0.orig/drivers/tty/serial/8250.c
-+++ vanilla-2.6.38.0/drivers/tty/serial/8250.c
-@@ -954,6 +954,23 @@ static int broken_efr(struct uart_8250_p
- return 0;
- }
-
-+static inline int ns16550a_goto_highspeed(struct uart_8250_port *up)
-+{
-+ unsigned char status;
-+
-+ status = serial_in(up, 0x04); /* EXCR2 */
-+#define PRESL(x) ((x) & 0x30)
-+ if (PRESL(status) == 0x10) {
-+ /* already in high speed mode */
-+ return 0;
-+ } else {
-+ status &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
-+ status |= 0x10; /* 1.625 divisor for baud_base --> 921600 */
-+ serial_outp(up, 0x04, status);
-+ }
-+ return 1;
-+}
-+
- /*
- * We know that the chip has FIFOs. Does it have an EFR? The
- * EFR is located in the same register position as the IIR and
-@@ -1025,12 +1042,8 @@ static void autoconfig_16550a(struct uar
- quot = serial_dl_read(up);
- quot <<= 3;
-
-- status1 = serial_in(up, 0x04); /* EXCR2 */
-- status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
-- status1 |= 0x10; /* 1.625 divisor for baud_base --> 921600 */
-- serial_outp(up, 0x04, status1);
--
-- serial_dl_write(up, quot);
-+ if (ns16550a_goto_highspeed(up))
-+ serial_dl_write(up, quot);
-
- serial_outp(up, UART_LCR, 0);
-
-@@ -3025,17 +3038,13 @@ void serial8250_resume_port(int line)
- struct uart_8250_port *up = &serial8250_ports[line];
-
- if (up->capabilities & UART_NATSEMI) {
-- unsigned char tmp;
--
- /* Ensure it's still in high speed mode */
- serial_outp(up, UART_LCR, 0xE0);
-
-- tmp = serial_in(up, 0x04); /* EXCR2 */
-- tmp &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
-- tmp |= 0x10; /* 1.625 divisor for baud_base --> 921600 */
-- serial_outp(up, 0x04, tmp);
-+ ns16550a_goto_highspeed(up);
-
- serial_outp(up, UART_LCR, 0);
-+ up->port.uartclk = 921600*16;
- }
- uart_resume_port(&serial8250_reg, &up->port);
- }
---- vanilla-2.6.38.0.orig/drivers/usb/serial/usb-serial.c
-+++ vanilla-2.6.38.0/drivers/usb/serial/usb-serial.c
-@@ -911,9 +911,8 @@ int usb_serial_probe(struct usb_interfac
- dev_err(&interface->dev, "No free urbs available\n");
- goto probe_error;
- }
-- buffer_size = serial->type->bulk_in_size;
-- if (!buffer_size)
-- buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+ buffer_size = max_t(int, serial->type->bulk_in_size,
-+ le16_to_cpu(endpoint->wMaxPacketSize));
- port->bulk_in_size = buffer_size;
- port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
---- vanilla-2.6.38.0.orig/include/linux/usb/serial.h
-+++ vanilla-2.6.38.0/include/linux/usb/serial.h
-@@ -191,7 +191,8 @@ static inline void usb_set_serial_data(s
- * @id_table: pointer to a list of usb_device_id structures that define all
- * of the devices this structure can support.
- * @num_ports: the number of different ports this device will have.
-- * @bulk_in_size: bytes to allocate for bulk-in buffer (0 = end-point size)
-+ * @bulk_in_size: minimum number of bytes to allocate for bulk-in buffer
-+ * (0 = end-point size)
- * @bulk_out_size: bytes to allocate for bulk-out buffer (0 = end-point size)
- * @calc_num_ports: pointer to a function to determine how many ports this
- * device has dynamically. It will be called after the probe()
---- vanilla-2.6.38.0.orig/drivers/usb/serial/kobil_sct.c
-+++ vanilla-2.6.38.0/drivers/usb/serial/kobil_sct.c
-@@ -372,7 +372,7 @@ static void kobil_read_int_callback(stru
- }
-
- tty = tty_port_tty_get(&port->port);
-- if (urb->actual_length) {
-+ if (tty && urb->actual_length) {
-
- /* BEGIN DEBUG */
- /*
---- vanilla-2.6.38.0.orig/drivers/usb/serial/option.c
-+++ vanilla-2.6.38.0/drivers/usb/serial/option.c
-@@ -652,7 +652,8 @@ static const struct usb_device_id option
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
-- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff,
-+ 0xff, 0xff), .driver_info = (kernel_ulong_t)&four_g_w14_blacklist },
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) },
---- vanilla-2.6.38.0.orig/drivers/usb/serial/ch341.c
-+++ vanilla-2.6.38.0/drivers/usb/serial/ch341.c
-@@ -75,6 +75,7 @@ static int debug;
- static const struct usb_device_id id_table[] = {
- { USB_DEVICE(0x4348, 0x5523) },
- { USB_DEVICE(0x1a86, 0x7523) },
-+ { USB_DEVICE(0x1a86, 0x5523) },
- { },
- };
- MODULE_DEVICE_TABLE(usb, id_table);
---- vanilla-2.6.38.0.orig/drivers/staging/winbond/core.h
-+++ vanilla-2.6.38.0/drivers/staging/winbond/core.h
-@@ -3,6 +3,7 @@
-
- #include <linux/wireless.h>
- #include <linux/types.h>
-+#include <linux/delay.h>
-
- #include "wbhal.h"
- #include "mto.h"
---- vanilla-2.6.38.0.orig/drivers/staging/tidspbridge/rmgr/proc.c
-+++ vanilla-2.6.38.0/drivers/staging/tidspbridge/rmgr/proc.c
-@@ -781,12 +781,14 @@ int proc_begin_dma(void *hprocessor, voi
- (u32)pmpu_addr,
- ul_size, dir);
-
-+ mutex_lock(&proc_lock);
-+
- /* find requested memory are in cached mapping information */
- map_obj = find_containing_mapping(pr_ctxt, (u32) pmpu_addr, ul_size);
- if (!map_obj) {
- pr_err("%s: find_containing_mapping failed\n", __func__);
- status = -EFAULT;
-- goto err_out;
-+ goto no_map;
- }
-
- if (memory_give_ownership(map_obj, (u32) pmpu_addr, ul_size, dir)) {
-@@ -795,6 +797,8 @@ int proc_begin_dma(void *hprocessor, voi
- status = -EFAULT;
- }
-
-+no_map:
-+ mutex_unlock(&proc_lock);
- err_out:
-
- return status;
-@@ -819,21 +823,24 @@ int proc_end_dma(void *hprocessor, void
- (u32)pmpu_addr,
- ul_size, dir);
-
-+ mutex_lock(&proc_lock);
-+
- /* find requested memory are in cached mapping information */
- map_obj = find_containing_mapping(pr_ctxt, (u32) pmpu_addr, ul_size);
- if (!map_obj) {
- pr_err("%s: find_containing_mapping failed\n", __func__);
- status = -EFAULT;
-- goto err_out;
-+ goto no_map;
- }
-
- if (memory_regain_ownership(map_obj, (u32) pmpu_addr, ul_size, dir)) {
- pr_err("%s: InValid address parameters %p %x\n",
- __func__, pmpu_addr, ul_size);
- status = -EFAULT;
-- goto err_out;
- }
-
-+no_map:
-+ mutex_unlock(&proc_lock);
- err_out:
- return status;
- }
-@@ -1726,9 +1733,8 @@ int proc_un_map(void *hprocessor, void *
- (p_proc_object->hbridge_context, va_align, size_align);
- }
-
-- mutex_unlock(&proc_lock);
- if (status)
-- goto func_end;
-+ goto unmap_failed;
-
- /*
- * A successful unmap should be followed by removal of map_obj
-@@ -1737,6 +1743,9 @@ int proc_un_map(void *hprocessor, void *
- */
- remove_mapping_information(pr_ctxt, (u32) map_addr, size_align);
-
-+unmap_failed:
-+ mutex_unlock(&proc_lock);
-+
- func_end:
- dev_dbg(bridge, "%s: hprocessor: 0x%p map_addr: 0x%p status: 0x%x\n",
- __func__, hprocessor, map_addr, status);
---- vanilla-2.6.38.0.orig/drivers/net/wireless/rtl818x/rtl8187/dev.c
-+++ vanilla-2.6.38.0/drivers/net/wireless/rtl818x/rtl8187/dev.c
-@@ -871,23 +871,35 @@ static void rtl8187_work(struct work_str
- /* The RTL8187 returns the retry count through register 0xFFFA. In
- * addition, it appears to be a cumulative retry count, not the
- * value for the current TX packet. When multiple TX entries are
-- * queued, the retry count will be valid for the last one in the queue.
-- * The "error" should not matter for purposes of rate setting. */
-+ * waiting in the queue, the retry count will be the total for all.
-+ * The "error" may matter for purposes of rate setting, but there is
-+ * no other choice with this hardware.
-+ */
- struct rtl8187_priv *priv = container_of(work, struct rtl8187_priv,
- work.work);
- struct ieee80211_tx_info *info;
- struct ieee80211_hw *dev = priv->dev;
- static u16 retry;
- u16 tmp;
-+ u16 avg_retry;
-+ int length;
-
- mutex_lock(&priv->conf_mutex);
- tmp = rtl818x_ioread16(priv, (__le16 *)0xFFFA);
-+ length = skb_queue_len(&priv->b_tx_status.queue);
-+ if (unlikely(!length))
-+ length = 1;
-+ if (unlikely(tmp < retry))
-+ tmp = retry;
-+ avg_retry = (tmp - retry) / length;
- while (skb_queue_len(&priv->b_tx_status.queue) > 0) {
- struct sk_buff *old_skb;
-
- old_skb = skb_dequeue(&priv->b_tx_status.queue);
- info = IEEE80211_SKB_CB(old_skb);
-- info->status.rates[0].count = tmp - retry + 1;
-+ info->status.rates[0].count = avg_retry + 1;
-+ if (info->status.rates[0].count > RETRY_COUNT)
-+ info->flags &= ~IEEE80211_TX_STAT_ACK;
- ieee80211_tx_status_irqsafe(dev, old_skb);
- }
- retry = tmp;
-@@ -933,8 +945,8 @@ static int rtl8187_start(struct ieee8021
- rtl818x_iowrite32(priv, &priv->map->TX_CONF,
- RTL818X_TX_CONF_HW_SEQNUM |
- RTL818X_TX_CONF_DISREQQSIZE |
-- (7 << 8 /* short retry limit */) |
-- (7 << 0 /* long retry limit */) |
-+ (RETRY_COUNT << 8 /* short retry limit */) |
-+ (RETRY_COUNT << 0 /* long retry limit */) |
- (7 << 21 /* MAX TX DMA */));
- rtl8187_init_urbs(dev);
- rtl8187b_init_status_urb(dev);
-@@ -1378,6 +1390,9 @@ static int __devinit rtl8187_probe(struc
- dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
- IEEE80211_HW_SIGNAL_DBM |
- IEEE80211_HW_RX_INCLUDES_FCS;
-+ /* Initialize rate-control variables */
-+ dev->max_rates = 1;
-+ dev->max_rate_tries = RETRY_COUNT;
-
- eeprom.data = dev;
- eeprom.register_read = rtl8187_eeprom_register_read;
---- vanilla-2.6.38.0.orig/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
-+++ vanilla-2.6.38.0/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
-@@ -35,6 +35,8 @@
- #define RFKILL_MASK_8187_89_97 0x2
- #define RFKILL_MASK_8198 0x4
-
-+#define RETRY_COUNT 7
-+
- struct rtl8187_rx_info {
- struct urb *urb;
- struct ieee80211_hw *dev;
---- vanilla-2.6.38.0.orig/drivers/usb/host/isp1760-hcd.c
-+++ vanilla-2.6.38.0/drivers/usb/host/isp1760-hcd.c
-@@ -33,6 +33,7 @@ struct isp1760_hcd {
- struct inter_packet_info atl_ints[32];
- struct inter_packet_info int_ints[32];
- struct memory_chunk memory_pool[BLOCKS];
-+ u32 atl_queued;
-
- /* periodic schedule support */
- #define DEFAULT_I_TDPS 1024
-@@ -850,6 +851,11 @@ static void enqueue_an_ATL_packet(struct
- skip_map &= ~queue_entry;
- isp1760_writel(skip_map, hcd->regs + HC_ATL_PTD_SKIPMAP_REG);
-
-+ priv->atl_queued++;
-+ if (priv->atl_queued == 2)
-+ isp1760_writel(INTERRUPT_ENABLE_SOT_MASK,
-+ hcd->regs + HC_INTERRUPT_ENABLE);
-+
- buffstatus = isp1760_readl(hcd->regs + HC_BUFFER_STATUS_REG);
- buffstatus |= ATL_BUFFER;
- isp1760_writel(buffstatus, hcd->regs + HC_BUFFER_STATUS_REG);
-@@ -992,6 +998,7 @@ static void do_atl_int(struct usb_hcd *u
- u32 dw3;
-
- status = 0;
-+ priv->atl_queued--;
-
- queue_entry = __ffs(done_map);
- done_map &= ~(1 << queue_entry);
-@@ -1054,11 +1061,6 @@ static void do_atl_int(struct usb_hcd *u
- * device is not able to send data fast enough.
- * This happens mostly on slower hardware.
- */
-- printk(KERN_NOTICE "Reloading ptd %p/%p... qh %p read: "
-- "%d of %zu done: %08x cur: %08x\n", qtd,
-- urb, qh, PTD_XFERRED_LENGTH(dw3),
-- qtd->length, done_map,
-- (1 << queue_entry));
-
- /* RL counter = ERR counter */
- dw3 &= ~(0xf << 19);
-@@ -1086,6 +1088,11 @@ static void do_atl_int(struct usb_hcd *u
- priv_write_copy(priv, (u32 *)&ptd, usb_hcd->regs +
- atl_regs, sizeof(ptd));
-
-+ priv->atl_queued++;
-+ if (priv->atl_queued == 2)
-+ isp1760_writel(INTERRUPT_ENABLE_SOT_MASK,
-+ usb_hcd->regs + HC_INTERRUPT_ENABLE);
-+
- buffstatus = isp1760_readl(usb_hcd->regs +
- HC_BUFFER_STATUS_REG);
- buffstatus |= ATL_BUFFER;
-@@ -1191,6 +1198,9 @@ static void do_atl_int(struct usb_hcd *u
- skip_map = isp1760_readl(usb_hcd->regs +
- HC_ATL_PTD_SKIPMAP_REG);
- }
-+ if (priv->atl_queued <= 1)
-+ isp1760_writel(INTERRUPT_ENABLE_MASK,
-+ usb_hcd->regs + HC_INTERRUPT_ENABLE);
- }
-
- static void do_intl_int(struct usb_hcd *usb_hcd)
-@@ -1770,7 +1780,7 @@ static irqreturn_t isp1760_irq(struct us
- goto leave;
-
- isp1760_writel(imask, usb_hcd->regs + HC_INTERRUPT_REG);
-- if (imask & HC_ATL_INT)
-+ if (imask & (HC_ATL_INT | HC_SOT_INT))
- do_atl_int(usb_hcd);
-
- if (imask & HC_INTL_INT)
---- vanilla-2.6.38.0.orig/drivers/usb/host/isp1760-hcd.h
-+++ vanilla-2.6.38.0/drivers/usb/host/isp1760-hcd.h
-@@ -69,6 +69,7 @@ void deinit_kmem_cache(void);
-
- #define HC_INTERRUPT_ENABLE 0x314
- #define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT | HC_EOT_INT)
-+#define INTERRUPT_ENABLE_SOT_MASK (HC_INTL_INT | HC_SOT_INT | HC_EOT_INT)
-
- #define HC_ISO_INT (1 << 9)
- #define HC_ATL_INT (1 << 8)
---- vanilla-2.6.38.0.orig/drivers/usb/host/ehci-hub.c
-+++ vanilla-2.6.38.0/drivers/usb/host/ehci-hub.c
-@@ -106,6 +106,27 @@ static void ehci_handover_companion_port
- ehci->owned_ports = 0;
- }
-
-+static int ehci_port_change(struct ehci_hcd *ehci)
-+{
-+ int i = HCS_N_PORTS(ehci->hcs_params);
-+
-+ /* First check if the controller indicates a change event */
-+
-+ if (ehci_readl(ehci, &ehci->regs->status) & STS_PCD)
-+ return 1;
-+
-+ /*
-+ * Not all controllers appear to update this while going from D3 to D0,
-+ * so check the individual port status registers as well
-+ */
-+
-+ while (i--)
-+ if (ehci_readl(ehci, &ehci->regs->port_status[i]) & PORT_CSC)
-+ return 1;
-+
-+ return 0;
-+}
-+
- static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
- bool suspending, bool do_wakeup)
- {
-@@ -173,7 +194,7 @@ static void ehci_adjust_port_wakeup_flag
- }
-
- /* Does the root hub have a port wakeup pending? */
-- if (!suspending && (ehci_readl(ehci, &ehci->regs->status) & STS_PCD))
-+ if (!suspending && ehci_port_change(ehci))
- usb_hcd_resume_root_hub(ehci_to_hcd(ehci));
-
- spin_unlock_irqrestore(&ehci->lock, flags);
---- vanilla-2.6.38.0.orig/drivers/usb/core/hcd-pci.c
-+++ vanilla-2.6.38.0/drivers/usb/core/hcd-pci.c
-@@ -363,8 +363,7 @@ static int check_root_hub_suspended(stru
- struct pci_dev *pci_dev = to_pci_dev(dev);
- struct usb_hcd *hcd = pci_get_drvdata(pci_dev);
-
-- if (!(hcd->state == HC_STATE_SUSPENDED ||
-- hcd->state == HC_STATE_HALT)) {
-+ if (HCD_RH_RUNNING(hcd)) {
- dev_warn(dev, "Root hub is not suspended\n");
- return -EBUSY;
- }
-@@ -386,7 +385,7 @@ static int suspend_common(struct device
- if (retval)
- return retval;
-
-- if (hcd->driver->pci_suspend) {
-+ if (hcd->driver->pci_suspend && !HCD_DEAD(hcd)) {
- /* Optimization: Don't suspend if a root-hub wakeup is
- * pending and it would cause the HCD to wake up anyway.
- */
-@@ -427,7 +426,7 @@ static int resume_common(struct device *
- struct usb_hcd *hcd = pci_get_drvdata(pci_dev);
- int retval;
-
-- if (hcd->state != HC_STATE_SUSPENDED) {
-+ if (HCD_RH_RUNNING(hcd)) {
- dev_dbg(dev, "can't resume, not suspended!\n");
- return 0;
- }
-@@ -442,7 +441,7 @@ static int resume_common(struct device *
-
- clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
-
-- if (hcd->driver->pci_resume) {
-+ if (hcd->driver->pci_resume && !HCD_DEAD(hcd)) {
- if (event != PM_EVENT_AUTO_RESUME)
- wait_for_companions(pci_dev, hcd);
-
-@@ -475,10 +474,10 @@ static int hcd_pci_suspend_noirq(struct
-
- pci_save_state(pci_dev);
-
-- /* If the root hub is HALTed rather than SUSPENDed,
-+ /* If the root hub is dead rather than suspended,
- * disallow remote wakeup.
- */
-- if (hcd->state == HC_STATE_HALT)
-+ if (HCD_DEAD(hcd))
- device_set_wakeup_enable(dev, 0);
- dev_dbg(dev, "wakeup: %d\n", device_may_wakeup(dev));
-
---- vanilla-2.6.38.0.orig/drivers/usb/core/hcd.c
-+++ vanilla-2.6.38.0/drivers/usb/core/hcd.c
-@@ -983,7 +983,7 @@ static int register_root_hub(struct usb_
- spin_unlock_irq (&hcd_root_hub_lock);
-
- /* Did the HC die before the root hub was registered? */
-- if (hcd->state == HC_STATE_HALT)
-+ if (HCD_DEAD(hcd) || hcd->state == HC_STATE_HALT)
- usb_hc_died (hcd); /* This time clean up */
- }
-
-@@ -1089,13 +1089,10 @@ int usb_hcd_link_urb_to_ep(struct usb_hc
- * Check the host controller's state and add the URB to the
- * endpoint's queue.
- */
-- switch (hcd->state) {
-- case HC_STATE_RUNNING:
-- case HC_STATE_RESUMING:
-+ if (HCD_RH_RUNNING(hcd)) {
- urb->unlinked = 0;
- list_add_tail(&urb->urb_list, &urb->ep->urb_list);
-- break;
-- default:
-+ } else {
- rc = -ESHUTDOWN;
- goto done;
- }
-@@ -1913,7 +1910,7 @@ int usb_hcd_get_frame_number (struct usb
- {
- struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-
-- if (!HC_IS_RUNNING (hcd->state))
-+ if (!HCD_RH_RUNNING(hcd))
- return -ESHUTDOWN;
- return hcd->driver->get_frame_number (hcd);
- }
-@@ -1930,9 +1927,15 @@ int hcd_bus_suspend(struct usb_device *r
-
- dev_dbg(&rhdev->dev, "bus %s%s\n",
- (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "suspend");
-+ if (HCD_DEAD(hcd)) {
-+ dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend");
-+ return 0;
-+ }
-+
- if (!hcd->driver->bus_suspend) {
- status = -ENOENT;
- } else {
-+ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
- hcd->state = HC_STATE_QUIESCING;
- status = hcd->driver->bus_suspend(hcd);
- }
-@@ -1940,7 +1943,12 @@ int hcd_bus_suspend(struct usb_device *r
- usb_set_device_state(rhdev, USB_STATE_SUSPENDED);
- hcd->state = HC_STATE_SUSPENDED;
- } else {
-- hcd->state = old_state;
-+ spin_lock_irq(&hcd_root_hub_lock);
-+ if (!HCD_DEAD(hcd)) {
-+ set_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
-+ hcd->state = old_state;
-+ }
-+ spin_unlock_irq(&hcd_root_hub_lock);
- dev_dbg(&rhdev->dev, "bus %s fail, err %d\n",
- "suspend", status);
- }
-@@ -1955,9 +1963,13 @@ int hcd_bus_resume(struct usb_device *rh
-
- dev_dbg(&rhdev->dev, "usb %s%s\n",
- (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
-+ if (HCD_DEAD(hcd)) {
-+ dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "resume");
-+ return 0;
-+ }
- if (!hcd->driver->bus_resume)
- return -ENOENT;
-- if (hcd->state == HC_STATE_RUNNING)
-+ if (HCD_RH_RUNNING(hcd))
- return 0;
-
- hcd->state = HC_STATE_RESUMING;
-@@ -1966,10 +1978,15 @@ int hcd_bus_resume(struct usb_device *rh
- if (status == 0) {
- /* TRSMRCY = 10 msec */
- msleep(10);
-- usb_set_device_state(rhdev, rhdev->actconfig
-- ? USB_STATE_CONFIGURED
-- : USB_STATE_ADDRESS);
-- hcd->state = HC_STATE_RUNNING;
-+ spin_lock_irq(&hcd_root_hub_lock);
-+ if (!HCD_DEAD(hcd)) {
-+ usb_set_device_state(rhdev, rhdev->actconfig
-+ ? USB_STATE_CONFIGURED
-+ : USB_STATE_ADDRESS);
-+ set_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
-+ hcd->state = HC_STATE_RUNNING;
-+ }
-+ spin_unlock_irq(&hcd_root_hub_lock);
- } else {
- hcd->state = old_state;
- dev_dbg(&rhdev->dev, "bus %s fail, err %d\n",
-@@ -2080,7 +2097,7 @@ irqreturn_t usb_hcd_irq (int irq, void *
- */
- local_irq_save(flags);
-
-- if (unlikely(hcd->state == HC_STATE_HALT || !HCD_HW_ACCESSIBLE(hcd))) {
-+ if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd))) {
- rc = IRQ_NONE;
- } else if (hcd->driver->irq(hcd) == IRQ_NONE) {
- rc = IRQ_NONE;
-@@ -2114,6 +2131,8 @@ void usb_hc_died (struct usb_hcd *hcd)
- dev_err (hcd->self.controller, "HC died; cleaning up\n");
-
- spin_lock_irqsave (&hcd_root_hub_lock, flags);
-+ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
-+ set_bit(HCD_FLAG_DEAD, &hcd->flags);
- if (hcd->rh_registered) {
- clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
-
-@@ -2256,6 +2275,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
- */
- device_init_wakeup(&rhdev->dev, 1);
-
-+ /* HCD_FLAG_RH_RUNNING doesn't matter until the root hub is
-+ * registered. But since the controller can die at any time,
-+ * let's initialize the flag before touching the hardware.
-+ */
-+ set_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
-+
- /* "reset" is misnamed; its role is now one-time init. the controller
- * should already have been reset (and boot firmware kicked off etc).
- */
-@@ -2323,6 +2348,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
- return retval;
-
- error_create_attr_group:
-+ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
- if (HC_IS_RUNNING(hcd->state))
- hcd->state = HC_STATE_QUIESCING;
- spin_lock_irq(&hcd_root_hub_lock);
-@@ -2375,6 +2401,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)
- usb_get_dev(rhdev);
- sysfs_remove_group(&rhdev->dev.kobj, &usb_bus_attr_group);
-
-+ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
- if (HC_IS_RUNNING (hcd->state))
- hcd->state = HC_STATE_QUIESCING;
-
---- vanilla-2.6.38.0.orig/include/linux/usb/hcd.h
-+++ vanilla-2.6.38.0/include/linux/usb/hcd.h
-@@ -99,6 +99,8 @@ struct usb_hcd {
- #define HCD_FLAG_POLL_RH 2 /* poll for rh status? */
- #define HCD_FLAG_POLL_PENDING 3 /* status has changed? */
- #define HCD_FLAG_WAKEUP_PENDING 4 /* root hub is resuming? */
-+#define HCD_FLAG_RH_RUNNING 5 /* root hub is running? */
-+#define HCD_FLAG_DEAD 6 /* controller has died? */
-
- /* The flags can be tested using these macros; they are likely to
- * be slightly faster than test_bit().
-@@ -108,6 +110,8 @@ struct usb_hcd {
- #define HCD_POLL_RH(hcd) ((hcd)->flags & (1U << HCD_FLAG_POLL_RH))
- #define HCD_POLL_PENDING(hcd) ((hcd)->flags & (1U << HCD_FLAG_POLL_PENDING))
- #define HCD_WAKEUP_PENDING(hcd) ((hcd)->flags & (1U << HCD_FLAG_WAKEUP_PENDING))
-+#define HCD_RH_RUNNING(hcd) ((hcd)->flags & (1U << HCD_FLAG_RH_RUNNING))
-+#define HCD_DEAD(hcd) ((hcd)->flags & (1U << HCD_FLAG_DEAD))
-
- /* Flags that get set only during HCD registration or removal. */
- unsigned rh_registered:1;/* is root hub registered? */
---- vanilla-2.6.38.0.orig/drivers/usb/host/xhci-ring.c
-+++ vanilla-2.6.38.0/drivers/usb/host/xhci-ring.c
-@@ -500,15 +500,26 @@ void xhci_find_new_dequeue_state(struct
- state->new_cycle_state = ~(state->new_cycle_state) & 0x1;
- next_trb(xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
-
-+ /*
-+ * If there is only one segment in a ring, find_trb_seg()'s while loop
-+ * will not run, and it will return before it has a chance to see if it
-+ * needs to toggle the cycle bit. It can't tell if the stalled transfer
-+ * ended just before the link TRB on a one-segment ring, or if the TD
-+ * wrapped around the top of the ring, because it doesn't have the TD in
-+ * question. Look for the one-segment case where stalled TRB's address
-+ * is greater than the new dequeue pointer address.
-+ */
-+ if (ep_ring->first_seg == ep_ring->first_seg->next &&
-+ state->new_deq_ptr < dev->eps[ep_index].stopped_trb)
-+ state->new_cycle_state ^= 0x1;
-+ xhci_dbg(xhci, "Cycle state = 0x%x\n", state->new_cycle_state);
-+
- /* Don't update the ring cycle state for the producer (us). */
- xhci_dbg(xhci, "New dequeue segment = %p (virtual)\n",
- state->new_deq_seg);
- addr = xhci_trb_virt_to_dma(state->new_deq_seg, state->new_deq_ptr);
- xhci_dbg(xhci, "New dequeue pointer = 0x%llx (DMA)\n",
- (unsigned long long) addr);
-- xhci_dbg(xhci, "Setting dequeue pointer in internal ring state.\n");
-- ep_ring->dequeue = state->new_deq_ptr;
-- ep_ring->deq_seg = state->new_deq_seg;
- }
-
- static void td_to_noop(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
-@@ -951,9 +962,26 @@ static void handle_set_deq_completion(st
- } else {
- xhci_dbg(xhci, "Successful Set TR Deq Ptr cmd, deq = @%08llx\n",
- ep_ctx->deq);
-+ if (xhci_trb_virt_to_dma(dev->eps[ep_index].queued_deq_seg,
-+ dev->eps[ep_index].queued_deq_ptr) ==
-+ (ep_ctx->deq & ~(EP_CTX_CYCLE_MASK))) {
-+ /* Update the ring's dequeue segment and dequeue pointer
-+ * to reflect the new position.
-+ */
-+ ep_ring->deq_seg = dev->eps[ep_index].queued_deq_seg;
-+ ep_ring->dequeue = dev->eps[ep_index].queued_deq_ptr;
-+ } else {
-+ xhci_warn(xhci, "Mismatch between completed Set TR Deq "
-+ "Ptr command & xHCI internal state.\n");
-+ xhci_warn(xhci, "ep deq seg = %p, deq ptr = %p\n",
-+ dev->eps[ep_index].queued_deq_seg,
-+ dev->eps[ep_index].queued_deq_ptr);
-+ }
- }
-
- dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING;
-+ dev->eps[ep_index].queued_deq_seg = NULL;
-+ dev->eps[ep_index].queued_deq_ptr = NULL;
- /* Restart any rings with pending URBs */
- ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
- }
-@@ -3229,6 +3257,7 @@ static int queue_set_tr_deq(struct xhci_
- u32 trb_ep_index = EP_ID_FOR_TRB(ep_index);
- u32 trb_stream_id = STREAM_ID_FOR_TRB(stream_id);
- u32 type = TRB_TYPE(TRB_SET_DEQ);
-+ struct xhci_virt_ep *ep;
-
- addr = xhci_trb_virt_to_dma(deq_seg, deq_ptr);
- if (addr == 0) {
-@@ -3237,6 +3266,14 @@ static int queue_set_tr_deq(struct xhci_
- deq_seg, deq_ptr);
- return 0;
- }
-+ ep = &xhci->devs[slot_id]->eps[ep_index];
-+ if ((ep->ep_state & SET_DEQ_PENDING)) {
-+ xhci_warn(xhci, "WARN Cannot submit Set TR Deq Ptr\n");
-+ xhci_warn(xhci, "A Set TR Deq Ptr command is pending.\n");
-+ return 0;
-+ }
-+ ep->queued_deq_seg = deq_seg;
-+ ep->queued_deq_ptr = deq_ptr;
- return queue_command(xhci, lower_32_bits(addr) | cycle_state,
- upper_32_bits(addr), trb_stream_id,
- trb_slot_id | trb_ep_index | type, false);
---- vanilla-2.6.38.0.orig/drivers/usb/host/xhci.h
-+++ vanilla-2.6.38.0/drivers/usb/host/xhci.h
-@@ -644,6 +644,9 @@ struct xhci_ep_ctx {
- #define AVG_TRB_LENGTH_FOR_EP(p) ((p) & 0xffff)
- #define MAX_ESIT_PAYLOAD_FOR_EP(p) (((p) & 0xffff) << 16)
-
-+/* deq bitmasks */
-+#define EP_CTX_CYCLE_MASK (1 << 0)
-+
-
- /**
- * struct xhci_input_control_context
-@@ -746,6 +749,12 @@ struct xhci_virt_ep {
- struct timer_list stop_cmd_timer;
- int stop_cmds_pending;
- struct xhci_hcd *xhci;
-+ /* Dequeue pointer and dequeue segment for a submitted Set TR Dequeue
-+ * command. We'll need to update the ring's dequeue segment and dequeue
-+ * pointer after the command completes.
-+ */
-+ struct xhci_segment *queued_deq_seg;
-+ union xhci_trb *queued_deq_ptr;
- /*
- * Sometimes the xHC can not process isochronous endpoint ring quickly
- * enough, and it will miss some isoc tds on the ring and generate
---- vanilla-2.6.38.0.orig/drivers/usb/core/urb.c
-+++ vanilla-2.6.38.0/drivers/usb/core/urb.c
-@@ -366,7 +366,16 @@ int usb_submit_urb(struct urb *urb, gfp_
- if (xfertype == USB_ENDPOINT_XFER_ISOC) {
- int n, len;
-
-- /* FIXME SuperSpeed isoc endpoints have up to 16 bursts */
-+ /* SuperSpeed isoc endpoints have up to 16 bursts of up to
-+ * 3 packets each
-+ */
-+ if (dev->speed == USB_SPEED_SUPER) {
-+ int burst = 1 + ep->ss_ep_comp.bMaxBurst;
-+ int mult = USB_SS_MULT(ep->ss_ep_comp.bmAttributes);
-+ max *= burst;
-+ max *= mult;
-+ }
-+
- /* "high bandwidth" mode, 1-3 packets/uframe? */
- if (dev->speed == USB_SPEED_HIGH) {
- int mult = 1 + ((max >> 11) & 0x03);
---- vanilla-2.6.38.0.orig/include/linux/usb/ch9.h
-+++ vanilla-2.6.38.0/include/linux/usb/ch9.h
-@@ -585,6 +585,8 @@ struct usb_ss_ep_comp_descriptor {
- #define USB_DT_SS_EP_COMP_SIZE 6
- /* Bits 4:0 of bmAttributes if this is a bulk endpoint */
- #define USB_SS_MAX_STREAMS(p) (1 << (p & 0x1f))
-+/* Bits 1:0 of bmAttributes if this is an isoc endpoint */
-+#define USB_SS_MULT(p) (1 + ((p) & 0x3))
-
- /*-------------------------------------------------------------------------*/
-
---- vanilla-2.6.38.0.orig/sound/pci/hda/patch_realtek.c
-+++ vanilla-2.6.38.0/sound/pci/hda/patch_realtek.c
-@@ -394,6 +394,7 @@ struct alc_spec {
- /* other flags */
- unsigned int no_analog :1; /* digital I/O only */
- unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */
-+ unsigned int single_input_src:1;
- int init_amp;
- int codec_variant; /* flag for other variants */
-
-@@ -3919,6 +3920,8 @@ static struct hda_amp_list alc880_lg_loo
- * Common callbacks
- */
-
-+static void alc_init_special_input_src(struct hda_codec *codec);
-+
- static int alc_init(struct hda_codec *codec)
- {
- struct alc_spec *spec = codec->spec;
-@@ -3929,6 +3932,7 @@ static int alc_init(struct hda_codec *co
-
- for (i = 0; i < spec->num_init_verbs; i++)
- snd_hda_sequence_write(codec, spec->init_verbs[i]);
-+ alc_init_special_input_src(codec);
-
- if (spec->init_hook)
- spec->init_hook(codec);
-@@ -5151,7 +5155,9 @@ static const char *alc_get_line_out_pfx(
-
- switch (cfg->line_out_type) {
- case AUTO_PIN_SPEAKER_OUT:
-- return "Speaker";
-+ if (cfg->line_outs == 1)
-+ return "Speaker";
-+ break;
- case AUTO_PIN_HP_OUT:
- return "Headphone";
- default:
-@@ -5205,16 +5211,19 @@ static int alc880_auto_create_multi_out_
- return err;
- } else {
- const char *name = pfx;
-- if (!name)
-+ int index = i;
-+ if (!name) {
- name = chname[i];
-+ index = 0;
-+ }
- err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
-- name, i,
-+ name, index,
- HDA_COMPOSE_AMP_VAL(nid, 3, 0,
- HDA_OUTPUT));
- if (err < 0)
- return err;
- err = __add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
-- name, i,
-+ name, index,
- HDA_COMPOSE_AMP_VAL(nid, 3, 2,
- HDA_INPUT));
- if (err < 0)
-@@ -5585,6 +5594,7 @@ static void fixup_single_adc(struct hda_
- spec->capsrc_nids += i;
- spec->adc_nids += i;
- spec->num_adc_nids = 1;
-+ spec->single_input_src = 1;
- }
- }
-
-@@ -5596,6 +5606,16 @@ static void fixup_dual_adc_switch(struct
- init_capsrc_for_pin(codec, spec->int_mic.pin);
- }
-
-+/* initialize some special cases for input sources */
-+static void alc_init_special_input_src(struct hda_codec *codec)
-+{
-+ struct alc_spec *spec = codec->spec;
-+ if (spec->dual_adc_switch)
-+ fixup_dual_adc_switch(codec);
-+ else if (spec->single_input_src)
-+ init_capsrc_for_pin(codec, spec->autocfg.inputs[0].pin);
-+}
-+
- static void set_capture_mixer(struct hda_codec *codec)
- {
- struct alc_spec *spec = codec->spec;
-@@ -5611,7 +5631,7 @@ static void set_capture_mixer(struct hda
- int mux = 0;
- int num_adcs = spec->num_adc_nids;
- if (spec->dual_adc_switch)
-- fixup_dual_adc_switch(codec);
-+ num_adcs = 1;
- else if (spec->auto_mic)
- fixup_automic_adc(codec);
- else if (spec->input_mux) {
-@@ -5620,8 +5640,6 @@ static void set_capture_mixer(struct hda
- else if (spec->input_mux->num_items == 1)
- fixup_single_adc(codec);
- }
-- if (spec->dual_adc_switch)
-- num_adcs = 1;
- spec->cap_mixer = caps[mux][num_adcs - 1];
- }
- }
-@@ -10748,6 +10766,7 @@ static struct alc_config_preset alc882_p
- */
- enum {
- PINFIX_ABIT_AW9D_MAX,
-+ PINFIX_LENOVO_Y530,
- PINFIX_PB_M5210,
- PINFIX_ACER_ASPIRE_7736,
- };
-@@ -10762,6 +10781,14 @@ static const struct alc_fixup alc882_fix
- { }
- }
- },
-+ [PINFIX_LENOVO_Y530] = {
-+ .type = ALC_FIXUP_PINS,
-+ .v.pins = (const struct alc_pincfg[]) {
-+ { 0x15, 0x99130112 }, /* rear int speakers */
-+ { 0x16, 0x99130111 }, /* subwoofer */
-+ { }
-+ }
-+ },
- [PINFIX_PB_M5210] = {
- .type = ALC_FIXUP_VERBS,
- .v.verbs = (const struct hda_verb[]) {
-@@ -10777,6 +10804,7 @@ static const struct alc_fixup alc882_fix
-
- static struct snd_pci_quirk alc882_fixup_tbl[] = {
- SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", PINFIX_PB_M5210),
-+ SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),
- SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
- SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),
- {}
-@@ -10829,23 +10857,28 @@ static void alc882_auto_init_hp_out(stru
- hda_nid_t pin, dac;
- int i;
-
-- for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
-- pin = spec->autocfg.hp_pins[i];
-- if (!pin)
-- break;
-- dac = spec->multiout.hp_nid;
-- if (!dac)
-- dac = spec->multiout.dac_nids[0]; /* to front */
-- alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
-+ if (spec->autocfg.line_out_type != AUTO_PIN_HP_OUT) {
-+ for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
-+ pin = spec->autocfg.hp_pins[i];
-+ if (!pin)
-+ break;
-+ dac = spec->multiout.hp_nid;
-+ if (!dac)
-+ dac = spec->multiout.dac_nids[0]; /* to front */
-+ alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
-+ }
- }
-- for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
-- pin = spec->autocfg.speaker_pins[i];
-- if (!pin)
-- break;
-- dac = spec->multiout.extra_out_nid[0];
-- if (!dac)
-- dac = spec->multiout.dac_nids[0]; /* to front */
-- alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
-+
-+ if (spec->autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT) {
-+ for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
-+ pin = spec->autocfg.speaker_pins[i];
-+ if (!pin)
-+ break;
-+ dac = spec->multiout.extra_out_nid[0];
-+ if (!dac)
-+ dac = spec->multiout.dac_nids[0]; /* to front */
-+ alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
-+ }
- }
- }
-
---- vanilla-2.6.38.0.orig/sound/pci/hda/patch_sigmatel.c
-+++ vanilla-2.6.38.0/sound/pci/hda/patch_sigmatel.c
-@@ -757,7 +757,7 @@ static int stac92xx_mux_enum_put(struct
- struct sigmatel_spec *spec = codec->spec;
- unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
- const struct hda_input_mux *imux = spec->input_mux;
-- unsigned int idx, prev_idx;
-+ unsigned int idx, prev_idx, didx;
-
- idx = ucontrol->value.enumerated.item[0];
- if (idx >= imux->num_items)
-@@ -769,7 +769,8 @@ static int stac92xx_mux_enum_put(struct
- snd_hda_codec_write_cache(codec, spec->mux_nids[adc_idx], 0,
- AC_VERB_SET_CONNECT_SEL,
- imux->items[idx].index);
-- if (prev_idx >= spec->num_analog_muxes) {
-+ if (prev_idx >= spec->num_analog_muxes &&
-+ spec->mux_nids[adc_idx] != spec->dmux_nids[adc_idx]) {
- imux = spec->dinput_mux;
- /* 0 = analog */
- snd_hda_codec_write_cache(codec,
-@@ -779,9 +780,13 @@ static int stac92xx_mux_enum_put(struct
- }
- } else {
- imux = spec->dinput_mux;
-+ /* first dimux item is hardcoded to select analog imux,
-+ * so lets skip it
-+ */
-+ didx = idx - spec->num_analog_muxes + 1;
- snd_hda_codec_write_cache(codec, spec->dmux_nids[adc_idx], 0,
- AC_VERB_SET_CONNECT_SEL,
-- imux->items[idx - 1].index);
-+ imux->items[didx].index);
- }
- spec->cur_mux[adc_idx] = idx;
- return 1;
---- vanilla-2.6.38.0.orig/drivers/hid/hid-magicmouse.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-magicmouse.c
-@@ -258,7 +258,7 @@ static void magicmouse_emit_touch(struct
- input_report_abs(input, ABS_MT_TRACKING_ID, id);
- input_report_abs(input, ABS_MT_TOUCH_MAJOR, touch_major << 2);
- input_report_abs(input, ABS_MT_TOUCH_MINOR, touch_minor << 2);
-- input_report_abs(input, ABS_MT_ORIENTATION, orientation);
-+ input_report_abs(input, ABS_MT_ORIENTATION, -orientation);
- input_report_abs(input, ABS_MT_POSITION_X, x);
- input_report_abs(input, ABS_MT_POSITION_Y, y);
-
-@@ -397,7 +397,7 @@ static void magicmouse_setup_input(struc
- input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
- input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
- input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
-- input_set_abs_params(input, ABS_MT_ORIENTATION, -32, 31, 1, 0);
-+ input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
-
- /* Note: Touch Y position from the device is inverted relative
- * to how pointer motion is reported (and relative to how USB
---- vanilla-2.6.38.0.orig/drivers/hid/Kconfig
-+++ vanilla-2.6.38.0/drivers/hid/Kconfig
-@@ -68,9 +68,15 @@ config HID_A4TECH
- ---help---
- Support for A4 tech X5 and WOP-35 / Trust 450L mice.
-
--config HID_ACRUX_FF
-- tristate "ACRUX force feedback"
-+config HID_ACRUX
-+ tristate "ACRUX game controller support"
- depends on USB_HID
-+ ---help---
-+ Say Y here if you want to enable support for ACRUX game controllers.
-+
-+config HID_ACRUX_FF
-+ tristate "ACRUX force feedback support"
-+ depends on HID_ACRUX
- select INPUT_FF_MEMLESS
- ---help---
- Say Y here if you want to enable force feedback support for ACRUX
-@@ -319,10 +325,10 @@ config HID_NTRIG
- Support for N-Trig touch screen.
-
- config HID_ORTEK
-- tristate "Ortek WKB-2000 wireless keyboard and mouse trackpad"
-+ tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad"
- depends on USB_HID
- ---help---
-- Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.
-+ Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad.
-
- config HID_PANTHERLORD
- tristate "Pantherlord/GreenAsia game controller"
---- vanilla-2.6.38.0.orig/drivers/hid/hid-core.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-core.c
-@@ -1256,9 +1256,7 @@ static const struct hid_device_id hid_ha
- { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
- { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
- { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
--#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)
- { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
--#endif
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
-@@ -1302,6 +1300,9 @@ static const struct hid_device_id hid_ha
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
-@@ -1400,6 +1401,7 @@ static const struct hid_device_id hid_ha
- { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
- { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
- { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
- { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
- { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
- { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
-@@ -1801,6 +1803,9 @@ static const struct hid_device_id hid_mo
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
- { }
---- vanilla-2.6.38.0.orig/drivers/hid/hid-ids.h
-+++ vanilla-2.6.38.0/drivers/hid/hid-ids.h
-@@ -103,6 +103,9 @@
- #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242
- #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243
- #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
-@@ -466,6 +469,7 @@
- #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
-
- #define USB_VENDOR_ID_ORTEK 0x05a4
-+#define USB_DEVICE_ID_ORTEK_PKB1700 0x1700
- #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000
-
- #define USB_VENDOR_ID_PANJIT 0x134c
---- vanilla-2.6.38.0.orig/drivers/hid/hid-ortek.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-ortek.c
-@@ -1,5 +1,5 @@
- /*
-- * HID driver for Ortek WKB-2000 (wireless keyboard + mouse trackpad).
-+ * HID driver for Ortek PKB-1700/WKB-2000 (wireless keyboard + mouse trackpad).
- * Fixes LogicalMaximum error in USB report description, see
- * http://bugzilla.kernel.org/show_bug.cgi?id=14787
- *
-@@ -30,6 +30,7 @@ static __u8 *ortek_report_fixup(struct h
- }
-
- static const struct hid_device_id ortek_devices[] = {
-+ { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
- { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
- { }
- };
---- vanilla-2.6.38.0.orig/drivers/pci/quirks.c
-+++ vanilla-2.6.38.0/drivers/pci/quirks.c
-@@ -533,6 +533,17 @@ static void __devinit quirk_piix4_acpi(s
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, quirk_piix4_acpi);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3, quirk_piix4_acpi);
-
-+#define ICH_PMBASE 0x40
-+#define ICH_ACPI_CNTL 0x44
-+#define ICH4_ACPI_EN 0x10
-+#define ICH6_ACPI_EN 0x80
-+#define ICH4_GPIOBASE 0x58
-+#define ICH4_GPIO_CNTL 0x5c
-+#define ICH4_GPIO_EN 0x10
-+#define ICH6_GPIOBASE 0x48
-+#define ICH6_GPIO_CNTL 0x4c
-+#define ICH6_GPIO_EN 0x10
-+
- /*
- * ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
- * 0x40 (128 bytes of ACPI, GPIO & TCO registers)
-@@ -541,12 +552,33 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- static void __devinit quirk_ich4_lpc_acpi(struct pci_dev *dev)
- {
- u32 region;
-+ u8 enable;
-
-- pci_read_config_dword(dev, 0x40, ®ion);
-- quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES, "ICH4 ACPI/GPIO/TCO");
-+ /*
-+ * The check for PCIBIOS_MIN_IO is to ensure we won't create a conflict
-+ * with low legacy (and fixed) ports. We don't know the decoding
-+ * priority and can't tell whether the legacy device or the one created
-+ * here is really at that address. This happens on boards with broken
-+ * BIOSes.
-+ */
-+
-+ pci_read_config_byte(dev, ICH_ACPI_CNTL, &enable);
-+ if (enable & ICH4_ACPI_EN) {
-+ pci_read_config_dword(dev, ICH_PMBASE, ®ion);
-+ region &= PCI_BASE_ADDRESS_IO_MASK;
-+ if (region >= PCIBIOS_MIN_IO)
-+ quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES,
-+ "ICH4 ACPI/GPIO/TCO");
-+ }
-
-- pci_read_config_dword(dev, 0x58, ®ion);
-- quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH4 GPIO");
-+ pci_read_config_byte(dev, ICH4_GPIO_CNTL, &enable);
-+ if (enable & ICH4_GPIO_EN) {
-+ pci_read_config_dword(dev, ICH4_GPIOBASE, ®ion);
-+ region &= PCI_BASE_ADDRESS_IO_MASK;
-+ if (region >= PCIBIOS_MIN_IO)
-+ quirk_io_region(dev, region, 64,
-+ PCI_BRIDGE_RESOURCES + 1, "ICH4 GPIO");
-+ }
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0, quirk_ich4_lpc_acpi);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0, quirk_ich4_lpc_acpi);
-@@ -562,12 +594,25 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- static void __devinit ich6_lpc_acpi_gpio(struct pci_dev *dev)
- {
- u32 region;
-+ u8 enable;
-
-- pci_read_config_dword(dev, 0x40, ®ion);
-- quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES, "ICH6 ACPI/GPIO/TCO");
-+ pci_read_config_byte(dev, ICH_ACPI_CNTL, &enable);
-+ if (enable & ICH6_ACPI_EN) {
-+ pci_read_config_dword(dev, ICH_PMBASE, ®ion);
-+ region &= PCI_BASE_ADDRESS_IO_MASK;
-+ if (region >= PCIBIOS_MIN_IO)
-+ quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES,
-+ "ICH6 ACPI/GPIO/TCO");
-+ }
-
-- pci_read_config_dword(dev, 0x48, ®ion);
-- quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH6 GPIO");
-+ pci_read_config_byte(dev, ICH6_GPIO_CNTL, &enable);
-+ if (enable & ICH4_GPIO_EN) {
-+ pci_read_config_dword(dev, ICH6_GPIOBASE, ®ion);
-+ region &= PCI_BASE_ADDRESS_IO_MASK;
-+ if (region >= PCIBIOS_MIN_IO)
-+ quirk_io_region(dev, region, 64,
-+ PCI_BRIDGE_RESOURCES + 1, "ICH6 GPIO");
-+ }
- }
-
- static void __devinit ich6_lpc_generic_decode(struct pci_dev *dev, unsigned reg, const char *name, int dynsize)
-@@ -2618,58 +2663,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
-
- #endif /* CONFIG_PCI_MSI */
-
--#ifdef CONFIG_PCI_IOV
--
--/*
-- * For Intel 82576 SR-IOV NIC, if BIOS doesn't allocate resources for the
-- * SR-IOV BARs, zero the Flash BAR and program the SR-IOV BARs to use the
-- * old Flash Memory Space.
-- */
--static void __devinit quirk_i82576_sriov(struct pci_dev *dev)
--{
-- int pos, flags;
-- u32 bar, start, size;
--
-- if (PAGE_SIZE > 0x10000)
-- return;
--
-- flags = pci_resource_flags(dev, 0);
-- if ((flags & PCI_BASE_ADDRESS_SPACE) !=
-- PCI_BASE_ADDRESS_SPACE_MEMORY ||
-- (flags & PCI_BASE_ADDRESS_MEM_TYPE_MASK) !=
-- PCI_BASE_ADDRESS_MEM_TYPE_32)
-- return;
--
-- pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV);
-- if (!pos)
-- return;
--
-- pci_read_config_dword(dev, pos + PCI_SRIOV_BAR, &bar);
-- if (bar & PCI_BASE_ADDRESS_MEM_MASK)
-- return;
--
-- start = pci_resource_start(dev, 1);
-- size = pci_resource_len(dev, 1);
-- if (!start || size != 0x400000 || start & (size - 1))
-- return;
--
-- pci_resource_flags(dev, 1) = 0;
-- pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, 0);
-- pci_write_config_dword(dev, pos + PCI_SRIOV_BAR, start);
-- pci_write_config_dword(dev, pos + PCI_SRIOV_BAR + 12, start + size / 2);
--
-- dev_info(&dev->dev, "use Flash Memory Space for SR-IOV BARs\n");
--}
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10c9, quirk_i82576_sriov);
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e6, quirk_i82576_sriov);
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e7, quirk_i82576_sriov);
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e8, quirk_i82576_sriov);
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150a, quirk_i82576_sriov);
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
--
--#endif /* CONFIG_PCI_IOV */
--
- /* Allow manual resource allocation for PCI hotplug bridges
- * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For
- * some PCI-PCI hotplug bridges, like PLX 6254 (former HINT HB6),
---- vanilla-2.6.38.0.orig/drivers/pci/pci-sysfs.c
-+++ vanilla-2.6.38.0/drivers/pci/pci-sysfs.c
-@@ -1088,7 +1088,7 @@ static int pci_create_capabilities_sysfs
- attr->write = write_vpd_attr;
- retval = sysfs_create_bin_file(&dev->dev.kobj, attr);
- if (retval) {
-- kfree(dev->vpd->attr);
-+ kfree(attr);
- return retval;
- }
- dev->vpd->attr = attr;
---- vanilla-2.6.38.0.orig/sound/pci/asihpi/hpioctl.c
-+++ vanilla-2.6.38.0/sound/pci/asihpi/hpioctl.c
-@@ -155,6 +155,11 @@ long asihpi_hpi_ioctl(struct file *file,
- goto out;
- }
-
-+ if (hm->h.adapter_index >= HPI_MAX_ADAPTERS) {
-+ err = -EINVAL;
-+ goto out;
-+ }
-+
- pa = &adapters[hm->h.adapter_index];
- hr->h.size = 0;
- if (hm->h.object == HPI_OBJ_SUBSYSTEM) {
---- vanilla-2.6.38.0.orig/sound/drivers/aloop.c
-+++ vanilla-2.6.38.0/sound/drivers/aloop.c
-@@ -482,8 +482,9 @@ static unsigned int loopback_pos_update(
- cable->streams[SNDRV_PCM_STREAM_CAPTURE];
- unsigned long delta_play = 0, delta_capt = 0;
- unsigned int running;
-+ unsigned long flags;
-
-- spin_lock(&cable->lock);
-+ spin_lock_irqsave(&cable->lock, flags);
- running = cable->running ^ cable->pause;
- if (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) {
- delta_play = jiffies - dpcm_play->last_jiffies;
-@@ -495,10 +496,8 @@ static unsigned int loopback_pos_update(
- dpcm_capt->last_jiffies += delta_capt;
- }
-
-- if (delta_play == 0 && delta_capt == 0) {
-- spin_unlock(&cable->lock);
-- return running;
-- }
-+ if (delta_play == 0 && delta_capt == 0)
-+ goto unlock;
-
- if (delta_play > delta_capt) {
- loopback_bytepos_update(dpcm_play, delta_play - delta_capt,
-@@ -510,14 +509,14 @@ static unsigned int loopback_pos_update(
- delta_capt = delta_play;
- }
-
-- if (delta_play == 0 && delta_capt == 0) {
-- spin_unlock(&cable->lock);
-- return running;
-- }
-+ if (delta_play == 0 && delta_capt == 0)
-+ goto unlock;
-+
- /* note delta_capt == delta_play at this moment */
- loopback_bytepos_update(dpcm_capt, delta_capt, BYTEPOS_UPDATE_COPY);
- loopback_bytepos_update(dpcm_play, delta_play, BYTEPOS_UPDATE_POSONLY);
-- spin_unlock(&cable->lock);
-+ unlock:
-+ spin_unlock_irqrestore(&cable->lock, flags);
- return running;
- }
-
---- vanilla-2.6.38.0.orig/sound/pci/ctxfi/ctatc.c
-+++ vanilla-2.6.38.0/sound/pci/ctxfi/ctatc.c
-@@ -869,7 +869,7 @@ spdif_passthru_playback_setup(struct ct_
- mutex_lock(&atc->atc_mutex);
- dao->ops->get_spos(dao, &status);
- if (((status >> 24) & IEC958_AES3_CON_FS) != iec958_con_fs) {
-- status &= ((~IEC958_AES3_CON_FS) << 24);
-+ status &= ~(IEC958_AES3_CON_FS << 24);
- status |= (iec958_con_fs << 24);
- dao->ops->set_spos(dao, status);
- dao->ops->commit_write(dao);
---- vanilla-2.6.38.0.orig/sound/pci/ctxfi/ctmixer.c
-+++ vanilla-2.6.38.0/sound/pci/ctxfi/ctmixer.c
-@@ -566,19 +566,6 @@ static int ct_spdif_get_mask(struct snd_
- return 0;
- }
-
--static int ct_spdif_default_get(struct snd_kcontrol *kcontrol,
-- struct snd_ctl_elem_value *ucontrol)
--{
-- unsigned int status = SNDRV_PCM_DEFAULT_CON_SPDIF;
--
-- ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
-- ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
-- ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
-- ucontrol->value.iec958.status[3] = (status >> 24) & 0xff;
--
-- return 0;
--}
--
- static int ct_spdif_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
- {
-@@ -586,6 +573,10 @@ static int ct_spdif_get(struct snd_kcont
- unsigned int status;
-
- atc->spdif_out_get_status(atc, &status);
-+
-+ if (status == 0)
-+ status = SNDRV_PCM_DEFAULT_CON_SPDIF;
-+
- ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
- ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
- ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
-@@ -629,7 +620,7 @@ static struct snd_kcontrol_new iec958_de
- .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
- .count = 1,
- .info = ct_spdif_info,
-- .get = ct_spdif_default_get,
-+ .get = ct_spdif_get,
- .put = ct_spdif_put,
- .private_value = MIXER_IEC958_DEFAULT
- };
---- vanilla-2.6.38.0.orig/sound/pci/ctxfi/ctdaio.c
-+++ vanilla-2.6.38.0/sound/pci/ctxfi/ctdaio.c
-@@ -176,6 +176,7 @@ static int dao_set_left_input(struct dao
- if (!entry)
- return -ENOMEM;
-
-+ dao->ops->clear_left_input(dao);
- /* Program master and conjugate resources */
- input->ops->master(input);
- daio->rscl.ops->master(&daio->rscl);
-@@ -204,6 +205,7 @@ static int dao_set_right_input(struct da
- if (!entry)
- return -ENOMEM;
-
-+ dao->ops->clear_right_input(dao);
- /* Program master and conjugate resources */
- input->ops->master(input);
- daio->rscr.ops->master(&daio->rscr);
---- vanilla-2.6.38.0.orig/sound/soc/pxa/z2.c
-+++ vanilla-2.6.38.0/sound/soc/pxa/z2.c
-@@ -147,7 +147,7 @@ static int z2_wm8750_init(struct snd_soc
- snd_soc_dapm_disable_pin(dapm, "LINPUT3");
- snd_soc_dapm_disable_pin(dapm, "RINPUT3");
- snd_soc_dapm_disable_pin(dapm, "OUT3");
-- snd_soc_dapm_disable_pin(dapm, "MONO");
-+ snd_soc_dapm_disable_pin(dapm, "MONO1");
-
- /* Add z2 specific widgets */
- snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
---- vanilla-2.6.38.0.orig/drivers/target/target_core_cdb.c
-+++ vanilla-2.6.38.0/drivers/target/target_core_cdb.c
-@@ -667,7 +667,13 @@ target_emulate_readcapacity(struct se_cm
- {
- struct se_device *dev = SE_DEV(cmd);
- unsigned char *buf = cmd->t_task->t_task_buf;
-- u32 blocks = dev->transport->get_blocks(dev);
-+ unsigned long long blocks_long = dev->transport->get_blocks(dev);
-+ u32 blocks;
-+
-+ if (blocks_long >= 0x00000000ffffffff)
-+ blocks = 0xffffffff;
-+ else
-+ blocks = (u32)blocks_long;
-
- buf[0] = (blocks >> 24) & 0xff;
- buf[1] = (blocks >> 16) & 0xff;
---- vanilla-2.6.38.0.orig/drivers/scsi/device_handler/scsi_dh_alua.c
-+++ vanilla-2.6.38.0/drivers/scsi/device_handler/scsi_dh_alua.c
-@@ -285,7 +285,8 @@ static void stpg_endio(struct request *r
- print_alua_state(h->state));
- }
- done:
-- blk_put_request(req);
-+ req->end_io_data = NULL;
-+ __blk_put_request(req->q, req);
- if (h->callback_fn) {
- h->callback_fn(h->callback_data, err);
- h->callback_fn = h->callback_data = NULL;
---- vanilla-2.6.38.0.orig/net/sunrpc/sched.c
-+++ vanilla-2.6.38.0/net/sunrpc/sched.c
-@@ -637,14 +637,12 @@ static void __rpc_execute(struct rpc_tas
- save_callback = task->tk_callback;
- task->tk_callback = NULL;
- save_callback(task);
-- }
--
-- /*
-- * Perform the next FSM step.
-- * tk_action may be NULL when the task has been killed
-- * by someone else.
-- */
-- if (!RPC_IS_QUEUED(task)) {
-+ } else {
-+ /*
-+ * Perform the next FSM step.
-+ * tk_action may be NULL when the task has been killed
-+ * by someone else.
-+ */
- if (task->tk_action == NULL)
- break;
- task->tk_action(task);
---- vanilla-2.6.38.0.orig/net/sunrpc/clnt.c
-+++ vanilla-2.6.38.0/net/sunrpc/clnt.c
-@@ -436,7 +436,9 @@ void rpc_killall_tasks(struct rpc_clnt *
- if (!(rovr->tk_flags & RPC_TASK_KILLED)) {
- rovr->tk_flags |= RPC_TASK_KILLED;
- rpc_exit(rovr, -EIO);
-- rpc_wake_up_queued_task(rovr->tk_waitqueue, rovr);
-+ if (RPC_IS_QUEUED(rovr))
-+ rpc_wake_up_queued_task(rovr->tk_waitqueue,
-+ rovr);
- }
- }
- spin_unlock(&clnt->cl_lock);
---- vanilla-2.6.38.0.orig/kernel/perf_event.c
-+++ vanilla-2.6.38.0/kernel/perf_event.c
-@@ -4567,7 +4567,7 @@ static int perf_exclude_event(struct per
- struct pt_regs *regs)
- {
- if (event->hw.state & PERF_HES_STOPPED)
-- return 0;
-+ return 1;
-
- if (regs) {
- if (event->attr.exclude_user && user_mode(regs))
-@@ -4923,6 +4923,8 @@ static int perf_tp_event_match(struct pe
- struct perf_sample_data *data,
- struct pt_regs *regs)
- {
-+ if (event->hw.state & PERF_HES_STOPPED)
-+ return 0;
- /*
- * All tracepoints are from kernel-space.
- */
---- vanilla-2.6.38.0.orig/arch/powerpc/include/asm/reg.h
-+++ vanilla-2.6.38.0/arch/powerpc/include/asm/reg.h
-@@ -880,6 +880,7 @@
- #define PV_970 0x0039
- #define PV_POWER5 0x003A
- #define PV_POWER5p 0x003B
-+#define PV_POWER7 0x003F
- #define PV_970FX 0x003C
- #define PV_630 0x0040
- #define PV_630p 0x0041
---- vanilla-2.6.38.0.orig/arch/powerpc/kernel/perf_event.c
-+++ vanilla-2.6.38.0/arch/powerpc/kernel/perf_event.c
-@@ -1269,6 +1269,28 @@ unsigned long perf_instruction_pointer(s
- return ip;
- }
-
-+static bool pmc_overflow(unsigned long val)
-+{
-+ if ((int)val < 0)
-+ return true;
-+
-+ /*
-+ * Events on POWER7 can roll back if a speculative event doesn't
-+ * eventually complete. Unfortunately in some rare cases they will
-+ * raise a performance monitor exception. We need to catch this to
-+ * ensure we reset the PMC. In all cases the PMC will be 256 or less
-+ * cycles from overflow.
-+ *
-+ * We only do this if the first pass fails to find any overflowing
-+ * PMCs because a user might set a period of less than 256 and we
-+ * don't want to mistakenly reset them.
-+ */
-+ if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256))
-+ return true;
-+
-+ return false;
-+}
-+
- /*
- * Performance monitor interrupt stuff
- */
-@@ -1316,7 +1338,7 @@ static void perf_event_interrupt(struct
- if (is_limited_pmc(i + 1))
- continue;
- val = read_pmc(i + 1);
-- if ((int)val < 0)
-+ if (pmc_overflow(val))
- write_pmc(i + 1, 0);
- }
- }
---- vanilla-2.6.38.0.orig/tools/perf/util/PERF-VERSION-GEN
-+++ vanilla-2.6.38.0/tools/perf/util/PERF-VERSION-GEN
-@@ -23,10 +23,10 @@ if test -d ../../.git -o -f ../../.git &
- then
- VN=$(echo "$VN" | sed -e 's/-/./g');
- else
-- eval `grep '^VERSION\s*=' ../../Makefile|tr -d ' '`
-- eval `grep '^PATCHLEVEL\s*=' ../../Makefile|tr -d ' '`
-- eval `grep '^SUBLEVEL\s*=' ../../Makefile|tr -d ' '`
-- eval `grep '^EXTRAVERSION\s*=' ../../Makefile|tr -d ' '`
-+ eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
-+ eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
-+ eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
-+ eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
-
- VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
- fi
---- vanilla-2.6.38.0.orig/fs/ext3/namei.c
-+++ vanilla-2.6.38.0/fs/ext3/namei.c
-@@ -1540,8 +1540,8 @@ static int ext3_dx_add_entry(handle_t *h
- goto cleanup;
- node2 = (struct dx_node *)(bh2->b_data);
- entries2 = node2->entries;
-+ memset(&node2->fake, 0, sizeof(struct fake_dirent));
- node2->fake.rec_len = ext3_rec_len_to_disk(sb->s_blocksize);
-- node2->fake.inode = 0;
- BUFFER_TRACE(frame->bh, "get_write_access");
- err = ext3_journal_get_write_access(handle, frame->bh);
- if (err)
---- vanilla-2.6.38.0.orig/kernel/smp.c
-+++ vanilla-2.6.38.0/kernel/smp.c
-@@ -450,7 +450,7 @@ void smp_call_function_many(const struct
- {
- struct call_function_data *data;
- unsigned long flags;
-- int cpu, next_cpu, this_cpu = smp_processor_id();
-+ int refs, cpu, next_cpu, this_cpu = smp_processor_id();
-
- /*
- * Can deadlock when called with interrupts disabled.
-@@ -461,7 +461,7 @@ void smp_call_function_many(const struct
- WARN_ON_ONCE(cpu_online(this_cpu) && irqs_disabled()
- && !oops_in_progress && !early_boot_irqs_disabled);
-
-- /* So, what's a CPU they want? Ignoring this one. */
-+ /* Try to fastpath. So, what's a CPU they want? Ignoring this one. */
- cpu = cpumask_first_and(mask, cpu_online_mask);
- if (cpu == this_cpu)
- cpu = cpumask_next_and(cpu, mask, cpu_online_mask);
-@@ -483,22 +483,49 @@ void smp_call_function_many(const struct
-
- data = &__get_cpu_var(cfd_data);
- csd_lock(&data->csd);
-+
-+ /* This BUG_ON verifies our reuse assertions and can be removed */
- BUG_ON(atomic_read(&data->refs) || !cpumask_empty(data->cpumask));
-
-+ /*
-+ * The global call function queue list add and delete are protected
-+ * by a lock, but the list is traversed without any lock, relying
-+ * on the rcu list add and delete to allow safe concurrent traversal.
-+ * We reuse the call function data without waiting for any grace
-+ * period after some other cpu removes it from the global queue.
-+ * This means a cpu might find our data block as it is being
-+ * filled out.
-+ *
-+ * We hold off the interrupt handler on the other cpu by
-+ * ordering our writes to the cpu mask vs our setting of the
-+ * refs counter. We assert only the cpu owning the data block
-+ * will set a bit in cpumask, and each bit will only be cleared
-+ * by the subject cpu. Each cpu must first find its bit is
-+ * set and then check that refs is set indicating the element is
-+ * ready to be processed, otherwise it must skip the entry.
-+ *
-+ * On the previous iteration refs was set to 0 by another cpu.
-+ * To avoid the use of transitivity, set the counter to 0 here
-+ * so the wmb will pair with the rmb in the interrupt handler.
-+ */
-+ atomic_set(&data->refs, 0); /* convert 3rd to 1st party write */
-+
- data->csd.func = func;
- data->csd.info = info;
-- cpumask_and(data->cpumask, mask, cpu_online_mask);
-- cpumask_clear_cpu(this_cpu, data->cpumask);
-
-- /*
-- * To ensure the interrupt handler gets an complete view
-- * we order the cpumask and refs writes and order the read
-- * of them in the interrupt handler. In addition we may
-- * only clear our own cpu bit from the mask.
-- */
-+ /* Ensure 0 refs is visible before mask. Also orders func and info */
- smp_wmb();
-
-- atomic_set(&data->refs, cpumask_weight(data->cpumask));
-+ /* We rely on the "and" being processed before the store */
-+ cpumask_and(data->cpumask, mask, cpu_online_mask);
-+ cpumask_clear_cpu(this_cpu, data->cpumask);
-+ refs = cpumask_weight(data->cpumask);
-+
-+ /* Some callers race with other cpus changing the passed mask */
-+ if (unlikely(!refs)) {
-+ csd_unlock(&data->csd);
-+ return;
-+ }
-
- raw_spin_lock_irqsave(&call_function.lock, flags);
- /*
-@@ -507,6 +534,12 @@ void smp_call_function_many(const struct
- * will not miss any other list entries:
- */
- list_add_rcu(&data->csd.list, &call_function.queue);
-+ /*
-+ * We rely on the wmb() in list_add_rcu to complete our writes
-+ * to the cpumask before this write to refs, which indicates
-+ * data is on the list and is ready to be processed.
-+ */
-+ atomic_set(&data->refs, refs);
- raw_spin_unlock_irqrestore(&call_function.lock, flags);
-
- /*
---- vanilla-2.6.38.0.orig/arch/x86/include/asm/pgtable-3level.h
-+++ vanilla-2.6.38.0/arch/x86/include/asm/pgtable-3level.h
-@@ -69,8 +69,6 @@ static inline void native_pmd_clear(pmd_
-
- static inline void pud_clear(pud_t *pudp)
- {
-- unsigned long pgd;
--
- set_pud(pudp, __pud(0));
-
- /*
-@@ -79,13 +77,10 @@ static inline void pud_clear(pud_t *pudp
- * section 8.1: in PAE mode we explicitly have to flush the
- * TLB via cr3 if the top-level pgd is changed...
- *
-- * Make sure the pud entry we're updating is within the
-- * current pgd to avoid unnecessary TLB flushes.
-+ * Currently all places where pud_clear() is called either have
-+ * flush_tlb_mm() followed or don't need TLB flush (x86_64 code or
-+ * pud_clear_bad()), so we don't need TLB flush here.
- */
-- pgd = read_cr3();
-- if (__pa(pudp) >= pgd && __pa(pudp) <
-- (pgd + sizeof(pgd_t)*PTRS_PER_PGD))
-- write_cr3(pgd);
- }
-
- #ifdef CONFIG_SMP
---- vanilla-2.6.38.0.orig/arch/x86/mm/pgtable.c
-+++ vanilla-2.6.38.0/arch/x86/mm/pgtable.c
-@@ -168,8 +168,7 @@ void pud_populate(struct mm_struct *mm,
- * section 8.1: in PAE mode we explicitly have to flush the
- * TLB via cr3 if the top-level pgd is changed...
- */
-- if (mm == current->active_mm)
-- write_cr3(read_cr3());
-+ flush_tlb_mm(mm);
- }
- #else /* !CONFIG_X86_PAE */
-
---- vanilla-2.6.38.0.orig/drivers/hid/Makefile
-+++ vanilla-2.6.38.0/drivers/hid/Makefile
-@@ -27,7 +27,7 @@ endif
-
- obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o
- obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
--obj-$(CONFIG_HID_ACRUX_FF) += hid-axff.o
-+obj-$(CONFIG_HID_ACRUX) += hid-axff.o
- obj-$(CONFIG_HID_APPLE) += hid-apple.o
- obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
- obj-$(CONFIG_HID_CANDO) += hid-cando.o
---- vanilla-2.6.38.0.orig/drivers/hid/hid-axff.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-axff.c
-@@ -33,6 +33,8 @@
- #include <linux/hid.h>
-
- #include "hid-ids.h"
-+
-+#ifdef CONFIG_HID_ACRUX_FF
- #include "usbhid/usbhid.h"
-
- struct axff_device {
-@@ -109,6 +111,12 @@ err_free_mem:
- kfree(axff);
- return error;
- }
-+#else
-+static inline int axff_init(struct hid_device *hid)
-+{
-+ return 0;
-+}
-+#endif
-
- static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
- {
-@@ -139,9 +147,25 @@ static int ax_probe(struct hid_device *h
- error);
- }
-
-+ /*
-+ * We need to start polling device right away, otherwise
-+ * it will go into a coma.
-+ */
-+ error = hid_hw_open(hdev);
-+ if (error) {
-+ dev_err(&hdev->dev, "hw open failed\n");
-+ return error;
-+ }
-+
- return 0;
- }
-
-+static void ax_remove(struct hid_device *hdev)
-+{
-+ hid_hw_close(hdev);
-+ hid_hw_stop(hdev);
-+}
-+
- static const struct hid_device_id ax_devices[] = {
- { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), },
- { }
-@@ -149,9 +173,10 @@ static const struct hid_device_id ax_dev
- MODULE_DEVICE_TABLE(hid, ax_devices);
-
- static struct hid_driver ax_driver = {
-- .name = "acrux",
-- .id_table = ax_devices,
-- .probe = ax_probe,
-+ .name = "acrux",
-+ .id_table = ax_devices,
-+ .probe = ax_probe,
-+ .remove = ax_remove,
- };
-
- static int __init ax_init(void)
---- vanilla-2.6.38.0.orig/drivers/hid/hid-input.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-input.c
-@@ -290,14 +290,6 @@ static void hidinput_configure_usage(str
- goto ignore;
- }
-
-- if (field->report_type == HID_FEATURE_REPORT) {
-- if (device->driver->feature_mapping) {
-- device->driver->feature_mapping(device, hidinput, field,
-- usage);
-- }
-- goto ignore;
-- }
--
- if (device->driver->input_mapping) {
- int ret = device->driver->input_mapping(device, hidinput, field,
- usage, &bit, &max);
-@@ -835,6 +827,24 @@ static void hidinput_close(struct input_
- hid_hw_close(hid);
- }
-
-+static void report_features(struct hid_device *hid)
-+{
-+ struct hid_driver *drv = hid->driver;
-+ struct hid_report_enum *rep_enum;
-+ struct hid_report *rep;
-+ int i, j;
-+
-+ if (!drv->feature_mapping)
-+ return;
-+
-+ rep_enum = &hid->report_enum[HID_FEATURE_REPORT];
-+ list_for_each_entry(rep, &rep_enum->report_list, list)
-+ for (i = 0; i < rep->maxfield; i++)
-+ for (j = 0; j < rep->field[i]->maxusage; j++)
-+ drv->feature_mapping(hid, rep->field[i],
-+ rep->field[i]->usage + j);
-+}
-+
- /*
- * Register the input device; print a message.
- * Configure the input layer interface
-@@ -863,7 +873,9 @@ int hidinput_connect(struct hid_device *
- return -1;
- }
-
-- for (k = HID_INPUT_REPORT; k <= HID_FEATURE_REPORT; k++) {
-+ report_features(hid);
-+
-+ for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++) {
- if (k == HID_OUTPUT_REPORT &&
- hid->quirks & HID_QUIRK_SKIP_OUTPUT_REPORTS)
- continue;
---- vanilla-2.6.38.0.orig/drivers/hid/hid-multitouch.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-multitouch.c
-@@ -122,7 +122,7 @@ struct mt_class mt_classes[] = {
- { }
- };
-
--static void mt_feature_mapping(struct hid_device *hdev, struct hid_input *hi,
-+static void mt_feature_mapping(struct hid_device *hdev,
- struct hid_field *field, struct hid_usage *usage)
- {
- if (usage->hid == HID_DG_INPUTMODE) {
---- vanilla-2.6.38.0.orig/include/linux/hid.h
-+++ vanilla-2.6.38.0/include/linux/hid.h
-@@ -638,7 +638,7 @@ struct hid_driver {
- struct hid_input *hidinput, struct hid_field *field,
- struct hid_usage *usage, unsigned long **bit, int *max);
- void (*feature_mapping)(struct hid_device *hdev,
-- struct hid_input *hidinput, struct hid_field *field,
-+ struct hid_field *field,
- struct hid_usage *usage);
- #ifdef CONFIG_PM
- int (*suspend)(struct hid_device *hdev, pm_message_t message);
---- vanilla-2.6.38.0.orig/arch/parisc/kernel/irq.c
-+++ vanilla-2.6.38.0/arch/parisc/kernel/irq.c
-@@ -108,7 +108,7 @@ int cpu_check_affinity(unsigned int irq,
- int cpu_dest;
-
- /* timer and ipi have to always be received on all CPUs */
-- if (CHECK_IRQ_PER_CPU(irq)) {
-+ if (CHECK_IRQ_PER_CPU(irq_to_desc(irq)->status)) {
- /* Bad linux design decision. The mask has already
- * been set; we must reset it */
- cpumask_setall(irq_desc[irq].affinity);
---- vanilla-2.6.38.0.orig/drivers/hid/hid-apple.c
-+++ vanilla-2.6.38.0/drivers/hid/hid-apple.c
-@@ -481,6 +481,12 @@ static const struct hid_device_id apple_
- .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
- .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
-+ .driver_data = APPLE_HAS_FN },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
-+ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
-+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
-+ .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
- .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
---- vanilla-2.6.38.0.orig/drivers/input/mouse/bcm5974.c
-+++ vanilla-2.6.38.0/drivers/input/mouse/bcm5974.c
-@@ -63,6 +63,10 @@
- #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242
- #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243
- #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244
-+/* Macbook8 (unibody, March 2011) */
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247
-
- #define BCM5974_DEVICE(prod) { \
- .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
-@@ -96,6 +100,10 @@ static const struct usb_device_id bcm597
- BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),
- BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),
- BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
-+ /* MacbookPro8 */
-+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
-+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
-+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
- /* Terminating entry */
- {}
- };
-@@ -274,6 +282,18 @@ static const struct bcm5974_config bcm59
- { DIM_X, DIM_X / SN_COORD, -4616, 5112 },
- { DIM_Y, DIM_Y / SN_COORD, -142, 5234 }
- },
-+ {
-+ USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI,
-+ USB_DEVICE_ID_APPLE_WELLSPRING5_ISO,
-+ USB_DEVICE_ID_APPLE_WELLSPRING5_JIS,
-+ HAS_INTEGRATED_BUTTON,
-+ 0x84, sizeof(struct bt_data),
-+ 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
-+ { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
-+ { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
-+ { DIM_X, DIM_X / SN_COORD, -4415, 5050 },
-+ { DIM_Y, DIM_Y / SN_COORD, -55, 6680 }
-+ },
- {}
- };
-
---- vanilla-2.6.38.0.orig/Documentation/i2c/instantiating-devices
-+++ vanilla-2.6.38.0/Documentation/i2c/instantiating-devices
-@@ -100,7 +100,7 @@ static int __devinit usb_hcd_pnx4008_pro
- (...)
- i2c_adap = i2c_get_adapter(2);
- memset(&i2c_info, 0, sizeof(struct i2c_board_info));
-- strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE);
-+ strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE);
- isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
- normal_i2c, NULL);
- i2c_put_adapter(i2c_adap);
---- vanilla-2.6.38.0.orig/drivers/mmc/host/sdhci-pci.c
-+++ vanilla-2.6.38.0/drivers/mmc/host/sdhci-pci.c
-@@ -547,6 +547,14 @@ static const struct pci_device_id pci_id
- },
-
- {
-+ .vendor = PCI_VENDOR_ID_RICOH,
-+ .device = 0xe823,
-+ .subvendor = PCI_ANY_ID,
-+ .subdevice = PCI_ANY_ID,
-+ .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc,
-+ },
-+
-+ {
- .vendor = PCI_VENDOR_ID_ENE,
- .device = PCI_DEVICE_ID_ENE_CB712_SD,
- .subvendor = PCI_ANY_ID,
---- vanilla-2.6.38.0.orig/drivers/mmc/core/sdio.c
-+++ vanilla-2.6.38.0/drivers/mmc/core/sdio.c
-@@ -395,6 +395,14 @@ static int mmc_sdio_init_card(struct mmc
- if (err)
- goto remove;
-
-+ /*
-+ * Update oldcard with the new RCA received from the SDIO
-+ * device -- we're doing this so that it's updated in the
-+ * "card" struct when oldcard overwrites that later.
-+ */
-+ if (oldcard)
-+ oldcard->rca = card->rca;
-+
- mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
- }
-
---- vanilla-2.6.38.0.orig/arch/x86/kernel/entry_64.S
-+++ vanilla-2.6.38.0/arch/x86/kernel/entry_64.S
-@@ -1248,7 +1248,7 @@ ENTRY(xen_do_hypervisor_callback) # do
- decl PER_CPU_VAR(irq_count)
- jmp error_exit
- CFI_ENDPROC
--END(do_hypervisor_callback)
-+END(xen_do_hypervisor_callback)
-
- /*
- * Hypervisor uses this for application faults while it executes.
---- vanilla-2.6.38.0.orig/arch/arm/mach-davinci/board-dm644x-evm.c
-+++ vanilla-2.6.38.0/arch/arm/mach-davinci/board-dm644x-evm.c
-@@ -440,11 +440,6 @@ evm_u35_setup(struct i2c_client *client,
- gpio_request(gpio + 7, "nCF_SEL");
- gpio_direction_output(gpio + 7, 1);
-
-- /* irlml6401 switches over 1A, in under 8 msec;
-- * now it can be managed by nDRV_VBUS ...
-- */
-- davinci_setup_usb(1000, 8);
--
- return 0;
- }
-
-@@ -705,6 +700,9 @@ static __init void davinci_evm_init(void
- davinci_serial_init(&uart_config);
- dm644x_init_asp(&dm644x_evm_snd_data);
-
-+ /* irlml6401 switches over 1A, in under 8 msec */
-+ davinci_setup_usb(1000, 8);
-+
- soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;
- /* Register the fixup for PHY on DaVinci */
- phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,
---- vanilla-2.6.38.0.orig/drivers/hwmon/sht15.c
-+++ vanilla-2.6.38.0/drivers/hwmon/sht15.c
-@@ -333,11 +333,11 @@ static inline int sht15_calc_humid(struc
-
- const int c1 = -4;
- const int c2 = 40500; /* x 10 ^ -6 */
-- const int c3 = -2800; /* x10 ^ -9 */
-+ const int c3 = -28; /* x 10 ^ -7 */
-
- RHlinear = c1*1000
- + c2 * data->val_humid/1000
-- + (data->val_humid * data->val_humid * c3)/1000000;
-+ + (data->val_humid * data->val_humid * c3) / 10000;
- return (temp - 25000) * (10000 + 80 * data->val_humid)
- / 1000000 + RHlinear;
- }
diff --git a/kernel.spec b/kernel.spec
index e40bf2b..405c30c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 5
+%global baserelease 6
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -63,7 +63,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -727,7 +727,6 @@ Patch12102: efifb_update.patch
Patch12200: acpi_reboot.patch
# Runtime power management
-Patch12202: linux-2.6-ehci-check-port-status.patch
Patch12203: linux-2.6-usb-pci-autosuspend.patch
Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
Patch12205: runtime_pm_fixups.patch
@@ -736,6 +735,9 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
+# Fix possible memory corruption on Dell HW
+Patch12430: dcdbas-force-smi-to-happen-when-expected.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1356,7 +1358,6 @@ ApplyPatch efifb_update.patch
ApplyPatch acpi_reboot.patch
# Runtime PM
-#ApplyPatch linux-2.6-ehci-check-port-status.patch
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
### Broken by implicit notify support & ACPICA rebase
###ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch
@@ -1368,6 +1369,9 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
# rhbz#662344,600690
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
+# Fix possible memory corruption on Dell HW
+ApplyPatch dcdbas-force-smi-to-happen-when-expected.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1976,6 +1980,11 @@ fi
# and build.
%changelog
+* Wed Mar 23 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38.1-6
+- Linux 2.6.38.1
+- Drop linux-2.6-ehci-check-port-status.patch, merged in .38.1
+- Add dcdbas-force-smi-to-happen-when-expected.patch
+
* Wed Mar 23 2011 Kyle McMartin <kmcmartin at redhat.com>
- Re-create ACPI battery sysfs files on resume from suspend, fixes the
upstream changes to the dropped
diff --git a/sources b/sources
index a051716..6953132 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2
+bd2be4d0465345e4e9355d6773f5f6fe patch-2.6.38.1.bz2
More information about the scm-commits
mailing list