Linux 3.10.3
Greg KH
maintainerI'm announcing the release of the 3.10.3 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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
------------
Documentation/i2c/busses/i2c-piix4 | 2 Makefile | 2 arch/arm64/mm/fault.c | 46 +--- arch/mips/cavium-octeon/setup.c | 2 arch/powerpc/include/asm/exception-64s.h | 8 arch/powerpc/include/asm/reg.h | 1 arch/powerpc/kernel/exceptions-64s.S | 56 ++--- arch/powerpc/kernel/hw_breakpoint.c | 3 arch/powerpc/kernel/ptrace.c | 4 arch/powerpc/kernel/setup_64.c | 2 arch/powerpc/kernel/signal_32.c | 70 +++++- arch/powerpc/kernel/signal_64.c | 8 arch/powerpc/kernel/traps.c | 41 +++ arch/powerpc/mm/numa.c | 5 arch/powerpc/perf/core-book3s.c | 46 ++-- arch/powerpc/perf/power8-pmu.c | 17 + arch/powerpc/platforms/powernv/pci-ioda.c | 21 ++ arch/xtensa/kernel/head.S | 9 arch/xtensa/kernel/setup.c | 6 drivers/ata/ata_piix.c | 2 drivers/ata/libata-pmp.c | 33 +-- drivers/ata/libata-zpodd.c | 7 drivers/ata/sata_highbank.c | 20 + drivers/clocksource/dw_apb_timer_of.c | 2 drivers/cpufreq/cpufreq.c | 4 drivers/cpufreq/cpufreq_governor.c | 3 drivers/cpufreq/cpufreq_stats.c | 6 drivers/gpu/drm/drm_gem.c | 18 - drivers/gpu/drm/i915/i915_gem.c | 3 drivers/gpu/drm/i915/i915_gem_context.c | 2 drivers/gpu/drm/i915/i915_irq.c | 13 - drivers/gpu/drm/i915/i915_reg.h | 28 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 3 drivers/gpu/drm/mgag200/mgag200_main.c | 2 drivers/gpu/drm/mgag200/mgag200_mode.c | 70 ++++++ drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c | 4 drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 6 drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 6 drivers/gpu/drm/radeon/atombios_encoders.c | 7 drivers/gpu/drm/radeon/evergreen_hdmi.c | 11 - drivers/gpu/drm/radeon/r600_hdmi.c | 11 - drivers/hwmon/nct6775.c | 92 ++++++-- drivers/i2c/busses/Kconfig | 1 drivers/i2c/busses/i2c-piix4.c | 3 drivers/iio/inkern.c | 2 drivers/iommu/amd_iommu.c | 6 drivers/md/raid10.c | 24 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 drivers/net/wireless/ath/ath9k/calib.c | 1 drivers/net/wireless/ath/ath9k/hw.c | 3 drivers/net/wireless/ath/ath9k/main.c | 7 drivers/net/wireless/b43/Kconfig | 4 drivers/net/wireless/rt2x00/rt2800lib.c | 6 drivers/net/wireless/rt2x00/rt61pci.c | 3 drivers/net/wireless/rt2x00/rt73usb.c | 3 drivers/of/address.c | 8 drivers/s390/scsi/zfcp_aux.c | 5 drivers/s390/scsi/zfcp_fsf.c | 27 +- drivers/s390/scsi/zfcp_scsi.c | 10 drivers/scsi/aacraid/src.c | 3 drivers/scsi/mpt2sas/mpt2sas_base.c | 13 - drivers/scsi/mpt2sas/mpt2sas_base.h | 3 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 14 - drivers/scsi/scsi.c | 8 drivers/scsi/sd.c | 46 +++- drivers/scsi/sd.h | 1 drivers/staging/line6/pcm.c | 5 drivers/virtio/virtio_balloon.c | 3 include/linux/cpu_cooling.h | 4 include/linux/iio/iio.h | 4 kernel/events/core.c | 28 ++ kernel/printk.c | 2 kernel/time/tick-broadcast.c | 80 ++++++- kernel/time/tick-common.c | 3 kernel/trace/trace.c | 209 +++++++++++++++++--- kernel/trace/trace.h | 5 kernel/trace/trace_events.c | 130 ++++++++++-- kernel/trace/trace_syscalls.c | 21 +- kernel/trace/trace_uprobe.c | 4 net/mac80211/iface.c | 9 net/sunrpc/svcauth_unix.c | 2 net/sunrpc/svcsock.c | 9 sound/arm/pxa2xx-pcm-lib.c | 2 sound/core/seq/oss/seq_oss_init.c | 16 + sound/core/seq/oss/seq_oss_midi.c | 2 sound/pci/asihpi/asihpi.c | 3 sound/pci/atiixp.c | 2 sound/pci/atiixp_modem.c | 2 sound/pci/hda/hda_generic.c | 2 sound/pci/hda/hda_local.h | 10 sound/pci/hda/patch_analog.c | 12 - sound/pci/hda/patch_hdmi.c | 4 sound/pci/hda/patch_via.c | 2 sound/soc/atmel/atmel-pcm-dma.c | 2 sound/soc/codecs/sgtl5000.h | 2 sound/soc/s6000/s6000-pcm.c | 2 sound/usb/6fire/pcm.c | 12 - sound/usb/misc/ua101.c | 14 + sound/usb/usx2y/usbusx2yaudio.c | 4 100 files changed, 1113 insertions(+), 411 deletions(-)
Aaron Plattner (1):
ALSA: hda - Add new GPU codec ID to snd-hda
Alex Deucher (2):
drm/radeon: fix AVI infoframe generation drm/radeon: add backlight quirk for hybrid mac
Alex Williamson (1):
iommu/amd: Only unmap large pages from the first pte
Alexander Z Lam (2):
tracing: Make trace_marker use the correct per-instance buffer
tracing: Protect ftrace_trace_arrays list in trace_events.c
Alexandre Belloni (2):
iio: Fix iio_channel_has_info
iio: inkern: fix iio_convert_raw_to_processed_unlocked
Arnd Bergmann (1):
thermal: cpu_cooling: fix stub function
Baruch Siach (1):
clocksource: dw_apb: Fix error check
Ben Widawsky (1):
drm/i915: Fix context sizes on HSW
Benjamin Herrenschmidt (2):
powerpc/powernv: Fix iommu initialization again
of: Fix address decoding on Bimini and js2x machines
Bu, Yitian (1):
printk: Fix rq->lock vs logbuf_lock unlock lock inversion
Chen Gang (1):
powerpc/smp: Section mismatch from smp_release_cpus to __initdata spinning_secondaries
Chris Wilson (1):
drm/i915: Only clear write-domains after a successful wait-seqno
Daniel Hansel (1):
SCSI: zfcp: fix adapter (re)open recovery while link to SAN is down
Daniel Vetter (1):
drm/i915: Fix up sdvo hpd pins for i965g/gm
David Daney (1):
MIPS: Octeon: Don't clobber bootloader data structures.
Emil Velikov (1):
drm/nv50-/disp: Use output specific mask in interrupt
Fabio Estevam (1):
ASoC: sglt5000: Fix SGTL5000_PLL_FRAC_DIV_MASK
Gabor Juhos (2):
rt2x00: read 5GHz TX power values from the correct offset
rt2x00: rt2800lib: fix default TX power check for RT55xx
Greg Kroah-Hartman (1):
Linux 3.10.3
Guenter Roeck (2):
hwmon: (nct6775) Fix temperature alarm attributes
hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775
Hauke Mehrtens (1):
b43: ensue that BCMA is "y" when B43 is "y"
Ilia Mirkin (1):
drm/nva3/disp: Fix HDMI audio regression
J. Bruce Fields (3):
svcrpc: fix failures to handle -1 uid's
svcrpc: fix handling of too-short rpc's
svcrpc: don't error out on small tcp fragment
Jiri Olsa (2):
perf: Clone child context from parent context pmu
perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario
Johannes Berg (1):
mac80211: close AP_VLAN interfaces before unregistering all
Julia Lemire (1):
drm/mgag200: Added resolution and bandwidth limits for various G200e products.
Luiz Capitulino (1):
virtio_balloon: leak_balloon(): only tell host if we got pages deflated
Mahesh Rajashekhara (1):
SCSI: aacraid: Fix for arrays are going offline in the system. System hangs
Marcin Slusarz (1):
drm/nouveau: use vmalloc for pgt allocation
Mark Langsdorf (1):
sata_highbank: increase retry count but shorten duration for Calxeda controller
Martin K. Petersen (1):
SCSI: sd: Update WRITE SAME heuristics
Max Filippov (1):
xtensa: adjust boot parameters address when INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is selected
Michael Ellerman (9):
powerpc: Remove unreachable relocation on exception handlers
powerpc: Remove KVMTEST from RELON exception handlers
powerpc: Rename and flesh out the facility unavailable exception handler
powerpc: Wire up the HV facility unavailable exception powerpc/perf: Check that events only include valid bits on Power8 powerpc/perf: Rework disable logic in pmu_disable() powerpc/perf: Freeze PMC5/6 if we're not using them powerpc/perf: Use existing out label in power_pmu_enable() powerpc/perf: Don't enable if we have zero events
Michael Neuling (8):
powerpc/hw_brk: Fix setting of length for exact mode breakpoints powerpc/hw_brk: Fix clearing of extraneous IRQ powerpc/hw_brk: Fix off by one error when validating DAWR region end powerpc/tm: Fix writing top half of MSR on 32 bit signals powerpc/tm: Fix 32 bit non-rt signals
powerpc/tm: Fix restoration of MSR on 32bit signal return powerpc/tm: Fix return of 32bit rt signals to active transactions powerpc/tm: Fix return of active 64bit signals
Nathan Fontenot (1):
powerpc/numa: Do not update sysfs cpu registration from invalid context
NeilBrown (3):
md/raid10: fix bug which causes all RAID10 reshapes to move no data. md/raid10: fix two bugs affecting RAID10 reshape. md/raid10: fix two problems with RAID10 resync.
Peter Zijlstra (1):
perf: Fix perf_lock_task_context() vs RCU
Reddy, Sreekanth (1):
SCSI: mpt2sas: Fix for issue Missing delay not getting set during system bootup
Sergei Shtylyov (1):
libata-zpodd: must use ata_tf_init()
Seth Heasley (1):
ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
Shane Huang (1):
i2c-piix4: Add AMD CZ SMBus device ID
Sreekanth Reddy (1):
SCSI: mpt2sas: fix firmware failure with wrong task attribute
Srivatsa S. Bhat (2):
cpufreq: Revert commit a66b2e to fix suspend/resume regression
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression
Steffen Maier (2):
SCSI: zfcp: block queue limits with data router
SCSI: zfcp: status read buffers on first adapter open with link down
Steven Rostedt (1):
tracing: Failed to create system directory
Steven Rostedt (Red Hat) (4):
tracing: Add trace_array_get/put() to handle instance refs better
tracing: Get trace_array ref counts when accessing trace files
tracing: Fix race between deleting buffer and setting events
tracing: Add trace_array_get/put() to event handling
Sujith Manoharan (3):
ath9k_hw: Assign default xlna config for AR9485
ath9k: Fix noisefloor calibration
ath9k: Do not assign noise for NULL caldata
Takashi Iwai (15):
ALSA: hda - Fix EAPD vmaster hook for AD1884 & co
ALSA: hda - Fix return value of snd_hda_check_power_state()
ALSA: hda - Cache the MUX selection for generic HDMI
ALSA: hda - Fix missing Mic Boost controls for VIA codecs
ALSA: hda - Fix the max length of control name in generic parser
ALSA: seq-oss: Initialize MIDI clients asynchronously
ALSA: 6fire: Fix unlocked snd_pcm_stop() call
ALSA: ua101: Fix unlocked snd_pcm_stop() call
ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
ALSA: atiixp: Fix unlocked snd_pcm_stop() call
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
ALSA: usx2y: Fix unlocked snd_pcm_stop() call
ASoC: s6000: Fix unlocked snd_pcm_stop() call
ASoC: atmel: Fix unlocked snd_pcm_stop() call
staging: line6: Fix unlocked snd_pcm_stop() call
Tejun Heo (1):
libata: skip SRST for all SIMG [34]7x port-multipliers
Thomas Gleixner (2):
tick: Sanitize broadcast control logic
tick: Prevent uncontrolled switch to oneshot mode
Will Deacon (1):
arm64: mm: don't treat user cache maintenance faults as writes
YoungJun Cho (1):
drm/gem: fix not to assign error value to gem name
zhangwei(Jovi) (2):
uprobes: Fix return value in error handling path
tracing: Fix irqs-off tag display in syscall tracing
Greg KH
maintainerDocumentation/i2c/busses/i2c-piix4 +1 -1
@@ -13,7 +13,7 @@ Supported adapters: * AMD SP5100 (SB700 derivative found on some server mainboards) Datasheet: Publicly available at the AMD website http://support.amd.com/us/Embedded_TechDocs/44413.pdf - * AMD Hudson-2 + * AMD Hudson-2, CZ Datasheet: Not publicly available * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge Datasheet: Publicly available at the SMSC website http://www.smsc.com
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = NAME = Unicycling Gorilla
arch/arm64/mm/fault.c +20 -26
87 lines not on this page · raw message
arch/mips/cavium-octeon/setup.c +1 -1
@@ -996,7 +996,7 @@ void __init plat_mem_setup(void)cvmx_bootmem_unlock ();/* Add the memory region for the kernel. */ kernel_start = (unsigned long ) _text; - kernel_size =ALIGN (_end - _text,0x100000 ); + kernel_size = _end - _text;/* Adjust for physical offset. */ kernel_start &= ~0xffffffff80000000ULL ;
arch/powerpc/include/asm/exception-64s.h +4 -4
@@ -358,12 +358,12 @@ label##_relon_pSeries: \/* No guest interrupts come through here */ \SET_SCRATCH0 (r13);/* save r13 */ \ EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label##_common, \ - EXC_STD, KVMTEST_PR, vec) + EXC_STD, NOTEST, vec)#define STD_RELON_EXCEPTION_PSERIES_OOL (vec, label) \ .globl label##_relon_pSeries; \ label##_relon_pSeries: \ - EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_PR, vec); \ + EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, vec); \ EXCEPTION_RELON_PROLOG_PSERIES_1(label##_common, EXC_STD)#define STD_RELON_EXCEPTION_HV (loc, vec, label) \
@@ -374,12 +374,12 @@ label##_relon_hv: \/* No guest interrupts come through here */ \SET_SCRATCH0 (r13);/* save r13 */ \ EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label##_common, \ - EXC_HV, KVMTEST, vec) + EXC_HV, NOTEST, vec)#define STD_RELON_EXCEPTION_HV_OOL (vec, label) \ .globl label##_relon_hv; \ label##_relon_hv: \ - EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST, vec); \ + EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, vec); \ EXCEPTION_RELON_PROLOG_PSERIES_1(label##_common, EXC_HV)/* This associate vector numbers with bits in paca->irq_happened */
arch/powerpc/include/asm/reg.h +1 -0
@@ -626,6 +626,7 @@#define MMCR0_TRIGGER 0x00002000UL/* TRIGGER enable */ #define MMCR0_PMAO 0x00000080UL/* performance monitor alert has occurred, set to 0 after handling exception */ #define MMCR0_SHRFC 0x00000040UL/* SHRre freeze conditions between threads */ +#define MMCR0_FC56 0x00000010UL/* freeze counters 5 and 6 */ #define MMCR0_FCTI 0x00000008UL/* freeze counters in tags inactive mode */ #define MMCR0_FCTA 0x00000004UL/* freeze counters in tags active mode */ #define MMCR0_FCWAIT 0x00000002UL/* freeze counter in WAIT state */
arch/powerpc/kernel/exceptions-64s.S +25 -31
113 lines not on this page · raw message
arch/powerpc/kernel/hw_breakpoint.c +2 -1
@@ -176,7 +176,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) length_max =512 ;/* 64 doublewords */ /* DAWR region can't cross 512 boundary */ if ((bp->attr.bp_addr >>10 ) != - ((bp->attr.bp_addr + bp->attr.bp_len) >>10 )) + ((bp->attr.bp_addr + bp->attr.bp_len -1 ) >>10 ))return -EINVAL ; } if (info->len >
@@ -250,6 +250,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)* we still need to single-step the instruction, but we don't * generate an event. */ + info->type &= ~HW_BRK_TYPE_EXTRANEOUS_IRQ ;if (!((bp->attr.bp_addr <= dar) && (dar - bp->attr.bp_addr < bp->attr.bp_len))) info->type |=HW_BRK_TYPE_EXTRANEOUS_IRQ ;
arch/powerpc/kernel/ptrace.c +3 -1
@@ -1449,7 +1449,9 @@ static long ppc_set_hwdebug(struct task_struct *child,*/ if (bp_info->addr_mode ==PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE ) { len = bp_info->addr2 - bp_info->addr; - }else if (bp_info->addr_mode !=PPC_BREAKPOINT_MODE_EXACT ) { + }else if (bp_info->addr_mode ==PPC_BREAKPOINT_MODE_EXACT ) + len =1 ; +else {ptrace_put_breakpoints (child);return -EINVAL ; }
arch/powerpc/kernel/setup_64.c +1 -1
@@ -76,7 +76,7 @@#endif int boot_cpuid =0 ; -int __initdata spinning_secondaries; +int spinning_secondaries;u64 ppc64_pft_size;/* Pick defaults since we might want to patch instructions
arch/powerpc/kernel/signal_32.c +53 -17
171 lines not on this page · raw message
arch/powerpc/kernel/signal_64.c +5 -3
@@ -410,6 +410,10 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,/* get MSR separately, transfer the LE bit if doing signal return */ err |=__get_user (msr, &sc->gp_regs[PT_MSR ]); +/* pull in MSR TM from user context */ + regs->msr = (regs->msr & ~MSR_TS_MASK ) | (msr &MSR_TS_MASK ); + +/* pull in MSR LE from user context */ regs->msr = (regs->msr & ~MSR_LE ) | (msr &MSR_LE );/* The following non-GPR non-FPR non-VR state is also checkpointed: */
@@ -505,8 +509,6 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,tm_enable ();/* This loads the checkpointed FP/VEC state, if used */ tm_recheckpoint (¤t->thread, msr); -/* The task has moved into TM state S, so ensure MSR reflects this: */ - regs->msr = (regs->msr & ~MSR_TS_MASK ) |__MASK (33 );/* This loads the speculative FP/VEC state, if used */ if (msr &MSR_FP ) {
@@ -654,7 +656,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,#ifdef CONFIG_PPC_TRANSACTIONAL_MEM if (__get_user (msr, &uc->uc_mcontext.gp_regs[PT_MSR ])) goto badframe; -if (MSR_TM_SUSPENDED (msr)) { +if (MSR_TM_ACTIVE (msr)) {/* We recheckpoint on return. */ struct ucontext __user *uc_transact;if (__get_user (uc_transact, &uc->uc_link))
arch/powerpc/kernel/traps.c +33 -8
58 lines not on this page · raw message
arch/powerpc/mm/numa.c +3 -2
@@ -1433,11 +1433,9 @@ static int update_cpu_topology(void *data)if (cpu != update->cpu)continue ; -unregister_cpu_under_node (update->cpu, update->old_nid);unmap_cpu_from_node (update->cpu);map_cpu_to_node (update->cpu, update->new_nid);vdso_getcpu_init (); -register_cpu_under_node (update->cpu, update->new_nid); }return 0 ;
@@ -1485,6 +1483,9 @@ int arch_update_cpu_topology(void)stop_machine (update_cpu_topology, &updates[0 ], &updated_cpus);for (ud = &updates[0 ]; ud; ud = ud->next) { +unregister_cpu_under_node (ud->cpu, ud->old_nid); +register_cpu_under_node (ud->cpu, ud->new_nid); + dev =get_cpu_device (ud->cpu);if (dev)kobject_uevent (&dev->kobj,KOBJ_CHANGE );
arch/powerpc/perf/core-book3s.c +29 -17
91 lines not on this page · raw message
arch/powerpc/perf/power8-pmu.c +17 -0
@@ -109,6 +109,16 @@#define EVENT_IS_MARKED (EVENT_MARKED_MASK << EVENT_MARKED_SHIFT)#define EVENT_PSEL_MASK 0xff/* PMCxSEL value */ +#define EVENT_VALID_MASK \ + ((EVENT_THRESH_MASK << EVENT_THRESH_SHIFT) | \ + (EVENT_SAMPLE_MASK << EVENT_SAMPLE_SHIFT) | \ + (EVENT_CACHE_SEL_MASK << EVENT_CACHE_SEL_SHIFT) | \ + (EVENT_PMC_MASK << EVENT_PMC_SHIFT) | \ + (EVENT_UNIT_MASK << EVENT_UNIT_SHIFT) | \ + (EVENT_COMBINE_MASK << EVENT_COMBINE_SHIFT) | \ + (EVENT_MARKED_MASK << EVENT_MARKED_SHIFT) | \ + EVENT_PSEL_MASK) +/* MMCRA IFM bits - POWER8 */ #define POWER8_MMCRA_IFM1 0x0000000040000000UL#define POWER8_MMCRA_IFM2 0x0000000080000000UL
@@ -212,6 +222,9 @@ static int power8_get_constraint(u64 event, unsigned long *maskp, unsigned long mask = value =0 ; +if (event & ~EVENT_VALID_MASK ) +return -1 ; + pmc = (event >>EVENT_PMC_SHIFT ) &EVENT_PMC_MASK ; unit = (event >>EVENT_UNIT_SHIFT ) &EVENT_UNIT_MASK ; cache = (event >>EVENT_CACHE_SEL_SHIFT ) &EVENT_CACHE_SEL_MASK ;
@@ -378,6 +391,10 @@ static int power8_compute_mmcr(u64 event[], int n_ev,if (pmc_inuse &0x7c ) mmcr[0 ] |= MMCR0_PMCjCE; +/* If we're not using PMC 5 or 6, freeze them */ +if (!(pmc_inuse &0x60 )) + mmcr[0 ] |=MMCR0_FC56 ; + mmcr[1 ] = mmcr1; mmcr[2 ] = mmcra;
arch/powerpc/platforms/powernv/pci-ioda.c +21 -0
@@ -441,6 +441,17 @@ static void pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdevset_iommu_table_base (&pdev->dev, &pe->tce32_table); } +static void pnv_ioda_setup_bus_dma (struct pnv_ioda_pe *pe,struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +set_iommu_table_base (&dev->dev, &pe->tce32_table); +if (dev->subordinate) +pnv_ioda_setup_bus_dma (pe, dev->subordinate); + } +} +static void pnv_pci_ioda1_tce_invalidate (struct iommu_table *tbl,u64 *startp,u64 *endp) {
@@ -596,6 +607,11 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, }iommu_init_table (tbl, phb->hose->node); +if (pe->pdev) +set_iommu_table_base (&pe->pdev->dev, tbl); +else +pnv_ioda_setup_bus_dma (pe, pe->pbus); +return ; fail:/* XXX Failure: Try to fallback to 64-bit only ? */
@@ -667,6 +683,11 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, }iommu_init_table (tbl, phb->hose->node); +if (pe->pdev) +set_iommu_table_base (&pe->pdev->dev, tbl); +else +pnv_ioda_setup_bus_dma (pe, pe->pbus); +return ; fail:if (pe->tce32_seg >=0 )
arch/xtensa/kernel/head.S +9 -0
@@ -68,6 +68,15 @@ _SetupMMU: #ifdef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX initialize_mmu +#if defined(CONFIG_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY + rsr a2, excsave1 + movi a3, 0x08000000 + bgeu a2, a3, 1f + movi a3, 0xd0000000 + add a2, a2, a3 + wsr a2, excsave1 +1: +#endif #endif .end no-absolute-literals
arch/xtensa/kernel/setup.c +3 -3
@@ -152,8 +152,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag) {meminfo_t * mi; mi = (meminfo_t *)(tag->data); - initrd_start = (void *)(mi->start); - initrd_end = (void *)(mi->end); + initrd_start =__va (mi->start); + initrd_end =__va (mi->end);return 0 ; }
@@ -164,7 +164,7 @@ __tagtable(BP_TAG_INITRD, parse_tag_initrd);static int __init parse_tag_fdt (const bp_tag_t *tag) { - dtb_start = (void *)(tag->data[0 ]); + dtb_start =__va (tag->data[0 ]);return 0 ; }
drivers/ata/ata_piix.c +2 -0
@@ -338,6 +338,8 @@ static const struct pci_device_id piix_pci_tbl[] = {/* SATA Controller IDE (BayTrail) */ { 0x8086, 0x0F20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt }, { 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt }, +/* SATA Controller IDE (Coleto Creek) */ + { 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */ };
drivers/ata/libata-pmp.c +17 -16
@@ -389,9 +389,13 @@ static void sata_pmp_quirks(struct ata_port *ap)/* link reports offline after LPM */ link->flags |=ATA_LFLAG_NO_LPM ; -/* Class code report is unreliable. */ +/* +* Class code report is unreliable and SRST times +* out under certain configurations. +*/ if (link->pmp <5 ) - link->flags |=ATA_LFLAG_ASSUME_ATA ; + link->flags |=ATA_LFLAG_NO_SRST | +ATA_LFLAG_ASSUME_ATA ;/* port 5 is for SEMB device and it doesn't like SRST */ if (link->pmp ==5 )
@@ -399,20 +403,17 @@ static void sata_pmp_quirks(struct ata_port *ap)ATA_LFLAG_ASSUME_SEMB ; } }else if (vendor ==0x1095 && devid ==0x4723 ) { -/* sil4723 quirks */ -ata_for_each_link (link, ap,EDGE ) { -/* link reports offline after LPM */ - link->flags |=ATA_LFLAG_NO_LPM ; - -/* class code report is unreliable */ -if (link->pmp <2 ) - link->flags |=ATA_LFLAG_ASSUME_ATA ; - -/* the config device at port 2 locks up on SRST */ -if (link->pmp ==2 ) - link->flags |=ATA_LFLAG_NO_SRST | -ATA_LFLAG_ASSUME_ATA ; - } +/* +* sil4723 quirks +* +* Link reports offline after LPM. Class code report is +* unreliable. SIMG PMPs never got SRST reliable and the +* config device at port 2 locks up on SRST. +*/ +ata_for_each_link (link, ap,EDGE ) + link->flags |=ATA_LFLAG_NO_LPM | +ATA_LFLAG_NO_SRST | +ATA_LFLAG_ASSUME_ATA ; }else if (vendor ==0x1095 && devid ==0x4726 ) {/* sil4726 quirks */ ata_for_each_link (link, ap,EDGE ) {
drivers/ata/libata-zpodd.c +4 -3
@@ -32,13 +32,14 @@ struct zpodd {static int eject_tray (struct ata_device *dev) { -struct ata_taskfile tf = {}; +struct ata_taskfile tf;const char cdb[] = {GPCMD_START_STOP_UNIT ,0 ,0 ,0 ,0x02 ,/* LoEj */ 0 ,0 ,0 ,0 ,0 ,0 ,0 , }; +ata_tf_init (dev, &tf); tf.flags =ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; tf.command =ATA_CMD_PACKET ; tf.protocol =ATAPI_PROT_NODATA ;
@@ -52,8 +53,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)char buf[16 ];unsigned int ret;struct rm_feature_desc *desc = (void *)(buf +8 ); -struct ata_taskfile tf = {}; - +struct ata_taskfile tf;char cdb[] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */
@@ -62,6 +62,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)0 ,0 ,0 , }; +ata_tf_init (dev, &tf); tf.flags =ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; tf.command =ATA_CMD_PACKET ; tf.protocol =ATAPI_PROT_PIO ;
drivers/ata/sata_highbank.c +18 -2
@@ -196,10 +196,26 @@ static int highbank_initialize_phys(struct device *dev, void __iomem *addr)return 0 ; } +/* +* The Calxeda SATA phy intermittently fails to bring up a link with Gen3 +* Retrying the phy hard reset can work around the issue, but the drive +* may fail again. In less than 150 out of 15000 test runs, it took more +* than 10 tries for the link to be established (but never more than 35). +* Triple the maximum observed retry count to provide plenty of margin for +* rare events and to guarantee that the link is established. +* +* Also, the default 2 second time-out on a failed drive is too long in +* this situation. The uboot implementation of the same driver function +* uses a much shorter time-out period and never experiences a time out +* issue. Reducing the time-out to 500ms improves the responsiveness. +* The other timing constants were kept the same as the stock AHCI driver. +* This change was also tested 15000 times on 24 drives and none of them +* experienced a time out. +*/ static int ahci_highbank_hardreset (struct ata_link *link,unsigned int *class,unsigned long deadline) { -const unsigned long *timing =sata_ehc_deb_timing (&link->eh_context); +static const unsigned long timing[] = {5 ,100 ,500 };struct ata_port *ap = link->ap;struct ahci_port_priv *pp = ap->private_data;u8 *d2h_fis = pp->rx_fis +RX_FIS_D2H_REG ;
@@ -207,7 +223,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class,bool online;u32 sstatus;int rc; -int retry =10 ; +int retry =100 ;ahci_stop_engine (ap);
drivers/clocksource/dw_apb_timer_of.c +1 -1
@@ -44,7 +44,7 @@ static void add_clockevent(struct device_node *event_timer)u32 irq, rate; irq =irq_of_parse_and_map (event_timer,0 ); -if (irq ==NO_IRQ ) +if (irq ==0 )panic ("No IRQ for clock event timer" );timer_get_base_and_rate (event_timer, &iobase, &rate);
drivers/cpufreq/cpufreq.c +3 -1
@@ -1837,13 +1837,15 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,if (dev) {switch (action) {case CPU_ONLINE : +case CPU_ONLINE_FROZEN :cpufreq_add_dev (dev,NULL );break ;case CPU_DOWN_PREPARE : -case CPU_UP_CANCELED_FROZEN : +case CPU_DOWN_PREPARE_FROZEN :__cpufreq_remove_dev (dev,NULL );break ;case CPU_DOWN_FAILED : +case CPU_DOWN_FAILED_FROZEN :cpufreq_add_dev (dev,NULL );break ; }
drivers/cpufreq/cpufreq_governor.c +0 -3
@@ -26,7 +26,6 @@#include <linux/tick.h> #include <linux/types.h> #include <linux/workqueue.h> -#include <linux/cpu.h> #include "cpufreq_governor.h"
@@ -181,10 +180,8 @@ void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,if (!all_cpus) {__gov_queue_work (smp_processor_id (), dbs_data, delay); }else { -get_online_cpus ();for_each_cpu (i, policy->cpus)__gov_queue_work (i, dbs_data, delay); -put_online_cpus (); } }EXPORT_SYMBOL_GPL (gov_queue_work);
drivers/cpufreq/cpufreq_stats.c +2 -4
@@ -353,13 +353,11 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,cpufreq_update_policy (cpu);break ;case CPU_DOWN_PREPARE : +case CPU_DOWN_PREPARE_FROZEN :cpufreq_stats_free_sysfs (cpu);break ;case CPU_DEAD : -cpufreq_stats_free_table (cpu); -break ; -case CPU_UP_CANCELED_FROZEN : -cpufreq_stats_free_sysfs (cpu); +case CPU_DEAD_FROZEN :cpufreq_stats_free_table (cpu);break ; }
drivers/gpu/drm/drm_gem.c +7 -11
@@ -453,25 +453,21 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,spin_lock (&dev->object_name_lock);if (!obj->name) { ret =idr_alloc (&dev->object_name_idr, obj,1 ,0 ,GFP_NOWAIT ); - obj->name = ret; - args->name = (uint64_t ) obj->name; -spin_unlock (&dev->object_name_lock); -idr_preload_end (); -if (ret <0 ) goto err; - ret =0 ; + + obj->name = ret;/* Allocate a reference for the name table. */ drm_gem_object_reference (obj); - }else { - args->name = (uint64_t ) obj->name; -spin_unlock (&dev->object_name_lock); -idr_preload_end (); - ret =0 ; } + args->name = (uint64_t ) obj->name; + ret =0 ; + err: +spin_unlock (&dev->object_name_lock); +idr_preload_end ();drm_gem_object_unreference_unlocked (obj);return ret; }
drivers/gpu/drm/i915/i915_gem.c +2 -1
@@ -1160,7 +1160,8 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj,/* Manually manage the write flush as we may have not yet * retired the buffer. */ -if (obj->last_write_seqno && +if (ret ==0 && + obj->last_write_seqno &&i915_seqno_passed (seqno, obj->last_write_seqno)) { obj->last_write_seqno =0 ; obj->base.write_domain &= ~I915_GEM_GPU_DOMAINS ;
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
@@ -113,7 +113,7 @@ static int get_context_size(struct drm_device *dev)case 7 : reg =I915_READ (GEN7_CXT_SIZE );if (IS_HASWELL (dev)) - ret =HSW_CXT_TOTAL_SIZE (reg) *64 ; + ret =HSW_CXT_TOTAL_SIZE ;else ret =GEN7_CXT_TOTAL_SIZE (reg) *64 ;break ;
drivers/gpu/drm/i915/i915_irq.c +2 -11
@@ -70,15 +70,6 @@ static const u32 hpd_status_gen4[] = { [HPD_PORT_D ] =PORTD_HOTPLUG_INT_STATUS }; -static const u32 hpd_status_i965[] = { - [HPD_CRT ] =CRT_HOTPLUG_INT_STATUS , - [HPD_SDVO_B ] =SDVOB_HOTPLUG_INT_STATUS_I965 , - [HPD_SDVO_C ] =SDVOC_HOTPLUG_INT_STATUS_I965 , - [HPD_PORT_B ] =PORTB_HOTPLUG_INT_STATUS , - [HPD_PORT_C ] =PORTC_HOTPLUG_INT_STATUS , - [HPD_PORT_D ] =PORTD_HOTPLUG_INT_STATUS -}; -static const u32 hpd_status_i915[] = {/* i915 and valleyview are the same */ [HPD_CRT ] =CRT_HOTPLUG_INT_STATUS , [HPD_SDVO_B ] =SDVOB_HOTPLUG_INT_STATUS_I915 ,
@@ -2952,13 +2943,13 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)u32 hotplug_status =I915_READ (PORT_HOTPLUG_STAT );u32 hotplug_trigger = hotplug_status & (IS_G4X (dev) ?HOTPLUG_INT_STATUS_G4X : -HOTPLUG_INT_STATUS_I965 ); +HOTPLUG_INT_STATUS_I915 );DRM_DEBUG_DRIVER ("hotplug event received, stat 0x%08x\n" , hotplug_status);if (hotplug_trigger) {if (hotplug_irq_storm_detect (dev, hotplug_trigger, -IS_G4X (dev) ? hpd_status_gen4 : hpd_status_i965)) +IS_G4X (dev) ? hpd_status_gen4 : hpd_status_i915))i915_hpd_irq_setup (dev);queue_work (dev_priv->wq, &dev_priv->hotplug_work);
drivers/gpu/drm/i915/i915_reg.h +13 -15
@@ -1535,14 +1535,13 @@ GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \ GEN7_CXT_GT1_SIZE(ctx_reg) + \ GEN7_CXT_VFSTATE_SIZE(ctx_reg)) -#define HSW_CXT_POWER_SIZE (ctx_reg) ((ctx_reg >> 26) & 0x3f) -#define HSW_CXT_RING_SIZE (ctx_reg) ((ctx_reg >> 23) & 0x7) -#define HSW_CXT_RENDER_SIZE (ctx_reg) ((ctx_reg >> 15) & 0xff) -#define HSW_CXT_TOTAL_SIZE (ctx_reg) (HSW_CXT_POWER_SIZE(ctx_reg) + \ - HSW_CXT_RING_SIZE(ctx_reg) + \ - HSW_CXT_RENDER_SIZE(ctx_reg) + \ - GEN7_CXT_VFSTATE_SIZE(ctx_reg)) - +/* Haswell does have the CXT_SIZE register however it does not appear to be +* valid. Now, docs explain in dwords what is in the context object. The full +* size is 70720 bytes, however, the power context and execlist context will +* never be saved (power context is stored elsewhere, and execlists don't work +* on HSW) - so the final size is 66944 bytes, which rounds to 17 pages. +*/ +#define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE)/* * Overlay regs
@@ -1691,6 +1690,12 @@/* SDVO is different across gen3/4 */ #define SDVOC_HOTPLUG_INT_STATUS_G4X (1 << 3)#define SDVOB_HOTPLUG_INT_STATUS_G4X (1 << 2) +/* +* Bspec seems to be seriously misleaded about the SDVO hpd bits on i965g/gm, +* since reality corrobates that they're the same as on gen3. But keep these +* bits here (and the comment!) to help any other lost wanderers back onto the +* right tracks. +*/ #define SDVOC_HOTPLUG_INT_STATUS_I965 (3 << 4)#define SDVOB_HOTPLUG_INT_STATUS_I965 (3 << 2)#define SDVOC_HOTPLUG_INT_STATUS_I915 (1 << 7)
@@ -1702,13 +1707,6 @@ PORTC_HOTPLUG_INT_STATUS | \ PORTD_HOTPLUG_INT_STATUS) -#define HOTPLUG_INT_STATUS_I965 (CRT_HOTPLUG_INT_STATUS | \ - SDVOB_HOTPLUG_INT_STATUS_I965 | \ - SDVOC_HOTPLUG_INT_STATUS_I965 | \ - PORTB_HOTPLUG_INT_STATUS | \ - PORTC_HOTPLUG_INT_STATUS | \ - PORTD_HOTPLUG_INT_STATUS) -#define HOTPLUG_INT_STATUS_I915 (CRT_HOTPLUG_INT_STATUS | \ SDVOB_HOTPLUG_INT_STATUS_I915 | \ SDVOC_HOTPLUG_INT_STATUS_I915 | \
drivers/gpu/drm/mgag200/mgag200_drv.h +2 -1
@@ -198,7 +198,8 @@ struct mga_device {struct ttm_bo_device bdev; } ttm; -u32 reg_1e24;/* SE model number */ +/* SE model number stored in reg 0x1e24 */ +u32 unique_rev_id; };
drivers/gpu/drm/mgag200/mgag200_main.c +1 -1
@@ -176,7 +176,7 @@ static int mgag200_device_init(struct drm_device *dev,/* stash G200 SE model number for later use */ if (IS_G200_SE (mdev)) - mdev->reg_1e24 =RREG32 (0x1e24 ); + mdev->unique_rev_id =RREG32 (0x1e24 ); ret =mga_vram_init (mdev);if (ret)
drivers/gpu/drm/mgag200/mgag200_mode.c +67 -3
94 lines not on this page · raw message
drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c +4 -0
@@ -55,6 +55,10 @@ nva3_hdmi_ctrl(struct nv50_disp_priv *priv, int head, int or, u32 data)nv_wr32 (priv,0x61c510 + soff,0x00000000 );nv_mask (priv,0x61c500 + soff,0x00000001 ,0x00000001 ); +nv_mask (priv,0x61c5d0 + soff,0x00070001 ,0x00010001 );/* SPARE, HW_CTS */ +nv_mask (priv,0x61c568 + soff,0x00010101 ,0x00000000 );/* ACR_CTRL, ?? */ +nv_mask (priv,0x61c578 + soff,0x80000000 ,0x80000000 );/* ACR_0441_ENABLE */ +/* ??? */ nv_mask (priv,0x61733c ,0x00100000 ,0x00100000 );/* RESETF */ nv_mask (priv,0x61733c ,0x10000000 ,0x10000000 );/* LOOKUP_EN */
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +5 -1
@@ -1107,6 +1107,7 @@ nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head)u32 pclk =nv_rd32 (priv,0x610ad0 + (head *0x540 )) &0x3fffff ;u32 hval, hreg =0x614200 + (head *0x800 );u32 oval, oreg; +u32 mask;u32 conf =exec_clkcmp (priv, head,0xff , pclk, &outp);if (conf != ~0 ) {if (outp.location ==0 && outp.type ==DCB_OUTPUT_DP ) {
@@ -1133,6 +1134,7 @@ nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head) oreg =0x614280 + (ffs (outp.or) -1 ) *0x800 ; oval =0x00000000 ; hval =0x00000000 ; + mask =0xffffffff ; }else if (!outp.location) {if (outp.type ==DCB_OUTPUT_DP )
@@ -1140,14 +1142,16 @@ nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head) oreg =0x614300 + (ffs (outp.or) -1 ) *0x800 ; oval = (conf &0x0100 ) ?0x00000101 :0x00000000 ; hval =0x00000000 ; + mask =0x00000707 ; }else { oreg =0x614380 + (ffs (outp.or) -1 ) *0x800 ; oval =0x00000001 ; hval =0x00000001 ; + mask =0x00000707 ; }nv_mask (priv, hreg,0x0000000f , hval); -nv_mask (priv, oreg,0x00000707 , oval); +nv_mask (priv, oreg, mask, oval); } }
drivers/gpu/drm/nouveau/core/subdev/vm/base.c +3 -3
@@ -362,7 +362,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, vm->fpde = offset >> (vmm->pgt_bits +12 ); vm->lpde = (offset + length -1 ) >> (vmm->pgt_bits +12 ); - vm->pgt =kcalloc (vm->lpde - vm->fpde +1 ,sizeof (*vm->pgt),GFP_KERNEL ); + vm->pgt =vzalloc ((vm->lpde - vm->fpde +1 ) *sizeof (*vm->pgt));if (!vm->pgt) {kfree (vm);return -ENOMEM ;
@@ -371,7 +371,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, ret =nouveau_mm_init (&vm->mm, mm_offset >>12 , mm_length >>12 , block >>12 );if (ret) { -kfree (vm->pgt); +vfree (vm->pgt);kfree (vm);return ret; }
@@ -446,7 +446,7 @@ nouveau_vm_del(struct nouveau_vm *vm) }nouveau_mm_fini (&vm->mm); -kfree (vm->pgt); +vfree (vm->pgt);kfree (vm); }
drivers/gpu/drm/radeon/atombios_encoders.c +7 -0
@@ -186,6 +186,13 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder,u8 backlight_level;char bl_name[16 ]; +/* Mac laptops with multiple GPUs use the gmux driver for backlight +* so don't register a backlight device +*/ +if ((rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE ) && + (rdev->pdev->device ==0x6741 )) +return ; +if (!radeon_encoder->enc_priv)return ;
drivers/gpu/drm/radeon/evergreen_hdmi.c +2 -9
@@ -128,14 +128,7 @@ static void evergreen_hdmi_update_avi_infoframe(struct drm_encoder *encoder,struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;uint32_t offset = dig->afmt->offset;uint8_t *frame = buffer +3 ; - -/* Our header values (type, version, length) should be alright, Intel -* is using the same. Checksum function also seems to be OK, it works -* fine for audio infoframe. However calculated value is always lower -* by 2 in comparison to fglrx. It breaks displaying anything in case -* of TVs that strictly check the checksum. Hack it manually here to -* workaround this issue. */ - frame[0x0 ] +=2 ; +uint8_t *header = buffer;WREG32 (AFMT_AVI_INFO0 + offset, frame[0x0 ] | (frame[0x1 ] <<8 ) | (frame[0x2 ] <<16 ) | (frame[0x3 ] <<24 ));
@@ -144,7 +137,7 @@ static void evergreen_hdmi_update_avi_infoframe(struct drm_encoder *encoder,WREG32 (AFMT_AVI_INFO2 + offset, frame[0x8 ] | (frame[0x9 ] <<8 ) | (frame[0xA ] <<16 ) | (frame[0xB ] <<24 ));WREG32 (AFMT_AVI_INFO3 + offset, - frame[0xC ] | (frame[0xD ] <<8 )); + frame[0xC ] | (frame[0xD ] <<8 ) | (header[1 ] <<24 )); }static void evergreen_audio_set_dto (struct drm_encoder *encoder,u32 clock)
drivers/gpu/drm/radeon/r600_hdmi.c +2 -9
@@ -133,14 +133,7 @@ static void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder,struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;uint32_t offset = dig->afmt->offset;uint8_t *frame = buffer +3 ; - -/* Our header values (type, version, length) should be alright, Intel -* is using the same. Checksum function also seems to be OK, it works -* fine for audio infoframe. However calculated value is always lower -* by 2 in comparison to fglrx. It breaks displaying anything in case -* of TVs that strictly check the checksum. Hack it manually here to -* workaround this issue. */ - frame[0x0 ] +=2 ; +uint8_t *header = buffer;WREG32 (HDMI0_AVI_INFO0 + offset, frame[0x0 ] | (frame[0x1 ] <<8 ) | (frame[0x2 ] <<16 ) | (frame[0x3 ] <<24 ));
@@ -149,7 +142,7 @@ static void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder,WREG32 (HDMI0_AVI_INFO2 + offset, frame[0x8 ] | (frame[0x9 ] <<8 ) | (frame[0xA ] <<16 ) | (frame[0xB ] <<24 ));WREG32 (HDMI0_AVI_INFO3 + offset, - frame[0xC ] | (frame[0xD ] <<8 )); + frame[0xC ] | (frame[0xD ] <<8 ) | (header[1 ] <<24 )); }/*
drivers/hwmon/nct6775.c +64 -28
164 lines not on this page · raw message
drivers/i2c/busses/Kconfig +1 -0
@@ -150,6 +150,7 @@ config I2C_PIIX4 ATI SB700/SP5100 ATI SB800 AMD Hudson-2 + AMD CZ Serverworks OSB4 Serverworks CSB5 Serverworks CSB6
drivers/i2c/busses/i2c-piix4.c +2 -1
@@ -22,7 +22,7 @@ Intel PIIX4, 440MX Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100 ATI IXP200, IXP300, IXP400, SB600, SB700/SP5100, SB800 - AMD Hudson-2 + AMD Hudson-2, CZ SMSC Victory66 Note: we assume there can only be one device, with one or more
@@ -522,6 +522,7 @@ static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = { { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
drivers/iio/inkern.c +1 -1
@@ -451,7 +451,7 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan,int ret; ret =iio_channel_read (chan, &offset,NULL ,IIO_CHAN_INFO_OFFSET ); -if (ret ==0 ) +if (ret >=0 ) raw64 += offset; scale_type = iio_channel_read(chan, &scale_val, &scale_val2,
drivers/iommu/amd_iommu.c +5 -1
@@ -1484,6 +1484,10 @@ static unsigned long iommu_unmap_page(struct protection_domain *dom,/* Large PTE found which maps this address */ unmap_size =PTE_PAGE_SIZE (*pte); + +/* Only unmap from the first pte in the page */ +if ((unmap_size -1 ) & bus_addr) +break ; count =PAGE_SIZE_PTE_COUNT (unmap_size);for (i =0 ; i < count; i++) pte[i] =0ULL ;
@@ -1493,7 +1497,7 @@ static unsigned long iommu_unmap_page(struct protection_domain *dom, unmapped += unmap_size; } -BUG_ON (!is_power_of_2 (unmapped)); +BUG_ON (unmapped && !is_power_of_2 (unmapped));return unmapped; }
drivers/md/raid10.c +15 -9
@@ -2075,11 +2075,17 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)* both 'first' and 'i', so we just compare them. * All vec entries are PAGE_SIZE; */ -for (j =0 ; j < vcnt; j++) +int sectors = r10_bio->sectors; +for (j =0 ; j < vcnt; j++) { +int len =PAGE_SIZE ; +if (sectors < (len /512 )) + len = sectors *512 ;if (memcmp (page_address (fbio->bi_io_vec[j].bv_page),page_address (tbio->bi_io_vec[j].bv_page), - fbio->bi_io_vec[j].bv_len)) + len))break ; + sectors -= len/512 ; + }if (j == vcnt)continue ;atomic64_add (r10_bio->sectors, &mddev->resync_mismatches);
@@ -2909,14 +2915,13 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,*/ if (mddev->bitmap ==NULL && mddev->recovery_cp == MaxSector && + mddev->reshape_position == MaxSector && + !test_bit (MD_RECOVERY_SYNC , &mddev->recovery) && !test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery) && + !test_bit (MD_RECOVERY_RESHAPE , &mddev->recovery) && conf->fullsync ==0 ) { *skipped =1 ; - max_sector = mddev->dev_sectors; -if (test_bit (MD_RECOVERY_SYNC , &mddev->recovery) || -test_bit (MD_RECOVERY_RESHAPE , &mddev->recovery)) - max_sector = mddev->resync_max_sectors; -return max_sector - sector_nr; +return mddev->dev_sectors - sector_nr; } skipped:
@@ -3386,6 +3391,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,if (bio->bi_end_io == end_sync_read) {md_sync_acct (bio->bi_bdev, nr_sectors); +set_bit (BIO_UPTODATE , &bio->bi_flags);generic_make_request (bio); } }
@@ -3532,7 +3538,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)/* FIXME calc properly */ conf->mirrors =kzalloc (sizeof (struct raid10_info )*(mddev->raid_disks + -max (0 ,mddev->delta_disks)), +max (0 ,-mddev->delta_disks)),GFP_KERNEL );if (!conf->mirrors) goto out;
@@ -3691,7 +3697,7 @@ static int run(struct mddev *mddev) conf->geo.far_offset == 0) goto out_free_conf;if (conf->prev.far_copies !=1 && - conf->geo.far_offset ==0 ) + conf->prev.far_offset ==0 ) goto out_free_conf; }
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +6 -2
@@ -3563,14 +3563,18 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) {struct ath9k_hw_capabilities *pCap = &ah->caps;int chain; -u32 regval; +u32 regval, value;static const u32 switch_chain_reg[AR9300_MAX_CHAINS ] = {AR_PHY_SWITCH_CHAIN_0 ,AR_PHY_SWITCH_CHAIN_1 ,AR_PHY_SWITCH_CHAIN_2 , }; -u32 value =ar9003_hw_ant_ctrl_common_get (ah, is2ghz); +if (AR_SREV_9485 (ah) && (ar9003_hw_get_rx_gain_idx (ah) ==0 )) +ath9k_hw_cfg_output (ah,AR9300_EXT_LNA_CTL_GPIO_AR9485 , +AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED ); + + value =ar9003_hw_ant_ctrl_common_get (ah, is2ghz);if (AR_SREV_9462 (ah) ||AR_SREV_9565 (ah)) { REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM,
drivers/net/wireless/ath/ath9k/ar9003_phy.h +2 -0
@@ -351,6 +351,8 @@#define AR_PHY_CCA_NOM_VAL_9330_2GHZ -118 +#define AR9300_EXT_LNA_CTL_GPIO_AR9485 9 +/* * AGC Field Definitions */
drivers/net/wireless/ath/ath9k/calib.c +0 -1
@@ -387,7 +387,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)if (!caldata) { chan->noisefloor = nf; - ah->noise =ath9k_hw_getchan_noise (ah, chan);return false; }
drivers/net/wireless/ath/ath9k/hw.c +2 -1
@@ -1872,7 +1872,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, ah->caldata = caldata;if (caldata && (chan->channel != caldata->channel || - chan->channelFlags != caldata->channelFlags)) { + chan->channelFlags != caldata->channelFlags || + chan->chanmode != caldata->chanmode)) {/* Operating channel changed, reset channel calibration data */ memset (caldata,0 ,sizeof (*caldata));ath9k_init_nfcal_hist_buffer (ah, chan);
drivers/net/wireless/ath/ath9k/main.c +0 -7
@@ -1211,13 +1211,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)ath_update_survey_stats (sc);spin_unlock_irqrestore (&common->cc_lock, flags); -/* -* Preserve the current channel values, before updating -* the same channel -*/ -if (ah->curchan && (old_pos == pos)) -ath9k_hw_getnf (ah, ah->curchan); -ath9k_cmn_update_ichannel (&sc->sc_ah->channels[pos], curchan, channel_type);
drivers/net/wireless/b43/Kconfig +2 -2
@@ -28,7 +28,7 @@ config B43 config B43_BCMA bool "Support for BCMA bus" - depends on B43 && BCMA + depends on B43 && (BCMA = y || BCMA = B43) default y config B43_BCMA_EXTRA
@@ -39,7 +39,7 @@ config B43_BCMA_EXTRA config B43_SSB bool - depends on B43 && SSB + depends on B43 && (SSB = y || SSB = B43) default y # Auto-select SSB PCI-HOST support, if possible
drivers/net/wireless/rt2x00/rt2800lib.c +3 -3
@@ -2392,7 +2392,7 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev,rt2800_rfcsr_write (rt2x00dev,49 , rfcsr);rt2800_rfcsr_read (rt2x00dev,50 , &rfcsr); -if (info->default_power1 > power_bound) +if (info->default_power2 > power_bound)rt2x00_set_field8 (&rfcsr,RFCSR50_TX , power_bound);else rt2x00_set_field8 (&rfcsr,RFCSR50_TX , info->default_power2);
@@ -6056,8 +6056,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) default_power2 =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A2 );for (i =14 ; i < spec->num_channels; i++) { - info[i].default_power1 = default_power1[i]; - info[i].default_power2 = default_power2[i]; + info[i].default_power1 = default_power1[i -14 ]; + info[i].default_power2 = default_power2[i -14 ]; } }
drivers/net/wireless/rt2x00/rt61pci.c +2 -1
@@ -2825,7 +2825,8 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) tx_power =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A_START );for (i =14 ; i < spec->num_channels; i++) { info[i].max_power =MAX_TXPOWER ; - info[i].default_power1 =TXPOWER_FROM_DEV (tx_power[i]); + info[i].default_power1 = +TXPOWER_FROM_DEV (tx_power[i -14 ]); } }
drivers/net/wireless/rt2x00/rt73usb.c +2 -1
@@ -2167,7 +2167,8 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) tx_power =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A_START );for (i =14 ; i < spec->num_channels; i++) { info[i].max_power =MAX_TXPOWER ; - info[i].default_power1 =TXPOWER_FROM_DEV (tx_power[i]); + info[i].default_power1 = +TXPOWER_FROM_DEV (tx_power[i -14 ]); } }
drivers/of/address.c +6 -2
@@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)static int of_bus_pci_match (struct device_node *np) { -/* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */ -return !strcmp (np->type,"pci" ) || !strcmp (np->type,"vci" ); +/* +* "vci" is for the /chaos bridge on 1st-gen PCI powermacs +* "ht" is hypertransport +*/ +return !strcmp (np->type,"pci" ) || !strcmp (np->type,"vci" ) || + !strcmp (np->type,"ht" ); } static void of_bus_pci_count_cells(struct device_node *np,
drivers/s390/scsi/zfcp_aux.c +4 -1
@@ -3,7 +3,7 @@* * Module interface and handling of zfcp data structures. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ /*
@@ -23,6 +23,7 @@* Christof Schmitt * Martin Petermann * Sven Schuetz +* Steffen Maier */ #define KMSG_COMPONENT "zfcp"
@@ -415,6 +416,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) adapter->dma_parms.max_segment_size =ZFCP_QDIO_SBALE_LEN ; adapter->ccw_device->dev.dma_parms = &adapter->dma_parms; + adapter->stat_read_buf_num =FSF_STATUS_READS_RECOM ; +if (!zfcp_scsi_adapter_register (adapter))return adapter;
drivers/s390/scsi/zfcp_fsf.c +20 -7
@@ -3,7 +3,7 @@* * Implementation of FSF commands. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ #define KMSG_COMPONENT "zfcp"
@@ -483,12 +483,8 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)fc_host_port_name (shost) = nsp->fl_wwpn;fc_host_node_name (shost) = nsp->fl_wwnn; -fc_host_port_id (shost) =ntoh24 (bottom->s_id); -fc_host_speed (shost) = -zfcp_fsf_convert_portspeed (bottom->fc_link_speed);fc_host_supported_classes (shost) =FC_COS_CLASS2 |FC_COS_CLASS3 ; - adapter->hydra_version = bottom->adapter_type; adapter->timer_ticks = bottom->timer_interval &ZFCP_FSF_TIMER_INT_MASK ; adapter->stat_read_buf_num =max (bottom->status_read_buf_num, (u16 )FSF_STATUS_READS_RECOM );
@@ -496,6 +492,19 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)if (fc_host_permanent_port_name (shost) ==-1 )fc_host_permanent_port_name (shost) =fc_host_port_name (shost); +zfcp_scsi_set_prot (adapter); + +/* no error return above here, otherwise must fix call chains */ +/* do not evaluate invalid fields */ +if (req->qtcb->header.fsf_status ==FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE ) +return 0 ; + +fc_host_port_id (shost) =ntoh24 (bottom->s_id); +fc_host_speed (shost) = +zfcp_fsf_convert_portspeed (bottom->fc_link_speed); + + adapter->hydra_version = bottom->adapter_type; +switch (bottom->fc_topology) {case FSF_TOPO_P2P : adapter->peer_d_id =ntoh24 (bottom->peer_d_id);
@@ -517,8 +526,6 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)return -EIO ; } -zfcp_scsi_set_prot (adapter); -return 0 ; }
@@ -563,8 +570,14 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)fc_host_port_type (shost) =FC_PORTTYPE_UNKNOWN ; adapter->hydra_version =0 ; +/* avoids adapter shutdown to be able to recognize +* events such as LINK UP */ +atomic_set_mask (ZFCP_STATUS_ADAPTER_XCONFIG_OK , + &adapter->status);zfcp_fsf_link_down_info_eval (req, &qtcb->header.fsf_status_qual.link_down_info); +if (zfcp_fsf_exchange_config_evaluate (req)) +return ;break ;default :zfcp_erp_adapter_shutdown (adapter,0 ,"fsecdh3" );
drivers/s390/scsi/zfcp_scsi.c +7 -3
@@ -3,7 +3,7 @@* * Interface to Linux SCSI midlayer. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ #define KMSG_COMPONENT "zfcp"
@@ -311,8 +311,12 @@ static struct scsi_host_template zfcp_scsi_host_template = { .proc_name = "zfcp", .can_queue = 4096, .this_id = -1, - .sg_tablesize = 1, /* adjusted later */ - .max_sectors = 8, /* adjusted later */ + .sg_tablesize = (((QDIO_MAX_ELEMENTS_PER_BUFFER -1 ) + * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2), +/* GCD, adjusted later */ + .max_sectors = (((QDIO_MAX_ELEMENTS_PER_BUFFER -1 ) + * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8, +/* GCD, adjusted later */ .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, .cmd_per_lun = 1, .use_clustering = 1,
drivers/scsi/aacraid/src.c +3 -0
@@ -93,6 +93,9 @@ static irqreturn_t aac_src_intr_message(int irq, void *dev_id)int send_it =0 ;extern int aac_sync_mode; +src_writel (dev, MUnit.ODR_C, bellbits); +src_readl (dev, MUnit.ODR_C); +if (!aac_sync_mode) {src_writel (dev, MUnit.ODR_C, bellbits);src_readl (dev, MUnit.ODR_C);
drivers/scsi/mpt2sas/mpt2sas_base.c +3 -10
@@ -80,10 +80,6 @@ static int msix_disable = -1;module_param (msix_disable, int,0 );MODULE_PARM_DESC (msix_disable," disable msix routed interrupts (default=0)" ); -static int missing_delay[2 ] = {-1 ,-1 }; -module_param_array (missing_delay, int,NULL ,0 ); -MODULE_PARM_DESC (missing_delay," device missing delay , io missing delay" ); -static int mpt2sas_fwfault_debug;MODULE_PARM_DESC (mpt2sas_fwfault_debug," enable detection of firmware fault " "and halt firmware - (default=0)" );
@@ -2199,7 +2195,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) }/** -* _base_update_missing_delay - change the missing delay timers +* mpt2sas_base_update_missing_delay - change the missing delay timers * @ioc: per adapter object * @device_missing_delay: amount of time till device is reported missing * @io_missing_delay: interval IO is returned when there is a missing device
@@ -2210,8 +2206,8 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)* delay, as well as the io missing delay. This should be called at driver * load time. */ -static void -_base_update_missing_delay (struct MPT2SAS_ADAPTER *ioc, +void +mpt2sas_base_update_missing_delay (struct MPT2SAS_ADAPTER *ioc,u16 device_missing_delay,u8 io_missing_delay) {u16 dmd, dmd_new, dmd_orignal;
@@ -4407,9 +4403,6 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)if (r) goto out_free_resources; -if (missing_delay[0 ] !=-1 && missing_delay[1 ] !=-1 ) -_base_update_missing_delay (ioc, missing_delay[0 ], - missing_delay[1 ]); ioc->non_operational_loop =0 ;return 0 ;
drivers/scsi/mpt2sas/mpt2sas_base.h +3 -0
@@ -1055,6 +1055,9 @@ void mpt2sas_base_validate_event_type(struct MPT2SAS_ADAPTER *ioc, u32 *event_tyvoid mpt2sas_halt_firmware (struct MPT2SAS_ADAPTER *ioc); +void mpt2sas_base_update_missing_delay (struct MPT2SAS_ADAPTER *ioc, +u16 device_missing_delay,u8 io_missing_delay); +int mpt2sas_port_enable (struct MPT2SAS_ADAPTER *ioc);/* scsih shared API */
drivers/scsi/mpt2sas/mpt2sas_scsih.c +8 -6
@@ -101,6 +101,10 @@ static ushort max_sectors = 0xFFFF;module_param (max_sectors, ushort,0 );MODULE_PARM_DESC (max_sectors,"max sectors, range 64 to 32767 default=32767" ); +static int missing_delay[2 ] = {-1 ,-1 }; +module_param_array (missing_delay, int,NULL ,0 ); +MODULE_PARM_DESC (missing_delay," device missing delay , io missing delay" ); +/* scsi-mid layer global parmeter is max_report_luns, which is 511 */ #define MPT2SAS_MAX_LUN (16895)static int max_lun =MPT2SAS_MAX_LUN ;
@@ -3994,11 +3998,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))else mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ; }else -/* MPI Revision I (UNIT = 0xA) - removed MPI2_SCSIIO_CONTROL_UNTAGGED */ -/* mpi_control |= MPI2_SCSIIO_CONTROL_UNTAGGED; -*/ - mpi_control |= (0x500 ); - + mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ; }else mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ;/* Make sure Device is not raid volume.
@@ -7303,7 +7303,9 @@ _firmware_event_work(struct work_struct *work)case MPT2SAS_PORT_ENABLE_COMPLETE : ioc->start_scan =0 ; - +if (missing_delay[0 ] !=-1 && missing_delay[1 ] !=-1 ) +mpt2sas_base_update_missing_delay (ioc, missing_delay[0 ], + missing_delay[1 ]);dewtprintk (ioc,printk (MPT2SAS_INFO_FMT "port enable: complete " "from worker thread\n" , ioc->name));
drivers/scsi/scsi.c +4 -4
@@ -1070,8 +1070,8 @@ EXPORT_SYMBOL_GPL(scsi_get_vpd_page);* @opcode: opcode for command to look up * * Uses the REPORT SUPPORTED OPERATION CODES to look up the given -* opcode. Returns 0 if RSOC fails or if the command opcode is -* unsupported. Returns 1 if the device claims to support the command. +* opcode. Returns -EINVAL if RSOC fails, 0 if the command opcode is +* unsupported and 1 if the device claims to support the command. */ int scsi_report_opcode (struct scsi_device *sdev,unsigned char *buffer,unsigned int len,unsigned char opcode)
@@ -1081,7 +1081,7 @@ int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer,int result;if (sdev->no_report_opcodes || sdev->scsi_level <SCSI_SPC_3 ) -return 0 ; +return -EINVAL ;memset (cmd,0 ,16 ); cmd[0 ] =MAINTENANCE_IN ;
@@ -1097,7 +1097,7 @@ int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer,if (result &&scsi_sense_valid (&sshdr) && sshdr.sense_key ==ILLEGAL_REQUEST && (sshdr.asc ==0x20 || sshdr.asc ==0x24 ) && sshdr.ascq ==0x00 ) -return 0 ; +return -EINVAL ;if ((buffer[1 ] &3 ) ==3 )/* Command supported */ return 1 ;
drivers/scsi/sd.c +32 -14
74 lines not on this page · raw message
drivers/scsi/sd.h +1 -0
@@ -84,6 +84,7 @@ struct scsi_disk { unsigned lbpws : 1; unsigned lbpws10 : 1; unsigned lbpvpd : 1; + unsigned ws10 : 1; unsigned ws16 : 1; };#define to_scsi_disk (obj) container_of(obj,struct scsi_disk,dev)
drivers/staging/line6/pcm.c +4 -1
@@ -385,8 +385,11 @@ static int snd_line6_pcm_free(struct snd_device *device)*/ static void pcm_disconnect_substream (struct snd_pcm_substream *substream) { -if (substream->runtime &&snd_pcm_running (substream)) +if (substream->runtime &&snd_pcm_running (substream)) { +snd_pcm_stream_lock_irq (substream);snd_pcm_stop (substream,SNDRV_PCM_STATE_DISCONNECTED ); +snd_pcm_stream_unlock_irq (substream); + } }/*
drivers/virtio/virtio_balloon.c +2 -1
@@ -191,7 +191,8 @@ static void leak_balloon(struct virtio_balloon *vb, size_t num)* virtio_has_feature(vdev, VIRTIO_BALLOON_F_MUST_TELL_HOST); * is true, we *have* to do it in this order */ -tell_host (vb, vb->deflate_vq); +if (vb->num_pfns !=0 ) +tell_host (vb, vb->deflate_vq);mutex_unlock (&vb->balloon_lock);release_pages_by_pfn (vb->pfns, vb->num_pfns); }
include/linux/cpu_cooling.h +2 -2
@@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus);*/ void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev); -unsigned long cpufreq_cooling_get_level (unsigned int ,unsigned int ); +unsigned long cpufreq_cooling_get_level (unsigned int cpu,unsigned int freq);#else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *cpufreq_cooling_register (const struct cpumask *clip_cpus)
@@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)return ; }static inline -unsigned long cpufreq_cooling_get_level (unsigned int ,unsigned int ) +unsigned long cpufreq_cooling_get_level (unsigned int cpu,unsigned int freq) {return THERMAL_CSTATE_INVALID ; }
include/linux/iio/iio.h +2 -2
@@ -211,8 +211,8 @@ struct iio_chan_spec {static inline bool iio_channel_has_info (const struct iio_chan_spec *chan,enum iio_chan_info_enum type) { -return (chan->info_mask_separate & type) | - (chan->info_mask_shared_by_type & type); +return (chan->info_mask_separate &BIT (type)) | + (chan->info_mask_shared_by_type &BIT (type)); }#define IIO_ST (si, rb, sb, sh) \
kernel/events/core.c +25 -3
@@ -761,8 +761,18 @@ perf_lock_task_context(struct task_struct *task, int ctxn, unsigned long *flags) {struct perf_event_context *ctx; -rcu_read_lock (); retry: +/* +* One of the few rules of preemptible RCU is that one cannot do +* rcu_read_unlock() while holding a scheduler (or nested) lock when +* part of the read side critical section was preemptible -- see +* rcu_read_unlock_special(). +* +* Since ctx->lock nests under rq->lock we must ensure the entire read +* side critical section is non-preemptible. +*/ +preempt_disable (); +rcu_read_lock (); ctx =rcu_dereference (task->perf_event_ctxp[ctxn]);if (ctx) {/*
@@ -778,6 +788,8 @@ retry:raw_spin_lock_irqsave (&ctx->lock, *flags);if (ctx !=rcu_dereference (task->perf_event_ctxp[ctxn])) {raw_spin_unlock_irqrestore (&ctx->lock, *flags); +rcu_read_unlock (); +preempt_enable (); goto retry; }
@@ -787,6 +799,7 @@ retry: } }rcu_read_unlock (); +preempt_enable ();return ctx; }
@@ -1761,7 +1774,16 @@ static int __perf_event_enable(void *info)struct perf_cpu_context *cpuctx =__get_cpu_context (ctx);int err; -if (WARN_ON_ONCE (!ctx->is_active)) +/* +* There's a time window between 'ctx->is_active' check +* in perf_event_enable function and this place having: +* - IRQs on +* - ctx->lock unlocked +* +* where the task could be killed and 'ctx' deactivated +* by perf_event_exit_task. +*/ +if (!ctx->is_active)return -EINVAL ;raw_spin_lock (&ctx->lock);
@@ -7228,7 +7250,7 @@ inherit_task_group(struct perf_event *event, struct task_struct *parent,* child. */ - child_ctx =alloc_perf_context (event->pmu, child); + child_ctx =alloc_perf_context (parent_ctx->pmu, child);if (!child_ctx)return -ENOMEM ;
kernel/printk.c +1 -1
@@ -1369,9 +1369,9 @@ static int console_trylock_for_printk(unsigned int cpu) } } logbuf_cpu =UINT_MAX ; +raw_spin_unlock (&logbuf_lock);if (wake)up (&console_sem); -raw_spin_unlock (&logbuf_lock);return retval; }
kernel/time/tick-broadcast.c +68 -12
135 lines not on this page · raw message
kernel/time/tick-common.c +2 -1
@@ -194,7 +194,8 @@ static void tick_setup_device(struct tick_device *td,* When global broadcasting is active, check if the current * device is registered as a placeholder for broadcast mode. * This allows us to handle this x86 misfeature in a generic -* way. +* way. This function also returns !=0 when we keep the +* current active broadcast state for this CPU. */ if (tick_device_uses_broadcast (newdev, cpu))return ;
kernel/trace/trace.c +180 -29
440 lines not on this page · raw message
kernel/trace/trace.h +5 -0
@@ -224,6 +224,11 @@ enum {extern struct list_head ftrace_trace_arrays; +extern struct mutex trace_types_lock; + +extern int trace_array_get (struct trace_array *tr); +extern void trace_array_put (struct trace_array *tr); +/* * The global tracer (top) should be the first trace array added, * but we check the flag anyway.
kernel/trace/trace_events.c +113 -17
285 lines not on this page · raw message
kernel/trace/trace_syscalls.c +17 -4
@@ -306,6 +306,8 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)struct syscall_metadata *sys_data;struct ring_buffer_event *event;struct ring_buffer *buffer; +unsigned long irq_flags; +int pc;int syscall_nr;int size;
@@ -321,9 +323,12 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.