Merge tag 'irqchip-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Pull irqchip updates from Marc Zyngier

- The huge (and terrifying) TI INTR/INTA set of drivers
- Rewrite of the stm32mp1-exti driver as a platform driver
- Update the IOMMU MSI mapping API to be RT friendly
- A number of cleanups and other low impact fixes

1 files changed, 63 insertions, 14 deletions

diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index e38518cdcbc3..74ef92f1d19a 100755
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -107,6 +107,7 @@ import os
 from PySide.QtCore import *
 from PySide.QtGui import *
 from PySide.QtSql import *
+pyside_version_1 = True
 from decimal import *
 from ctypes import *
 from multiprocessing import Process, Array, Value, Event
@@ -1526,6 +1527,19 @@ def BranchDataPrep(query):
                         " (" + dsoname(query.value(15)) + ")")
         return data
 
+def BranchDataPrepWA(query):
+        data = []
+        data.append(query.value(0))
+        # Workaround pyside failing to handle large integers (i.e. time) in python3 by converting to a string
+        data.append("{:>19}".format(query.value(1)))
+        for i in xrange(2, 8):
+                data.append(query.value(i))
+        data.append(tohex(query.value(8)).rjust(16) + " " + query.value(9) + offstr(query.value(10)) +
+                        " (" + dsoname(query.value(11)) + ")" + " -> " +
+                        tohex(query.value(12)) + " " + query.value(13) + offstr(query.value(14)) +
+                        " (" + dsoname(query.value(15)) + ")")
+        return data
+
 # Branch data model
 
 class BranchModel(TreeModel):
@@ -1553,7 +1567,11 @@ class BranchModel(TreeModel):
                         " AND evsel_id = " + str(self.event_id) +
                         " ORDER BY samples.id"
                         " LIMIT " + str(glb_chunk_sz))
-                self.fetcher = SQLFetcher(glb, sql, BranchDataPrep, self.AddSample)
+                if pyside_version_1 and sys.version_info[0] == 3:
+                        prep = BranchDataPrepWA
+                else:
+                        prep = BranchDataPrep
+                self.fetcher = SQLFetcher(glb, sql, prep, self.AddSample)
                 self.fetcher.done.connect(self.Update)
                 self.fetcher.Fetch(glb_chunk_sz)
 
@@ -2079,14 +2097,6 @@ def IsSelectable(db, table, sql = ""):
                 return False
         return True
 
-# SQL data preparation
-
-def SQLTableDataPrep(query, count):
-        data = []
-        for i in xrange(count):
-                data.append(query.value(i))
-        return data
-
 # SQL table data model item
 
 class SQLTableItem():
@@ -2110,7 +2120,7 @@ class SQLTableModel(TableModel):
                 self.more = True
                 self.populated = 0
                 self.column_headers = column_headers
-                self.fetcher = SQLFetcher(glb, sql, lambda x, y=len(column_headers): SQLTableDataPrep(x, y), self.AddSample)
+                self.fetcher = SQLFetcher(glb, sql, lambda x, y=len(column_headers): self.SQLTableDataPrep(x, y), self.AddSample)
                 self.fetcher.done.connect(self.Update)
                 self.fetcher.Fetch(glb_chunk_sz)
 
@@ -2154,6 +2164,12 @@ class SQLTableModel(TableModel):
         def columnHeader(self, column):
                 return self.column_headers[column]
 
+        def SQLTableDataPrep(self, query, count):
+                data = []
+                for i in xrange(count):
+                        data.append(query.value(i))
+                return data
+
 # SQL automatic table data model
 
 class SQLAutoTableModel(SQLTableModel):
@@ -2182,8 +2198,32 @@ class SQLAutoTableModel(SQLTableModel):
                         QueryExec(query, "SELECT column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' and table_name = '" + select_table_name + "'")
                         while query.next():
                                 column_headers.append(query.value(0))
+                if pyside_version_1 and sys.version_info[0] == 3:
+                        if table_name == "samples_view":
+                                self.SQLTableDataPrep = self.samples_view_DataPrep
+                        if table_name == "samples":
+                                self.SQLTableDataPrep = self.samples_DataPrep
                 super(SQLAutoTableModel, self).__init__(glb, sql, column_headers, parent)
 
+        def samples_view_DataPrep(self, query, count):
+                data = []
+                data.append(query.value(0))
+                # Workaround pyside failing to handle large integers (i.e. time) in python3 by converting to a string
+                data.append("{:>19}".format(query.value(1)))
+                for i in xrange(2, count):
+                        data.append(query.value(i))
+                return data
+
+        def samples_DataPrep(self, query, count):
+                data = []
+                for i in xrange(9):
+                        data.append(query.value(i))
+                # Workaround pyside failing to handle large integers (i.e. time) in python3 by converting to a string
+                data.append("{:>19}".format(query.value(9)))
+                for i in xrange(10, count):
+                        data.append(query.value(i))
+                return data
+
 # Base class for custom ResizeColumnsToContents
 
 class ResizeColumnsToContentsBase(QObject):
@@ -2868,9 +2908,13 @@ class LibXED():
                 ok = self.xed_format_context(2, inst.xedp, inst.bufferp, sizeof(inst.buffer), ip, 0, 0)
                 if not ok:
                         return 0, ""
+                if sys.version_info[0] == 2:
+                        result = inst.buffer.value
+                else:
+                        result = inst.buffer.value.decode()
                 # Return instruction length and the disassembled instruction text
                 # For now, assume the length is in byte 166
-                return inst.xedd[166], inst.buffer.value
+                return inst.xedd[166], result
 
 def TryOpen(file_name):
         try:
@@ -2886,9 +2930,14 @@ def Is64Bit(f):
         header = f.read(7)
         f.seek(pos)
         magic = header[0:4]
-        eclass = ord(header[4])
-        encoding = ord(header[5])
-        version = ord(header[6])
+        if sys.version_info[0] == 2:
+                eclass = ord(header[4])
+                encoding = ord(header[5])
+                version = ord(header[6])
+        else:
+                eclass = header[4]
+                encoding = header[5]
+                version = header[6]
         if magic == chr(127) + "ELF" and eclass > 0 and eclass < 3 and encoding > 0 and encoding < 3 and version == 1:
                 result = True if eclass == 2 else False
         return result