aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-08[SCSI] qla2xxx: Do not query FC statistics during chip reset.Chad Dupuis1-1/+4
During a chip reset, the mailbox call to get FC statistics from the ISP will not work resulting in needless mailbox accesses and errors printing out: qla2xxx [0000:05:00.0]-00af:11: Performing ISP error recovery - ha=ffff881fad044800. qla2xxx [0000:05:00.0]-1020:11: **** Failed mbx[0]=4001, mb[1]=4953, mb[2]=5020, mb[3]=b100, cmd=6d ****. qla2xxx [0000:05:00.0]-1020:11: **** Failed mbx[0]=4001, mb[1]=4953, mb[2]=5020, mb[3]=b100, cmd=6d ****. qla2xxx [0000:05:00.0]-1020:11: **** Failed mbx[0]=4001, mb[1]=4953, mb[2]=5020, mb[3]=b100, cmd=6d ****. qla2xxx [0000:05:00.0]-1020:11: **** Failed mbx[0]=4001, mb[1]=4953, mb[2]=5020, mb[3]=b100, cmd=6d ****. qla2xxx [0000:05:00.0]-1020:11: **** Failed mbx[0]=4001, mb[1]=4953, mb[2]=5020, mb[3]=b100, cmd=6d ****. To prevent this, check for a chip reset when an application queries for FC stats and return immediately if a chip reset is occurring. Signed-off-by: Chad Dupuis <[email protected]> Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-08[SCSI] qla2xxx: Move qla2x00_free_device to the correct location.Saurav Kashyap1-2/+1
Signed-off-by: Giridhar Malavali <[email protected]> Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-08[SCSI] qla2xxx: Set the index in outstanding command array to NULL when cmd ↵Giridhar Malavali1-3/+2
is aborted when the request timeout. Call the generic BSG free routine to unmap the DMA buffers. Signed-off-by: Giridhar Malavali <[email protected]> Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-08[SCSI] qla2xxx: Clear the MBX_INTR_WAIT flag when the mailbox time-out happens.Giridhar Malavali2-3/+9
Signed-off-by: Giridhar Malavali <[email protected]> Signed-off-by: Saurav Kashyap <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-08amilo-rfkill: Add dependency on SERIO_I8042Ben Hutchings1-0/+1
I forgot to add this when changing the driver to use the proper i8042 functions. Reported-by: kbuild test robot <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2013-07-08dell-laptop: fix error return code in dell_init()Wei Yongjun1-2/+3
Fix to return -ENOMEM in the alloc_page() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2013-07-08hp-wmi: Enable hotkeys on some systemsMatthew Garrett1-0/+16
Kyle Evans discovered that he needed to set some bits in an EC register in order to receive hotkey events. Doing so blindly broke some otherwise working HP laptops. It turns out that there's a WMI call that accesses the same register, so let's try calling that instead. Signed-off-by: Matthew Garrett <[email protected]> Cc: Kyle Evans <[email protected]>
2013-07-08[SCSI] storvsc: Increase the value of STORVSC_MAX_IO_REQUESTSK. Y. Srinivasan1-1/+1
Increase the value of STORVSC_MAX_IO_REQUESTS to 200 requests. The current ringbuffer size can support this higher value. Signed-off-by: K. Y. Srinivasan <[email protected]> Reviewed-by: Haiyang Zhang <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-08thermal: cpu_cooling: fix stub functionArnd Bergmann1-2/+2
The function stub for cpufreq_cooling_get_level introduced in 57df81069 "Thermal: exynos: fix cooling state translation" is not syntactically correct C and needs to be fixed to avoid this error: In file included from drivers/thermal/db8500_thermal.c:20:0: include/linux/cpu_cooling.h: In function 'cpufreq_cooling_get_level': include/linux/cpu_cooling.h:57:1: error: parameter name omitted unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) ^ include/linux/cpu_cooling.h:57:1: error: parameter name omitted Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Eduardo Valentin <[email protected]> Cc: Zhang Rui <[email protected]> Cc: Amit Daniel kachhap <[email protected]> Cc: [email protected] Signed-off-by: Eduardo Valentin <[email protected]>
2013-07-08thermal: ti-soc-thermal: use standard GPIO DT bindingsEduardo Valentin2-10/+7
This change updates the ti-soc-thermal driver to use standard GPIO DT bindings to read the GPIO number associated to thermal shutdown IRQ, in case the device features it. Previously, the code was using a specific DT bindings. As now OMAP supports the standard way to model GPIOs, there is no point in having a ti specific binding. Cc: Zhang Rui <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Eduardo Valentin <[email protected]>
2013-07-08thermal: MAINTAINERS: Add git tree path for SoC specific updatesEduardo Valentin1-0/+1
To reduce thermal maintenance load on Rui, SoC specific patches would be applied by me now. Rui Zhang will pull in these changes from time to time (at rc's). Additionally I would be sending him pull request for every merge window and rc's (for fixes). Branch names would be: next and fixes. Cc: Zhang Rui <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Eduardo Valentin <[email protected]>
2013-07-08MAINTAINERS & ABI: Update to point to my new emailMauro Carvalho Chehab2-23/+23
As [email protected] is no longer valid, update it to reflect the new one. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2013-07-08hwmon: (lm63) Drop redundant safety on cache lifetimeJean Delvare1-3/+2
time_after (as opposed to time_after_equal) already ensures that the cache lifetime is at least as much as requested. There is no point in manually adding another jiffy to that value, and this can confuse the reader into wrong interpretation. Signed-off-by: Jean Delvare <[email protected]> Cc: Imre Deak <[email protected]>
2013-07-08hwmon: (lm90) Drop redundant safety on cache lifetimeJean Delvare1-2/+2
time_after (as opposed to time_after_equal) already ensures that the cache lifetime is at least as much as requested. There is no point in manually adding another jiffy to that value, and this can confuse the reader into wrong interpretation. Signed-off-by: Jean Delvare <[email protected]> Cc: Imre Deak <[email protected]>
2013-07-08ncpfs: fix error return code in ncp_parse_options()Wei Yongjun1-3/+9
Fix to return -EINVAL from the option parse error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Al Viro <[email protected]>
2013-07-08locks: move file_lock_list to a set of percpu hlist_heads and convert ↵Jeff Layton2-20/+50
file_lock_lock to an lglock The file_lock_list is only used for /proc/locks. The vastly common case is for locks to be put onto the list and come off again, without ever being traversed. Help optimize for this use-case by moving to percpu hlist_head-s. At the same time, we can make the locking less contentious by moving to an lglock. When iterating over the lists for /proc/locks, we must take the global lock and then iterate over each CPU's list in turn. This change necessitates a new fl_link_cpu field to keep track of which CPU the entry is on. On x86_64 at least, this field is placed within an existing hole in the struct to avoid growing the size. Signed-off-by: Jeff Layton <[email protected]> Acked-by: J. Bruce Fields <[email protected]> Signed-off-by: Al Viro <[email protected]>
2013-07-08seq_file: add seq_list_*_percpu helpersJeff Layton2-0/+60
When we convert the file_lock_list to a set of percpu lists, we'll need a way to iterate over them in order to output /proc/locks info. Add some seq_list_*_percpu helpers to handle that. Signed-off-by: Jeff Layton <[email protected]> Acked-by: J. Bruce Fields <[email protected]> Signed-off-by: Al Viro <[email protected]>
2013-07-08f2fs: fix readdir incorrectnessJaegeuk Kim1-11/+9
In the previous Al Viro's readdir patch set, there occurs a bug when running xfstest: 006 as follows. [Error output] alpha size = 4, name length = 6, total files = 4096, nproc=1 1023 files created rm: cannot remove `/mnt/f2fs/permname.15150/a': Directory not empty [Correct output] alpha size = 4, name length = 6, total files = 4096, nproc=1 4097 files created This bug is due to the misupdate of directory position in ctx. So, this patch fixes this. [AV: fixed a braino] CC: Al Viro <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]> Signed-off-by: Al Viro <[email protected]>
2013-07-08video: imxfb: Add DT supportMarkus Pargmann3-35/+212
Add devicetree support for imx framebuffer driver. It uses the generic display bindings and helper functions. Signed-off-by: Markus Pargmann <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Mark Rutland <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Acked-by: Sascha Hauer <[email protected]>
2013-07-08xtensa: remove the second argument of __bio_kmap_atomic()Zhao Hongjiang2-4/+4
kmap_atomic allows only one argument now, just remove the unused 'kmtype'. Signed-off-by: Zhao Hongjiang <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: add static function tracer supportMax Filippov6-2/+78
Signed-off-by: Max Filippov <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: Flat DeviceTree copy not future-safeVineet Gupta1-1/+1
flat DT copy code calls bootmem allocator with @align = 0. This is probably OK with legacy allocator which xtensa uses right now, but this will panic right away with memblock allocator Signed-off-by: Vineet Gupta <[email protected]> Cc: Chris Zankel <[email protected]> Cc: Max Filippov <[email protected]> Cc: Marc Gauthier <[email protected]> Cc: [email protected] Cc: [email protected] Acked-by: Max Filippov <[email protected]> Signed-off-by: Max Filippov <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: check TLB sanity on return to userspaceMax Filippov3-1/+131
- check that user TLB mappings correspond to the current page table; - check that TLB mapping VPN is in the kernel/user address range in accordance with its ASID. Signed-off-by: Max Filippov <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: adjust boot parameters address when ↵Max Filippov2-3/+12
INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is selected The virtual address of boot parameters chain is passed to the kernel via a2 register. Adjust it in case it is remapped during MMUv3 -> MMUv2 mapping change, i.e. when it is in the first 128M. Also fix interpretation of initrd and FDT addresses passed in the boot parameters: these are physical addresses. Cc: [email protected] Reported-by: Baruch Siach <[email protected]> Signed-off-by: Max Filippov <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: bootparams: fix typoBaruch Siach1-1/+1
Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Max Filippov <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: tell git to ignore generated .dtb filesBaruch Siach1-0/+1
Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Max Filippov <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: ccount based sched_clockBaruch Siach2-0/+9
Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: ccount based clockevent implementationBaruch Siach2-32/+79
Reused some code from a preliminary implementation by Max Fillippov. Cc: Max Filippov <[email protected]> Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: consolidate ccount access routinesBaruch Siach2-12/+4
Use get_ccount everywhere; remove xtensa_get_ccount. Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: cleanup ccount frequency trackingBaruch Siach5-12/+8
Remove unused nsec_per_ccount, and rename ccount_per_jiffy to ccount_preq. Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: timex.h: remove unused symbolsBaruch Siach1-7/+0
Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08xtensa: tell git to ignore copied zlib source filesBaruch Siach1-0/+3
Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Chris Zankel <[email protected]>
2013-07-08Merge branch 'timers-core-for-linus' of ↵Chris Zankel1728-12532/+27487
https://git.kernel.org/cgit/linux/kernel/git/tip/tip into tst5
2013-07-08mm/slab: Give s_next and s_stop slab-specific namesWanpeng Li3-8/+8
Give s_next and s_stop slab-specific names instead of exporting "s_next" and "s_stop". Signed-off-by: Wanpeng Li <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
2013-07-08ALSA: hda - Keep halting ALC5505 DSPTakashi Iwai1-2/+17
ALC5505 DSP is enabled even though we don't use the features yet at all. This results in the unnecessarily high power consumption, more than 100mV higher. Until we implement the DSP support, better to bypass DSP for saving more power. Reported-by: Mengdong Lin <[email protected]> [Patch modified by Mengdong to cal alc5505_dsp_init() with extra acl5505_dsp_halt().] Signed-off-by: Takashi Iwai <[email protected]>
2013-07-08[SCSI] storvsc: Support FC devicesK. Y. Srinivasan1-0/+6
Signed-off-by: K. Y. Srinivasan <[email protected]> Reviewed-by: Haiyang Zhang <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-08[SCSI] storvsc: Implement multi-channel supportK. Y. Srinivasan1-4/+127
Signed-off-by: K. Y. Srinivasan <[email protected]> Reviewed-by: Haiyang Zhang <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2013-07-07fs/9p: Remove the unused variable "err" in v9fs_vfs_getattr()Gu Zheng1-2/+0
Delete the unused variable "err" in v9fs_vfs_getattr() Signed-off-by: Gu Zheng <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P: Add cancelled() to the transport functions.Simon Derr3-3/+23
RDMA needs to post a buffer for each incoming reply. Hence it needs to keep count of these and needs to be aware of whether a flushed request has received a reply or not. This patch adds the cancelled() callback to the transport modules. It is called when RFLUSH has been received and that the corresponding request will never receive a reply. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: count posted buffers without a pending requestSimon Derr2-3/+34
In rdma_request(): If an error occurs between posting the recv and the send, there will be a reply context posted without a pending request. Since there is no way to "un-post" it, we remember it and skip post_recv() for the next request. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: Improve error handling in rdma_requestSimon Derr1-16/+28
Most importantly: - do not free the recv context (rpl_context) after a successful post_recv() - but do free the send context (c) after a failed send. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: Do not free req->rc in error handling in rdma_request()Simon Derr1-6/+3
rdma_request() should never be in charge of freeing rc. When an error occurs: * Either the rc buffer has been recv_post()'ed. then kfree()'ing it certainly is a bad idea. * Or is has not, and in that case req->rc still points to it, hence it needs not be freed. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: Use a semaphore to protect the RQSimon Derr1-10/+12
The current code keeps track of the number of buffers posted in the RQ, and will prevent it from overflowing. But it does so by simply dropping post requests (And leaking memory in the process). When this happens there will actually be too few buffers posted, and soon the 9P server will complain about 'RNR retry counter exceeded' errors. Instead, use a semaphore, and block until the RQ is ready for another buffer to be posted. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: Protect against duplicate repliesSimon Derr1-0/+7
A well-behaved server would not send twice the reply to a request. But if it ever happens... This additional check prevents the kernel from leaking memory and possibly more nasty consequences in that unlikely event. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: increase P9_RDMA_MAXSIZE to 1MBSimon Derr1-3/+1
The current value is too low to get good performance. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079pnet: refactor struct p9_fcall alloc codeSimon Derr1-17/+18
Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P/RDMA: rdma_request() needs not allocate req->rcSimon Derr1-19/+0
p9_tag_alloc() takes care of that. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-079P: Fix fcall allocation for rdmaSimon Derr1-16/+23
The current code assumes that when a request in the request array does have a tc, it also has a rc. This is normally true, but not always : when using RDMA, req->rc will temporarily be set to NULL after the request has been sent. That is usually OK though, as when the reply arrives, req->rc will be reassigned to a sane value before the request is recycled. But there is a catch : if the request is flushed, the reply will never arrive, and req->rc will be NULL, but not req->tc. This patch fixes p9_tag_alloc to take this into account. Signed-off-by: Simon Derr <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-07fs/9p: xattr: add trusted and security namespacesJim Garlick6-1/+182
Allow requests for security.* and trusted.* xattr name spaces to pass through to server. The new files are 99% cut and paste from fs/9p/xattr_user.c with the namespaces changed. It has the intended effect in superficial testing. I do not know much detail about how these namespaces are used, but passing them through to the server, which can decide whether to handle them or not, seems reasonable. I want to support a use case where an ext4 file system is mounted via 9P, then re-exported via samba to windows clients in a cluster. Windows wants to store xattrs such as security.NTACL. This works when ext4 directly backs samba, but not when 9P is inserted. This use case is documented here: http://code.google.com/p/diod/issues/detail?id=95 Signed-off-by: Jim Garlick <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2013-07-07net/9p: add privport option to 9p tcp transportJim Garlick2-1/+42
If the privport option is specified, the tcp transport binds local address to a reserved port before connecting to the 9p server. In some cases when 9P AUTH cannot be implemented, this is better than nothing. Signed-off-by: Jim Garlick <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>