aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-07-25tilepro pci: fix pci_bus.subordinate bad bombing from b918c62eChris Metcalf1-1/+1
The bombing to convert pci_bus.subordinate to busn_res.end accidentally modified a "struct pci_dev" site, causing this file not to compile. This commit reverts that code to use dev->subordinate again. Signed-off-by: Chris Metcalf <[email protected]>
2012-07-25tilegx pci: fix semantic merge conflict with 3527ed81cChris Metcalf1-1/+1
Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that the tile-next changes to add tilegx PCI support don't build. This was expected (seen in linux-next) and this one-line fix is along the same lines as commit b918c62e for all other architectures. Acked-by: Bjorn Helgaas <[email protected]> Signed-off-by: Chris Metcalf <[email protected]>
2012-07-25Btrfs: introduce BTRFS_IOC_SEND for btrfs send/receiveAlexander Block5-1/+4717
This patch introduces the BTRFS_IOC_SEND ioctl that is required for send. It allows btrfs-progs to implement full and incremental sends. Patches for btrfs-progs will follow. Signed-off-by: Alexander Block <[email protected]> Reviewed-by: David Sterba <[email protected]> Reviewed-by: Arne Jansen <[email protected]> Reviewed-by: Jan Schmidt <[email protected]> Reviewed-by: Alex Lyakas <[email protected]>
2012-07-25Btrfs: add btrfs_compare_trees functionAlexander Block2-0/+440
This function is used to find the differences between two trees. The tree compare skips whole subtrees if it detects shared tree blocks and thus is pretty fast. Signed-off-by: Alexander Block <[email protected]> Reviewed-by: David Sterba <[email protected]> Reviewed-by: Arne Jansen <[email protected]> Reviewed-by: Jan Schmidt <[email protected]> Reviewed-by: Alex Lyakas <[email protected]>
2012-07-25Btrfs: introduce subvol uuids and timesAlexander Block8-15/+292
This patch introduces uuids for subvolumes. Each subvolume has it's own uuid. In case it was snapshotted, it also contains parent_uuid. In case it was received, it also contains received_uuid. It also introduces subvolume ctime/otime/stime/rtime. The first two are comparable to the times found in inodes. otime is the origin/creation time and ctime is the change time. stime/rtime are only valid on received subvolumes. stime is the time of the subvolume when it was sent. rtime is the time of the subvolume when it was received. Additionally to the times, we have a transid for each time. They are updated at the same place as the times. btrfs receive uses stransid and rtransid to find out if a received subvolume changed in the meantime. If an older kernel mounts a filesystem with the extented fields, all fields become invalid. The next mount with a new kernel will detect this and reset the fields. Signed-off-by: Alexander Block <[email protected]> Reviewed-by: David Sterba <[email protected]> Reviewed-by: Arne Jansen <[email protected]> Reviewed-by: Jan Schmidt <[email protected]> Reviewed-by: Alex Lyakas <[email protected]>
2012-07-25Btrfs: make iref_to_path non staticAlexander Block2-5/+9
Make iref_to_path non static (needed in send) and rename it to btrfs_iref_to_path Signed-off-by: Alexander Block <[email protected]>
2012-07-25Btrfs: add a barrier before a waitqueue_active checkChris Mason1-0/+1
We were missing wakeups on the delayed ref waitqueue due to races on waitqueue_active. Signed-off-by: Chris Mason <[email protected]>
2012-07-25Btrfs: call the ordered free operation without any locks heldChris Mason1-1/+8
Each ordered operation has a free callback, and this was called with the worker spinlock held. Josef made the free callback also call iput, which we can't do with the spinlock. This drops the spinlock for the free operation and grabs it again before moving through the rest of the list. We'll circle back around to this and find a cleaner way that doesn't bounce the lock around so much. Signed-off-by: Chris Mason <[email protected]> cc: [email protected]
2012-07-25Btrfs: Check INCOMPAT flags on remount and add helper functionMitch Harder3-14/+20
In support of the recently added capability to remount with lzo compression, provide a helper function to check the compression INCOMPAT flags when remounting with lzo compression, and set the flags if necessary. Also, implement the new helper function when defragmenting with explicit lzo compression and when setting the default subvolume. Signed-off-by: Mitch Harder <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2012-07-25Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linusChris Mason15-242/+2697
Conflicts: fs/btrfs/ioctl.c fs/btrfs/ioctl.h fs/btrfs/transaction.c fs/btrfs/transaction.h Signed-off-by: Chris Mason <[email protected]>
2012-07-25ARM: dt: tegra trimslice: enable USB2 portStephen Warren1-0/+1
This was accidentally disabled by commit 2a5fdc9 "ARM: dt: tegra: invert status=disable vs status=okay". Cc: <[email protected]> # v3.5 (file is named tegra-trimslice.dts there) Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2012-07-25ARM: dt: tegra trimslice: add vbus-gpio propertyStephen Warren1-0/+1
On TrimSlice, Tegra's USB1 port may be routed to either an external micro USB port, or an internal USB->SATA bridge for SSD or HDD. This muxing is controlled by a GPIO. Whilst not strictly a VBUS GPIO, the TrimSlice board files caused this GPIO to be set appropriately to enable the SATA bridge by passing it as the VBUS GPIO to the USB driver. Echo this same configuration in device tree to enable the SATA bridge. An alternative might be to implement a full USB bus mux driver. However, that seems over-complex right now. Cc: <[email protected]> # v3.5 (file is named tegra-trimslice.dts there) Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2012-07-25[libata] pata_cmd64x: whitespace cleanupJeff Garzik1-2/+2
Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25ARM: vt8500: Add maintainer for VT8500 architectureTony Prisk1-0/+11
Add a MAINTAINERS entry for mach-vt8500 and related files. Signed-off-by: Tony Prisk <[email protected]> Acked-by: Alexey Charkov <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2012-07-25libata-acpi: fix up for acpi_pm_device_sleep_state APIStephen Rothwell1-1/+1
After merging the libata tree, today's [2012-07-01] linux-next build (x86_64 allmodconfig) failed like this: drivers/ata/libata-acpi.c: In function 'ata_acpi_set_state': drivers/ata/libata-acpi.c:872:5: error: too few arguments to function 'acpi_pm_device_sleep_state' include/acpi/acpi_bus.h:418:5: note: declared here Caused by commit 3bd46600a7a7 ("libata-acpi: add ata port runtime D3Cold support") from the libata tree interacting with commit ee85f543710d ("ACPI/PM: specify lowest allowed state for device sleep state") from the pci tree. This patch adds ACPI_STATE_D3 as the new third parameter to acpi_pm_device_sleep_state() Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstreamJeff Garzik4696-105976/+183520
Two bits were appended to the end of the bitfield list in struct scsi_device. Resolve that conflict by including both bits. Conflicts: include/scsi/scsi_device.h
2012-07-25sata_dwc_460ex: device tree may specify dma_channelThang Q. Nguyen1-17/+31
Only channel 0 is currently support and the driver code is fixed on channel 0. This patch lets device node specifying dma-channel in case it is not 0. If no dma-channel property is specified, channel 0 is used as default. Signed-off-by: Thang Q. Nguyen <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25cifs: ensure that we always do cifsFileInfo_get under the spinlockJeff Layton2-8/+15
The readpages bug is a regression that was introduced in 6993f74a5. This also fixes a couple of similar bugs in the uncached read and write codepaths. Also, prevent this sort of thing in the future by having cifsFileInfo_get take the spinlock itself, and adding a _locked variant for use in places that are already holding the lock. The _put code has always done that so this makes for a less confusing interface. Cc: <[email protected]> # 3.5.x Reviewed-by: Pavel Shilovsky <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2012-07-25ahci, trivial: fixed coding style issues related to bracesJeffrin Jose1-22/+11
Fixed coding style issues related to braces found by checkpatch.pl in drivers/ata/ahci.c Signed-off-by: Jeffrin Jose <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixesArnd Bergmann16-30/+98
From Andrew Lunn <[email protected]>: * 'v3.5-rc7-fixes' of git://github.com/lunn/linux: ARM: Kirkwood: Replace mrvl with marvell ARM: Orion: fix driver probe error handling with respect to clk ARM: Dove: Fixup ge00 initialisation ARM: Kirkwood: Fix PHY disable clk problems ARM: Kirkwood: Ensure runit clock always ticks. Signed-off-by: Arnd Bergmann <[email protected]>
2012-07-25ahci_platform: add hibernation callbacksShiraz Hashim1-7/+3
Use existing suspend, resume implementation for hibernation callbacks. Signed-off-by: Shiraz Hashim <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25libata-eh.c: local functions should not be exposed globallyH Hartley Sweeten1-1/+1
The function ata_ering_clear_cb is only referenced in this file and should be marked static to prevent it from being exposed globally. This quiets the sparse warning: warning: symbol 'ata_ering_clear_cb' was not declared. Should it be static? Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25libata-transport.c: local functions should not be exposed globallyH Hartley Sweeten1-3/+3
Functions not referenced outside of a source file should be marked static to prevent it from being exposed globally. This quiets the sparse warnings: warning: symbol 'ata_is_port' was not declared. Should it be static? warning: symbol 'ata_is_link' was not declared. Should it be static? warning: symbol 'ata_is_ata_dev' was not declared. Should it be static? Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25sata_dwc_460ex: support hardresetThang Q. Nguyen1-1/+23
The hardreset operation is currently not supported. This causes sometime the SATA driver does cause kernel crash because of none-determined state.a This patch will fix the issue. Signed-off-by: Thang Q. Nguyen <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25ata: use module_pci_driverAxel Lin60-761/+60
This patch converts the drivers in drivers/ata/* to use module_pci_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin <[email protected]> Cc: Alan Cox <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Mikael Pettersson <[email protected]> Cc: Mark Lord <[email protected]> Cc: Jeremy Higdon <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25drivers/ata/pata_pcmcia.c: adjust suspicious bit operationJulia Lawall1-1/+2
IO_DATA_PATH_WIDTH_8 is 0, so a bit-and with it is always false. The value IO_DATA_PATH_WIDTH covers the bits of the IO_DATA_PATH constants, so first pick those bits and then make the test using !=. This problem was found using Coccinelle (http://coccinelle.lip6.fr/). Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25pata_imx: Convert to clk_prepare_enable/clk_disable_unprepareFabio Estevam1-5/+5
With the new i.mx clock framework, we need to use clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2Mark Nelson1-0/+16
Like e65cc194f7628ecaa02462f22f42fb09b50dcd49 (ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum) and 3c4aa91f21f65b7b40bdfb015eacbcb8453ccae2 (ahci: Enable SB600 64bit DMA on Asus M3A), this patch enables 64bit DMA for the AHCI SATA controller of another board that has the SB600 southbridge. In this case though we're enabling 64bit DMA for another MSI motherboard, the K9AGM2 or MS-7327. It is new enough that all of the BIOS releases since the initial release (1.0 from 2007-02-09) work correctly with 64bit DMA enabled. Signed-off-by: Mark Nelson <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25[libata] Prevent interface errors with Seagate FreeAgent GoFlexDaniel J Blueman1-0/+1
When using my Seagate FreeAgent GoFlex eSATAp external disk enclosure, interface errors are always seen until 1.5Gbps is negotiated [1]. This occurs using any disk in the enclosure, and when the disk is connected directly with a generic passive eSATAp cable, we see stable 3Gbps operation as expected. Blacklist 3Gbps mode to avoid dataloss and the ~30s delay bus reset and renegotiation incurs. Signed-off-by: Daniel J Blueman <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25drivers/acpi/glue: revert accidental license-related 6b66d95895c bitsJeff Garzik1-2/+2
Commit 6b66d95895c149cbc04d4fac5a2f5477c543a8ae should not have changed EXPORT_SYMBOL_GPL to EXPORT_SYMBOL. Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25libata-acpi: add missing inlines in libata.hLin Ming1-3/+3
Adds inline for ata_acpi_unregister/ata_acpi_bind/ata_acpi_unbind in drivers/ata/libata.h for !CONFIG_ATA_ACPI to fix below warnings. warning: 'ata_acpi_unregister' defined but not used [-Wunused-function] warning: 'ata_acpi_bind' defined but not used [-Wunused-function] warning: 'ata_acpi_unbind' defined but not used [-Wunused-function] Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-07-25Btrfs: add helper for tree enumerationArne Jansen2-0/+77
Often no exact match is wanted but just the next lower or higher item. There's a lot of duplicated code throughout btrfs to deal with the corner cases. This patch adds a helper function that can facilitate searching. Signed-off-by: Arne Jansen <[email protected]>
2012-07-25btrfs: allow cross-subvolume file cloneDavid Sterba1-3/+8
Lift the EXDEV condition and allow different root trees for files being cloned, then pass source inode's root when searching for extents. Cloning is not allowed to cross vfsmounts, ie. when two subvolumes from one filesystem are mounted separately. Signed-off-by: David Sterba <[email protected]>
2012-07-25ARM: Kirkwood: Replace mrvl with marvellAndrew Lunn9-12/+12
It has been decided to use marvell, not mrvl, in the compatibility property. Search & replace. Signed-off-by: Andrew Lunn <[email protected]>
2012-07-25ARM: Orion: fix driver probe error handling with respect to clkSimon Baatz6-1/+29
The clk patches added code to get and enable clocks in the respective driver probe functions. If the probe function failed for some reason after enabling the clock, the clock was not disabled again in many cases. Signed-off-by: Simon Baatz <[email protected]> Signed-off-by: Andrew Lumm <[email protected]>
2012-07-25ARM: Dove: Fixup ge00 initialisationHannes Reinecke1-2/+2
The last argument of orion_ge00_init() is actually the error interrupt, so we should be using the correct value here. Signed-off-by: Hannes Reinecke <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-25ARM: Kirkwood: Fix PHY disable clk problemsSimon Baatz1-15/+50
Commit 98d9986 (ARM: Kirkwood: Replace clock gating) and the fix 5fb2ce (ARM: Kirkwood: clk_register_gate_fn: add fn assignment) introduced a custom variant of clock gating which allows to define a function to be called before gating the clock off. This is used to disable the SATA and PCIe PHYs if the respective clocks are unused after initialization. However, of these two drivers, the SATA driver may be compiled as a module. The driver re-enables the clocks at module init but the PHYs stay disabled. Since the custom clock gating disabled the PHYs when gating the clock off, it should also re-enable them when enabling the clock gate. This is done by adding a second function that may be used to enable the PHYs. Signed-off-by: Simon Baatz <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-25ARM: Kirkwood: Ensure runit clock always ticks.Andrew Lunn1-0/+5
Marvell engineers tell us: It seems that many units use the RUNIT clock. SPI, UART, NAND, TWSI, ... So it's not possible to clock gate it. Currently the SPI, NAND and TWSI driver will clk_prepaure_enable() this clk, but since we have no idea what ... is, and turning this clk off results in a hard lock, unconditionally enable runit. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-25ARM: versatile: Don't use platform clock for Integrator & VEPawel Moll1-2/+0
Due to automatic merge of a613163dff04cbfcb7d66b06ef4a5f65498ee59b "ARM: integrator: convert to common clock" and 56a34b03ff427046494db87f05fc810aaedd23a5 "ARM: versatile: Make plat-versatile clock optional" two platforms: Integrator and Versatile Express now select both COMMON_CLK and PLAT_VERSATILE_CLOCK which breaks building them. Fixed now. Signed-off-by: Pawel Moll <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2012-07-25Merge branch 'master' of ↵Arnd Bergmann2779-77188/+126931
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes The merge of the 'clk-for-linus' branch caused an automated merge failure. Pull that in here so we can fix the problem. Signed-off-by: Arnd Bergmann <[email protected]>
2012-07-25drm/i915: unbreak lastclose for failed driver initDaniel Vetter1-1/+7
We now refuse to load on gen6+ if kms is not enabled: commit 26394d9251879231b85e6c8cf899fa43e75c68f1 Author: Daniel Vetter <[email protected]> Date: Mon Mar 26 21:33:18 2012 +0200 drm/i915: refuse to load on gen6+ without kms Which results in the drm core calling our lastclose function to clean up the mess, but that one is neatly broken for such failure cases since kms has been introduced in commit 79e539453b34e35f39299a899d263b0a1f1670bd Author: Jesse Barnes <[email protected]> Date: Fri Nov 7 14:24:08 2008 -0800 DRM: i915: add mode setting support Reported-and-tested-by: Paulo Zanoni <[email protected]> Signed-Off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915: Set the context before setting up regs for the context.Eric Anholt1-4/+4
Fixes failures in transform feedback on gen7 because our SOL_RESET flag was setting the transform feedback offsets in the old context (occasionally happened to be ours) instead of the new context. Signed-off-by: Eric Anholt <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915: constify mode in crtc_mode_fixupDaniel Vetter1-1/+1
Laurent Pinchart missed this when sending in is giant constify patch: commit e811f5ae19043b2ac2c28e147a4274038e655598 Author: Laurent Pinchart <[email protected]> Date: Tue Jul 17 17:56:50 2012 +0200 drm: Make the .mode_fixup() operations mode argument a const pointer Acked-by; Laurent Pinchart <[email protected]> Signed-Off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915/lvds: ditch ->prepare special caseDaniel Vetter1-7/+1
LVDS is the first output where dpms on/off and prepare/commit don't perfectly match. Now the idea behind this special case seems to be that for simple resolution changes on the LVDS we don't need to stop the pipe, because (at least on newer chips) we can adjust the panel fitter on the fly. There are a few problems with the current code though: - We still stop and restart the pipe unconditionally, because the crtc helper code isn't flexible enough. - We show some ugly flickering, especially when changing crtcs (this the crtc helper would actually take into account, but we don't implement the encoder->get_crtc callback required to make this work properly). So it doesn't even work as advertised. I agree that it would be nice to do resolution changes on LVDS (and also eDP) whithout blacking the screen where the panel fitter allows to do that. But imo we should implement this as a special case a few layers up in the mode set code, akin to how we already detect simple framebuffer changes (and only update the required registers with ->mode_set_base). Until this is all in place, make our lives easier and just rip it out. Also note that this seems to fix actual bugs with enabling the lvds output, see: http://lists.freedesktop.org/archives/intel-gfx/2012-July/018614.html Cc: Takashi Iwai <[email protected]> Cc: Giacomo Comes <[email protected]> Acked-by: Chris Wilson <[email protected]> Tested-by: Takashi Iwai <[email protected]> Signed-Off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915: dereferencing an error pointerDan Carpenter1-1/+3
We need to check that "ctx" is a valid pointer before dereferencing it. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915: fix invalid reference handling of the default ctx objChris Wilson1-14/+4
Otherwise we end up trying to unpin a freed object and BUG. Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Ben Widawsky <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915: Add -EIO to the list of known errors for __wait_seqnoChris Wilson1-0/+1
This prevents a WARN introduced with commit de2b998552c1534e87bfbc51ec5734b02bc89020 Author: Daniel Vetter <[email protected]> Date: Wed Jul 4 22:52:50 2012 +0200 drm/i915: don't return a spurious -EIO from intel_ring_begin Signed-off-by: Chris Wilson <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2012-07-25drm/i915: Flush the context object from the CPU caches upon switchingChris Wilson1-0/+11
The issue is that we stale data in the CPU caches, when we come to swap-out the object, the CPU may short-circuit the reads from those cacheline and so corrupt the context object. Secondary, leaving the context object as being marked in the CPU write domain whilst on the GPU active list is a bad idea and will throw warnings later. Note: Thanks to calling set_to_gtt_domain with write = false and not setting any gpu write domain when putting a context object onto the active list (when we switch away from it) the set_to_gtt_domain call won't block. Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Ben Widawsky <[email protected]> [danvet: Added a note to the commit message and a comment in the code to explain the clever non-blocking trick.] Signed-off-by: Daniel Vetter <[email protected]>
2012-07-24Merge branch 'next' into for-linusDmitry Torokhov9398-328861/+542006
2012-07-25drm/radeon: fix dpms on/off on trinity/aruba v2Jerome Glisse1-2/+10
The external encoder need to be setup again before enabling the transmiter. This seems to be only needed on some trinity/aruba to fix dpms on. v2: Add comment, only setup again on dce6 ie aruba or newer. Cc: <[email protected]> Signed-off-by: Jerome Glisse <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.