Saravana Kannan
13b1e39965
GKI: io-pgtable: #ifdef unused structs
...
These structs are from old SoCs and the code is not compiled in Pixel.
So wrap them with #ifdef to avoid unnecessary ABI diff with ACK.
Signed-off-by: Saravana Kannan <saravanak@google.com >
Change-Id: I143d32675a61ebfc9ef11815ba64eae27f9b3259
2020-05-30 02:28:44 +08:00
Robin Peng
58a95695aa
Merge LA.UM.9.12.R1.10.00.00.597.032 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
...
Conflicts:
arch/arm64/configs/vendor/kona_defconfig
arch/arm64/configs/vendor/lito_defconfig
arch/arm64/include/asm/traps.h
drivers/power/supply/qcom/qpnp-smb5.c
kernel/sched/sched.h
Bug: 151568484
Change-Id: I6ed9ae8bc29d93e42b8527ae25074db334c640da
Signed-off-by: Robin Peng <robinpeng@google.com >
2020-05-30 02:18:38 +08:00
Robin Peng
18aebe37da
Merge LA.UM.9.12.R1.10.00.00.597.021 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
...
Conflicts:
drivers/gpu/msm/kgsl.c
drivers/scsi/ufs/ufs-sysfs.c
drivers/soc/qcom/msm_bus/Makefile
Bug: 149175890
Change-Id: If201d9b60bfe4236c51481a9ef0ae8e16a4bcac1
Signed-off-by: Robin Peng <robinpeng@google.com >
2020-05-30 02:07:17 +08:00
Rob Herring
7626e21c43
GKI: UPSTREAM: BACKPORT: iommu: Allow io-pgtable to be used outside of drivers/iommu/
...
Move io-pgtable.h to include/linux/ and export alloc_io_pgtable_ops
and free_io_pgtable_ops. This enables drivers outside drivers/iommu/ to
use the page table library. Specifically, some ARM Mali GPUs use the
ARM page table formats.
Cc: Will Deacon <will.deacon@arm.com >
Cc: Robin Murphy <robin.murphy@arm.com >
Cc: Joerg Roedel <joro@8bytes.org >
Cc: Matthias Brugger <matthias.bgg@gmail.com >
Cc: Rob Clark <robdclark@gmail.com >
Cc: linux-arm-kernel@lists.infradead.org
Cc: iommu@lists.linux-foundation.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org >
Signed-off-by: Joerg Roedel <jroedel@suse.de >
(cherry pick from commit b77cf11f094136a9d7d0ee6a56cf49db1f412871)
Signed-off-by: Mark Salyzyn <salyzyn@google.com >
Bug: 145919068
Change-Id: I09a0d1a83bd4788297d36cbee248119252452d4c
2020-05-30 02:00:50 +08:00
