2.6.35.5 -stable review
Subsystems (65)
cover 2.6.35.5 -stable review
[Note, I do still have patches that people have sent me for inclusion in the .35-stable tree in my queue, but I figured this series was already big enough that it should go out now. If you notice, I _did_ apply all patches that went through Linus's tree with a [email protected] marking on it, so people might consider using that method instead...]
This is the start of the stable review cycle for the 2.6.35.5 release. There are 129 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let us know. If anyone is a maintainer of the proper subsystem, and wants to add a Signed-off-by: line to the patch, please respond with it.
Responses should be made by @date (day, month date, time)@ UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.35.5-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
Documentation/sound/alsa/HD-Audio-Models.txt | 1 + Makefile | 2 +- arch/arm/kernel/entry-common.S | 2 + arch/ia64/include/asm/compat.h | 2 +- arch/ia64/kernel/msi_ia64.c | 2 +- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/mips/include/asm/compat.h | 2 +- arch/parisc/include/asm/compat.h | 2 +- arch/powerpc/include/asm/compat.h | 2 +- arch/powerpc/kernel/time.c | 23 +-- arch/s390/include/asm/compat.h | 2 +- arch/sparc/include/asm/compat.h | 2 +- arch/x86/ia32/ia32entry.S | 22 ++- arch/x86/include/asm/compat.h | 2 +- arch/x86/include/asm/hpet.h | 1 - arch/x86/include/asm/tsc.h | 2 + arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/cpu/perf_event_p4.c | 2 + arch/x86/kernel/early-quirks.c | 18 -- arch/x86/kernel/hpet.c | 31 ++-- arch/x86/kernel/tsc.c | 38 ++++ arch/x86/oprofile/nmi_int.c | 22 ++- arch/x86/power/cpu.c | 2 + drivers/ata/libahci.c | 2 +- drivers/ata/libata-core.c | 14 ++- drivers/ata/libata-eh.c | 4 + drivers/ata/libata-sff.c | 7 +- drivers/ata/pata_cmd64x.c | 6 - drivers/ata/pata_via.c | 2 + drivers/ata/sata_mv.c | 44 ++++- drivers/char/agp/intel-gtt.c | 8 +- drivers/gpu/drm/drm_crtc_helper.c | 4 +- drivers/gpu/drm/i915/i915_dma.c | 36 +++-- drivers/gpu/drm/i915/i915_gem.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 9 + drivers/gpu/drm/i915/intel_display.c | 11 +- drivers/gpu/drm/i915/intel_dp.c | 58 +++--- drivers/gpu/drm/i915/intel_lvds.c | 2 - drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +- drivers/gpu/drm/radeon/atombios_crtc.c | 23 ++- drivers/gpu/drm/radeon/evergreen.c | 66 ++++++- drivers/gpu/drm/radeon/r600.c | 7 +- drivers/gpu/drm/radeon/radeon.h | 6 + drivers/gpu/drm/radeon/rv770.c | 52 +++++ drivers/hid/usbhid/hid-core.c | 3 +- drivers/hwmon/ads7871.c | 38 ++-- drivers/hwmon/emc1403.c | 1 - drivers/hwmon/f75375s.c | 6 +- drivers/hwmon/hp_accel.c | 2 + drivers/hwmon/k8temp.c | 35 +++- drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- drivers/input/mouse/appletouch.c | 6 +- drivers/input/serio/i8042.c | 67 ++++--- drivers/mmc/core/core.c | 83 ++++++--- drivers/mmc/core/host.c | 6 + drivers/mmc/host/tmio_mmc.c | 7 +- drivers/mmc/host/tmio_mmc.h | 13 +- drivers/net/wireless/ath/ath5k/base.c | 4 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 +- drivers/net/wireless/ath/regd.h | 1 - drivers/net/wireless/p54/txrx.c | 2 +- drivers/oprofile/buffer_sync.c | 27 ++-- drivers/oprofile/cpu_buffer.c | 2 - drivers/pci/msi.c | 27 +++- drivers/power/apm_power.c | 1 + drivers/serial/bfin_sport_uart.c | 2 +- drivers/staging/hv/netvsc_drv.c | 3 + drivers/staging/hv/ring_buffer.c | 3 +- drivers/staging/hv/storvsc_api.h | 4 +- drivers/staging/hv/storvsc_drv.c | 11 +- drivers/staging/rt2860/usb_main_dev.c | 41 ++++- drivers/usb/atm/cxacru.c | 24 ++- drivers/usb/class/cdc-acm.c | 23 ++- drivers/usb/core/message.c | 22 +- drivers/usb/gadget/rndis.c | 10 +- drivers/usb/host/ehci-ppc-of.c | 12 +- drivers/usb/serial/cp210x.c | 10 +- drivers/usb/serial/ftdi_sio.c | 8 + drivers/usb/serial/ftdi_sio_ids.h | 12 ++ drivers/usb/serial/mos7840.c | 32 ++- drivers/xen/events.c | 21 ++- fs/binfmt_misc.c | 2 +- fs/cifs/connect.c | 6 +- fs/direct-io.c | 30 ++-- fs/ext4/ext4.h | 4 +- fs/ext4/inode.c | 17 ++- fs/fuse/dev.c | 16 ++- fs/minix/namei.c | 2 +- fs/nfs/client.c | 2 +- fs/nfs/super.c | 10 +- fs/ocfs2/aops.c | 7 +- fs/ocfs2/inode.c | 6 +- fs/sysfs/file.c | 2 +- fs/xfs/linux-2.6/xfs_aops.c | 24 ++- fs/xfs/linux-2.6/xfs_aops.h | 2 + fs/xfs/xfs_ialloc.c | 16 +- fs/xfs/xfs_inode.c | 49 +++--- include/linux/compat.h | 3 + include/linux/fs.h | 3 +- include/linux/libata.h | 1 + include/linux/mmc/host.h | 3 + include/linux/msi.h | 2 + include/linux/swap.h | 3 +- kernel/compat.c | 21 ++ kernel/gcov/fs.c | 244 +++++++++++++++++------ kernel/groups.c | 5 +- kernel/trace/ftrace.c | 19 ++- mm/bounce.c | 2 +- mm/compaction.c | 7 +- mm/memory_hotplug.c | 16 +- mm/page-writeback.c | 26 +-- mm/swapfile.c | 35 +++- net/ipv4/netfilter/arp_tables.c | 3 + net/ipv4/netfilter/ip_tables.c | 3 + net/ipv6/netfilter/ip6_tables.c | 3 + net/irda/irlan/irlan_common.c | 2 +- net/mac80211/main.c | 6 + net/sunrpc/auth_gss/auth_gss.c | 9 +- net/sunrpc/rpc_pipe.c | 6 +- net/wireless/wext-compat.c | 3 + net/wireless/wext-core.c | 16 ++ security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_iint.c | 4 +- security/integrity/ima/ima_main.c | 8 +- sound/core/seq/oss/seq_oss_init.c | 9 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/patch_cirrus.c | 50 +++++ sound/pci/hda/patch_conexant.c | 58 ++++++ sound/pci/hda/patch_nvhdmi.c | 61 ++++-- sound/pci/hda/patch_realtek.c | 20 ++- sound/pci/oxygen/oxygen.h | 1 + sound/pci/oxygen/oxygen_lib.c | 21 ++- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_wm87x6.c | 22 ++- sound/usb/card.c | 19 ++- sound/usb/clock.c | 3 +- sound/usb/endpoint.c | 11 +- sound/usb/format.c | 14 +- sound/usb/mixer.c | 10 +- sound/usb/pcm.c | 3 +- tools/perf/util/callchain.h | 1 + 143 files changed, 1517 insertions(+), 572 deletions(-)
PATCH 1/129 hwmon: (ads7871) Fix ads7871_probe error paths
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Axel Lin <[email protected]>
commit c12c507d7185fe4e8ada7ed9832957576eefecf8 upstream.
1. remove 'status' variable
2. remove unneeded initialization of 'err' variable
3. return missing error code if sysfs_create_group fail.
4. fix the init sequence as:
- check hardware existence
- kzalloc for ads7871_data
- sysfs_create_group
- hwmon_device_register
--- drivers/hwmon/ads7871.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/hwmon/ads7871.c +19 -19
@@ -160,30 +160,12 @@ static const struct attribute_group ads7static int __devinit ads7871_probe (struct spi_device *spi) { -int status, ret, err =0 ; +int ret, err;uint8_t val;struct ads7871_data *pdata;dev_dbg (&spi->dev,"probe\n" ); - pdata =kzalloc (sizeof (struct ads7871_data ),GFP_KERNEL ); -if (!pdata) { - err = -ENOMEM ; - goto exit; - } - - status =sysfs_create_group (&spi->dev.kobj, &ads7871_group); -if (status <0 ) - goto error_free; - - pdata->hwmon_dev =hwmon_device_register (&spi->dev); -if (IS_ERR (pdata->hwmon_dev)) { - err =PTR_ERR (pdata->hwmon_dev); - goto error_remove; - } - -spi_set_drvdata (spi, pdata); -/* Configure the SPI bus */ spi->mode = (SPI_MODE_0 ); spi->bits_per_word =8 ;
@@ -201,6 +183,24 @@ static int __devinit ads7871_probe(strucwe need to make sure we really have a chip*/ if (val != ret) { err = -ENODEV ; + goto exit; + } + + pdata =kzalloc (sizeof (struct ads7871_data ),GFP_KERNEL ); +if (!pdata) { + err = -ENOMEM ; + goto exit; + } + + err =sysfs_create_group (&spi->dev.kobj, &ads7871_group); +if (err <0 ) + goto error_free; + +spi_set_drvdata (spi, pdata); + + pdata->hwmon_dev =hwmon_device_register (&spi->dev); +if (IS_ERR (pdata->hwmon_dev)) { + err =PTR_ERR (pdata->hwmon_dev); goto error_remove; }
PATCH 2/129 hwmon: (k8temp) Differentiate between AM2 and ASB1
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Andreas Herrmann <[email protected]>
commit a05e93f3b3fc2f53c1d0de3b17019e207c482349 upstream.
Commit 8bf0223ed515be24de0c671eedaff49e78bebc9c (hwmon, k8temp: Fix temperature reporting for ASB1 processor revisions) fixed temperature reporting for ASB1 CPUs. But those CPU models (model 0x6b, 0x6f, 0x7f) were packaged both as AM2 (desktop) and ASB1 (mobile). Thus the commit leads to wrong temperature reporting for AM2 CPU parts.
The solution is to determine the package type for models 0x6b, 0x6f, 0x7f.
This is done using BrandId from CPUID Fn8000_0001_EBX[15:0]. See "Constructing the processor Name String" in "Revision Guide for AMD NPT Family 0Fh Processors" (Rev. 3.46).
--- drivers/hwmon/k8temp.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)
drivers/hwmon/k8temp.c +32 -3
@@ -143,6 +143,37 @@ static const struct pci_device_id k8tempMODULE_DEVICE_TABLE (pci, k8temp_ids); +static int __devinit is_rev_g_desktop (u8 model) +{ +u32 brandidx; + +if (model <0x69 ) +return 0 ; + +if (model ==0xc1 || model ==0x6c || model ==0x7c ) +return 0 ; + +/* +* Differentiate between AM2 and ASB1. +* See "Constructing the processor Name String" in "Revision +* Guide for AMD NPT Family 0Fh Processors" (33610). +*/ + brandidx =cpuid_ebx (0x80000001 ); + brandidx = (brandidx >>9 ) &0x1f ; + +/* Single core */ +if ((model ==0x6f || model ==0x7f ) && + (brandidx ==0x7 || brandidx ==0x9 || brandidx ==0xc )) +return 0 ; + +/* Dual core */ +if (model ==0x6b && + (brandidx ==0xb || brandidx ==0xc )) +return 0 ; + +return 1 ; +} +static int __devinit k8temp_probe (struct pci_dev *pdev,const struct pci_device_id *id) {
@@ -179,9 +210,7 @@ static int __devinit k8temp_probe(struct "wrong - check erratum #141\n"); } -if ((model >=0x69 ) && - !(model ==0xc1 || model ==0x6c || model ==0x7c || - model ==0x6b || model ==0x6f || model ==0x7f )) { +if (is_rev_g_desktop (model)) {/* * RevG desktop CPUs (i.e. no socket S1G1 or * ASB1 parts) need additional offset,
PATCH 3/129 xen: handle events as edge-triggered
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeremy Fitzhardinge <[email protected]>
commit dffe2e1e1a1ddb566a76266136c312801c66dcf7 upstream.
Xen events are logically edge triggered, as Xen only calls the event upcall when an event is newly set, but not continuously as it remains set. As a result, use handle_edge_irq rather than handle_level_irq.
This has the important side-effect of fixing a long-standing bug of events getting lost if:
- an event's interrupt handler is running
- the event is migrated to a different vcpu
- the event is re-triggered
The most noticable symptom of these lost events is occasional lockups of blkfront.
Many thanks to Tom Kopec and Daniel Stodden in tracking this down.
--- drivers/xen/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/events.c +1 -1
@@ -363,7 +363,7 @@ int bind_evtchn_to_irq(unsigned int evtc irq =find_unbound_irq ();set_irq_chip_and_handler_name (irq, &xen_dynamic_chip, - handle_level_irq,"event" ); + handle_edge_irq,"event" ); evtchn_to_irq[evtchn] = irq; irq_info[irq] =mk_evtchn_info (evtchn);
PATCH 4/129 xen: use percpu interrupts for IPIs and VIRQs
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeremy Fitzhardinge <[email protected]>
commit aaca49642b92c8a57d3ca5029a5a94019c7af69f upstream.
IPIs and VIRQs are inherently per-cpu event types, so treat them as such:
- use a specific percpu irq_chip implementation, and
- handle them with handle_percpu_irq
This makes the path for delivering these interrupts more efficient (no masking/unmasking, no locks), and it avoid problems with attempts to migrate them.
--- drivers/xen/events.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/xen/events.c +15 -4
@@ -107,6 +107,7 @@ static inline unsigned long *cpu_evtchn_#define VALID_EVTCHN (chn) ((chn) != 0)static struct irq_chip xen_dynamic_chip; +static struct irq_chip xen_percpu_chip;/* Constructor for packed IRQ information. */ static struct irq_info mk_unbound_info (void )
@@ -389,8 +390,8 @@ static int bind_ipi_to_irq(unsigned intif (irq <0 ) goto out; -set_irq_chip_and_handler_name (irq, &xen_dynamic_chip, - handle_level_irq,"ipi" ); +set_irq_chip_and_handler_name (irq, &xen_percpu_chip, + handle_percpu_irq,"ipi" ); bind_ipi.vcpu = cpu; if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi,
@@ -430,8 +431,8 @@ static int bind_virq_to_irq(unsigned int irq =find_unbound_irq (); -set_irq_chip_and_handler_name (irq, &xen_dynamic_chip, - handle_level_irq,"virq" ); +set_irq_chip_and_handler_name (irq, &xen_percpu_chip, + handle_percpu_irq,"virq" ); evtchn_to_irq[evtchn] = irq; irq_info[irq] =mk_virq_info (evtchn, virq);
@@ -934,6 +935,16 @@ static struct irq_chip xen_dynamic_chip .retrigger = retrigger_dynirq, }; +static struct irq_chip en_percpu_chip__read_mostly = { + .name ="xen-percpu" , + + .disable = disable_dynirq, + .mask = disable_dynirq, + .unmask = enable_dynirq, + + .ack = ack_dynirq, +}; +void __init xen_init_IRQ (void ) {int i;
PATCH 5/129 xfs: fix untrusted inode number lookup
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dave Chinner <[email protected]>
commit 4536f2ad8b330453d7ebec0746c4374eadd649b1 upstream.
Commit 7124fe0a5b619d65b739477b3b55a20bf805b06d ("xfs: validate untrusted inode numbers during lookup") changes the inode lookup code to do btree lookups for untrusted inode numbers. This change made an invalid assumption about the alignment of inodes and hence incorrectly calculated the first inode in the cluster. As a result, some inode numbers were being incorrectly considered invalid when they were actually valid.
The issue was not picked up by the xfstests suite because it always runs fsr and dump (the two utilities that utilise the bulkstat interface) on cache hot inodes and hence the lookup code in the cold cache path was not sufficiently exercised to uncover this intermittent problem.
Fix the issue by relaxing the btree lookup criteria and then checking if the record returned contains the inode number we are lookup for. If it we get an incorrect record, then the inode number is invalid.
--- fs/xfs/xfs_ialloc.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
fs/xfs/xfs_ialloc.c +10 -6
@@ -1217,7 +1217,6 @@ xfs_imap_lookup(struct xfs_inobt_rec_incore rec;struct xfs_btree_cur *cur;struct xfs_buf *agbp; -xfs_agino_t startino;int error;int i;
@@ -1231,13 +1230,13 @@ xfs_imap_lookup( }/* -* derive and lookup the exact inode record for the given agino. If the -* record cannot be found, then it's an invalid inode number and we -* should abort. +* Lookup the inode record for the given agino. If the record cannot be +* found, then it's an invalid inode number and we should abort. Once +* we have a record, we need to ensure it contains the inode number +* we are looking up. */ cur =xfs_inobt_init_cursor (mp, tp, agbp, agno); - startino = agino & ~(XFS_IALLOC_INODES (mp) -1 ); - error =xfs_inobt_lookup (cur, startino,XFS_LOOKUP_EQ , &i); + error =xfs_inobt_lookup (cur, agino,XFS_LOOKUP_LE , &i);if (!error) {if (i) error =xfs_inobt_get_rec (cur, &rec, &i);
@@ -1250,6 +1249,11 @@ xfs_imap_lookup(if (error)return error; +/* check that the returned record contains the required inode */ +if (rec.ir_startino > agino || + rec.ir_startino +XFS_IALLOC_INODES (mp) <= agino) +return EINVAL ; +/* for untrusted inodes check it is allocated first */ if ((flags &XFS_IGET_UNTRUSTED ) && (rec.ir_free &XFS_INOBT_MASK (agino - rec.ir_startino)))
PATCH 6/129 xfs: ensure we mark all inodes in a freed cluster XFS_ISTALE
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dave Chinner <[email protected]>
commit 5b3eed756cd37255cad1181bd86bfd0977e97953 upstream.
Under heavy load parallel metadata loads (e.g. dbench), we can fail to mark all the inodes in a cluster being freed as XFS_ISTALE as we skip inodes we cannot get the XFS_ILOCK_EXCL or the flush lock on. When this happens and the inode cluster buffer has already been marked stale and freed, inode reclaim can try to write the inode out as it is dirty and not marked stale. This can result in writing th metadata to an freed extent, or in the case it has already been overwritten trigger a magic number check failure and return an EUCLEAN error such as:
Filesystem "ram0": inode 0x442ba1 background reclaim flush failed with 117
Fix this by ensuring that we hoover up all in memory inodes in the cluster and mark them XFS_ISTALE when freeing the cluster.
--- fs/xfs/xfs_inode.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-)
fs/xfs/xfs_inode.c +26 -23
@@ -1927,6 +1927,11 @@ xfs_iunlink_remove(return 0 ; } +/* +* A big issue when freeing the inode cluster is is that we _cannot_ skip any +* inodes that are in memory - they all must be marked stale and attached to +* the cluster buffer. +*/ STATIC void xfs_ifree_cluster( xfs_inode_t *free_ip,
@@ -1958,8 +1963,6 @@ xfs_ifree_cluster( }for (j =0 ; j < nbufs; j++, inum += ninodes) { -int found =0 ; - blkno =XFS_AGB_TO_DADDR (mp,XFS_INO_TO_AGNO (mp, inum),XFS_INO_TO_AGBNO (mp, inum));
@@ -1978,7 +1981,9 @@ xfs_ifree_cluster(/* * Walk the inodes already attached to the buffer and mark them * stale. These will all have the flush locks held, so an -* in-memory inode walk can't lock them. +* in-memory inode walk can't lock them. By marking them all +* stale first, we will not attempt to lock them in the loop +* below as the XFS_ISTALE flag will be set. */ lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);while (lip) {
@@ -1990,11 +1995,11 @@ xfs_ifree_cluster( &iip->ili_flush_lsn, &iip->ili_item.li_lsn);xfs_iflags_set (iip->ili_inode,XFS_ISTALE ); - found++; } lip = lip->li_bio_list; } +/* * For each inode in memory attempt to add it to the inode * buffer and set it up for being staled on buffer IO
@@ -2006,6 +2011,7 @@ xfs_ifree_cluster(* even trying to lock them. */ for (i =0 ; i < ninodes; i++) { +retry:read_lock (&pag->pag_ici_lock); ip =radix_tree_lookup (&pag->pag_ici_root,XFS_INO_TO_AGINO (mp, (inum + i)));
@@ -2016,38 +2022,36 @@ xfs_ifree_cluster(continue ; } -/* don't try to lock/unlock the current inode */ +/* +* Don't try to lock/unlock the current inode, but we +* _cannot_ skip the other inodes that we did not find +* in the list attached to the buffer and are not +* already marked stale. If we can't lock it, back off +* and retry. +*/ if (ip != free_ip && !xfs_ilock_nowait (ip,XFS_ILOCK_EXCL )) {read_unlock (&pag->pag_ici_lock); -continue ; +delay (1 ); + goto retry; }read_unlock (&pag->pag_ici_lock); -if (!xfs_iflock_nowait (ip)) { -if (ip != free_ip) -xfs_iunlock (ip,XFS_ILOCK_EXCL ); -continue ; - } - +xfs_iflock (ip);xfs_iflags_set (ip,XFS_ISTALE ); -if (xfs_inode_clean (ip)) { -ASSERT (ip != free_ip); -xfs_ifunlock (ip); -xfs_iunlock (ip,XFS_ILOCK_EXCL ); -continue ; - } +/* +* we don't need to attach clean inodes or those only +* with unlogged changes (which we throw away, anyway). +*/ iip = ip->i_itemp; -if (!iip) { -/* inode with unlogged changes only */ +if (!iip ||xfs_inode_clean (ip)) {ASSERT (ip != free_ip); ip->i_update_core =0 ;xfs_ifunlock (ip);xfs_iunlock (ip,XFS_ILOCK_EXCL );continue ; } - found++; iip->ili_last_fields = iip->ili_format.ilf_fields; iip->ili_format.ilf_fields =0 ;
@@ -2063,8 +2067,7 @@ xfs_ifree_cluster(xfs_iunlock (ip,XFS_ILOCK_EXCL ); } -if (found) -xfs_trans_stale_inode_buf (tp, bp); +xfs_trans_stale_inode_buf (tp, bp);xfs_trans_binval (tp, bp); }
PATCH 7/129 ALSA: hda - Add Sony VAIO quirk for ALC269
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <[email protected]>
commit dbbcbc073ad3132bfbc410b11546b2fb4bdf2568 upstream.
The attached patch enables playback on a Sony VAIO machine.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -14244,6 +14244,7 @@ static const struct alc_fixup alc269_fixstatic struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x104d ,0x9071 ,"Sony VAIO" ,ALC269_FIXUP_SONY_VAIO ), +SND_PCI_QUIRK (0x104d ,0x9077 ,"Sony VAIO" ,ALC269_FIXUP_SONY_VAIO ), {} };
PATCH 8/129 ALSA: HDA: Use model=auto for LG R510
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <[email protected]>
commit 81cd3fca642cecb40a1ccef099799dcb5730734b upstream.
Two users report model=auto is needed to make the internal mic work properly.
--- sound/pci/hda/patch_realtek.c | 1 - 1 file changed, 1 deletion(-)
sound/pci/hda/patch_realtek.c +0 -1
@@ -13305,7 +13305,6 @@ static struct snd_pci_quirk alc268_cfg_tSND_PCI_QUIRK (0x14c0 ,0x0025 ,"COMPAL IFL90/JFL-92" ,ALC268_TOSHIBA ),SND_PCI_QUIRK (0x152d ,0x0763 ,"Diverse (CPR2000)" ,ALC268_ACER ), SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1), - SND_PCI_QUIRK(0x1854, 0x1775, "LG R510", ALC268_DELL), {} };
PATCH 9/129 ALSA: hda - Rename iMic to Int Mic on Lenovo NB0763
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <[email protected]>
commit 150b432f448281d5518f5229d240923f9a9c5459 upstream.
The non-standard name "iMic" makes PulseAudio ignore the microphone.
--- sound/pci/hda/patch_realtek.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/pci/hda/patch_realtek.c +3 -3
@@ -7005,7 +7005,7 @@ static struct hda_input_mux alc883_lenov .num_items = 4, .items = { { "Mic", 0x0 }, - { "iMic", 0x1 }, + { "Int Mic", 0x1 }, { "Line", 0x2 }, { "CD", 0x4 }, },
@@ -8575,8 +8575,8 @@ static struct snd_kcontrol_new alc883_leHDA_CODEC_MUTE ("CD Playback Switch" ,0x0b ,0x04 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Mic Playback Volume" ,0x0b ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE ("Mic Playback Switch" ,0x0b ,0x0 ,HDA_INPUT ), -HDA_CODEC_VOLUME ("iMic Playback Volume" ,0x0b ,0x1 ,HDA_INPUT ), - HDA_CODEC_MUTE("iMic Playback Switch", 0x0b, 0x1, HDA_INPUT), +HDA_CODEC_VOLUME ("Int Mic Playback Volume" ,0x0b ,0x1 ,HDA_INPUT ), + HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), { } /* end */ };
PATCH 10/129 libata-sff: remove harmful BUG_ON from ata_bmdma_qc_issue
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Mark Lord <[email protected]>
commit 55ee67f837882f28a900705a2ca1af257ab6c53d upstream.
Remove harmful BUG_ON() from ata_bmdma_qc_issue(), as it casts too wide of a net and breaks sata_mv. It also crashes the kernel while doing the BUG_ON().
There's already a WARN_ON_ONCE() further down to catch the case of POLLING for a BMDMA operation.
--- drivers/ata/libata-sff.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/ata/libata-sff.c +0 -4
@@ -2735,10 +2735,6 @@ unsigned int ata_bmdma_qc_issue(struct a {struct ata_port *ap = qc->ap; -/* see ata_dma_blacklisted() */ -BUG_ON ((ap->flags &ATA_FLAG_PIO_POLLING ) && - qc->tf.protocol ==ATAPI_PROT_DMA ); -/* defer PIO handling to sff_qc_issue */ if (!ata_is_dma (qc->tf.protocol))return ata_sff_qc_issue (qc);
PATCH 11/129 sata_mv: fix broken DSM/TRIM support (v2)
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Mark Lord <[email protected]>
commit 44b733809a5aba7f6b15a548d31a56d25bf3851c upstream.
Fix DSM/TRIM commands in sata_mv (v2). These need to be issued using old-school "BM DMA", rather than via the EDMA host queue.
Since the chips don't have proper BM DMA status,
we need to be more careful with setting the ATA_DMA_INTR bit, since DSM/TRIM often has a long delay between "DMA complete" and "command complete".
GEN_I chips don't have BM DMA, so no TRIM for them.
--- drivers/ata/sata_mv.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-)
drivers/ata/sata_mv.c +37 -7
@@ -1898,19 +1898,25 @@ static void mv_bmdma_start(struct ata_qu* LOCKING: * Inherited from caller. */ -static void mv_bmdma_stop (struct ata_queued_cmd *qc) +static void mv_bmdma_stop_ap (struct ata_port *ap) { -struct ata_port *ap = qc->ap;void __iomem *port_mmio =mv_ap_base (ap);u32 cmd;/* clear start/stop bit */ cmd =readl (port_mmio +BMDMA_CMD ); - cmd &= ~ATA_DMA_START ; -writelfl (cmd, port_mmio +BMDMA_CMD ); +if (cmd &ATA_DMA_START ) { + cmd &= ~ATA_DMA_START ; +writelfl (cmd, port_mmio +BMDMA_CMD ); -/* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */ -ata_sff_dma_pause (ap); +/* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */ +ata_sff_dma_pause (ap); + } +} + +static void mv_bmdma_stop (struct ata_queued_cmd *qc) +{ +mv_bmdma_stop_ap (qc->ap); }/**
@@ -1934,8 +1940,21 @@ static u8 mv_bmdma_status(struct ata_por reg =readl (port_mmio +BMDMA_STATUS );if (reg &ATA_DMA_ACTIVE ) status =ATA_DMA_ACTIVE ; -else +else if (reg &ATA_DMA_ERR ) status = (reg &ATA_DMA_ERR ) |ATA_DMA_INTR ; +else { +/* +* Just because DMA_ACTIVE is 0 (DMA completed), +* this does _not_ mean the device is "done". +* So we should not yet be signalling ATA_DMA_INTR +* in some cases. Eg. DSM/TRIM, and perhaps others. +*/ +mv_bmdma_stop_ap (ap); +if (ioread8 (ap->ioaddr.altstatus_addr) &ATA_BUSY ) + status =0 ; +else + status =ATA_DMA_INTR ; + }return status; }
@@ -1995,6 +2014,9 @@ static void mv_qc_prep(struct ata_queuedswitch (tf->protocol) {case ATA_PROT_DMA : +if (tf->command ==ATA_CMD_DSM ) +return ; +/* fall-thru */ case ATA_PROT_NCQ :break ;/* continue below */ case ATA_PROT_PIO :
@@ -2094,6 +2116,8 @@ static void mv_qc_prep_iie(struct ata_quif ((tf->protocol !=ATA_PROT_DMA ) && (tf->protocol !=ATA_PROT_NCQ ))return ; +if (tf->command ==ATA_CMD_DSM ) +return ;/* use bmdma for this */ /* Fill in Gen IIE command request block */ if (!(tf->flags &ATA_TFLAG_WRITE ))
@@ -2289,6 +2313,12 @@ static unsigned int mv_qc_issue(struct aswitch (qc->tf.protocol) {case ATA_PROT_DMA : +if (qc->tf.command ==ATA_CMD_DSM ) { +if (!ap->ops->bmdma_setup)/* no bmdma on GEN_I */ +return AC_ERR_OTHER ; +break ;/* use bmdma for this */ + } +/* fall thru */ case ATA_PROT_NCQ :mv_start_edma (ap, port_mmio, pp, qc->tf.protocol); pp->req_idx = (pp->req_idx +1 ) &MV_MAX_Q_DEPTH_MASK ;
PATCH 12/129 pata_cmd64x: revert commit d62f5576
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit aba8a08ded89a74f1ba04ae94ecc98f26e27d41c upstream.
Commit d62f5576 (pata_cmd64x: fix handling of address setup timings) incorrectly called ata_timing_compute() on UDMA mode on 0 @UT leading to devide by zero fault. Revert it until better fix is available. This is reported in bko#16607 by Milan Kocian who also root caused it.
https://bugzilla.kernel.org/show_bug.cgi?id=16607
--- drivers/ata/pata_cmd64x.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/ata/pata_cmd64x.c +0 -6
@@ -121,14 +121,8 @@ static void cmd64x_set_timing(struct ataif (pair) {struct ata_timing tp; -ata_timing_compute (pair, pair->pio_mode, &tp,T ,0 );ata_timing_merge (&t, &tp, &t,ATA_TIMING_SETUP ); -if (pair->dma_mode) { -ata_timing_compute (pair, pair->dma_mode, - &tp,T ,0 ); -ata_timing_merge (&tp, &t, &t,ATA_TIMING_SETUP ); - } } }
PATCH 13/129 writeback: write_cache_pages doesnt terminate at nr_to_write <= 0
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dave Chinner <[email protected]>
commit 546a1924224078c6f582e68f890b05b387b42653 upstream.
I noticed XFS writeback in 2.6.36-rc1 was much slower than it should have been. Enabling writeback tracing showed:
flush-253:16-8516 [007] 1342952.351608: wbc_writepage: bdi 253:16: towrt=1024 skip=0 mode=0 kupd=0 bgrd=1 reclm=0 cyclic=1 more=0 older=0x0 start=0x0 end=0x0
flush-253:16-8516 [007] 1342952.351654: wbc_writepage: bdi 253:16: towrt=1023 skip=0 mode=0 kupd=0 bgrd=1 reclm=0 cyclic=1 more=0 older=0x0 start=0x0 end=0x0
flush-253:16-8516 [000] 1342952.369520: wbc_writepage: bdi 253:16: towrt=0 skip=0 mode=0 kupd=0 bgrd=1 reclm=0 cyclic=1 more=0 older=0x0 start=0x0 end=0x0
flush-253:16-8516 [000] 1342952.369542: wbc_writepage: bdi 253:16: towrt=-1 skip=0 mode=0 kupd=0 bgrd=1 reclm=0 cyclic=1 more=0 older=0x0 start=0x0 end=0x0
flush-253:16-8516 [000] 1342952.369549: wbc_writepage: bdi 253:16: towrt=-2 skip=0 mode=0 kupd=0 bgrd=1 reclm=0 cyclic=1 more=0 older=0x0 start=0x0 end=0x0Writeback is not terminating in background writeback if ->writepage is returning with wbc->nr_to_write == 0, resulting in sub-optimal single page writeback on XFS.
Fix the write_cache_pages loop to terminate correctly when this situation occurs and so prevent this sub-optimal background writeback pattern. This improves sustained sequential buffered write performance from around 250MB/s to 750MB/s for a 100GB file on an XFS filesystem on my 8p test VM.
--- mm/page-writeback.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
mm/page-writeback.c +10 -16
@@ -949,22 +949,16 @@ continue_unlock: } } -if (wbc->nr_to_write >0 ) { -if (--wbc->nr_to_write ==0 && - wbc->sync_mode ==WB_SYNC_NONE ) { -/* -* We stop writing back only if we are -* not doing integrity sync. In case of -* integrity sync we have to keep going -* because someone may be concurrently -* dirtying pages, and we might have -* synced a lot of newly appeared dirty -* pages, but have not synced all of the -* old dirty pages. -*/ - done =1 ; -break ; - } +/* +* We stop writing back only if we are not doing +* integrity sync. In case of integrity sync we have to +* keep going until we have written all the pages +* we tagged for writeback prior to entering this loop. +*/ +if (--wbc->nr_to_write <=0 && + wbc->sync_mode ==WB_SYNC_NONE ) { + done =1 ; +break ; } }pagevec_release (&pvec);
PATCH 14/129 x86, tsc, sched: Recompute cyc2ns_offsets during resume from sleep states
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Suresh Siddha <[email protected]>
commit cd7240c0b900eb6d690ccee088a6c9b46dae815a upstream.
TSC's get reset after suspend/resume (even on cpu's with invariant TSC which runs at a constant rate across ACPI P-, C- and T-states). And in some systems BIOS seem to reinit TSC to arbitrary large value (still sync'd across cpu's) during resume.
This leads to a scenario of scheduler rq->clock (sched_clock_cpu()) less than rq->age_stamp (introduced in 2.6.32). This leads to a big value returned by scale_rt_power() and the resulting big group power set by the update_group_power() is causing improper load balancing between busy and idle cpu's after suspend/resume.
This resulted in multi-threaded workloads (like kernel-compilation) go slower after suspend/resume cycle on core i5 laptops.
Fix this by recomputing cyc2ns_offset's during resume, so that sched_clock() continues from the point where it was left off during suspend.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/tsc.h | 2 ++ arch/x86/kernel/tsc.c | 38 ++++++++++++++++++++++++++++++++++++++ arch/x86/power/cpu.c | 2 ++ 3 files changed, 42 insertions(+)
arch/x86/include/asm/tsc.h +2 -0
@@ -59,5 +59,7 @@ extern void check_tsc_sync_source(int cpextern void check_tsc_sync_target (void );extern int notsc_setup (char *); +extern void save_sched_clock_state (void ); +extern void restore_sched_clock_state (void );#endif /* _ASM_X86_TSC_H */
arch/x86/kernel/tsc.c +38 -0
@@ -626,6 +626,44 @@ static void set_cyc2ns_scale(unsigned lolocal_irq_restore (flags); } +static unsigned long long cyc2ns_suspend; + +void save_sched_clock_state (void ) +{ +if (!sched_clock_stable) +return ; + + cyc2ns_suspend =sched_clock (); +} + +/* +* Even on processors with invariant TSC, TSC gets reset in some the +* ACPI system sleep states. And in some systems BIOS seem to reinit TSC to +* arbitrary value (still sync'd across cpu's) during resume from such sleep +* states. To cope up with this, recompute the cyc2ns_offset for each cpu so +* that sched_clock() continues from the point where it was left off during +* suspend. +*/ +void restore_sched_clock_state (void ) +{ +unsigned long long offset; +unsigned long flags; +int cpu; + +if (!sched_clock_stable) +return ; + +local_irq_save (flags); + +get_cpu_var (cyc2ns_offset) =0 ; + offset = cyc2ns_suspend -sched_clock (); + +for_each_possible_cpu (cpu) +per_cpu (cyc2ns_offset, cpu) = offset; + +local_irq_restore (flags); +} +#ifdef CONFIG_CPU_FREQ /* Frequency scaling support. Adjust the TSC based timer when the cpu frequency
arch/x86/power/cpu.c +2 -0
@@ -113,6 +113,7 @@ static void __save_processor_state(strucvoid save_processor_state (void ) {__save_processor_state (&saved_context); +save_sched_clock_state (); }#ifdef CONFIG_X86_32 EXPORT_SYMBOL (save_processor_state);
@@ -229,6 +230,7 @@ static void __restore_processor_state(stvoid restore_processor_state (void ) {__restore_processor_state (&saved_context); +restore_sched_clock_state (); }#ifdef CONFIG_X86_32 EXPORT_SYMBOL (restore_processor_state);
PATCH 15/129 perf, x86, Pentium4: Clear the P4_CCCR_FORCE_OVF flag
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Lin Ming <[email protected]>
commit 8d330919927ea31fa083b5a80084dc991da813a0 upstream.
If on Pentium4 CPUs the FORCE_OVF flag is set then an NMI happens on every event, which can generate a flood of NMIs. Clear it.
--- arch/x86/kernel/cpu/perf_event_p4.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/perf_event_p4.c +2 -0
@@ -457,6 +457,8 @@ static int p4_hw_config(struct perf_even event->hw.config |= event->attr.config & (p4_config_pack_escr (P4_ESCR_MASK_HT ) |p4_config_pack_cccr (P4_CCCR_MASK_HT )); + + event->hw.config &= ~P4_CCCR_FORCE_OVF ; } rc =x86_setup_perfctr (event);
PATCH 16/129 netfilter: fix CONFIG_COMPAT support
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Florian Westphal <[email protected]>
commit cca77b7c81876d819a5806f408b3c29b5b61a815 upstream.
commit f3c5c1bfd430858d3a05436f82c51e53104feb6b (netfilter: xtables: make ip_tables reentrant) forgot to also compute the jumpstack size in the compat handlers.
Result is that "iptables -I INPUT -j userchain" turns into -j DROP.
Reported by Sebastian Roesner on #netfilter, closes
http://bugzilla.netfilter.org/show_bug.cgi?id=669.
Note: arptables change is compile-tested only.
--- net/ipv4/netfilter/arp_tables.c | 3 +++ net/ipv4/netfilter/ip_tables.c | 3 +++ net/ipv6/netfilter/ip6_tables.c | 3 +++ 3 files changed, 9 insertions(+)
net/ipv4/netfilter/arp_tables.c +3 -0
@@ -1420,6 +1420,9 @@ static int translate_compat_table(constif (ret !=0 )break ; ++i; +if (strcmp (arpt_get_target (iter1)->u.user.name, +XT_ERROR_TARGET ) ==0 ) + ++newinfo->stacksize; }if (ret) {/*
net/ipv4/netfilter/ip_tables.c +3 -0
@@ -1747,6 +1747,9 @@ translate_compat_table(struct net *net,if (ret !=0 )break ; ++i; +if (strcmp (ipt_get_target (iter1)->u.user.name, +XT_ERROR_TARGET ) ==0 ) + ++newinfo->stacksize; }if (ret) {/*
net/ipv6/netfilter/ip6_tables.c +3 -0
@@ -1765,6 +1765,9 @@ translate_compat_table(struct net *net,if (ret !=0 )break ; ++i; +if (strcmp (ip6t_get_target (iter1)->u.user.name, +XT_ERROR_TARGET ) ==0 ) + ++newinfo->stacksize; }if (ret) {/*
PATCH 17/129 PCI: MSI: Remove unsafe and unnecessary hardware access
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ben Hutchings <[email protected]>
commit fcd097f31a6ee207cc0c3da9cccd2a86d4334785 upstream.
During suspend on an SMP system, {read,write}_msi_msg_desc() may be called to mask and unmask interrupts on a device that is already in a reduced power state. At this point memory-mapped registers including MSI-X tables are not accessible, and config space may not be fully functional either.
While a device is in a reduced power state its interrupts are effectively masked and its MSI(-X) state will be restored when it is brought back to D0. Therefore these functions can simply read and write msi_desc::msg for devices not in D0.
Further, read_msi_msg_desc() should only ever be used to update a previously written message, so it can always read msi_desc::msg and never needs to touch the hardware.
--- drivers/pci/msi.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-)
drivers/pci/msi.c +12 -24
@@ -196,30 +196,15 @@ void unmask_msi_irq(unsigned int irq)void read_msi_msg_desc (struct irq_desc *desc,struct msi_msg *msg) {struct msi_desc *entry =get_irq_desc_msi (desc); -if (entry->msi_attrib.is_msix) { -void __iomem *base = entry->mask_base + - entry->msi_attrib.entry_nr *PCI_MSIX_ENTRY_SIZE ; - msg->address_lo =readl (base +PCI_MSIX_ENTRY_LOWER_ADDR ); - msg->address_hi =readl (base +PCI_MSIX_ENTRY_UPPER_ADDR ); - msg->data =readl (base +PCI_MSIX_ENTRY_DATA ); - }else { -struct pci_dev *dev = entry->dev; -int pos = entry->msi_attrib.pos; -u16 data; - -pci_read_config_dword (dev,msi_lower_address_reg (pos), - &msg->address_lo); -if (entry->msi_attrib.is_64) { -pci_read_config_dword (dev,msi_upper_address_reg (pos), - &msg->address_hi); -pci_read_config_word (dev,msi_data_reg (pos,1 ), &data); - }else { - msg->address_hi =0 ; -pci_read_config_word (dev,msi_data_reg (pos,0 ), &data); - } - msg->data = data; - } +/* We do not touch the hardware (which may not even be +* accessible at the moment) but return the last message +* written. Assert that this is valid, assuming that +* valid messages are not all-zeroes. */ +BUG_ON (!(entry->msg.address_hi | entry->msg.address_lo | + entry->msg.data)); + + *msg = entry->msg; }void read_msi_msg (unsigned int irq,struct msi_msg *msg)
@@ -232,7 +217,10 @@ void read_msi_msg(unsigned int irq, struvoid write_msi_msg_desc (struct irq_desc *desc,struct msi_msg *msg) {struct msi_desc *entry =get_irq_desc_msi (desc); -if (entry->msi_attrib.is_msix) { + +if (entry->dev->current_state !=PCI_D0 ) { +/* Don't touch the hardware now */ + }else if (entry->msi_attrib.is_msix) {void __iomem *base; base = entry->mask_base + entry->msi_attrib.entry_nr *PCI_MSIX_ENTRY_SIZE ;
PATCH 18/129 PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ben Hutchings <[email protected]>
commit 30da55242818a8ca08583188ebcbaccd283ad4d9 upstream.
commit 2ca1af9aa3285c6a5f103ed31ad09f7399fc65d7 "PCI: MSI: Remove unsafe and unnecessary hardware access" changed read_msi_msg_desc() to return the last MSI message written instead of reading it from the device, since it may be called while the device is in a reduced power state.
However, the pSeries platform code really does need to read messages from the device, since they are initially written by firmware. Therefore:
- Restore the previous behaviour of read_msi_msg_desc()
- Add new functions get_cached_msi_msg{,_desc}() which return the last MSI message written
- Use the new functions where appropriate
--- arch/ia64/kernel/msi_ia64.c | 2 - arch/ia64/sn/kernel/msi_sn.c | 2 - arch/x86/kernel/apic/io_apic.c | 2 - drivers/pci/msi.c | 47 ++++++++++++++++++++++++++++++++++++----- include/linux/msi.h | 2 + 5 files changed, 47 insertions(+), 8 deletions(-)
arch/ia64/kernel/msi_ia64.c +1 -1
@@ -25,7 +25,7 @@ static int ia64_set_msi_irq_affinity(unsif (irq_prepare_move (irq, cpu))return -1 ; -read_msi_msg (irq, &msg); +get_cached_msi_msg (irq, &msg); addr = msg.address_lo; addr &=MSI_ADDR_DEST_ID_MASK ;
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -175,7 +175,7 @@ static int sn_set_msi_irq_affinity(unsig* Release XIO resources for the old MSI PCI address */ -read_msi_msg (irq, &msg); +get_cached_msi_msg (irq, &msg); sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; pdev = sn_pdev->pdi_linux_pcidev; provider =SN_PCIDEV_BUSPROVIDER (pdev);
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -3399,7 +3399,7 @@ static int set_msi_irq_affinity(unsigned cfg = desc->chip_data; -read_msi_msg_desc (desc, &msg); +get_cached_msi_msg_desc (desc, &msg); msg.data &= ~MSI_DATA_VECTOR_MASK ; msg.data |=MSI_DATA_VECTOR (cfg->vector);
drivers/pci/msi.c +42 -5
62 lines not on this page · raw message
include/linux/msi.h +2 -0
@@ -14,8 +14,10 @@ struct irq_desc;extern void mask_msi_irq (unsigned int irq);extern void unmask_msi_irq (unsigned int irq);extern void read_msi_msg_desc (struct irq_desc *desc,struct msi_msg *msg); +extern void get_cached_msi_msg_desc (struct irq_desc *desc,struct msi_msg *msg);extern void write_msi_msg_desc (struct irq_desc *desc,struct msi_msg *msg);extern void read_msi_msg (unsigned int irq,struct msi_msg *msg); +extern void get_cached_msi_msg (unsigned int irq,struct msi_msg *msg);extern void write_msi_msg (unsigned int irq,struct msi_msg *msg);struct msi_desc {
PATCH 19/129 direct-io: move aio_complete into ->end_io
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Christoph Hellwig <[email protected]>
commit 40e2e97316af6e62affab7a392e792494b8d9dde upstream.
Filesystems with unwritten extent support must not complete an AIO request until the transaction to convert the extent has been commited. That means the aio_complete calls needs to be moved into the ->end_io callback so that the filesystem can control when to call it exactly.
This makes a bit of a mess out of dio_complete and the ->end_io callback prototype even more complicated.
--- fs/direct-io.c | 26 ++++++++++++++------------ fs/ext4/inode.c | 10 +++++++--- fs/ocfs2/aops.c | 7 ++++++- fs/xfs/linux-2.6/xfs_aops.c | 7 ++++++- fs/xfs/linux-2.6/xfs_aops.h | 2 ++ include/linux/fs.h | 3 ++- 6 files changed, 37 insertions(+), 18 deletions(-)
fs/direct-io.c +14 -12
@@ -218,7 +218,7 @@ static struct page *dio_get_page(struct* filesystems can use it to hold additional state between get_block calls and * dio_complete. */ -static int dio_complete (struct dio *dio,loff_t offset,int ret) +static int dio_complete (struct dio *dio,loff_t offset,int ret,bool is_async) {ssize_t transferred =0 ;
@@ -239,14 +239,6 @@ static int dio_complete(struct dio *dio, transferred = dio->i_size - offset; } -if (dio->end_io && dio->result) - dio->end_io (dio->iocb, offset, transferred, - dio->map_bh.b_private); - -if (dio->flags &DIO_LOCKING ) -/* lockdep: non-owner release */ -up_read_non_owner (&dio->inode->i_alloc_sem); -if (ret ==0 ) ret = dio->page_errors;if (ret ==0 )
@@ -254,6 +246,17 @@ static int dio_complete(struct dio *dio,if (ret ==0 ) ret = transferred; +if (dio->end_io && dio->result) { + dio->end_io (dio->iocb, offset, transferred, + dio->map_bh.b_private, ret, is_async); + }else if (is_async) { +aio_complete (dio->iocb, ret,0 ); + } + +if (dio->flags &DIO_LOCKING ) +/* lockdep: non-owner release */ +up_read_non_owner (&dio->inode->i_alloc_sem); +return ret; }
@@ -277,8 +280,7 @@ static void dio_bio_end_aio(struct bio *spin_unlock_irqrestore (&dio->bio_lock, flags);if (remaining ==0 ) { -int ret =dio_complete (dio, dio->iocb->ki_pos,0 ); -aio_complete (dio->iocb, ret,0 ); +dio_complete (dio, dio->iocb->ki_pos,0 , true);kfree (dio); } }
@@ -1126,7 +1128,7 @@ direct_io_worker(int rw, struct kiocb *ispin_unlock_irqrestore (&dio->bio_lock, flags);if (ret2 ==0 ) { - ret =dio_complete (dio, offset, ret); + ret =dio_complete (dio, offset, ret, false);kfree (dio); }else BUG_ON (ret != -EIOCBQUEUED );
fs/ext4/inode.c +7 -3
@@ -3775,7 +3775,8 @@ static ext4_io_end_t *ext4_init_io_end ( }static void ext4_end_io_dio (struct kiocb *iocb,loff_t offset, -ssize_t size,void *private) +ssize_t size,void *private,int ret, +bool is_async) {ext4_io_end_t *io_end = iocb->private;struct workqueue_struct *wq;
@@ -3784,7 +3785,7 @@ static void ext4_end_io_dio(struct kiocb/* if not async direct IO or dio with 0 bytes write, just return */ if (!io_end || !size) -return ; + goto out; ext_debug("ext4_end_io_dio(): io_end 0x%p" "for inode %lu, iocb 0x%p, offset %llu, size %llu\n",
@@ -3795,7 +3796,7 @@ static void ext4_end_io_dio(struct kiocbif (io_end->flag !=EXT4_IO_UNWRITTEN ){ext4_free_io_end (io_end); iocb->private =NULL ; -return ; + goto out; } io_end->offset = offset;
@@ -3812,6 +3813,9 @@ static void ext4_end_io_dio(struct kiocblist_add_tail (&io_end->list, &ei->i_completed_io_list);spin_unlock_irqrestore (&ei->i_completed_io_lock, flags); iocb->private =NULL ; +out: +if (is_async) +aio_complete (iocb, ret,0 ); }static void ext4_end_io_buffer_write (struct buffer_head *bh,int uptodate)
fs/ocfs2/aops.c +6 -1
@@ -578,7 +578,9 @@ bail:static void ocfs2_dio_end_io (struct kiocb *iocb,loff_t offset,ssize_t bytes, -void *private) +void *private, +int ret, +bool is_async) {struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;int level;
@@ -592,6 +594,9 @@ static void ocfs2_dio_end_io(struct kiocif (!level)up_read (&inode->i_alloc_sem);ocfs2_rw_unlock (inode, level); + +if (is_async) +aio_complete (iocb, ret,0 ); }/*
fs/xfs/linux-2.6/xfs_aops.c +6 -1
@@ -1599,7 +1599,9 @@ xfs_end_io_direct(struct kiocb *iocb, loff_t offset, ssize_t size, - void *private) + void *private, + int ret, + bool is_async) { xfs_ioend_t *ioend = iocb->private;
@@ -1645,6 +1647,9 @@ xfs_end_io_direct(* against double-freeing. */ iocb->private =NULL ; + +if (is_async) +aio_complete (iocb, ret,0 ); }STATIC ssize_t
fs/xfs/linux-2.6/xfs_aops.h +2 -0
@@ -37,6 +37,8 @@ typedef struct xfs_ioend {size_t io_size;/* size of the extent */ xfs_off_t io_offset;/* offset in the file */ struct work_struct io_work;/* xfsdatad work queue */ +struct kiocb *io_iocb; +int io_result; } xfs_ioend_t;extern const struct address_space_operations xfs_address_space_operations;
include/linux/fs.h +2 -1
@@ -416,7 +416,8 @@ struct buffer_head;typedef int (get_block_t )(struct inode *inode,sector_t iblock,struct buffer_head *bh_result,int create);typedef void (dio_iodone_t )(struct kiocb *iocb,loff_t offset, -ssize_t bytes,void *private); +ssize_t bytes,void *private,int ret, +bool is_async);/* * Attribute flags. These should be or-ed together to figure out what
PATCH 20/129 ext4: move aio completion after unwritten extent conversion
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jiaying Zhang <[email protected]>
commit 5b3ff237bef43b9e7fb7d1eb858e29b73fd664f9 upstream.
This patch is to be applied upon Christoph's "direct-io: move aio_complete into ->end_io" patch. It adds iocb and result fields to struct ext4_io_end_t, so that we can call aio_complete from ext4_end_io_nolock() after the extent conversion has finished.
I have verified with Christoph's aio-dio test that used to fail after a few runs on an original kernel but now succeeds on the patched kernel.
See http://thread.gmane.org/gmane.comp.file-systems.ext4/19659 for details.
--- fs/ext4/ext4.h | 4 +++- fs/ext4/inode.c | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-)
fs/ext4/ext4.h +3 -1
@@ -167,13 +167,15 @@ struct mpage_da_data { };#define EXT4_IO_UNWRITTEN 0x1typedef struct ext4_io_end { -struct list_head list;/* per-file finished AIO list */ +struct list_head list;/* per-file finished IO list */ struct inode *inode;/* file being written to */ unsigned int flag;/* unwritten or not */ struct page *page;/* page struct for buffer write */ loff_t offset;/* offset in the file */ ssize_t size;/* size of the extent */ struct work_struct work;/* data work queue */ +struct kiocb *iocb;/* iocb struct for AIO */ +int result;/* error value for AIO */ }ext4_io_end_t ;/*
fs/ext4/inode.c +12 -5
@@ -3668,6 +3668,8 @@ static int ext4_end_io_nolock(ext4_io_enreturn ret; } +if (io->iocb) +aio_complete (io->iocb, io->result,0 );/* clear the DIO AIO unwritten flag */ io->flag =0 ;return ret;
@@ -3767,6 +3769,8 @@ static ext4_io_end_t *ext4_init_io_end ( io->offset =0 ; io->size =0 ; io->page =NULL ; + io->iocb =NULL ; + io->result =0 ;INIT_WORK (&io->work, ext4_end_io_work);INIT_LIST_HEAD (&io->list); }
@@ -3796,12 +3800,18 @@ static void ext4_end_io_dio(struct kiocbif (io_end->flag !=EXT4_IO_UNWRITTEN ){ext4_free_io_end (io_end); iocb->private =NULL ; - goto out; +out: +if (is_async) +aio_complete (iocb, ret,0 ); +return ; } io_end->offset = offset; io_end->size = size; - io_end->flag =EXT4_IO_UNWRITTEN ; +if (is_async) { + io_end->iocb = iocb; + io_end->result = ret; + } wq =EXT4_SB (io_end->inode->i_sb)->dio_unwritten_wq;/* queue the work to convert unwritten extents to written */
@@ -3813,9 +3823,6 @@ static void ext4_end_io_dio(struct kiocblist_add_tail (&io_end->list, &ei->i_completed_io_list);spin_unlock_irqrestore (&ei->i_completed_io_lock, flags); iocb->private =NULL ; -out: -if (is_async) -aio_complete (iocb, ret,0 ); }static void ext4_end_io_buffer_write (struct buffer_head *bh,int uptodate)
PATCH 21/129 xfs: move aio completion after unwritten extent conversion
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Christoph Hellwig <[email protected]>
commit fb511f2150174b18b28ad54708c1adda0df39b17 upstream.
If we write into an unwritten extent using AIO we need to complete the AIO request after the extent conversion has finished. Without that a read could
race to see see the extent still unwritten and return zeros. For synchronous
I/O we already take care of that by flushing the xfsconvertd workqueue (which might be a bit of overkill).
To do that add iocb and result fields to struct xfs_ioend, so that we can call aio_complete from xfs_end_io after the extent conversion has happened. Note that we need a new result field as io_error is used for positive errno values, while the AIO code can return negative error values and positive transfer sizes.
--- fs/xfs/linux-2.6/xfs_aops.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
fs/xfs/linux-2.6/xfs_aops.c +16 -3
@@ -275,8 +275,11 @@ xfs_end_io(xfs_finish_ioend (ioend,0 );/* ensure we don't spin on blocked ioends */ delay (1 ); - }else + }else { +if (ioend->io_iocb) +aio_complete (ioend->io_iocb, ioend->io_result,0 );xfs_destroy_ioend (ioend); + } }/*
@@ -309,6 +312,8 @@ xfs_alloc_ioend(atomic_inc (&XFS_I (ioend->io_inode)->i_iocount); ioend->io_offset =0 ; ioend->io_size =0 ; + ioend->io_iocb =NULL ; + ioend->io_result =0 ;INIT_WORK (&ioend->io_work, xfs_end_io);return ioend;
@@ -1604,6 +1609,7 @@ xfs_end_io_direct( bool is_async) {xfs_ioend_t *ioend = iocb->private; +bool complete_aio = is_async;/* * Non-NULL private data means we need to issue a transaction to
@@ -1629,7 +1635,14 @@ xfs_end_io_direct(if (ioend->io_type ==IO_READ ) {xfs_finish_ioend (ioend,0 ); }else if (private && size >0 ) { -xfs_finish_ioend (ioend,is_sync_kiocb (iocb)); +if (is_async) { + ioend->io_iocb = iocb; + ioend->io_result = ret; + complete_aio = false; +xfs_finish_ioend (ioend,0 ); + }else { +xfs_finish_ioend (ioend,1 ); + } }else {/* * A direct I/O write ioend starts it's life in unwritten
@@ -1648,7 +1661,7 @@ xfs_end_io_direct(*/ iocb->private =NULL ; -if (is_async) +if (complete_aio)aio_complete (iocb, ret,0 ); }
PATCH 22/129 Revert "Input: appletouch - fix integer overflow issue"
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Benjamin Herrenschmidt <[email protected]>
commit 6e49c1a407c8af8d779a24fd2428857991514a7b upstream.
This reverts commit 04b4b88cca0ebe3813b4b6f014fb6a0db380b137.
While the original problem only caused a slight disturbance on the edge of the touchpad, the commit above to "fix" it completely breaks operation on some other models such as mine.
We'll sort this out separately, revert the patch for now.
--- drivers/input/mouse/appletouch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/input/mouse/appletouch.c +3 -3
@@ -205,8 +205,8 @@ struct atp {bool overflow_warned;int x_old;/* last reported x/y, */ int y_old;/* used for smoothing */ -u8 xy_cur[ATP_XSENSORS +ATP_YSENSORS ]; -u8 xy_old[ATP_XSENSORS +ATP_YSENSORS ]; +signed char xy_cur[ATP_XSENSORS +ATP_YSENSORS ]; +signed char xy_old[ATP_XSENSORS +ATP_YSENSORS ];int xy_acc[ATP_XSENSORS +ATP_YSENSORS ];int idlecount;/* number of empty packets */ struct work_struct work;
@@ -531,7 +531,7 @@ static void atp_complete_geyser_1_2(strufor (i =0 ; i <ATP_XSENSORS +ATP_YSENSORS ; i++) {/* accumulate the change */ -int change = dev->xy_old[i] - dev->xy_cur[i]; +signed char change = dev->xy_old[i] - dev->xy_cur[i]; dev->xy_acc[i] -= change;/* prevent down drifting */
PATCH 23/129 ALSA: hda - Handle missing NID 0x1b on ALC259 codec
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit 5d4abf93ea3192cc666430225a29a4978c97c57d upstream.
Since ALC259/269 use the same parser of ALC268, the pin 0x1b was ignored as an invalid widget. Just add this NID to handle properly. This will add the missing mixer controls for some devices.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -13026,6 +13026,7 @@ static int alc268_new_analog_output(stru dac =0x02 ;break ;case 0x15 : +case 0x1b :case 0x21 :/* ALC269vb has this pin, too */ dac =0x03 ;break ;
PATCH 24/129 ALSA: hda - Handle pin NID 0x1a on ALC259/269
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit b08b1637ce1c0196970348bcabf40f04b6b3d58e upstream.
The pin NID 0x1a should be handled as well as NID 0x1b. Also added comments.
--- sound/pci/hda/patch_realtek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +2 -1
@@ -13026,7 +13026,8 @@ static int alc268_new_analog_output(stru dac =0x02 ;break ;case 0x15 : -case 0x1b : +case 0x1a :/* ALC259/269 only */ +case 0x1b :/* ALC259/269 only */ case 0x21 :/* ALC269vb has this pin, too */ dac =0x03 ;break ;
PATCH 25/129 Staging: rt2870sta: Add more device IDs from vendor drivers
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ben Hutchings <[email protected]>
commit 9e693e4375689cb1cd1529aba011de0044f74ef5 upstream.
Taken from DPO_RT3070_LinuxSTA_V2.3.0.4_20100604.tar.bz2 and 2010_0709_RT2870_Linux_STA_v2.4.0.1.tar.bz2, with duplicates removed.
--- drivers/staging/rt2860/usb_main_dev.c | 41 ++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
drivers/staging/rt2860/usb_main_dev.c +39 -2
@@ -44,6 +44,7 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x07B8, 0x2870)}, /* AboCom */ {USB_DEVICE(0x07B8, 0x2770)}, /* AboCom */ {USB_DEVICE(0x0DF6, 0x0039)}, /* Sitecom 2770 */ + {USB_DEVICE(0x0DF6, 0x003F)}, /* Sitecom 2770 */ {USB_DEVICE(0x083A, 0x7512)}, /* Arcadyan 2770 */ {USB_DEVICE(0x0789, 0x0162)}, /* Logitec 2870 */ {USB_DEVICE(0x0789, 0x0163)}, /* Logitec 2870 */
@@ -95,7 +96,8 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x050d, 0x815c)}, {USB_DEVICE(0x1482, 0x3C09)}, /* Abocom */ {USB_DEVICE(0x14B2, 0x3C09)}, /* Alpha */ - {USB_DEVICE(0x04E8, 0x2018)}, /* samsung */ + {USB_DEVICE(0x04E8, 0x2018)}, /* samsung linkstick2 */ + {USB_DEVICE(0x1690, 0x0740)}, /* Askey */ {USB_DEVICE(0x5A57, 0x0280)}, /* Zinwell */ {USB_DEVICE(0x5A57, 0x0282)}, /* Zinwell */ {USB_DEVICE(0x7392, 0x7718)},
@@ -105,21 +107,34 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x1737, 0x0071)}, /* Linksys WUSB600N */ {USB_DEVICE(0x0411, 0x00e8)}, /* Buffalo WLI-UC-G300N */ {USB_DEVICE(0x050d, 0x815c)}, /* Belkin F5D8053 */ + {USB_DEVICE(0x100D, 0x9031)}, /* Motorola 2770 */ #endif /* RT2870 // */ #ifdef RT3070 {USB_DEVICE(0x148F, 0x3070)}, /* Ralink 3070 */ {USB_DEVICE(0x148F, 0x3071)}, /* Ralink 3071 */ {USB_DEVICE(0x148F, 0x3072)}, /* Ralink 3072 */ {USB_DEVICE(0x0DB0, 0x3820)}, /* Ralink 3070 */ + {USB_DEVICE(0x0DB0, 0x871C)}, /* Ralink 3070 */ + {USB_DEVICE(0x0DB0, 0x822C)}, /* Ralink 3070 */ + {USB_DEVICE(0x0DB0, 0x871B)}, /* Ralink 3070 */ + {USB_DEVICE(0x0DB0, 0x822B)}, /* Ralink 3070 */ {USB_DEVICE(0x0DF6, 0x003E)}, /* Sitecom 3070 */ {USB_DEVICE(0x0DF6, 0x0042)}, /* Sitecom 3072 */ + {USB_DEVICE(0x0DF6, 0x0048)}, /* Sitecom 3070 */ + {USB_DEVICE(0x0DF6, 0x0047)}, /* Sitecom 3071 */ {USB_DEVICE(0x14B2, 0x3C12)}, /* AL 3070 */ {USB_DEVICE(0x18C5, 0x0012)}, /* Corega 3070 */ {USB_DEVICE(0x083A, 0x7511)}, /* Arcadyan 3070 */ + {USB_DEVICE(0x083A, 0xA701)}, /* SMC 3070 */ + {USB_DEVICE(0x083A, 0xA702)}, /* SMC 3072 */ {USB_DEVICE(0x1740, 0x9703)}, /* EnGenius 3070 */ {USB_DEVICE(0x1740, 0x9705)}, /* EnGenius 3071 */ {USB_DEVICE(0x1740, 0x9706)}, /* EnGenius 3072 */ + {USB_DEVICE(0x1740, 0x9707)}, /* EnGenius 3070 */ + {USB_DEVICE(0x1740, 0x9708)}, /* EnGenius 3071 */ + {USB_DEVICE(0x1740, 0x9709)}, /* EnGenius 3072 */ {USB_DEVICE(0x13D3, 0x3273)}, /* AzureWave 3070 */ + {USB_DEVICE(0x13D3, 0x3305)}, /* AzureWave 3070*/ {USB_DEVICE(0x1044, 0x800D)}, /* Gigabyte GN-WB32L 3070 */ {USB_DEVICE(0x2019, 0xAB25)}, /* Planex Communications, Inc. RT3070 */ {USB_DEVICE(0x07B8, 0x3070)}, /* AboCom 3070 */
@@ -132,14 +147,36 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x07D1, 0x3C0D)}, /* D-Link 3070 */ {USB_DEVICE(0x07D1, 0x3C0E)}, /* D-Link 3070 */ {USB_DEVICE(0x07D1, 0x3C0F)}, /* D-Link 3070 */ + {USB_DEVICE(0x07D1, 0x3C16)}, /* D-Link 3070 */ + {USB_DEVICE(0x07D1, 0x3C17)}, /* D-Link 8070 */ {USB_DEVICE(0x1D4D, 0x000C)}, /* Pegatron Corporation 3070 */ {USB_DEVICE(0x1D4D, 0x000E)}, /* Pegatron Corporation 3070 */ {USB_DEVICE(0x5A57, 0x5257)}, /* Zinwell 3070 */ {USB_DEVICE(0x5A57, 0x0283)}, /* Zinwell 3072 */ {USB_DEVICE(0x04BB, 0x0945)}, /* I-O DATA 3072 */ + {USB_DEVICE(0x04BB, 0x0947)}, /* I-O DATA 3070 */ + {USB_DEVICE(0x04BB, 0x0948)}, /* I-O DATA 3072 */ {USB_DEVICE(0x203D, 0x1480)}, /* Encore 3070 */ + {USB_DEVICE(0x20B8, 0x8888)}, /* PARA INDUSTRIAL 3070 */ + {USB_DEVICE(0x0B05, 0x1784)}, /* Asus 3072 */ + {USB_DEVICE(0x203D, 0x14A9)}, /* Encore 3070*/ + {USB_DEVICE(0x0DB0, 0x899A)}, /* MSI 3070*/ + {USB_DEVICE(0x0DB0, 0x3870)}, /* MSI 3070*/ + {USB_DEVICE(0x0DB0, 0x870A)}, /* MSI 3070*/ + {USB_DEVICE(0x0DB0, 0x6899)}, /* MSI 3070 */ + {USB_DEVICE(0x0DB0, 0x3822)}, /* MSI 3070 */ + {USB_DEVICE(0x0DB0, 0x3871)}, /* MSI 3070 */ + {USB_DEVICE(0x0DB0, 0x871A)}, /* MSI 3070 */ + {USB_DEVICE(0x0DB0, 0x822A)}, /* MSI 3070 */ + {USB_DEVICE(0x0DB0, 0x3821)}, /* Ralink 3070 */ + {USB_DEVICE(0x0DB0, 0x821A)}, /* Ralink 3070 */ + {USB_DEVICE(0x083A, 0xA703)}, /* IO-MAGIC */ + {USB_DEVICE(0x13D3, 0x3307)}, /* Azurewave */ + {USB_DEVICE(0x13D3, 0x3321)}, /* Azurewave */ + {USB_DEVICE(0x07FA, 0x7712)}, /* Edimax */ + {USB_DEVICE(0x0789, 0x0166)}, /* Edimax */ + {USB_DEVICE(0x148F, 0x2070)}, /* Edimax */ #endif /* RT3070 // */ - {USB_DEVICE(0x0DF6, 0x003F)}, /* Sitecom WL-608 */ {USB_DEVICE(0x1737, 0x0077)}, /* Linksys WUSB54GC-EU v3 */ {USB_DEVICE(0x2001, 0x3C09)}, /* D-Link */ {USB_DEVICE(0x2001, 0x3C0A)}, /* D-Link 3072 */
PATCH 26/129 staging: hv: Fix missing functions for net_device_ops
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Haiyang Zhang <[email protected]>
commit b681b5886bb5d1f5b6750a0ed7c62846da7ccea4 upstream.
Fix missing functions for net_device_ops.
It's a bug when porting the drivers from 2.6.27 to 2.6.32. In 2.6.27, the default functions for Ethernet, like eth_change_mtu(), were assigned by ether_setup(). But in 2.6.32, these function pointers moved to net_device_ops structure and no longer be assigned in ether_setup(). So we need to set these functions in our driver code. It will ensure the MTU won't be set beyond 1500. Otherwise, this can cause an error on the server side, because the HyperV linux driver doesn't support jumbo frame yet.
--- drivers/staging/hv/netvsc_drv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/hv/netvsc_drv.c +3 -0
@@ -348,6 +348,9 @@ static const struct net_device_ops devic .ndo_stop = netvsc_close, .ndo_start_xmit = netvsc_start_xmit, .ndo_set_multicast_list = netvsc_set_multicast_list, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, };static int netvsc_probe (struct device *device)
PATCH 27/129 staging: hv: Fixed bounce kmap problem by using correct index
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hank Janssen <[email protected]>
commit 0c47a70a9a8a6d1ec37a53d2f9cb82f8b8ef8aa2 upstream.
Fixed bounce offset kmap problem by using correct index.
The symptom of the problem is that in some NAS appliances this problem represents Itself by a unresponsive VM under a load with many clients writing small files.
--- drivers/staging/hv/storvsc_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/hv/storvsc_drv.c +2 -2
@@ -526,7 +526,7 @@ static unsigned int copy_to_bounce_buffe/* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */ -if (j ==0 ) +if (bounce_addr ==0 ) bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])),KM_IRQ0 );while (srclen) {
@@ -587,7 +587,7 @@ static unsigned int copy_from_bounce_buf destlen = orig_sgl[i].length;/* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */ -if (j ==0 ) +if (bounce_addr ==0 ) bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])),KM_IRQ0 );while (destlen) {
PATCH 28/129 staging: hv: Fixed the value of the 64bit-hole inside ring buffer
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Haiyang Zhang <[email protected]>
commit e5fa721d1c2a54261a37eb59686e18dee34b6af6 upstream.
Fixed the value of the 64bit-hole inside ring buffer, this caused a problem on Hyper-V when running checked Windows builds.
Checked builds of Windows are used internally and given to external system integrators at times. They are builds that for example that all elements in a structure follow the definition of that Structure. The bug this fixed was for a field that we did not fill in at all (Because we do Not use it on the Linux side), and the checked build of windows gives errors on it internally to the Windows logs.
This fixes that error.
--- drivers/staging/hv/ring_buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/hv/ring_buffer.c +1 -2
@@ -192,8 +192,7 @@ Description:static inline u64 GetRingBufferIndices (RING_BUFFER_INFO *RingInfo) { -return ((u64 )RingInfo->RingBuffer->WriteIndex <<32 ) - || RingInfo->RingBuffer->ReadIndex; +return (u64 )RingInfo->RingBuffer->WriteIndex <<32 ; }
PATCH 29/129 staging: hv: Increased storvsc ringbuffer and max_io_requests
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hank Janssen <[email protected]>
commit 15dd1c9f53b31cdc84b8072a88c23fa09527c596 upstream.
Increased storvsc ringbuffer and max_io_requests. This now more closely mimics the numbers on Hyper-V. And will allow more IO requests to take place for the SCSI driver.
Max_IO is set to double from what it was before, Hyper-V allows it and we have had appliance builder requests to see if it was a problem to increase the number.
Ringbuffer size for storvsc is now increased because I have seen A few buffer problems on extremely busy systems. They were Set pretty low before. And since max_io_requests is increased I Really needed to increase the buffer as well.
--- drivers/staging/hv/storvsc_api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/hv/storvsc_api.h +2 -2
@@ -28,10 +28,10 @@#include "vmbus_api.h" /* Defines */ -#define STORVSC_RING_BUFFER_SIZE (10*PAGE_SIZE) +#define STORVSC_RING_BUFFER_SIZE (20*PAGE_SIZE)#define BLKVSC_RING_BUFFER_SIZE (20*PAGE_SIZE) -#define STORVSC_MAX_IO_REQUESTS 64 +#define STORVSC_MAX_IO_REQUESTS 128/* * In Hyper-V, each port/path/target maps to 1 scsi host adapter. In
PATCH 30/129 staging: hv: Fixed lockup problem with bounce_buffer scatter list
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hank Janssen <[email protected]>
commit 77c5ceaff31645ea049c6706b99e699eae81fb88 upstream.
Fixed lockup problem with bounce_buffer scatter list which caused crashes in heavy loads. And minor code indentation cleanup in effected area.
Removed whitespace and noted minor indentation changes in description as pointed out by Joe Perches. (Thanks for reviewing Joe)
--- drivers/staging/hv/storvsc_drv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/staging/hv/storvsc_drv.c +5 -2
@@ -646,6 +646,7 @@ static int storvsc_queuecommand(struct sunsigned int request_size =0 ;int i;struct scatterlist *sgl; +unsigned int sg_count =0 ;DPRINT_ENTER (STORVSC_DRV );
@@ -730,6 +731,7 @@ static int storvsc_queuecommand(struct s request->DataBuffer.Length =scsi_bufflen (scmnd);if (scsi_sg_count (scmnd)) { sgl = (struct scatterlist *)scsi_sglist (scmnd); + sg_count =scsi_sg_count (scmnd);/* check if we need to bounce the sgl */ if (do_bounce_buffer (sgl,scsi_sg_count (scmnd)) !=-1 ) {
@@ -764,15 +766,16 @@ static int storvsc_queuecommand(struct s scsi_sg_count(scmnd)); sgl = cmd_request->bounce_sgl; + sg_count = cmd_request->bounce_sgl_count; } request->DataBuffer.Offset = sgl[0 ].offset; -for (i =0 ; i <scsi_sg_count (scmnd); i++) { +for (i =0 ; i < sg_count; i++) {DPRINT_DBG (STORVSC_DRV ,"sgl[%d] len %d offset %d\n" , i, sgl[i].length, sgl[i].offset); request->DataBuffer.PfnArray[i] = -page_to_pfn (sg_page ((&sgl[i]))); +page_to_pfn (sg_page ((&sgl[i]))); } }else if (scsi_sglist (scmnd)) {/* ASSERT(scsi_bufflen(scmnd) <= PAGE_SIZE); */
PATCH 31/129 fuse: flush background queue on connection close
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Miklos Szeredi <[email protected]>
commit 595afaf9e6ee1b48e13ec4b8bcc8c7dee888161a upstream.
David Bartly reported that fuse can hang in fuse_get_req_nofail() when the connection to the filesystem server is no longer active.
If bg_queue is not empty then flush_bg_queue() called from request_end() can put more requests on to the pending queue. If this happens while ending requests on the processing queue then those background requests will be queued to the pending list and never ended.
Another problem is that fuse_dev_release() didn't wake up processes sleeping on blocked_waitq.
Solve this by:
a) flushing the background queue before calling end_requests() on the pending and processing queues
b) setting blocked = 0 and waking up processes waiting on blocked_waitq()
Thanks to David for an excellent bug report.
--- fs/fuse/dev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
fs/fuse/dev.c +12 -4
@@ -1552,6 +1552,14 @@ __acquires(&fc->lock) } } +static void end_queued_requests (struct fuse_conn *fc) +{ + fc->max_background =UINT_MAX ; +flush_bg_queue (fc); +end_requests (fc, &fc->pending); +end_requests (fc, &fc->processing); +} +/* * Abort all requests. *
@@ -1578,8 +1586,7 @@ void fuse_abort_conn(struct fuse_conn *f fc->connected =0 ; fc->blocked =0 ;end_io_requests (fc); -end_requests (fc, &fc->pending); -end_requests (fc, &fc->processing); +end_queued_requests (fc);wake_up_all (&fc->waitq);wake_up_all (&fc->blocked_waitq);kill_fasync (&fc->fasync,SIGIO ,POLL_IN );
@@ -1594,8 +1601,9 @@ int fuse_dev_release(struct inode *inodeif (fc) {spin_lock (&fc->lock); fc->connected =0 ; -end_requests (fc, &fc->pending); -end_requests (fc, &fc->processing); + fc->blocked =0 ; +end_queued_requests (fc); +wake_up_all (&fc->blocked_waitq);spin_unlock (&fc->lock);fuse_conn_put (fc); }
PATCH 32/129 mac80211: delete work timer
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Johannes Berg <[email protected]>
commit 071249b1d501b1f31a6b1af3fbcbe03158a84e5c upstream.
The new workqueue changes helped me find this bug that's been lingering since the changes to the work processing in mac80211 -- the work timer is never deleted properly. Do that to avoid having it fire after all data structures have been freed. It can't be re-armed because all it will do, if running, is schedule the work, but that gets flushed later and won't have anything to do since all work items are gone by now (by way of interface removal).
--- net/mac80211/main.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/mac80211/main.c +6 -0
@@ -659,6 +659,12 @@ void ieee80211_unregister_hw(struct ieeertnl_unlock (); +/* +* Now all work items will be gone, but the +* timer might still be armed, so delete it +*/ +del_timer_sync (&local->work_timer); +cancel_work_sync (&local->reconfig_filter);ieee80211_clear_tx_pending (local);
PATCH 33/129 ath9k_htc: Fix disconnect issue in HT40 mode.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Vivek Natarajan <[email protected]>
commit 71ba186c123630ddab17667ec9ecf7e2ef211295 upstream.
Some APs advertise that they may be HT40 capable in the capabilites but the current operating channel configuration may be only HT20. This causes disconnection as ath9k_htc sets WLAN_RC_40_FLAG despite the AP operating in HT20 mode.
Hence set this flag only if the current channel configuration is HT40 enabled.
--- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/htc_drv_main.c +2 -1
@@ -370,7 +370,8 @@ static int ath9k_htc_init_rate(struct at priv->tgt_rate.rates.ht_rates.rs_nrates = j; caps =WLAN_RC_HT_FLAG ; -if (sta->ht_cap.cap &IEEE80211_HT_CAP_SUP_WIDTH_20_40 ) +if ((sta->ht_cap.cap &IEEE80211_HT_CAP_SUP_WIDTH_20_40 ) && + (conf_is_ht40 (&priv->hw->conf))) caps |=WLAN_RC_40_FLAG ;if (sta->ht_cap.cap &IEEE80211_HT_CAP_SGI_40 ) caps |=WLAN_RC_SGI_FLAG ;
PATCH 34/129 ath9k_hw: Fix EEPROM uncompress block reading on AR9003
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit 803288e61e346ba367373bc7d5eeb6e11c81a33c upstream.
The EEPROM is compressed on AR9003, upon decompression the wrong upper limit was being used for the block which prevented the 5 GHz CTL indexes from being used, which are stored towards the end of the EEPROM block. This fix allows the actual intended regulatory limits to be used on AR9003 hardware.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +1 -1
@@ -768,7 +768,7 @@ static bool ar9300_uncompress_block(stru length = block[it+1 ]; length &=0xff ; -if (length >0 && spot >=0 && spot+length < mdataSize) { +if (length >0 && spot >=0 && spot+length <= mdataSize) { ath_print(common, ATH_DBG_EEPROM, "Restore at %d: spot=%d " "offset=%d length=%d\n",
PATCH 35/129 ath9k_hw: fix parsing of HT40 5 GHz CTLs
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit 904879748d7439a6dabdc6be9aad983e216b027d upstream.
The 5 GHz CTL indexes were not being read for all hardware devices due to the masking out through the CTL_MODE_M mask being one bit too short. Without this the calibrated regulatory maximum values were not being picked up when devices operate on 5 GHz in HT40 mode. The final output power used for Atheros devices is the minimum between the calibrated CTL values and what CRDA provides.
--- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/regd.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/eeprom.h +1 -1
@@ -62,7 +62,7 @@#define SD_NO_CTL 0xE0#define NO_CTL 0xff -#define CTL_MODE_M 7 +#define CTL_MODE_M 0xf#define CTL_11A 0#define CTL_11B 1#define CTL_11G 2
drivers/net/wireless/ath/regd.h +0 -1
@@ -31,7 +31,6 @@ enum ctl_group {#define NO_CTL 0xff#define SD_NO_CTL 0xE0#define NO_CTL 0xff -#define CTL_MODE_M 7#define CTL_11A 0#define CTL_11B 1#define CTL_11G 2
PATCH 36/129 ocfs2: Fix incorrect checksum validation error
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Sunil Mushran <[email protected]>
commit f5ce5a08a40f2086435858ddc80cb40394b082eb upstream.
For local mounts, ocfs2_read_locked_inode() calls ocfs2_read_blocks_sync() to read the inode off the disk. The latter first checks to see if that block is cached in the journal, and, if so, returns that block. That is ok.
But ocfs2_read_locked_inode() goes wrong when it tries to validate the checksum of such blocks. Blocks that are cached in the journal may not have had their checksum computed as yet. We should not validate the checksums of such blocks.
Fixes ossbz#1282
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1282
--- fs/ocfs2/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/ocfs2/inode.c +5 -1
@@ -488,7 +488,11 @@ static int ocfs2_read_locked_inode(struc OCFS2_BH_IGNORE_CACHE); }else { status =ocfs2_read_blocks_sync (osb, args->fi_blkno,1 , &bh); -if (!status) +/* +* If buffer is in jbd, then its checksum may not have been +* computed as yet. +*/ +if (!status && !buffer_jbd (bh)) status =ocfs2_validate_inode_block (osb->sb, bh); }if (status <0 ) {
PATCH 37/129 serial: bfin_sport_uart: restore transmit frame sync fix
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Sonic Zhang <[email protected]>
commit 336746918299f2ca16b31490655b4ff7c8824c87 upstream.
The large cleanup/rewrite of resources in commit ccf68e59e93181df9353c0cc accidentally reverted an earlier fix in commit a19e8b205915b2925aca75b. So restore it here.
--- drivers/serial/bfin_sport_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/serial/bfin_sport_uart.c +1 -1
@@ -121,7 +121,7 @@ static int sport_uart_setup(struct sportunsigned int sclk =get_sclk ();/* Set TCR1 and TCR2, TFSR is not enabled for uart */ -SPORT_PUT_TCR1 (up, (ITFS |TLSBIT |ITCLK )); +SPORT_PUT_TCR1 (up, (LATFS |ITFS |TFSR |TLSBIT |ITCLK ));SPORT_PUT_TCR2 (up, size +1 );pr_debug ("%s TCR1:%x, TCR2:%x\n" , __func__,SPORT_GET_TCR1 (up),SPORT_GET_TCR2 (up));
PATCH 38/129 USB: ehci-ppc-of: problems in unwind
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Carpenter <[email protected]>
commit 08a3b3b1c2e622e378d9086aee9e2e42ce37591d upstream.
The iounmap(ehci->ohci_hcctrl_reg); should be the first thing we do because the ioremap() was the last thing we did. Also if we hit any of the goto statements in the original code then it would have led to a NULL dereference of "ehci". This bug was introduced in: 796bcae7361c "USB: powerpc: Workaround for the PPC440EPX USBH_23 errata [take 3]"
I modified the few lines in front a little so that my code didn't obscure the return success code path.
--- drivers/usb/host/ehci-ppc-of.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/usb/host/ehci-ppc-of.c +7 -5
@@ -192,17 +192,19 @@ ehci_hcd_ppc_of_probe(struct of_device * } rv =usb_add_hcd (hcd, irq,0 ); -if (rv ==0 ) -return 0 ; +if (rv) + goto err_ehci; +return 0 ; + +err_ehci: +if (ehci->has_amcc_usb23) +iounmap (ehci->ohci_hcctrl_reg);iounmap (hcd->regs); err_ioremap:irq_dispose_mapping (irq); err_irq:release_mem_region (hcd->rsrc_start, hcd->rsrc_len); - -if (ehci->has_amcc_usb23) -iounmap (ehci->ohci_hcctrl_reg); err_rmr:usb_put_hcd (hcd);
PATCH 39/129 USB: Fix kernel oops with g_ether and Windows
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Maxim Osipov <[email protected]>
commit 037d3656adbd7e8cb848f01cf5dec423ed76bbe7 upstream.
Please find attached patch for
https://bugzilla.kernel.org/show_bug.cgi?id=16023 problem.
--- drivers/usb/gadget/rndis.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/usb/gadget/rndis.c +7 -3
@@ -292,9 +292,13 @@ gen_ndis_query_resp (int configNr, u32 O/* mandatory */ case OID_GEN_VENDOR_DESCRIPTION :pr_debug ("%s: OID_GEN_VENDOR_DESCRIPTION\n" , __func__); - length =strlen (rndis_per_dev_params [configNr].vendorDescr); -memcpy (outbuf, - rndis_per_dev_params [configNr].vendorDescr, length); +if ( rndis_per_dev_params [configNr].vendorDescr ) { + length =strlen (rndis_per_dev_params [configNr].vendorDescr); +memcpy (outbuf, + rndis_per_dev_params [configNr].vendorDescr, length); + }else { + outbuf[0 ] =0 ; + } retval =0 ;break ;
PATCH 40/129 USB: CP210x Add new device ID
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Craig Shelley <[email protected]>
commit 541e05ec3add5ab5bcf238d60161b53480280b20 upstream.
New device ID added for Balluff RFID reader.
--- drivers/usb/serial/cp210x.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/serial/cp210x.c +5 -4
@@ -109,6 +109,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */ { USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */ { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ + { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
@@ -122,14 +123,14 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ - { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ - { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ - { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ - { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ { USB_DEVICE(0x16DC, 0x0010) }, /* W-IE-NE-R Plein & Baus GmbH PL512 Power Supply */ { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */ { USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */ { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */ + { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ + { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ + { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ + { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ { } /* Terminating Entry */ };
PATCH 41/129 USB: cp210x: Add B&G H3000 link cable ID
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jason Detring <[email protected]>
commit 0bf7a81c5d447c21db434be35363c44c0a30f598 upstream.
This is the cable between an H3000 navigation unit and a multi-function display.
http://www.bandg.com/en/Products/H3000/Spares-and-Accessories/Cables/H3000-CPU-USB-Cable-Pack/
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -88,6 +88,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ + { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */ { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
PATCH 42/129 usb: allow drivers to use allocated bandwidth until unbound
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit 0791971ba8fbc44e4f476079f856335ed45e6324 upstream.
When using the remove sysfs file, the device configuration is set to -1 (unconfigured). This eventually unbind drivers with the bandwidth_mutex held. Some drivers may call functions that hold said mutex, like usb_reset_device. This is the case for rtl8187, for example. This will lead to the same process holding the mutex twice, which deadlocks.
Besides, according to Alan Stern:
"The deadlock problem probably could be handled somehow, but there's a separate issue: Until the usb_disable_device call finishes unbinding the drivers, the drivers are free to continue using their allocated bandwidth. We musn't change the bandwidth allocations until after the unbinding is done. So this patch is indeed necessary."
Unbinding the driver before holding the bandwidth_mutex solves the problem. If any operation after that fails, drivers are not bound again. But that would be a problem anyway that the user may solve resetting the device configuration to one that works, just like he would need to do in most other failure cases.
--- drivers/usb/core/message.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/usb/core/message.c +11 -11
@@ -1724,6 +1724,15 @@ free_interfaces:if (ret) goto free_interfaces; +/* if it's already configured, clear out old state first. +* getting rid of old interfaces means unbinding their drivers. +*/ +if (dev->state !=USB_STATE_ADDRESS ) +usb_disable_device (dev,1 );/* Skip ep0 */ + +/* Get rid of pending async Set-Config requests for this device */ +cancel_async_set_config (dev); +/* Make sure we have bandwidth (and available HCD resources) for this * configuration. Remove endpoints from the schedule if we're dropping * this configuration to set configuration 0. After this point, the
@@ -1733,20 +1742,11 @@ free_interfaces:mutex_lock (&hcd->bandwidth_mutex); ret =usb_hcd_alloc_bandwidth (dev, cp,NULL ,NULL );if (ret <0 ) { -usb_autosuspend_device (dev);mutex_unlock (&hcd->bandwidth_mutex); +usb_autosuspend_device (dev); goto free_interfaces; } -/* if it's already configured, clear out old state first. -* getting rid of old interfaces means unbinding their drivers. -*/ -if (dev->state !=USB_STATE_ADDRESS ) -usb_disable_device (dev,1 );/* Skip ep0 */ - -/* Get rid of pending async Set-Config requests for this device */ -cancel_async_set_config (dev); - ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ),USB_REQ_SET_CONFIGURATION ,0 , configuration,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -1761,8 +1761,8 @@ free_interfaces:if (!cp) {usb_set_device_state (dev,USB_STATE_ADDRESS );usb_hcd_alloc_bandwidth (dev,NULL ,NULL ,NULL ); -usb_autosuspend_device (dev);mutex_unlock (&hcd->bandwidth_mutex); +usb_autosuspend_device (dev); goto free_interfaces; }mutex_unlock (&hcd->bandwidth_mutex);
PATCH 43/129 USB: ftdi_sio: Added custom PIDs for ChamSys products
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Luke Lowrey <[email protected]>
commit 657373883417b2618023fd4135d251ba06a2c30a upstream.
Added the 0xDAF8 to 0xDAFF PID range for ChamSys limited USB interface/wing products
--- drivers/usb/serial/ftdi_sio.c | 8 ++++++++ drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++++++++ 2 files changed, 20 insertions(+)
drivers/usb/serial/ftdi_sio.c +8 -0
@@ -753,6 +753,14 @@ static struct usb_device_id id_table_com { USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) }, { USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_PC_WING_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_USB_DMX_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MIDI_TIMECODE_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MINI_WING_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +12 -0
@@ -135,6 +135,18 @@#define FTDI_NDI_AURORA_SCU_PID 0xDA74/* NDI Aurora SCU */ /* +* ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs +*/ +#define FTDI_CHAMSYS_24_MASTER_WING_PID 0xDAF8 +#define FTDI_CHAMSYS_PC_WING_PID 0xDAF9 +#define FTDI_CHAMSYS_USB_DMX_PID 0xDAFA +#define FTDI_CHAMSYS_MIDI_TIMECODE_PID 0xDAFB +#define FTDI_CHAMSYS_MINI_WING_PID 0xDAFC +#define FTDI_CHAMSYS_MAXI_WING_PID 0xDAFD +#define FTDI_CHAMSYS_MEDIA_WING_PID 0xDAFE +#define FTDI_CHAMSYS_WING_PID 0xDAFF + +/* * Westrex International devices submitted by Cory Lee */ #define FTDI_WESTREX_MODEL_777_PID 0xDC00/* Model 777 */
PATCH 44/129 usb: serial: mos7840: Add USB ID to support the B&B Electronics USOPTL4-2P.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dave Ludlow <[email protected]>
commit caf3a636a9f809fdca5fa746e6687096457accb1 upstream.
Add the USB ID needed to support B&B Electronic's 2-port, optically-isolated, powered, USB to RS485 converter.
--- drivers/usb/serial/mos7840.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/mos7840.c +3 -0
@@ -129,6 +129,7 @@#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24 +#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02/* This driver also supports * ATEN UC2324 device using Moschip MCS7840
@@ -192,6 +193,7 @@ static const struct usb_device_id moschi {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, {} /* terminating entry */
@@ -209,6 +211,7 @@ static const struct usb_device_id moschi {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, {} /* terminating entry */
PATCH 45/129 usb: serial: mos7840: Add USB IDs to support more B&B USB/RS485 converters.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dave Ludlow <[email protected]>
commit 870408c8291015872a7a0b583673a9e56b3e73f4 upstream.
Add the USB IDs needed to support the B&B USOPTL4-4P, USO9ML2-2P, and USO9ML2-4P. This patch expands and corrects a typo in the patch sent on 08-31-2010.
--- drivers/usb/serial/mos7840.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
drivers/usb/serial/mos7840.c +22 -13
@@ -119,17 +119,20 @@* by making a change here, in moschip_port_id_table, and in * moschip_id_table_combined */ -#define USB_VENDOR_ID_BANDB 0x0856 -#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22 -#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24 -#define BANDB_DEVICE_ID_US9ML2_2 0xAC29 -#define BANDB_DEVICE_ID_US9ML2_4 0xAC30 -#define BANDB_DEVICE_ID_USPTL4_2 0xAC31 -#define BANDB_DEVICE_ID_USPTL4_4 0xAC32 -#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 -#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 -#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24 -#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02 +#define USB_VENDOR_ID_BANDB 0x0856 +#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22 +#define BANDB_DEVICE_ID_USO9ML2_2P 0xBC00 +#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24 +#define BANDB_DEVICE_ID_USO9ML2_4P 0xBC01 +#define BANDB_DEVICE_ID_US9ML2_2 0xAC29 +#define BANDB_DEVICE_ID_US9ML2_4 0xAC30 +#define BANDB_DEVICE_ID_USPTL4_2 0xAC31 +#define BANDB_DEVICE_ID_USPTL4_4 0xAC32 +#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 +#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02 +#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 +#define BANDB_DEVICE_ID_USOPTL4_4P 0xBC03 +#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24/* This driver also supports * ATEN UC2324 device using Moschip MCS7840
@@ -185,15 +188,18 @@ static const struct usb_device_id moschi {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)}, {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, {} /* terminating entry */
@@ -203,15 +209,18 @@ static const struct usb_device_id moschi {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)}, {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, + {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P)}, {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, {} /* terminating entry */
PATCH 46/129 ima: always maintain counters
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Mimi Zohar <[email protected]>
commit e950598d43dce8d97e7d5270808393425d1e5cbd upstream.
commit 8262bb85da allocated the inode integrity struct (iint) before any inodes were created. Only after IMA was initialized in late_initcall were the counters updated. This patch updates the counters, whether or not IMA has been initialized, to resolve 'imbalance' messages.
This patch fixes the bug as reported in bugzilla: 15673. When the i915 is builtin, the ring_buffer is initialized before IMA, causing the imbalance message on suspend.
--- security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_iint.c | 4 +++- security/integrity/ima/ima_main.c | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-)
security/integrity/ima/ima.h +1 -0
@@ -35,6 +35,7 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 =#define IMA_MEASURE_HTABLE_SIZE (1 << IMA_HASH_BITS)/* set during initialization */ +extern int iint_initialized;extern int ima_initialized;extern int ima_used_chip;extern char *ima_hash;
security/integrity/ima/ima_iint.c +3 -1
@@ -22,9 +22,10 @@RADIX_TREE (ima_iint_store,GFP_ATOMIC );DEFINE_SPINLOCK (ima_iint_lock); -static struct kmem_cache *iint_cache__read_mostly ; +int iint_initialized =0 ; +/* ima_iint_find_get - return the iint associated with an inode * * ima_iint_find_get gets a reference to the iint. Caller must
@@ -141,6 +142,7 @@ static int __init ima_iintcache_init(voi iint_cache =kmem_cache_create ("iint_cache" ,sizeof (struct ima_iint_cache ),0 ,SLAB_PANIC , init_once); + iint_initialized =1 ;return 0 ; }security_initcall (ima_iintcache_init);
security/integrity/ima/ima_main.c +5 -3
@@ -148,12 +148,14 @@ void ima_counts_get(struct file *file)struct ima_iint_cache *iint;int rc; -if (!ima_initialized || !S_ISREG (inode->i_mode)) +if (!iint_initialized || !S_ISREG (inode->i_mode))return ; iint =ima_iint_find_get (inode);if (!iint)return ;mutex_lock (&iint->mutex); +if (!ima_initialized) + goto out; rc =ima_must_measure (iint, inode,MAY_READ ,FILE_CHECK );if (rc <0 ) goto out;
@@ -213,7 +215,7 @@ void ima_file_free(struct file *file)struct inode *inode = file->f_dentry->d_inode;struct ima_iint_cache *iint; -if (!ima_initialized || !S_ISREG (inode->i_mode)) +if (!iint_initialized || !S_ISREG (inode->i_mode))return ; iint =ima_iint_find_get (inode);if (!iint)
@@ -230,7 +232,7 @@ static int process_measurement(struct fi {struct inode *inode = file->f_dentry->d_inode;struct ima_iint_cache *iint; -int rc; +int rc =0 ;if (!ima_initialized || !S_ISREG (inode->i_mode))return 0 ;
PATCH 47/129 USB: cxacru: Use a bulk/int URB to access the command endpoint
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Simon Arlott <[email protected]>
commit 902ffc3c707c1d459ea57428a619a807cbe412f9 upstream.
The command endpoint is either a bulk or interrupt endpoint, but using the wrong type of transfer causes an error if CONFIG_USB_DEBUG is enabled after commit f661c6f8c67bd55e93348f160d590ff9edf08904, which checks for this mismatch.
Detect which type of endpoint it is and use a bulk/int URB as appropriate. There are other function calls specifying a bulk pipe, but usb_clear_halt doesn't use the pipe type (only the endpoint) and usb_bulk_msg auto-detects interrupt transfers.
--- drivers/usb/atm/cxacru.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/usb/atm/cxacru.c +22 -2
@@ -1128,6 +1128,7 @@ static int cxacru_bind(struct usbatm_dat {struct cxacru_data *instance;struct usb_device *usb_dev =interface_to_usbdev (intf); +struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD ];int ret;/* instance init */
@@ -1172,15 +1173,34 @@ static int cxacru_bind(struct usbatm_dat goto fail; } -usb_fill_int_urb (instance->rcv_urb, +if (!cmd_ep) { +dbg ("cxacru_bind: no command endpoint" ); + ret = -ENODEV ; + goto fail; + } + +if ((cmd_ep->desc.bmAttributes &USB_ENDPOINT_XFERTYPE_MASK ) + ==USB_ENDPOINT_XFER_INT ) { +usb_fill_int_urb (instance->rcv_urb, usb_dev,usb_rcvintpipe (usb_dev,CXACRU_EP_CMD ), instance->rcv_buf,PAGE_SIZE , cxacru_blocking_completion, &instance->rcv_done,1 ); -usb_fill_int_urb (instance->snd_urb, +usb_fill_int_urb (instance->snd_urb, usb_dev,usb_sndintpipe (usb_dev,CXACRU_EP_CMD ), instance->snd_buf,PAGE_SIZE , cxacru_blocking_completion, &instance->snd_done,4 ); + }else { +usb_fill_bulk_urb (instance->rcv_urb, + usb_dev,usb_rcvbulkpipe (usb_dev,CXACRU_EP_CMD ), + instance->rcv_buf,PAGE_SIZE , + cxacru_blocking_completion, &instance->rcv_done); + +usb_fill_bulk_urb (instance->snd_urb, + usb_dev,usb_sndbulkpipe (usb_dev,CXACRU_EP_CMD ), + instance->snd_buf,PAGE_SIZE , + cxacru_blocking_completion, &instance->snd_done); + }mutex_init (&instance->cm_serialize);
PATCH 48/129 USB: cdc-acm: Adding second ACM channel support for various Nokia and one Samsung phones
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Toby Gray <[email protected]>
commit 4035e45632c2a8bb4edae83c20447051bd9a9604 upstream.
S60 phones from Nokia and Samsung expose two ACM channels. The first is a modem with a standard AT-command interface, which is picked up correctly by CDC-ACM.
The second ACM port is marked as having a vendor-specific protocol. This means that the ACM driver will not claim the second channel by default.
This adds support for the second ACM channel for the following devices:
Nokia E63
Nokia E75
Nokia 6760 Slide
Nokia E52
Nokia E55
Nokia E72
Nokia X6
Nokia N97 Mini
Nokia 5800 Xpressmusic
Nokia E90
Samsung GTi8510 (INNOV8)
--- drivers/usb/class/cdc-acm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/usb/class/cdc-acm.c +16 -0
@@ -1487,6 +1487,11 @@ static int acm_reset_resume(struct usb_i USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \ USB_CDC_ACM_PROTO_VENDOR) +#define SAMSUNG_PCSUITE_ACM_INFO (x) \ + USB_DEVICE_AND_INTERFACE_INFO(0x04e7, x, \ + USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \ + USB_CDC_ACM_PROTO_VENDOR) +/* * USB driver structure. */
@@ -1597,6 +1602,17 @@ static const struct usb_device_id acm_id { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */ { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */ { NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */ + { NOKIA_PCSUITE_ACM_INFO(0x0178), }, /* Nokia E63 */ + { NOKIA_PCSUITE_ACM_INFO(0x010e), }, /* Nokia E75 */ + { NOKIA_PCSUITE_ACM_INFO(0x02d9), }, /* Nokia 6760 Slide */ + { NOKIA_PCSUITE_ACM_INFO(0x01d0), }, /* Nokia E52 */ + { NOKIA_PCSUITE_ACM_INFO(0x0223), }, /* Nokia E72 */ + { NOKIA_PCSUITE_ACM_INFO(0x0275), }, /* Nokia X6 */ + { NOKIA_PCSUITE_ACM_INFO(0x026c), }, /* Nokia N97 Mini */ + { NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */ + { NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */ + { NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */ + { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) *//* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
PATCH 49/129 USB: cdc-acm: Add pseudo modem without AT command capabilities
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Philippe Corbes <[email protected]>
commit 5b239f0aebd4dd6f85b13decf5e18e86e35d57f0 upstream.
cdc-acm.c : Manage pseudo-modem without AT commands capabilities
Enable to drive electronic simple gadgets based on microcontrolers. The Interface descriptor is like this:
bInterfaceClass 2 Communications
bInterfaceSubClass 2 Abstract (modem)
bInterfaceProtocol 0 None--- drivers/usb/class/cdc-acm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/class/cdc-acm.c +4 -0
@@ -1621,6 +1621,10 @@ static const struct usb_device_id acm_id .driver_info = NOT_A_MODEM, }, +/* control interfaces without any protocol set */ + {USB_INTERFACE_INFO (USB_CLASS_COMM ,USB_CDC_SUBCLASS_ACM , + USB_CDC_PROTO_NONE) }, +/* control interfaces with various AT-command sets */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, USB_CDC_ACM_PROTO_AT_V25TER) },
PATCH 50/129 USB: cdc-acm: Fixing crash when ACM probing interfaces with no endpoint descriptors.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Toby Gray <[email protected]>
commit 577045c0a76e34294f902a7d5d60e90b04d094d0 upstream.
Certain USB devices, such as the Nokia X6 mobile phone, don't expose any endpoint descriptors on some of their interfaces. If the ACM driver is forced to probe all interfaces on a device the a NULL pointer dereference will occur when the ACM driver attempts to use the endpoint of the alternative settings. One way to get the ACM driver to probe all the interfaces is by using the /sys/bus/usb/drivers/cdc_acm/new_id interface.
This patch checks that the endpoint pointer for the current alternate settings is non-NULL before using it.
--- drivers/usb/class/cdc-acm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/class/cdc-acm.c +2 -1
@@ -971,7 +971,8 @@ static int acm_probe(struct usb_interfac }if (!buflen) { -if (intf->cur_altsetting->endpoint->extralen && +if (intf->cur_altsetting->endpoint && + intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {dev_dbg (&intf->dev,"Seeking extra descriptors on endpoint\n" );
PATCH 51/129 ALSA: hda - Add a new hp-laptop model for Conexant 5066, tested on HP G60
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <[email protected]>
commit 048e78a5bc22c27410cb5ca9680c3c7ac400607f upstream.
This new model adds the following functionality to HP G60:
- Automute of internal speakers
- Autoswitch of internal/external mics
- Remove SPDIF not physically present
--- Documentation/sound/alsa/HD-Audio-Models.txt | 1 sound/pci/hda/patch_conexant.c | 57 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
@@ -288,6 +288,7 @@ Conexant 5051 Conexant 5066 ============= laptop Basic Laptop config (default) + hp-laptop HP laptops, e g G60 dell-laptop Dell laptops olpc-xo-1_5 OLPC XO 1.5 ideapad Lenovo IdeaPad U150
sound/pci/hda/patch_conexant.c +57 -0
111 lines not on this page · raw message
PATCH 52/129 ALSA: usb-audio: fix detection of vendor-specific device protocol settings
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Clemens Ladisch <[email protected]>
commit a2acad8298a42b7be684a32fafaf83332bba9c2b upstream.
The Audio Class v2 support code in 2.6.35 added checks for the bInterfaceProtocol field. However, there are devices (usually those detected by vendor-specific quirks) that do not have one of the predefined values in this field, which made the driver reject them.
To fix this regression, restore the old behaviour, i.e., assume that a device with an unknown bInterfaceProtocol field (other than UAC_VERSION_2) has more or less UAC-v1-compatible descriptors.
[compile warning fixes by tiwai]
--- sound/usb/card.c | 9 +++++---- sound/usb/clock.c | 3 +-- sound/usb/endpoint.c | 11 ++++++----- sound/usb/format.c | 14 ++++++++++---- sound/usb/mixer.c | 10 +++++++++- sound/usb/pcm.c | 3 +-- 6 files changed, 32 insertions(+), 18 deletions(-)
sound/usb/card.c +5 -4
@@ -216,6 +216,11 @@ static int snd_usb_create_streams(struct }switch (protocol) { +default : +snd_printdd (KERN_WARNING "unknown interface protocol %#02x, assuming v1\n" , + protocol); +/* fall through */ +case UAC_VERSION_1 : {struct uac_ac_header_descriptor_v1 *h1 = control_header;
@@ -253,10 +258,6 @@ static int snd_usb_create_streams(structbreak ; } - -default : -snd_printk (KERN_ERR "unknown protocol version 0x%02x\n" , protocol); -return -EINVAL ; }return 0 ;
sound/usb/clock.c +1 -2
@@ -304,12 +304,11 @@ int snd_usb_init_sample_rate(struct snd_switch (altsd->bInterfaceProtocol) {case UAC_VERSION_1 : +default :return set_sample_rate_v1 (chip, iface, alts, fmt, rate);case UAC_VERSION_2 :return set_sample_rate_v2 (chip, iface, alts, fmt, rate); } - -return -EINVAL ; }
sound/usb/endpoint.c +6 -5
@@ -274,6 +274,12 @@ int snd_usb_parse_audio_endpoints(struct/* get audio formats */ switch (protocol) { +default : +snd_printdd (KERN_WARNING "%d:%u:%d: unknown interface protocol %#02x, assuming v1\n" , + dev->devnum, iface_no, altno, protocol); + protocol =UAC_VERSION_1 ; +/* fall through */ +case UAC_VERSION_1 : {struct uac_as_header_descriptor_v1 *as =snd_usb_find_csint_desc (alts->extra, alts->extralen,NULL ,UAC_AS_GENERAL );
@@ -335,11 +341,6 @@ int snd_usb_parse_audio_endpoints(struct dev->devnum, iface_no, altno, as->bTerminalLink);continue ; } - -default : -snd_printk (KERN_ERR "%d:%u:%d : unknown interface protocol %04x\n" , - dev->devnum, iface_no, altno, protocol); -continue ; }/* get format type */
sound/usb/format.c +10 -4
@@ -49,7 +49,8 @@ static u64 parse_audio_format_i_type(stru64 pcm_formats;switch (protocol) { -case UAC_VERSION_1 : { +case UAC_VERSION_1 : +default : {struct uac_format_type_i_discrete_descriptor *fmt = _fmt; sample_width = fmt->bBitResolution; sample_bytes = fmt->bSubframeSize;
@@ -64,9 +65,6 @@ static u64 parse_audio_format_i_type(str format <<=1 ;break ; } - -default : -return -EINVAL ; } pcm_formats =0 ;
@@ -385,6 +383,10 @@ static int parse_audio_format_i(struct s* audio class v2 uses class specific EP0 range requests for that. */ switch (protocol) { +default : +snd_printdd (KERN_WARNING "%d:%u:%d : invalid protocol version %d, assuming v1\n" , + chip->dev->devnum, fp->iface, fp->altsetting, protocol); +/* fall through */ case UAC_VERSION_1 : fp->channels = fmt->bNrChannels; ret =parse_audio_format_rates_v1 (chip, fp, (unsigned char *) fmt,7 );
@@ -435,6 +437,10 @@ static int parse_audio_format_ii(struct fp->channels =1 ;switch (protocol) { +default : +snd_printdd (KERN_WARNING "%d:%u:%d : invalid protocol version %d, assuming v1\n" , + chip->dev->devnum, fp->iface, fp->altsetting, protocol); +/* fall through */ case UAC_VERSION_1 : {struct uac_format_type_ii_discrete_descriptor *fmt = _fmt; brate =le16_to_cpu (fmt->wMaxBitRate);
sound/usb/mixer.c +9 -1
@@ -2168,7 +2168,15 @@ int snd_usb_create_mixer(struct snd_usb_ } host_iface = &usb_ifnum_to_if (chip->dev, ctrlif)->altsetting[0 ]; - mixer->protocol =get_iface_desc (host_iface)->bInterfaceProtocol; +switch (get_iface_desc (host_iface)->bInterfaceProtocol) { +case UAC_VERSION_1 : +default : + mixer->protocol =UAC_VERSION_1 ; +break ; +case UAC_VERSION_2 : + mixer->protocol =UAC_VERSION_2 ; +break ; + }if ((err =snd_usb_mixer_controls (mixer)) <0 || (err =snd_usb_mixer_status_create (mixer)) <0 )
sound/usb/pcm.c +1 -2
@@ -173,13 +173,12 @@ int snd_usb_init_pitch(struct snd_usb_auswitch (altsd->bInterfaceProtocol) {case UAC_VERSION_1 : +default :return init_pitch_v1 (chip, iface, alts, fmt);case UAC_VERSION_2 :return init_pitch_v2 (chip, iface, alts, fmt); } - -return -EINVAL ; }/*
PATCH 53/129 ALSA: virtuoso: work around missing reset in the Xonar DS Windows driver
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Clemens Ladisch <[email protected]>
commit 4c25b93223340deff73381cc47f9244fb379a74d upstream.
For the WM8776 chip, this driver uses a different sample format and more features than the Windows driver. When rebooting from Linux into Windows, the latter driver does not reset the chip but assumes all its registers have their default settings, so we get garbled sound or, if the output happened to be muted before rebooting, no sound.
To make that driver happy, hook our driver's cleanup function into the shutdown notifier and ensure that the chip gets reset.
--- sound/pci/oxygen/oxygen.h | 1 + sound/pci/oxygen/oxygen_lib.c | 21 ++++++++++++++++++--- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_wm87x6.c | 1 + 4 files changed, 21 insertions(+), 3 deletions(-)
sound/pci/oxygen/oxygen.h +1 -0
@@ -155,6 +155,7 @@ void oxygen_pci_remove(struct pci_dev *pint oxygen_pci_suspend (struct pci_dev *pci,pm_message_t state);int oxygen_pci_resume (struct pci_dev *pci);#endif +void oxygen_pci_shutdown (struct pci_dev *pci);/* oxygen_mixer.c */
sound/pci/oxygen/oxygen_lib.c +18 -3
@@ -519,16 +519,21 @@ static void oxygen_init(struct oxygen *c } } -static void oxygen_card_free (struct snd_card *card) +static void oxygen_shutdown (struct oxygen *chip) { -struct oxygen *chip = card->private_data; -spin_lock_irq (&chip->reg_lock); chip->interrupt_mask =0 ; chip->pcm_running =0 ;oxygen_write16 (chip,OXYGEN_DMA_STATUS ,0 );oxygen_write16 (chip,OXYGEN_INTERRUPT_MASK ,0 );spin_unlock_irq (&chip->reg_lock); +} + +static void oxygen_card_free (struct snd_card *card) +{ +struct oxygen *chip = card->private_data; + +oxygen_shutdown (chip);if (chip->irq >=0 )free_irq (chip->irq, chip);flush_scheduled_work ();
@@ -778,3 +783,13 @@ int oxygen_pci_resume(struct pci_dev *pc }EXPORT_SYMBOL (oxygen_pci_resume);#endif /* CONFIG_PM */ + +void oxygen_pci_shutdown (struct pci_dev *pci) +{ +struct snd_card *card =pci_get_drvdata (pci); +struct oxygen *chip = card->private_data; + +oxygen_shutdown (chip); + chip->model.cleanup (chip); +} +EXPORT_SYMBOL (oxygen_pci_shutdown);
sound/pci/oxygen/virtuoso.c +1 -0
@@ -95,6 +95,7 @@ static struct pci_driver xonar_driver = .suspend = oxygen_pci_suspend, .resume = oxygen_pci_resume, #endif + .shutdown = oxygen_pci_shutdown, };static int __init alsa_card_xonar_init (void )
sound/pci/oxygen/xonar_wm87x6.c +1 -0
@@ -193,6 +193,7 @@ static void xonar_ds_init(struct oxygenstatic void xonar_ds_cleanup (struct oxygen *chip) {xonar_disable_output (chip); +wm8776_write (chip,WM8776_RESET ,0 ); }static void xonar_ds_suspend (struct oxygen *chip)
PATCH 54/129 ALSA: virtuoso: fix setting of Xonar DS line-in/mic-in controls
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Clemens Ladisch <[email protected]>
commit fe6ce80ae25953d95ebaf9bce27b585218cda25c upstream.
The Line and Mic inputs cannot be used at the same time, so the driver has to automatically disable one of them if both are set. However, it forgot to notify userspace about this change, so the mixer state would be inconsistent. To fix this, check if the other control gets muted, and send a notification event in this case.
--- sound/pci/oxygen/xonar_wm87x6.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
sound/pci/oxygen/xonar_wm87x6.c +20 -1
@@ -53,6 +53,8 @@ struct xonar_wm87x6 {struct xonar_generic generic;u16 wm8776_regs[0x17 ];u16 wm8766_regs[0x10 ]; +struct snd_kcontrol *line_adcmux_control; +struct snd_kcontrol *mic_adcmux_control;struct snd_kcontrol *lc_controls[13 ]; };
@@ -604,6 +606,7 @@ static int wm8776_input_mux_put(struct s {struct oxygen *chip = ctl->private_data;struct xonar_wm87x6 *data = chip->model_data; +struct snd_kcontrol *other_ctl;unsigned int mux_bit = ctl->private_value;u16 reg;int changed;
@@ -611,8 +614,18 @@ static int wm8776_input_mux_put(struct smutex_lock (&chip->mutex); reg = data->wm8776_regs[WM8776_ADCMUX ];if (value->value.integer.value[0 ]) { - reg &= ~0x003 ; reg |= mux_bit; +/* line-in and mic-in are exclusive */ + mux_bit ^=3 ; +if (reg & mux_bit) { + reg &= ~mux_bit; +if (mux_bit ==1 ) + other_ctl = data->line_adcmux_control; +else + other_ctl = data->mic_adcmux_control; +snd_ctl_notify (chip->card,SNDRV_CTL_EVENT_MASK_VALUE , + &other_ctl->id); + } }else reg &= ~mux_bit; changed = reg != data->wm8776_regs[WM8776_ADCMUX ];
@@ -964,7 +977,13 @@ static int xonar_ds_mixer_init(struct ox err =snd_ctl_add (chip->card, ctl);if (err <0 )return err; +if (!strcmp (ctl->id.name,"Line Capture Switch" )) + data->line_adcmux_control = ctl; +else if (!strcmp (ctl->id.name,"Mic Capture Switch" )) + data->mic_adcmux_control = ctl; } +if (!data->line_adcmux_control || !data->mic_adcmux_control) +return -ENXIO ;BUILD_BUG_ON (ARRAY_SIZE (lc_controls) !=ARRAY_SIZE (data->lc_controls));for (i =0 ; i <ARRAY_SIZE (lc_controls); ++i) { ctl =snd_ctl_new1 (&lc_controls[i], chip);
PATCH 55/129 ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit 27f7ad53829f79e799a253285318bff79ece15bd upstream.
The error handling in snd_seq_oss_open() has several bad codes that do dereferecing released pointers and double-free of kmalloc'ed data. The object dp is release in free_devinfo() that is called via private_free callback. The rest shouldn't touch this object any more.
The patch changes delete_port() to call kfree() in any case, and gets rid of unnecessary calls of destructors in snd_seq_oss_open().
Fixes CVE-2010-3080.
--- sound/core/seq/oss/seq_oss_init.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
sound/core/seq/oss/seq_oss_init.c +4 -5
@@ -281,13 +281,10 @@ snd_seq_oss_open(struct file *file, intreturn 0 ; _error: -snd_seq_oss_writeq_delete (dp->writeq); -snd_seq_oss_readq_delete (dp->readq);snd_seq_oss_synth_cleanup (dp);snd_seq_oss_midi_cleanup (dp); -delete_port (dp);delete_seq_queue (dp->queue); -kfree (dp); +delete_port (dp);return rc; }
@@ -350,8 +347,10 @@ create_port(struct seq_oss_devinfo *dp)static int delete_port (struct seq_oss_devinfo *dp) { -if (dp->port <0 ) +if (dp->port <0 ) { +kfree (dp);return 0 ; + }debug_printk (("delete_port %i\n" , dp->port));return snd_seq_event_port_detach (dp->cseq, dp->port);
PATCH 56/129 ALSA: usb - Release capture substream URBs properly
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit 76195fb096ca6db2f8bbaffb96e3025aaf1649a0 upstream.
Due to the wrong "return" in the loop, a capture substream won't be released at disconnection properly if the device is capture only and has no playback substream. This caused Oops occasionally at the device reconnection.
--- sound/usb/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/card.c +1 -1
@@ -126,7 +126,7 @@ static void snd_usb_stream_disconnect(stfor (idx =0 ; idx <2 ; idx++) { subs = &as->substream[idx];if (!subs->num_formats) -return ; +continue ;snd_usb_release_substream_urbs (subs,1 ); subs->interface =-1 ; }
PATCH 57/129 ALSA: hda - Add quirk for Lenovo T400s
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit 4d155641c81203440da64c4633b4efaab75f63b3 upstream.
Lenovo T400s requires the quirk to make automatic HP/mic switching working.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -3015,6 +3015,7 @@ static struct snd_pci_quirk cxt5066_cfg_SND_PCI_QUIRK (0x103c ,0x360b ,"HP G60" ,CXT5066_HP_LAPTOP ),SND_PCI_QUIRK (0x1179 ,0xff50 ,"Toshiba Satellite P500-PSPGSC-01800T" ,CXT5066_OLPC_XO_1_5 ),SND_PCI_QUIRK (0x1179 ,0xffe0 ,"Toshiba Satellite Pro T130-15F" ,CXT5066_OLPC_XO_1_5 ), +SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Lenovo T400s" ,CXT5066_THINKPAD ),SND_PCI_QUIRK (0x17aa ,0x21b2 ,"Thinkpad X100e" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x21b3 ,"Thinkpad Edge 13 (197)" ,CXT5066_IDEAPAD ), SND_PCI_QUIRK(0x17aa, 0x21b4, "Thinkpad Edge", CXT5066_IDEAPAD),
PATCH 58/129 ALSA: hda - Add errata initverb sequence for CS42xx codecs
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Brian Austin <[email protected]>
commit a769cbcf60cee51f4431c0938acd39e7e5b76b8d upstream.
Add init verb sequence for errata ER880C3
http://www.cirrus.com/en/pubs/errata/ER880C3.pdf
--- sound/pci/hda/patch_cirrus.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
sound/pci/hda/patch_cirrus.c +50 -0
@@ -972,6 +972,53 @@ static struct hda_verb cs_coef_init_verb {}/* terminator */ }; +/* Errata: CS4207 rev C0/C1/C2 Silicon +* +* http://www.cirrus.com/en/pubs/errata/ER880C3.pdf +* +* 6. At high temperature (TA > +85°C), the digital supply current (IVD) +* may be excessive (up to an additional 200 μA), which is most easily +* observed while the part is being held in reset (RESET# active low). +* +* Root Cause: At initial powerup of the device, the logic that drives +* the clock and write enable to the S/PDIF SRC RAMs is not properly +* initialized. +* Certain random patterns will cause a steady leakage current in those +* RAM cells. The issue will resolve once the SRCs are used (turned on). +* +* Workaround: The following verb sequence briefly turns on the S/PDIF SRC +* blocks, which will alleviate the issue. +*/ + +static struct hda_verb cs_errata_init_verbs[] = { + {0x01 ,AC_VERB_SET_POWER_STATE ,0x00 },/* AFG: D0 */ + {0x11 ,AC_VERB_SET_PROC_STATE ,0x01 },/* VPW: processing on */ + + {0x11 ,AC_VERB_SET_COEF_INDEX ,0x0008 }, + {0x11 ,AC_VERB_SET_PROC_COEF ,0x9999 }, + {0x11 ,AC_VERB_SET_COEF_INDEX ,0x0017 }, + {0x11 ,AC_VERB_SET_PROC_COEF ,0xa412 }, + {0x11 ,AC_VERB_SET_COEF_INDEX ,0x0001 }, + {0x11 ,AC_VERB_SET_PROC_COEF ,0x0009 }, + + {0x07 ,AC_VERB_SET_POWER_STATE ,0x00 },/* S/PDIF Rx: D0 */ + {0x08 ,AC_VERB_SET_POWER_STATE ,0x00 },/* S/PDIF Tx: D0 */ + + {0x11 ,AC_VERB_SET_COEF_INDEX ,0x0017 }, + {0x11 ,AC_VERB_SET_PROC_COEF ,0x2412 }, + {0x11 ,AC_VERB_SET_COEF_INDEX ,0x0008 }, + {0x11 ,AC_VERB_SET_PROC_COEF ,0x0000 }, + {0x11 ,AC_VERB_SET_COEF_INDEX ,0x0001 }, + {0x11 ,AC_VERB_SET_PROC_COEF ,0x0008 }, + {0x11 ,AC_VERB_SET_PROC_STATE ,0x00 }, + + {0x07 ,AC_VERB_SET_POWER_STATE ,0x03 },/* S/PDIF Rx: D3 */ + {0x08 ,AC_VERB_SET_POWER_STATE ,0x03 },/* S/PDIF Tx: D3 */ +/*{0x01, AC_VERB_SET_POWER_STATE, 0x03},*/ /* AFG: D3 This is already handled */ + + {}/* terminator */ +}; +/* SPDIF setup */ static void init_digital (struct hda_codec *codec) {
@@ -991,6 +1038,9 @@ static int cs_init(struct hda_codec *cod {struct cs_spec *spec = codec->spec; +/* init_verb sequence for C0/C1/C2 errata*/ +snd_hda_sequence_write (codec, cs_errata_init_verbs); +snd_hda_sequence_write (codec, cs_coef_init_verbs);if (spec->gpio_mask) {
PATCH 59/129 ALSA: hda - Fix wrong HP pin detection in snd_hda_parse_pin_def_config()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit 122661b67899980f1372812d907e73ebcfb3d037 upstream.
snd_hda_parse_pin_def_config() has some workaround for re-assigning some pins declared as headphones to line-outs. This didn't work properly for some cases because it used memmove() stupidly wrongly.
Reference: Novell bnc#637263
https://bugzilla.novell.com/show_bug.cgi?id=637263
--- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_codec.c +1 -1
@@ -4360,7 +4360,7 @@ int snd_hda_parse_pin_def_config(struct cfg->hp_outs--;memmove (cfg->hp_pins + i, cfg->hp_pins + i +1 ,sizeof (cfg->hp_pins[0 ]) * (cfg->hp_outs - i)); -memmove (sequences_hp + i -1 , sequences_hp + i, +memmove (sequences_hp + i, sequences_hp + i +1 ,sizeof (sequences_hp[0 ]) * (cfg->hp_outs - i)); } }
PATCH 60/129 ALSA: usb-audio: Assume first control interface is for audio
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Daniel Mack <[email protected]>
commit 7b6717e144de6592e614fd7fc3b914b6bf686a9d upstream.
For devices with more than one control interface, let's assume the first one contains the audio controls. Unfortunately, there is no field in any of the descriptors to tell us whether a control interface is for audio or MIDI controls, so a better check is not easy to implement.
On a composite device with audio and MIDI functions, for example, the code currently overwrites chip->ctrl_intf, causing operations on the control interface to fail if they are issued after the device probe.
--- sound/usb/card.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
sound/usb/card.c +7 -1
@@ -466,7 +466,13 @@ static void *snd_usb_audio_probe(struct goto __error; } - chip->ctrl_intf = alts; +/* +* For devices with more than one control interface, we assume the +* first contains the audio controls. We might need a more specific +* check here in the future. +*/ +if (!chip->ctrl_intf) + chip->ctrl_intf = alts;if (err >0 ) {/* create normal USB audio interfaces */
PATCH 61/129 ALSA: hda - patch_nvhdmi.c: Add missing codec IDs, unify names
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Stephen Warren <[email protected]>
commit 9cf2657d05f9f9e04c3e113d68bf7cef5a942070 upstream.
* Add missing codec IDs.
* Modify some existing codec names for discrete GPUs to match newly added IDs. Note: existing names were a mixture of marketing and engineering GPU names. Equally, there's no reason that codec IDs have to be specific to a particular GPU or board, so identify codecs in a less marketing-oriented fashion.
* Reformat codec ID table so it's easier to read, for me at least.
--- sound/pci/hda/patch_nvhdmi.c | 61 ++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 20 deletions(-)
sound/pci/hda/patch_nvhdmi.c +41 -20
@@ -541,26 +541,32 @@ static int patch_nvhdmi_2ch(struct hda_c* patch entries */ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { - { .id =0x10de0002 , .name ="MCP77/78 HDMI" , - .patch = patch_nvhdmi_8ch_7x }, - { .id =0x10de0003 , .name ="MCP77/78 HDMI" , - .patch = patch_nvhdmi_8ch_7x }, - { .id =0x10de0005 , .name ="MCP77/78 HDMI" , - .patch = patch_nvhdmi_8ch_7x }, - { .id =0x10de0006 , .name ="MCP77/78 HDMI" , - .patch = patch_nvhdmi_8ch_7x }, - { .id =0x10de0007 , .name ="MCP79/7A HDMI" , - .patch = patch_nvhdmi_8ch_7x }, - { .id =0x10de000a , .name ="GT220 HDMI" , - .patch = patch_nvhdmi_8ch_89 }, - { .id =0x10de000b , .name ="GT21x HDMI" , - .patch = patch_nvhdmi_8ch_89 }, - { .id =0x10de000c , .name ="MCP89 HDMI" , - .patch = patch_nvhdmi_8ch_89 }, - { .id =0x10de000d , .name ="GT240 HDMI" , - .patch = patch_nvhdmi_8ch_89 }, - { .id =0x10de0067 , .name ="MCP67 HDMI" , .patch = patch_nvhdmi_2ch }, - { .id =0x10de8001 , .name ="MCP73 HDMI" , .patch = patch_nvhdmi_2ch }, + { .id =0x10de0002 , .name ="MCP77/78 HDMI" , .patch = patch_nvhdmi_8ch_7x }, + { .id =0x10de0003 , .name ="MCP77/78 HDMI" , .patch = patch_nvhdmi_8ch_7x }, + { .id =0x10de0005 , .name ="MCP77/78 HDMI" , .patch = patch_nvhdmi_8ch_7x }, + { .id =0x10de0006 , .name ="MCP77/78 HDMI" , .patch = patch_nvhdmi_8ch_7x }, + { .id =0x10de0007 , .name ="MCP79/7A HDMI" , .patch = patch_nvhdmi_8ch_7x }, + { .id =0x10de000a , .name ="GPU 0a HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de000b , .name ="GPU 0b HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de000c , .name ="MCP89 HDMI" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de000d , .name ="GPU 0d HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0010 , .name ="GPU 10 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0011 , .name ="GPU 11 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0012 , .name ="GPU 12 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0013 , .name ="GPU 13 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0014 , .name ="GPU 14 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0018 , .name ="GPU 18 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0019 , .name ="GPU 19 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de001a , .name ="GPU 1a HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de001b , .name ="GPU 1b HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de001c , .name ="GPU 1c HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0040 , .name ="GPU 40 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0041 , .name ="GPU 41 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0042 , .name ="GPU 42 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0043 , .name ="GPU 43 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0044 , .name ="GPU 44 HDMI/DP" , .patch = patch_nvhdmi_8ch_89 }, + { .id =0x10de0067 , .name ="MCP67 HDMI" , .patch = patch_nvhdmi_2ch }, + { .id =0x10de8001 , .name ="MCP73 HDMI" , .patch = patch_nvhdmi_2ch }, {}/* terminator */ };
@@ -573,6 +579,21 @@ MODULE_ALIAS("snd-hda-codec-id:10de000a"MODULE_ALIAS ("snd-hda-codec-id:10de000b" );MODULE_ALIAS ("snd-hda-codec-id:10de000c" );MODULE_ALIAS ("snd-hda-codec-id:10de000d" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0010" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0011" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0012" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0013" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0014" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0018" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0019" ); +MODULE_ALIAS ("snd-hda-codec-id:10de001a" ); +MODULE_ALIAS ("snd-hda-codec-id:10de001b" ); +MODULE_ALIAS ("snd-hda-codec-id:10de001c" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0040" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0041" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0042" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0043" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0044" );MODULE_ALIAS ("snd-hda-codec-id:10de0067" );MODULE_ALIAS ("snd-hda-codec-id:10de8001" );
PATCH 62/129 swap: prevent reuse during hibernation
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit b73d7fcecd93dc15eaa3c45c8c587b613f6673c4 upstream.
Move the hibernation check from scan_swap_map() into try_to_free_swap():
to catch not only the common case when hibernation's allocation itself triggers swap reuse, but also the less likely case when concurrent page reclaim (shrink_page_list) might happen to try_to_free_swap from a page.
Hibernation already clears __GFP_IO from the gfp_allowed_mask, to stop reclaim from going to swap: check that to prevent swap reuse too.
--- mm/swapfile.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
mm/swapfile.c +20 -4
@@ -318,10 +318,8 @@ checks:if (offset > si->highest_bit) scan_base = offset = si->lowest_bit; -/* reuse swap entry of cache-only swap if not hibernation. */ -if (vm_swap_full () - && usage ==SWAP_HAS_CACHE - && si->swap_map[offset] ==SWAP_HAS_CACHE ) { +/* reuse swap entry of cache-only swap if not busy. */ +if (vm_swap_full () && si->swap_map[offset] ==SWAP_HAS_CACHE ) {int swap_was_freed;spin_unlock (&swap_lock); swap_was_freed =__try_to_reclaim_swap (si, offset);
@@ -688,6 +686,24 @@ int try_to_free_swap(struct page *page)if (page_swapcount (page))return 0 ; +/* +* Once hibernation has begun to create its image of memory, +* there's a danger that one of the calls to try_to_free_swap() +* - most probably a call from __try_to_reclaim_swap() while +* hibernation is allocating its own swap pages for the image, +* but conceivably even a call from memory reclaim - will free +* the swap from a page which has already been recorded in the +* image as a clean swapcache page, and then reuse its swap for +* another page of the image. On waking from hibernation, the +* original page might be freed under memory pressure, then +* later read back in from swap, now with the wrong data. +* +* Hibernation clears bits from gfp_allowed_mask to prevent +* memory reclaim from writing to disk, so check that here. +*/ +if (!(gfp_allowed_mask & __GFP_IO)) +return 0 ; +delete_from_swap_cache (page);SetPageDirty (page);return 1 ;
PATCH 63/129 swap: discard while swapping only if SWAP_FLAG_DISCARD
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hugh Dickins <[email protected]>
commit 3399446632739fcd05fd8b272b476a69c6e6d14a upstream.
Tests with recent firmware on Intel X25-M 80GB and OCZ Vertex 60GB SSDs show a shift since I last tested in December: in part because of firmware updates, in part because of the necessary move from barriers to awaiting completion at the block layer. While discard at swapon still shows as slightly beneficial on both, discarding 1MB swap cluster when allocating is now disadvanteous: adds 25% overhead on Intel, adds 230% on OCZ (YMMV).
Surrender: discard as presently implemented is more hindrance than help for swap; but might prove useful on other devices, or with improvements. So continue to do the discard at swapon, but make discard while swapping conditional on a SWAP_FLAG_DISCARD to sys_swapon() (which has been using only the lower 16 bits of int flags).
We can add a --discard or -d to swapon(8), and a "discard" to swap in /etc/fstab: matching the mount option for btrfs, ext4, fat, gfs2, nilfs2.
--- include/linux/swap.h | 3 ++- mm/swapfile.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
include/linux/swap.h +2 -1
@@ -19,6 +19,7 @@ struct bio;#define SWAP_FLAG_PREFER 0x8000/* set if swap priority specified */ #define SWAP_FLAG_PRIO_MASK 0x7fff#define SWAP_FLAG_PRIO_SHIFT 0 +#define SWAP_FLAG_DISCARD 0x10000/* discard swap cluster after use */ static inline int current_is_kswapd (void ) {
@@ -142,7 +143,7 @@ struct swap_extent {enum {SWP_USED = (1 <<0 ),/* is slot in swap_info[] used? */ SWP_WRITEOK = (1 <<1 ),/* ok to write to this swap? */ -SWP_DISCARDABLE = (1 <<2 ),/* blkdev supports discard */ +SWP_DISCARDABLE = (1 <<2 ),/* swapon+blkdev support discard */ SWP_DISCARDING = (1 <<3 ),/* now discarding a free cluster */ SWP_SOLIDSTATE = (1 <<4 ),/* blkdev seeks are cheap */ SWP_CONTINUED = (1 <<5 ),/* swap_map has count continuation */
mm/swapfile.c +1 -1
@@ -2050,7 +2050,7 @@ SYSCALL_DEFINE2(swapon, const char __use p->flags |=SWP_SOLIDSTATE ; p->cluster_next =1 + (random32 () % p->highest_bit); } -if (discard_swap (p) ==0 ) +if (discard_swap (p) ==0 && (swap_flags &SWAP_FLAG_DISCARD )) p->flags |=SWP_DISCARDABLE ; }
PATCH 64/129 swap: do not send discards as barriers
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Christoph Hellwig <[email protected]>
commit 8f2ae0faa3a119158c4dcfe89926d6fad5f5332c upstream.
The swap code already uses synchronous discards, no need to add I/O barriers.
This fixes the worst of the terrible slowdown in swap allocation for hibernation, reported on 2.6.35 by Nigel Cunningham; but does not entirely eliminate that regression.
--- mm/swapfile.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
mm/swapfile.c +3 -6
@@ -139,8 +139,7 @@ static int discard_swap(struct swap_info nr_blocks = ((sector_t )se->nr_pages -1 ) << (PAGE_SHIFT -9 );if (nr_blocks) { err =blkdev_issue_discard (si->bdev, start_block, - nr_blocks,GFP_KERNEL , -BLKDEV_IFL_WAIT |BLKDEV_IFL_BARRIER ); + nr_blocks,GFP_KERNEL ,BLKDEV_IFL_WAIT );if (err)return err;cond_resched ();
@@ -151,8 +150,7 @@ static int discard_swap(struct swap_info nr_blocks = (sector_t )se->nr_pages << (PAGE_SHIFT -9 ); err =blkdev_issue_discard (si->bdev, start_block, - nr_blocks,GFP_KERNEL , -BLKDEV_IFL_WAIT |BLKDEV_IFL_BARRIER ); + nr_blocks,GFP_KERNEL ,BLKDEV_IFL_WAIT );if (err)break ;
@@ -191,8 +189,7 @@ static void discard_swap_cluster(struct start_block <<=PAGE_SHIFT -9 ; nr_blocks <<=PAGE_SHIFT -9 ;if (blkdev_issue_discard (si->bdev, start_block, - nr_blocks,GFP_NOIO ,BLKDEV_IFL_WAIT | -BLKDEV_IFL_BARRIER )) + nr_blocks,GFP_NOIO ,BLKDEV_IFL_WAIT ))break ; }
PATCH 65/129 sysfs: checking for NULL instead of ERR_PTR
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Carpenter <[email protected]>
commit 57f9bdac2510cd7fda58e4a111d250861eb1ebeb upstream.
d_path() returns an ERR_PTR and it doesn't return NULL.
--- fs/sysfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/sysfs/file.c +1 -1
@@ -340,7 +340,7 @@ static int sysfs_open_file(struct inodechar *p; p =d_path (&file->f_path, last_sysfs_file,sizeof (last_sysfs_file)); -if (p) +if (!IS_ERR (p))memmove (last_sysfs_file, p,strlen (p) +1 );/* need attr_sd for attr and ops, its parent for kobj */
PATCH 66/129 oprofile: fix crash when accessing freed task structs
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Robert Richter <[email protected]>
commit 750d857c682f4db60d14722d430c7ccc35070962 upstream.
This patch fixes a crash during shutdown reported below. The crash is caused by accessing already freed task structs. The fix changes the order for registering and unregistering notifier callbacks.
All notifiers must be initialized before buffers start working. To stop buffer synchronization we cancel all workqueues, unregister the notifier callback and then flush all buffers. After all of this we finally can free all tasks listed.
This should avoid accessing freed tasks.
Quoted 18 lines · Benjamin Herrenschmidt
So the initial observation is a spinlock bad magic followed by a crash in the spinlock debug code:
[ 1541.586531] BUG: spinlock bad magic on CPU#5, events/5/136 [ 1541.597564] Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6b6d03Backtrace looks like:
spin_bug+0x74/0xd4 ._raw_spin_lock+0x48/0x184 ._spin_lock+0x10/0x24 .get_task_mm+0x28/0x8c .sync_buffer+0x1b4/0x598 .wq_sync_buffer+0xa0/0xdc .worker_thread+0x1d8/0x2a8 .kthread+0xa8/0xb4 .kernel_thread+0x54/0x70
Quoted 2 lines
So we are accessing a freed task struct in the work queue when processing the samples.
--- drivers/oprofile/buffer_sync.c | 27 ++++++++++++++------------- drivers/oprofile/cpu_buffer.c | 2 -- 2 files changed, 14 insertions(+), 15 deletions(-)
drivers/oprofile/buffer_sync.c +14 -13
@@ -141,16 +141,6 @@ static struct notifier_block module_load .notifier_call = module_load_notify, }; - -static void end_sync (void ) -{ -end_cpu_work (); -/* make sure we don't leak task structs */ -process_task_mortuary (); -process_task_mortuary (); -} - -int sync_start (void ) {int err;
@@ -158,7 +148,7 @@ int sync_start(void)if (!zalloc_cpumask_var (&marked_cpus,GFP_KERNEL ))return -ENOMEM ; -start_cpu_work (); +mutex_lock (&buffer_mutex); err =task_handoff_register (&task_free_nb);if (err)
@@ -173,7 +163,10 @@ int sync_start(void)if (err) goto out4; +start_cpu_work (); + out: +mutex_unlock (&buffer_mutex);return err; out4:profile_event_unregister (PROFILE_MUNMAP , &munmap_nb);
@@ -182,7 +175,6 @@ out3: out2:task_handoff_unregister (&task_free_nb); out1: -end_sync ();free_cpumask_var (marked_cpus); goto out; }
@@ -190,11 +182,20 @@ out1:void sync_stop (void ) { +/* flush buffers */ +mutex_lock (&buffer_mutex); +end_cpu_work ();unregister_module_notifier (&module_load_nb);profile_event_unregister (PROFILE_MUNMAP , &munmap_nb);profile_event_unregister (PROFILE_TASK_EXIT , &task_exit_nb);task_handoff_unregister (&task_free_nb); -end_sync (); +mutex_unlock (&buffer_mutex); +flush_scheduled_work (); + +/* make sure we don't leak task structs */ +process_task_mortuary (); +process_task_mortuary (); +free_cpumask_var (marked_cpus); }
drivers/oprofile/cpu_buffer.c +0 -2
@@ -120,8 +120,6 @@ void end_cpu_work(void)cancel_delayed_work (&b->work); } - -flush_scheduled_work (); }/*
PATCH 67/129 oprofile, x86: fix init_sysfs error handling
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Robert Richter <[email protected]>
commit 10f0412f57f2a76a90eff4376f59cbb0a39e4e18 upstream.
On failure init_sysfs() might not properly free resources. The error code of the function is not checked. And, when reinitializing the exit function might be called twice. This patch fixes all this.
--- arch/x86/oprofile/nmi_int.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
arch/x86/oprofile/nmi_int.c +13 -3
@@ -568,8 +568,13 @@ static int __init init_sysfs(void)int error; error =sysdev_class_register (&oprofile_sysclass); -if (!error) - error =sysdev_register (&device_oprofile); +if (error) +return error; + + error =sysdev_register (&device_oprofile); +if (error) +sysdev_class_unregister (&oprofile_sysclass); +return error; }
@@ -695,6 +700,8 @@ int __init op_nmi_init(struct oprofile_ochar *cpu_type =NULL ;int ret =0 ; + using_nmi =0 ; +if (!cpu_has_apic)return -ENODEV ;
@@ -774,7 +781,10 @@ int __init op_nmi_init(struct oprofile_omux_init (ops); -init_sysfs (); + ret =init_sysfs (); +if (ret) +return ret; + using_nmi =1 ;printk (KERN_INFO "oprofile: using NMI interrupt.\n" );return 0 ;
PATCH 68/129 oprofile, x86: fix init_sysfs() function stub
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Robert Richter <[email protected]>
commit 269f45c25028c75fe10e6d9be86e7202ab461fbc upstream.
The use of the return value of init_sysfs() with commit
10f0412 oprofile, x86: fix init_sysfs error handling
discovered the following build error for !CONFIG_PM:
.../linux/arch/x86/oprofile/nmi_int.c: In function ‘op_nmi_init’:
.../linux/arch/x86/oprofile/nmi_int.c:784: error: expected expression before ‘do’ make[2]: *** [arch/x86/oprofile/nmi_int.o] Error 1
make[1]: *** [arch/x86/oprofile] Error 2
This patch fixes this.
--- arch/x86/oprofile/nmi_int.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/oprofile/nmi_int.c +4 -2
@@ -585,8 +585,10 @@ static void exit_sysfs(void) }#else -#define init_sysfs () do { } while (0) -#define exit_sysfs () do { } while (0) + +static inline int init_sysfs (void ) {return 0 ; } +static inline void exit_sysfs (void ) { } +#endif /* CONFIG_PM */ static int __init p4_init (char **cpu_type)
PATCH 69/129 HID: Set Report ID properly for Output reports on the Control endpoint.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alan Ott <[email protected]>
commit c29771c2d8ceb907ed45eb8c7fc0450308140aca upstream.
When I made commit 29129a98e6fc89 ("HID: Send Report ID when numbered reports are sent over the control endpoint"), I didn't account for *buf not being the report ID anymore, as buf is incremented.
--- drivers/hid/usbhid/hid-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hid/usbhid/hid-core.c +2 -1
@@ -828,6 +828,7 @@ static int usbhid_output_raw_report(stru } }else {int skipped_report_id =0 ; +int report_id = buf[0 ];if (buf[0 ] ==0x0 ) {/* Don't send the Report ID */ buf++;
@@ -837,7 +838,7 @@ static int usbhid_output_raw_report(stru ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ),HID_REQ_SET_REPORT ,USB_DIR_OUT |USB_TYPE_CLASS |USB_RECIP_INTERFACE , - ((report_type +1 ) <<8 ) | *buf, + ((report_type +1 ) <<8 ) | report_id, interface->desc.bInterfaceNumber, buf, count,USB_CTRL_SET_TIMEOUT );/* count also the report id, if this was a numbered report. */
PATCH 70/129 libata: skip EH autopsy and recovery during suspend
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit e2f3d75fc0e4a0d03c61872bad39ffa2e74a04ff upstream.
For some mysterious reason, certain hardware reacts badly to usual EH actions while the system is going for suspend. As the devices won't be needed until the system is resumed, ask EH to skip usual autopsy and recovery and proceed directly to suspend.
--- drivers/ata/libata-core.c | 14 +++++++++++++- drivers/ata/libata-eh.c | 4 ++++ include/linux/libata.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-)
drivers/ata/libata-core.c +13 -1
@@ -5434,6 +5434,7 @@ static int ata_host_request_pm(struct at*/ int ata_host_suspend (struct ata_host *host,pm_message_t mesg) { +unsigned int ehi_flags =ATA_EHI_QUIET ;int rc;/*
@@ -5442,7 +5443,18 @@ int ata_host_suspend(struct ata_host *ho*/ ata_lpm_enable (host); - rc =ata_host_request_pm (host, mesg,0 ,ATA_EHI_QUIET ,1 ); +/* +* On some hardware, device fails to respond after spun down +* for suspend. As the device won't be used before being +* resumed, we don't need to touch the device. Ask EH to skip +* the usual stuff and proceed directly to suspend. +* +* http://thread.gmane.org/gmane.linux.ide/46764 +*/ +if (mesg.event ==PM_EVENT_SUSPEND ) + ehi_flags |=ATA_EHI_NO_AUTOPSY |ATA_EHI_NO_RECOVERY ; + + rc =ata_host_request_pm (host, mesg,0 , ehi_flags,1 );if (rc ==0 ) host->dev->power.power_state = mesg;return rc;
drivers/ata/libata-eh.c +4 -0
@@ -3234,6 +3234,10 @@ static int ata_eh_skip_recovery(struct aif (link->flags &ATA_LFLAG_DISABLED )return 1 ; +/* skip if explicitly requested */ +if (ehc->i.flags &ATA_EHI_NO_RECOVERY ) +return 1 ; +/* thaw frozen port and recover failed devices */ if ((ap->pflags &ATA_PFLAG_FROZEN ) ||ata_link_nr_enabled (link))return 0 ;
include/linux/libata.h +1 -0
@@ -335,6 +335,7 @@ enum {ATA_EHI_HOTPLUGGED = (1 <<0 ),/* could have been hotplugged */ ATA_EHI_NO_AUTOPSY = (1 <<2 ),/* no autopsy */ ATA_EHI_QUIET = (1 <<3 ),/* be quiet */ +ATA_EHI_NO_RECOVERY = (1 <<4 ),/* no recovery */ ATA_EHI_DID_SOFTRESET = (1 <<16 ),/* already soft-reset this port */ ATA_EHI_DID_HARDRESET = (1 << 17), /* already soft-reset this port */
PATCH 71/129 libata,pata_via: revert ata_wait_idle() removal from ata_sff/via_tf_load()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit 40c6023031369ae5573e622ca54fa3ffe89fb865 upstream.
Commit 978c0666 (libata: Remove excess delay in the tf_load path) removed ata_wait_idle() from ata_sff_tf_load() and via_tf_load(). This caused obscure detection problems in sata_sil.
https://bugzilla.kernel.org/show_bug.cgi?id=16606
The commit was pure performance optimization. Revert it for now.
--- drivers/ata/libata-sff.c | 3 +++ drivers/ata/pata_via.c | 2 ++ 2 files changed, 5 insertions(+)
drivers/ata/libata-sff.c +3 -0
@@ -418,6 +418,7 @@ void ata_sff_tf_load(struct ata_port *apif (ioaddr->ctl_addr)iowrite8 (tf->ctl, ioaddr->ctl_addr); ap->last_ctl = tf->ctl; +ata_wait_idle (ap); }if (is_addr && (tf->flags &ATA_TFLAG_LBA48 )) {
@@ -453,6 +454,8 @@ void ata_sff_tf_load(struct ata_port *apiowrite8 (tf->device, ioaddr->device_addr);VPRINTK ("device 0x%X\n" , tf->device); } + +ata_wait_idle (ap); }EXPORT_SYMBOL_GPL (ata_sff_tf_load);
drivers/ata/pata_via.c +2 -0
@@ -417,6 +417,8 @@ static void via_tf_load(struct ata_port tf->lbam, tf->lbah); } + +ata_wait_idle (ap); }static int via_port_start (struct ata_port *ap)
PATCH 72/129 ahci: fix hang on failed softreset
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Tejun Heo <[email protected]>
commit f1f5a807b051eddd3f302e503d39214e5bde0ef2 upstream.
ahci_do_softreset() compared the current time and deadline in reverse when calculating timeout for SRST issue. The result is that if @deadline is in future, SRST is issued with 0 timeout, which hasn't caused any problem because it later waits for DRDY with the correct timeout. If deadline is already exceeded by the time SRST is about to be issued, the timeout calculation underflows and if the device doesn't respond, timeout doesn't trigger for a _very_ long time.
Reverse the incorrect comparison order.
--- drivers/ata/libahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libahci.c +1 -1
@@ -1320,7 +1320,7 @@ int ahci_do_softreset(struct ata_link *l/* issue the first D2H Register FIS */ msecs =0 ; now = jiffies; -if (time_after (now, deadline)) +if (time_after (deadline, now)) msecs =jiffies_to_msecs (deadline - now); tf.ctl |=ATA_SRST ;
PATCH 73/129 O_DIRECT: fix the splitting up of contiguous I/O
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Moyer <[email protected]>
commit 7a801ac6f5067539ceb5fad0fe90ec49fc156e47 upstream.
commit c2c6ca4 (direct-io: do not merge logically non-contiguous requests) introduced a bug whereby all O_DIRECT I/Os were submitted a page at a time to the block layer. The problem is that the code expected dio->block_in_file to correspond to the current page in the dio. In fact, it corresponds to the previous page submitted via submit_page_section. This was purely an oversight, as the dio->cur_page_fs_offset field was introduced for just this purpose. This patch simply uses the correct variable when calculating whether there is a mismatch between contiguous logical blocks and contiguous physical blocks (as described in the comments).
I also switched the if conditional following this check to an else if, to ensure that we never call dio_bio_submit twice for the same dio (in theory, this should not happen, anyway).
I've tested this by running blktrace and verifying that a 64KB I/O was submitted as a single I/O. I also ran the patched kernel through xfstests' aio tests using xfs, ext4 (with 1k and 4k block sizes) and btrfs and verified that there were no regressions as compared to an unpatched kernel.
--- fs/direct-io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/direct-io.c +2 -2
@@ -634,7 +634,7 @@ static int dio_send_cur_page(struct dioint ret =0 ;if (dio->bio) { -loff_t cur_offset = dio->block_in_file << dio->blkbits; +loff_t cur_offset = dio->cur_page_fs_offset;loff_t bio_next_offset = dio->logical_offset_in_bio + dio->bio->bi_size;
@@ -659,7 +659,7 @@ static int dio_send_cur_page(struct dio* Submit now if the underlying fs is about to perform a * metadata read */ -if (dio->boundary) + else if (dio->boundary) dio_bio_submit(dio); }
PATCH 74/129 tracing: Fix a race in function profile
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Li Zefan <[email protected]>
commit 3aaba20f26f58843e8f20611e5c0b1c06954310f upstream.
While we are reading trace_stat/functionX and someone just disabled function_profile at that time, we can trigger this:
divide error: 0000 [#1] PREEMPT SMP ... EIP is at function_stat_show+0x90/0x230 ...
This fix just takes the ftrace_profile_lock and checks if rec->counter is 0. If it's 0, we know the profile buffer has been reset.
LKML-Reference: <[email protected]>
--- kernel/trace/ftrace.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +11 -4
@@ -381,12 +381,19 @@ static int function_stat_show(struct seq {struct ftrace_profile *rec = v;char str[KSYM_SYMBOL_LEN ]; +int ret =0 ;#ifdef CONFIG_FUNCTION_GRAPH_TRACER -static DEFINE_MUTEX (mutex);static struct trace_seq s;unsigned long long avg;unsigned long long stddev;#endif +mutex_lock (&ftrace_profile_lock); + +/* we raced with function_profile_reset() */ +if (unlikely (rec->counter ==0 )) { + ret = -EBUSY ; + goto out; + }kallsyms_lookup (rec->ip,NULL ,NULL ,NULL , str);seq_printf (m," %-30.30s %10lu" , str, rec->counter);
@@ -408,7 +415,6 @@ static int function_stat_show(struct seqdo_div (stddev, (rec->counter -1 ) *1000 ); } -mutex_lock (&mutex);trace_seq_init (&s);trace_print_graph_duration (rec->time, &s);trace_seq_puts (&s," " );
@@ -416,11 +422,12 @@ static int function_stat_show(struct seqtrace_seq_puts (&s," " );trace_print_graph_duration (stddev, &s);trace_print_seq (m, &s); -mutex_unlock (&mutex);#endif seq_putc (m,'\n' ); +out: +mutex_unlock (&ftrace_profile_lock); -return 0 ; +return ret; }static void ftrace_profile_reset (struct ftrace_profile_stat *stat)
PATCH 75/129 tracing: Do not allow llseek to set_ftrace_filter
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Steven Rostedt <[email protected]>
commit 9c55cb12c1c172e2d51e85fbb5a4796ca86b77e7 upstream.
Reading the file set_ftrace_filter does three things.
1) shows whether or not filters are set for the function tracer
2) shows what functions are set for the function tracer
3) shows what triggers are set on any functions
3 is independent from 1 and 2.
The way this file currently works is that it is a state machine, and as you read it, it may change state. But this assumption breaks when you use lseek() on the file. The state machine gets out of sync and the t_show() may use the wrong pointer and cause a kernel oops.
Luckily, this will only kill the app that does the lseek, but the app dies while holding a mutex. This prevents anyone else from using the set_ftrace_filter file (or any other function tracing file for that matter).
A real fix for this is to rewrite the code, but that is too much for a -rc release or stable. This patch simply disables llseek on the set_ftrace_filter() file for now, and we can do the proper fix for the next major release.
--- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
@@ -2417,7 +2417,7 @@ static const struct file_operations ftra .open = ftrace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = no_llseek, .release = ftrace_filter_release, };
PATCH 76/129 tracing: t_start: reset FTRACE_ITER_HASH in case of seek/pread
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wright <[email protected]>
commit df09162550fbb53354f0c88e85b5d0e6129ee9cc upstream.
Be sure to avoid entering t_show() with FTRACE_ITER_HASH set without having properly started the iterator to iterate the hash. This case is degenerate and, as discovered by Robert Swiecki, can cause t_hash_show() to misuse a pointer. This causes a NULL ptr deref with possible security implications. Tracked as CVE-2010-3079.
--- kernel/trace/ftrace.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/ftrace.c +2 -0
@@ -1510,6 +1510,8 @@ static void *t_start(struct seq_file *m,if (*pos >0 )return t_hash_start (m, pos); iter->flags |=FTRACE_ITER_PRINTALL ; +/* reset in case of seek/pread */ + iter->flags &= ~FTRACE_ITER_HASH ;return iter; }
PATCH 77/129 irda: off by one
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Carpenter <[email protected]>
commit cf9b94f88bdbe8a02015fc30d7c232b2d262d4ad upstream.
This is an off by one. We would go past the end when we NUL terminate the "value" string at end of the function. The "value" buffer is allocated in irlan_client_parse_response() or irlan_provider_parse_command().
--- net/irda/irlan/irlan_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/irda/irlan/irlan_common.c +1 -1
@@ -1102,7 +1102,7 @@ int irlan_extract_param(__u8 *buf, charmemcpy (&val_len, buf+n,2 );/* To avoid alignment problems */ le16_to_cpus (&val_len); n+=2 ; -if (val_len >1016 ) { +if (val_len >=1016 ) {IRDA_DEBUG (2 ,"%s(), parameter length to long\n" , __func__ );return -RSP_INVALID_COMMAND_FORMAT ; }
PATCH 78/129 hp_accel: add quirks for HP ProBook 532x and HP Mini 5102
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <[email protected]>
commit 4e70598c3b56e6fec551454c495d4d4025834749 upstream.
Added missing axis-mapping for HP ProBook 532x and HP Mini 5102.
--- drivers/hwmon/hp_accel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwmon/hp_accel.c +2 -0
@@ -221,6 +221,8 @@ static struct dmi_system_id lis3lv02d_dmAXIS_DMI_MATCH ("HPB442x" ,"HP ProBook 442" , xy_rotated_left),AXIS_DMI_MATCH ("HPB452x" ,"HP ProBook 452" , y_inverted),AXIS_DMI_MATCH ("HPB522x" ,"HP ProBook 522" , xy_swap), +AXIS_DMI_MATCH ("HPB532x" ,"HP ProBook 532" , y_inverted), +AXIS_DMI_MATCH ("Mini5102" ,"HP Mini 5102" , xy_rotated_left_usd), { NULL, }/* Laptop models without axis info (yet): * "NC6910" "HP Compaq 6910"
PATCH 79/129 gcov: fix null-pointer dereference for certain module types
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Peter Oberparleiter <[email protected]>
commit 85a0fdfd0f967507f3903e8419bc7e408f5a59de upstream.
The gcov-kernel infrastructure expects that each object file is loaded only once. This may not be true, e.g. when loading multiple kernel modules which are linked to the same object file. As a result, loading such kernel modules will result in incorrect gcov results while unloading will cause a null-pointer dereference.
This patch fixes these problems by changing the gcov-kernel infrastructure so that multiple profiling data sets can be associated with one debugfs entry. It applies to 2.6.36-rc1.
--- kernel/gcov/fs.c | 244 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 180 insertions(+), 64 deletions(-)
kernel/gcov/fs.c +180 -64
@@ -33,10 +33,11 @@* @children: child nodes * @all: list head for list of all nodes * @parent: parent node -* @info: associated profiling data structure if not a directory -* @ghost: when an object file containing profiling data is unloaded we keep a -* copy of the profiling data here to allow collecting coverage data -* for cleanup code. Such a node is called a "ghost". +* @loaded_info: array of pointers to profiling data sets for loaded object +* files. +* @num_loaded: number of profiling data sets for loaded object files. +* @unloaded_info: accumulated copy of profiling data sets for unloaded +* object files. Used only when gcov_persist=1. * @dentry: main debugfs entry, either a directory or data file * @links: associated symbolic links * @name: data file basename
@@ -51,10 +52,11 @@ struct gcov_node {struct list_head children;struct list_head all;struct gcov_node *parent; -struct gcov_info *info; -struct gcov_info *ghost; +struct gcov_info **loaded_info; +struct gcov_info *unloaded_info;struct dentry *dentry;struct dentry **links; +int num_loaded;char name[0 ]; };
@@ -136,16 +138,37 @@ static const struct seq_operations gcov_ };/* -* Return the profiling data set for a given node. This can either be the -* original profiling data structure or a duplicate (also called "ghost") -* in case the associated object file has been unloaded. +* Return a profiling data set associated with the given node. This is +* either a data set for a loaded object file or a data set copy in case +* all associated object files have been unloaded. */ static struct gcov_info *get_node_info (struct gcov_node *node) { -if (node->info) -return node->info; +if (node->num_loaded >0 ) +return node->loaded_info[0 ]; -return node->ghost; +return node->unloaded_info; +} + +/* +* Return a newly allocated profiling data set which contains the sum of +* all profiling data associated with the given node. +*/ +static struct gcov_info *get_accumulated_info (struct gcov_node *node) +{ +struct gcov_info *info; +int i =0 ; + +if (node->unloaded_info) + info =gcov_info_dup (node->unloaded_info); +else + info =gcov_info_dup (node->loaded_info[i++]); +if (!info) +return NULL ; +for (; i < node->num_loaded; i++) +gcov_info_add (info, node->loaded_info[i]); + +return info; }/*
@@ -163,9 +186,10 @@ static int gcov_seq_open(struct inode *imutex_lock (&node_lock);/* * Read from a profiling data copy to minimize reference tracking -* complexity and concurrent access. +* complexity and concurrent access and to keep accumulating multiple +* profiling data sets associated with one node simple. */ - info =gcov_info_dup (get_node_info (node)); + info =get_accumulated_info (node);if (!info) goto out_unlock; iter =gcov_iter_new (info);
@@ -225,12 +249,25 @@ static struct gcov_node *get_node_by_namreturn NULL ; } +/* +* Reset all profiling data associated with the specified node. +*/ +static void reset_node (struct gcov_node *node) +{ +int i; + +if (node->unloaded_info) +gcov_info_reset (node->unloaded_info); +for (i =0 ; i < node->num_loaded; i++) +gcov_info_reset (node->loaded_info[i]); +} +static void remove_node (struct gcov_node *node);/* * write() implementation for gcov data files. Reset profiling data for the -* associated file. If the object file has been unloaded (i.e. this is -* a "ghost" node), remove the debug fs node as well. +* corresponding file. If all associated object files have been unloaded, +* remove the debug fs node as well. */ static ssize_t gcov_seq_write (struct file *file,const char __user *addr,size_t len,loff_t *pos)
@@ -245,10 +282,10 @@ static ssize_t gcov_seq_write(struct fil node =get_node_by_name (info->filename);if (node) {/* Reset counts or remove node for unloaded modules. */ -if (node->ghost) +if (node->num_loaded ==0 )remove_node (node);else -gcov_info_reset (node->info); +reset_node (node); }/* Reset counts for open file. */ gcov_info_reset (info);
@@ -378,7 +415,10 @@ static void init_node(struct gcov_node *INIT_LIST_HEAD (&node->list);INIT_LIST_HEAD (&node->children);INIT_LIST_HEAD (&node->all); - node->info = info; +if (node->loaded_info) { + node->loaded_info[0 ] = info; + node->num_loaded =1 ; + } node->parent = parent;if (name)strcpy (node->name, name);
@@ -394,9 +434,13 @@ static struct gcov_node *new_node(structstruct gcov_node *node; node =kzalloc (sizeof (struct gcov_node ) +strlen (name) +1 ,GFP_KERNEL ); -if (!node) { -pr_warning ("out of memory\n" ); -return NULL ; +if (!node) + goto err_nomem; +if (info) { + node->loaded_info =kcalloc (1 ,sizeof (struct gcov_info *), +GFP_KERNEL ); +if (!node->loaded_info) + goto err_nomem; }init_node (node, info, name, parent);/* Differentiate between gcov data file nodes and directory nodes. */
@@ -416,6 +460,11 @@ static struct gcov_node *new_node(structlist_add (&node->all, &all_head);return node; + +err_nomem: +kfree (node); +pr_warning ("out of memory\n" ); +return NULL ; }/* Remove symbolic links associated with node. */
@@ -441,8 +490,9 @@ static void release_node(struct gcov_nodlist_del (&node->all);debugfs_remove (node->dentry);remove_links (node); -if (node->ghost) -gcov_info_free (node->ghost); +kfree (node->loaded_info); +if (node->unloaded_info) +gcov_info_free (node->unloaded_info);kfree (node); }
@@ -477,7 +527,7 @@ static struct gcov_node *get_child_by_na/* * write() implementation for reset file. Reset all profiling data to zero -* and remove ghost nodes. +* and remove nodes for which all associated object files are unloaded. */ static ssize_t reset_write (struct file *file,const char __user *addr,size_t len,loff_t *pos)
@@ -487,8 +537,8 @@ static ssize_t reset_write(struct file *mutex_lock (&node_lock); restart:list_for_each_entry (node, &all_head, all) { -if (node->info) -gcov_info_reset (node->info); +if (node->num_loaded >0 ) +reset_node (node);else if (list_empty (&node->children)) {remove_node (node);/* Several nodes may have gone - restart loop. */
@@ -564,37 +614,115 @@ err_remove: }/* -* The profiling data set associated with this node is being unloaded. Store a -* copy of the profiling data and turn this node into a "ghost". +* Associate a profiling data set with an existing node. Needs to be called +* with node_lock held. */ -static int ghost_node (struct gcov_node *node) +static void add_info (struct gcov_node *node,struct gcov_info *info) { - node->ghost =gcov_info_dup (node->info); -if (!node->ghost) { -pr_warning ("could not save data for '%s' (out of memory)\n" , - node->info->filename); -return -ENOMEM ; +struct gcov_info **loaded_info; +int num = node->num_loaded; + +/* +* Prepare new array. This is done first to simplify cleanup in +* case the new data set is incompatible, the node only contains +* unloaded data sets and there's not enough memory for the array. +*/ + loaded_info =kcalloc (num +1 ,sizeof (struct gcov_info *),GFP_KERNEL ); +if (!loaded_info) { +pr_warning ("could not add '%s' (out of memory)\n" , + info->filename); +return ; + } +memcpy (loaded_info, node->loaded_info, + num *sizeof (struct gcov_info *)); + loaded_info[num] = info; +/* Check if the new data set is compatible. */ +if (num ==0 ) { +/* +* A module was unloaded, modified and reloaded. The new +* data set replaces the copy of the last one. +*/ +if (!gcov_info_is_compatible (node->unloaded_info, info)) { +pr_warning ("discarding saved data for %s " +"(incompatible version)\n" , info->filename); +gcov_info_free (node->unloaded_info); + node->unloaded_info =NULL ; + } + }else { +/* +* Two different versions of the same object file are loaded. +* The initial one takes precedence. +*/ +if (!gcov_info_is_compatible (node->loaded_info[0 ], info)) { +pr_warning ("could not add '%s' (incompatible " +"version)\n" , info->filename); +kfree (loaded_info); +return ; + } } - node->info =NULL ; +/* Overwrite previous array. */ +kfree (node->loaded_info); + node->loaded_info = loaded_info; + node->num_loaded = num +1 ; +} -return 0 ; +/* +* Return the index of a profiling data set associated with a node. +*/ +static int get_info_index (struct gcov_node *node,struct gcov_info *info) +{ +int i; + +for (i =0 ; i < node->num_loaded; i++) { +if (node->loaded_info[i] == info) +return i; + } +return -ENOENT ; }/* -* Profiling data for this node has been loaded again. Add profiling data -* from previous instantiation and turn this node into a regular node. +* Save the data of a profiling data set which is being unloaded. */ -static void revive_node (struct gcov_node *node,struct gcov_info *info) +static void save_info (struct gcov_node *node,struct gcov_info *info) { -if (gcov_info_is_compatible (node->ghost, info)) -gcov_info_add (info, node->ghost); +if (node->unloaded_info) +gcov_info_add (node->unloaded_info, info);else { -pr_warning ("discarding saved data for '%s' (version changed)\n" , + node->unloaded_info =gcov_info_dup (info); +if (!node->unloaded_info) { +pr_warning ("could not save data for '%s' " +"(out of memory)\n" , info->filename); + } + } +} + +/* +* Disassociate a profiling data set from a node. Needs to be called with +* node_lock held. +*/ +static void remove_info (struct gcov_node *node,struct gcov_info *info) +{ +int i; + + i =get_info_index (node, info); +if (i <0 ) { +pr_warning ("could not remove '%s' (not found)\n" , info->filename); +return ; } -gcov_info_free (node->ghost); - node->ghost =NULL ; - node->info = info; +if (gcov_persist) +save_info (node, info); +/* Shrink array. */ + node->loaded_info[i] = node->loaded_info[node->num_loaded -1 ]; + node->num_loaded--; +if (node->num_loaded >0 ) +return ; +/* Last loaded data set was removed. */ +kfree (node->loaded_info); + node->loaded_info =NULL ; + node->num_loaded =0 ; +if (!node->unloaded_info) +remove_node (node); }/*
@@ -609,30 +737,18 @@ void gcov_event(enum gcov_action action, node =get_node_by_name (info->filename);switch (action) {case GCOV_ADD : -/* Add new node or revive ghost. */ -if (!node) { +if (node) +add_info (node, info); +else add_node (info); -break ; - } -if (gcov_persist) -revive_node (node, info); -else { -pr_warning ("could not add '%s' (already exists)\n" , - info->filename); - }break ;case GCOV_REMOVE : -/* Remove node or turn into ghost. */ -if (!node) { +if (node) +remove_info (node, info); +else {pr_warning ("could not remove '%s' (not found)\n" , info->filename); -break ; } -if (gcov_persist) { -if (!ghost_node (node)) -break ; - } -remove_node (node);break ; }mutex_unlock (&node_lock);
PATCH 80/129 tmio_mmc: dont clear unhandled pending interrupts
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Yusuke Goda <[email protected]>
commit b78d6c5f51935ba89df8db33a57bacb547aa7325 upstream.
Previously, it was possible for ack_mmc_irqs() to clear pending interrupt bits in the CTL_STATUS register, even though the interrupt handler had not been called. This was because of a race that existed when doing a read-modify-write sequence on CTL_STATUS. After the read step in this sequence, if an interrupt occurred (causing one of the bits in CTL_STATUS to be set) the write step would inadvertently clear it.
Observed with the TMIO_STAT_RXRDY bit together with CMD53 on AR6002 and BCM4318 SDIO cards in polled mode.
This patch eliminates this race by only writing to CTL_STATUS and clearing the interrupts that were passed as an argument to ack_mmc_irqs()."
--- drivers/mmc/host/tmio_mmc.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/mmc/host/tmio_mmc.h +1 -4
@@ -82,10 +82,7 @@#define ack_mmc_irqs (host, i) \ do { \ - u32 mask;\ - mask = sd_ctrl_read32((host), CTL_STATUS); \ - mask &= ~((i) & TMIO_MASK_IRQ); \ - sd_ctrl_write32((host), CTL_STATUS, mask); \ + sd_ctrl_write32((host), CTL_STATUS, ~(i)); \ } while (0)
PATCH 81/129 mmc: fix the use of kunmap_atomic() in tmio_mmc.h
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Guennadi Liakhovetski <[email protected]>
commit 5600efb1bc2745d93ae0bc08130117a84f2b9d69 upstream.
kunmap_atomic() takes the cookie, returned by the kmap_atomic() as its argument and not the page address, used as an argument to kmap_atomic(). This patch fixes the compile error:
In file included from drivers/mmc/host/tmio_mmc.c:37:drivers/mmc/host/tmio_mmc.h: In function 'tmio_mmc_kunmap_atomic':drivers/mmc/host/tmio_mmc.h:192: error: negative width in bit-field '<anonymous>'
--- drivers/mmc/host/tmio_mmc.c | 7 ++++--- drivers/mmc/host/tmio_mmc.h | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/mmc/host/tmio_mmc.c +4 -3
@@ -164,6 +164,7 @@ tmio_mmc_start_command(struct tmio_mmc_hstatic void tmio_mmc_pio_irq (struct tmio_mmc_host *host) {struct mmc_data *data = host->data; +void *sg_virt;unsigned short *buf;unsigned int count;unsigned long flags;
@@ -173,8 +174,8 @@ static void tmio_mmc_pio_irq(struct tmioreturn ; } - buf = (unsigned short *)(tmio_mmc_kmap_atomic (host, &flags) + - host->sg_off); + sg_virt =tmio_mmc_kmap_atomic (host->sg_ptr, &flags); + buf = (unsigned short *)(sg_virt + host->sg_off); count = host->sg_ptr->length - host->sg_off;if (count > data->blksz)
@@ -191,7 +192,7 @@ static void tmio_mmc_pio_irq(struct tmio host->sg_off += count; -tmio_mmc_kunmap_atomic (host, &flags); +tmio_mmc_kunmap_atomic (sg_virt, &flags);if (host->sg_off == host->sg_ptr->length)tmio_mmc_next_sg (host);
drivers/mmc/host/tmio_mmc.h +3 -5
@@ -174,19 +174,17 @@ static inline int tmio_mmc_next_sg(strucreturn --host->sg_len; } -static inline char *tmio_mmc_kmap_atomic (struct tmio_mmc_host *host, +static inline char *tmio_mmc_kmap_atomic (struct scatterlist *sg,unsigned long *flags) { -struct scatterlist *sg = host->sg_ptr; -local_irq_save (*flags);return kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; } -static inline void tmio_mmc_kunmap_atomic (struct tmio_mmc_host *host, +static inline void tmio_mmc_kunmap_atomic (void *virt,unsigned long *flags) { -kunmap_atomic (sg_page (host->sg_ptr),KM_BIO_SRC_IRQ ); +kunmap_atomic (virt,KM_BIO_SRC_IRQ );local_irq_restore (*flags); }
PATCH 82/129 mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Maxim Levitsky <[email protected]>
commit 4c2ef25fe0b847d2ae818f74758ddb0be1c27d8e upstream.
If you don't use CONFIG_MMC_UNSAFE_RESUME, as soon as you attempt to suspend, the card will be removed, therefore this patch doesn't change the behavior of this option.
However the removal will be done by pm notifier, which runs while userspace is still not frozen and thus can freely use del_gendisk, without the risk of deadlock which would happen otherwise.
Card detect workqueue is now disabled while userspace is frozen, Therefore if you do use CONFIG_MMC_UNSAFE_RESUME, and remove the card during suspend, the removal will be detected as soon as userspace is unfrozen, again at the moment it is safe to call del_gendisk.
Tested with and without CONFIG_MMC_UNSAFE_RESUME with suspend and hibernate.
--- drivers/mmc/core/core.c | 83 ++++++++++++++++++++++++++++++++--------------- drivers/mmc/core/host.c | 4 ++ include/linux/mmc/host.h | 3 + 3 files changed, 64 insertions(+), 26 deletions(-)
drivers/mmc/core/core.c +57 -26
@@ -1057,6 +1057,17 @@ void mmc_rescan(struct work_struct *work container_of(work, struct mmc_host, detect.work);u32 ocr;int err; +unsigned long flags; + +spin_lock_irqsave (&host->lock, flags); + +if (host->rescan_disable) { +spin_unlock_irqrestore (&host->lock, flags); +return ; + } + +spin_unlock_irqrestore (&host->lock, flags); +mmc_bus_get (host);
@@ -1266,19 +1277,6 @@ int mmc_suspend_host(struct mmc_host *hoif (host->bus_ops && !host->bus_dead) {if (host->bus_ops->suspend) err = host->bus_ops->suspend (host); -if (err == -ENOSYS || !host->bus_ops->resume) { -/* -* We simply "remove" the card in this case. -* It will be redetected on resume. -*/ -if (host->bus_ops->remove) - host->bus_ops->remove (host); -mmc_claim_host (host); -mmc_detach_bus (host); -mmc_release_host (host); - host->pm_flags =0 ; - err =0 ; - } }mmc_bus_put (host);
@@ -1310,28 +1308,61 @@ int mmc_resume_host(struct mmc_host *hosprintk (KERN_WARNING "%s: error %d during resume " "(card was removed?)\n" ,mmc_hostname (host), err); -if (host->bus_ops->remove) - host->bus_ops->remove (host); -mmc_claim_host (host); -mmc_detach_bus (host); -mmc_release_host (host); -/* no need to bother upper layers */ err = 0; } }mmc_bus_put (host); -/* -* We add a slight delay here so that resume can progress -* in parallel. -*/ -mmc_detect_change (host,1 ); -return err; } -EXPORT_SYMBOL (mmc_resume_host); +/* Do the card removal on suspend if card is assumed removeable +* Do that in pm notifier while userspace isn't yet frozen, so we will be able +to sync the card. +*/ +int mmc_pm_notify (struct notifier_block *notify_block, +unsigned long mode,void *unused) +{ +struct mmc_host *host =container_of ( + notify_block, struct mmc_host, pm_notify); +unsigned long flags; + + +switch (mode) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : + +spin_lock_irqsave (&host->lock, flags); + host->rescan_disable =1 ; +spin_unlock_irqrestore (&host->lock, flags); +cancel_delayed_work_sync (&host->detect); + +if (!host->bus_ops || host->bus_ops->suspend) +break ; + +mmc_claim_host (host); + +if (host->bus_ops->remove) + host->bus_ops->remove (host); + +mmc_detach_bus (host); +mmc_release_host (host); + host->pm_flags =0 ; +break ; + +case PM_POST_SUSPEND : +case PM_POST_HIBERNATION : + +spin_lock_irqsave (&host->lock, flags); + host->rescan_disable =0 ; +spin_unlock_irqrestore (&host->lock, flags); +mmc_detect_change (host,0 ); + + } + +return 0 ; +}#endif static int __init mmc_init (void )
drivers/mmc/core/host.c +4 -0
@@ -17,6 +17,7 @@#include <linux/pagemap.h> #include <linux/leds.h> #include <linux/slab.h> +#include <linux/suspend.h> #include <linux/mmc/host.h>
@@ -85,6 +86,7 @@ struct mmc_host *mmc_alloc_host(int extrinit_waitqueue_head (&host->wq);INIT_DELAYED_WORK (&host->detect, mmc_rescan);INIT_DELAYED_WORK_DEFERRABLE (&host->disable, mmc_host_deeper_disable); + host->pm_notify.notifier_call = mmc_pm_notify;/* * By default, hosts do not support SGIO or large requests.
@@ -133,6 +135,7 @@ int mmc_add_host(struct mmc_host *host)#endif mmc_start_host (host); +register_pm_notifier (&host->pm_notify);return 0 ; }
@@ -149,6 +152,7 @@ EXPORT_SYMBOL(mmc_add_host);*/ void mmc_remove_host (struct mmc_host *host) { +unregister_pm_notifier (&host->pm_notify);mmc_stop_host (host);#ifdef CONFIG_DEBUG_FS
include/linux/mmc/host.h +3 -0
@@ -124,6 +124,7 @@ struct mmc_host {unsigned int f_min;unsigned int f_max;u32 ocr_avail; +struct notifier_block pm_notify;#define MMC_VDD_165_195 0x00000080/* VDD voltage 1.65 - 1.95 */ #define MMC_VDD_20_21 0x00000100/* VDD voltage 2.0 ~ 2.1 */
@@ -183,6 +184,7 @@ struct mmc_host {/* Only used with MMC_CAP_DISABLE */ int enabled;/* host is enabled */ +int rescan_disable;/* disable card detection */ int nesting_cnt;/* "enable" nesting count */ int en_dis_recurs;/* detect recursion */ unsigned int disable_delay;/* disable delay in msecs */
@@ -257,6 +259,7 @@ int mmc_card_can_sleep(struct mmc_host *int mmc_host_enable (struct mmc_host *host);int mmc_host_disable (struct mmc_host *host);int mmc_host_lazy_disable (struct mmc_host *host); +int mmc_pm_notify (struct notifier_block *notify_block,unsigned long ,void *);static inline void mmc_set_disable_delay (struct mmc_host *host,unsigned int disable_delay)
PATCH 83/129 mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Uwe Kleine-König <[email protected]>
commit 81ca03a0e2ea0207b2df80e0edcf4c775c07a505 upstream.
This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume")
--- drivers/mmc/core/host.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/core/host.c +2 -0
@@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extrinit_waitqueue_head (&host->wq);INIT_DELAYED_WORK (&host->detect, mmc_rescan);INIT_DELAYED_WORK_DEFERRABLE (&host->disable, mmc_host_deeper_disable); +#ifdef CONFIG_PM host->pm_notify.notifier_call = mmc_pm_notify; +#endif /* * By default, hosts do not support SGIO or large requests.
PATCH 84/129 statfs() gives ESTALE error
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Menyhart Zoltan <[email protected]>
commit fbf3fdd2443965d9ba6fb4b5fecd1f6e0847218f upstream.
Hi,
An NFS client executes a statfs("file", &buff) call. "file" exists / existed, the client has read / written it, but it has already closed it.
user_path(pathname, &path) looks up "file" successfully in the directory-cache and restarts the aging timer of the directory-entry. Even if "file" has already been removed from the server, because the lookupcache=positive option I use, keeps the entries valid for a while.
nfs_statfs() returns ESTALE if "file" has already been removed from the server.
If the user application repeats the statfs("file", &buff) call, we are stuck: "file" remains young forever in the directory-cache.
--- fs/nfs/super.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/nfs/super.c +8 -0
@@ -431,7 +431,15 @@ static int nfs_statfs(struct dentry *den goto out_err; error = server->nfs_client->rpc_ops->statfs (server, fh, &res); +if (unlikely (error == -ESTALE )) { +struct dentry *pd_dentry; + pd_dentry =dget_parent (dentry); +if (pd_dentry !=NULL ) { +nfs_zap_caches (pd_dentry->d_inode); +dput (pd_dentry); + } + }nfs_free_fattr (res.fattr);if (error <0 ) goto out_err;
PATCH 85/129 minix: fix regression in minix_mkdir()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jorge Boncompte [DTI2] <[email protected]>
commit eee743fd7eac9f2ea69ad06d093dfb5a12538fe5 upstream.
Commit 9eed1fb721c ("minix: replace inode uid,gid,mode init with helper") broke directory creation on minix filesystems.
Fix it by passing the needed mode flag to inode init helper.
--- fs/minix/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/minix/namei.c +1 -1
@@ -115,7 +115,7 @@ static int minix_mkdir(struct inode * diinode_inc_link_count (dir); - inode =minix_new_inode (dir, mode, &err); + inode =minix_new_inode (dir,S_IFDIR | mode, &err);if (!inode) goto out_dir;
PATCH 86/129 bounce: call flush_dcache_page() after bounce_copy_vec()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Gary King <[email protected]>
commit ac8456d6f9a3011c824176bd6084d39e5f70a382 upstream.
I have been seeing problems on Tegra 2 (ARMv7 SMP) systems with HIGHMEM enabled on 2.6.35 (plus some patches targetted at 2.6.36 to perform cache maintenance lazily), and the root cause appears to be that the mm bouncing code is calling flush_dcache_page before it copies the bounce buffer into the bio.
The bounced page needs to be flushed after data is copied into it, to ensure that architecture implementations can synchronize instruction and data caches if necessary.
--- mm/bounce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/bounce.c +1 -1
@@ -116,8 +116,8 @@ static void copy_to_high_bio_irq(struct*/ vfrom =page_address (fromvec->bv_page) + tovec->bv_offset; -flush_dcache_page (tovec->bv_page);bounce_copy_vec (tovec, vfrom); +flush_dcache_page (tovec->bv_page); } }
PATCH 87/129 mm: compaction: handle active and inactive fairly in too_many_isolated
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Minchan Kim <[email protected]>
commit bc6930457460788e14b2c0808ed4632a1592bd61 upstream.
Iram reported that compaction's too_many_isolated() loops forever.
(http://www.spinics.net/lists/linux-mm/msg08123.html)
The meminfo when the situation happened was inactive anon is zero. That's because the system has no memory pressure until then. While all anon pages were in the active lru, compaction could select active lru as well as inactive lru. That's a different thing from vmscan's isolated. So we has been two too_many_isolated.
While compaction can isolate pages in both active and inactive, current implementation of too_many_isolated only considers inactive. It made Iram's problem.
This patch handles active and inactive fairly. That's because we can't expect where from and how many compaction would isolated pages.
This patch changes (nr_isolated > nr_inactive) with nr_isolated > (nr_active + nr_inactive) / 2.
--- mm/compaction.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
mm/compaction.c +4 -3
@@ -214,15 +214,16 @@ static void acct_isolated(struct zone *z/* Similar to reclaim, but different enough that they don't share logic */ static bool too_many_isolated (struct zone *zone) { - -unsigned long inactive, isolated; +unsigned long active, inactive, isolated; inactive =zone_page_state (zone,NR_INACTIVE_FILE ) +zone_page_state (zone,NR_INACTIVE_ANON ); + active =zone_page_state (zone,NR_ACTIVE_FILE ) + +zone_page_state (zone,NR_ACTIVE_ANON ); isolated =zone_page_state (zone,NR_ISOLATED_FILE ) +zone_page_state (zone,NR_ISOLATED_ANON ); -return isolated > inactive; +return isolated > (inactive + active) /2 ; }/*
PATCH 88/129 kernel/groups.c: fix integer overflow in groups_search
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jerome Marchand <[email protected]>
commit 1c24de60e50fb19b94d94225458da17c720f0729 upstream.
gid_t is a unsigned int. If group_info contains a gid greater than MAX_INT, groups_search() function may look on the wrong side of the search tree.
This solves some unfair "permission denied" problems.
--- kernel/groups.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/groups.c +2 -3
@@ -143,10 +143,9 @@ int groups_search(const struct group_inf right = group_info->ngroups;while (left < right) {unsigned int mid = (left+right)/2 ; -int cmp = grp -GROUP_AT (group_info, mid); -if (cmp >0 ) +if (grp >GROUP_AT (group_info, mid)) left = mid +1 ; -else if (cmp <0 ) +else if (grp <GROUP_AT (group_info, mid)) right = mid;else return 1 ;
PATCH 89/129 binfmt_misc: fix binfmt_misc priority
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jan Sembera <[email protected]>
commit ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b upstream.
Commit 74641f584da ("alpha: binfmt_aout fix") (May 2009) introduced a regression - binfmt_misc is now consulted after binfmt_elf, which will unfortunately break ia32el. ia32 ELF binaries on ia64 used to be matched using binfmt_misc and executed using wrapper. As 32bit binaries are now matched by binfmt_elf before bindmt_misc kicks in, the wrapper is ignored.
The fix increases precedence of binfmt_misc to the original state.
--- fs/binfmt_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/binfmt_misc.c +1 -1
@@ -723,7 +723,7 @@ static int __init init_misc_binfmt(void) {int err =register_filesystem (&bm_fs_type);if (!err) { - err =register_binfmt (&misc_format); + err =insert_binfmt (&misc_format);if (err)unregister_filesystem (&bm_fs_type); }
PATCH 90/129 Input: i8042 - fix device removal on unload
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dmitry Torokhov <[email protected]>
commit af045b86662f17bf130239a65995c61a34f00a6b upstream.
We need to call platform_device_unregister(i8042_platform_device) before calling platform_driver_unregister() because i8042_remove() resets i8042_platform_device to NULL. This leaves the platform device instance behind and prevents driver reload.
Fixes https://bugzilla.kernel.org/show_bug.cgi?id=16613
--- drivers/input/serio/i8042.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/serio/i8042.c +1 -1
@@ -1483,8 +1483,8 @@ static int __init i8042_init(void) static void __exit i8042_exit(void) { -platform_driver_unregister (&i8042_driver);platform_device_unregister (i8042_platform_device); +platform_driver_unregister (&i8042_driver);i8042_platform_exit (); panic_blink =NULL ;
PATCH 91/129 Input: i8042 - reset keyboard controller wehen resuming from S2R
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 1ca56e513a9fd356d5a9e0de45dbe0e189e00386 upstream.
Some laptops, such as Lenovo 3000 N100, require keyboard controller reset in order to have touchpad operable after suspend to RAM. Even if box does not need the reset it should be safe to do so, so instead of chasing after misbehaving boxes and grow DMI tables, let's reset the controller unconditionally.
--- drivers/input/serio/i8042.c | 65 +++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-)
drivers/input/serio/i8042.c +41 -24
@@ -861,9 +861,6 @@ static int i8042_controller_selftest(voiunsigned char param;int i =0 ; -if (!i8042_reset) -return 0 ; -/* * We try this 5 times; on some really fragile systems this does not * take the first time...
@@ -1020,7 +1017,8 @@ static void i8042_controller_reset(void)* Reset the controller if requested. */ -i8042_controller_selftest (); +if (i8042_reset) +i8042_controller_selftest ();/* * Restore the original control register setting.
@@ -1094,23 +1092,11 @@ static void i8042_dritek_enable(void)#ifdef CONFIG_PM /* -* Here we try to restore the original BIOS settings to avoid -* upsetting it. -*/ - -static int i8042_pm_reset (struct device *dev) -{ -i8042_controller_reset (); - -return 0 ; -} - -/* * Here we try to reset everything back to a state we had * before suspending. */ -static int i8042_pm_restore (struct device *dev) +static int i8042_controller_resume (bool force_reset) {int error;
@@ -1118,9 +1104,11 @@ static int i8042_pm_restore(struct devicif (error)return error; - error =i8042_controller_selftest (); -if (error) -return error; +if (i8042_reset || force_reset) { + error =i8042_controller_selftest (); +if (error) +return error; + }/* * Restore original CTR value and disable all ports
@@ -1162,6 +1150,28 @@ static int i8042_pm_restore(struct devicreturn 0 ; } +/* +* Here we try to restore the original BIOS settings to avoid +* upsetting it. +*/ + +static int i8042_pm_reset (struct device *dev) +{ +i8042_controller_reset (); + +return 0 ; +} + +static int i8042_pm_resume (struct device *dev) +{ +/* +* On resume from S2R we always try to reset the controller +* to bring it in a sane state. (In case of S2D we expect +* BIOS to reset the controller for us.) +*/ +return i8042_controller_resume (true); +} +static int i8042_pm_thaw (struct device *dev) {i8042_interrupt (0 ,NULL );
@@ -1169,9 +1179,14 @@ static int i8042_pm_thaw(struct device *return 0 ; } +static int i8042_pm_restore (struct device *dev) +{ +return i8042_controller_resume (false); +} +static const struct dev_pm_ops i8042_pm_ops = { .suspend = i8042_pm_reset, - .resume = i8042_pm_restore, + .resume = i8042_pm_resume, .thaw = i8042_pm_thaw, .poweroff = i8042_pm_reset, .restore = i8042_pm_restore,
@@ -1389,9 +1404,11 @@ static int __init i8042_probe(struct pla i8042_platform_device = dev; - error =i8042_controller_selftest (); -if (error) -return error; +if (i8042_reset) { + error =i8042_controller_selftest (); +if (error) +return error; + } error =i8042_controller_init ();if (error)
PATCH 92/129 memory hotplug: fix next block calculation in is_removable
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: KAMEZAWA Hiroyuki <[email protected]>
commit 0dcc48c15f63ee86c2fcd33968b08d651f0360a5 upstream.
next_active_pageblock() is for finding next _used_ freeblock. It skips several blocks when it finds there are a chunk of free pages lager than pageblock. But it has 2 bugs.
1. We have no lock. page_order(page) - pageblock_order can be minus.
2. pageblocks_stride += is wrong. it should skip page_order(p) of pages.
--- mm/memory_hotplug.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
mm/memory_hotplug.c +8 -8
@@ -584,19 +584,19 @@ static inline int pageblock_free(struct/* Return the start of the next active pageblock after a given page */ static struct page *next_active_pageblock (struct page *page) { -int pageblocks_stride; -/* Ensure the starting page is pageblock-aligned */ BUG_ON (page_to_pfn (page) & (pageblock_nr_pages -1 )); -/* Move forward by at least 1 * pageblock_nr_pages */ - pageblocks_stride =1 ; -/* If the entire pageblock is free, move to the end of free page */ -if (pageblock_free (page)) - pageblocks_stride +=page_order (page) - pageblock_order; +if (pageblock_free (page)) { +int order; +/* be careful. we don't have locks, page_order can be changed.*/ + order =page_order (page); +if ((order <MAX_ORDER ) && (order >= pageblock_order)) +return page + (1 << order); + } -return page + (pageblocks_stride * pageblock_nr_pages); +return page + pageblock_nr_pages; }/* Checks if this range of memory is likely to be hot-removable. */
PATCH 93/129 perf: Initialize callchains rootss childen hits
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Frederic Weisbecker <[email protected]>
commit 5225c45899e872383ca39f5533d28ec63c54b39e upstream.
Each histogram entry has a callchain root that stores the callchain samples. However we forgot to initialize the tracking of children hits of these roots, which then got random values on their creation.
The root children hits is multiplied by the minimum percentage of hits provided by the user, and the result becomes the minimum hits expected from children branches. If the random value due to the uninitialization is big enough, then this minimum number of hits can be huge and eventually filter every children branches.
The end result was invisible callchains. All we need to fix this is to initialize the children hits of the root.
--- tools/perf/util/callchain.h | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/callchain.h +1 -0
@@ -50,6 +50,7 @@ static inline void callchain_init(structINIT_LIST_HEAD (&node->children);INIT_LIST_HEAD (&node->val); + node->children_hit =0 ; node->parent =NULL ; node->hit =0 ; }
PATCH 94/129 powerpc/perf_event: Reduce latency of calling perf_event_do_pending
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Paul Mackerras <[email protected]>
commit b0d278b7d3ae9115939ddcea93f516308cc367e2 upstream.
Commit 0fe1ac48 ("powerpc/perf_event: Fix oops due to perf_event_do_pending call") moved the call to perf_event_do_pending in timer_interrupt() down so that it was after the irq_enter() call. Unfortunately this moved it after the code that checks whether it is time for the next decrementer clock event. The result is that the call to perf_event_do_pending() won't happen until the next decrementer clock event is due. This was pointed out by Milton Miller.
This fixes it by moving the check for whether it's time for the next decrementer clock event down to the point where we're about to call the event handler, after we've called perf_event_do_pending.
This has the side effect that on old pre-Core99 Powermacs where we use the ppc_n_lost_interrupts mechanism to replay interrupts, a replayed interrupt will incur a little more latency since it will now do the code from the irq_enter down to the irq_exit, that it used to skip. However, these machines are now old and rare enough that this doesn't matter. To make it clear that ppc_n_lost_interrupts is only used on Powermacs, and to speed up the code slightly on non-Powermac ppc32 machines, the code that tests ppc_n_lost_interrupts is now conditional on CONFIG_PMAC as well as CONFIG_PPC32.
--- arch/powerpc/kernel/time.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
arch/powerpc/kernel/time.c +11 -12
@@ -616,20 +616,11 @@ void timer_interrupt(struct pt_regs * re* some CPUs will continuue to take decrementer exceptions */ set_dec (DECREMENTER_MAX ); -#ifdef CONFIG_PPC32 +#if defined(CONFIG_PPC32 ) && defined(CONFIG_PMAC )if (atomic_read (&ppc_n_lost_interrupts) !=0 )do_IRQ (regs);#endif - now =get_tb_or_rtc (); -if (now < decrementer->next_tb) { -/* not time for this event yet */ - now = decrementer->next_tb - now; -if (now <=DECREMENTER_MAX ) -set_dec ((int )now); -trace_timer_interrupt_exit (regs); -return ; - } old_regs =set_irq_regs (regs);irq_enter ();
@@ -645,8 +636,16 @@ void timer_interrupt(struct pt_regs * reget_lppaca ()->int_dword.fields.decr_int =0 ;#endif -if (evt->event_handler) - evt->event_handler (evt); + now =get_tb_or_rtc (); +if (now >= decrementer->next_tb) { + decrementer->next_tb = ~(u64 )0 ; +if (evt->event_handler) + evt->event_handler (evt); + }else { + now = decrementer->next_tb - now; +if (now <=DECREMENTER_MAX ) +set_dec ((int )now); + }#ifdef CONFIG_PPC_ISERIES if (firmware_has_feature (FW_FEATURE_ISERIES ) &&hvlpevent_is_pending ())
PATCH 95/129 p54: fix tx feedback status flag check
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Christian Lamparter <[email protected]>
commit f880c2050f30b23c9b6f80028c09f76e693bf309 upstream.
Michael reported that p54* never really entered power save mode, even tough it was enabled.
It turned out that upon a power save mode change the firmware will set a special flag onto the last outgoing frame tx status (which in this case is almost always the designated PSM nullfunc frame). This flag confused the driver; It erroneously reported transmission failures to the stack, which then generated the next nullfunc. and so on...
--- drivers/net/wireless/p54/txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/p54/txrx.c +1 -1
@@ -444,7 +444,7 @@ static void p54_rx_frame_sent(struct p54 }if (!(info->flags &IEEE80211_TX_CTL_NO_ACK ) && - (!payload->status)) + !(payload->status &P54_TX_FAILED )) info->flags |=IEEE80211_TX_STAT_ACK ;if (payload->status &P54_TX_PSM_CANCELLED ) info->flags |=IEEE80211_TX_STAT_TX_FILTERED ;
PATCH 96/129 ath5k: check return value of ieee80211_get_tx_rate
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: John W. Linville <[email protected]>
commit d8e1ba76d619dbc0be8fbeee4e6c683b5c812d3a upstream.
This avoids a NULL pointer dereference as reported here:
https://bugzilla.redhat.com/show_bug.cgi?id=625889
When the WARN condition is hit in ieee80211_get_tx_rate, it will return NULL. So, we need to check the return value and avoid dereferencing it in that case.
--- drivers/net/wireless/ath/ath5k/base.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath5k/base.c +4 -0
@@ -1318,6 +1318,10 @@ ath5k_txbuf_setup(struct ath5k_softc *sc PCI_DMA_TODEVICE); rate =ieee80211_get_tx_rate (sc->hw, info); +if (!rate) { + ret = -EINVAL ; + goto err_unmap; + }if (info->flags &IEEE80211_TX_CTL_NO_ACK ) flags |=AR5K_TXDESC_NOACK ;
PATCH 97/129 wireless extensions: fix kernel heap content leak
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Johannes Berg <[email protected]>
commit 42da2f948d949efd0111309f5827bf0298bcc9a4 upstream.
Wireless extensions have an unfortunate, undocumented requirement which requires drivers to always fill iwp->length when returning a successful status. When a driver doesn't do this, it leads to a kernel heap content leak when userspace offers a larger buffer than would have been necessary.
Arguably, this is a driver bug, as it should, if it returns 0, fill iwp->length, even if it separately indicated that the buffer contents was not valid.
However, we can also at least avoid the memory content leak if the driver doesn't do this by setting the iwp length to max_tokens, which then reflects how big the buffer is that the driver may fill, regardless of how big the userspace buffer is.
To illustrate the point, this patch also fixes a corresponding cfg80211 bug (since this requirement isn't documented nor was ever pointed out by anyone during code review, I don't trust all drivers nor all cfg80211 handlers to implement it correctly).
--- net/wireless/wext-compat.c | 3 +++ net/wireless/wext-core.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)
net/wireless/wext-compat.c +3 -0
@@ -1420,6 +1420,9 @@ int cfg80211_wext_giwessid(struct net_de {struct wireless_dev *wdev = dev->ieee80211_ptr; + data->flags =0 ; + data->length =0 ; +switch (wdev->iftype) {case NL80211_IFTYPE_ADHOC :return cfg80211_ibss_wext_giwessid (dev, info, data, ssid);
net/wireless/wext-core.c +16 -0
@@ -782,6 +782,22 @@ static int ioctl_standard_iw_point(struc } } +if (IW_IS_GET (cmd) && !(descr->flags &IW_DESCR_FLAG_NOMAX )) { +/* +* If this is a GET, but not NOMAX, it means that the extra +* data is not bounded by userspace, but by max_tokens. Thus +* set the length to max_tokens. This matches the extra data +* allocation. +* The driver should fill it with the number of tokens it +* provided, and it may check iwp->length rather than having +* knowledge of max_tokens. If the driver doesn't change the +* iwp->length, this ioctl just copies back max_token tokens +* filled with zeroes. Hopefully the driver isn't claiming +* them to be valid data. +*/ + iwp->length = descr->max_tokens; + } + err =handler (dev, info, (union iwreq_data *) iwp, extra); iwp->length += essid_compat;
PATCH 98/129 RDMA/cxgb3: Dont exceed the max HW CQ depth
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Steve Wise <[email protected]>
commit dc4e96ce2dceb649224ee84f83592aac8c54c9b7 upstream.
The max depth supported by T3 is 64K entries. This fixes a bug introduced in commit 9918b28d ("RDMA/cxgb3: Increase the max CQ depth") that causes stalls and possibly crashes in large MPI clusters.
--- drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/cxgb3/cxio_hal.h +1 -1
@@ -53,7 +53,7 @@#define T3_MAX_PBL_SIZE 256#define T3_MAX_RQ_SIZE 1024#define T3_MAX_QP_DEPTH (T3_MAX_RQ_SIZE-1) -#define T3_MAX_CQ_DEPTH 262144 +#define T3_MAX_CQ_DEPTH 65536#define T3_MAX_NUM_STAG (1<<15)#define T3_MAX_MR_SIZE 0x100000000ULL#define T3_PAGESIZE_MASK 0xffff000/* 4KB-128MB */
PATCH 99/129 x86, tsc: Fix a preemption leak in restore_sched_clock_state()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Peter Zijlstra <[email protected]>
commit 55496c896b8a695140045099d4e0175cf09d4eae upstream.
Doh, a real life genuine preemption leak..
This caused a suspend failure.
Reported-bisected-and-tested-by-the-invaluable: Jeff Chua <[email protected]>
sleep states
LKML-Reference: <1284150773.402.122.camel@laptop>
--- arch/x86/kernel/tsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/tsc.c +1 -1
@@ -655,7 +655,7 @@ void restore_sched_clock_state(void)local_irq_save (flags); -get_cpu_var (cyc2ns_offset) =0 ; +__get_cpu_var (cyc2ns_offset) =0 ; offset = cyc2ns_suspend -sched_clock ();for_each_possible_cpu (cpu)
PATCH 100/129 x86-64, compat: Test %rax for the syscall number, not %eax
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: H. Peter Anvin <[email protected]>
commit 36d001c70d8a0144ac1d038f6876c484849a74de upstream.
On 64 bits, we always, by necessity, jump through the system call table via %rax. For 32-bit system calls, in theory the system call number is stored in %eax, and the code was testing %eax for a valid system call number. At one point we loaded the stored value back from the stack to enforce zero-extension, but that was removed in checkin d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process will not be able to introduce a non-zero-extended number, but it can happen via ptrace.
Instead of re-introducing the zero-extension, test what we are actually going to use, i.e. %rax. This only adds a handful of REX prefixes to the code.
--- arch/x86/ia32/ia32entry.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/ia32/ia32entry.S +7 -7
@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) CFI_REMEMBER_STATE jnz sysenter_tracesys - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys sysenter_do_call: IA32_ARG_FIXUP
@@ -195,7 +195,7 @@ sysexit_from_sys_call: movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ call audit_syscall_entry movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys movl %ebx,%edi /* reload 1st syscall arg */ movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
@@ -248,7 +248,7 @@ sysenter_tracesys: call syscall_trace_enter LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */ jmp sysenter_do_call CFI_ENDPROC
@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) CFI_REMEMBER_STATE jnz cstar_tracesys - cmpl $IA32_NR_syscalls-1,%eax + cmpq $IA32_NR_syscalls-1,%rax ja ia32_badsys cstar_do_call: IA32_ARG_FIXUP 1
@@ -367,7 +367,7 @@ cstar_tracesys: LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ RESTORE_REST xchgl %ebp,%r9d - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */ jmp cstar_do_call END(ia32_cstar_target)
@@ -425,7 +425,7 @@ ENTRY(ia32_syscall) orl $TS_COMPAT,TI_status(%r10) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) jnz ia32_tracesys - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys ia32_do_call: IA32_ARG_FIXUP
@@ -444,7 +444,7 @@ ia32_tracesys: call syscall_trace_enter LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ jmp ia32_do_call END(ia32_syscall)
PATCH 101/129 compat: Make compat_alloc_user_space() incorporate the access_ok()
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: H. Peter Anvin <[email protected]>
commit c41d68a513c71e35a14f66d71782d27a79a81ea6 upstream.
compat_alloc_user_space() expects the caller to independently call access_ok() to verify the returned area. A missing call could introduce problems on some architectures.
This patch incorporates the access_ok() check into compat_alloc_user_space() and also adds a sanity check on the length. The existing compat_alloc_user_space() implementations are renamed arch_compat_alloc_user_space() and are used as part of the implementation of the new global function.
This patch assumes NULL will cause __get_user()/__put_user() to either fail or access userspace on all architectures. This should be followed by checking the return value of compat_access_user_space() for NULL in the callers, at which time the access_ok() in the callers can also be removed.
--- arch/ia64/include/asm/compat.h | 2 +- arch/mips/include/asm/compat.h | 2 +- arch/parisc/include/asm/compat.h | 2 +- arch/powerpc/include/asm/compat.h | 2 +- arch/s390/include/asm/compat.h | 2 +- arch/sparc/include/asm/compat.h | 2 +- arch/x86/include/asm/compat.h | 2 +- include/linux/compat.h | 3 +++ kernel/compat.c | 21 +++++++++++++++++++++ 9 files changed, 31 insertions(+), 7 deletions(-)
arch/ia64/include/asm/compat.h +1 -1
@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr) }static __inline__void __user * -compat_alloc_user_space (long len) +arch_compat_alloc_user_space (long len) {struct pt_regs *regs =task_pt_regs (current);return (void __user *) (((regs->r12 &0xffffffff ) &-16 ) - len);
arch/mips/include/asm/compat.h +1 -1
@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compareturn (u32 )(unsigned long )uptr; } -static inline void __user *compat_alloc_user_space (long len) +static inline void __user *arch_compat_alloc_user_space (long len) {struct pt_regs *regs = (struct pt_regs *) ((unsigned long )current_thread_info () +THREAD_SIZE -32 ) -1 ;
arch/parisc/include/asm/compat.h +1 -1
@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compareturn (u32 )(unsigned long )uptr; } -static __inline__void __user *compat_alloc_user_space (long len) +static __inline__void __user *arch_compat_alloc_user_space (long len) {struct pt_regs *regs = ¤t->thread.regs;return (void __user *)regs->gr[30 ];
arch/powerpc/include/asm/compat.h +1 -1
@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compareturn (u32 )(unsigned long )uptr; } -static inline void __user *compat_alloc_user_space (long len) +static inline void __user *arch_compat_alloc_user_space (long len) {struct pt_regs *regs = current->thread.regs;unsigned long usp = regs->gpr[1 ];
arch/s390/include/asm/compat.h +1 -1
@@ -181,7 +181,7 @@ static inline int is_compat_task(void)#endif -static inline void __user *compat_alloc_user_space (long len) +static inline void __user *arch_compat_alloc_user_space (long len) {unsigned long stack;
arch/sparc/include/asm/compat.h +1 -1
@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compareturn (u32 )(unsigned long )uptr; } -static inline void __user *compat_alloc_user_space (long len) +static inline void __user *arch_compat_alloc_user_space (long len) {struct pt_regs *regs =current_thread_info ()->kregs;unsigned long usp = regs->u_regs[UREG_I6 ];
arch/x86/include/asm/compat.h +1 -1
@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compareturn (u32 )(unsigned long )uptr; } -static inline void __user *compat_alloc_user_space (long len) +static inline void __user *arch_compat_alloc_user_space (long len) {struct pt_regs *regs =task_pt_regs (current);return (void __user *)regs->sp - len;
include/linux/compat.h +3 -0
@@ -360,5 +360,8 @@ extern ssize_t compat_rw_copy_check_uvec const struct compat_iovec __user *uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer); + +extern void __user *compat_alloc_user_space (unsigned long len); +#endif /* CONFIG_COMPAT */ #endif /* _LINUX_COMPAT_H */
kernel/compat.c +21 -0
@@ -1137,3 +1137,24 @@ compat_sys_sysinfo(struct compat_sysinforeturn 0 ; } + +/* +* Allocate user-space memory for the duration of a single system call, +* in order to marshall parameters inside a compat thunk. +*/ +void __user *compat_alloc_user_space (unsigned long len) +{ +void __user *ptr; + +/* If len would occupy more than half of the entire compat space... */ +if (unlikely (len > (((compat_uptr_t )~0 ) >>1 ))) +return NULL ; + + ptr =arch_compat_alloc_user_space (len); + +if (unlikely (!access_ok (VERIFY_WRITE , ptr, len))) +return NULL ; + +return ptr; +} +EXPORT_SYMBOL_GPL (compat_alloc_user_space);
PATCH 102/129 x86-64, compat: Retruncate rax after ia32 syscall entry tracing
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Roland McGrath <[email protected]>
commit eefdca043e8391dcd719711716492063030b55ac upstream.
In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a 32-bit tracee in system call entry. A %rax value set via ptrace at the entry tracing stop gets used whole as a 32-bit syscall number, while we only check the low 32 bits for validity.
Fix it by truncating %rax back to 32 bits after syscall_trace_enter, in addition to testing the full 64 bits as has already been added.
--- arch/x86/ia32/ia32entry.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/ia32/ia32entry.S +7 -1
@@ -50,7 +50,12 @@ /* * Reload arg registers from stack in case ptrace changed them. * We don't reload %eax because syscall_trace_enter() returned - * the value it wants us to use in the table lookup. + * the %rax value we should see. Instead, we just truncate that + * value to 32 bits again as we did on entry from user mode. + * If it's a new value set by user_regset during entry tracing, + * this matches the normal truncation of the user-mode value. + * If it's -1 to make us punt the syscall, then (u32)-1 is still + * an appropriately invalid value. */ .macro LOAD_ARGS32 offset, _r9=0 .if \_r9
@@ -60,6 +65,7 @@ movl \offset+48(%rsp),%edx movl \offset+56(%rsp),%esi movl \offset+64(%rsp),%edi + movl %eax,%eax /* zero extension */ .endm .macro CFI_STARTPROC32 simple
PATCH 103/129 ALSA: HDA: Enable internal speaker on Dell M101z
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <[email protected]>
commit 145a902bfeb1f89a41165bd2d1e633ce070bcb73 upstream.
In some cases a magic processing coefficient is needed to enable the internal speaker on Dell M101z. According to Realtek, this processing coefficient is only present on ALC269vb.
--- sound/pci/hda/patch_realtek.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/pci/hda/patch_realtek.c +10 -0
@@ -14230,6 +14230,7 @@ static void alc269_auto_init(struct hda_enum {ALC269_FIXUP_SONY_VAIO , +ALC269_FIXUP_DELL_M101Z , };static const struct hda_verb alc269_sony_vaio_fixup_verbs[] = {
@@ -14241,11 +14242,20 @@ static const struct alc_fixup alc269_fix [ALC269_FIXUP_SONY_VAIO ] = { .verbs = alc269_sony_vaio_fixup_verbs }, + [ALC269_FIXUP_DELL_M101Z ] = { + .verbs = (const struct hda_verb []) { +/* Enables internal speaker */ + {0x20 ,AC_VERB_SET_COEF_INDEX ,13 }, + {0x20 ,AC_VERB_SET_PROC_COEF ,0x4040 }, + {} + } + }, };static struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x104d ,0x9071 ,"Sony VAIO" ,ALC269_FIXUP_SONY_VAIO ),SND_PCI_QUIRK (0x104d ,0x9077 ,"Sony VAIO" ,ALC269_FIXUP_SONY_VAIO ), +SND_PCI_QUIRK (0x1028 ,0x0470 ,"Dell M101z" ,ALC269_FIXUP_DELL_M101Z ), {} };
PATCH 104/129 x86: hpet: Work around hardware stupidity
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Thomas Gleixner <[email protected]>
commit 54ff7e595d763d894104d421b103a89f7becf47c upstream.
This more or less reverts commits 08be979 (x86: Force HPET readback_cmp for all ATI chipsets) and 30a564be (x86, hpet: Restrict read back to affected ATI chipsets) to the status of commit 8da854c (x86, hpet: Erratum workaround for read after write of HPET comparator).
The delta to commit 8da854c is mostly comments and the change from WARN_ONCE to printk_once as we know the call path of this function already.
This needs really in depth explanation:
First of all the HPET design is a complete failure. Having a counter compare register which generates an interrupt on matching values forces the software to do at least one superfluous readback of the counter register.
While it is nice in theory to program "absolute" time events it is practically useless because the timer runs at some absurd frequency which can never be matched to real world units. So we are forced to calculate a relative delta and this forces a readout of the actual counter value, adding the delta and programming the compare register. When the delta is small enough we run into the danger that we program a compare value which is already in the past. Due to the compare for equal nature of HPET we need to read back the counter value after writing the compare rehgister (btw. this is necessary for absolute timeouts as well) to make sure that we did not miss the timer event. We try to work around that by setting the minimum delta to a value which is larger than the theoretical time which elapses between the counter readout and the compare register write, but that's only true in theory. A NMI or SMI which hits between the readout and the write can easily push us beyond that limit. This would result in waiting for the next HPET timer interrupt until the 32bit wraparound of the counter happens which takes about 306 seconds.
So we designed the next event function to look like:
match = read_cnt() + delta; write_compare_ref(match); return read_cnt() < match ? 0 : -ETIME;
At some point we got into trouble with certain ATI chipsets. Even the above "safe" procedure failed. The reason was that the write to the compare register was delayed probably for performance reasons. The theory was that they wanted to avoid the synchronization of the write with the HPET clock, which is understandable. So the write does not hit the compare register directly instead it goes to some intermediate register which is copied to the real compare register in sync with the HPET clock. That opens another window for hitting the dreaded "wait for a wraparound" problem.
To work around that "optimization" we added a read back of the compare register which either enforced the update of the just written value or just delayed the readout of the counter enough to avoid the issue. We unfortunately never got any affirmative info from ATI/AMD about this.
One thing is sure, that we nuked the performance "optimization" that way completely and I'm pretty sure that the result is worse than before some HW folks came up with those.
Just for paranoia reasons I added a check whether the read back compare register value was the same as the value we wrote right before. That paranoia check triggered a couple of years after it was added on an Intel ICH9 chipset. Venki added a workaround (commit 8da854c) which was reading the compare register twice when the first check failed. We considered this to be a penalty in general and restricted the readback (thus the wasted CPU cycles) to the known to be affected ATI chipsets.
This turned out to be a utterly wrong decision. 2.6.35 testers experienced massive problems and finally one of them bisected it down to commit 30a564be which spured some further investigation.
Finally we got confirmation that the write to the compare register can be delayed by up to two HPET clock cycles which explains the problems nicely. All we can do about this is to go back to Venki's initial workaround in a slightly modified version.
Just for the record I need to say, that all of this could have been avoided if hardware designers and of course the HPET committee would have thought about the consequences for a split second. It's out of my comprehension why designing a working timer is so hard. There are two ways to achieve it:
1) Use a counter wrap around aware compare_reg <= counter_reg implementation instead of the easy compare_reg == counter_reg
Downsides:
- It needs more silicon.
- It needs a readout of the counter to apply a relative timeout. This is necessary as the counter does not run in any useful (and adjustable) frequency and there is no guarantee that the counter which is used for timer events is the same which is used for reading the actual time (and therefor for calculating the delta)
Upsides:
- None
2) Use a simple down counter for relative timer events
Downsides:
- Absolute timeouts are not possible, which is not a problem at all in the context of an OS and the expected max. latencies/jitter (also see Downsides of #1)
Upsides:
- It needs less or equal silicon.
- It works ALWAYS
- It is way faster than a compare register based solution (One write versus one write plus at least one and up to four reads)
I would not be so grumpy about all of this, if I would not have been ignored for many years when pointing out these flaws to various hardware folks. I really hate timers (at least those which seem to be designed by janitors).
Though finally we got a reasonable explanation plus a solution and I want to thank all the folks involved in chasing it down and providing valuable input to this.
--- arch/x86/include/asm/hpet.h | 1 - arch/x86/kernel/early-quirks.c | 18 ------------------ arch/x86/kernel/hpet.c | 31 +++++++++++++++++-------------- 3 files changed, 17 insertions(+), 33 deletions(-)
arch/x86/include/asm/hpet.h +0 -1
@@ -68,7 +68,6 @@ extern unsigned long force_hpet_address;extern u8 hpet_blockid;extern int hpet_force_user;extern u8 hpet_msi_disable; -extern u8 hpet_readback_cmp;extern int is_hpet_enabled (void );extern int hpet_enable (void );extern void hpet_disable (void );
arch/x86/kernel/early-quirks.c +0 -18
@@ -18,7 +18,6 @@#include <asm/apic.h> #include <asm/iommu.h> #include <asm/gart.h> -#include <asm/hpet.h> static void __init fix_hypertransport_config (int num,int slot,int func) {
@@ -192,21 +191,6 @@ static void __init ati_bugs_contd(int nu }#endif -/* -* Force the read back of the CMP register in hpet_next_event() -* to work around the problem that the CMP register write seems to be -* delayed. See hpet_next_event() for details. -* -* We do this on all SMBUS incarnations for now until we have more -* information about the affected chipsets. -*/ -static void __init ati_hpet_bugs (int num,int slot,int func) -{ -#ifdef CONFIG_HPET_TIMER - hpet_readback_cmp =1 ; -#endif -} -#define QFLAG_APPLY_ONCE 0x1#define QFLAG_APPLIED 0x2#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
@@ -236,8 +220,6 @@ static struct chipset early_qrk[] __init PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs }, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd }, - { PCI_VENDOR_ID_ATI, PCI_ANY_ID, - PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_hpet_bugs }, {} };
arch/x86/kernel/hpet.c +17 -14
@@ -36,7 +36,6 @@unsigned long hpet_address;u8 hpet_blockid;/* OS timer block num */ u8 hpet_msi_disable; -u8 hpet_readback_cmp;#ifdef CONFIG_PCI_MSI static unsigned long hpet_num_timers;
@@ -396,23 +395,27 @@ static int hpet_next_event(unsigned long* at that point and we would wait for the next hpet interrupt * forever. We found out that reading the CMP register back * forces the transfer so we can rely on the comparison with -* the counter register below. +* the counter register below. If the read back from the +* compare register does not match the value we programmed +* then we might have a real hardware problem. We can not do +* much about it here, but at least alert the user/admin with +* a prominent warning. * -* That works fine on those ATI chipsets, but on newer Intel -* chipsets (ICH9...) this triggers due to an erratum: Reading -* the comparator immediately following a write is returning -* the old value. +* An erratum on some chipsets (ICH9,..), results in +* comparator read immediately following a write returning old +* value. Workaround for this is to read this value second +* time, when first read returns old value. * -* We restrict the read back to the affected ATI chipsets (set -* by quirks) and also run it with hpet=verbose for debugging -* purposes. +* In fact the write to the comparator register is delayed up +* to two HPET cycles so the workaround we tried to restrict +* the readback to those known to be borked ATI chipsets +* failed miserably. So we give up on optimizations forever +* and penalize all HPET incarnations unconditionally. */ -if (hpet_readback_cmp || hpet_verbose) { -u32 cmp =hpet_readl (HPET_Tn_CMP (timer)); - -if (cmp != cnt) +if (unlikely ((u32 )hpet_readl (HPET_Tn_CMP (timer)) != cnt)) { +if (hpet_readl (HPET_Tn_CMP (timer)) != cnt)printk_once (KERN_WARNING -"hpet: compare register read back failed.\n" ); +"hpet: compare register read back failed.\n" ); }return (s32)(hpet_readl (HPET_COUNTER ) - cnt) >=0 ? -ETIME :0 ;
PATCH 105/129 arm: fix really nasty sigreturn bug
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Al Viro <[email protected]>
commit 653d48b22166db2d8b1515ebe6f9f0f7c95dfc86 upstream.
If a signal hits us outside of a syscall and another gets delivered when we are in sigreturn (e.g. because it had been in sa_mask for the first one and got sent to us while we'd been in the first handler), we have a chance of returning from the second handler to location one insn prior to where we ought to return. If r0 happens to contain -513 (-ERESTARTNOINTR), sigreturn will get confused into doing restart syscall song and dance.
Incredible joy to debug, since it manifests as random, infrequent and very hard to reproduce double execution of instructions in userland code...
The fix is simple - mark it "don't bother with restarts" in wrapper, i.e. set r8 to 0 in sys_sigreturn and sys_rt_sigreturn wrappers, suppressing the syscall restart handling on return from these guys. They can't legitimately return a restart-worthy error anyway.
Testcase:
#include <unistd.h>
#include <signal.h>
#include <stdlib.h>
#include <sys/time.h>
#include <errno.h>
void f(int n)
{
__asm__ __volatile__(
"ldr r0, [%0]\n"
"b 1f\n"
"b 2f\n"
"1:b .\n"
"2:\n" : : "r"(&n));
}
void handler1(int sig) { }
void handler2(int sig) { raise(1); }
void handler3(int sig) { exit(0); }
main()
{
struct sigaction s = {.sa_handler = handler2};
struct itimerval t1 = { .it_value = {1} };
struct itimerval t2 = { .it_value = {2} };
signal(1, handler1);
sigemptyset(&s.sa_mask);
sigaddset(&s.sa_mask, 1);
sigaction(SIGALRM, &s, NULL);
signal(SIGVTALRM, handler3);
setitimer(ITIMER_REAL, &t1, NULL);
setitimer(ITIMER_VIRTUAL, &t2, NULL);
f(-513); /* -ERESTARTNOINTR */
write(1, "buggered\n", 9);
return 1;
}--- arch/arm/kernel/entry-common.S | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/kernel/entry-common.S +2 -0
@@ -382,11 +382,13 @@ ENDPROC(sys_clone_wrapper) sys_sigreturn_wrapper: add r0, sp, #S_OFF + mov why, #0 @ prevent syscall restart handling b sys_sigreturn ENDPROC(sys_sigreturn_wrapper) sys_rt_sigreturn_wrapper: add r0, sp, #S_OFF + mov why, #0 @ prevent syscall restart handling b sys_rt_sigreturn ENDPROC(sys_rt_sigreturn_wrapper)
PATCH 106/129 hwmon: (emc1403) Remove unnecessary hwmon_device_unregister
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Yong Wang <[email protected]>
commit f17c811d1433aa1966f9c5a744841427e9a97ecf upstream.
It is unnecessary and wrong to call hwmon_device_unregister in error handling before hwmon_device_register is called.
--- drivers/hwmon/emc1403.c | 1 - 1 file changed, 1 deletion(-)
drivers/hwmon/emc1403.c +0 -1
@@ -275,7 +275,6 @@ static int emc1403_probe(struct i2c_clie res =sysfs_create_group (&client->dev.kobj, &m_thermal_gr);if (res) {dev_warn (&client->dev,"create group failed\n" ); -hwmon_device_unregister (data->hwmon_dev); goto thermal_error1; } data->hwmon_dev =hwmon_device_register (&client->dev);
PATCH 107/129 hwmon: (f75375s) Shift control mode to the correct bit position
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Guillem Jover <[email protected]>
commit 96f3640894012be7dd15a384566bfdc18297bc6c upstream.
The spec notes that fan0 and fan1 control mode bits are located in bits 7-6 and 5-4 respectively, but the FAN_CTRL_MODE macro was making the bits shift by 5 instead of by 4.
--- drivers/hwmon/f75375s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/f75375s.c +1 -1
@@ -79,7 +79,7 @@ enum chips { f75373, f75375 };#define F75375_REG_PWM2_DROP_DUTY 0x6C#define FAN_CTRL_LINEAR (nr) (4 + nr) -#define FAN_CTRL_MODE (nr) (5 + ((nr) * 2)) +#define FAN_CTRL_MODE (nr) (4 + ((nr) * 2))/* * Data structures and manipulation thereof
PATCH 108/129 hwmon: (f75375s) Do not overwrite values read from registers
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Guillem Jover <[email protected]>
commit c3b327d60bbba3f5ff8fd87d1efc0e95eb6c121b upstream.
All bits in the values read from registers to be used for the next write were getting overwritten, avoid doing so to not mess with the current configuration.
--- drivers/hwmon/f75375s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/f75375s.c +2 -2
@@ -298,7 +298,7 @@ static int set_pwm_enable_direct(structreturn -EINVAL ; fanmode =f75375_read8 (client,F75375_REG_FAN_TIMER ); - fanmode = ~(3 <<FAN_CTRL_MODE (nr)); + fanmode &= ~(3 <<FAN_CTRL_MODE (nr));switch (val) {case 0 :/* Full speed */
@@ -350,7 +350,7 @@ static ssize_t set_pwm_mode(struct devicmutex_lock (&data->update_lock); conf =f75375_read8 (client,F75375_REG_CONFIG1 ); - conf = ~(1 <<FAN_CTRL_LINEAR (nr)); + conf &= ~(1 <<FAN_CTRL_LINEAR (nr));if (val ==0 ) conf |= (1 <<FAN_CTRL_LINEAR (nr)) ;
PATCH 109/129 apm_power: Add missing break statement
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Anton Vorontsov <[email protected]>
commit 1d220334d6a8a711149234dc5f98d34ae02226b8 upstream.
The missing break statement causes wrong capacity calculation for batteries that report energy.
--- drivers/power/apm_power.c | 1 + 1 file changed, 1 insertion(+)
drivers/power/apm_power.c +1 -0
@@ -233,6 +233,7 @@ static int calculate_capacity(enum apm_s empty_design_prop =POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN ; now_prop =POWER_SUPPLY_PROP_ENERGY_NOW ; avg_prop =POWER_SUPPLY_PROP_ENERGY_AVG ; +break ;case SOURCE_VOLTAGE : full_prop =POWER_SUPPLY_PROP_VOLTAGE_MAX ; empty_prop =POWER_SUPPLY_PROP_VOLTAGE_MIN ;
PATCH 110/129 cifs: fix potential double put of TCP session reference
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Layton <[email protected]>
commit 460cf3411b858ad509d5255e0dfaf862a83c0299 upstream.
cifs_get_smb_ses must be called on a server pointer on which it holds an active reference. It first does a search for an existing SMB session. If it finds one, it'll put the server reference and then try to ensure that the negprot is done, etc.
If it encounters an error at that point then it'll return an error. There's a potential problem here though. When cifs_get_smb_ses returns an error, the caller will also put the TCP server reference leading to a double-put.
Fix this by having cifs_get_smb_ses only put the server reference if it found an existing session that it could use and isn't returning an error.
--- fs/cifs/connect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/cifs/connect.c +3 -3
@@ -1647,9 +1647,6 @@ cifs_get_smb_ses(struct TCP_Server_Infoif (ses) {cFYI (1 ,"Existing smb sess found (status=%d)" , ses->status); -/* existing SMB ses has a server reference already */ -cifs_put_tcp_session (server); -mutex_lock (&ses->session_mutex); rc =cifs_negotiate_protocol (xid, ses);if (rc) {
@@ -1672,6 +1669,9 @@ cifs_get_smb_ses(struct TCP_Server_Info } }mutex_unlock (&ses->session_mutex); + +/* existing SMB ses has a server reference already */ +cifs_put_tcp_session (server);FreeXid (xid);return ses; }
PATCH 111/129 NFS: Fix a typo in nfs_sockaddr_match_ipaddr6
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Trond Myklebust <[email protected]>
commit b20d37ca9561711c6a3c4b859c2855f49565e061 upstream.
--- fs/nfs/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/client.c +1 -1
@@ -274,7 +274,7 @@ static int nfs_sockaddr_match_ipaddr6(co sin1->sin6_scope_id != sin2->sin6_scope_id)return 0 ; -return ipv6_addr_equal (&sin1->sin6_addr, &sin1->sin6_addr); +return ipv6_addr_equal (&sin1->sin6_addr, &sin2->sin6_addr); }#else /* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1,
PATCH 112/129 SUNRPC: Fix race corrupting rpc upcall
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Trond Myklebust <[email protected]>
commit 5a67657a2e90c9e4a48518f95d4ba7777aa20fbb upstream.
If rpc_queue_upcall() adds a new upcall to the rpci->pipe list just after rpc_pipe_release calls rpc_purge_list(), but before it calls gss_pipe_release (as rpci->ops->release_pipe(inode)), then the latter will free a message without deleting it from the rpci->pipe list.
We will be left with a freed object on the rpc->pipe list. Most frequent symptoms are kernel crashes in rpc.gssd system calls on the pipe in question.
--- net/sunrpc/auth_gss/auth_gss.c | 9 +++++---- net/sunrpc/rpc_pipe.c | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-)
net/sunrpc/auth_gss/auth_gss.c +5 -4
@@ -745,17 +745,18 @@ gss_pipe_release(struct inode *inode)struct rpc_inode *rpci =RPC_I (inode);struct gss_upcall_msg *gss_msg; +restart:spin_lock (&inode->i_lock); -while (!list_empty (&rpci->in_downcall)) { +list_for_each_entry (gss_msg, &rpci->in_downcall, list) { - gss_msg =list_entry (rpci->in_downcall.next, - struct gss_upcall_msg, list); +if (!list_empty (&gss_msg->msg.list)) +continue ; gss_msg->msg.errno = -EPIPE ;atomic_inc (&gss_msg->count);__gss_unhash_msg (gss_msg);spin_unlock (&inode->i_lock);gss_release_msg (gss_msg); -spin_lock (&inode->i_lock); + goto restart; }spin_unlock (&inode->i_lock);
net/sunrpc/rpc_pipe.c +3 -3
@@ -48,7 +48,7 @@ static void rpc_purge_list(struct rpc_inreturn ;do { msg = list_entry(head->next, struct rpc_pipe_msg, list); -list_del (&msg->list); +list_del_init (&msg->list); msg->errno = err;destroy_msg (msg); }while (!list_empty (head));
@@ -208,7 +208,7 @@ rpc_pipe_release(struct inode *inode, stif (msg !=NULL ) {spin_lock (&inode->i_lock); msg->errno = -EAGAIN ; -list_del (&msg->list); +list_del_init (&msg->list);spin_unlock (&inode->i_lock); rpci->ops->destroy_msg (msg); }
@@ -268,7 +268,7 @@ rpc_pipe_read(struct file *filp, char __if (res <0 || msg->len == msg->copied) { filp->private_data =NULL ;spin_lock (&inode->i_lock); -list_del (&msg->list); +list_del_init (&msg->list);spin_unlock (&inode->i_lock); rpci->ops->destroy_msg (msg); }
PATCH 113/129 agp/intel: Promote warning about failure to setup flush to error.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit df51e7aa2cf204e3a65657a1d60b96cfda133e9b upstream.
Make sure we always detect when we fail to correctly allocate the Isoch Flush Page and print an error to warn the user about the likely memory corruption that will result in invalid rendering or worse.
--- drivers/char/agp/intel-gtt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/char/agp/intel-gtt.c +4 -4
@@ -1061,11 +1061,11 @@ static void intel_i9xx_setup_flush(void)intel_i915_setup_chipset_flush (); } -if (intel_private.ifp_resource.start) { +if (intel_private.ifp_resource.start) intel_private.i9xx_flush_page =ioremap_nocache (intel_private.ifp_resource.start,PAGE_SIZE ); -if (!intel_private.i9xx_flush_page) -dev_info (&intel_private.pcidev->dev,"can't ioremap flush page - no chipset flushing" ); - } +if (!intel_private.i9xx_flush_page) +dev_err (&intel_private.pcidev->dev, +"can't ioremap flush page - no chipset flushing\n" ); }static int intel_i9xx_configure (void )
PATCH 114/129 drm/radeon/kms: fix a regression on r7xx AGP due to the HDP flush fix
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit 87cbf8f2c5d1b1fc4642c3dc0bb6efc587479603 upstream.
commit: 812d046915f48236657f02c06d7dc47140e9ceda drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush breaks on AGP boards since there is no VRAM gart table.
This patch fixes the issue by creating a VRAM scratch page so that can be used on both AGP and PCIE.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=29834
--- drivers/gpu/drm/radeon/r600.c | 2 - drivers/gpu/drm/radeon/radeon.h | 6 ++++ drivers/gpu/drm/radeon/rv770.c | 52 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/r600.c +1 -1
@@ -3526,7 +3526,7 @@ void r600_ioctl_wait_idle(struct radeon_* rather than write to HDP_REG_COHERENCY_FLUSH_CNTL */ if ((rdev->family >=CHIP_RV770 ) && (rdev->family <=CHIP_RV740 )) { -void __iomem *ptr = (void *)rdev->gart.table.vram.ptr; +void __iomem *ptr = (void *)rdev->vram_scratch.ptr;u32 tmp;WREG32 (HDP_DEBUG1 ,0 );
drivers/gpu/drm/radeon/radeon.h +6 -0
@@ -997,6 +997,11 @@ int radeon_gem_set_tiling_ioctl(struct dint radeon_gem_get_tiling_ioctl (struct drm_device *dev,void *data,struct drm_file *filp); +/* VRAM scratch page for HDP bug */ +struct r700_vram_scratch { +struct radeon_bo *robj; +volatile uint32_t *ptr; +};/* * Core structure, functions and helpers.
@@ -1060,6 +1065,7 @@ struct radeon_device {const struct firmware *pfp_fw;/* r6/700 PFP firmware */ const struct firmware *rlc_fw;/* r6/700 RLC firmware */ struct r600_blit r600_blit; +struct r700_vram_scratch vram_scratch;int msi_enabled;/* msi enabled */ struct r600_ih ih;/* r6/700 interrupt ring */ struct workqueue_struct *wq;
drivers/gpu/drm/radeon/rv770.c +52 -0
70 lines not on this page · raw message
PATCH 115/129 drm/i915: Enable MI_FLUSH on Sandybridge
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Zhenyu Wang <[email protected]>
commit a69ffdbfcba8eabf2ca9d384b578e6f28b339c61 upstream.
MI_FLUSH is being deprecated, but still available on Sandybridge. Make sure it's enabled as userspace still uses MI_FLUSH.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -312,6 +312,7 @@#define MI_MODE 0x0209c# define VS_TIMER_DISPATCH (1 << 6) +# define MI_FLUSH_ENABLE (1 << 11)#define SCPD0 0x0209c/* 915+ only */ #define IER 0x020a0
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -2
@@ -203,9 +203,13 @@ static int init_render_ring(struct drm_d {drm_i915_private_t *dev_priv = dev->dev_private;int ret =init_ring_common (dev, ring); +int mode; +if (IS_I9XX (dev) && !IS_GEN3 (dev)) { -I915_WRITE (MI_MODE , - (VS_TIMER_DISPATCH ) <<16 |VS_TIMER_DISPATCH ); + mode =VS_TIMER_DISPATCH <<16 |VS_TIMER_DISPATCH ; +if (IS_GEN6 (dev)) + mode |=MI_FLUSH_ENABLE <<16 |MI_FLUSH_ENABLE ; +I915_WRITE (MI_MODE , mode); }return ret; }
PATCH 116/129 drm/radeon/kms: force legacy pll algo for RV515 LVDS
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit 0d9958b18e10d7426d94cc3dd024920a40db3ee2 upstream.
There has been periodic evidence that LVDS, on at least some panels, prefers the dividers selected by the legacy pll algo. This patch forces the use of the legacy pll algo on RV515 LVDS panels. The old behavior (new pll algo) can be selected by setting the new_pll module parameter to 1.
--- drivers/gpu/drm/radeon/atombios_crtc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/radeon/atombios_crtc.c +14 -0
@@ -527,6 +527,20 @@ static u32 atombios_adjust_pll(struct dr pll->algo =PLL_ALGO_LEGACY ; pll->flags |=RADEON_PLL_PREFER_CLOSEST_LOWER ; } +/* There is some evidence (often anecdotal) that RV515 LVDS +* (on some boards at least) prefers the legacy algo. I'm not +* sure whether this should handled generically or on a +* case-by-case quirk basis. Both algos should work fine in the +* majority of cases. +*/ +if ((radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT )) && + (rdev->family ==CHIP_RV515 )) { +/* allow the user to overrride just in case */ +if (radeon_new_pll ==1 ) + pll->algo =PLL_ALGO_NEW ; +else + pll->algo =PLL_ALGO_LEGACY ; + } }else {if (encoder->encoder_type !=DRM_MODE_ENCODER_DAC ) pll->flags |=RADEON_PLL_NO_ODD_POST_DIV ;
PATCH 117/129 drm/radeon/kms: force legacy pll algo for RV620 LVDS
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit f90087eea44ce5fad139f086bc9d89ca37b0edc2 upstream.
There has been periodic evidence that LVDS, on at least some panels, prefers the dividers selected by the legacy pll algo. This patch forces the use of the legacy pll algo on RV620 LVDS panels. The old behavior (new pll algo) can be selected by setting the new_pll module parameter to 1.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=30029
--- drivers/gpu/drm/radeon/atombios_crtc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/atombios_crtc.c +3 -2
@@ -527,14 +527,15 @@ static u32 atombios_adjust_pll(struct dr pll->algo =PLL_ALGO_LEGACY ; pll->flags |=RADEON_PLL_PREFER_CLOSEST_LOWER ; } -/* There is some evidence (often anecdotal) that RV515 LVDS +/* There is some evidence (often anecdotal) that RV515/RV620 LVDS * (on some boards at least) prefers the legacy algo. I'm not * sure whether this should handled generically or on a * case-by-case quirk basis. Both algos should work fine in the * majority of cases. */ if ((radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT )) && - (rdev->family ==CHIP_RV515 )) { + ((rdev->family ==CHIP_RV515 ) || + (rdev->family ==CHIP_RV620 ))) {/* allow the user to overrride just in case */ if (radeon_new_pll ==1 ) pll->algo =PLL_ALGO_NEW ;
PATCH 118/129 drm/radeon/kms: properly set crtc high base on r7xx
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit 95347871865ca5093c7e87a223274f7c3b5eccda upstream.
--- drivers/gpu/drm/radeon/atombios_crtc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/atombios_crtc.c +4 -4
@@ -1007,11 +1007,11 @@ static int avivo_crtc_set_base(struct drif (rdev->family >=CHIP_RV770 ) {if (radeon_crtc->crtc_id) { -WREG32 (R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH ,0 ); -WREG32 (R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH ,0 ); +WREG32 (R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH ,upper_32_bits (fb_location)); +WREG32 (R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH ,upper_32_bits (fb_location)); }else { -WREG32 (R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH ,0 ); -WREG32 (R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH ,0 ); +WREG32 (R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH ,upper_32_bits (fb_location)); +WREG32 (R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH ,upper_32_bits (fb_location)); } } WREG32(AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,
PATCH 119/129 drm/radeon/kms/evergreen: fix gpu hangs in userspace accel code
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit 7e7b41d2ff30ed7ad4bf401d18566e6f38e42e4f upstream.
These VGT regs need to be programmed via the ring rather than MMIO as on previous asics (r6xx/r7xx).
--- drivers/gpu/drm/radeon/evergreen.c | 39 ++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/radeon/r600.c | 5 ---- 2 files changed, 39 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +38 -1
@@ -658,6 +658,43 @@ static int evergreen_cp_load_microcode(sreturn 0 ; } +static int evergreen_cp_start (struct radeon_device *rdev) +{ +int r; +uint32_t cp_me; + + r =radeon_ring_lock (rdev,7 ); +if (r) { +DRM_ERROR ("radeon: cp failed to lock ring (%d).\n" , r); +return r; + } +radeon_ring_write (rdev,PACKET3 (PACKET3_ME_INITIALIZE ,5 )); +radeon_ring_write (rdev,0x1 ); +radeon_ring_write (rdev,0x0 ); +radeon_ring_write (rdev, rdev->config.evergreen.max_hw_contexts -1 ); +radeon_ring_write (rdev,PACKET3_ME_INITIALIZE_DEVICE_ID (1 )); +radeon_ring_write (rdev,0 ); +radeon_ring_write (rdev,0 ); +radeon_ring_unlock_commit (rdev); + + cp_me =0xff ; +WREG32 (CP_ME_CNTL , cp_me); + + r =radeon_ring_lock (rdev,4 ); +if (r) { +DRM_ERROR ("radeon: cp failed to lock ring (%d).\n" , r); +return r; + } +/* init some VGT regs */ +radeon_ring_write (rdev,PACKET3 (PACKET3_SET_CONTEXT_REG ,2 )); +radeon_ring_write (rdev, (VGT_VERTEX_REUSE_BLOCK_CNTL -PACKET3_SET_CONTEXT_REG_START ) >>2 ); +radeon_ring_write (rdev,0xe ); +radeon_ring_write (rdev,0x10 ); +radeon_ring_unlock_commit (rdev); + +return 0 ; +} +int evergreen_cp_resume (struct radeon_device *rdev) {u32 tmp;
@@ -702,7 +739,7 @@ int evergreen_cp_resume(struct radeon_de rdev->cp.rptr =RREG32 (CP_RB_RPTR ); rdev->cp.wptr =RREG32 (CP_RB_WPTR ); -r600_cp_start (rdev); +evergreen_cp_start (rdev); rdev->cp.ready = true; r =radeon_ring_test (rdev);if (r) {
drivers/gpu/drm/radeon/r600.c +1 -4
@@ -2104,10 +2104,7 @@ int r600_cp_start(struct radeon_device * }radeon_ring_write (rdev,PACKET3 (PACKET3_ME_INITIALIZE ,5 ));radeon_ring_write (rdev,0x1 ); -if (rdev->family >=CHIP_CEDAR ) { -radeon_ring_write (rdev,0x0 ); -radeon_ring_write (rdev, rdev->config.evergreen.max_hw_contexts -1 ); - }else if (rdev->family >=CHIP_RV770 ) { +if (rdev->family >=CHIP_RV770 ) {radeon_ring_write (rdev,0x0 );radeon_ring_write (rdev, rdev->config.rv770.max_hw_contexts -1 ); }else {
PATCH 120/129 drm/radeon/kms/evergreen: fix backend setup
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alex Deucher <[email protected]>
commit b741be82cf2079f71553af595610f17a3a3a752a upstream.
This patch fixes rendering errors on some evergreen boards. Hardcoding the backend map is not an optimal solution, but a better fix is being worked on.
Similar to the fix for rv740
(6271901d828b34b27607314026deaf417f9f9b75).
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=29986
--- drivers/gpu/drm/radeon/evergreen.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +19 -8
@@ -1143,14 +1143,25 @@ static void evergreen_gpu_init(struct ra EVERGREEN_MAX_BACKENDS_MASK));break ; } - }else - gb_backend_map = -evergreen_get_tile_pipe_to_backend_map (rdev, - rdev->config.evergreen.max_tile_pipes, - rdev->config.evergreen.max_backends, - ((EVERGREEN_MAX_BACKENDS_MASK << - rdev->config.evergreen.max_backends) & -EVERGREEN_MAX_BACKENDS_MASK )); + }else { +switch (rdev->family) { +case CHIP_CYPRESS : +case CHIP_HEMLOCK : + gb_backend_map =0x66442200 ; +break ; +case CHIP_JUNIPER : + gb_backend_map =0x00006420 ; +break ; +default : + gb_backend_map = +evergreen_get_tile_pipe_to_backend_map (rdev, + rdev->config.evergreen.max_tile_pipes, + rdev->config.evergreen.max_backends, + ((EVERGREEN_MAX_BACKENDS_MASK << + rdev->config.evergreen.max_backends) & +EVERGREEN_MAX_BACKENDS_MASK )); + } + }WREG32 (GB_BACKEND_MAP , gb_backend_map);WREG32 (GB_ADDR_CONFIG , gb_addr_config);
PATCH 121/129 i915: return -EFAULT if copy_to_user fails
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Carpenter <[email protected]>
commit 9927a403ca8c97798129953fa9cbb5dc259c7cb9 upstream.
copy_to_user returns the number of bytes remaining to be copied, but we want to return a negative error code here. These are returned to userspace.
--- drivers/gpu/drm/i915/i915_dma.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +9 -3
@@ -612,8 +612,10 @@ static int i915_batchbuffer(struct drm_d ret =copy_from_user (cliprects, batch->cliprects, batch->num_cliprects *sizeof (struct drm_clip_rect )); -if (ret !=0 ) +if (ret !=0 ) { + ret = -EFAULT ; goto fail_free; + } }mutex_lock (&dev->struct_mutex);
@@ -654,8 +656,10 @@ static int i915_cmdbuffer(struct drm_devreturn -ENOMEM ; ret =copy_from_user (batch_data, cmdbuf->buf, cmdbuf->sz); -if (ret !=0 ) +if (ret !=0 ) { + ret = -EFAULT ; goto fail_batch_free; + }if (cmdbuf->num_cliprects) { cliprects = kcalloc(cmdbuf->num_cliprects,
@@ -668,8 +672,10 @@ static int i915_cmdbuffer(struct drm_dev ret =copy_from_user (cliprects, cmdbuf->cliprects, cmdbuf->num_cliprects *sizeof (struct drm_clip_rect )); -if (ret !=0 ) +if (ret !=0 ) { + ret = -EFAULT ; goto fail_clip_free; + } }mutex_lock (&dev->struct_mutex);
PATCH 122/129 i915_gem: return -EFAULT if copy_to_user fails
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dan Carpenter <[email protected]>
commit c877cdce93a44eea96f6cf7fc04be7d0372db2be upstream.
copy_to_user() returns the number of bytes remaining to be copied and I'm pretty sure we want to return a negative error code here.
--- drivers/gpu/drm/i915/i915_gem.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_gem.c +1 -0
@@ -3709,6 +3709,7 @@ i915_gem_do_execbuffer(struct drm_deviceif (ret !=0 ) {DRM_ERROR ("copy %d cliprects failed: %d\n" , args->num_cliprects, ret); + ret = -EFAULT ; goto pre_mutex_err; } }
PATCH 123/129 drm/i915/dp: Really try 5 times before giving up.
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit 4f7f7b7eb94bd37c449f06932459bbed78826f8d upstream.
Only stop trying if the aux channel sucessfully reports that the transmission was completed, otherwise try again. On the 5th failure, bail and report that something is amiss.
This fixes a sporadic failure in reading the EDID for my external panel over DP.
--- drivers/gpu/drm/i915/intel_dp.c | 58 +++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +28 -30
@@ -229,7 +229,6 @@ intel_dp_aux_ch(struct intel_encoder *inuint32_t ch_data = ch_ctl +4 ;int i;int recv_bytes; -uint32_t ctl;uint32_t status;uint32_t aux_clock_divider;int try, precharge;
@@ -253,41 +252,43 @@ intel_dp_aux_ch(struct intel_encoder *inelse precharge =5 ; +if (I915_READ (ch_ctl) &DP_AUX_CH_CTL_SEND_BUSY ) { +DRM_ERROR ("dp_aux_ch not started status 0x%08x\n" , +I915_READ (ch_ctl)); +return -EBUSY ; + } +/* Must try at least 3 times according to DP spec */ for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */ -for (i =0 ; i < send_bytes; i +=4 ) { -uint32_t d =pack_aux (send + i, send_bytes - i); - -I915_WRITE (ch_data + i, d); - } - - ctl = (DP_AUX_CH_CTL_SEND_BUSY | - DP_AUX_CH_CTL_TIME_OUT_400us | - (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | - (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | - (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT ) | -DP_AUX_CH_CTL_DONE | -DP_AUX_CH_CTL_TIME_OUT_ERROR | -DP_AUX_CH_CTL_RECEIVE_ERROR ); +for (i =0 ; i < send_bytes; i +=4 ) +I915_WRITE (ch_data + i, +pack_aux (send + i, send_bytes - i));/* Send the command and wait for it to complete */ -I915_WRITE (ch_ctl, ctl); - (void )I915_READ (ch_ctl); +I915_WRITE (ch_ctl, +DP_AUX_CH_CTL_SEND_BUSY | + DP_AUX_CH_CTL_TIME_OUT_400us | + (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | + (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | + (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT ) | +DP_AUX_CH_CTL_DONE | +DP_AUX_CH_CTL_TIME_OUT_ERROR | +DP_AUX_CH_CTL_RECEIVE_ERROR );for (;;) { -udelay (100 ); status =I915_READ (ch_ctl);if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 )break ; +udelay (100 ); }/* Clear done status and any errors */ -I915_WRITE (ch_ctl, (status | -DP_AUX_CH_CTL_DONE | -DP_AUX_CH_CTL_TIME_OUT_ERROR | -DP_AUX_CH_CTL_RECEIVE_ERROR )); - (void )I915_READ (ch_ctl); -if ((status &DP_AUX_CH_CTL_TIME_OUT_ERROR ) ==0 ) +I915_WRITE (ch_ctl, + status | +DP_AUX_CH_CTL_DONE | +DP_AUX_CH_CTL_TIME_OUT_ERROR | +DP_AUX_CH_CTL_RECEIVE_ERROR ); +if (status &DP_AUX_CH_CTL_DONE )break ; }
@@ -314,15 +315,12 @@ intel_dp_aux_ch(struct intel_encoder *in/* Unload any bytes sent back from the other side */ recv_bytes = ((status &DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ) >>DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -if (recv_bytes > recv_size) recv_bytes = recv_size; -for (i =0 ; i < recv_bytes; i +=4 ) { -uint32_t d =I915_READ (ch_data + i); - -unpack_aux (d, recv + i, recv_bytes - i); - } +for (i =0 ; i < recv_bytes; i +=4 ) +unpack_aux (I915_READ (ch_data + i), + recv + i, recv_bytes - i);return recv_bytes; }
PATCH 124/129 drm/i915: Allocate the PCI resource for the MCHBAR
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit a25c25c2a2aa55e609099a9f74453c518aec29a6 upstream.
We were failing when trying to allocate the resource for MMIO of the MCHBAR because we forgot to specify what type of resource we wanted.
--- drivers/gpu/drm/i915/i915_dma.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +10 -10
@@ -883,7 +883,7 @@ intel_alloc_mchbar_resource(struct drm_dint reg =IS_I965G (dev) ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp_lo, temp_hi =0 ;u64 mchbar_addr; -int ret =0 ; +int ret;if (IS_I965G (dev))pci_read_config_dword (dev_priv->bridge_dev, reg +4 , &temp_hi);
@@ -893,22 +893,23 @@ intel_alloc_mchbar_resource(struct drm_d/* If ACPI doesn't have it, assume we need to allocate it ourselves */ #ifdef CONFIG_PNP if (mchbar_addr && -pnp_range_reserved (mchbar_addr, mchbar_addr +MCHBAR_SIZE )) { - ret =0 ; - goto out; - } +pnp_range_reserved (mchbar_addr, mchbar_addr +MCHBAR_SIZE )) +return 0 ;#endif /* Get some space for it */ - ret =pci_bus_alloc_resource (dev_priv->bridge_dev->bus, &dev_priv->mch_res, + dev_priv->mch_res.name ="i915 MCHBAR" ; + dev_priv->mch_res.flags =IORESOURCE_MEM ; + ret =pci_bus_alloc_resource (dev_priv->bridge_dev->bus, + &dev_priv->mch_res,MCHBAR_SIZE ,MCHBAR_SIZE ,PCIBIOS_MIN_MEM , -0 , pcibios_align_resource, +0 , pcibios_align_resource, dev_priv->bridge_dev);if (ret) {DRM_DEBUG_DRIVER ("failed bus alloc: %d\n" , ret); dev_priv->mch_res.start =0 ; - goto out; +return ret; }if (IS_I965G (dev))
@@ -917,8 +918,7 @@ intel_alloc_mchbar_resource(struct drm_dpci_write_config_dword (dev_priv->bridge_dev, reg,lower_32_bits (dev_priv->mch_res.start)); -out: -return ret; +return 0 ; }/* Setup MCHBAR if possible, return true if we should disable it again */
PATCH 125/129 drm/i915: overlay on gen2 cant address above 1G
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Daniel Vetter <[email protected]>
commit 9f82d23846146990d475f6753be733e55788d88d upstream.
So set the coherent dma mask accordingly. This dma mask is only used for physical objects, so it won't really matter allocation-wise.
Now this never really surfaced because sane 32bit kernels only have 1G of lowmem. But some eager testers (distros?) still carry around the patch to adjust lowmem via a kconfig option. And the kernel seems to favour high allocations on boot-up, hence the overlay blowing up reliably.
Because the patch is tiny and nicely shows how broken gen2 is it's imho worth to merge despite the fact that mucking around with the lowmem/ highmem division is (no longer) supported.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28318
--- drivers/gpu/drm/i915/i915_dma.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_dma.c +4 -0
@@ -2079,6 +2079,10 @@ int i915_driver_load(struct drm_device * goto free_priv; } +/* overlay on gen2 is broken and can't address above 1G */ +if (IS_GEN2 (dev)) +dma_set_coherent_mask (&dev->pdev->dev,DMA_BIT_MASK (30 )); + dev_priv->regs =ioremap (base, size);if (!dev_priv->regs) {DRM_ERROR ("failed to map registers\n" );
PATCH 126/129 drm/i915: Prevent double dpms on
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit 032d2a0d068b0368296a56469761394ef03207c3 upstream.
Arguably this is a bug in drm-core in that we should not be called twice in succession with DPMS_ON, however this is still occuring and we see FDI link training failures on the second call leading to the occassional blank display. For the time being ignore the repeated call.
Original patch by Dave Airlie <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +4 -1
@@ -2314,6 +2314,9 @@ static void intel_crtc_dpms(struct drm_cint pipe = intel_crtc->pipe;bool enabled; +if (intel_crtc->dpms_mode == mode) +return ; + dev_priv->display.dpms (crtc, mode); intel_crtc->dpms_mode = mode;
@@ -4915,7 +4918,7 @@ static void intel_crtc_init(struct drm_d dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base; intel_crtc->cursor_addr =0 ; - intel_crtc->dpms_mode =DRM_MODE_DPMS_OFF ; + intel_crtc->dpms_mode =-1 ;drm_crtc_helper_add (&intel_crtc->base, &intel_helper_funcs); intel_crtc->busy = false;
PATCH 127/129 drm/i915: dont enable self-refresh on Ironlake
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jesse Barnes <[email protected]>
commit dd8849c8f59ec1cee4809a0c5e603e045abe860e upstream.
We don't know how to enable it safely, especially as outputs turn on and off. When disabling LP1 we also need to make sure LP2 and 3 are already disabled.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29173
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29082
--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ drivers/gpu/drm/i915/intel_display.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -0
@@ -2200,9 +2200,17 @@#define WM1_LP_SR_EN (1<<31)#define WM1_LP_LATENCY_SHIFT 24#define WM1_LP_LATENCY_MASK (0x7f<<24) +#define WM1_LP_FBC_LP1_MASK (0xf<<20) +#define WM1_LP_FBC_LP1_SHIFT 20#define WM1_LP_SR_MASK (0x1ff<<8)#define WM1_LP_SR_SHIFT 8#define WM1_LP_CURSOR_MASK (0x3f) +#define WM2_LP_ILK 0x4510c +#define WM2_LP_EN (1<<31) +#define WM3_LP_ILK 0x45110 +#define WM3_LP_EN (1<<31) +#define WM1S_LP_ILK 0x45120 +#define WM1S_LP_EN (1<<31)/* Memory latency timer register */ #define MLTR_ILK 0x11222
drivers/gpu/drm/i915/intel_display.c +4 -2
@@ -3206,8 +3206,7 @@ static void ironlake_update_wm(struct dr reg_value =I915_READ (WM1_LP_ILK ); reg_value &= ~(WM1_LP_LATENCY_MASK |WM1_LP_SR_MASK |WM1_LP_CURSOR_MASK ); - reg_value |=WM1_LP_SR_EN | - (ilk_sr_latency <<WM1_LP_LATENCY_SHIFT ) | + reg_value |= (ilk_sr_latency <<WM1_LP_LATENCY_SHIFT ) | (sr_wm <<WM1_LP_SR_SHIFT ) | cursor_wm;I915_WRITE (WM1_LP_ILK , reg_value);
@@ -5425,6 +5424,9 @@ void intel_init_clock_gating(struct drm_I915_WRITE (DISP_ARB_CTL , (I915_READ (DISP_ARB_CTL ) |DISP_FBC_WM_DIS )); +I915_WRITE (WM3_LP_ILK ,0 ); +I915_WRITE (WM2_LP_ILK ,0 ); +I915_WRITE (WM1_LP_ILK ,0 ); }return ; }else if (IS_G4X (dev)) {
PATCH 128/129 Revert "drm/i915: Allow LVDS on pipe A on gen4+"
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit 12e8ba25ef52f19e7a42e61aecb3c1fef83b2a82 upstream.
This reverts commit 0f3ee801b332d6ff22285386675fe5aaedf035c3.
Enabling LVDS on pipe A was causing excessive wakeups on otherwise idle systems due to i915 interrupts. So restrict the LVDS to pipe B once more, whilst the issue is properly diagnosed.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16307
--- drivers/gpu/drm/i915/intel_lvds.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_lvds.c +0 -2
@@ -988,8 +988,6 @@ void intel_lvds_init(struct drm_device * intel_encoder->clone_mask = (1 <<INTEL_LVDS_CLONE_BIT ); intel_encoder->crtc_mask = (1 <<1 ); -if (IS_I965G (dev)) - intel_encoder->crtc_mask |= (1 <<0 );drm_encoder_helper_add (encoder, &intel_lvds_helper_funcs);drm_connector_helper_add (connector, &intel_lvds_connector_helper_funcs); connector->display_info.subpixel_order = SubPixelHorizontalRGB;
PATCH 129/129 drm: Only decouple the old_fb from the crtc is we call mode_set*
In reply to Greg KH2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Wilson <[email protected]>
commit 356ad3cd616185631235ffb48b3efbf39f9923b3 upstream.
Otherwise when disabling the output we switch to the new fb (which is likely NULL) and skip the call to mode_set -- leaking driver private state on the old_fb.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29857
--- drivers/gpu/drm/drm_crtc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_crtc_helper.c +2 -2
@@ -610,13 +610,13 @@ int drm_crtc_helper_set_config(struct dr mode_changed = true;if (mode_changed) { - old_fb = set->crtc->fb; - set->crtc->fb = set->fb; set->crtc->enabled = (set->mode !=NULL );if (set->mode !=NULL ) {DRM_DEBUG_KMS ("attempting to set mode from" " userspace\n" );drm_mode_debug_printmodeline (set->mode); + old_fb = set->crtc->fb; + set->crtc->fb = set->fb;if (!drm_crtc_helper_set_mode (set->crtc, set->mode, set->x, set->y, old_fb)) {
Quoted 12 lines · Greg KH
[Note, I do still have patches that people have sent me for inclusion in the .35-stable tree in my queue, but I figured this series was already big enough that it should go out now. If you notice, I _did_ apply all patches that went through Linus's tree with a [email protected] marking on it, so people might consider using that method instead...]
This is the start of the stable review cycle for the 2.6.35.5 release. There are 129 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let us know. If anyone is a maintainer of the proper subsystem, and wants to add a Signed-off-by: line to the patch, please respond with it.
Quoted 6 lines
Responses should be made by @date (day, month date, time)@ UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.35.5-rc1.gzand the diffstat can be found below.
Greg,
please consider applying patch 615661f3948a066fd22a36fe8ea0c528b75ee373 "drm/nv50: initialize ramht_refs list for faked 0 channel" for .35-stable.
Thanks,
Marcin
Quoted 16 lines · Marcin Slusarz
Quoted 15 lines · Greg KH
[Note, I do still have patches that people have sent me for inclusion in the .35-stable tree in my queue, but I figured this series was already big enough that it should go out now. If you notice, I _did_ apply all patches that went through Linus's tree with a [email protected] marking on it, so people might consider using that method instead...]
This is the start of the stable review cycle for the 2.6.35.5 release. There are 129 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let us know. If anyone is a maintainer of the proper subsystem, and wants to add a Signed-off-by: line to the patch, please respond with it.
Responses should be made by @date (day, month date, time)@ UTC. Anything received after that time might be too late.
Quoted 8 lines
Quoted 3 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.35.5-rc1.gzand the diffstat can be found below.
Greg,
please consider applying patch615661f3948a066fd22a36fe8ea0c528b75ee373"drm/nv50: initializeramht_refslist for faked 0 channel" for .35-stable.
See the note above.
Why has this not been sent to [email protected] previously? Remember to read Documentation/stable_kernel_rules.txt for how to get a patch into the stable tree. Please get the maintainer of the driver to forward this to that email address and I'll queue it up for the next stable kernel rounds.
thanks,
greg k-h