summaryrefslogtreecommitdiffstats
path: root/arch (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2014-12-091-1/+0
|\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/mm: Eliminate memset after alloc_bootmem_pages nubus: Remove superfluous interrupt disable/restore
| * m68k/mm: Eliminate memset after alloc_bootmem_pagesHimangi Saraogi2014-11-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alloc_bootmem and related functions always return a zeroed region of memory. Thus a memset after calls to these functions is unnecessary. The following Coccinelle semantic patch was used for making the change: @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E - memset(E,0,E1); Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* | Merge tag 'nios2-v3.19-rc1' of git://git.rocketboards.org/linux-socfpga-nextLinus Torvalds2014-12-0994-0/+9982
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull Altera Nios II processor support from Ley Foon Tan: "Here is the Linux port for Nios II processor (from Altera) arch/nios2/ tree for v3.19. The patchset has been discussed on the kernel mailing lists since April and has gone through 6 revisions of review. The additional changes since then have been mostly further cleanups and fixes when merged with other trees. The arch code is in arch/nios2 and one asm-generic change (acked by Arnd)" Arnd Bergmann says: "I've reviewed the architecture port in the past and it looks good in its latest version" Acked-by: Arnd Bergmann <arnd@arndb.de> * tag 'nios2-v3.19-rc1' of git://git.rocketboards.org/linux-socfpga-next: (40 commits) nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL nios2: Add missing NR_CPUS to Kconfig nios2: asm-offsets: Remove unused definition TI_TASK nios2: Remove write-only struct member from nios2_timer nios2: Remove unused extern declaration of shm_align_mask nios2: include linux/type.h in io.h nios2: move include asm-generic/io.h to end of file nios2: remove include asm-generic/iomap.h from io.h nios2: remove unnecessary space before define nios2: fix error handling of irq_of_parse_and_map nios2: Use IS_ENABLED instead of #ifdefs to check config symbols nios2: Build infrastructure Documentation: Add documentation for Nios2 architecture MAINTAINERS: Add nios2 maintainer nios2: ptrace support nios2: Module support nios2: Nios2 registers nios2: Miscellaneous header files nios2: Cpuinfo handling nios2: Time keeping ...
| * | nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOLTobias Klauser2014-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If NIOS2_CMDLINE_IGNORE_DTB is selected but CMDLINE_BOOL isn't and thus CONFIG_CMDLINE is not defined, the build fails with the following error: arch/nios2/kernel/setup.c: In function 'nios2_boot_init': arch/nios2/kernel/setup.c:131:30: error: 'CONFIG_CMDLINE' undeclared (first use in this function) strncpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); This can be reproduced using randconfig with KCONFIG_SEED=0xE5B8749E, i.e. 'make KCONFIG_SEED=0xE5B8749E ARCH=nios2 randconfig'. Fix this by letting NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL, so we actually have a default kernel command string to fall back to. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Add missing NR_CPUS to KconfigTobias Klauser2014-12-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel/time/Kconfig expects that NR_CPUS is defined. This fixes the following config warning: "kernel/time/Kconfig:163:warning: range is invalid" Follow 4cbbbb43d666 ("microblaze: Fix missing NR_CPUS in menuconfig") Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: asm-offsets: Remove unused definition TI_TASKTobias Klauser2014-12-081-1/+0
| | | | | | | | | | | | | | | | | | | | | TI_TASK is not used in nios2 assembly code, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Remove write-only struct member from nios2_timerTobias Klauser2014-12-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The irq member of struct nios2_timer is only written to but never read, thus it can be removed. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Remove unused extern declaration of shm_align_maskTobias Klauser2014-12-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | shm_align_mask is not defined/used on nios2, thus there is no need to declare it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: include linux/type.h in io.hLey Foon Tan2014-12-081-0/+1
| | | | | | | | | | | | | | | | | | This is require for __iomem definition. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: move include asm-generic/io.h to end of fileLey Foon Tan2014-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move asm-generic/io.h to end of file to override functions like phys_to_virt, virt_to_phys in asm-generic/io.h. This is due to recent commit 9216efaf introduced new way to override functions by checking for the existence of a macro with the same of the function. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: remove include asm-generic/iomap.h from io.hLey Foon Tan2014-12-081-1/+0
| | | | | | | | | | | | | | | | | | | | | Don't need asm-generic/iomap.h and asm-generic/io.h added default ioread8/16/32 iowrite8/16/32 implementation. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: remove unnecessary space before defineLey Foon Tan2014-12-081-4/+4
| | | | | | | | | | | | | | | | | | Remove extra space between # and define. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: fix error handling of irq_of_parse_and_mapDmitry Torokhov2014-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Return value of irq_of_parse_and_map() is unsigned int, with 0 indicating failure, so testing for negative result never works. Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Use IS_ENABLED instead of #ifdefs to check config symbolsTobias Klauser2014-12-081-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | Make the checking for div/mul/mulx instruction config symbols easier to read by using IS_ENABLED instead of #ifdefs. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Build infrastructureLey Foon Tan2014-12-0815-0/+826
| | | | | | | | | | | | | | | | | | | | | This patch adds Makefile and Kconfig files required for building a nios2 kernel. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: ptrace supportLey Foon Tan2014-12-083-0/+319
| | | | | | | | | | | | | | | | | | Add ptrace support for nios2. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Module supportLey Foon Tan2014-12-081-0/+138
| | | | | | | | | | | | | | | | | | This patch adds support for loadable modules. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Nios2 registersLey Foon Tan2014-12-081-0/+71
| | | | | | | | | | | | | | | | | | | | | This file contains constants for the instruction macros, cpu registers, fields and bits. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Miscellaneous header filesLey Foon Tan2014-12-085-0/+146
| | | | | | | | | | | | | | | | | | This patch introduces a few nios2-specific header files. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Cpuinfo handlingLey Foon Tan2014-12-082-0/+258
| | | | | | | | | | | | Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Time keepingLey Foon Tan2014-12-084-0/+407
| | | | | | | | | | | | | | | | | | | | | Add time keeping code for nios2. Signed-off-by: Ley Foon Tan <lftan@altera.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
| * | nios2: Device tree supportLey Foon Tan2014-12-084-0/+294
| | | | | | | | | | | | | | | | | | Add device tree support to arch/nios2. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Library functionsLey Foon Tan2014-12-085-0/+467
| | | | | | | | | | | | | | | | | | Add optimised library functions for nios2. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Signal handling supportLey Foon Tan2014-12-085-0/+428
| | | | | | | | | | | | | | | | | | This patch adds support for signal handling. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: System calls handlingLey Foon Tan2014-12-085-0/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for system calls from userspaces. It uses the asm-generic/unistd.h definitions with architecture spcific syscall. The sys_call_table is just an array defined in a C file and it contains pointers to the syscall functions. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: ELF definitionsLey Foon Tan2014-12-082-0/+168
| | | | | | | | | | | | | | | | | | This patch adds definitions for the ELF format Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: DMA mapping APILey Foon Tan2014-12-082-0/+326
| | | | | | | | | | | | | | | | | | This patch adds support for the DMA mapping API. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Interrupt handlingLey Foon Tan2014-12-083-0/+193
| | | | | | | | | | | | | | | | | | | | | This patch adds the support for IRQ handling. Signed-off-by: Ley Foon Tan <lftan@altera.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
| * | nios2: TLB handlingLey Foon Tan2014-12-083-0/+355
| | | | | | | | | | | | | | | | | | This patch adds the TLB maintenance functions. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Cache handlingLey Foon Tan2014-12-083-0/+359
| | | | | | | | | | | | | | | | | | This patch adds functionality required for cache maintenance. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Process managementLey Foon Tan2014-12-086-0/+694
| | | | | | | | | | | | | | | | | | This patch adds support for thread creation and context switching. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Page table managementLey Foon Tan2014-12-084-0/+505
| | | | | | | | | | | | | | | | | | This patch adds support for page table management. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: MMU Fault handlingLey Foon Tan2014-12-082-0/+276
| | | | | | | | | | | | | | | | | | | | | This patch adds support for the handling of the MMU faults (exception entry code introduced by a previous patch, kernel/entry.S). Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: I/O MappingLey Foon Tan2014-12-082-0/+248
| | | | | | | | | | | | | | | | | | This patch adds several definitions for I/O accessors and ioremap(). Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Memory managementLey Foon Tan2014-12-085-0/+663
| | | | | | | | | | | | | | | | | | | | | This patch contains the initialisation of the memory blocks, MMU attributes and the memory map. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Traps exception handlingLey Foon Tan2014-12-083-0/+796
| | | | | | | | | | | | | | | | | | This patch contains traps exception handling. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Exception handlingLey Foon Tan2014-12-082-0/+811
| | | | | | | | | | | | | | | | | | | | | This patch contains the exception entry code (kernel/entry.S) and misaligned exception. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Kernel booting and initializationLey Foon Tan2014-12-084-0/+551
| | | | | | | | | | | | | | | | | | This patch adds the kernel booting and the initial setup code. Signed-off-by: Ley Foon Tan <lftan@altera.com>
| * | nios2: Assembly macros and definitionsLey Foon Tan2014-12-083-0/+417
| | | | | | | | | | | | | | | | | | | | | This patch add assembly macros and definitions used in the .S files across arch/nios2/ and together with asm-offsets.c. Signed-off-by: Ley Foon Tan <lftan@altera.com>
* | | Merge tag 'scsi-for-linus' of ↵Linus Torvalds2014-12-096-37/+265
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI updates from James Bottomley: "This patch is the usual mix of driver updates (srp, ipr, scsi_debug, NCR5380, fnic, 53c974, ses, wd719x, hpsa, megaraid_sas). Of those, wd7a9x is new and 53c974 is a rewrite of the old tmscsim driver and the extensive work by Finn Thain rewrites all the NCR5380 based drivers. There's also extensive infrastructure updates: a new logging infrastructure for sense information and a rewrite of the tagged command queue API and an assortment of minor updates" * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (183 commits) scsi: set fmt to NULL scsi_extd_sense_format() by default libsas: remove task_collector mode wd719x: remove dma_cache_sync call scsi_debug: add Report supported opcodes+tmfs; Compare and write scsi_debug: change SCSI command parser to table driven scsi_debug: add Capacity Changed Unit Attention scsi_debug: append inject error flags onto scsi_cmnd object scsi_debug: pinpoint invalid field in sense data wd719x: Add firmware documentation wd719x: Introduce Western Digital WD7193/7197/7296 PCI SCSI card driver eeprom-93cx6: Add (read-only) support for 8-bit mode esas2r: fix an oversight in setting return value esas2r: fix an error path in esas2r_ioctl_handler esas2r: fir error handling in do_fm_api scsi: add SPC-3 command definitions scsi: rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16 scsi: remove scsi_driver owner field scsi: move scsi_dispatch_cmd to scsi_lib.c scsi: stop passing a gfp_mask argument down the command setup path scsi: remove scsi_next_command ...
| * \ \ Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linusJames Bottomley2014-12-086-37/+265
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/scsi/scsi_debug.c Agreed and tested resolution to a merge problem between a fix in scsi_debug and a driver update Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| | * | | sun3_scsi: Convert to platform deviceFinn Thain2014-11-201-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert sun3_scsi to platform device and eliminate scsi_register(). Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
| | * | | atari_scsi: Convert to platform deviceFinn Thain2014-11-201-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert atari_scsi to platform device and eliminate scsi_register(). Validate __setup options later on so that module options are checked as well. Remove the comment about the scsi mid-layer disabling the host irq as it is no longer true (AFAICT). Also remove the obsolete slow interrupt stuff (IRQ_TYPE_SLOW == 0 anyway). Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Tested-by: Michael Schmitz <schmitzmic@gmail.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
| | * | | atari_scsi: Fix atari_scsi deadlocks on FalconFinn Thain2014-11-202-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't disable irqs when waiting for the ST DMA "lock"; its release may require an interrupt. Introduce stdma_try_lock() for use in soft irq context. atari_scsi now tells the SCSI mid-layer to defer queueing a command if the ST DMA lock is not available, as per Michael's patch: http://marc.info/?l=linux-m68k&m=139095335824863&w=2 The falcon_got_lock variable is race prone: we can't disable IRQs while waiting to acquire the lock, so after acquiring it there must be some interval during which falcon_got_lock remains false. Introduce stdma_is_locked_by() to replace falcon_got_lock. The falcon_got_lock tests in the EH handlers are incorrect these days. It can happen that an EH handler is called after a command completes normally. Remove these checks along with falcon_got_lock. Also remove the complicated and racy fairness wait queues. If fairness is an issue (when SCSI competes with IDE for the ST DMA interrupt), the solution is likely to be a lower value for host->can_queue. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Tested-by: Michael Schmitz <schmitzmic@gmail.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
| | * | | mac_scsi: Convert to platform deviceFinn Thain2014-11-202-14/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert mac_scsi to platform device and eliminate scsi_register(). Platform resources for chip registers now follow the documentation. This should fix issues with the Mac IIci (and possibly other models too). Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
* | | | | Merge tag 'hwmon-for-linus-3.19' of ↵Linus Torvalds2014-12-091-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon updates from Guenter Roeck: "Notable changes: - new driver for NCT7802Y - support for TMP435, LM95233, LM95235, NCT6792D, and NXP LM75B - regulator support for PMBus chips, specifically LTX2978 - support for humidity sensors to iio-hwmon bridge driver * tag 'hwmon-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (21 commits) hwmon: (tmp401) Detect TMP435 on all addresses it supports hwmon: (lm75) Strengthen detect function hwmon: (gpio-fan) Add a shutdown handler to poweroff the fans hwmon: (gpio-fan) Allow usage of gpio operations that may sleep hwmon: (tmp401) Bail out from tmp401_probe() in case of write errors hwmon: (tmp401) Add support for TI TMP435 hwmon: (lm95234) Add support for LM95233 hwmon: (lm95245) Add support for LM95235 hwmon: (ina2xx) bail-out from ina2xx_probe() in case of configuration errors hwmon: (nct6775) Add blank lines after declarations hwmon: (nct6775) Add support for NCT6792D hwmon: (nct6775) Documentation updates hwmon: (lm75) Add support for the NXP LM75B hwmon: Driver for Nuvoton NCT7802Y hwmon: (ibmpowernv) Convert to module_platform_driver hwmon: (ibmpowernv) Use platform 'id_table' to probe the device hwmon: (iio_hwmon) Add support for humidity sensors hwmon: (ltc2978) Add regulator support hwmon: (pmbus) Add regulator support hwmon: (pmbus) add helpers for byte write and read modify write ...
| * | | | | hwmon: (ibmpowernv) Use platform 'id_table' to probe the deviceNeelesh Gupta2014-12-011-0/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current driver probe() function assumes the sensor device to be always present and gets executed every time if the driver is loaded, but the appropriate hardware could not be present. So, move the platform device creation as part of platform init code and use the 'id_table' to check if the device is present or not. Signed-off-by: Neelesh Gupta <neelegup@linux.vnet.ibm.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
* | | | | Merge tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bpLinus Torvalds2014-12-091-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull EDAC updates from Borislav Petkov: "EDAC updates all over the place: - Enablement for AMD F15h models 0x60 CPUs. Most notably DDR4 RAM support. Out of tree stuff is adding the required PCI IDs. From Aravind Gopalakrishnan. - Enable amd64_edac for 32-bit due to popular demand. From Tomasz Pala. - Convert the AMD MCE injection module to debugfs, where it belongs. - Misc EDAC cleanups" * tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, MCE, AMD: Correct formatting of decoded text EDAC, mce_amd_inj: Add an injector function EDAC, mce_amd_inj: Add hw-injection attributes EDAC, mce_amd_inj: Enable direct writes to MCE MSRs EDAC, mce_amd_inj: Convert mce_amd_inj module to debugfs EDAC: Delete unnecessary check before calling pci_dev_put() EDAC, pci_sysfs: remove unneccessary ifdef around entire file ghes_edac: Use snprintf() to silence a static checker warning amd64_edac: Build module on x86-32 EDAC, MCE, AMD: Add decoding table for MC6 xec amd64_edac: Add F15h M60h support {mv64x60,ppc4xx}_edac,: Remove deprecated IRQF_DISABLED EDAC: Sync memory types and names EDAC: Add DDR3 LRDIMM entries to edac_mem_types x86, amd_nb: Add device IDs to NB tables for F15h M60h pci_ids: Add PCI device IDs for F15h M60h
| * | | | | x86, amd_nb: Add device IDs to NB tables for F15h M60hAravind Gopalakrishnan2014-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add F3 and F4 PCI device IDs to amd_nb_misc_ids[] and amd_nb_link_ids[] respectively. Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1411070205-10217-1-git-send-email-Aravind.Gopalakrishnan@amd.com Signed-off-by: Borislav Petkov <bp@suse.de>
* | | | | | Merge tag 'mmc-v3.19-1' of git://git.linaro.org/people/ulf.hansson/mmcLinus Torvalds2014-12-0917-169/+86
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull MMC updates from Ulf Hansson: "MMC core: - Consolidation and cleanups. - Some improvements regarding error handling. - Increase maximum amount of block devices. - Use correct OCR mask for SDIO when restoring power. - Fix prepared requests while doing BKOPS. - Convert to modern PM ops. - Add mmc_send_tuning() API and convert some hosts to use it. MMC host: - toshsd: New Toshiba PCI SD controller driver. - sdhci: 64-bit ADMA support. - sdhci: Some regulator fixes. - sdhci: HS400 support. - sdhci: Various fixes cleanups. - atmel-mci: Modernization and cleanups. - atmel-mci: Runtime PM support. - omap_hsmmc: Modernization and cleanups. - omap_hsmmc: Fix UHS card with DDR50 support. - dw_mmc: Support for ARM64 and Exynos 7 variant. - dw_mmc: Add support for IMG Pistachio variant. - dw_mmc: Various fixes and cleanups. - mvsdio: DMA fixes. - mxs-mmc: Modernization and cleanups. - mxcmmc: Various fixes" * tag 'mmc-v3.19-1' of git://git.linaro.org/people/ulf.hansson/mmc: (126 commits) mmc: sdhci-msm: Convert to mmc_send_tuning() mmc: sdhci-esdhc-imx: Convert to mmc_send_tuning() mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter mmc: queue: Improve error handling during allocation of bounce buffers mmc: sdhci-acpi: Add two host capabilities for Intel mmc: sdhci-pci: Add two host capabilities for BYT mmc: sdhci-acpi: Add SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC mmc: sdhci-pci: Add SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC to BYT mmc: atmel-mci: use probe deferring if dma controller is not ready yet mmc: atmel-mci: stop using specific initcall mmc: atmel-mci: remove __init/__exit attributes mmc: atmel-mci: remove useless DMA stuff for non-dt devices mmc: omap_hsmmc: Fix UHS card with DDR50 support mmc: core: add core-level function for sending tuning commands mmc: core: hold SD Clock before CMD11 during Signal mmc: mxs-mmc: Check for clk_prepare_enable() error mmc: mxs-mmc: Propagate the real error mmc: mxs-mmc: No need to do NULL check on 'iores' mmc: dw_mmc: Add support for IMG Pistachio mmc: mxs-mmc: Simplify PM hooks ...
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 01:56:03 +0100