Linux 3.2.6
Greg KH
maintainerI'm announcing the release of the 3.2.6 kernel.
All users of the 3.2 kernel series must upgrade.
The updated 3.2.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.2.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/kernel/ptrace.c | 8 + arch/arm/kernel/signal.c | 5 - arch/arm/mach-omap2/gpmc.c | 6 + drivers/cpufreq/powernow-k8.c | 30 ++++-- drivers/dma/at_hdmac.c | 4 drivers/dma/at_hdmac_regs.h | 17 +-- drivers/firewire/ohci.c | 6 + drivers/gpu/drm/i915/i915_debugfs.c | 8 + drivers/gpu/drm/i915/i915_dma.c | 1 drivers/gpu/drm/i915/i915_drv.c | 20 +++- drivers/gpu/drm/i915/i915_drv.h | 12 ++ drivers/gpu/drm/i915/i915_irq.c | 13 ++- drivers/gpu/drm/i915/i915_suspend.c | 4 drivers/gpu/drm/i915/intel_dp.c | 1 drivers/gpu/drm/i915/intel_hdmi.c | 8 + drivers/gpu/drm/i915/intel_tv.c | 16 +-- drivers/gpu/drm/nouveau/nouveau_gem.c | 23 ++++- drivers/gpu/drm/radeon/atombios_crtc.c | 4 drivers/gpu/drm/radeon/atombios_dp.c | 18 +++- drivers/gpu/drm/radeon/radeon_device.c | 4 drivers/hwmon/w83627ehf.c | 23 ++++- drivers/infiniband/core/uverbs_cmd.c | 1 drivers/infiniband/core/verbs.c | 2 drivers/infiniband/hw/mlx4/mad.c | 7 - drivers/iommu/amd_iommu.c | 3 drivers/iommu/msm_iommu.c | 7 - drivers/misc/cb710/core.c | 1 drivers/mtd/nand/atmel_nand.c | 45 +++++++++- drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 18 +++- drivers/net/ethernet/realtek/8139cp.c | 1 drivers/pcmcia/ds.c | 4 drivers/staging/asus_oled/asus_oled.c | 13 ++- drivers/staging/rtl8712/drv_types.h | 7 + drivers/staging/rtl8712/hal_init.c | 62 ++++++++++---- drivers/staging/rtl8712/os_intfs.c | 14 ++- drivers/staging/rtl8712/rtl8712_hal.h | 1 drivers/staging/rtl8712/usb_intf.c | 10 +- drivers/staging/zcache/zcache-main.c | 11 +- drivers/target/iscsi/iscsi_target.c | 39 +++++++-- drivers/target/iscsi/iscsi_target_core.h | 2 drivers/target/iscsi/iscsi_target_login.c | 31 ++++++- drivers/target/iscsi/iscsi_target_util.c | 11 ++ drivers/target/target_core_cdb.c | 9 +- drivers/target/target_core_pr.c | 5 - drivers/target/target_core_transport.c | 21 +++- drivers/tty/vt/vt_ioctl.c | 1 drivers/usb/gadget/f_loopback.c | 2 drivers/usb/host/pci-quirks.c | 6 + drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 7 + drivers/usb/serial/option.c | 129 +++++++++++++++++++++++++++++- drivers/video/atmel_lcdfb.c | 2 fs/cifs/sess.c | 7 - fs/ecryptfs/read_write.c | 4 fs/proc/base.c | 106 ++++++++++-------------- fs/udf/super.c | 6 + include/linux/freezer.h | 2 include/linux/pm_qos.h | 14 +++ include/linux/usb/ch9.h | 2 kernel/kprobes.c | 6 + kernel/panic.c | 17 +++ kernel/power/hibernate.c | 2 kernel/power/power.h | 2 kernel/power/process.c | 9 ++ kernel/power/user.c | 22 ++++- kernel/sched_rt.c | 5 + mm/compaction.c | 24 +++++ mm/filemap.c | 8 - mm/filemap_xip.c | 7 + mm/huge_memory.c | 4 mm/swap.c | 2 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/patch_cirrus.c | 6 - sound/pci/hda/patch_realtek.c | 44 ++++++++-- sound/pci/hda/patch_via.c | 28 +++++- sound/pci/oxygen/oxygen_mixer.c | 25 +++-- sound/soc/codecs/wm8962.c | 6 - sound/soc/codecs/wm8994.c | 6 + sound/soc/codecs/wm_hubs.c | 18 ++-- 80 files changed, 822 insertions(+), 268 deletions(-)
Alex Deucher (1):
drm/radeon/kms: fix TRAVIS panel setup
Andreas Herrmann (2):
powernow-k8: Avoid Pstate MSR accesses on systems supporting CPB
powernow-k8: Fix indexing issue
Artem Bityutskiy (1):
Revert "mtd: atmel_nand: optimize read/write buffer functions"
Axel Lin (1):
mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip
Ben Hutchings (1):
lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
Ben Skeggs (1):
drm/nouveau/gem: fix fence_sync race / oops
Bernd Schubert (1):
RDMA/core: Fix kernel panic by always initializing qp->usecnt
Carsten Otte (1):
mm/filemap_xip.c: fix race condition in xip_file_fault()
Chanho Min (1):
sched/rt: Fix task stack corruption under __ARCH_WANT_INTERRUPTS_ON_CTXSW
Clemens Ladisch (2):
firewire: ohci: add reset packet quirk for SB Audigy
ALSA: oxygen, virtuoso: fix exchanged L/R volumes of aux and CD inputs
Dan Magenheimer (2):
zcache: Set SWIZ_BITS to 8 to reduce tmem bucket lock contention.
zcache: fix deadlock condition
Daniel Vetter (3):
drm/i915: check ACTHD of all rings
drm/i915: convert force_wake_get to func pointer in the gpu reset code drm/i915: protect force_wake_(get|put) with the gt_lock
Dave Martin (1):
ARM: 7307/1: vfp: fix ptrace regset modification race
David Henningsson (2):
ALSA: HDA: Remove quirk for Asus N53Jq
ALSA: HDA: Fix duplicated output to more than one codec
Dylan Reid (1):
ALSA: hda - Fix calling cs_automic twice for Cirrus codecs.
Eugeni Dodonov (1):
drm/i915: handle 3rd pipe
Francois Romieu (1):
8139cp: fix missing napi_gro_flush.
Greg Kroah-Hartman (1):
Linux 3.2.6
Guenter Roeck (1):
hwmon: (w83627ehf) Fix number of fans for NCT6776F
Huang Shijie (1):
mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23
Hubert Feurstein (1):
atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
Hugh Dickins (1):
mm: fix UP THP spin_is_locked BUGs
Jack Morgenstein (1):
IB/mlx4: pass SMP vendor-specific attribute MADs to firmware
Jan Kara (1):
udf: Mark LVID buffer as uptodate before marking it dirty
Jayachandran C (1):
usb: Skip PCI USB quirk handling for Netlogic XLP
Jiang Liu (1):
kprobes: fix a memory leak in function pre_handler_kretprobe()
Joerg Roedel (2):
iommu/amd: Work around broken IVRS tables iommu/msm: Fix error handling in msm_iommu_unmap()
Kuninori Morimoto (1):
usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()
Larry Finger (2):
staging: r8712u: Add new Sitecom UsB ID
staging: r8712u: Use asynchronous firmware loading
Li Wang (1):
eCryptfs: Infinite loop due to overflow in ecryptfs_write()
Marco Sanvido (2):
target: Use correct preempted registration sense code
target: Allow PERSISTENT RESERVE IN for non-reservation holder
Mark Brown (5):
ASoC: wm_hubs: Enable line out VMID buffer for single ended line outputs
ASoC: wm_hubs: Fix routing of input PGAs to line output mixer
ASoC: wm_hubs: Correct line input to line output 2 paths
ASoC: wm8994: Enabling VMID should take a runtime PM reference
ASoC: wm8994: Fix typo in VMID ramp setting
Mel Gorman (2):
mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
mm: compaction: check for overlapping nodes during isolation for migration
Michel Dänzer (1):
drm/radeon: Set DESKTOP_HEIGHT register to the framebuffer (not mode) height.
Milan Kocian (1):
USB: usbserial: add new PID number (0xa951) to the ftdi driver
Nicholas Bellinger (4):
iscsi-target: Fix reject release handling in iscsit_free_cmd()
iscsi-target: Fix double list_add with iscsit_alloc_buffs reject
iscsi-target: Fix discovery with INADDR_ANY and IN6ADDR_ANY_INIT
target: Add workaround for zero-length control CDB handling
Nikolaus Voss (1):
at_hdmac: bugfix for enabling channel irq
Oleg Nesterov (3):
proc: mem_release() should check mm != NULL
proc: unify mem_read() and mem_write()
proc: make sure mem_open() doesn't pin the target's memory
Pekka Paalanen (2):
Staging: asus_oled: fix image processing
Staging: asus_oled: fix NULL-ptr crash on unloading
Peter Zijlstra (1):
lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep
Rafael J. Wysocki (1):
PM / Hibernate: Fix s2disk regression related to freezing workqueues
Rodrigo Vivi (1):
drm/i915: Fix TV Out refresh rate.
Roland Dreier (3):
target: Correct sense key for INVALID FIELD IN {PARAMETER LIST,CDB}
target: Return correct ASC for unimplemented VPD pages
target: Fail INQUIRY commands with EVPD==0 but PAGE CODE!=0Rui li (1):
USB: add new zte 3g-dongle's pid to option.c
Russell King (1):
pcmcia: fix socket refcount decrementing on each resume
Samuel Thibault (1):
drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
Seth Forshee (1):
drm/radeon/kms: disable output polling when suspended
Shaohua Li (1):
readahead: fix pipeline break caused by block plug
Shirish Pargaonkar (1):
cifs: Fix oops in session setup code for null user mounts
Srivatsa S. Bhat (2):
PM / Hibernate: Thaw processes in SNAPSHOT_CREATE_IMAGE ioctl test path PM / Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path
Stefan Richter (1):
firewire: ohci: disable MSI on Ricoh controllers
Susan Gao (1):
ASoC: wm8962: Fix word length configuration
Takashi Iwai (4):
ALSA: hda - Fix the logic to detect VIA analog low-current mode
ALSA: hda - Apply 0x0f-VREF fix to all ASUS laptops with ALC861/660
ALSA: hda - Allow analog low-current mode when dynamic power-control is on
ALSA: hda - Disable dynamic-power control for VIA as default
Timo Juhani Lindfors (1):
usb: gadget: zero: fix bug in loopback autoresume handling
UK KIM (1):
ASoC: wm_hubs: fix wrong bits for LINEOUT2 N/P mixer
Venkatesh Pallipadi (1):
PM / QoS: CPU C-state breakage with PM Qos change
Will Deacon (2):
ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe
ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers
Wu Fengguang (2):
drm/i915: HDMI hot remove notification to audio driver drm/i915: DisplayPort hot remove notification to audio driver
Yegor Yefremov (1):
ARM: OMAP2+: GPMC: fix device size setup
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/kernel/ptrace.c +5 -3
@@ -699,10 +699,13 @@ static int vfp_set(struct task_struct *target, {int ret;struct thread_info *thread =task_thread_info (target); -struct vfp_hard_struct new_vfp = thread->vfpstate.hard; +struct vfp_hard_struct new_vfp;const size_t user_fpregs_offset = offsetof(struct user_vfp , fpregs);const size_t user_fpscr_offset = offsetof(struct user_vfp , fpscr); +vfp_sync_hwstate (thread); + new_vfp = thread->vfpstate.hard; + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &new_vfp.fpregs, user_fpregs_offset,
@@ -723,9 +726,8 @@ static int vfp_set(struct task_struct *target,if (ret)return ret; -vfp_sync_hwstate (thread); - thread->vfpstate.hard = new_vfp;vfp_flush_hwstate (thread); + thread->vfpstate.hard = new_vfp;return 0 ; }
arch/arm/kernel/signal.c +2 -3
@@ -227,6 +227,8 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)if (magic !=VFP_MAGIC || size !=VFP_STORAGE_SIZE )return -EINVAL ; +vfp_flush_hwstate (thread); +/* * Copy the floating point registers. There can be unused * registers see asm/hwcap.h for details.
@@ -251,9 +253,6 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)__get_user_error (h->fpinst, &frame->ufp_exc.fpinst, err);__get_user_error (h->fpinst2, &frame->ufp_exc.fpinst2, err); -if (!err) -vfp_flush_hwstate (thread); -return err ? -EFAULT :0 ; }
arch/arm/mach-omap2/gpmc.c +6 -0
@@ -528,7 +528,13 @@ int gpmc_cs_configure(int cs, int cmd, int wval)case GPMC_CONFIG_DEV_SIZE : regval =gpmc_cs_read_reg (cs,GPMC_CS_CONFIG1 ); + +/* clear 2 target bits */ + regval &= ~GPMC_CONFIG1_DEVICESIZE (3 ); + +/* set the proper value */ regval |=GPMC_CONFIG1_DEVICESIZE (wval); +gpmc_cs_write_reg (cs,GPMC_CS_CONFIG1 , regval);break ;
drivers/cpufreq/powernow-k8.c +19 -11
@@ -54,6 +54,9 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);static int cpu_family =CPU_OPTERON ; +/* array to map SW pstate number to acpi state */ +static u32 ps_to_as[8 ]; +/* core performance boost */ static bool cpb_capable, cpb_enabled;static struct msr __percpu *msrs;
@@ -80,9 +83,9 @@ static u32 find_khz_freq_from_fid(u32 fid) }static u32 find_khz_freq_from_pstate (struct cpufreq_frequency_table *data, -u32 pstate) +u32 pstate) { -return data[pstate].frequency; +return data[ps_to_as[pstate]].frequency; }/* Return the vco fid for an input fid
@@ -926,23 +929,27 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data,invalidate_entry (powernow_table, i);continue ; } -rdmsr (MSR_PSTATE_DEF_BASE + index, lo, hi); -if (!(hi &HW_PSTATE_VALID_MASK )) { -pr_debug ("invalid pstate %d, ignoring\n" , index); -invalidate_entry (powernow_table, i); -continue ; - } - powernow_table[i].index = index; + ps_to_as[index] = i;/* Frequency may be rounded for these */ if ((boot_cpu_data.x86 ==0x10 && boot_cpu_data.x86_model <10 ) || boot_cpu_data.x86 ==0x11 ) { + +rdmsr (MSR_PSTATE_DEF_BASE + index, lo, hi); +if (!(hi &HW_PSTATE_VALID_MASK )) { +pr_debug ("invalid pstate %d, ignoring\n" , index); +invalidate_entry (powernow_table, i); +continue ; + } + powernow_table[i].frequency =freq_from_fid_did (lo &0x3f , (lo >>6 ) &7 ); }else powernow_table[i].frequency = data->acpi_data.states[i].core_frequency *1000 ; + + powernow_table[i].index = index; }return 0 ; }
@@ -1189,7 +1196,8 @@ static int powernowk8_target(struct cpufreq_policy *pol,powernow_k8_acpi_pst_values (data, newstate);if (cpu_family ==CPU_HW_PSTATE ) - ret =transition_frequency_pstate (data, newstate); + ret =transition_frequency_pstate (data, + data->powernow_table[newstate].index);else ret =transition_frequency_fidvid (data, newstate);if (ret) {
@@ -1202,7 +1210,7 @@ static int powernowk8_target(struct cpufreq_policy *pol,if (cpu_family ==CPU_HW_PSTATE ) pol->cur =find_khz_freq_from_pstate (data->powernow_table, - newstate); + data->powernow_table[newstate].index);else pol->cur =find_khz_freq_from_fid (data->currfid); ret =0 ;
drivers/dma/at_hdmac.c +2 -2
@@ -1286,7 +1286,7 @@ static int __init at_dma_probe(struct platform_device *pdev)tasklet_init (&atchan->tasklet, atc_tasklet, (unsigned long )atchan); -atc_enable_irq (atchan); +atc_enable_chan_irq (atdma, i); }/* set base routines */
@@ -1353,7 +1353,7 @@ static int __exit at_dma_remove(struct platform_device *pdev)struct at_dma_chan *atchan =to_at_dma_chan (chan);/* Disable interrupts */ -atc_disable_irq (atchan); +atc_disable_chan_irq (atdma, chan->chan_id);tasklet_disable (&atchan->tasklet);tasklet_kill (&atchan->tasklet);
drivers/dma/at_hdmac_regs.h +8 -9
@@ -326,28 +326,27 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli) } -static void atc_setup_irq (struct at_dma_chan *atchan,int on) +static void atc_setup_irq (struct at_dma *atdma,int chan_id,int on) { -struct at_dma *atdma =to_at_dma (atchan->chan_common.device); -u32 ebci; +u32 ebci;/* enable interrupts on buffer transfer completion & error */ - ebci =AT_DMA_BTC (atchan->chan_common.chan_id) - |AT_DMA_ERR (atchan->chan_common.chan_id); + ebci =AT_DMA_BTC (chan_id) + |AT_DMA_ERR (chan_id);if (on)dma_writel (atdma,EBCIER , ebci);else dma_writel (atdma,EBCIDR , ebci); } -static inline void atc_enable_irq (struct at_dma_chan *atchan) +static void atc_enable_chan_irq (struct at_dma *atdma,int chan_id) { -atc_setup_irq (atchan,1 ); +atc_setup_irq (atdma, chan_id,1 ); } -static inline void atc_disable_irq (struct at_dma_chan *atchan) +static void atc_disable_chan_irq (struct at_dma *atdma,int chan_id) { -atc_setup_irq (atchan,0 ); +atc_setup_irq (atdma, chan_id,0 ); }
drivers/firewire/ohci.c +5 -1
@@ -263,6 +263,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)static char ohci_driver_name[] =KBUILD_MODNAME ;#define PCI_DEVICE_ID_AGERE_FW643 0x5901 +#define PCI_DEVICE_ID_CREATIVE_SB1394 0x4001#define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380#define PCI_DEVICE_ID_TI_TSB12LV22 0x8009#define PCI_DEVICE_ID_TI_TSB12LV26 0x8020
@@ -289,6 +290,9 @@ static const struct { {PCI_VENDOR_ID_ATT ,PCI_DEVICE_ID_AGERE_FW643 ,6 , QUIRK_NO_MSI}, + {PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_SB1394, PCI_ANY_ID, + QUIRK_RESET_PACKET}, + {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID, QUIRK_NO_MSI},
@@ -299,7 +303,7 @@ static const struct { QUIRK_NO_MSI}, {PCI_VENDOR_ID_RICOH ,PCI_ANY_ID ,PCI_ANY_ID , - QUIRK_CYCLE_TIMER}, + QUIRK_CYCLE_TIMER | QUIRK_NO_MSI}, {PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID, QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A},
drivers/gpu/drm/i915/i915_debugfs.c +6 -2
@@ -1314,9 +1314,13 @@ static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data)struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private; +unsigned forcewake_count; -seq_printf (m,"forcewake count = %d\n" , -atomic_read (&dev_priv->forcewake_count)); +spin_lock_irq (&dev_priv->gt_lock); + forcewake_count = dev_priv->forcewake_count; +spin_unlock_irq (&dev_priv->gt_lock); + +seq_printf (m,"forcewake count = %u\n" , forcewake_count);return 0 ; }
drivers/gpu/drm/i915/i915_dma.c +1 -0
@@ -2042,6 +2042,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)if (!IS_I945G (dev) && !IS_I945GM (dev))pci_enable_msi (dev->pdev); +spin_lock_init (&dev_priv->gt_lock);spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->error_lock);spin_lock_init (&dev_priv->rps_lock);
drivers/gpu/drm/i915/i915_drv.c +13 -7
@@ -368,11 +368,12 @@ void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)*/ void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) { -WARN_ON (!mutex_is_locked (&dev_priv->dev->struct_mutex)); +unsigned long irqflags; -/* Forcewake is atomic in case we get in here without the lock */ -if (atomic_add_return (1 , &dev_priv->forcewake_count) ==1 ) +spin_lock_irqsave (&dev_priv->gt_lock, irqflags); +if (dev_priv->forcewake_count++ ==0 ) dev_priv->display.force_wake_get (dev_priv); +spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags); }void __gen6_gt_force_wake_put (struct drm_i915_private *dev_priv)
@@ -392,10 +393,12 @@ void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv)*/ void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv) { -WARN_ON (!mutex_is_locked (&dev_priv->dev->struct_mutex)); +unsigned long irqflags; -if (atomic_dec_and_test (&dev_priv->forcewake_count)) +spin_lock_irqsave (&dev_priv->gt_lock, irqflags); +if (--dev_priv->forcewake_count ==0 ) dev_priv->display.force_wake_put (dev_priv); +spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags); }void __gen6_gt_wait_for_fifo (struct drm_i915_private *dev_priv)
@@ -626,6 +629,7 @@ int i915_reset(struct drm_device *dev, u8 flags)* need to */ bool need_display = true; +unsigned long irqflags;int ret;if (!i915_try_reset)
@@ -644,8 +648,10 @@ int i915_reset(struct drm_device *dev, u8 flags)case 6 : ret =gen6_do_reset (dev, flags);/* If reset with a user forcewake, try to restore */ -if (atomic_read (&dev_priv->forcewake_count)) -__gen6_gt_force_wake_get (dev_priv); +spin_lock_irqsave (&dev_priv->gt_lock, irqflags); +if (dev_priv->forcewake_count) + dev_priv->display.force_wake_get (dev_priv); +spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags);break ;case 5 : ret =ironlake_do_reset (dev, flags);
drivers/gpu/drm/i915/i915_drv.h +9 -3
@@ -286,7 +286,13 @@ typedef struct drm_i915_private {int relative_constants_mode;void __iomem *regs; -u32 gt_fifo_count; +/** gt_fifo_count and the subsequent register write are synchronized +* with dev->struct_mutex. */ +unsigned gt_fifo_count; +/** forcewake_count is protected by gt_lock */ +unsigned forcewake_count; +/** gt_lock is also taken in irq contexts. */ +struct spinlock gt_lock;struct intel_gmbus {struct i2c_adapter adapter;
@@ -337,6 +343,8 @@ typedef struct drm_i915_private {struct timer_list hangcheck_timer;int hangcheck_count;uint32_t last_acthd; +uint32_t last_acthd_bsd; +uint32_t last_acthd_blt;uint32_t last_instdone;uint32_t last_instdone1;
@@ -736,8 +744,6 @@ typedef struct drm_i915_private {struct drm_property *broadcast_rgb_property;struct drm_property *force_audio_property; - -atomic_t forcewake_count; } drm_i915_private_t;enum i915_cache_level {
drivers/gpu/drm/i915/i915_irq.c +10 -3
@@ -1669,7 +1669,7 @@ void i915_hangcheck_elapsed(unsigned long data) {struct drm_device *dev = (struct drm_device *)data;drm_i915_private_t *dev_priv = dev->dev_private; -uint32_t acthd, instdone, instdone1; +uint32_t acthd, instdone, instdone1, acthd_bsd, acthd_blt;bool err = false;if (!i915_enable_hangcheck)
@@ -1686,16 +1686,21 @@ void i915_hangcheck_elapsed(unsigned long data) }if (INTEL_INFO (dev)->gen <4 ) { - acthd =I915_READ (ACTHD ); instdone =I915_READ (INSTDONE ); instdone1 =0 ; }else { - acthd =I915_READ (ACTHD_I965 ); instdone =I915_READ (INSTDONE_I965 ); instdone1 =I915_READ (INSTDONE1 ); } + acthd =intel_ring_get_active_head (&dev_priv->ring[RCS ]); + acthd_bsd =HAS_BSD (dev) ? +intel_ring_get_active_head (&dev_priv->ring[VCS ]) :0 ; + acthd_blt =HAS_BLT (dev) ? +intel_ring_get_active_head (&dev_priv->ring[BCS ]) :0 ;if (dev_priv->last_acthd == acthd && + dev_priv->last_acthd_bsd == acthd_bsd && + dev_priv->last_acthd_blt == acthd_blt && dev_priv->last_instdone == instdone && dev_priv->last_instdone1 == instdone1) {if (dev_priv->hangcheck_count++ >1 ) {
@@ -1727,6 +1732,8 @@ void i915_hangcheck_elapsed(unsigned long data) dev_priv->hangcheck_count =0 ; dev_priv->last_acthd = acthd; + dev_priv->last_acthd_bsd = acthd_bsd; + dev_priv->last_acthd_blt = acthd_blt; dev_priv->last_instdone = instdone; dev_priv->last_instdone1 = instdone1; }
drivers/gpu/drm/i915/i915_suspend.c +4 -0
@@ -34,6 +34,10 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)struct drm_i915_private *dev_priv = dev->dev_private;u32 dpll_reg; +/* On IVB, 3rd pipe shares PLL with another one */ +if (pipe >1 ) +return false; +if (HAS_PCH_SPLIT (dev)) dpll_reg = (pipe ==PIPE_A ) ? _PCH_DPLL_A : _PCH_DPLL_B;else
drivers/gpu/drm/i915/intel_dp.c +1 -0
@@ -1926,6 +1926,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)intel_wait_for_vblank (dev,to_intel_crtc (crtc)->pipe); } +DP &= ~DP_AUDIO_OUTPUT_ENABLE ;I915_WRITE (intel_dp->output_reg,DP & ~DP_PORT_EN );POSTING_READ (intel_dp->output_reg);msleep (intel_dp->panel_power_down_delay);
drivers/gpu/drm/i915/intel_hdmi.c +6 -2
@@ -269,6 +269,10 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);u32 temp; +u32 enable_bits =SDVO_ENABLE ; + +if (intel_hdmi->has_audio) + enable_bits |=SDVO_AUDIO_ENABLE ; temp =I915_READ (intel_hdmi->sdvox_reg);
@@ -281,9 +285,9 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode) }if (mode !=DRM_MODE_DPMS_ON ) { - temp &= ~SDVO_ENABLE ; + temp &= ~enable_bits; }else { - temp |=SDVO_ENABLE ; + temp |= enable_bits; }I915_WRITE (intel_hdmi->sdvox_reg, temp);
drivers/gpu/drm/i915/intel_tv.c +8 -8
@@ -417,7 +417,7 @@ static const struct tv_mode tv_modes[] = { { .name = "NTSC-M", .clock = 108000, - .refresh = 29970, + .refresh = 59940, .oversample = TV_OVERSAMPLE_8X, .component_only = 0,/* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 3.580MHz */
@@ -460,7 +460,7 @@ static const struct tv_mode tv_modes[] = { { .name = "NTSC-443", .clock = 108000, - .refresh = 29970, + .refresh = 59940, .oversample = TV_OVERSAMPLE_8X, .component_only = 0,/* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 4.43MHz */
@@ -502,7 +502,7 @@ static const struct tv_mode tv_modes[] = { { .name = "NTSC-J", .clock = 108000, - .refresh = 29970, + .refresh = 59940, .oversample = TV_OVERSAMPLE_8X, .component_only = 0,
@@ -545,7 +545,7 @@ static const struct tv_mode tv_modes[] = { { .name = "PAL-M", .clock = 108000, - .refresh = 29970, + .refresh = 59940, .oversample = TV_OVERSAMPLE_8X, .component_only = 0,
@@ -589,7 +589,7 @@ static const struct tv_mode tv_modes[] = {/* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */ .name = "PAL-N", .clock = 108000, - .refresh = 25000, + .refresh = 50000, .oversample = TV_OVERSAMPLE_8X, .component_only = 0,
@@ -634,7 +634,7 @@ static const struct tv_mode tv_modes[] = {/* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */ .name = "PAL", .clock = 108000, - .refresh = 25000, + .refresh = 50000, .oversample = TV_OVERSAMPLE_8X, .component_only = 0,
@@ -821,7 +821,7 @@ static const struct tv_mode tv_modes[] = { { .name = "1080i@50Hz", .clock = 148800, - .refresh = 25000, + .refresh = 50000, .oversample = TV_OVERSAMPLE_2X, .component_only = 1,
@@ -847,7 +847,7 @@ static const struct tv_mode tv_modes[] = { { .name = "1080i@60Hz", .clock = 148800, - .refresh = 30000, + .refresh = 60000, .oversample = TV_OVERSAMPLE_2X, .component_only = 1,
drivers/gpu/drm/nouveau/nouveau_gem.c +21 -2
@@ -380,6 +380,25 @@ retry: }static int +validate_sync (struct nouveau_channel *chan,struct nouveau_bo *nvbo) +{ +struct nouveau_fence *fence =NULL ; +int ret =0 ; + +spin_lock (&nvbo->bo.bdev->fence_lock); +if (nvbo->bo.sync_obj) + fence =nouveau_fence_ref (nvbo->bo.sync_obj); +spin_unlock (&nvbo->bo.bdev->fence_lock); + +if (fence) { + ret =nouveau_fence_sync (fence, chan); +nouveau_fence_unref (&fence); + } + +return ret; +} + +static int validate_list (struct nouveau_channel *chan,struct list_head *list,struct drm_nouveau_gem_pushbuf_bo *pbbo,uint64_t user_pbbo_ptr) {
@@ -393,7 +412,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,list_for_each_entry (nvbo, list, entry) {struct drm_nouveau_gem_pushbuf_bo *b = &pbbo[nvbo->pbbo_index]; - ret =nouveau_fence_sync (nvbo->bo.sync_obj, chan); + ret =validate_sync (chan, nvbo);if (unlikely (ret)) {NV_ERROR (dev,"fail pre-validate sync\n" );return ret;
@@ -416,7 +435,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,return ret; } - ret =nouveau_fence_sync (nvbo->bo.sync_obj, chan); + ret =validate_sync (chan, nvbo);if (unlikely (ret)) {NV_ERROR (dev,"fail post-validate sync\n" );return ret;
drivers/gpu/drm/radeon/atombios_crtc.c +2 -2
@@ -1189,7 +1189,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,WREG32 (EVERGREEN_GRPH_ENABLE + radeon_crtc->crtc_offset,1 );WREG32 (EVERGREEN_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, - crtc->mode.vdisplay); + target_fb->height); x &= ~3 ; y &= ~1 ; WREG32(EVERGREEN_VIEWPORT_START + radeon_crtc->crtc_offset,
@@ -1358,7 +1358,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,WREG32 (AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset,1 );WREG32 (AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, - crtc->mode.vdisplay); + target_fb->height); x &= ~3 ; y &= ~1 ; WREG32(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset,
drivers/gpu/drm/radeon/atombios_dp.c +15 -3
@@ -564,9 +564,21 @@ int radeon_dp_get_panel_mode(struct drm_encoder *encoder, ENCODER_OBJECT_ID_NUTMEG) panel_mode =DP_PANEL_MODE_INTERNAL_DP1_MODE ; else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == -ENCODER_OBJECT_ID_TRAVIS ) - panel_mode =DP_PANEL_MODE_INTERNAL_DP2_MODE ; - else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +ENCODER_OBJECT_ID_TRAVIS ) { +u8 id[6 ]; +int i; +for (i =0 ; i <6 ; i++) + id[i] =radeon_read_dpcd_reg (radeon_connector,0x503 + i); +if (id[0 ] ==0x73 && + id[1 ] ==0x69 && + id[2 ] ==0x76 && + id[3 ] ==0x61 && + id[4 ] ==0x72 && + id[5 ] ==0x54 ) + panel_mode =DP_PANEL_MODE_INTERNAL_DP1_MODE ; +else + panel_mode =DP_PANEL_MODE_INTERNAL_DP2_MODE ; + } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {u8 tmp =radeon_read_dpcd_reg (radeon_connector,DP_EDP_CONFIGURATION_CAP );if (tmp &1 ) panel_mode =DP_PANEL_MODE_INTERNAL_DP2_MODE ;
drivers/gpu/drm/radeon/radeon_device.c +4 -0
@@ -864,6 +864,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; +drm_kms_helper_poll_disable (dev); +/* turn off display hw */ list_for_each_entry (connector, &dev->mode_config.connector_list, head) {drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF );
@@ -950,6 +952,8 @@ int radeon_resume_kms(struct drm_device *dev)list_for_each_entry (connector, &dev->mode_config.connector_list, head) {drm_helper_connector_dpms (connector,DRM_MODE_DPMS_ON ); } + +drm_kms_helper_poll_enable (dev);return 0 ; }
drivers/hwmon/w83627ehf.c +20 -3
@@ -1920,9 +1920,26 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data, fan4min =0 ; fan5pin =0 ; }else if (sio_data->kind == nct6776) { - fan3pin = !(superio_inb (sio_data->sioreg,0x24 ) &0x40 ); - fan4pin = !!(superio_inb (sio_data->sioreg,0x1C ) &0x01 ); - fan5pin = !!(superio_inb (sio_data->sioreg,0x1C ) &0x02 ); +bool gpok =superio_inb (sio_data->sioreg,0x27 ) &0x80 ; + +superio_select (sio_data->sioreg,W83627EHF_LD_HWM ); + regval =superio_inb (sio_data->sioreg,SIO_REG_ENABLE ); + +if (regval &0x80 ) + fan3pin = gpok; +else + fan3pin = !(superio_inb (sio_data->sioreg,0x24 ) &0x40 ); + +if (regval &0x40 ) + fan4pin = gpok; +else + fan4pin = !!(superio_inb (sio_data->sioreg,0x1C ) &0x01 ); + +if (regval &0x20 ) + fan5pin = gpok; +else + fan5pin = !!(superio_inb (sio_data->sioreg,0x1C ) &0x02 ); + fan4min = fan4pin; }else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { fan3pin =1 ;
drivers/infiniband/core/uverbs_cmd.c +1 -0
@@ -1485,6 +1485,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, qp->event_handler = attr.event_handler; qp->qp_context = attr.qp_context; qp->qp_type = attr.qp_type; +atomic_set (&qp->usecnt,0 );atomic_inc (&pd->usecnt);atomic_inc (&attr.send_cq->usecnt);if (attr.recv_cq)
drivers/infiniband/core/verbs.c +1 -1
@@ -421,6 +421,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, qp->uobject =NULL ; qp->qp_type = qp_init_attr->qp_type; +atomic_set (&qp->usecnt,0 );if (qp_init_attr->qp_type ==IB_QPT_XRC_TGT ) { qp->event_handler = __ib_shared_qp_event_handler; qp->qp_context = qp;
@@ -430,7 +431,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, qp->xrcd = qp_init_attr->xrcd;atomic_inc (&qp_init_attr->xrcd->usecnt);INIT_LIST_HEAD (&qp->open_list); -atomic_set (&qp->usecnt,0 ); real_qp = qp; qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,
drivers/infiniband/hw/mlx4/mad.c +2 -5
@@ -256,12 +256,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,return IB_MAD_RESULT_SUCCESS ;/* -* Don't process SMInfo queries or vendor-specific -* MADs -- the SMA can't handle them. +* Don't process SMInfo queries -- the SMA can't handle them. */ -if (in_mad->mad_hdr.attr_id ==IB_SMP_ATTR_SM_INFO || - ((in_mad->mad_hdr.attr_id &IB_SMP_ATTR_VENDOR_MASK ) == -IB_SMP_ATTR_VENDOR_MASK )) +if (in_mad->mad_hdr.attr_id ==IB_SMP_ATTR_SM_INFO )return IB_MAD_RESULT_SUCCESS ; } else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT || in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1 ||
drivers/iommu/amd_iommu.c +3 -0
@@ -2479,6 +2479,9 @@ static unsigned device_dma_ops_init(void)for_each_pci_dev (pdev) {if (!check_device (&pdev->dev)) { + +iommu_ignore_device (&pdev->dev); + unhandled +=1 ;continue ; }
drivers/iommu/msm_iommu.c +1 -6
@@ -481,23 +481,19 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va, priv = domain->priv; -if (!priv) { - ret = -ENODEV ; +if (!priv) goto fail; - } fl_table = priv->pgtable;if (len !=SZ_16M && len !=SZ_1M && len !=SZ_64K && len !=SZ_4K ) {pr_debug ("Bad length: %d\n" , len); - ret = -EINVAL ; goto fail; }if (!fl_table) {pr_debug ("Null page table\n" ); - ret = -EINVAL ; goto fail; }
@@ -506,7 +502,6 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,if (*fl_pte ==0 ) {pr_debug ("First level PTE is 0\n" ); - ret = -ENODEV ; goto fail; }
drivers/misc/cb710/core.c +1 -0
@@ -245,6 +245,7 @@ static int __devinit cb710_probe(struct pci_dev *pdev,if (err)return err; +spin_lock_init (&chip->irq_lock); chip->pdev = pdev; chip->iobase =pcim_iomap_table (pdev)[0 ];
drivers/mtd/nand/atmel_nand.c +41 -4
74 lines not on this page · raw message
drivers/mtd/nand/gpmi-nand/gpmi-lib.c +14 -4
@@ -69,17 +69,19 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)* [1] enable the module. * [2] reset the module. * -* In most of the cases, it's ok. But there is a hardware bug in the BCH block. +* In most of the cases, it's ok. +* But in MX23, there is a hardware bug in the BCH block (see erratum #2847). * If you try to soft reset the BCH block, it becomes unusable until * the next hard reset. This case occurs in the NAND boot mode. When the board * boots by NAND, the ROM of the chip will initialize the BCH blocks itself. * So If the driver tries to reset the BCH again, the BCH will not work anymore. -* You will see a DMA timeout in this case. +* You will see a DMA timeout in this case. The bug has been fixed +* in the following chips, such as MX28. * * To avoid this bug, just add a new parameter `just_enable` for * the mxs_reset_block(), and rewrite it here. */ -int gpmi_reset_block (void __iomem *reset_addr,bool just_enable) +static int gpmi_reset_block (void __iomem *reset_addr,bool just_enable) {int ret;int timeout =0x400 ;
@@ -206,7 +208,15 @@ int bch_set_geometry(struct gpmi_nand_data *this)if (ret) goto err_out; - ret =gpmi_reset_block (r->bch_regs, true); +/* +* Due to erratum #2847 of the MX23, the BCH cannot be soft reset on this +* chip, otherwise it will lock up. So we skip resetting BCH on the MX23. +* On the other hand, the MX28 needs the reset, because one case has been +* seen where the BCH produced ECC errors constantly after 10000 +* consecutive reboots. The latter case has not been seen on the MX23 yet, +* still we don't know if it could happen there as well. +*/ + ret =gpmi_reset_block (r->bch_regs,GPMI_IS_MX23 (this));if (ret) goto err_out;
drivers/net/ethernet/realtek/8139cp.c +1 -0
@@ -563,6 +563,7 @@ rx_next:if (cpr16 (IntrStatus) & cp_rx_intr_mask) goto rx_status_loop; +napi_gro_flush (napi);spin_lock_irqsave (&cp->lock, flags);__napi_complete (napi);cpw16_f (IntrMask, cp_intr_mask);
drivers/pcmcia/ds.c +1 -3
@@ -1269,10 +1269,8 @@ static int pcmcia_bus_add(struct pcmcia_socket *skt)static int pcmcia_bus_early_resume (struct pcmcia_socket *skt) { -if (!verify_cis_cache (skt)) { -pcmcia_put_socket (skt); +if (!verify_cis_cache (skt))return 0 ; - }dev_dbg (&skt->dev,"cis mismatch - different card\n" );
drivers/staging/asus_oled/asus_oled.c +9 -4
@@ -355,7 +355,14 @@ static void send_data(struct asus_oled_dev *odev)static int append_values (struct asus_oled_dev *odev,uint8_t val,size_t count) { -while (count-- >0 && val) { + odev->last_val = val; + +if (val ==0 ) { + odev->buf_offs += count; +return 0 ; + } + +while (count-- >0 ) {size_t x = odev->buf_offs % odev->width;size_t y = odev->buf_offs / odev->width;size_t i;
@@ -406,7 +413,6 @@ static int append_values(struct asus_oled_dev *odev, uint8_t val, size_t count) ; } - odev->last_val = val; odev->buf_offs++; }
@@ -805,10 +811,9 @@ error: static void __exit asus_oled_exit(void) { +usb_deregister (&oled_driver);class_remove_file (oled_class, &class_attr_version.attr);class_destroy (oled_class); - -usb_deregister (&oled_driver); }module_init (asus_oled_init);
drivers/staging/rtl8712/drv_types.h +7 -0
@@ -37,6 +37,8 @@ struct _adapter;#include "wlan_bssdef.h" #include "rtl8712_spec.h" #include "rtl8712_hal.h" +#include <linux/mutex.h> +#include <linux/completion.h> enum _NIC_VERSION {RTL8711_NIC ,
@@ -168,6 +170,7 @@ struct _adapter {s32 bSurpriseRemoved;u32 IsrContent;u32 ImrContent; +bool fw_found;u8 EepromAddressSize;u8 hw_init_completed;struct task_struct *cmdThread;
@@ -184,6 +187,10 @@ struct _adapter {_workitem wkFilterRxFF0;u8 blnEnableRxFF0Filter;spinlock_t lockRxFF0Filter; +const struct firmware *fw; +struct usb_interface *pusb_intf; +struct mutex mutex_start; +struct completion rtl8712_fw_ready; };static inline u8 *myid (struct eeprom_priv *peepriv)
drivers/staging/rtl8712/hal_init.c +43 -19
105 lines not on this page · raw message
drivers/staging/rtl8712/os_intfs.c +11 -3
@@ -31,6 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/kthread.h> +#include <linux/firmware.h> #include "osdep_service.h" #include "drv_types.h" #include "xmit_osdep.h"
@@ -264,12 +265,12 @@ static void start_drv_timers(struct _adapter *padapter)void r8712_stop_drv_timers (struct _adapter *padapter) {_cancel_timer_ex (&padapter->mlmepriv.assoc_timer); -_cancel_timer_ex (&padapter->mlmepriv.sitesurveyctrl. - sitesurvey_ctrl_timer);_cancel_timer_ex (&padapter->securitypriv.tkip_timer);_cancel_timer_ex (&padapter->mlmepriv.scan_to_timer);_cancel_timer_ex (&padapter->mlmepriv.dhcp_timer);_cancel_timer_ex (&padapter->mlmepriv.wdg_timer); +_cancel_timer_ex (&padapter->mlmepriv.sitesurveyctrl. + sitesurvey_ctrl_timer); }static u8 init_default_value (struct _adapter *padapter)
@@ -347,7 +348,8 @@ u8 r8712_free_drv_sw(struct _adapter *padapter)r8712_free_mlme_priv (&padapter->mlmepriv);r8712_free_io_queue (padapter);_free_xmit_priv (&padapter->xmitpriv); -_r8712_free_sta_priv (&padapter->stapriv); +if (padapter->fw_found) +_r8712_free_sta_priv (&padapter->stapriv);_r8712_free_recv_priv (&padapter->recvpriv);mp871xdeinit (padapter);if (pnetdev)
@@ -388,6 +390,7 @@ static int netdev_open(struct net_device *pnetdev) {struct _adapter *padapter = (struct _adapter *)netdev_priv (pnetdev); +mutex_lock (&padapter->mutex_start);if (padapter->bup == false) { padapter->bDriverStopped = false; padapter->bSurpriseRemoved = false;
@@ -435,11 +438,13 @@ static int netdev_open(struct net_device *pnetdev)/* start driver mlme relation timer */ start_drv_timers (padapter); padapter->ledpriv.LedControlHandler (padapter,LED_CTL_NO_LINK ); +mutex_unlock (&padapter->mutex_start);return 0 ; netdev_open_error: padapter->bup = false;netif_carrier_off (pnetdev);netif_stop_queue (pnetdev); +mutex_unlock (&padapter->mutex_start);return -1 ; }
@@ -473,6 +478,9 @@ static int netdev_close(struct net_device *pnetdev)r8712_free_network_queue (padapter);/* The interface is no longer Up: */ padapter->bup = false; +release_firmware (padapter->fw); +/* never exit with a firmware callback pending */ +wait_for_completion (&padapter->rtl8712_fw_ready);return 0 ; }
drivers/staging/rtl8712/rtl8712_hal.h +1 -0
@@ -145,5 +145,6 @@ struct hal_priv { };uint rtl8712_hal_init (struct _adapter *padapter); +int rtl871x_load_fw (struct _adapter *padapter);#endif
drivers/staging/rtl8712/usb_intf.c +7 -3
@@ -89,6 +89,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = { {USB_DEVICE(0x0DF6, 0x0045)}, {USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */ {USB_DEVICE(0x0DF6, 0x004B)}, + {USB_DEVICE(0x0DF6, 0x005B)}, {USB_DEVICE(0x0DF6, 0x005D)}, {USB_DEVICE(0x0DF6, 0x0063)},/* Sweex */
@@ -389,6 +390,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, pdvobjpriv = &padapter->dvobjpriv; pdvobjpriv->padapter = padapter; padapter->dvobjpriv.pusbdev = udev; + padapter->pusb_intf = pusb_intf;usb_set_intfdata (pusb_intf, pnetdev);SET_NETDEV_DEV (pnetdev, &pusb_intf->dev);/* step 2. */
@@ -595,10 +597,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, "%pM\n", mac);memcpy (pnetdev->dev_addr, mac,ETH_ALEN ); } -/* step 6. Tell the network stack we exist */ -if (register_netdev (pnetdev) !=0 ) +/* step 6. Load the firmware asynchronously */ +if (rtl871x_load_fw (padapter)) goto error;spin_lock_init (&padapter->lockRxFF0Filter); +mutex_init (&padapter->mutex_start);return 0 ; error:usb_put_dev (udev);
@@ -629,7 +632,8 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)flush_scheduled_work ();udelay (1 );/*Stop driver mlme relation timer */ -r8712_stop_drv_timers (padapter); +if (padapter->fw_found) +r8712_stop_drv_timers (padapter);r871x_dev_unload (padapter);r8712_free_drv_sw (padapter); }
drivers/staging/zcache/zcache-main.c +5 -6
@@ -358,8 +358,8 @@ static struct zbud_hdr *zbud_create(uint16_t client_id, uint16_t pool_id,if (unlikely (zbpg ==NULL )) goto out;/* ok, have a page, now compress the data before taking locks */ -spin_lock (&zbpg->lock);spin_lock (&zbud_budlists_spinlock); +spin_lock (&zbpg->lock);list_add_tail (&zbpg->bud_list, &zbud_unbuddied[nchunks].list); zbud_unbuddied[nchunks].count++; zh = &zbpg->buddy[0 ];
@@ -389,12 +389,11 @@ init_zh: zh->oid = *oid; zh->pool_id = pool_id; zh->client_id = client_id; -/* can wait to copy the data until the list locks are dropped */ -spin_unlock (&zbud_budlists_spinlock); - to =zbud_data (zh, size);memcpy (to, cdata, size);spin_unlock (&zbpg->lock); +spin_unlock (&zbud_budlists_spinlock); + zbud_cumul_chunk_counts[nchunks]++;atomic_inc (&zcache_zbud_curr_zpages); zcache_zbud_cumul_zpages++;
@@ -1782,9 +1781,9 @@ static int zcache_frontswap_poolid = -1;* Swizzling increases objects per swaptype, increasing tmem concurrency * for heavy swaploads. Later, larger nr_cpus -> larger SWIZ_BITS * Setting SWIZ_BITS to 27 basically reconstructs the swap entry from -* frontswap_get_page() +* frontswap_get_page(), but has side-effects. Hence using 8. */ -#define SWIZ_BITS 27 +#define SWIZ_BITS 8#define SWIZ_MASK ((1 << SWIZ_BITS) - 1)#define _oswiz (_type, _ind) ((_type << SWIZ_BITS) | (_ind & SWIZ_MASK))#define iswiz (_ind) (_ind >> SWIZ_BITS)
drivers/target/iscsi/iscsi_target.c +34 -5
@@ -1062,7 +1062,7 @@ attach_cmd:if (ret <0 )return iscsit_add_reject_from_cmd (ISCSI_REASON_BOOKMARK_NO_RESOURCES , -1 ,1 , buf, cmd); +1 ,0 , buf, cmd);/* * Check the CmdSN against ExpCmdSN/MaxCmdSN here if * the Immediate Bit is not set, and no Immediate
@@ -3165,6 +3165,30 @@ static int iscsit_send_task_mgt_rsp(return 0 ; } +static bool iscsit_check_inaddr_any (struct iscsi_np *np) +{ +bool ret = false; + +if (np->np_sockaddr.ss_family ==AF_INET6 ) { +const struct sockaddr_in6 sin6 = { + .sin6_addr =IN6ADDR_ANY_INIT }; +struct sockaddr_in6 *sock_in6 = + (struct sockaddr_in6 *)&np->np_sockaddr; + +if (!memcmp (sock_in6->sin6_addr.s6_addr, + sin6.sin6_addr.s6_addr,16 )) + ret = true; + }else { +struct sockaddr_in * sock_in = + (struct sockaddr_in *)&np->np_sockaddr; + +if (sock_in->sin_addr.s_addr ==INADDR_ANY ) + ret = true; + } + +return ret; +} +static int iscsit_build_sendtargets_response (struct iscsi_cmd *cmd) {char *payload =NULL ;
@@ -3214,12 +3238,17 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)spin_lock (&tpg->tpg_np_lock);list_for_each_entry (tpg_np, &tpg->tpg_gnp_list, tpg_np_list) { +struct iscsi_np *np = tpg_np->tpg_np; +bool inaddr_any =iscsit_check_inaddr_any (np); + len =sprintf (buf,"TargetAddress=" "%s%s%s:%hu,%hu" , - (tpg_np->tpg_np->np_sockaddr.ss_family ==AF_INET6 ) ? -"[" :"" , tpg_np->tpg_np->np_ip, - (tpg_np->tpg_np->np_sockaddr.ss_family ==AF_INET6 ) ? -"]" :"" , tpg_np->tpg_np->np_port, + (np->np_sockaddr.ss_family ==AF_INET6 ) ? +"[" :"" , (inaddr_any == false) ? + np->np_ip : conn->local_ip, + (np->np_sockaddr.ss_family ==AF_INET6 ) ? +"]" :"" , (inaddr_any == false) ? + np->np_port : conn->local_port, tpg->tpgt); len +=1 ;
drivers/target/iscsi/iscsi_target_core.h +2 -0
@@ -508,6 +508,7 @@ struct iscsi_conn {u16 cid;/* Remote TCP Port */ u16 login_port; +u16 local_port;int net_size;u32 auth_id;#define CONNFLAG_SCTP_STRUCT_FILE 0x01
@@ -527,6 +528,7 @@ struct iscsi_conn {unsigned char bad_hdr[ISCSI_HDR_LEN ];#define IPV6_ADDRESS_SPACE 48unsigned char login_ip[IPV6_ADDRESS_SPACE ]; +unsigned char local_ip[IPV6_ADDRESS_SPACE ];int conn_usage_count;int conn_waiting_on_uc;atomic_t check_immediate_queue;
drivers/target/iscsi/iscsi_target_login.c +27 -4
@@ -616,8 +616,8 @@ static int iscsi_post_login_handler( }pr_debug ("iSCSI Login successful on CID: %hu from %s to" -" %s:%hu,%hu\n" , conn->cid, conn->login_ip, np->np_ip, - np->np_port, tpg->tpgt); +" %s:%hu,%hu\n" , conn->cid, conn->login_ip, + conn->local_ip, conn->local_port, tpg->tpgt);list_add_tail (&conn->conn_list, &sess->sess_conn_list);atomic_inc (&sess->nconn);
@@ -659,7 +659,8 @@ static int iscsi_post_login_handler( sess->session_state =TARG_SESS_STATE_LOGGED_IN ;pr_debug ("iSCSI Login successful on CID: %hu from %s to %s:%hu,%hu\n" , - conn->cid, conn->login_ip, np->np_ip, np->np_port, tpg->tpgt); + conn->cid, conn->login_ip, conn->local_ip, conn->local_port, + tpg->tpgt);spin_lock_bh (&sess->conn_lock);list_add_tail (&conn->conn_list, &sess->sess_conn_list);
@@ -1019,6 +1020,18 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)snprintf (conn->login_ip,sizeof (conn->login_ip),"%pI6c" , &sock_in6.sin6_addr.in6_u); conn->login_port =ntohs (sock_in6.sin6_port); + +if (conn->sock->ops->getname (conn->sock, + (struct sockaddr *)&sock_in6, &err,0 ) <0 ) { +pr_err ("sock_ops->getname() failed.\n" ); +iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR , +ISCSI_LOGIN_STATUS_TARGET_ERROR ); + goto new_sess_out; + } +snprintf (conn->local_ip,sizeof (conn->local_ip),"%pI6c" , + &sock_in6.sin6_addr.in6_u); + conn->local_port =ntohs (sock_in6.sin6_port); + }else {memset (&sock_in,0 ,sizeof (struct sockaddr_in ));
@@ -1031,6 +1044,16 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) }sprintf (conn->login_ip,"%pI4" , &sock_in.sin_addr.s_addr); conn->login_port =ntohs (sock_in.sin_port); + +if (conn->sock->ops->getname (conn->sock, + (struct sockaddr *)&sock_in, &err,0 ) <0 ) { +pr_err ("sock_ops->getname() failed.\n" ); +iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR , +ISCSI_LOGIN_STATUS_TARGET_ERROR ); + goto new_sess_out; + } +sprintf (conn->local_ip,"%pI4" , &sock_in.sin_addr.s_addr); + conn->local_port =ntohs (sock_in.sin_port); } conn->network_transport = np->np_network_transport;
@@ -1038,7 +1061,7 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)pr_debug ("Received iSCSI login request from %s on %s Network" " Portal %s:%hu\n" , conn->login_ip, (conn->network_transport ==ISCSI_TCP ) ?"TCP" :"SCTP" , - np->np_ip, np->np_port); + conn->local_ip, conn->local_port);pr_debug ("Moving to TARG_CONN_STATE_IN_LOGIN.\n" ); conn->conn_state =TARG_CONN_STATE_IN_LOGIN ;
drivers/target/iscsi/iscsi_target_util.c +11 -0
@@ -851,6 +851,17 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd)case ISCSI_OP_SCSI_TMFUNC :transport_generic_free_cmd (&cmd->se_cmd,1 );break ; +case ISCSI_OP_REJECT : +/* +* Handle special case for REJECT when iscsi_add_reject*() has +* overwritten the original iscsi_opcode assignment, and the +* associated cmd->se_cmd needs to be released. +*/ +if (cmd->se_cmd.se_tfo !=NULL ) { +transport_generic_free_cmd (&cmd->se_cmd,1 ); +break ; + } +/* Fall-through */ default :iscsit_release_cmd (cmd);break ;
drivers/target/target_core_cdb.c +8 -1
@@ -701,6 +701,13 @@ int target_emulate_inquiry(struct se_task *task)int p, ret;if (!(cdb[1 ] &0x1 )) { +if (cdb[2 ]) { +pr_err ("INQUIRY with EVPD==0 but PAGE CODE=%02x\n" , + cdb[2 ]); + cmd->scsi_sense_reason =TCM_INVALID_CDB_FIELD ; +return -EINVAL ; + } + ret =target_emulate_inquiry_std (cmd); goto out; }
@@ -732,7 +739,7 @@ int target_emulate_inquiry(struct se_task *task) }pr_err ("Unknown VPD Code: 0x%02x\n" , cdb[2 ]); - cmd->scsi_sense_reason =TCM_UNSUPPORTED_SCSI_OPCODE ; + cmd->scsi_sense_reason =TCM_INVALID_CDB_FIELD ; ret = -EINVAL ; out_unmap:
drivers/target/target_core_pr.c +3 -2
@@ -481,6 +481,7 @@ static int core_scsi3_pr_seq_non_holder(case READ_MEDIA_SERIAL_NUMBER :case REPORT_LUNS :case REQUEST_SENSE : +case PERSISTENT_RESERVE_IN : ret =0 ;/*/ Allowed CDBs */ break ;default :
@@ -3138,7 +3139,7 @@ static int core_scsi3_pro_preempt(if (!calling_it_nexus)core_scsi3_ua_allocate (pr_reg_nacl, pr_res_mapped_lun,0x2A , -ASCQ_2AH_RESERVATIONS_PREEMPTED ); +ASCQ_2AH_REGISTRATIONS_PREEMPTED ); }spin_unlock (&pr_tmpl->registration_lock);/*
@@ -3251,7 +3252,7 @@ static int core_scsi3_pro_preempt(* additional sense code set to REGISTRATIONS PREEMPTED; */ core_scsi3_ua_allocate (pr_reg_nacl, pr_res_mapped_lun,0x2A , -ASCQ_2AH_RESERVATIONS_PREEMPTED ); +ASCQ_2AH_REGISTRATIONS_PREEMPTED ); }spin_unlock (&pr_tmpl->registration_lock);/*
drivers/target/target_core_transport.c +17 -4
@@ -3701,6 +3701,11 @@ transport_allocate_control_task(struct se_cmd *cmd)struct se_task *task;unsigned long flags; +/* Workaround for handling zero-length control CDBs */ +if ((cmd->se_cmd_flags &SCF_SCSI_CONTROL_SG_IO_CDB ) && + !cmd->data_length) +return 0 ; + task =transport_generic_get_task (cmd, cmd->data_direction);if (!task)return -ENOMEM ;
@@ -3772,6 +3777,14 @@ int transport_generic_new_cmd(struct se_cmd *cmd)else if (!task_cdbs && (cmd->se_cmd_flags &SCF_SCSI_DATA_SG_IO_CDB )) { cmd->t_state =TRANSPORT_COMPLETE ;atomic_set (&cmd->t_transport_active,1 ); + +if (cmd->t_task_cdb[0 ] ==REQUEST_SENSE ) { +u8 ua_asc =0 , ua_ascq =0 ; + +core_scsi3_ua_clear_for_request_sense (cmd, + &ua_asc, &ua_ascq); + } +INIT_WORK (&cmd->work, target_complete_ok_work);queue_work (target_completion_wq, &cmd->work);return 0 ;
@@ -4403,8 +4416,8 @@ int transport_send_check_condition_and_sense(/* CURRENT ERROR */ buffer[offset] =0x70 ; buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ; -/* ABORTED COMMAND */ - buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ; +/* ILLEGAL REQUEST */ + buffer[offset+SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ;/* INVALID FIELD IN CDB */ buffer[offset+SPC_ASC_KEY_OFFSET ] =0x24 ;break ;
@@ -4412,8 +4425,8 @@ int transport_send_check_condition_and_sense(/* CURRENT ERROR */ buffer[offset] =0x70 ; buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ; -/* ABORTED COMMAND */ - buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ; +/* ILLEGAL REQUEST */ + buffer[offset+SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ;/* INVALID FIELD IN PARAMETER LIST */ buffer[offset+SPC_ASC_KEY_OFFSET ] =0x26 ;break ;
drivers/tty/vt/vt_ioctl.c +0 -1
@@ -1463,7 +1463,6 @@ compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,if (!perm && op->op !=KD_FONT_OP_GET )return -EPERM ; op->data =compat_ptr (((struct compat_console_font_op *)op)->data); - op->flags |=KD_FONT_FLAG_OLD ; i =con_font_op (vc, op);if (i)return i;
drivers/usb/gadget/f_loopback.c +1 -1
@@ -418,7 +418,7 @@ int __init loopback_add(struct usb_composite_dev *cdev, bool autoresume)/* support autoresume for remote wakeup testing */ if (autoresume) - sourcesink_driver.bmAttributes |=USB_CONFIG_ATT_WAKEUP ; + loopback_driver.bmAttributes |=USB_CONFIG_ATT_WAKEUP ;/* support OTG systems */ if (gadget_is_otg (cdev->gadget)) {
drivers/usb/host/pci-quirks.c +6 -0
@@ -867,6 +867,12 @@ hc_init:static void __devinit quirk_usb_early_handoff (struct pci_dev *pdev) { +/* Skip Netlogic mips SoC's internal PCI USB controller. +* This device does not need/support EHCI/OHCI handoff +*/ +if (pdev->vendor ==0x184e )/* vendor Netlogic */ +return ; +if (pdev->class ==PCI_CLASS_SERIAL_USB_UHCI )quirk_usb_handoff_uhci (pdev);else if (pdev->class ==PCI_CLASS_SERIAL_USB_OHCI )
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -839,6 +839,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CINTERION_MC55I_PID) }, { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) }, { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -1187,3 +1187,10 @@*/ /* ZigBee controller */ #define FTDI_RF_R106 0x8A28 + +/* +* Product: HCP HIT GPRS modem +* Manufacturer: HCP d.o.o. +* ATI command output: Cinterion MC55i +*/ +#define FTDI_CINTERION_MC55I_PID 0xA951
drivers/usb/serial/option.c +128 -1
153 lines not on this page · raw message
drivers/video/atmel_lcdfb.c +1 -1
@@ -1089,7 +1089,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)*/ lcdc_writel (sinfo,ATMEL_LCDC_IDR , ~0UL ); - sinfo->saved_lcdcon =lcdc_readl (sinfo,ATMEL_LCDC_CONTRAST_VAL ); + sinfo->saved_lcdcon =lcdc_readl (sinfo,ATMEL_LCDC_CONTRAST_CTR );lcdc_writel (sinfo,ATMEL_LCDC_CONTRAST_CTR ,0 );if (sinfo->atmel_lcdfb_power_control) sinfo->atmel_lcdfb_power_control (0 );
fs/cifs/sess.c +3 -4
@@ -246,16 +246,15 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,/* copy user */ /* BB what about null user mounts - check that we do this BB */ /* copy user */ -if (ses->user_name !=NULL ) +if (ses->user_name !=NULL ) {strncpy (bcc_ptr, ses->user_name,MAX_USERNAME_SIZE ); + bcc_ptr +=strnlen (ses->user_name,MAX_USERNAME_SIZE ); + }/* else null user mount */ - - bcc_ptr +=strnlen (ses->user_name,MAX_USERNAME_SIZE ); *bcc_ptr =0 ; bcc_ptr++;/* account for null termination */ /* copy domain */ -if (ses->domainName !=NULL ) {strncpy (bcc_ptr, ses->domainName,256 ); bcc_ptr +=strnlen (ses->domainName,256 );
fs/ecryptfs/read_write.c +2 -2
@@ -130,7 +130,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,pgoff_t ecryptfs_page_idx = (pos >>PAGE_CACHE_SHIFT );size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK );size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page); -size_t total_remaining_bytes = ((offset + size) - pos); +loff_t total_remaining_bytes = ((offset + size) - pos);if (fatal_signal_pending (current)) { rc = -EINTR ;
@@ -141,7 +141,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, num_bytes = total_remaining_bytes;if (pos < offset) {/* remaining zeros to write, up to destination offset */ -size_t total_remaining_zeros = (offset - pos); +loff_t total_remaining_zeros = (offset - pos);if (num_bytes > total_remaining_zeros) num_bytes = total_remaining_zeros;
fs/proc/base.c +46 -60
148 lines not on this page · raw message
fs/udf/super.c +6 -0
@@ -1799,6 +1799,12 @@ static void udf_close_lvid(struct super_block *sb) le16_to_cpu(lvid->descTag.descCRCLength))); lvid->descTag.tagChecksum =udf_tag_checksum (&lvid->descTag); +/* +* We set buffer uptodate unconditionally here to avoid spurious +* warnings from mark_buffer_dirty() when previous EIO has marked +* the buffer as !uptodate +*/ +set_buffer_uptodate (bh);mark_buffer_dirty (bh); sbi->s_lvid_dirty =0 ;mutex_unlock (&sbi->s_alloc_mutex);
include/linux/freezer.h +2 -0
@@ -51,6 +51,7 @@ extern void refrigerator(void);extern int freeze_processes (void );extern int freeze_kernel_threads (void );extern void thaw_processes (void ); +extern void thaw_kernel_threads (void );static inline int try_to_freeze (void ) {
@@ -185,6 +186,7 @@ static inline void refrigerator(void) {}static inline int freeze_processes (void ) {return -ENOSYS ; }static inline int freeze_kernel_threads (void ) {return -ENOSYS ; }static inline void thaw_processes (void ) {} +static inline void thaw_kernel_threads (void ) {}static inline int try_to_freeze (void ) {return 0 ; }
include/linux/pm_qos.h +13 -1
@@ -107,7 +107,19 @@ static inline void pm_qos_remove_request(struct pm_qos_request *req) {return ; }static inline int pm_qos_request (int pm_qos_class) - {return 0 ; } +{ +switch (pm_qos_class) { +case PM_QOS_CPU_DMA_LATENCY : +return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE ; +case PM_QOS_NETWORK_LATENCY : +return PM_QOS_NETWORK_LAT_DEFAULT_VALUE ; +case PM_QOS_NETWORK_THROUGHPUT : +return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE ; +default : +return PM_QOS_DEFAULT_VALUE ; + } +} +static inline int pm_qos_add_notifier (int pm_qos_class,struct notifier_block *notifier) {return 0 ; }
include/linux/usb/ch9.h +1 -1
@@ -589,7 +589,7 @@ static inline int usb_endpoint_is_isoc_out(*/ static inline int usb_endpoint_maxp (const struct usb_endpoint_descriptor *epd) { -return le16_to_cpu (epd->wMaxPacketSize); +return __le16_to_cpu (epd->wMaxPacketSize); }/*-------------------------------------------------------------------------*/
kernel/kprobes.c +5 -1
@@ -1673,8 +1673,12 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p, ri->rp = rp; ri->task = current; -if (rp->entry_handler && rp->entry_handler (ri, regs)) +if (rp->entry_handler && rp->entry_handler (ri, regs)) { +raw_spin_lock_irqsave (&rp->lock, flags); +hlist_add_head (&ri->hlist, &rp->free_instances); +raw_spin_unlock_irqrestore (&rp->lock, flags);return 0 ; + }arch_prepare_kretprobe (ri, regs);
kernel/panic.c +13 -4
@@ -237,11 +237,20 @@ void add_taint(unsigned flag)* Can't trust the integrity of the kernel anymore. * We don't call directly debug_locks_off() because the issue * is not necessarily serious enough to set oops_in_progress to 1 -* Also we want to keep up lockdep for staging development and -* post-warning case. +* Also we want to keep up lockdep for staging/out-of-tree +* development and post-warning case. */ -if (flag !=TAINT_CRAP && flag !=TAINT_WARN &&__debug_locks_off ()) -printk (KERN_WARNING "Disabling lock debugging due to kernel taint\n" ); +switch (flag) { +case TAINT_CRAP : +case TAINT_OOT_MODULE : +case TAINT_WARN : +case TAINT_FIRMWARE_WORKAROUND : +break ; + +default : +if (__debug_locks_off ()) +printk (KERN_WARNING "Disabling lock debugging due to kernel taint\n" ); + }set_bit (flag, &tainted_mask); }
kernel/power/hibernate.c +1 -1
@@ -55,7 +55,7 @@ enum {static int hibernation_mode =HIBERNATION_SHUTDOWN ; -static bool freezer_test_done; +bool freezer_test_done;static const struct platform_hibernation_ops *hibernation_ops;
kernel/power/power.h +2 -0
@@ -50,6 +50,8 @@ static inline char *check_image_kernel(struct swsusp_info *info)#define SPARE_PAGES ((1024 * 1024) >> PAGE_SHIFT)/* kernel/power/hibernate.c */ +extern bool freezer_test_done; +extern int hibernation_snapshot (int platform_mode);extern int hibernation_restore (int platform_mode);extern int hibernation_platform_enter (void );
kernel/power/process.c +9 -0
@@ -203,3 +203,12 @@ void thaw_processes(void)printk ("done.\n" ); } +void thaw_kernel_threads (void ) +{ +printk ("Restarting kernel threads ... " ); +thaw_workqueues (); +thaw_tasks (true); +schedule (); +printk ("done.\n" ); +} +
kernel/power/user.c +19 -3
@@ -283,10 +283,17 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, }pm_restore_gfp_mask (); error =hibernation_snapshot (data->platform_support); -if (!error) +if (error) { +thaw_kernel_threads (); + }else { error =put_user (in_suspend, (int __user *)arg); -if (!error) - data->ready =1 ; +if (!error && !freezer_test_done) + data->ready =1 ; +if (freezer_test_done) { + freezer_test_done = false; +thaw_kernel_threads (); + } + }break ;case SNAPSHOT_ATOMIC_RESTORE :
@@ -303,6 +310,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,swsusp_free ();memset (&data->handle,0 ,sizeof (struct snapshot_handle )); data->ready =0 ; +/* +* It is necessary to thaw kernel threads here, because +* SNAPSHOT_CREATE_IMAGE may be invoked directly after +* SNAPSHOT_FREE. In that case, if kernel threads were not +* thawed, the preallocation of memory carried out by +* hibernation_snapshot() might run into problems (i.e. it +* might fail or even deadlock). +*/ +thaw_kernel_threads ();break ;case SNAPSHOT_SET_IMAGE_SIZE :
kernel/sched_rt.c +5 -0
@@ -1388,6 +1388,11 @@ static int push_rt_task(struct rq *rq)if (!next_task)return 0 ; +#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW +if (unlikely (task_running (rq, next_task))) +return 0 ; +#endif + retry:if (unlikely (next_task == rq->curr)) {WARN_ON (1 );
mm/compaction.c +23 -1
@@ -313,12 +313,34 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, }else if (!locked)spin_lock_irq (&zone->lru_lock); +/* +* migrate_pfn does not necessarily start aligned to a +* pageblock. Ensure that pfn_valid is called when moving +* into a new MAX_ORDER_NR_PAGES range in case of large +* memory holes within the zone +*/ +if ((low_pfn & (MAX_ORDER_NR_PAGES -1 )) ==0 ) { +if (!pfn_valid (low_pfn)) { + low_pfn +=MAX_ORDER_NR_PAGES -1 ; +continue ; + } + } +if (!pfn_valid_within (low_pfn))continue ; nr_scanned++; -/* Get the page and skip if free */ +/* +* Get the page and ensure the page is within the same zone. +* See the comment in isolate_freepages about overlapping +* nodes. It is deliberate that the new zone lock is not taken +* as memory compaction should not move pages between nodes. +*/ page =pfn_to_page (low_pfn); +if (page_zone (page) != zone) +continue ; + +/* Skip if free */ if (PageBuddy (page))continue ;
mm/filemap.c +4 -4
@@ -1400,15 +1400,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,unsigned long seg =0 ;size_t count;loff_t *ppos = &iocb->ki_pos; -struct blk_plug plug; count =0 ; retval =generic_segment_checks (iov, &nr_segs, &count,VERIFY_WRITE );if (retval)return retval; -blk_start_plug (&plug); -/* coalesce the iovecs and go direct-to-BIO for O_DIRECT */ if (filp->f_flags &O_DIRECT ) {loff_t size;
@@ -1424,8 +1421,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, retval =filemap_write_and_wait_range (mapping, pos, pos +iov_length (iov, nr_segs) -1 );if (!retval) { +struct blk_plug plug; + +blk_start_plug (&plug); retval = mapping->a_ops->direct_IO (READ , iocb, iov, pos, nr_segs); +blk_finish_plug (&plug); }if (retval >0 ) { *ppos = pos + retval;
@@ -1481,7 +1482,6 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,break ; } out: -blk_finish_plug (&plug);return retval; }EXPORT_SYMBOL (generic_file_aio_read);
mm/filemap_xip.c +6 -1
@@ -263,7 +263,12 @@ found: xip_pfn);if (err == -ENOMEM )return VM_FAULT_OOM ; -BUG_ON (err); +/* +* err == -EBUSY is fine, we've raced against another thread +* that faulted-in the same page +*/ +if (err != -EBUSY ) +BUG_ON (err);return VM_FAULT_NOPAGE ; }else {int err, ret =VM_FAULT_OOM ;
mm/huge_memory.c +2 -2
@@ -2064,7 +2064,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) {struct mm_struct *mm = mm_slot->mm; -VM_BUG_ON (!spin_is_locked (&khugepaged_mm_lock)); +VM_BUG_ON (NR_CPUS !=1 && !spin_is_locked (&khugepaged_mm_lock));if (khugepaged_test_exit (mm)) {/* free mm_slot */
@@ -2094,7 +2094,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,int progress =0 ;VM_BUG_ON (!pages); -VM_BUG_ON (!spin_is_locked (&khugepaged_mm_lock)); +VM_BUG_ON (NR_CPUS !=1 && !spin_is_locked (&khugepaged_mm_lock));if (khugepaged_scan.mm_slot) mm_slot = khugepaged_scan.mm_slot;
mm/swap.c +1 -1
@@ -667,7 +667,7 @@ void lru_add_page_tail(struct zone* zone,VM_BUG_ON (!PageHead (page));VM_BUG_ON (PageCompound (page_tail));VM_BUG_ON (PageLRU (page_tail)); -VM_BUG_ON (!spin_is_locked (&zone->lru_lock)); +VM_BUG_ON (NR_CPUS !=1 && !spin_is_locked (&zone->lru_lock));SetPageLRU (page_tail);
sound/pci/hda/hda_codec.c +1 -1
@@ -1446,7 +1446,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,for (i =0 ; i < c->cvt_setups.used; i++) { p =snd_array_elem (&c->cvt_setups, i);if (!p->active && p->stream_tag == stream_tag && -get_wcaps_type (get_wcaps (codec, p->nid)) == type) +get_wcaps_type (get_wcaps (c, p->nid)) == type) p->dirty =1 ; } }
sound/pci/hda/patch_cirrus.c +4 -2
@@ -976,8 +976,10 @@ static void cs_automic(struct hda_codec *codec)/* specific to CS421x, single ADC */ if (spec->vendor_nid ==CS421X_VENDOR_NID ) {if (present) { - spec->last_input = spec->cur_input; - spec->cur_input = spec->automic_idx; +if (spec->cur_input != spec->automic_idx) { + spec->last_input = spec->cur_input; + spec->cur_input = spec->automic_idx; + } }else { spec->cur_input = spec->last_input; }
sound/pci/hda/patch_realtek.c +35 -9
84 lines not on this page · raw message
sound/pci/hda/patch_via.c +22 -6
@@ -198,6 +198,9 @@ struct via_spec {unsigned int no_pin_power_ctl;enum VIA_HDA_CODEC codec_type; +/* analog low-power control */ +bool alc_mode; +/* smart51 setup */ unsigned int smart51_nums;hda_nid_t smart51_pins[2 ];
@@ -748,6 +751,7 @@ static int via_pin_power_ctl_put(struct snd_kcontrol *kcontrol,return 0 ; spec->no_pin_power_ctl = val;set_widgets_power_state (codec); +analog_low_current_mode (codec);return 1 ; }
@@ -1035,13 +1039,19 @@ static bool is_aa_path_mute(struct hda_codec *codec) }/* enter/exit analog low-current mode */ -static void analog_low_current_mode (struct hda_codec *codec) +static void __analog_low_current_mode (struct hda_codec *codec,bool force) {struct via_spec *spec = codec->spec;bool enable;unsigned int verb, parm; - enable =is_aa_path_mute (codec) && (spec->opened_streams !=0 ); +if (spec->no_pin_power_ctl) + enable = false; +else + enable =is_aa_path_mute (codec) && !spec->opened_streams; +if (enable == spec->alc_mode && !force) +return ; + spec->alc_mode = enable;/* decide low current mode's verb & parameter */ switch (spec->codec_type) {
@@ -1073,6 +1083,11 @@ static void analog_low_current_mode(struct hda_codec *codec)snd_hda_codec_write (codec, codec->afg,0 , verb, parm); } +static void analog_low_current_mode (struct hda_codec *codec) +{ +return __analog_low_current_mode (codec, false); +} +/* * generic initialization of ADC, input mixers and output mixers */
@@ -1445,6 +1460,7 @@ static int via_build_controls(struct hda_codec *codec)struct snd_kcontrol *kctl;int err, i; + spec->no_pin_power_ctl =1 ;if (spec->set_widgets_power_state)if (!via_clone_control (spec, &via_pin_power_ctl_enum))return -ENOMEM ;
@@ -1498,10 +1514,6 @@ static int via_build_controls(struct hda_codec *codec)return err; } -/* init power states */ -set_widgets_power_state (codec); -analog_low_current_mode (codec); -via_free_kctls (codec);/* no longer needed */ return 0 ; }
@@ -2771,6 +2783,10 @@ static int via_init(struct hda_codec *codec)for (i =0 ; i < spec->num_iverbs; i++)snd_hda_sequence_write (codec, spec->init_verbs[i]); +/* init power states */ +set_widgets_power_state (codec); +__analog_low_current_mode (codec, true); +via_auto_init_multi_out (codec);via_auto_init_hp_out (codec);via_auto_init_speaker_out (codec);
sound/pci/oxygen/oxygen_mixer.c +14 -11
@@ -618,9 +618,12 @@ static int ac97_volume_get(struct snd_kcontrol *ctl,mutex_lock (&chip->mutex); reg =oxygen_read_ac97 (chip, codec, index);mutex_unlock (&chip->mutex); - value->value.integer.value[0 ] =31 - (reg &0x1f ); -if (stereo) - value->value.integer.value[1 ] =31 - ((reg >>8 ) &0x1f ); +if (!stereo) { + value->value.integer.value[0 ] =31 - (reg &0x1f ); + }else { + value->value.integer.value[0 ] =31 - ((reg >>8 ) &0x1f ); + value->value.integer.value[1 ] =31 - (reg &0x1f ); + }return 0 ; }
@@ -636,14 +639,14 @@ static int ac97_volume_put(struct snd_kcontrol *ctl,mutex_lock (&chip->mutex); oldreg =oxygen_read_ac97 (chip, codec, index); - newreg = oldreg; - newreg = (newreg & ~0x1f ) | - (31 - (value->value.integer.value[0 ] &0x1f )); -if (stereo) - newreg = (newreg & ~0x1f00 ) | - ((31 - (value->value.integer.value[1 ] &0x1f )) <<8 ); -else - newreg = (newreg & ~0x1f00 ) | ((newreg &0x1f ) <<8 ); +if (!stereo) { + newreg = oldreg & ~0x1f ; + newreg |=31 - (value->value.integer.value[0 ] &0x1f ); + }else { + newreg = oldreg & ~0x1f1f ; + newreg |= (31 - (value->value.integer.value[0 ] &0x1f )) <<8 ; + newreg |=31 - (value->value.integer.value[1 ] &0x1f ); + } change = newreg != oldreg;if (change)oxygen_write_ac97 (chip, codec, index, newreg);
sound/soc/codecs/wm8962.c +3 -3
@@ -3172,13 +3172,13 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream,case SNDRV_PCM_FORMAT_S16_LE :break ;case SNDRV_PCM_FORMAT_S20_3LE : - aif0 |=0x40 ; + aif0 |=0x4 ;break ;case SNDRV_PCM_FORMAT_S24_LE : - aif0 |=0x80 ; + aif0 |=0x8 ;break ;case SNDRV_PCM_FORMAT_S32_LE : - aif0 |=0xc0 ; + aif0 |=0xc ;break ;default :return -EINVAL ;
sound/soc/codecs/wm8994.c +5 -1
@@ -729,6 +729,8 @@ static void vmid_reference(struct snd_soc_codec *codec) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); +pm_runtime_get_sync (codec->dev); + wm8994->vmid_refcount++; dev_dbg(codec->dev, "Referencing VMID, refcount is now %d\n",
@@ -742,7 +744,7 @@ static void vmid_reference(struct snd_soc_codec *codec)WM8994_VMID_RAMP_MASK ,WM8994_STARTUP_BIAS_ENA |WM8994_VMID_BUF_ENA | - (0x11 << WM8994_VMID_RAMP_SHIFT)); + (0x3 << WM8994_VMID_RAMP_SHIFT));/* Main bias enable, VMID=2x40k */ snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
@@ -796,6 +798,8 @@ static void vmid_dereference(struct snd_soc_codec *codec)WM8994_VMID_BUF_ENA | WM8994_VMID_RAMP_MASK, 0); } + +pm_runtime_put (codec->dev); } static int vmid_event(struct snd_soc_dapm_widget *w,
sound/soc/codecs/wm_hubs.c +12 -6
@@ -587,14 +587,14 @@ SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 0, 1, 0), };static const struct snd_kcontrol_new line2_mix[] = { -SOC_DAPM_SINGLE ("IN2R Switch" ,WM8993_LINE_MIXER2 ,2 ,1 ,0 ), -SOC_DAPM_SINGLE ("IN2L Switch" ,WM8993_LINE_MIXER2 ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("IN1L Switch" ,WM8993_LINE_MIXER2 ,2 ,1 ,0 ), +SOC_DAPM_SINGLE ("IN1R Switch" ,WM8993_LINE_MIXER2 ,1 ,1 ,0 ),SOC_DAPM_SINGLE ("Output Switch" ,WM8993_LINE_MIXER2 ,0 ,1 ,0 ), };static const struct snd_kcontrol_new line2n_mix[] = { -SOC_DAPM_SINGLE ("Left Output Switch" ,WM8993_LINE_MIXER2 ,6 ,1 ,0 ), -SOC_DAPM_SINGLE ("Right Output Switch" ,WM8993_LINE_MIXER2 ,5 ,1 ,0 ), +SOC_DAPM_SINGLE ("Left Output Switch" ,WM8993_LINE_MIXER2 ,5 ,1 ,0 ), +SOC_DAPM_SINGLE ("Right Output Switch" ,WM8993_LINE_MIXER2 ,6 ,1 ,0 ), };static const struct snd_kcontrol_new line2p_mix[] = {
@@ -614,6 +614,8 @@ SND_SOC_DAPM_INPUT("IN2RP:VXRP"),SND_SOC_DAPM_MICBIAS ("MICBIAS2" ,WM8993_POWER_MANAGEMENT_1 ,5 ,0 ),SND_SOC_DAPM_MICBIAS ("MICBIAS1" ,WM8993_POWER_MANAGEMENT_1 ,4 ,0 ), +SND_SOC_DAPM_SUPPLY ("LINEOUT_VMID_BUF" ,WM8993_ANTIPOP1 ,7 ,0 ,NULL ,0 ), +SND_SOC_DAPM_MIXER ("IN1L PGA" ,WM8993_POWER_MANAGEMENT_2 ,6 ,0 , in1l_pga,ARRAY_SIZE (in1l_pga)), SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0,
@@ -832,9 +834,11 @@ static const struct snd_soc_dapm_route lineout1_diff_routes[] = { };static const struct snd_soc_dapm_route lineout1_se_routes[] = { + {"LINEOUT1N Mixer" ,NULL ,"LINEOUT_VMID_BUF" }, {"LINEOUT1N Mixer" ,"Left Output Switch" ,"Left Output PGA" }, {"LINEOUT1N Mixer" ,"Right Output Switch" ,"Right Output PGA" }, + {"LINEOUT1P Mixer" ,NULL ,"LINEOUT_VMID_BUF" }, {"LINEOUT1P Mixer" ,"Left Output Switch" ,"Left Output PGA" }, {"LINEOUT1N Driver" ,NULL ,"LINEOUT1N Mixer" },
@@ -842,8 +846,8 @@ static const struct snd_soc_dapm_route lineout1_se_routes[] = { };static const struct snd_soc_dapm_route lineout2_diff_routes[] = { - {"LINEOUT2 Mixer" ,"IN2L Switch" ,"IN2L PGA" }, - {"LINEOUT2 Mixer" ,"IN2R Switch" ,"IN2R PGA" }, + {"LINEOUT2 Mixer" ,"IN1L Switch" ,"IN1L PGA" }, + {"LINEOUT2 Mixer" ,"IN1R Switch" ,"IN1R PGA" }, {"LINEOUT2 Mixer" ,"Output Switch" ,"Right Output PGA" }, {"LINEOUT2N Driver" ,NULL ,"LINEOUT2 Mixer" },
@@ -851,9 +855,11 @@ static const struct snd_soc_dapm_route lineout2_diff_routes[] = { };static const struct snd_soc_dapm_route lineout2_se_routes[] = { + {"LINEOUT2N Mixer" ,NULL ,"LINEOUT_VMID_BUF" }, {"LINEOUT2N Mixer" ,"Left Output Switch" ,"Left Output PGA" }, {"LINEOUT2N Mixer" ,"Right Output Switch" ,"Right Output PGA" }, + {"LINEOUT2P Mixer" ,NULL ,"LINEOUT_VMID_BUF" }, {"LINEOUT2P Mixer" ,"Right Output Switch" ,"Right Output PGA" }, {"LINEOUT2N Driver" ,NULL ,"LINEOUT2N Mixer" },
compile warnings, linux-3.2.6a/arch/x86/include/asm/uaccess_32.h, was Re: Linux 3.2.6
In reply to Greg KHQuoted 3 lines · you
I'm announcing the release of the 3.2.6 kernel.
All users of the 3.2 kernel series must upgrade.
I'm getting:
...
CC drivers/net/Space.o
In file included from /home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess.h:573:0,
from /home/grant/linux/linux-3.2.6a/arch/x86/include/asm/sections.h:5,
from /home/grant/linux/linux-3.2.6a/arch/x86/include/asm/hw_irq.h:26,
from include/linux/irq.h:357,
from /home/grant/linux/linux-3.2.6a/arch/x86/include/asm/hardirq.h:5,
from include/linux/hardirq.h:7,
from include/linux/interrupt.h:12,
from net/core/pktgen.c:135:
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:877:20:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1147:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1254:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1276:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1300:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1323:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1346:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1367:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1388:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1409:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1431:21:
/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
In function 'copy_from_user',
inlined from 'pktgen_if_write' at net/core/pktgen.c:1448:21:/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
CC drivers/net/loopback.o
In function 'copy_from_user',
inlined from 'pktgen_thread_write' at net/core/pktgen.c:1771:20:/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct In function 'copy_from_user',
inlined from 'pktgen_thread_write' at net/core/pktgen.c:1802:21:/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
CC [M] drivers/net/ethernet/broadcom/bnx2.o
...
Is this bad? Turning off the pktgen option reduced the compile warnings to a single:
In file included from /home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess.h:573:0,
from include/net/checksum.h:25,
from include/linux/skbuff.h:28,
from include/linux/if_ether.h:133,
from include/linux/netdevice.h:29,
from net/packet/af_packet.c:62:In function 'copy_from_user',
inlined from 'packet_getsockopt' at net/packet/af_packet.c:3269:21:/home/grant/linux/linux-3.2.6a/arch/x86/include/asm/uaccess_32.h:211:26: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
Cheers,
Grant.
Quoted 298 lines
The updated 3.2.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-3.2.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/arm/kernel/ptrace.c | 8 + arch/arm/kernel/signal.c | 5 - arch/arm/mach-omap2/gpmc.c | 6 + drivers/cpufreq/powernow-k8.c | 30 ++++-- drivers/dma/at_hdmac.c | 4 drivers/dma/at_hdmac_regs.h | 17 +-- drivers/firewire/ohci.c | 6 + drivers/gpu/drm/i915/i915_debugfs.c | 8 + drivers/gpu/drm/i915/i915_dma.c | 1 drivers/gpu/drm/i915/i915_drv.c | 20 +++- drivers/gpu/drm/i915/i915_drv.h | 12 ++ drivers/gpu/drm/i915/i915_irq.c | 13 ++- drivers/gpu/drm/i915/i915_suspend.c | 4 drivers/gpu/drm/i915/intel_dp.c | 1 drivers/gpu/drm/i915/intel_hdmi.c | 8 + drivers/gpu/drm/i915/intel_tv.c | 16 +-- drivers/gpu/drm/nouveau/nouveau_gem.c | 23 ++++- drivers/gpu/drm/radeon/atombios_crtc.c | 4 drivers/gpu/drm/radeon/atombios_dp.c | 18 +++- drivers/gpu/drm/radeon/radeon_device.c | 4 drivers/hwmon/w83627ehf.c | 23 ++++- drivers/infiniband/core/uverbs_cmd.c | 1 drivers/infiniband/core/verbs.c | 2 drivers/infiniband/hw/mlx4/mad.c | 7 - drivers/iommu/amd_iommu.c | 3 drivers/iommu/msm_iommu.c | 7 - drivers/misc/cb710/core.c | 1 drivers/mtd/nand/atmel_nand.c | 45 +++++++++- drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 18 +++- drivers/net/ethernet/realtek/8139cp.c | 1 drivers/pcmcia/ds.c | 4 drivers/staging/asus_oled/asus_oled.c | 13 ++- drivers/staging/rtl8712/drv_types.h | 7 + drivers/staging/rtl8712/hal_init.c | 62 ++++++++++---- drivers/staging/rtl8712/os_intfs.c | 14 ++- drivers/staging/rtl8712/rtl8712_hal.h | 1 drivers/staging/rtl8712/usb_intf.c | 10 +- drivers/staging/zcache/zcache-main.c | 11 +- drivers/target/iscsi/iscsi_target.c | 39 +++++++-- drivers/target/iscsi/iscsi_target_core.h | 2 drivers/target/iscsi/iscsi_target_login.c | 31 ++++++- drivers/target/iscsi/iscsi_target_util.c | 11 ++ drivers/target/target_core_cdb.c | 9 +- drivers/target/target_core_pr.c | 5 - drivers/target/target_core_transport.c | 21 +++- drivers/tty/vt/vt_ioctl.c | 1 drivers/usb/gadget/f_loopback.c | 2 drivers/usb/host/pci-quirks.c | 6 + drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 7 + drivers/usb/serial/option.c | 129 +++++++++++++++++++++++++++++- drivers/video/atmel_lcdfb.c | 2 fs/cifs/sess.c | 7 - fs/ecryptfs/read_write.c | 4 fs/proc/base.c | 106 ++++++++++-------------- fs/udf/super.c | 6 + include/linux/freezer.h | 2 include/linux/pm_qos.h | 14 +++ include/linux/usb/ch9.h | 2 kernel/kprobes.c | 6 + kernel/panic.c | 17 +++ kernel/power/hibernate.c | 2 kernel/power/power.h | 2 kernel/power/process.c | 9 ++ kernel/power/user.c | 22 ++++- kernel/sched_rt.c | 5 + mm/compaction.c | 24 +++++ mm/filemap.c | 8 - mm/filemap_xip.c | 7 + mm/huge_memory.c | 4 mm/swap.c | 2 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/patch_cirrus.c | 6 - sound/pci/hda/patch_realtek.c | 44 ++++++++-- sound/pci/hda/patch_via.c | 28 +++++- sound/pci/oxygen/oxygen_mixer.c | 25 +++-- sound/soc/codecs/wm8962.c | 6 - sound/soc/codecs/wm8994.c | 6 + sound/soc/codecs/wm_hubs.c | 18 ++-- 80 files changed, 822 insertions(+), 268 deletions(-)Alex Deucher (1):
drm/radeon/kms: fix TRAVIS panel setupAndreas Herrmann (2):
powernow-k8: Avoid Pstate MSR accesses on systems supporting CPB
powernow-k8: Fix indexing issueArtem Bityutskiy (1):
Revert "mtd:atmel_nand: optimize read/write buffer functions"Axel Lin (1):
mmc: cb710 core: Add missingspin_lock_initforirq_lockof structcb710_chipBen Hutchings (1):
lockdep, bug: ExcludeTAINT_OOT_MODULEfrom disabling lock debuggingBen Skeggs (1):
drm/nouveau/gem: fixfence_syncrace / oopsBernd Schubert (1):
RDMA/core: Fix kernel panic by always initializing qp->usecntCarsten Otte (1):
mm/filemap_xip.c: fix race condition inxip_file_fault()Chanho Min (1):
sched/rt: Fix task stack corruption under__ARCH_WANT_INTERRUPTS_ON_CTXSWClemens Ladisch (2):
firewire: ohci: add reset packet quirk for SB Audigy
ALSA: oxygen, virtuoso: fix exchanged L/R volumes of aux and CD inputsDan Magenheimer (2):
zcache: SetSWIZ_BITSto 8 to reduce tmem bucket lock contention.
zcache: fix deadlock conditionDaniel Vetter (3):
drm/i915: check ACTHD of all rings
drm/i915: convertforce_wake_getto func pointer in the gpu reset code drm/i915: protectforce_wake_(get|put)with thegt_lockDave Martin (1):
ARM: 7307/1: vfp: fix ptrace regset modification raceDavid Henningsson (2):
ALSA: HDA: Remove quirk for Asus N53Jq
ALSA: HDA: Fix duplicated output to more than one codecDylan Reid (1):
ALSA: hda - Fix callingcs_automictwice for Cirrus codecs.Eugeni Dodonov (1):
drm/i915: handle 3rd pipeFrancois Romieu (1):
8139cp: fix missingnapi_gro_flush.Greg Kroah-Hartman (1):
Linux 3.2.6Guenter Roeck (1):
hwmon: (w83627ehf) Fix number of fans for NCT6776FHuang Shijie (1):
mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23Hubert Feurstein (1):
atmel_lcdfb: fix usage ofCONTRAST_CTRin suspend/resumeHugh Dickins (1):
mm: fix UP THPspin_is_lockedBUGsJack Morgenstein (1):
IB/mlx4: pass SMP vendor-specific attribute MADs to firmwareJan Kara (1):
udf: Mark LVID buffer as uptodate before marking it dirtyJayachandran C (1):
usb: Skip PCI USB quirk handling for Netlogic XLPJiang Liu (1):
kprobes: fix a memory leak in functionpre_handler_kretprobe()Joerg Roedel (2):
iommu/amd: Work around broken IVRS tables iommu/msm: Fix error handling inmsm_iommu_unmap()Kuninori Morimoto (1):
usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()Larry Finger (2):
staging: r8712u: Add new Sitecom UsB ID
staging: r8712u: Use asynchronous firmware loadingLi Wang (1):
eCryptfs: Infinite loop due to overflow inecryptfs_write()Marco Sanvido (2):
target: Use correct preempted registration sense code
target: Allow PERSISTENT RESERVE IN for non-reservation holderMark Brown (5):
ASoC:wm_hubs: Enable line out VMID buffer for single ended line outputs
ASoC:wm_hubs: Fix routing of input PGAs to line output mixer
ASoC:wm_hubs: Correct line input to line output 2 paths
ASoC: wm8994: Enabling VMID should take a runtime PM reference
ASoC: wm8994: Fix typo in VMID ramp settingMel Gorman (2):
mm: compaction: checkpfn_validwhen entering a newMAX_ORDER_NR_PAGESblock during isolation for migration
mm: compaction: check for overlapping nodes during isolation for migrationMichel Dänzer (1):
drm/radeon: SetDESKTOP_HEIGHTregister to the framebuffer (not mode) height.Milan Kocian (1):
USB: usbserial: add new PID number (0xa951) to the ftdi driverNicholas Bellinger (4):
iscsi-target: Fix reject release handling iniscsit_free_cmd()
iscsi-target: Fix doublelist_addwithiscsit_alloc_buffsreject
iscsi-target: Fix discovery withINADDR_ANYandIN6ADDR_ANY_INIT
target: Add workaround for zero-length control CDB handlingNikolaus Voss (1):
at_hdmac: bugfix for enabling channel irqOleg Nesterov (3):
proc:mem_release()should check mm != NULL
proc: unifymem_read()andmem_write()
proc: make suremem_open()doesn't pin the target's memoryPekka Paalanen (2):
Staging:asus_oled: fix image processing
Staging:asus_oled: fix NULL-ptr crash on unloadingPeter Zijlstra (1):
lockdep, bug: ExcludeTAINT_FIRMWARE_WORKAROUNDfrom disabling lockdepRafael J. Wysocki (1):
PM / Hibernate: Fix s2disk regression related to freezing workqueuesRodrigo Vivi (1):
drm/i915: Fix TV Out refresh rate.Roland Dreier (3):
target: Correct sense key for INVALID FIELD IN {PARAMETER LIST,CDB} target: Return correct ASC for unimplemented VPD pages target: Fail INQUIRY commands with EVPD==0 but PAGE CODE!=0Rui li (1):
USB: add new zte 3g-dongle's pid tooption.cRussell King (1):
pcmcia: fix socket refcount decrementing on each resumeSamuel Thibault (1):
drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layerSeth Forshee (1):
drm/radeon/kms: disable output polling when suspendedShaohua Li (1):
readahead: fix pipeline break caused by block plugShirish Pargaonkar (1):
cifs: Fix oops in session setup code for null user mountsSrivatsa S. Bhat (2):
PM / Hibernate: Thaw processes inSNAPSHOT_CREATE_IMAGEioctl test path PM / Hibernate: Thaw kernel threads inSNAPSHOT_CREATE_IMAGEioctl pathStefan Richter (1):
firewire: ohci: disable MSI on Ricoh controllersSusan Gao (1):
ASoC: wm8962: Fix word length configurationTakashi Iwai (4):
ALSA: hda - Fix the logic to detect VIA analog low-current mode
ALSA: hda - Apply 0x0f-VREF fix to all ASUS laptops with ALC861/660
ALSA: hda - Allow analog low-current mode when dynamic power-control is on
ALSA: hda - Disable dynamic-power control for VIA as defaultTimo Juhani Lindfors (1):
usb: gadget: zero: fix bug in loopback autoresume handlingUK KIM (1):
ASoC:wm_hubs: fix wrong bits for LINEOUT2 N/P mixerVenkatesh Pallipadi (1):
PM / QoS: CPU C-state breakage with PM Qos changeWill Deacon (2):
ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe
ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registersWu Fengguang (2):
drm/i915: HDMI hot remove notification to audio driver drm/i915: DisplayPort hot remove notification to audio driverYegor Yefremov (1):
ARM: OMAP2+: GPMC: fix device size setup
Greg KH
maintainerRe: compile warnings, linux-3.2.6a/arch/x86/include/asm/uaccess_32.h, was Re: Linux 3.2.6
Quoted 9 lines · Grant Coady
Quoted 3 lines · you
I'm announcing the release of the 3.2.6 kernel.
All users of the 3.2 kernel series must upgrade.
I'm getting:
...
CCdrivers/net/Space.o
<snip>
Does this also happen in 3.2.5? Can you narrow it down to a specific patch?
thanks,
greg k-h
Re: compile warnings, linux-3.2.6a/arch/x86/include/asm/uaccess_32.h, was Re: Linux 3.2.6
Quoted 7 lines · you
Quoted 6 lines · Grant Coady
Quoted 3 lines · you
I'm announcing the release of the 3.2.6 kernel.
All users of the 3.2 kernel series must upgrade.
Quoted 8 lines
Quoted 3 lines
I'm getting:
...
CCdrivers/net/Space.o<snip>
Does this also happen in 3.2.5? Can you narrow it down to a specific patch?
Yes, and all the way back to 3.2. No idea what brought it on, 3.2.6 was a skip from 2.6.38.7 for me so I cannot easily tell when it came in.
Cheers,
Grant.
Greg KH
maintainerRe: compile warnings, linux-3.2.6a/arch/x86/include/asm/uaccess_32.h, was Re: Linux 3.2.6
Quoted 13 lines · Grant Coady
Quoted 11 lines · you
Quoted 9 lines · Grant Coady
Quoted 3 lines · you
I'm announcing the release of the 3.2.6 kernel.
All users of the 3.2 kernel series must upgrade.
I'm getting:
...
CCdrivers/net/Space.o
Quoted 7 lines
Quoted 4 lines
<snip>
Does this also happen in 3.2.5? Can you narrow it down to a specific patch?
Yes, and all the way back to 3.2. No idea what brought it on, 3.2.6 was a skip from 2.6.38.7 for me so I cannot easily tell when it came in.
Then please contact the netdev mailing list with this issue, as it's a "mainline" issue, not stable-release-specific.
thanks,
greg k-h