1. 11 Dec, 2015 8 commits
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-4.5-2' of git://git.infradead.org/linux-mvebu into next/dt · dd270f24
      Arnd Bergmann authored
      Merge "mvebu dt for 4.5 (part 2)" from Gregory CLEMENT:
      
      - Fix Armada 388 GP dts
      - Add clock related to PMU for Dove
      - Add SolidRun Armada 388 Clearfog A1 dts
      
      * tag 'mvebu-dt-4.5-2' of git://git.infradead.org/linux-mvebu:
        ARM: dts: Add SolidRun Armada 388 Clearfog A1 DT file
        dt-bindings: add Marvell PMU documentation
        ARM: dts: dove: add Dove divider clocks
        dt-bindings: add Marvell core PLL and clock divider PMU documentation
        ARM: mvebu: remove duplicated regulator definition in Armada 388 GP
      dd270f24
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-4.5-1' of git://git.infradead.org/linux-mvebu into next/dt · 5d362a31
      Arnd Bergmann authored
      Merge "mvebu dt for 4.5 (part 1)" from Gregory CLEMENT:
      
      Update partition handling for ix4-300d
      
      * tag 'mvebu-dt-4.5-1' of git://git.infradead.org/linux-mvebu:
        ARM: dt: mvebu: ix4-300d: Cleanup NAND partition ranges
        ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node
        ARM: dt: mvebu: ix4-300d: remove whole flash partition
      5d362a31
    • Arnd Bergmann's avatar
      Merge tag 'berlin-dt-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt · 1d04ca21
      Arnd Bergmann authored
      Merge "Marvell Berlin DT changes (round 1)" from Sebastian Hesselbarth:
      
      - BG2Q cleanups (DMP eMMC, duplicated interrupt-parents)
      - add BG2, BG2CD, BG2Q watchdog nodes
      - add BG2Q DMP SDHCI1 nodes
      
      * tag 'berlin-dt-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin:
        arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality
        arm: dts: berlin2: add watchdog nodes
        arm: dts: berlin2cd: add watchdog nodes
        arm: dts: berlin2q: add watchdog nodes
        arm: dts: berlin2q: remove duplicated interrupt-parent
        arm: dts: berlin2q-marvell-dmp: remove broken-cd from eMMC node
      1d04ca21
    • Arnd Bergmann's avatar
      Merge tag 'v4.5-rockchip-dts32-1' of... · e9093d04
      Arnd Bergmann authored
      Merge tag 'v4.5-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      Merge "rockchip dts32 changes for 4.5" from Heiko Stuebner:
      
      First round of arm devicetree changes.
      Among the bigger changes are two new Veyron boards, support for
      the dual-core cortex-a7 rk3036 soc and addition of support for
      the crypto engine of the rk3288. Smaller changes include some
      IR receivers, updates of thermal settings more reflecting real-
      life and testing-results.
      
      * tag 'v4.5-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: rockchip: add gpio-ir-receiver to the R89 board
        ARM: dts: rockchip: add touchscreen node to veyron minnie
        ARM: dts: rockchip: add veyron-mickey board
        ARM: dts: rockchip: add veyron-brain board
        ARM: dts: rockchip: make sure edp_24m is associated to xin24m on veyron
        ARM: dts: rockchip: override thermal settings on veyron-speedy
        ARM: dts: rockchip: update the thermal management on rk3288
        ARM: dts: rockchip: Add Crypto node for rk3288
        ARM: dts: rockchip: add rk3036-evb board
        ARM: dts: rockchip: add core rk3036 dtsi
        clk: rockchip: add dt-binding header for rk3036
        clk: rockchip: add an id for rk3288 crypto clk
        ARM: dts: rockchip: Add IR receiver to RK3288 Radxa Rock 2 Square
        ARM: dts: rockchip: add channels properties for i2s
        ARM: dts: rockchip: set system-power-controller property on rk3288-rock2
        ARM: dts: rockchip: Setup rk3066/rk3188 ethernet0 alias for u-boot
        ARM: dts: rockchip: Setup rk3288 ethernet0 alias for u-boot
      e9093d04
    • Masahiro Yamada's avatar
      ARM: dts: uniphier: factor out common nodes to uniphier-common32.dtsi · 629b557a
      Masahiro Yamada authored
      UniPhier SoCs (except PH1-sLD3) have several nodes in common.
      Factor out them into uniphier-common32.dtsi.  This improves the code
      maintainability.
      
      PH1-sLD3 is so old that it has more or less different register maps
      than the others.  So, it cannot be included in this refactoring.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      629b557a
    • Masahiro Yamada's avatar
      ARM: dts: uniphier: change IRQ number of UART3 of PH1-Pro4 SoC · 618a43ea
      Masahiro Yamada authored
      The UART3 is assigned with IRQ 29 for old SoCs, IRQ 177 for new ones,
      and PH1-Pro4 is on the boundary.
      
        PH1-sLD3: UART3 is unavailable
        PH1-LD4, PH1-sLD8: only IRQ 29 is supported
        PH1-Pro4: both IRQ 29 and 177 are supported
        PH1-Pro5, ProXstream2, PH1-LD6b: only IRQ 177 is supported
      
      This SoC can choose either IRQ 29 or IRQ 177, but the former is shared
      with another hardware (low speed serial0).  The latter is dedicated
      for this hardware and more recommended.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      618a43ea
    • Arnd Bergmann's avatar
      Merge tag 'ux500-dt-for-arm-soc' of... · 1a7022f1
      Arnd Bergmann authored
      Merge tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
      
      Merge "Device Tree changes for Ux500" from Linus Walleij:
      
      - Push the Rohm touchscreen to the STUIB, as the TVK UIB has
        a Synaptics RMI4 touchscreen.
      - Set up the right sensor IRQs for the Snowball, so that
        periodic data ready-IRQ capture starts working.
      - Use wakeup-source consequently.
      - Remove legacy regulator-compatible strings.
      - Define the sensors on the HREFP TVK board properly.
      
      * tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: configure the sensors on the TVK board correctly
        ARM: u300: remove regulator-compatible usage
        ARM: ux500: remove regulator-compatible usage
        ARM: ux500: replace legacy *,wakeup property with wakeup-source
        ARM: ux500: Assign proper sensor IRQs for Snowball
        ARM: ux500: push down Rohm TS to STUIB
      1a7022f1
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt2-for-v4.5' of... · 406ca449
      Arnd Bergmann authored
      Merge tag 'renesas-dt2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.5" from Simon Horman:
      
      * sh73a0, r8a7740: Add L2 cache-controller node
      * r8a7791, r8a7794: remove deprecated #gpio-range-cells
      * r8a7793: Add DU support and enable for VGA port
      * r8a7790: switch console back to scif0
      * alt: Correct ether and scif2 pinmux
      * koelsch: Correct hdmi pinmux
      * silk, lager, porter, bockw: Move SPI FLASH partitions to subnode
      * bockw: Add schi0 pinmux
      
      * tag 'renesas-dt2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node
        ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node
        ARM: shmobile: alt: Correct ether pfc
        ARM: shmobile: alt: Correct scif2 pfc
        ARM: shmobile: silk: Move SPI FLASH partitions to subnode
        ARM: shmobile: lager: Move SPI FLASH partitions to subnode
        ARM: shmobile: porter: Move SPI FLASH partitions to subnode
        ARM: shmobile: bockw: Move SPI FLASH partition to subnode
        ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI
        ARM: shmobile: r8a7794: remove deprecated #gpio-range-cells from dtsi
        ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi
        ARM: shmobile: r8a7793: Add DU node to device tree
        ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port
        ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups
        ARM: shmobile: r8a7790: switch console back to scif0
      406ca449
  2. 10 Dec, 2015 2 commits
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-for-v4.5' of... · 6da06083
      Arnd Bergmann authored
      Merge tag 'renesas-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Merge "Renesas ARM Based SoC DT Updates for v4.5" from Simon Horman:
      
      * henninger: Remove as it is now replaced by silk
      * koelsch: Move SPI partitions to subnode
      * porter: Add CAN0 and HS-USB support
      * r8a7793/gose: Add QSPI, PFC support
      * r8a7793: Add GPIO, DMAC, theral, IPMMU support
      * r8a7794/alt: Add DU support
      * r8a7794: Disable all IPMMU nodes by default
      * r8a779[0134]: Use Use SoC specific binding for rcar-dmac
      * r8a779[01], r8a73a4, r8a7740, sh73a0: replace gpio-key, wakeup with
        wakeup-source property
      * r8a779[14]: Correct "gpio-ranges" properties
      * r8a779[14]: Remove bogus imp_clk node
      * silk: Add SDHI1 support
      
      * tag 'renesas-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits)
        ARM: shmobile: alt: add VIN0, ADV7180 DT support
        ARM: shmobile: alt: add I2C1 DT support
        ARM: shmobile: alt: Add pfc pins to DT
        ARM: shmobile: r8a7794: Use SoC specific binding for rcar-dmac nodes
        ARM: shmobile: r8a7793: Use SoC specific binding for rcar-dmac nodes
        ARM: shmobile: r8a7791: Use SoC specific binding for rcar-dmac nodes
        ARM: shmobile: r8a7790: Use SoC specific binding for rcar-dmac nodes
        ARM: shmobile: r8a7793: Add GPIO nodes to device tree
        ARM: shmobile: r8a7794: alt: Enable VGA port
        ARM: shmobile: r8a7794: Add DU node to device tree
        ARM: shmobile: r8a7794: Add DU0 clock
        ARM: shmobile: gose: Add QSPI device to DT
        ARM: shmobile: r8a7793: Add QSPI device to DT
        ARM: shmobile: r8a7793: Add DMAC devices to DT
        ARM: shmobile: koelsch: Move SPI FLASH partitions to subnode
        ARM: shmobile: gose: Configure PFC in DT
        ARM: shmobile: r8a7793: Add PFC to DT
        ARM: shmobile: r8a7793: Add thermal device to DT
        ARM: shmobile: henninger: remove board DT
        ARM: shmobile: porter: add CAN0 DT support
        ...
      6da06083
    • Arnd Bergmann's avatar
      Merge branch 'lpc32xx-dts' of https://github.com/vzapolskiy/linux into next/dt · c72c7a00
      Arnd Bergmann authored
      Merge LPC32xx DTS changes for v4.5 from Vladimir Zapolskiy:
      
      Main changes in the series:
      - Added description of the second PWM controller device
      - Added External Memory Controller device tree node (Primecell PL175)
      - Added device tree nodes for standard timer controllers
      - USB controllers are grouped
      - Various minor clean-ups needed for further development of LPC32xx
      
      * 'lpc32xx-dts' of https://github.com/vzapolskiy/linux:
        arm: dts: lpc32xx: move USB controller subdevices into own device node
        arm: dts: lpc32xx: add device nodes for standard timers
        arm: dts: lpc32xx: add external memory controller device node
        arm: dts: ea3250/phy3250: specify phys memory offset for lpc32xx boards
        arm: dts: lpc32xx: add device node for the second pwm controller
        arm: dts: lpc32xx: add reg property to cpu device node
        arm: dts: lpc32xx: add labels to all defined peripheral nodes
        arm: dts: lpc32xx: change include syntax to be C preprocessor friendly
      c72c7a00
  3. 08 Dec, 2015 1 commit
  4. 07 Dec, 2015 4 commits
  5. 06 Dec, 2015 1 commit
  6. 04 Dec, 2015 1 commit
  7. 03 Dec, 2015 4 commits
  8. 01 Dec, 2015 3 commits
  9. 30 Nov, 2015 9 commits
  10. 29 Nov, 2015 7 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 36511e86
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       - fix tcm-user backend driver expired cmd time processing (agrover)
       - eliminate kref_put_spinlock_irqsave() for I/O completion (bart)
       - fix iscsi login kthread failure case hung task regression (nab)
       - fix COMPARE_AND_WRITE completion use-after-free race (nab)
       - fix COMPARE_AND_WRITE with SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC non zero
         SGL offset data corruption.  (Jan + Doug)
       - fix >= v4.4-rc1 regression for tcm_qla2xxx enable configfs attribute
         (Himanshu + HCH)
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target/stat: print full t10_wwn.model buffer
        target: fix COMPARE_AND_WRITE non zero SGL offset data corruption
        qla2xxx: Fix regression introduced by target configFS changes
        kref: Remove kref_put_spinlock_irqsave()
        target: Invoke release_cmd() callback without holding a spinlock
        target: Fix race for SCF_COMPARE_AND_WRITE_POST checking
        iscsi-target: Fix rx_login_comp hang after login failure
        iscsi-target: return -ENOMEM instead of -1 in case of failed kmalloc()
        target/user: Do not set unused fields in tcmu_ops
        target/user: Fix time calc in expired cmd processing
      36511e86
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 75a29ec1
      Linus Torvalds authored
      Pull thermal management fixes from Zhang Rui:
       "Specifics:
      
       - several fixes and cleanups on Rockchip thermal drivers.
      
       - add the missing support of RK3368 SoCs in Rockchip driver.
      
       - small fixes on of-thermal, power_allocator, rcar driver, IMX, and
         QCOM drivers, and also compilation fixes, on thermal.h, when thermal
         is not selected"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        imx: thermal: use CPU temperature grade info for thresholds
        thermal: fix thermal_zone_bind_cooling_device prototype
        Revert "thermal: qcom_spmi: allow compile test"
        thermal: rcar_thermal: remove redundant operation
        thermal: of-thermal: Reduce log level for message when can't fine thermal zone
        thermal: power_allocator: Use temperature reading from tz
        thermal: rockchip: Support the RK3368 SoCs in thermal driver
        thermal: rockchip: consistently use int for temperatures
        thermal: rockchip: Add the sort mode for adc value increment or decrement
        thermal: rockchip: improve the conversion function
        thermal: rockchip: trivial: fix typo in commit
        thermal: rockchip: better to compatible the driver for different SoCs
        dt-bindings: rockchip-thermal: Support the RK3368 SoCs compatible
      75a29ec1
    • David Disseldorp's avatar
      target/stat: print full t10_wwn.model buffer · 8f903539
      David Disseldorp authored
      Cut 'n paste error saw it only process sizeof(t10_wwn.vendor) characters.
      Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      8f903539
    • Jan Engelhardt's avatar
      target: fix COMPARE_AND_WRITE non zero SGL offset data corruption · d94e5a61
      Jan Engelhardt authored
      target_core_sbc's compare_and_write functionality suffers from taking
      data at the wrong memory location when writing a CAW request to disk
      when a SGL offset is non-zero.
      
      This can happen with loopback and vhost-scsi fabric drivers when
      SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is used to map existing user-space
      SGL memory into COMPARE_AND_WRITE READ/WRITE payload buffers.
      
      Given the following sample LIO subtopology,
      
      % targetcli ls /loopback/
      o- loopback ................................. [1 Target]
        o- naa.6001405ebb8df14a ....... [naa.60014059143ed2b3]
          o- luns ................................... [2 LUNs]
            o- lun0 ................ [iblock/ram0 (/dev/ram0)]
            o- lun1 ................ [iblock/ram1 (/dev/ram1)]
      % lsscsi -g
      [3:0:1:0]    disk    LIO-ORG  IBLOCK           4.0   /dev/sdc   /dev/sg3
      [3:0:1:1]    disk    LIO-ORG  IBLOCK           4.0   /dev/sdd   /dev/sg4
      
      the following bug can be observed in Linux 4.3 and 4.4~rc1:
      
      % perl -e 'print chr$_ for 0..255,reverse 0..255' >rand
      % perl -e 'print "\0" x 512' >zero
      % cat rand >/dev/sdd
      % sg_compare_and_write -i rand -D zero --lba 0 /dev/sdd
      % sg_compare_and_write -i zero -D rand --lba 0 /dev/sdd
      Miscompare reported
      % hexdump -Cn 512 /dev/sdd
      00000000  0f 0e 0d 0c 0b 0a 09 08  07 06 05 04 03 02 01 00
      00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
      *
      00000200
      
      Rather than writing all-zeroes as instructed with the -D file, it
      corrupts the data in the sector by splicing some of the original
      bytes in. The page of the first entry of cmd->t_data_sg includes the
      CDB, and sg->offset is set to a position past the CDB. I presume that
      sg->offset is also the right choice to use for subsequent sglist
      members.
      Signed-off-by: default avatarJan Engelhardt <jengelh@netitwork.de>
      Tested-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
      Cc: <stable@vger.kernel.org> # v3.12+
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      d94e5a61
    • Himanshu Madhani's avatar
      qla2xxx: Fix regression introduced by target configFS changes · 3786dc45
      Himanshu Madhani authored
      this patch fixes following regression
      
       # targetcli
       [Errno 13] Permission denied: '/sys/kernel/config/target/qla2xxx/21:00:00:0e:1e:08:c7:20/tpgt_1/enable'
      
      Fixes: 2eafd729 ("target: use per-attribute show and store methods")
      Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
      Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      3786dc45
    • Bart Van Assche's avatar
      kref: Remove kref_put_spinlock_irqsave() · 3a66d7dc
      Bart Van Assche authored
      The last user is gone. Hence remove this function.
      Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Joern Engel <joern@logfs.org>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      3a66d7dc
    • Bart Van Assche's avatar
      target: Invoke release_cmd() callback without holding a spinlock · 9ff9d15e
      Bart Van Assche authored
      This patch fixes the following kernel warning because it avoids that
      IRQs are disabled while ft_release_cmd() is invoked (fc_seq_set_resp()
      invokes spin_unlock_bh()):
      
      WARNING: CPU: 3 PID: 117 at kernel/softirq.c:150 __local_bh_enable_ip+0xaa/0x110()
      Call Trace:
       [<ffffffff814f71eb>] dump_stack+0x4f/0x7b
       [<ffffffff8105e56a>] warn_slowpath_common+0x8a/0xc0
       [<ffffffff8105e65a>] warn_slowpath_null+0x1a/0x20
       [<ffffffff81062b2a>] __local_bh_enable_ip+0xaa/0x110
       [<ffffffff814ff229>] _raw_spin_unlock_bh+0x39/0x40
       [<ffffffffa03a7f94>] fc_seq_set_resp+0xe4/0x100 [libfc]
       [<ffffffffa02e604a>] ft_free_cmd+0x4a/0x90 [tcm_fc]
       [<ffffffffa02e6972>] ft_release_cmd+0x12/0x20 [tcm_fc]
       [<ffffffffa042bd66>] target_release_cmd_kref+0x56/0x90 [target_core_mod]
       [<ffffffffa042caf0>] target_put_sess_cmd+0xc0/0x110 [target_core_mod]
       [<ffffffffa042cb81>] transport_release_cmd+0x41/0x70 [target_core_mod]
       [<ffffffffa042d975>] transport_generic_free_cmd+0x35/0x420 [target_core_mod]
      Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
      Acked-by: default avatarJoern Engel <joern@logfs.org>
      Reviewed-by: default avatarAndy Grover <agrover@redhat.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Hannes Reinecke <hare@suse.de>
      Cc: Sagi Grimberg <sagig@mellanox.com>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      9ff9d15e