1. 13 2月, 2013 10 次提交
    • V
      crypto: caam - Added property fsl, sec-era in SEC4.0 device tree binding. · 2d1efdb2
      Vakul Garg 提交于
      This new property defines the era of the particular SEC version.
      The compatible property in device tree "crypto" node has been updated
      not to contain SEC era numbers.
      Signed-off-by: NVakul Garg <vakul@freescale.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      2d1efdb2
    • P
      powerpc/85xx: enable MTD options in sbc8548 defconfig · d5bc813f
      Paul Gortmaker 提交于
      This board has soldered on flash, and a SODIMM flash module.
      Both can be used for booting, via switching JP12 and SW2.8
      and using the sbc8548-altflash.dts when booting from SODIMM.
      
      Here we enable MTD in kernel so that we can see the bootloader
      (and other flash sectors) from linux.
      
      Normal configuration:
      
       root@sbc8548:~# cat /proc/mtd
       dev:    size   erasesize  name
       mtd0: 007a0000 00020000 "space"
       mtd1: 00060000 00020000 "bootloader"
       mtd2: 03f00000 00080000 "space"
       mtd3: 00100000 00080000 "bootloader"
       root@sbc8548:~# dd if=/dev/mtd1 count=1 bs=48|hexdump -C
       1+0 records in
       1+0 records out
       00000000  27 05 19 56 55 2d 42 6f  6f 74 20 32 30 31 32 2e  |'..VU-Boot 2012.|
       00000010  31 30 2d 64 69 72 74 79  20 28 4a 61 6e 20 31 39  |10-dirty (Jan 19|
       00000020  20 32 30 31 33 20 2d 20  31 39 3a 34 30 3a 31 31  | 2013 - 19:40:11|
       00000030
       root@sbc8548:~# dd if=/dev/mtd3 count=1 bs=48|hexdump -C
       1+0 records in
       1+0 records out
       00000000  27 05 19 56 55 2d 42 6f  6f 74 20 32 30 31 32 2e  |'..VU-Boot 2012.|
       00000010  31 30 2d 64 69 72 74 79  20 28 44 65 63 20 31 33  |10-dirty (Dec 13|
       00000020  20 32 30 31 32 20 2d 20  31 35 3a 30 30 3a 30 37  | 2012 - 15:00:07|
       00000030
       root@sbc8548:~#
      
      Alternate configuration, with sbc8548-altflash.dts:
      
       root@sbc8548:~# cat /proc/mtd
       dev:    size   erasesize  name
       mtd0: 03f00000 00080000 "space"
       mtd1: 00100000 00080000 "bootloader"
       mtd2: 007a0000 00020000 "space"
       mtd3: 00060000 00020000 "bootloader"
       root@sbc8548:~# dd if=/dev/mtd1 count=1 bs=48|hexdump -C
       1+0 records in
       1+0 records out
       00000000  27 05 19 56 55 2d 42 6f  6f 74 20 32 30 31 32 2e  |'..VU-Boot 2012.|
       00000010  31 30 2d 64 69 72 74 79  20 28 44 65 63 20 31 33  |10-dirty (Dec 13|
       00000020  20 32 30 31 32 20 2d 20  31 35 3a 30 30 3a 30 37  | 2012 - 15:00:07|
       00000030
       root@sbc8548:~# dd if=/dev/mtd3 count=1 bs=48|hexdump -C
       1+0 records in
       1+0 records out
       00000000  27 05 19 56 55 2d 42 6f  6f 74 20 32 30 31 32 2e  |'..VU-Boot 2012.|
       00000010  31 30 2d 64 69 72 74 79  20 28 4a 61 6e 20 31 39  |10-dirty (Jan 19|
       00000020  20 32 30 31 33 20 2d 20  31 39 3a 34 30 3a 31 31  | 2013 - 19:40:11|
       00000030
       root@sbc8548:~#
      
      Note that in the latter, the larger SODIMM device appears 1st,
      as mtd0 and mtd1, as indicated in the sizes, and in the date
      of the u-boot image.
      
      The kernel configuration is the same in both cases; only the dtb
      needs to be changed in accordance with the JP12/SW2.8 settings.
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      d5bc813f
    • P
      powerpc/85xx: add alternate dts file for sbc8548 boot via SODIMM · dcc8722a
      Paul Gortmaker 提交于
      By moving the two JP12 jumpers 90 degrees, and switching the
      setting of SW2.8, the sbc8548 can be configured to boot off
      the alternate 64MB SODIMM, which when populated with u-boot
      can be a handy recovery option, in case the u-boot in the
      8MB soldered on flash gets corrupted.  Here we add an alternate
      dts file to match that configuration.
      
      To better highlight the differences, the output from the u-boot
      "fli" command is shown for the normal configuration and then
      the alternate configuration.
      
      Normal:
       -----------------------
      Bank # 1: CFI conformant flash (8 x 8)  Size: 8 MB in 64 Sectors
        Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x17
        Erase timeout: 4096 ms, write timeout: 1 ms
        Buffer write timeout: 2 ms, buffer size: 32 bytes
      
        Sector Start Addresses:
        FF800000 E      FF820000 E      FF840000 E      FF860000 E      FF880000 E
       [...]
        FFEE0000 E      FFF00000 E      FFF20000 E      FFF40000 E      FFF60000 E
        FFF80000        FFFA0000   RO   FFFC0000   RO   FFFE0000   RO
      
      Bank # 2: CFI conformant flash (32 x 8)  Size: 64 MB in 128 Sectors
        Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x18
        Erase timeout: 4096 ms, write timeout: 1 ms
        Buffer write timeout: 2 ms, buffer size: 32 bytes
      
        Sector Start Addresses:
        EC000000 E      EC080000 E      EC100000 E      EC180000 E      EC200000 E
       [...]
        EFC00000 E      EFC80000 E      EFD00000 E      EFD80000 E      EFE00000 E
        EFE80000 E      EFF00000        EFF80000
       -----------------------
      
      Alternate:
       -----------------------
      Bank # 1: CFI conformant flash (32 x 8)  Size: 64 MB in 128 Sectors
        Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x18
        Erase timeout: 4096 ms, write timeout: 1 ms
        Buffer write timeout: 2 ms, buffer size: 32 bytes
      
        Sector Start Addresses:
        FC000000 E      FC080000 E      FC100000 E      FC180000 E      FC200000 E
       [...]
        FFC00000 E      FFC80000 E      FFD00000 E      FFD80000 E      FFE00000 E
        FFE80000 E      FFF00000   RO   FFF80000   RO
      
      Bank # 2: CFI conformant flash (8 x 8)  Size: 8 MB in 64 Sectors
        Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x17
        Erase timeout: 4096 ms, write timeout: 1 ms
        Buffer write timeout: 2 ms, buffer size: 32 bytes
      
        Sector Start Addresses:
        EF800000 E      EF820000 E      EF840000 E      EF860000 E      EF880000 E
       [...]
        EFEE0000 E      EFF00000 E      EFF20000 E      EFF40000 E      EFF60000 E
        EFF80000 E      EFFA0000        EFFC0000        EFFE0000
       -----------------------
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      dcc8722a
    • P
      powerpc/85xx: update sbc8548 flash information to match recent u-boot · 7e83f2ad
      Paul Gortmaker 提交于
      The original memory map for the sbc8548 had the 64MB SODIMM flash
      device misaligned by 8MB to allow a window of address space for
      the soldered on 8MB device -- i.e.
      
       start           end             CS<n>   width   Desc.
       ----------------------------------------------------------
       fb80_0000       ff7f_ffff       CS6     32      SODIMM flash (64MB)
       ff80_0000       ffff_ffff       CS0     8       Boot flash (8MB)
      
      However, if we want to change the configuration so that it boots
      off the 64MB flash, it is in turn then aligned with a 64MB boundary,
      starting at fc00_0000 (and the 8MB @ fb80_0000 -> fbff_ffff).
      
      This makes for complicated updates, since what is the beginning
      of the physical device is 8MB into its address space in the default
      configuration shown above.
      
      This issue was fixed as of u-boot commit 3fd673cf363bc86ed42eff713d4
      ("sbc8548: relocate 64MB user flash to sane boundary") -- in which
      the SODIMM was mapped to ec00_0000 (natively aligned under efff_ffff)
      and so when JP12/SW2.8 are switched, it will be a a simple 0xec --> 0xfc
      mapping between the two instances.
      
      Here we make the associated changes in the localbus flash memory
      map in the dts file:  indicating the 64MB device starts at ec00_0000
      and that the tail end of the 64MB device (last 2 sectors) can contain
      a bootloader image.
      
      The partitions for both flash devices get a clean-up; there were
      non-meaningful assignments in there that probably originated from
      the MPC8548CDS on which the file was based on.  Now there is just
      the categorization of free space and bootloader images.
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      7e83f2ad
    • P
      powerpc/85xx: split sbc8548 dts file into pre and post chunks · d1cf1c7d
      Paul Gortmaker 提交于
      Updates to u-boot allow this board to boot off of either
      the 8MB soldered on flash, or the 64MB SODIMM flash.
      
      This is achieved by changing JP12 and SW2.8 which in turn
      swaps which flash device appears on /CS0 and /CS6 respectively.
      
      Since the flash devices are not the same size, this also
      changes the MTD memory map layout on the local bus.
      
      Here we split the common chunks out into a pre and post
      include, so they can be reused by an upcoming "alternative
      boot" dts file; leaving only the local bus chunk behind.
      
      No content changes are made at this point - it is just purely
      the move to using include files.
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      d1cf1c7d
    • W
      powerpc/85xx: use for_each_compatible_node() macro · 5444d639
      Wei Yongjun 提交于
      Use for_each_compatible_node() macro instead of open coding it.
      Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Acked-by: NGrant Likely <grant.likely@secretlab.ca>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      5444d639
    • K
      powerpc/fsl: msi: sparse fixes · 6cce76dc
      Kim Phillips 提交于
      arch/powerpc/sysdev/fsl_msi.c:31:1: warning: symbol 'msi_head' was not declared. Should it be static?
      arch/powerpc/sysdev/fsl_msi.c:138:40: warning: incorrect type in argument 1 (different base types)
      arch/powerpc/sysdev/fsl_msi.c:138:40:    expected restricted __be64 const [usertype] *p
      arch/powerpc/sysdev/fsl_msi.c:138:40:    got unsigned long long const [usertype] *[assigned] reg
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      6cce76dc
    • K
      powerpc/fsl: ifc: sparse fixes · 8998a030
      Kim Phillips 提交于
      arch/powerpc/sysdev/fsl_ifc.c:66:38: warning: incorrect type in initializer (different base types)
      arch/powerpc/sysdev/fsl_ifc.c:66:38:    expected restricted __be32 [usertype] cspr
      arch/powerpc/sysdev/fsl_ifc.c:66:38:    got unsigned int
      arch/powerpc/sysdev/fsl_ifc.c:67:21: warning: restricted __be32 degrades to integer
      arch/powerpc/sysdev/fsl_ifc.c:67:39: warning: restricted __be32 degrades to integer
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      8998a030
    • K
      powerpc/fsl: fsl_soc: sparse fixes · 8443cc14
      Kim Phillips 提交于
      arch/powerpc/sysdev/fsl_soc.c:70:67: warning: incorrect type in argument 2 (different base types)
      arch/powerpc/sysdev/fsl_soc.c:70:67:    expected restricted __be32 const [usertype] *addr
      arch/powerpc/sysdev/fsl_soc.c:70:67:    got unsigned int const [usertype] *
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      8443cc14
    • K
      powerpc/fsl: lbc: sparse fixes · 01673a13
      Kim Phillips 提交于
      arch/powerpc/sysdev/fsl_lbc.c:77:36: warning: incorrect type in initializer (different base types)
      arch/powerpc/sysdev/fsl_lbc.c:77:36:    expected restricted __be32 [usertype] br
      arch/powerpc/sysdev/fsl_lbc.c:77:36:    got unsigned int
      arch/powerpc/sysdev/fsl_lbc.c:78:36: warning: incorrect type in initializer (different base types)
      arch/powerpc/sysdev/fsl_lbc.c:78:36:    expected restricted __be32 [usertype] or
      arch/powerpc/sysdev/fsl_lbc.c:78:36:    got unsigned int
      arch/powerpc/sysdev/fsl_lbc.c:80:21: warning: restricted __be32 degrades to integer
      arch/powerpc/sysdev/fsl_lbc.c:80:38: warning: restricted __be32 degrades to integer
      arch/powerpc/sysdev/fsl_lbc.c:111:12: warning: incorrect type in assignment (different base types)
      arch/powerpc/sysdev/fsl_lbc.c:111:12:    expected restricted __be32 [usertype] br
      arch/powerpc/sysdev/fsl_lbc.c:111:12:    got unsigned int
      arch/powerpc/sysdev/fsl_lbc.c:113:17: warning: restricted __be32 degrades to integer
      arch/powerpc/sysdev/fsl_lbc.c:127:17: warning: restricted __be32 degrades to integer
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      01673a13
  2. 08 2月, 2013 4 次提交
    • I
      powerpc: Add support for context switching the TAR register · 2468dcf6
      Ian Munsie 提交于
      This patch adds support for enabling and context switching the Target
      Address Register in Power8. The TAR is a new special purpose register
      that can be used for computed branches with the bctar[l] (branch
      conditional to TAR) instruction in the same manner as the count and link
      registers.
      Signed-off-by: NIan Munsie <imunsie@au1.ibm.com>
      Signed-off-by: NMatt Evans <matt@ozlabs.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      2468dcf6
    • N
      pseries/iommu: Remove DDW on kexec · 14b6f00f
      Nishanth Aravamudan 提交于
      pseries/iommu: remove DDW on kexec
      
      We currently insert a property in the device-tree when we successfully
      configure DDW for a given slot. This was meant to be an optimization to
      speed up kexec/kdump, so that we don't need to make the RTAS calls again
      to re-configured DDW in the new kernel.
      
      However, we end up tripping a plpar_tce_stuff failure on kexec/kdump
      because we unconditionally parse the ibm,dma-window property for the
      node at bus/dev setup time. This property contains the 32-bit DMA window
      LIOBN, which is distinct from the DDW window's. We pass that LIOBN (via
      iommu_table_init -> iommu_table_clear -> tce_free ->
      tce_freemulti_pSeriesLP) to plpar_tce_stuff, which fails because that
      32-bit window is no longer present after
      25ebc45b ("powerpc/pseries/iommu: remove
      default window before attempting DDW manipulation").
      
      I believe the simplest, easiest-to-maintain fix is to just change our
      initcall to, rather than detecting and updating the new kernel's DDW
      knowledge, just remove all DDW configurations. When the drivers
      re-initialize, we will set everything back up as it was before.
      Signed-off-by: NNishanth Aravamudan <nacc@us.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      14b6f00f
    • N
      pseries/iommu: Restore_default_window does not use liobn parameter · a1dabade
      Nishanth Aravamudan 提交于
      The parameter is unused, and complicates a following fix. Just remove
      it.
      Signed-off-by: NNishanth Aravamudan <nacc@us.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      a1dabade
    • D
      powerpc: fix ics_rtas_init and start_secondary section mismatch · 174ea471
      Daniel Borkmann 提交于
      It seems, we're fine with just annotating the two functions.
      Thus, this fixes the following build warnings on ppc64:
      
      WARNING: arch/powerpc/sysdev/xics/built-in.o(.text+0x1664):
      The function .ics_rtas_init() references
      the function __init .xics_register_ics().
      This is often because .ics_rtas_init lacks a __init
      annotation or the annotation of .xics_register_ics is wrong.
      
      WARNING: arch/powerpc/sysdev/built-in.o(.text+0x6044):
      The function .ics_rtas_init() references
      the function __init .xics_register_ics().
      This is often because .ics_rtas_init lacks a __init
      annotation or the annotation of .xics_register_ics is wrong.
      
      WARNING: arch/powerpc/kernel/built-in.o(.text+0x2db30):
      The function .start_secondary() references
      the function __cpuinit .vdso_getcpu_init().
      This is often because .start_secondary lacks a __cpuinit
      annotation or the annotation of .vdso_getcpu_init is wrong.
      
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      174ea471
  3. 29 1月, 2013 23 次提交
    • N
      pseries/iommu: Ensure TCEs are cleared with non-huge DDW · 71cf1def
      Nishanth Aravamudan 提交于
      There are now two kinds of DMA windows that might be presented by
      PowerVM DDW support -- huge windows (that can map all of system memory
      regardless of the LPAR configuration) and non-huge windows (which
      can't). They are implemented slightly differently in PowerVM, and thus
      have different characteristics. The most obvious is that slot isolate
      doesn't clear the TCEs/window for us with non-huge windows. Thus, when a
      DLPAR operation occurs on a slot using a non-huge window, TCEs are still
      present (the notifier chain doesn't currently remove them explicitly)
      and the DLPAR fails. Fix this by calling remove_ddw() first, which will
      unmap the DDW TCEs.
      
      Note: a corresponding change to drmgr is needed to actually successfully
      DLPAR, such that the device-tree update (which causes the notifier chain
      to fire) occurs before slot isolate.
      Signed-off-by: NNishanth Aravamudan <nacc@us.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      71cf1def
    • N
      pseries/iommu: Fix iteration in DDW TCE clearrange · 22b38298
      Nishanth Aravamudan 提交于
      tce_clearrange_multi_pSeriesLP is attempting to iterate over all TCEs in
      a given range. However, is it not advancing the dma_offset value passed
      to plpar_tce_stuff via the next value. This prevents DLPAR from
      completing, because TCEs are still present at slot isolation time.
      Signed-off-by: NNishanth Aravamudan <nacc@us.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      22b38298
    • M
      powerpc: Change hardware breakpoint to allow longer ranges · 4ae7ebe9
      Michael Neuling 提交于
      Change the hardware breakpoint code so that we can support wider ranged
      breakpoints.
      
      This means both ptrace and perf hardware breakpoints can use upto 512 byte long
      breakpoints when using the DAWR and only 8 byte when using the DABR.
      Signed-off-by: NMichael Neuling <mikey@neuling.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      4ae7ebe9
    • M
      powerpc: Add length setting to set_dawr · 05d694ea
      Michael Neuling 提交于
      Currently we set the length field in the DAWR to 0 which defaults it to one
      double word (64bits) which is the same as the DABR.
      
      Change this so that we can set it to longer values as supported by the DAWR.
      Signed-off-by: NMichael Neuling <mikey@neuling.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      05d694ea
    • S
      perf/Power: PERF_EVENT_IOC_ENABLE does not reenable event · f53d168c
      sukadev@linux.vnet.ibm.com 提交于
      perf/Power: PERF_EVENT_IOC_ENABLE does not reenable event
      
      If we disable a perf event because we exceeded the specified ->event_limit,
      power_pmu_stop() sets the PERF_HES_STOPPED flag on the event.
      
      If the application then re-enables the event using PERF_EVENT_IOC_ENABLE
      ioctl, we don't ever clear this STOPPED flag. Consequently, the user space
      is never notified of the event.
      
      Following message has more background and test case.
      
          http://lists.eecs.utk.edu/pipermail/ptools-perfapi/2012-October/002528.html
      
      Used the following test cases to verify that this patch works on latest PAPI.
      
      	$ papi.git/src/ctests/nonthread PAPI_TOT_CYC@5000000
      
      	$ papi.git/src/ctests/overflow_single_event
      
      Changelog[v2]:
      	- [Paul Mackerras] Also clear PERF_HES_UPTODATE flag since we are
      	  restarting the event; cleanup comments and patch description.
      Signed-off-by: NSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      f53d168c
    • L
      powerpc: Avoid debug_smp_processor_id() check in SHARED_PROCESSOR · 94c95cfb
      Li Zhong 提交于
      Use local_paca directly in macro SHARED_PROCESSOR, as all processors
      have the same value for the field shared_proc, so we don't need care
      racy here.
      Reported-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Signed-off-by: NLi Zhong <zhong@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      94c95cfb
    • S
      uprobes/powerpc: Add dependency on single step emulation · 5e249d45
      Suzuki K. Poulose 提交于
      Uprobes uses emulate_step in sstep.c, but we haven't explicitly specified
      the dependency. On pseries HAVE_HW_BREAKPOINT protects us, but 44x has no
      such luxury.
      
      Consolidate other users that depend on sstep and create a new config option.
      Signed-off-by: NAnanth N Mavinakayanahalli <ananth@in.ibm.com>
      Signed-off-by: NSuzuki K. Poulose <suzuki@in.ibm.com>
      Cc: linuxppc-dev@ozlabs.org
      Cc: stable@vger.kernel.org
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      5e249d45
    • B
      powerpc: Add support for CTS-1000 GPIO controlled system poweroff · 5611fe48
      Benjamin Collins 提交于
      CTS-1000 is based on P4080. GPIO 27 is used to signal the FPGA to
      switch off power, and also associates IRQ 8 with front-panel button
      press (which we use to call orderly_poweroff()).
      
      The relevant device-tree looks like this:
      
      	gpio0: gpio@130000 {
      		compatible = "fsl,qoriq-gpio";
      		reg = <0x130000 0x1000>;
      		interrupts = <55 2 0 0>;
      		#gpio-cells = <2>;
      		gpio-controller;
      
      		/* Allows powering off the system via GPIO signal. */
      		gpio-halt@27 {
      			compatible = "sgy,gpio-halt";
      			gpios = <&gpio0 27 0>;
      			interrupts = <8 1 0 0>;
      		};
      	};
      
      Because the driver cannot match on sgy,gpio-halt (because the node is never
      processed through of_platform), it matches on fsl,qoriq-gpio and then
      checks child nodes for the matching sgy,gpio-halt. This also ensures that
      the GPIO controller is detected prior to sgy_cts1000's probe callback,
      since that node wont match via of_platform until the controller is
      registered.
      
      Also, because the GPIO handler for triggering system poweroff might sleep,
      the IRQ uses a workqueue to call orderly_poweroff().
      
      As a final note, this driver may be expanded for other features specific to
      the CTS-1000.
      Signed-off-by: NBen Collins <ben.c@servergy.com>
      Cc: Jack Smith <jack.s@servergy.com>
      Cc: Vihar Rai <vihar.r@servergy.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      5611fe48
    • S
      powerpc/fsl: Remove CONFIG_IRQ_ALL_CPUS from mpc85xx/mpc86xx defconfig · 34f364fe
      Scott Wood 提交于
      While this should be harmless now that distribute_irqs
      obeys MPIC_SINGLE_DEST_CPU, there's no reason to enable this
      on mpc85xx/mpc86xx since MPIC_SINGLE_DEST_CPU will always be set.
      Signed-off-by: NScott Wood <scottwood@freescale.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      34f364fe
    • S
      powerpc/mpic: Make distribute_irqs obey MPIC_SINGLE_DEST_CPU · 7bd9fc55
      Scott Wood 提交于
      Previously we were setting an illegal configuration on mpc85xx
      MPICs if CONFIG_IRQ_ALL_CPUS is enabled (which for some reason it is
      in mpc85xx_smp_defconfig).
      Signed-off-by: NScott Wood <scottwood@freescale.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      7bd9fc55
    • M
      powerpc/ptrace: Make #defines for all request numbers hex · 145c52d5
      Michael Neuling 提交于
      We have a mix of decimal and hex here, so lets make them consistently
      hex.  Also, strace will print them in hex if it can't decode them, so
      having them in hex here makes it easier to match up.
      
      No functional change.
      Signed-off-by: NMichael Neuling <mikey@neuling.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      145c52d5
    • C
      powerpc/mm: Eliminate unneeded for_each_memblock · 4e8309ba
      Cody P Schafer 提交于
      The only persistent change made by this loop is calling
      memblock_set_node() once for each memblock, which is not useful (and has
      no effect) as memblock_set_node() is not called with any
      memblock-specific parameters.
      
      Subsistute a single memblock_set_node().
      Signed-off-by: NCody P Schafer <cody@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      4e8309ba
    • B
      Merge branch 'merge' into next · dfd0436a
      Benjamin Herrenschmidt 提交于
      Merge "merge" branch to bring in various bug fixes that are
      going into 3.8
      dfd0436a
    • T
      powerpc: Max next_tb to prevent from replaying timer interrupt · 689dfa89
      Tiejun Chen 提交于
      With lazy interrupt, we always call __check_irq_replaysome with
      decrementers_next_tb to check if we need to replay timer interrupt.
      So in hotplug case we also need to set decrementers_next_tb as MAX
      to make sure __check_irq_replay don't replay timer interrupt
      when return as we expect, otherwise we'll trap here infinitely.
      Signed-off-by: NTiejun Chen <tiejun.chen@windriver.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      689dfa89
    • C
      powerpc: kernel/kgdb.c: Fix memory leakage · fefd9e6f
      Cong Ding 提交于
      the variable backup_current_thread_info isn't freed before existing the
      function.
      Signed-off-by: NCong Ding <dinggnu@gmail.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      fefd9e6f
    • T
      powerpc/book3e: Disable interrupt after preempt_schedule_irq · 572177d7
      Tiejun Chen 提交于
      In preempt case current arch_local_irq_restore() from
      preempt_schedule_irq() may enable hard interrupt but we really
      should disable interrupts when we return from the interrupt,
      and so that we don't get interrupted after loading SRR0/1.
      Signed-off-by: NTiejun Chen <tiejun.chen@windriver.com>
      CC: <stable@vger.kernel.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      572177d7
    • C
      powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function · 46ed7a76
      Carl E. Love 提交于
      The calculation for the left shift of the mask OPROFILE_PM_PMCSEL_MSK has an
      error.  The calculation is should be to shift left by (max_cntrs - cntr) times
      the width of the pmsel field width.  However, the #define OPROFILE_MAX_PMC_NUM
      was used instead of OPROFILE_PMSEL_FIELD_WIDTH.  This patch fixes the
      calculation.
      Signed-off-by: NCarl Love <cel@us.ibm.com>
      Acked-by: NPaul Mackerras <paulus@samba.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      46ed7a76
    • S
      powerpc/pasemi: Fix crash on reboot · 72640d88
      Steven Rostedt 提交于
      commit f96972f2 "kernel/sys.c: call disable_nonboot_cpus() in
      kernel_restart()"
      
      added a call to disable_nonboot_cpus() on kernel_restart(), which tries
      to shutdown all the CPUs except the first one. The issue with the PA
      Semi, is that it does not support CPU hotplug.
      
      When the call is made to __cpu_down(), it calls the notifiers
      CPU_DOWN_PREPARE, and then tries to take the CPU down.
      
      One of the notifiers to the CPU hotplug code, is the cpufreq. The
      DOWN_PREPARE will call __cpufreq_remove_dev() which calls
      cpufreq_driver->exit. The PA Semi exit handler unmaps regions of I/O
      that is used by an interrupt that goes off constantly
      (system_reset_common, but it goes off during normal system operations
      too). I'm not sure exactly what this interrupt does.
      
      Running a simple function trace, you can see it goes off quite a bit:
      
      # tracer: function
      #
      #           TASK-PID    CPU#    TIMESTAMP  FUNCTION
      #              | |       |          |         |
                <idle>-0     [001]  1558.859363: .pasemi_system_reset_exception <-.system_reset_exception
                <idle>-0     [000]  1558.860112: .pasemi_system_reset_exception <-.system_reset_exception
                <idle>-0     [000]  1558.861109: .pasemi_system_reset_exception <-.system_reset_exception
                <idle>-0     [001]  1558.861361: .pasemi_system_reset_exception <-.system_reset_exception
                <idle>-0     [000]  1558.861437: .pasemi_system_reset_exception <-.system_reset_exception
      
      When the region is unmapped, the system crashes with:
      
      Disabling non-boot CPUs ...
      Error taking CPU1 down: -38
      Unable to handle kernel paging request for data at address 0xd0000800903a0100
      Faulting instruction address: 0xc000000000055fcc
      Oops: Kernel access of bad area, sig: 11 [#1]
      PREEMPT SMP NR_CPUS=64 NUMA PA Semi PWRficient
      Modules linked in: shpchp
      NIP: c000000000055fcc LR: c000000000055fb4 CTR: c0000000000df1fc
      REGS: c0000000012175d0 TRAP: 0300   Not tainted  (3.8.0-rc4-test-dirty)
      MSR: 9000000000009032 <SF,HV,EE,ME,IR,DR,RI>  CR: 24000088  XER: 00000000
      SOFTE: 0
      DAR: d0000800903a0100, DSISR: 42000000
      TASK = c0000000010e9008[0] 'swapper/0' THREAD: c000000001214000 CPU: 0
      GPR00: d0000800903a0000 c000000001217850 c0000000012167e0 0000000000000000
      GPR04: 0000000000000000 0000000000000724 0000000000000724 0000000000000000
      GPR08: 0000000000000000 0000000000000000 0000000000000001 0000000000a70000
      GPR12: 0000000024000080 c00000000fff0000 ffffffffffffffff 000000003ffffae0
      GPR16: ffffffffffffffff 0000000000a21198 0000000000000060 0000000000000000
      GPR20: 00000000008fdd35 0000000000a21258 000000003ffffaf0 0000000000000417
      GPR24: 0000000000a226d0 c000000000000000 0000000000000000 0000000000000000
      GPR28: c00000000138b358 0000000000000000 c000000001144818 d0000800903a0100
      NIP [c000000000055fcc] .set_astate+0x5c/0xa4
      LR [c000000000055fb4] .set_astate+0x44/0xa4
      Call Trace:
      [c000000001217850] [c000000000055fb4] .set_astate+0x44/0xa4 (unreliable)
      [c0000000012178f0] [c00000000005647c] .restore_astate+0x2c/0x34
      [c000000001217980] [c000000000054668] .pasemi_system_reset_exception+0x6c/0x88
      [c000000001217a00] [c000000000019ef0] .system_reset_exception+0x48/0x84
      [c000000001217a80] [c000000000001e40] system_reset_common+0x140/0x180
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      72640d88
    • L
      powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning for ppc32 · 41d82bdb
      Li Zhong 提交于
      This patch fixes MAX_STACK_TRACE_ENTRIES too low warning for ppc32,
      which is similar to commit 12660b17.
      Reported-by: NChristian Kujau <lists@nerdbynature.de>
      Signed-off-by: NLi Zhong <zhong@linux.vnet.ibm.com>
      Tested-by: NChristian Kujau <lists@nerdbynature.de>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      41d82bdb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes · 45e72af0
      Linus Torvalds 提交于
      Pull GFS2 fix from Steven Whitehouse.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
        GFS2: fix skip unlock condition
      45e72af0
    • L
      Merge tag 'iommu-fixes-v3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · ae2c3d95
      Linus Torvalds 提交于
      Pull IOMMU fix from Joerg Roedel:
       "One fix for the AMD IOMMU driver to work around broken BIOSes found in
        the field.  Some BIOSes forget to enable a workaround for a hardware
        problem which might cause the IOMMU to stop working under high load
        conditions.  The fix makes sure this workaround is enabled."
      
      * tag 'iommu-fixes-v3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround
      ae2c3d95
    • L
      Merge tag 'mfd-for-linus-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 325a86b6
      Linus Torvalds 提交于
      Pull MFD fixes from Samuel Ortiz:
       "This is the first pull request for MFD fixes for 3.8
      
        We have some build failure fixes (twl4030, vexpress, abx500 and
        tps65910), some actual runtime oops and lockup fixes (rtsx, da9052),
        and some more hypothetical NULL pointers dereferences fixes for
        pcf50633 and max776xx.
      
        Then we also have additional rtsx fixes for a correct switch output
        voltage and clock divider correctness for rtl8411 (rtsx driver), and
        irqdomain fix for db8550-prcmu, and some more cosmetic fixes for
        arizona and wm5102."
      
      * tag 'mfd-for-linus-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
        mfd: rtsx: Fix oops when rtsx_pci_sdmmc is not probed
        mfd: wm5102: Fix definition of WM5102_MAX_REGISTER
        mfd: twl4030: Don't warn about uninitialized return code
        mfd: da9052/53 lockup fix
        mfd: rtsx: Add clock divider hook
        mmc: rtsx: Call MFD hook to switch output voltage
        mfd: rtsx: Add output voltage switch hook
        mfd: Fix compile errors and warnings when !CONFIG_AB8500_BM
        mfd: vexpress: Export global functions to fix build error
        mfd: arizona: Check errors from regcache_sync()
        mfd: tc3589x: Use simple irqdomain
        mfd: pcf50633: Init pcf->dev before using it
        mfd: max77693: Init max77693->dev before using it
        mfd: max77686: Init max77686->dev before using it
        mfd: db8500-prcmu: Fix irqdomain usage
        mfd: tps65910: Select REGMAP_IRQ in Kconfig to fix build error
        mfd: arizona: Disable control interface reporting for WM5102 and WM5110
      325a86b6
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 22f83798
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "Much more accumulated than I would have liked due to an unexpected
        bout with a nasty flu:
      
         1) AH and ESP input don't set ECN field correctly because the
            transport head of the SKB isn't set correctly, fix from Li
            RongQing.
      
         2) If netfilter conntrack zones are disabled, we can return an
            uninitialized variable instead of the proper error code.  Fix from
            Borislav Petkov.
      
         3) Fix double SKB free in ath9k driver beacon handling, from Felix
            Feitkau.
      
         4) Remove bogus assumption about netns cleanup ordering in
            nf_conntrack, from Pablo Neira Ayuso.
      
         5) Remove a bogus BUG_ON in the new TCP fastopen code, from Eric
            Dumazet.  It uses spin_is_locked() in it's test and is therefore
            unsuitable for UP.
      
         6) Fix SELINUX labelling regressions added by the tuntap multiqueue
            changes, from Paul Moore.
      
         7) Fix CRC errors with jumbo frame receive in tg3 driver, from Nithin
            Nayak Sujir.
      
         8) CXGB4 driver sets interrupt coalescing parameters only on first
            queue, rather than all of them.  Fix from Thadeu Lima de Souza
            Cascardo.
      
         9) Fix regression in the dispatch of read/write registers in dm9601
            driver, from Tushar Behera.
      
        10) ipv6_append_data miscalculates header length, from Romain KUNTZ.
      
        11) Fix PMTU handling regressions on ipv4 routes, from Steffen
            Klassert, Timo Teräs, and Julian Anastasov.
      
        12) In 3c574_cs driver, add necessary parenthesis to "x << y & z"
            expression.  From Nickolai Zeldovich.
      
        13) macvlan_get_size() causes underallocation netlink message space,
            fix from Eric Dumazet.
      
        14) Avoid division by zero in xfrm_replay_advance_bmp(), from Nickolai
            Zeldovich.  Amusingly the zero check was already there, we were
            just performing it after the modulus :-)
      
        15) Some more splice bug fixes from Eric Dumazet, which fix things
            mostly eminating from how we now more aggressively use high-order
            pages in SKBs.
      
        16) Fix size calculation bug when freeing hash tables in the IPSEC
            xfrm code, from Michal Kubecek.
      
        17) Fix PMTU event propagation into socket cached routes, from Steffen
            Klassert.
      
        18) Fix off by one in TX buffer release in netxen driver, from Eric
            Dumazet.
      
        19) Fix rediculous memory allocation requirements introduced by the
            tuntap multiqueue changes, from Jason Wang.
      
        20) Remove bogus AMD platform workaround in r8169 driver that causes
            major problems in normal operation, from Timo Teräs.
      
        21) virtio-net set affinity and select queue don't handle
            discontiguous cpu numbers properly, fix from Wanlong Gao.
      
        22) Fix a route refcounting issue in loopback driver, from Eric
            Dumazet.  There's a similar fix coming that we might add to the
            macvlan driver as well.
      
        23) Fix SKB leaks in batman-adv's distributed arp table code, from
            Matthias Schiffer.
      
        24) r8169 driver gives descriptor ownership back the hardware before
            we're done reading the VLAN tag out of it, fix from Francois
            Romieu.
      
        25) Checksums not calculated properly in GRE tunnel driver fix from
            Pravin B Shelar.
      
      26) Fix SCTP memory leak on namespace exit."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (101 commits)
        dm9601: support dm9620 variant
        SCTP: Free the per-net sysctl table on net exit. v2
        net: phy: icplus: fix broken INTR pin settings
        net: phy: icplus: Use the RGMII interface mode to configure clock delays
        IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
        sctp: set association state to established in dupcook_a handler
        ip6mr: limit IPv6 MRT_TABLE identifiers
        r8169: fix vlan tag read ordering.
        net: cdc_ncm: use IAD provided by the USB core
        batman-adv: filter ARP packets with invalid MAC addresses in DAT
        batman-adv: check for more types of invalid IP addresses in DAT
        batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply()
        net: loopback: fix a dst refcounting issue
        virtio-net: reset virtqueue affinity when doing cpu hotplug
        virtio-net: split out clean affinity function
        virtio-net: fix the set affinity bug when CPU IDs are not consecutive
        can: pch_can: fix invalid error codes
        can: ti_hecc: fix invalid error codes
        can: c_can: fix invalid error codes
        r8169: remove the obsolete and incorrect AMD workaround
        ...
      22f83798
  4. 28 1月, 2013 3 次提交