1. 07 Feb, 2019 10 commits
    • Dmitry Osipenko's avatar
      gpu: host1x: Continue CDMA execution starting with a next job · 79930baf
      Dmitry Osipenko authored
      Currently gathers of a hung job are getting NOP'ed and a restarted CDMA
      executes the NOP'ed gathers. There shouldn't be a reason to not restart
      CDMA execution starting with a next job, avoiding the unnecessary churning
      with gathers NOP'ing.
      Signed-off-by: Dmitry Osipenko's avatarDmitry Osipenko <digetx@gmail.com>
      Reviewed-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      79930baf
    • Dmitry Osipenko's avatar
      gpu: host1x: Don't complete a completed job · 5d6f0436
      Dmitry Osipenko authored
      There is a chance that the last job has been completed at the time of
      CDMA timeout handler invocation. In this case there is no need to complete
      the completed job.
      Signed-off-by: Dmitry Osipenko's avatarDmitry Osipenko <digetx@gmail.com>
      Reviewed-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      5d6f0436
    • Dmitry Osipenko's avatar
      gpu: host1x: Cancel only job that actually got stuck · e8bad659
      Dmitry Osipenko authored
      Host1x doesn't have information about jobs inter-dependency, that is
      something that will become available once host1x will get a proper
      jobs scheduler implementation. Currently a hang job causes other unrelated
      jobs to be canceled, that is a relic from downstream driver which is
      irrelevant to upstream. Let's cancel only the hanging job and not to touch
      other jobs in queue.
      Signed-off-by: Dmitry Osipenko's avatarDmitry Osipenko <digetx@gmail.com>
      Reviewed-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      e8bad659
    • Thierry Reding's avatar
      gpu: host1x: Optimize CDMA push buffer memory usage · e1f338c0
      Thierry Reding authored
      The host1x CDMA push buffer is terminated by a special opcode (RESTART)
      that tells the CDMA to wrap around to the beginning of the push buffer.
      To accomodate the RESTART opcode, an extra 4 bytes are allocated on top
      of the 512 * 8 = 4096 bytes needed for the 512 slots (1 slot = 2 words)
      that are used for other commands passed to CDMA. This requires that two
      memory pages are allocated, but most of the second page (4092 bytes) is
      never used.
      
      Decrease the number of slots to 511 so that the RESTART opcode fits
      within the page. Adjust the push buffer wraparound code to take into
      account push buffer sizes that are not a power of two.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      e1f338c0
    • Thierry Reding's avatar
      gpu: host1x: Use correct semantics for HOST1X_CHANNEL_DMAEND · 0e43b8da
      Thierry Reding authored
      The HOST1X_CHANNEL_DMAEND is an offset relative to the value written to
      the HOST1X_CHANNEL_DMASTART register, but it is currently treated as an
      absolute address. This can cause SMMU faults if the CDMA fetches past a
      pushbuffer's IOMMU mapping.
      
      Properly setting the DMAEND prevents the CDMA from fetching beyond that
      address and avoid such issues. This is currently not observed because a
      whole (almost) page of essentially scratch space absorbs any excessive
      prefetching by CDMA. However, changing the number of slots in the push
      buffer can trigger these SMMU faults.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      0e43b8da
    • Thierry Reding's avatar
      gpu: host1x: Support 40-bit addressing on Tegra186 · 8de896eb
      Thierry Reding authored
      The host1x and clients instantiated on Tegra186 support addressing 40
      bits of memory.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      8de896eb
    • Thierry Reding's avatar
      gpu: host1x: Restrict IOVA space to DMA mask · 38fabcc9
      Thierry Reding authored
      On Tegra186 and later, the ARM SMMU provides an input address space that
      is 48 bits wide. However, memory clients can only address up to 40 bits.
      If the geometry is used as-is, allocations of IOVA space can end up in a
      region that is not addressable by the memory clients.
      
      To fix this, restrict the IOVA space to the DMA mask of the host1x
      device.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      38fabcc9
    • Thierry Reding's avatar
      gpu: host1x: Support 40-bit addressing · 67a82dbc
      Thierry Reding authored
      Tegra186 and later support 40 bits of address space. Additional
      registers need to be programmed to store the full 40 bits of push
      buffer addresses.
      
      Since command stream gathers can also reside in buffers in a 40-bit
      address space, a new variant of the GATHER opcode is also introduced.
      It takes two parameters: the first parameter contains the lower 32
      bits of the address and the second parameter contains bits 32 to 39.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      67a82dbc
    • Thierry Reding's avatar
      gpu: host1x: Introduce support for wide opcodes · 5a5fccbd
      Thierry Reding authored
      The CDMA push buffer can currently only handle opcodes that take a
      single word parameter. However, the host1x implementation on Tegra186
      and later supports opcodes that require multiple words as parameters.
      
      Unfortunately the way the push buffer is structured, these wide opcodes
      cannot simply be composed of two regular opcodes because that could
      result in the wide opcode being split across the end of the push buffer
      and the final RESTART opcode required to wrap the push buffer around
      would break the wide opcode.
      
      One way to fix this would be to remove the concept of slots to simplify
      push buffer operations. However, that's not entirely trivial and should
      be done in a separate patch. For now, simply use a different function
      to push four-word opcodes into the push buffer. Technically only three
      words are pushed, with the fourth word used as padding to preserve the
      2-word alignment required by the slots abstraction. The fourth word is
      always a NOP opcode.
      
      Additional care must be taken when the end of the push buffer is
      reached. If a four-word opcode doesn't fit into the push buffer without
      being split by the boundary, NOP opcodes will be introduced and the new
      wide opcode placed at the beginning of the push buffer.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      5a5fccbd
    • Thierry Reding's avatar
      gpu: host1x: Program the channel stream ID · de5469c2
      Thierry Reding authored
      When processing command streams, make sure the host1x's stream ID is
      programmed for the channel so that addresses are properly translated
      through the SMMU.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      de5469c2
  2. 04 Feb, 2019 3 commits
  3. 29 Nov, 2018 1 commit
    • Thierry Reding's avatar
      gpu: host1x: Add Tegra194 support · ac1bdbf2
      Thierry Reding authored
      The host1x hardware found on Tegra194 is mostly backwards compatible
      with the version found on Tegra186, with the notable exceptions of the
      increased number of syncpoints and mlocks. In addition, some rarely
      used features such as syncpoint wait bases were dropped and some
      registers had to move around to accomodate the increased number of
      syncpoints.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      ac1bdbf2
  4. 27 Nov, 2018 2 commits
  5. 26 Sep, 2018 2 commits
  6. 09 Jul, 2018 2 commits
  7. 18 May, 2018 7 commits
  8. 17 May, 2018 2 commits
  9. 03 May, 2018 2 commits
  10. 21 Dec, 2017 1 commit
    • Thierry Reding's avatar
      gpu: host1x: Use IOMMU groups · 41c3068c
      Thierry Reding authored
      Use IOMMU groups to attach the host1x device to its IOMMU domain. This
      is not strictly necessary because the domain isn't shared with any other
      device, but it makes the code consistent with how IOMMU is handled in
      other drivers and provides an easy way to detect when no IOMMU has been
      attached via device tree.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      41c3068c
  11. 13 Dec, 2017 2 commits
  12. 02 Nov, 2017 1 commit
    • Greg Kroah-Hartman's avatar
      License cleanup: add SPDX GPL-2.0 license identifier to files with no license · b2441318
      Greg Kroah-Hartman authored
      Many source files in the tree are missing licensing information, which
      makes it harder for compliance tools to determine the correct license.
      
      By default all files without license information are under the default
      license of the kernel, which is GPL version 2.
      
      Update the files which contain no license information with the 'GPL-2.0'
      SPDX license identifier.  The SPDX identifier is a legally binding
      shorthand, which can be used instead of the full boiler plate text.
      
      This patch is based on work done by Thomas Gleixner and Kate Stewart and
      Philippe Ombredanne.
      
      How this work was done:
      
      Patches were generated and checked against linux-4.14-rc6 for a subset of
      the use cases:
       - file had no licensing information it it.
       - file was a */uapi/* one with no licensing information in it,
       - file was a */uapi/* one with existing licensing information,
      
      Further patches will be generated in subsequent months to fix up cases
      where non-standard license headers were used, and references to license
      had to be inferred by heuristics based on keywords.
      
      The analysis to determine which SPDX License Identifier to be applied to
      a file was done in a spreadsheet of side by side results from of the
      output of two independent scanners (ScanCode & Windriver) producing SPDX
      tag:value files created by Philippe Ombredanne.  Philippe prepared the
      base worksheet, and did an initial spot review of a few 1000 files.
      
      The 4.13 kernel was the starting point of the analysis with 60,537 files
      assessed.  Kate Stewart did a file by file comparison of the scanner
      results in the spreadsheet to determine which SPDX license identifier(s)
      to be applied to the file. She confirmed any determination that was not
      immediately clear with lawyers working with the Linux Foundation.
      
      Criteria used to select files for SPDX license identifier tagging was:
       - Files considered eligible had to be source code files.
       - Make and config files were included as candidates if they contained >5
         lines of source
       - File already had some variant of a license header in it (even if <5
         lines).
      
      All documentation files were explicitly excluded.
      
      The following heuristics were used to determine which SPDX license
      identifiers to apply.
      
       - when both scanners couldn't find any license traces, file was
         considered to have no license information in it, and the top level
         COPYING file license applied.
      
         For non */uapi/* files that summary was:
      
         SPDX license identifier                            # files
         ---------------------------------------------------|-------
         GPL-2.0                                              11139
      
         and resulted in the first patch in this series.
      
         If that file was a */uapi/* path one, it was "GPL-2.0 WITH
         Linux-syscall-note" otherwise it was "GPL-2.0".  Results of that was:
      
         SPDX license identifier                            # files
         ---------------------------------------------------|-------
         GPL-2.0 WITH Linux-syscall-note                        930
      
         and resulted in the second patch in this series.
      
       - if a file had some form of licensing information in it, and was one
         of the */uapi/* ones, it was denoted with the Linux-syscall-note if
         any GPL family license was found in the file or had no licensing in
         it (per prior point).  Results summary:
      
         SPDX license identifier                            # files
         ---------------------------------------------------|------
         GPL-2.0 WITH Linux-syscall-note                       270
         GPL-2.0+ WITH Linux-syscall-note                      169
         ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause)    21
         ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)    17
         LGPL-2.1+ WITH Linux-syscall-note                      15
         GPL-1.0+ WITH Linux-syscall-note                       14
         ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause)    5
         LGPL-2.0+ WITH Linux-syscall-note                       4
         LGPL-2.1 WITH Linux-syscall-note                        3
         ((GPL-2.0 WITH Linux-syscall-note) OR MIT)              3
         ((GPL-2.0 WITH Linux-syscall-note) AND MIT)             1
      
         and that resulted in the third patch in this series.
      
       - when the two scanners agreed on the detected license(s), that became
         the concluded license(s).
      
       - when there was disagreement between the two scanners (one detected a
         license but the other didn't, or they both detected different
         licenses) a manual inspection of the file occurred.
      
       - In most cases a manual inspection of the information in the file
         resulted in a clear resolution of the license that should apply (and
         which scanner probably needed to revisit its heuristics).
      
       - When it was not immediately clear, the license identifier was
         confirmed with lawyers working with the Linux Foundation.
      
       - If there was any question as to the appropriate license identifier,
         the file was flagged for further research and to be revisited later
         in time.
      
      In total, over 70 hours of logged manual review was done on the
      spreadsheet to determine the SPDX license identifiers to apply to the
      source files by Kate, Philippe, Thomas and, in some cases, confirmation
      by lawyers working with the Linux Foundation.
      
      Kate also obtained a third independent scan of the 4.13 code base from
      FOSSology, and compared selected files where the other two scanners
      disagreed against that SPDX file, to see if there was new insights.  The
      Windriver scanner is based on an older version of FOSSology in part, so
      they are related.
      
      Thomas did random spot checks in about 500 files from the spreadsheets
      for the uapi headers and agreed with SPDX license identifier in the
      files he inspected. For the non-uapi files Thomas did random spot checks
      in about 15000 files.
      
      In initial set of patches against 4.14-rc6, 3 files were found to have
      copy/paste license identifier errors, and have been fixed to reflect the
      correct identifier.
      
      Additionally Philippe spent 10 hours this week doing a detailed manual
      inspection and review of the 12,461 patched files from the initial patch
      version early this week with:
       - a full scancode scan run, collecting the matched texts, detected
         license ids and scores
       - reviewing anything where there was a license detected (about 500+
         files) to ensure that the applied SPDX license was correct
       - reviewing anything where there was no detection but the patch license
         was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
         SPDX license was correct
      
      This produced a worksheet with 20 files needing minor correction.  This
      worksheet was then exported into 3 different .csv files for the
      different types of files to be modified.
      
      These .csv files were then reviewed by Greg.  Thomas wrote a script to
      parse the csv files and add the proper SPDX tag to the file, in the
      format that the file expected.  This script was further refined by Greg
      based on the output to detect more types of files automatically and to
      distinguish between header and source .c files (which need different
      comment types.)  Finally Greg ran the script using the .csv files to
      generate the patches.
      Reviewed-by: default avatarKate Stewart <kstewart@linuxfoundation.org>
      Reviewed-by: default avatarPhilippe Ombredanne <pombredanne@nexb.com>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b2441318
  13. 20 Oct, 2017 5 commits